Merge remote-tracking branch 'origin/main' into hm/RUSTSEC-2024-0370

Cargo.toml

@@ -16,8 +16,8 @@ anyhow = "1"
 cid = { version = "0.11", default-features = false, features = ["std"] }
 flume = "0.11"
 futures = "0.3"
-libp2p = { version = "0.54", default-features = false }
-libp2p-swarm-test = "0.4"
+libp2p = { version = "0.55", default-features = false }
+libp2p-swarm-test = { version = "0.5", default-features = false, features = ["tokio"] }
 multihash-codetable = { version = "0.1", features = ["blake2b", "blake2s", "blake3", "sha2", "sha3", "strobe"] }
 rust2go = "0.3"
 tokio = "1"

deny.toml

@@ -74,10 +74,6 @@ ignore = [
   # compatability/consensus reasons - see
   # https://github.com/filecoin-project/ref-fvm/issues/1843
   "RUSTSEC-2022-0061", # parity-wasm is deprecated
-  # Instant is unmaintained, but there is a replacement in
-  # the pipeline - see
-  # https://github.com/libp2p/rust-libp2p/pull/5674
-  "RUSTSEC-2024-0384",
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.

interop-tests/src/tests/bitswap_go_compat.rs

@@ -34,7 +34,7 @@ async fn bitswap_go_compat_test_impl() -> anyhow::Result<()> {
         loop {
             // Swarm event loop
             match swarm.select_next_some().await {
-                SwarmEvent::Behaviour(BitswapBehaviourEvent::Message { peer, message }) => {
+                SwarmEvent::Behaviour(BitswapBehaviourEvent::Message { peer, message, .. }) => {
                     let bitswap = &mut swarm.behaviour_mut();
                     match message {
                         request_response::Message::Request {

src/libp2p/gossip_params.rs

@@ -107,6 +107,9 @@ pub(in crate::libp2p) fn build_peer_score_params(network_name: &str) -> PeerScor
 
         retain_score: Duration::from_secs(6 * 60 * 60),
         topics: psp_topics,
+
+        // slow_peer_* settings are not customized in Lotus
+        ..Default::default()
     }
 }
 

src/libp2p/hello/behaviour.rs

@@ -179,6 +179,7 @@ impl NetworkBehaviour for HelloBehaviour {
                         request: HelloRequest { .. },
                         ..
                     },
+                ..
             }) = &ev
             {
                 self.pending_inbound_hello_peers.remove(peer);

src/libp2p/service.rs

@@ -615,7 +615,7 @@ async fn handle_gossip_event(
     if let gossipsub::Event::Message {
         propagation_source: source,
         message,
-        message_id: _,
+        ..
     } = e
     {
         let topic = message.topic.as_str();
@@ -666,11 +666,9 @@ async fn handle_hello_event(
     network_sender_out: &Sender<NetworkEvent>,
 ) {
     match event {
-        request_response::Event::Message { peer, message } => match message {
+        request_response::Event::Message { peer, message, .. } => match message {
             request_response::Message::Request {
-                request,
-                channel,
-                request_id: _,
+                request, channel, ..
             } => {
                 emit_event(network_sender_out, NetworkEvent::HelloRequestInbound).await;
 
@@ -729,6 +727,7 @@ async fn handle_hello_event(
             request_id,
             peer,
             error,
+            ..
         } => {
             hello.on_outbound_failure(&request_id);
             match error {
@@ -784,7 +783,7 @@ async fn handle_chain_exchange_event<DB>(
     DB: Blockstore + Sync + Send + 'static,
 {
     match ce_event {
-        request_response::Event::Message { peer, message } => match message {
+        request_response::Event::Message { peer, message, .. } => match message {
             request_response::Message::Request {
                 request,
                 channel,
@@ -825,17 +824,11 @@ async fn handle_chain_exchange_event<DB>(
             }
         },
         request_response::Event::OutboundFailure {
-            peer: _,
-            request_id,
-            error,
+            request_id, error, ..
         } => {
             chain_exchange.on_outbound_error(&request_id, error);
         }
-        request_response::Event::InboundFailure {
-            peer,
-            error,
-            request_id: _,
-        } => {
+        request_response::Event::InboundFailure { peer, error, .. } => {
             debug!(
                 "ChainExchange inbound error (peer: {:?}): {:?}",
                 peer, error

src/libp2p_bitswap/internals/event_handlers.rs

@@ -20,7 +20,7 @@ pub fn handle_event_impl<S: BitswapStoreRead>(
     store: &S,
     event: BitswapBehaviourEvent,
 ) -> anyhow::Result<()> {
-    if let BitswapBehaviourEvent::Message { peer, message } = event {
+    if let BitswapBehaviourEvent::Message { peer, message, .. } = event {
         match message {
             request_response::Message::Request {
                 request_id: _, // `request_id` is useless here for pairing request and response

src/libp2p_bitswap/tests/request_manager.rs

@@ -91,7 +91,7 @@ mod tests {
     }
 
     async fn create_swarm() -> anyhow::Result<(Swarm<BitswapBehaviour>, PeerId, Multiaddr)> {
-        let mut swarm = Swarm::new_ephemeral(|_| {
+        let mut swarm = Swarm::new_ephemeral_tokio(|_| {
             BitswapBehaviour::new(&["/test/ipfs/bitswap/1.0.0"], Default::default())
         });
         let peer_id = *swarm.local_peer_id();