From ce24938048cdb9c29f0b8218364557783cecd44a Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 4 Dec 2023 09:54:56 +1100
Subject: [PATCH 001/455] feat(swarm): implement `Copy` and `Clone` for
 `FromSwarm`

We can make `FromSwarm` implement `Copy` and `Close` which makes it much easier to

a) generate code in `libp2p-swarm-derive`
b) manually wrap a `NetworkBehaviour`

Previously, we couldn't do this because `ConnectionClosed` would have a `handler` field that cannot be cloned / copied.

Related: #4076.
Related: #4581.

Pull-Request: #4825.
---
 Cargo.lock                         |   4 +-
 Cargo.toml                         |   4 +-
 protocols/autonat/src/behaviour.rs |  90 ++-----
 protocols/rendezvous/src/server.rs |  12 +-
 swarm-derive/CHANGELOG.md          |   5 +
 swarm-derive/Cargo.toml            |   2 +-
 swarm-derive/src/lib.rs            | 362 +----------------------------
 swarm/CHANGELOG.md                 |   6 +
 swarm/Cargo.toml                   |   2 +-
 swarm/src/behaviour.rs             |   4 +-
 swarm/src/test.rs                  |  41 +---
 11 files changed, 47 insertions(+), 485 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b69a700f7ca..f61f94c09a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3106,7 +3106,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.44.0"
+version = "0.44.1"
 dependencies = [
  "async-std",
  "either",
@@ -3139,7 +3139,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.34.0"
+version = "0.34.1"
 dependencies = [
  "heck",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 8fca61c365e..00aa66625cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,8 +99,8 @@ libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.1", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.5", path = "misc/server" }
-libp2p-swarm = { version = "0.44.0", path = "swarm" }
-libp2p-swarm-derive = { version = "=0.34.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
+libp2p-swarm = { version = "0.44.1", path = "swarm" }
+libp2p-swarm-derive = { version = "=0.34.1", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
diff --git a/protocols/autonat/src/behaviour.rs b/protocols/autonat/src/behaviour.rs
index 0b80a079c0f..e95163ab23f 100644
--- a/protocols/autonat/src/behaviour.rs
+++ b/protocols/autonat/src/behaviour.rs
@@ -35,12 +35,9 @@ use libp2p_request_response::{
     self as request_response, InboundRequestId, OutboundRequestId, ProtocolSupport, ResponseChannel,
 };
 use libp2p_swarm::{
-    behaviour::{
-        AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, ExpiredListenAddr,
-        ExternalAddrExpired, FromSwarm,
-    },
-    ConnectionDenied, ConnectionId, ListenAddresses, NetworkBehaviour, NewExternalAddrCandidate,
-    THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+    behaviour::{AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm},
+    ConnectionDenied, ConnectionId, ListenAddresses, NetworkBehaviour, THandler, THandlerInEvent,
+    THandlerOutEvent, ToSwarm,
 };
 use std::{
     collections::{HashMap, HashSet, VecDeque},
@@ -363,18 +360,10 @@ impl Behaviour {
         ConnectionClosed {
             peer_id,
             connection_id,
-            endpoint,
             remaining_established,
+            ..
         }: ConnectionClosed,
     ) {
-        self.inner
-            .on_swarm_event(FromSwarm::ConnectionClosed(ConnectionClosed {
-                peer_id,
-                connection_id,
-                endpoint,
-                remaining_established,
-            }));
-
         if remaining_established == 0 {
             self.connected.remove(&peer_id);
         } else {
@@ -386,20 +375,7 @@ impl Behaviour {
         }
     }
 
-    fn on_dial_failure(
-        &mut self,
-        DialFailure {
-            peer_id,
-            connection_id,
-            error,
-        }: DialFailure,
-    ) {
-        self.inner
-            .on_swarm_event(FromSwarm::DialFailure(DialFailure {
-                peer_id,
-                connection_id,
-                error,
-            }));
+    fn on_dial_failure(&mut self, DialFailure { peer_id, error, .. }: DialFailure) {
         if let Some(event) = self.as_server().on_outbound_dial_error(peer_id, error) {
             self.pending_actions
                 .push_back(ToSwarm::GenerateEvent(Event::InboundProbe(event)));
@@ -542,57 +518,25 @@ impl NetworkBehaviour for Behaviour {
 
     fn on_swarm_event(&mut self, event: FromSwarm) {
         self.listen_addresses.on_swarm_event(&event);
+        self.inner.on_swarm_event(event);
 
         match event {
-            FromSwarm::ConnectionEstablished(connection_established) => {
-                self.inner
-                    .on_swarm_event(FromSwarm::ConnectionEstablished(connection_established));
-                self.on_connection_established(connection_established)
-            }
-            FromSwarm::ConnectionClosed(connection_closed) => {
-                self.on_connection_closed(connection_closed)
-            }
-            FromSwarm::DialFailure(dial_failure) => self.on_dial_failure(dial_failure),
-            FromSwarm::AddressChange(address_change) => {
-                self.inner
-                    .on_swarm_event(FromSwarm::AddressChange(address_change));
-                self.on_address_change(address_change)
-            }
-            listen_addr @ FromSwarm::NewListenAddr(_) => {
-                self.inner.on_swarm_event(listen_addr);
+            FromSwarm::ConnectionEstablished(e) => self.on_connection_established(e),
+            FromSwarm::ConnectionClosed(e) => self.on_connection_closed(e),
+            FromSwarm::DialFailure(e) => self.on_dial_failure(e),
+            FromSwarm::AddressChange(e) => self.on_address_change(e),
+            FromSwarm::NewListenAddr(_) => {
                 self.as_client().on_new_address();
             }
-            FromSwarm::ExpiredListenAddr(ExpiredListenAddr { listener_id, addr }) => {
-                self.inner
-                    .on_swarm_event(FromSwarm::ExpiredListenAddr(ExpiredListenAddr {
-                        listener_id,
-                        addr,
-                    }));
-                self.as_client().on_expired_address(addr);
-            }
-            FromSwarm::ExternalAddrExpired(ExternalAddrExpired { addr }) => {
-                self.inner
-                    .on_swarm_event(FromSwarm::ExternalAddrExpired(ExternalAddrExpired { addr }));
-                self.as_client().on_expired_address(addr);
-            }
-            FromSwarm::NewExternalAddrCandidate(NewExternalAddrCandidate { addr }) => {
-                self.inner
-                    .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
-                        NewExternalAddrCandidate { addr },
-                    ));
-                self.probe_address(addr.to_owned());
-            }
-            listen_failure @ FromSwarm::ListenFailure(_) => {
-                self.inner.on_swarm_event(listen_failure)
+            FromSwarm::ExpiredListenAddr(e) => {
+                self.as_client().on_expired_address(e.addr);
             }
-            new_listener @ FromSwarm::NewListener(_) => self.inner.on_swarm_event(new_listener),
-            listener_error @ FromSwarm::ListenerError(_) => {
-                self.inner.on_swarm_event(listener_error)
+            FromSwarm::ExternalAddrExpired(e) => {
+                self.as_client().on_expired_address(e.addr);
             }
-            listener_closed @ FromSwarm::ListenerClosed(_) => {
-                self.inner.on_swarm_event(listener_closed)
+            FromSwarm::NewExternalAddrCandidate(e) => {
+                self.probe_address(e.addr.to_owned());
             }
-            confirmed @ FromSwarm::ExternalAddrConfirmed(_) => self.inner.on_swarm_event(confirmed),
             _ => {}
         }
     }
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index 78aa42043cd..667c71e20e3 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -215,20 +215,12 @@ impl NetworkBehaviour for Behaviour {
                     }) => {
                         continue;
                     }
-                    ToSwarm::Dial { .. }
-                    | ToSwarm::ListenOn { .. }
-                    | ToSwarm::RemoveListener { .. }
-                    | ToSwarm::NotifyHandler { .. }
-                    | ToSwarm::NewExternalAddrCandidate(_)
-                    | ToSwarm::ExternalAddrConfirmed(_)
-                    | ToSwarm::ExternalAddrExpired(_)
-                    | ToSwarm::CloseConnection { .. } => {
-                        let new_to_swarm = to_swarm
+                    other => {
+                        let new_to_swarm = other
                             .map_out(|_| unreachable!("we manually map `GenerateEvent` variants"));
 
                         return Poll::Ready(new_to_swarm);
                     }
-                    _ => {}
                 };
             }
 
diff --git a/swarm-derive/CHANGELOG.md b/swarm-derive/CHANGELOG.md
index 08adba00cdb..85ea1a46048 100644
--- a/swarm-derive/CHANGELOG.md
+++ b/swarm-derive/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.34.1
+
+- Always forward all variants of `FromSwarm`.
+  See [PR 4825](https://github.com/libp2p/rust-libp2p/pull/4825).
+
 ## 0.34.0
 
 - Adapt to interface changes in `libp2p-swarm`.
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 11cc4b6a12a..78ffd337101 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm-derive"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Procedural macros of libp2p-swarm"
-version = "0.34.0"
+version = "0.34.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm-derive/src/lib.rs b/swarm-derive/src/lib.rs
index 514975390b0..5c8ce93966d 100644
--- a/swarm-derive/src/lib.rs
+++ b/swarm-derive/src/lib.rs
@@ -71,19 +71,6 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
     let peer_id = quote! { #prelude_path::PeerId };
     let connection_id = quote! { #prelude_path::ConnectionId };
     let from_swarm = quote! { #prelude_path::FromSwarm };
-    let connection_established = quote! { #prelude_path::ConnectionEstablished };
-    let address_change = quote! { #prelude_path::AddressChange };
-    let connection_closed = quote! { #prelude_path::ConnectionClosed };
-    let dial_failure = quote! { #prelude_path::DialFailure };
-    let listen_failure = quote! { #prelude_path::ListenFailure };
-    let new_listener = quote! { #prelude_path::NewListener };
-    let new_listen_addr = quote! { #prelude_path::NewListenAddr };
-    let expired_listen_addr = quote! { #prelude_path::ExpiredListenAddr };
-    let new_external_addr_candidate = quote! { #prelude_path::NewExternalAddrCandidate };
-    let external_addr_expired = quote! { #prelude_path::ExternalAddrExpired };
-    let external_addr_confirmed = quote! { #prelude_path::ExternalAddrConfirmed };
-    let listener_error = quote! { #prelude_path::ListenerError };
-    let listener_closed = quote! { #prelude_path::ListenerClosed };
     let t_handler = quote! { #prelude_path::THandler };
     let t_handler_in_event = quote! { #prelude_path::THandlerInEvent };
     let t_handler_out_event = quote! { #prelude_path::THandlerOutEvent };
@@ -221,316 +208,18 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
         }
     };
 
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ConnectionEstablished` variant.
-    let on_connection_established_stmts = {
+    // Build the list of statements to put in the body of `on_swarm_event()`.
+    let on_swarm_event_stmts = {
         data_struct
             .fields
             .iter()
             .enumerate()
             .map(|(field_n, field)| match field.ident {
                 Some(ref i) => quote! {
-                    self.#i.on_swarm_event(#from_swarm::ConnectionEstablished(#connection_established {
-                        peer_id,
-                        connection_id,
-                        endpoint,
-                        failed_addresses,
-                        other_established,
-                    }));
+                    self.#i.on_swarm_event(event);
                 },
                 None => quote! {
-                    self.#field_n.on_swarm_event(#from_swarm::ConnectionEstablished(#connection_established {
-                        peer_id,
-                        connection_id,
-                        endpoint,
-                        failed_addresses,
-                        other_established,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::AddressChange variant`.
-    let on_address_change_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::AddressChange(#address_change {
-                        peer_id,
-                        connection_id,
-                        old,
-                        new,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::AddressChange(#address_change {
-                        peer_id,
-                        connection_id,
-                        old,
-                        new,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ConnectionClosed` variant.
-    let on_connection_closed_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .rev()
-            .enumerate()
-            .map(|(enum_n, field)| {
-                let inject = match field.ident {
-                    Some(ref i) => quote! {
-                    self.#i.on_swarm_event(#from_swarm::ConnectionClosed(#connection_closed {
-                            peer_id,
-                            connection_id,
-                            endpoint,
-                            remaining_established,
-                        }));
-                    },
-                    None => quote! {
-                    self.#enum_n.on_swarm_event(#from_swarm::ConnectionClosed(#connection_closed {
-                            peer_id,
-                            connection_id,
-                            endpoint,
-                            remaining_established,
-                        }));
-                    },
-                };
-
-                quote! {
-                    #inject;
-                }
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::DialFailure` variant.
-    let on_dial_failure_stmts = data_struct
-        .fields
-        .iter()
-        .enumerate()
-        .map(|(enum_n, field)| match field.ident {
-            Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::DialFailure(#dial_failure {
-                    peer_id,
-                    connection_id,
-                    error,
-                }));
-            },
-            None => quote! {
-                self.#enum_n.on_swarm_event(#from_swarm::DialFailure(#dial_failure {
-                    peer_id,
-                    connection_id,
-                    error,
-                }));
-            },
-        });
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ListenFailure` variant.
-    let on_listen_failure_stmts = data_struct
-        .fields
-        .iter()
-        .enumerate()
-        .map(|(enum_n, field)| match field.ident {
-            Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::ListenFailure(#listen_failure {
-                    local_addr,
-                    send_back_addr,
-                    connection_id,
-                    error
-                }));
-            },
-            None => quote! {
-                self.#enum_n.on_swarm_event(#from_swarm::ListenFailure(#listen_failure {
-                    local_addr,
-                    send_back_addr,
-                    connection_id,
-                    error
-                }));
-            },
-        });
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::NewListener` variant.
-    let on_new_listener_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::NewListener(#new_listener {
-                        listener_id,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::NewListener(#new_listener {
-                        listener_id,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::NewListenAddr` variant.
-    let on_new_listen_addr_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::NewListenAddr(#new_listen_addr {
-                        listener_id,
-                        addr,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::NewListenAddr(#new_listen_addr {
-                        listener_id,
-                        addr,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ExpiredListenAddr` variant.
-    let on_expired_listen_addr_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::ExpiredListenAddr(#expired_listen_addr {
-                        listener_id,
-                        addr,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::ExpiredListenAddr(#expired_listen_addr {
-                        listener_id,
-                        addr,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::NewExternalAddr` variant.
-    let on_new_external_addr_candidate_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::NewExternalAddrCandidate(#new_external_addr_candidate {
-                        addr,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::NewExternalAddrCandidate(#new_external_addr_candidate {
-                        addr,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ExternalAddrExpired` variant.
-    let on_external_addr_expired_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::ExternalAddrExpired(#external_addr_expired {
-                        addr,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::ExternalAddrExpired(#external_addr_expired {
-                        addr,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ExternalAddrConfirmed` variant.
-    let on_external_addr_confirmed_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::ExternalAddrConfirmed(#external_addr_confirmed {
-                        addr,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::ExternalAddrConfirmed(#external_addr_confirmed {
-                        addr,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ListenerError` variant.
-    let on_listener_error_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                    self.#i.on_swarm_event(#from_swarm::ListenerError(#listener_error {
-                        listener_id,
-                        err,
-                    }));
-                },
-                None => quote! {
-                    self.#field_n.on_swarm_event(#from_swarm::ListenerError(#listener_error {
-                        listener_id,
-                        err,
-                    }));
-                },
-            })
-    };
-
-    // Build the list of statements to put in the body of `on_swarm_event()`
-    // for the `FromSwarm::ListenerClosed` variant.
-    let on_listener_closed_stmts = {
-        data_struct
-            .fields
-            .iter()
-            .enumerate()
-            .map(|(field_n, field)| match field.ident {
-                Some(ref i) => quote! {
-                self.#i.on_swarm_event(#from_swarm::ListenerClosed(#listener_closed {
-                        listener_id,
-                        reason,
-                    }));
-                },
-                None => quote! {
-                self.#field_n.on_swarm_event(#from_swarm::ListenerClosed(#listener_closed {
-                        listener_id,
-                        reason,
-                    }));
+                    self.#field_n.on_swarm_event(event);
                 },
             })
     };
@@ -792,48 +481,7 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
             }
 
             fn on_swarm_event(&mut self, event: #from_swarm) {
-                match event {
-                    #from_swarm::ConnectionEstablished(
-                        #connection_established { peer_id, connection_id, endpoint, failed_addresses, other_established })
-                    => { #(#on_connection_established_stmts)* }
-                    #from_swarm::AddressChange(
-                        #address_change { peer_id, connection_id, old, new })
-                    => { #(#on_address_change_stmts)* }
-                    #from_swarm::ConnectionClosed(
-                        #connection_closed { peer_id, connection_id, endpoint, remaining_established })
-                    => { #(#on_connection_closed_stmts)* }
-                    #from_swarm::DialFailure(
-                        #dial_failure { peer_id, connection_id, error })
-                    => { #(#on_dial_failure_stmts)* }
-                    #from_swarm::ListenFailure(
-                        #listen_failure { local_addr, send_back_addr, connection_id, error })
-                    => { #(#on_listen_failure_stmts)* }
-                    #from_swarm::NewListener(
-                        #new_listener { listener_id })
-                    => { #(#on_new_listener_stmts)* }
-                    #from_swarm::NewListenAddr(
-                        #new_listen_addr { listener_id, addr })
-                    => { #(#on_new_listen_addr_stmts)* }
-                    #from_swarm::ExpiredListenAddr(
-                        #expired_listen_addr { listener_id, addr })
-                    => { #(#on_expired_listen_addr_stmts)* }
-                    #from_swarm::NewExternalAddrCandidate(
-                        #new_external_addr_candidate { addr })
-                    => { #(#on_new_external_addr_candidate_stmts)* }
-                    #from_swarm::ExternalAddrExpired(
-                        #external_addr_expired { addr })
-                    => { #(#on_external_addr_expired_stmts)* }
-                    #from_swarm::ExternalAddrConfirmed(
-                        #external_addr_confirmed { addr })
-                    => { #(#on_external_addr_confirmed_stmts)* }
-                    #from_swarm::ListenerError(
-                        #listener_error { listener_id, err })
-                    => { #(#on_listener_error_stmts)* }
-                    #from_swarm::ListenerClosed(
-                        #listener_closed { listener_id, reason })
-                    => { #(#on_listener_closed_stmts)* }
-                    _ => {}
-                }
+                #(#on_swarm_event_stmts)*
             }
         }
     };
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 48cafee6ced..65dce4b002a 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.44.1
+
+- Implement `Clone` & `Copy` for `FromSwarm.
+  This makes it easier to forward these events when wrapping other behaviours.
+  See [PR 4825](https://github.com/libp2p/rust-libp2p/pull/4825).
+
 ## 0.44.0
 
 - Add `#[non_exhaustive]` to `FromSwarm`, `ToSwarm`, `SwarmEvent`, `ConnectionHandlerEvent`, `ConnectionEvent`.
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3b706df6d2b..817e4b4855e 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.44.0"
+version = "0.44.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
index c25b14e75e3..4be129a4eea 100644
--- a/swarm/src/behaviour.rs
+++ b/swarm/src/behaviour.rs
@@ -391,7 +391,7 @@ pub enum CloseConnection {
 
 /// Enumeration with the list of the possible events
 /// to pass to [`on_swarm_event`](NetworkBehaviour::on_swarm_event).
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 #[non_exhaustive]
 pub enum FromSwarm<'a> {
     /// Informs the behaviour about a newly established connection to a peer.
@@ -449,7 +449,7 @@ pub struct ConnectionEstablished<'a> {
 /// This event is always paired with an earlier
 /// [`FromSwarm::ConnectionEstablished`] with the same peer ID, connection ID
 /// and endpoint.
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 pub struct ConnectionClosed<'a> {
     pub peer_id: PeerId,
     pub connection_id: ConnectionId,
diff --git a/swarm/src/test.rs b/swarm/src/test.rs
index 4f6adfc37b0..547277550bb 100644
--- a/swarm/src/test.rs
+++ b/swarm/src/test.rs
@@ -437,6 +437,8 @@ where
     }
 
     fn on_swarm_event(&mut self, event: FromSwarm) {
+        self.inner.on_swarm_event(event);
+
         match event {
             FromSwarm::ConnectionEstablished(connection_established) => {
                 self.on_connection_established(connection_established)
@@ -444,68 +446,33 @@ where
             FromSwarm::ConnectionClosed(connection_closed) => {
                 self.on_connection_closed(connection_closed)
             }
-            FromSwarm::DialFailure(DialFailure {
-                peer_id,
-                connection_id,
-                error,
-            }) => {
+            FromSwarm::DialFailure(DialFailure { peer_id, .. }) => {
                 self.on_dial_failure.push(peer_id);
-                self.inner
-                    .on_swarm_event(FromSwarm::DialFailure(DialFailure {
-                        peer_id,
-                        connection_id,
-                        error,
-                    }));
             }
             FromSwarm::NewListener(NewListener { listener_id }) => {
                 self.on_new_listener.push(listener_id);
-                self.inner
-                    .on_swarm_event(FromSwarm::NewListener(NewListener { listener_id }));
             }
             FromSwarm::NewListenAddr(NewListenAddr { listener_id, addr }) => {
                 self.on_new_listen_addr.push((listener_id, addr.clone()));
-                self.inner
-                    .on_swarm_event(FromSwarm::NewListenAddr(NewListenAddr {
-                        listener_id,
-                        addr,
-                    }));
             }
             FromSwarm::ExpiredListenAddr(ExpiredListenAddr { listener_id, addr }) => {
                 self.on_expired_listen_addr
                     .push((listener_id, addr.clone()));
-                self.inner
-                    .on_swarm_event(FromSwarm::ExpiredListenAddr(ExpiredListenAddr {
-                        listener_id,
-                        addr,
-                    }));
             }
             FromSwarm::NewExternalAddrCandidate(NewExternalAddrCandidate { addr }) => {
                 self.on_new_external_addr.push(addr.clone());
-                self.inner
-                    .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
-                        NewExternalAddrCandidate { addr },
-                    ));
             }
             FromSwarm::ExternalAddrExpired(ExternalAddrExpired { addr }) => {
                 self.on_expired_external_addr.push(addr.clone());
-                self.inner
-                    .on_swarm_event(FromSwarm::ExternalAddrExpired(ExternalAddrExpired { addr }));
             }
-            FromSwarm::ListenerError(ListenerError { listener_id, err }) => {
+            FromSwarm::ListenerError(ListenerError { listener_id, .. }) => {
                 self.on_listener_error.push(listener_id);
-                self.inner
-                    .on_swarm_event(FromSwarm::ListenerError(ListenerError { listener_id, err }));
             }
             FromSwarm::ListenerClosed(ListenerClosed {
                 listener_id,
                 reason,
             }) => {
                 self.on_listener_closed.push((listener_id, reason.is_ok()));
-                self.inner
-                    .on_swarm_event(FromSwarm::ListenerClosed(ListenerClosed {
-                        listener_id,
-                        reason,
-                    }));
             }
             _ => {}
         }

From 2b289703f14282135460bf9b99a80906f8e05629 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 05:45:41 +0000
Subject: [PATCH 002/455] deps: bump wasm-bindgen-futures from 0.4.38 to 0.4.39

Pull-Request: #4946.
---
 Cargo.lock                                | 4 ++--
 examples/browser-webrtc/Cargo.toml        | 2 +-
 swarm/Cargo.toml                          | 2 +-
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f61f94c09a7..fc9bf4cab50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6260,9 +6260,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
 dependencies = [
  "cfg-if",
  "js-sys",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 57232abeb5e..f242d7977bc 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -39,7 +39,7 @@ libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "was
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
 wasm-bindgen = "0.2.89"
-wasm-bindgen-futures = "0.4.38"
+wasm-bindgen-futures = "0.4.39"
 web-sys = { version = "0.3", features = ['Document', 'Element', 'HtmlElement', 'Node', 'Response', 'Window'] }
 
 [lints]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 817e4b4855e..1f5ce9fc08f 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8"
 smallvec = "1.11.2"
 tracing = "0.1.37"
 void = "1"
-wasm-bindgen-futures = { version = "0.4.38", optional = true }
+wasm-bindgen-futures = { version = "0.4.39", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index a5eb8f0b14d..5b2d18ad360 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -26,7 +26,7 @@ serde = { version = "1.0", features = ["derive"] }
 thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.89" }
-wasm-bindgen-futures = { version = "0.4.38" }
+wasm-bindgen-futures = { version = "0.4.39" }
 web-sys = { version = "0.3.65", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [dev-dependencies]
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index d21730e42c4..e1dbba224c9 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -25,7 +25,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.50"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.89"
-wasm-bindgen-futures = "0.4.38"
+wasm-bindgen-futures = "0.4.39"
 web-sys = { version = "0.3.65", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 8d775b6c2fb..32fa16444a4 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-webtransport-websys = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.89"
-wasm-bindgen-futures = "0.4.38"
+wasm-bindgen-futures = "0.4.39"
 wasm-bindgen-test = "0.3.38"
 web-sys = { version = "0.3.65", features = ["Response", "Window"] }
 

From 111f9b1df786201883f783432ba01eee9c8e177d Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Mon, 4 Dec 2023 01:18:46 -0500
Subject: [PATCH 003/455] feat(connection-limit): add function to mutate
 `ConnectionLimits`

Resolves: #4826.

Pull-Request: #4964.
---
 Cargo.lock                          | 2 +-
 Cargo.toml                          | 2 +-
 misc/connection-limits/CHANGELOG.md | 5 +++++
 misc/connection-limits/Cargo.toml   | 2 +-
 misc/connection-limits/src/lib.rs   | 6 ++++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc9bf4cab50..c7a5775b18f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-connection-limits"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "async-std",
  "libp2p-core",
diff --git a/Cargo.toml b/Cargo.toml
index 00aa66625cb..11ac47b0be4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ futures-bounded = { version = "0.2.3", path = "misc/futures-bounded" }
 libp2p = { version = "0.53.2", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
-libp2p-connection-limits = { version = "0.3.0", path = "misc/connection-limits" }
+libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
 libp2p-core = { version = "0.41.2", path = "core" }
 libp2p-dcutr = { version = "0.11.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
diff --git a/misc/connection-limits/CHANGELOG.md b/misc/connection-limits/CHANGELOG.md
index a5b68a6f51b..4654281a83e 100644
--- a/misc/connection-limits/CHANGELOG.md
+++ b/misc/connection-limits/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.1
+
+- Add function to mutate `ConnectionLimits`.
+  See [PR 4964](https://github.com/libp2p/rust-libp2p/pull/4964).
+
 ## 0.3.0
 
 
diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml
index 2aa26ad44f1..8ecb0005cb1 100644
--- a/misc/connection-limits/Cargo.toml
+++ b/misc/connection-limits/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-connection-limits"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Connection limits for libp2p."
-version = "0.3.0"
+version = "0.3.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/connection-limits/src/lib.rs b/misc/connection-limits/src/lib.rs
index cb12599ad79..dbe68a8ad11 100644
--- a/misc/connection-limits/src/lib.rs
+++ b/misc/connection-limits/src/lib.rs
@@ -79,6 +79,12 @@ impl Behaviour {
             established_per_peer: Default::default(),
         }
     }
+
+    /// Returns a mutable reference to [`ConnectionLimits`].
+    /// > **Note**: A new limit will not be enforced against existing connections.
+    pub fn limits_mut(&mut self) -> &mut ConnectionLimits {
+        &mut self.limits
+    }
 }
 
 fn check_limit(limit: Option<u32>, current: usize, kind: Kind) -> Result<(), ConnectionDenied> {

From 1361ead01a4c05cb0f6dae54d1cd68dc1259482a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 08:17:40 +0000
Subject: [PATCH 004/455] deps: bump web-sys from 0.3.65 to 0.3.66

Pull-Request: #4976.
---
 Cargo.lock                                | 4 ++--
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c7a5775b18f..f102b3a40c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6337,9 +6337,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 5b2d18ad360..11dab48ea53 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -27,7 +27,7 @@ thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.89" }
 wasm-bindgen-futures = { version = "0.4.39" }
-web-sys = { version = "0.3.65", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
+web-sys = { version = "0.3.66", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [dev-dependencies]
 hex-literal = "0.4"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index b0493533e26..568bd22e20e 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
 thiserror = "1.0.50"
 wasm-bindgen = "0.2.89"
-web-sys = { version = "0.3.65", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
+web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index e1dbba224c9..96afd159ff8 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1.0.50"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"
-web-sys = { version = "0.3.65", features = [
+web-sys = { version = "0.3.66", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
     "WebTransportBidirectionalStream",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 32fa16444a4..2f28e160a03 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -20,7 +20,7 @@ multihash = { workspace = true }
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"
 wasm-bindgen-test = "0.3.38"
-web-sys = { version = "0.3.65", features = ["Response", "Window"] }
+web-sys = { version = "0.3.66", features = ["Response", "Window"] }
 
 [lints]
 workspace = true

From 0f98c98ca3aff66a2a53f8dfbe7106cf3e6fde1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 03:38:23 +0000
Subject: [PATCH 005/455] deps: bump wasm-bindgen-test from 0.3.38 to 0.3.39

Pull-Request: #4975.
---
 Cargo.lock                               | 8 ++++----
 wasm-tests/webtransport-tests/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f102b3a40c8..2fbf628713b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6301,9 +6301,9 @@ checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.38"
+version = "0.3.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d"
+checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -6315,9 +6315,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.38"
+version = "0.3.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735"
+checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 2f28e160a03..d8c11b646f1 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -19,7 +19,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"
-wasm-bindgen-test = "0.3.38"
+wasm-bindgen-test = "0.3.39"
 web-sys = { version = "0.3.66", features = ["Response", "Window"] }
 
 [lints]

From f12dabcde60eb67e1e8a714b7a7faa2305ba74b8 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 6 Dec 2023 07:27:46 +1100
Subject: [PATCH 006/455] fix(kad): don't assume `QuerId`s are unique

We mistakenly assumed that `QueryId`s are unique in that, only a single request will be emitted per `QueryId`. This is wrong. A bootstrap for example will issue multiple requests as part of the same `QueryId`. Thus, we cannot use the `QueryId` as a key for the `FuturesMap`. Instead, we use a `FuturesTupleSet` to associate the `QueryId` with the in-flight request.

Related: #4901.
Resolves: #4948.

Pull-Request: #4971.
---
 protocols/kad/src/handler.rs | 67 +++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
index 318261d8d21..5e7c2e21b8b 100644
--- a/protocols/kad/src/handler.rs
+++ b/protocols/kad/src/handler.rs
@@ -60,7 +60,8 @@ pub struct Handler {
     next_connec_unique_id: UniqueConnecId,
 
     /// List of active outbound streams.
-    outbound_substreams: futures_bounded::FuturesMap<QueryId, io::Result<Option<KadResponseMsg>>>,
+    outbound_substreams:
+        futures_bounded::FuturesTupleSet<io::Result<Option<KadResponseMsg>>, QueryId>,
 
     /// Contains one [`oneshot::Sender`] per outbound stream that we have requested.
     pending_streams:
@@ -453,7 +454,7 @@ impl Handler {
             remote_peer_id,
             next_connec_unique_id: UniqueConnecId(0),
             inbound_substreams: Default::default(),
-            outbound_substreams: futures_bounded::FuturesMap::new(
+            outbound_substreams: futures_bounded::FuturesTupleSet::new(
                 Duration::from_secs(10),
                 MAX_NUM_STREAMS,
             ),
@@ -552,32 +553,36 @@ impl Handler {
         let (sender, receiver) = oneshot::channel();
 
         self.pending_streams.push_back(sender);
-        let result = self.outbound_substreams.try_push(id, async move {
-            let mut stream = receiver
-                .await
-                .map_err(|_| io::Error::from(io::ErrorKind::BrokenPipe))?
-                .map_err(|e| match e {
-                    StreamUpgradeError::Timeout => io::ErrorKind::TimedOut.into(),
-                    StreamUpgradeError::Apply(e) => e,
-                    StreamUpgradeError::NegotiationFailed => {
-                        io::Error::new(io::ErrorKind::ConnectionRefused, "protocol not supported")
-                    }
-                    StreamUpgradeError::Io(e) => e,
-                })?;
-
-            let has_answer = !matches!(msg, KadRequestMsg::AddProvider { .. });
-
-            stream.send(msg).await?;
-            stream.close().await?;
-
-            if !has_answer {
-                return Ok(None);
-            }
+        let result = self.outbound_substreams.try_push(
+            async move {
+                let mut stream = receiver
+                    .await
+                    .map_err(|_| io::Error::from(io::ErrorKind::BrokenPipe))?
+                    .map_err(|e| match e {
+                        StreamUpgradeError::Timeout => io::ErrorKind::TimedOut.into(),
+                        StreamUpgradeError::Apply(e) => e,
+                        StreamUpgradeError::NegotiationFailed => io::Error::new(
+                            io::ErrorKind::ConnectionRefused,
+                            "protocol not supported",
+                        ),
+                        StreamUpgradeError::Io(e) => e,
+                    })?;
+
+                let has_answer = !matches!(msg, KadRequestMsg::AddProvider { .. });
+
+                stream.send(msg).await?;
+                stream.close().await?;
+
+                if !has_answer {
+                    return Ok(None);
+                }
 
-            let msg = stream.next().await.ok_or(io::ErrorKind::UnexpectedEof)??;
+                let msg = stream.next().await.ok_or(io::ErrorKind::UnexpectedEof)??;
 
-            Ok(Some(msg))
-        });
+                Ok(Some(msg))
+            },
+            id,
+        );
 
         debug_assert!(
             result.is_ok(),
@@ -728,15 +733,15 @@ impl ConnectionHandler for Handler {
             }
 
             match self.outbound_substreams.poll_unpin(cx) {
-                Poll::Ready((query, Ok(Ok(Some(response))))) => {
+                Poll::Ready((Ok(Ok(Some(response))), query_id)) => {
                     return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                        process_kad_response(response, query),
+                        process_kad_response(response, query_id),
                     ))
                 }
-                Poll::Ready((_, Ok(Ok(None)))) => {
+                Poll::Ready((Ok(Ok(None)), _)) => {
                     continue;
                 }
-                Poll::Ready((query_id, Ok(Err(e)))) => {
+                Poll::Ready((Ok(Err(e)), query_id)) => {
                     return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
                         HandlerEvent::QueryError {
                             error: HandlerQueryErr::Io(e),
@@ -744,7 +749,7 @@ impl ConnectionHandler for Handler {
                         },
                     ))
                 }
-                Poll::Ready((query_id, Err(_timeout))) => {
+                Poll::Ready((Err(_timeout), query_id)) => {
                     return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
                         HandlerEvent::QueryError {
                             error: HandlerQueryErr::Io(io::ErrorKind::TimedOut.into()),

From 0f28528d16ff0309da5d56baa74c6ad77583c5a0 Mon Sep 17 00:00:00 2001
From: Doug A <douganderson444@gmail.com>
Date: Tue, 5 Dec 2023 19:40:06 -0400
Subject: [PATCH 007/455] fix(webrtc example): clarify idle connection timeout

When I ran the `example/browser-webrtc` example I discovered it would break after a ping or two.
The `Ping` idle timeout needed to be extended, on both the server and the wasm client, which is what this PR fixes.
I also added a small note to the README about ensuring `wasm-pack` is install for the users who are new to the ecosystem.

Fixes: #4950.

Pull-Request: #4966.
---
 examples/browser-webrtc/README.md   |  2 ++
 examples/browser-webrtc/src/lib.rs  | 21 +++++++++++++++++++--
 examples/browser-webrtc/src/main.rs |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/examples/browser-webrtc/README.md b/examples/browser-webrtc/README.md
index d44cf879905..eec2c9c0494 100644
--- a/examples/browser-webrtc/README.md
+++ b/examples/browser-webrtc/README.md
@@ -5,6 +5,8 @@ It uses [wasm-pack](https://rustwasm.github.io/docs/wasm-pack/) to build the pro
 
 ## Running the example
 
+Ensure you have `wasm-pack` [installed](https://rustwasm.github.io/wasm-pack/).
+
 1. Build the client library:
 ```shell
 wasm-pack build --target web --out-dir static
diff --git a/examples/browser-webrtc/src/lib.rs b/examples/browser-webrtc/src/lib.rs
index 2112919c6de..9499ccbd158 100644
--- a/examples/browser-webrtc/src/lib.rs
+++ b/examples/browser-webrtc/src/lib.rs
@@ -15,8 +15,13 @@ use web_sys::{Document, HtmlElement};
 pub async fn run(libp2p_endpoint: String) -> Result<(), JsError> {
     tracing_wasm::set_as_global_default();
 
+    let ping_duration = Duration::from_secs(30);
+
     let body = Body::from_current_window()?;
-    body.append_p("Let's ping the WebRTC Server!")?;
+    body.append_p(&format!(
+        "Let's ping the rust-libp2p server over WebRTC for {:?}:",
+        ping_duration
+    ))?;
 
     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
         .with_wasm_bindgen()
@@ -24,7 +29,7 @@ pub async fn run(libp2p_endpoint: String) -> Result<(), JsError> {
             webrtc_websys::Transport::new(webrtc_websys::Config::new(&key))
         })?
         .with_behaviour(|_| ping::Behaviour::new(ping::Config::new()))?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
+        .with_swarm_config(|c| c.with_idle_connection_timeout(ping_duration))
         .build();
 
     let addr = libp2p_endpoint.parse::<Multiaddr>()?;
@@ -46,6 +51,18 @@ pub async fn run(libp2p_endpoint: String) -> Result<(), JsError> {
                 tracing::info!("Ping successful: RTT: {rtt:?}, from {peer}");
                 body.append_p(&format!("RTT: {rtt:?} at {}", Date::new_0().to_string()))?;
             }
+            SwarmEvent::ConnectionClosed {
+                cause: Some(cause), ..
+            } => {
+                tracing::info!("Swarm event: {:?}", cause);
+
+                if let libp2p::swarm::ConnectionError::KeepAliveTimeout = cause {
+                    body.append_p("All done with pinging! ")?;
+
+                    break;
+                }
+                body.append_p(&format!("Connection closed due to: {:?}", cause))?;
+            }
             evt => tracing::info!("Swarm event: {:?}", evt),
         }
     }
diff --git a/examples/browser-webrtc/src/main.rs b/examples/browser-webrtc/src/main.rs
index 098b70f3054..3fbc8cfec0e 100644
--- a/examples/browser-webrtc/src/main.rs
+++ b/examples/browser-webrtc/src/main.rs
@@ -38,7 +38,7 @@ async fn main() -> anyhow::Result<()> {
         .with_behaviour(|_| ping::Behaviour::default())?
         .with_swarm_config(|cfg| {
             cfg.with_idle_connection_timeout(
-                Duration::from_secs(30), // Allows us to observe the pings.
+                Duration::from_secs(u64::MAX), // Allows us to observe the pings.
             )
         })
         .build();

From 06d80fbb7478c05908ee97106b8045628d761548 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:49:16 +0100
Subject: [PATCH 008/455] docs(examples/readme): fix broken link

Related: #3536.

Pull-Request: #4984.
---
 examples/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/README.md b/examples/README.md
index 28e085587b7..0a3e55aed39 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -20,6 +20,6 @@ A set of examples showcasing how to use rust-libp2p.
 
 - [IPFS Private](./ipfs-private) Implementation using the gossipsub, ping and identify protocols to implement the ipfs private swarms feature.
 
-- [Ping](./ping) Small `ping` clone, sending a ping to a peer, expecting a pong as a response. See [tutorial](../src/tutorials/ping.rs) for a step-by-step guide building the example.
+- [Ping](./ping) Small `ping` clone, sending a ping to a peer, expecting a pong as a response. See [tutorial](../libp2p/src/tutorials/ping.rs) for a step-by-step guide building the example.
 
 - [Rendezvous](./rendezvous) Rendezvous Protocol. See [specs](https://github.com/libp2p/specs/blob/master/rendezvous/README.md).

From f40cc4e58ba9732af126c23c48bf77ff8db3fe0f Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Wed, 6 Dec 2023 19:23:24 +0100
Subject: [PATCH 009/455] feat(yamux): auto-tune (dynamic) stream receive
 window

https://github.com/libp2p/rust-yamux/pull/176 enables auto-tuning for the Yamux stream receive window. While preserving small buffers on low-latency and/or low-bandwidth connections, this change allows for high-latency and/or high-bandwidth connections to exhaust the available bandwidth on a single stream.

Using the [libp2p perf](https://github.com/libp2p/test-plans/blob/master/perf/README.md) benchmark tools (60ms, 10Gbit/s) shows an **improvement from 33 Mbit/s to 1.3 Gbit/s** in single stream throughput.

See https://github.com/libp2p/rust-yamux/pull/176 for details.

To ship the above Rust Yamux change in a libp2p patch release (non-breaking), this pull request uses `yamux` `v0.13` (new version) by default and falls back to `yamux` `v0.12` (old version) when setting any configuration options. Thus default users benefit from the increased performance, while power users with custom configurations maintain the old behavior.

Pull-Request: #4970.
---
 Cargo.lock                |  20 +++-
 muxers/yamux/CHANGELOG.md |   6 ++
 muxers/yamux/Cargo.toml   |   4 +-
 muxers/yamux/src/lib.rs   | 214 +++++++++++++++++++++++++++-----------
 4 files changed, 184 insertions(+), 60 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fbf628713b..f510267ca06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3372,12 +3372,14 @@ name = "libp2p-yamux"
 version = "0.45.1"
 dependencies = [
  "async-std",
+ "either",
  "futures",
  "libp2p-core",
  "libp2p-muxer-test-harness",
  "thiserror",
  "tracing",
- "yamux",
+ "yamux 0.12.1",
+ "yamux 0.13.1",
 ]
 
 [[package]]
@@ -6862,6 +6864,22 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "yamux"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1d0148b89300047e72994bee99ecdabd15a9166a7b70c8b8c37c314dcc9002"
+dependencies = [
+ "futures",
+ "instant",
+ "log",
+ "nohash-hasher",
+ "parking_lot",
+ "pin-project",
+ "rand 0.8.5",
+ "static_assertions",
+]
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
diff --git a/muxers/yamux/CHANGELOG.md b/muxers/yamux/CHANGELOG.md
index c8534166ea6..de608b195f8 100644
--- a/muxers/yamux/CHANGELOG.md
+++ b/muxers/yamux/CHANGELOG.md
@@ -4,6 +4,12 @@
   It does not enforce flow-control, i.e. breaks backpressure.
   Use `WindowUpdateMode::on_read` instead.
   See `yamux` crate version `v0.12.1` and [Yamux PR #177](https://github.com/libp2p/rust-yamux/pull/177).
+- `yamux` `v0.13` enables auto-tuning for the Yamux stream receive window.
+  While preserving small buffers on low-latency and/or low-bandwidth connections, this change allows for high-latency and/or high-bandwidth connections to exhaust the available bandwidth on a single stream.
+  Have `libp2p-yamux` use `yamux` `v0.13` (new version) by default and fall back to `yamux` `v0.12` (old version) when setting any configuration options.
+  Thus default users benefit from the increased performance, while power users with custom configurations maintain the old behavior.
+  `libp2p-yamux` will switch over to `yamux` `v0.13` entirely with the next breaking release.
+  See [PR 4970](https://github.com/libp2p/rust-libp2p/pull/4970).
 
 ## 0.45.0
 
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 1456238121b..36601ae56af 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -11,10 +11,12 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
+either = "1"
 futures = "0.3.29"
 libp2p-core = { workspace = true }
 thiserror = "1.0"
-yamux = "0.12"
+yamux012 = { version = "0.12.1", package = "yamux" }
+yamux013 = { version = "0.13.1", package = "yamux" }
 tracing = "0.1.37"
 
 [dev-dependencies]
diff --git a/muxers/yamux/src/lib.rs b/muxers/yamux/src/lib.rs
index fc7ff430396..2b5eb52a11e 100644
--- a/muxers/yamux/src/lib.rs
+++ b/muxers/yamux/src/lib.rs
@@ -22,6 +22,7 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
+use either::Either;
 use futures::{future, prelude::*, ready};
 use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
 use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo};
@@ -34,15 +35,14 @@ use std::{
     task::{Context, Poll},
 };
 use thiserror::Error;
-use yamux::ConnectionError;
 
 /// A Yamux connection.
 #[derive(Debug)]
 pub struct Muxer<C> {
-    connection: yamux::Connection<C>,
+    connection: Either<yamux012::Connection<C>, yamux013::Connection<C>>,
     /// Temporarily buffers inbound streams in case our node is performing backpressure on the remote.
     ///
-    /// The only way how yamux can make progress is by calling [`yamux::Connection::poll_next_inbound`]. However, the
+    /// The only way how yamux can make progress is by calling [`yamux013::Connection::poll_next_inbound`]. However, the
     /// [`StreamMuxer`] interface is designed to allow a caller to selectively make progress via
     /// [`StreamMuxer::poll_inbound`] and [`StreamMuxer::poll_outbound`] whilst the more general
     /// [`StreamMuxer::poll`] is designed to make progress on existing streams etc.
@@ -65,9 +65,9 @@ where
     C: AsyncRead + AsyncWrite + Send + Unpin + 'static,
 {
     /// Create a new Yamux connection.
-    fn new(io: C, cfg: yamux::Config, mode: yamux::Mode) -> Self {
+    fn new(connection: Either<yamux012::Connection<C>, yamux013::Connection<C>>) -> Self {
         Muxer {
-            connection: yamux::Connection::new(io, cfg, mode),
+            connection,
             inbound_stream_buffer: VecDeque::default(),
             inbound_stream_waker: None,
         }
@@ -103,16 +103,23 @@ where
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Result<Self::Substream, Self::Error>> {
-        let stream = ready!(self.connection.poll_new_outbound(cx).map_err(Error)?);
-
-        Poll::Ready(Ok(Stream(stream)))
+        let stream = match self.connection.as_mut() {
+            Either::Left(c) => ready!(c.poll_new_outbound(cx))
+                .map_err(|e| Error(Either::Left(e)))
+                .map(|s| Stream(Either::Left(s))),
+            Either::Right(c) => ready!(c.poll_new_outbound(cx))
+                .map_err(|e| Error(Either::Right(e)))
+                .map(|s| Stream(Either::Right(s))),
+        }?;
+        Poll::Ready(Ok(stream))
     }
 
     #[tracing::instrument(level = "trace", name = "StreamMuxer::poll_close", skip(self, cx))]
     fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        ready!(self.connection.poll_close(cx).map_err(Error)?);
-
-        Poll::Ready(Ok(()))
+        match self.connection.as_mut() {
+            Either::Left(c) => c.poll_close(cx).map_err(|e| Error(Either::Left(e))),
+            Either::Right(c) => c.poll_close(cx).map_err(|e| Error(Either::Right(e))),
+        }
     }
 
     #[tracing::instrument(level = "trace", name = "StreamMuxer::poll", skip(self, cx))]
@@ -146,7 +153,7 @@ where
 
 /// A stream produced by the yamux multiplexer.
 #[derive(Debug)]
-pub struct Stream(yamux::Stream);
+pub struct Stream(Either<yamux012::Stream, yamux013::Stream>);
 
 impl AsyncRead for Stream {
     fn poll_read(
@@ -154,7 +161,7 @@ impl AsyncRead for Stream {
         cx: &mut Context<'_>,
         buf: &mut [u8],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_read(cx, buf)
+        either::for_both!(self.0.as_mut(), s => Pin::new(s).poll_read(cx, buf))
     }
 
     fn poll_read_vectored(
@@ -162,7 +169,7 @@ impl AsyncRead for Stream {
         cx: &mut Context<'_>,
         bufs: &mut [IoSliceMut<'_>],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_read_vectored(cx, bufs)
+        either::for_both!(self.0.as_mut(), s => Pin::new(s).poll_read_vectored(cx, bufs))
     }
 }
 
@@ -172,7 +179,7 @@ impl AsyncWrite for Stream {
         cx: &mut Context<'_>,
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_write(cx, buf)
+        either::for_both!(self.0.as_mut(), s => Pin::new(s).poll_write(cx, buf))
     }
 
     fn poll_write_vectored(
@@ -180,15 +187,15 @@ impl AsyncWrite for Stream {
         cx: &mut Context<'_>,
         bufs: &[IoSlice<'_>],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.0).poll_write_vectored(cx, bufs)
+        either::for_both!(self.0.as_mut(), s => Pin::new(s).poll_write_vectored(cx, bufs))
     }
 
     fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut self.0).poll_flush(cx)
+        either::for_both!(self.0.as_mut(), s => Pin::new(s).poll_flush(cx))
     }
 
     fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut self.0).poll_close(cx)
+        either::for_both!(self.0.as_mut(), s => Pin::new(s).poll_close(cx))
     }
 }
 
@@ -197,11 +204,16 @@ where
     C: AsyncRead + AsyncWrite + Unpin + 'static,
 {
     fn poll_inner(&mut self, cx: &mut Context<'_>) -> Poll<Result<Stream, Error>> {
-        let stream = ready!(self.connection.poll_next_inbound(cx))
-            .transpose()
-            .map_err(Error)?
-            .map(Stream)
-            .ok_or(Error(ConnectionError::Closed))?;
+        let stream = match self.connection.as_mut() {
+            Either::Left(c) => ready!(c.poll_next_inbound(cx))
+                .ok_or(Error(Either::Left(yamux012::ConnectionError::Closed)))?
+                .map_err(|e| Error(Either::Left(e)))
+                .map(|s| Stream(Either::Left(s)))?,
+            Either::Right(c) => ready!(c.poll_next_inbound(cx))
+                .ok_or(Error(Either::Right(yamux013::ConnectionError::Closed)))?
+                .map_err(|e| Error(Either::Right(e)))
+                .map(|s| Stream(Either::Right(s)))?,
+        };
 
         Poll::Ready(Ok(stream))
     }
@@ -209,14 +221,33 @@ where
 
 /// The yamux configuration.
 #[derive(Debug, Clone)]
-pub struct Config {
-    inner: yamux::Config,
-    mode: Option<yamux::Mode>,
+pub struct Config(Either<Config012, Config013>);
+
+impl Default for Config {
+    fn default() -> Self {
+        Self(Either::Right(Config013::default()))
+    }
+}
+
+#[derive(Debug, Clone)]
+struct Config012 {
+    inner: yamux012::Config,
+    mode: Option<yamux012::Mode>,
+}
+
+impl Default for Config012 {
+    fn default() -> Self {
+        let mut inner = yamux012::Config::default();
+        // For conformity with mplex, read-after-close on a multiplexed
+        // connection is never permitted and not configurable.
+        inner.set_read_after_close(false);
+        Self { inner, mode: None }
+    }
 }
 
 /// The window update mode determines when window updates are
 /// sent to the remote, giving it new credit to send more data.
-pub struct WindowUpdateMode(yamux::WindowUpdateMode);
+pub struct WindowUpdateMode(yamux012::WindowUpdateMode);
 
 impl WindowUpdateMode {
     /// The window update mode whereby the remote is given
@@ -234,7 +265,7 @@ impl WindowUpdateMode {
     #[deprecated(note = "Use `WindowUpdateMode::on_read` instead.")]
     pub fn on_receive() -> Self {
         #[allow(deprecated)]
-        WindowUpdateMode(yamux::WindowUpdateMode::OnReceive)
+        WindowUpdateMode(yamux012::WindowUpdateMode::OnReceive)
     }
 
     /// The window update mode whereby the remote is given new
@@ -252,62 +283,71 @@ impl WindowUpdateMode {
     /// > **Note**: With this strategy, there is usually no point in the
     /// > receive buffer being larger than the window size.
     pub fn on_read() -> Self {
-        WindowUpdateMode(yamux::WindowUpdateMode::OnRead)
+        WindowUpdateMode(yamux012::WindowUpdateMode::OnRead)
     }
 }
 
 impl Config {
     /// Creates a new `YamuxConfig` in client mode, regardless of whether
     /// it will be used for an inbound or outbound upgrade.
+    #[deprecated(note = "Will be removed with the next breaking release.")]
     pub fn client() -> Self {
-        Self {
-            mode: Some(yamux::Mode::Client),
+        Self(Either::Left(Config012 {
+            mode: Some(yamux012::Mode::Client),
             ..Default::default()
-        }
+        }))
     }
 
     /// Creates a new `YamuxConfig` in server mode, regardless of whether
     /// it will be used for an inbound or outbound upgrade.
+    #[deprecated(note = "Will be removed with the next breaking release.")]
     pub fn server() -> Self {
-        Self {
-            mode: Some(yamux::Mode::Server),
+        Self(Either::Left(Config012 {
+            mode: Some(yamux012::Mode::Server),
             ..Default::default()
-        }
+        }))
     }
 
     /// Sets the size (in bytes) of the receive window per substream.
+    #[deprecated(
+        note = "Will be replaced in the next breaking release with a connection receive window size limit."
+    )]
     pub fn set_receive_window_size(&mut self, num_bytes: u32) -> &mut Self {
-        self.inner.set_receive_window(num_bytes);
-        self
+        self.set(|cfg| cfg.set_receive_window(num_bytes))
     }
 
     /// Sets the maximum size (in bytes) of the receive buffer per substream.
+    #[deprecated(note = "Will be removed with the next breaking release.")]
     pub fn set_max_buffer_size(&mut self, num_bytes: usize) -> &mut Self {
-        self.inner.set_max_buffer_size(num_bytes);
-        self
+        self.set(|cfg| cfg.set_max_buffer_size(num_bytes))
     }
 
     /// Sets the maximum number of concurrent substreams.
     pub fn set_max_num_streams(&mut self, num_streams: usize) -> &mut Self {
-        self.inner.set_max_num_streams(num_streams);
-        self
+        self.set(|cfg| cfg.set_max_num_streams(num_streams))
     }
 
     /// Sets the window update mode that determines when the remote
     /// is given new credit for sending more data.
+    #[deprecated(
+        note = "`WindowUpdate::OnRead` is the default. `WindowUpdate::OnReceive` breaks backpressure, is thus not recommended, and will be removed in the next breaking release. Thus this method becomes obsolete and will be removed with the next breaking release."
+    )]
     pub fn set_window_update_mode(&mut self, mode: WindowUpdateMode) -> &mut Self {
-        self.inner.set_window_update_mode(mode.0);
-        self
+        self.set(|cfg| cfg.set_window_update_mode(mode.0))
     }
-}
 
-impl Default for Config {
-    fn default() -> Self {
-        let mut inner = yamux::Config::default();
-        // For conformity with mplex, read-after-close on a multiplexed
-        // connection is never permitted and not configurable.
-        inner.set_read_after_close(false);
-        Config { inner, mode: None }
+    fn set(&mut self, f: impl FnOnce(&mut yamux012::Config) -> &mut yamux012::Config) -> &mut Self {
+        let cfg012 = match self.0.as_mut() {
+            Either::Left(c) => &mut c.inner,
+            Either::Right(_) => {
+                self.0 = Either::Left(Config012::default());
+                &mut self.0.as_mut().unwrap_left().inner
+            }
+        };
+
+        f(cfg012);
+
+        self
     }
 }
 
@@ -329,8 +369,18 @@ where
     type Future = future::Ready<Result<Self::Output, Self::Error>>;
 
     fn upgrade_inbound(self, io: C, _: Self::Info) -> Self::Future {
-        let mode = self.mode.unwrap_or(yamux::Mode::Server);
-        future::ready(Ok(Muxer::new(io, self.inner, mode)))
+        let connection = match self.0 {
+            Either::Left(Config012 { inner, mode }) => Either::Left(yamux012::Connection::new(
+                io,
+                inner,
+                mode.unwrap_or(yamux012::Mode::Server),
+            )),
+            Either::Right(Config013(cfg)) => {
+                Either::Right(yamux013::Connection::new(io, cfg, yamux013::Mode::Server))
+            }
+        };
+
+        future::ready(Ok(Muxer::new(connection)))
     }
 }
 
@@ -343,21 +393,69 @@ where
     type Future = future::Ready<Result<Self::Output, Self::Error>>;
 
     fn upgrade_outbound(self, io: C, _: Self::Info) -> Self::Future {
-        let mode = self.mode.unwrap_or(yamux::Mode::Client);
-        future::ready(Ok(Muxer::new(io, self.inner, mode)))
+        let connection = match self.0 {
+            Either::Left(Config012 { inner, mode }) => Either::Left(yamux012::Connection::new(
+                io,
+                inner,
+                mode.unwrap_or(yamux012::Mode::Client),
+            )),
+            Either::Right(Config013(cfg)) => {
+                Either::Right(yamux013::Connection::new(io, cfg, yamux013::Mode::Client))
+            }
+        };
+
+        future::ready(Ok(Muxer::new(connection)))
+    }
+}
+
+#[derive(Debug, Clone)]
+struct Config013(yamux013::Config);
+
+impl Default for Config013 {
+    fn default() -> Self {
+        let mut cfg = yamux013::Config::default();
+        // For conformity with mplex, read-after-close on a multiplexed
+        // connection is never permitted and not configurable.
+        cfg.set_read_after_close(false);
+        Self(cfg)
     }
 }
 
 /// The Yamux [`StreamMuxer`] error type.
 #[derive(Debug, Error)]
 #[error(transparent)]
-pub struct Error(yamux::ConnectionError);
+pub struct Error(Either<yamux012::ConnectionError, yamux013::ConnectionError>);
 
 impl From<Error> for io::Error {
     fn from(err: Error) -> Self {
         match err.0 {
-            yamux::ConnectionError::Io(e) => e,
-            e => io::Error::new(io::ErrorKind::Other, e),
+            Either::Left(err) => match err {
+                yamux012::ConnectionError::Io(e) => e,
+                e => io::Error::new(io::ErrorKind::Other, e),
+            },
+            Either::Right(err) => match err {
+                yamux013::ConnectionError::Io(e) => e,
+                e => io::Error::new(io::ErrorKind::Other, e),
+            },
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    #[test]
+    fn config_set_switches_to_v012() {
+        // By default we use yamux v0.13. Thus we provide the benefits of yamux v0.13 to all users
+        // that do not depend on any of the behaviors (i.e. configuration options) of v0.12.
+        let mut cfg = Config::default();
+        assert!(matches!(
+            cfg,
+            Config(Either::Right(Config013(yamux013::Config { .. })))
+        ));
+
+        // In case a user makes any configurations, use yamux v0.12 instead.
+        cfg.set_max_num_streams(42);
+        assert!(matches!(cfg, Config(Either::Left(Config012 { .. }))));
+    }
+}

From cfb248f5481f63b5b4571f8fb5eed8095afb3c1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:54:44 +0000
Subject: [PATCH 010/455] deps: bump actions/deploy-pages from 2 to 3

Pull-Request: #4978.
---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index bffcc60d2ea..87fb4732b6e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -42,5 +42,5 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v3
 

From 914c8aa45306e66b08f0f207a1d51893201f53f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 23:45:48 +0000
Subject: [PATCH 011/455] deps: bump the axum group with 2 updates

Pull-Request: #4943.
---
 Cargo.lock                          | 227 ++++++++++++++++++++++------
 examples/browser-webrtc/Cargo.toml  |   4 +-
 examples/browser-webrtc/src/main.rs |  11 +-
 interop-tests/Cargo.toml            |   4 +-
 interop-tests/src/bin/wasm_ping.rs  |   8 +-
 5 files changed, 200 insertions(+), 54 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f510267ca06..029b42d505b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -452,7 +452,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2"
 dependencies = [
- "http",
+ "http 0.2.9",
  "log",
  "url",
 ]
@@ -482,13 +482,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
- "axum-core",
+ "axum-core 0.3.4",
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8"
+dependencies = [
+ "async-trait",
+ "axum-core 0.4.0",
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.0.1",
+ "hyper-util",
  "itoa",
  "matchit",
  "memchr",
@@ -516,14 +545,34 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 0.2.9",
+ "http-body 0.4.5",
  "mime",
  "rustversion",
  "tower-layer",
  "tower-service",
 ]
 
+[[package]]
+name = "axum-core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.68"
@@ -661,7 +710,7 @@ name = "browser-webrtc-example"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.1",
  "futures",
  "js-sys",
  "libp2p",
@@ -1467,8 +1516,8 @@ dependencies = [
  "cookie",
  "futures-core",
  "futures-util",
- "http",
- "hyper",
+ "http 0.2.9",
+ "hyper 0.14.27",
  "hyper-rustls",
  "mime",
  "serde",
@@ -1827,7 +1876,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.9",
  "indexmap 1.9.3",
  "slab",
  "tokio",
@@ -1835,6 +1884,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 1.0.0",
+ "indexmap 2.0.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "1.8.2"
@@ -2010,6 +2078,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.5"
@@ -2017,15 +2096,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.9",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.0.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-range-header"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe"
 
 [[package]]
 name = "httparse"
@@ -2055,9 +2157,9 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.20",
+ "http 0.2.9",
+ "http-body 0.4.5",
  "httparse",
  "httpdate",
  "itoa",
@@ -2069,14 +2171,33 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.0",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
- "http",
- "hyper",
+ "http 0.2.9",
+ "hyper 0.14.27",
  "log",
  "rustls 0.20.8",
  "rustls-native-certs",
@@ -2090,7 +2211,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper",
+ "hyper 0.14.27",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2103,12 +2224,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.27",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "hyper-util"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "hyper 1.0.1",
+ "pin-project-lite",
+ "socket2 0.5.5",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "identify-example"
 version = "0.1.0"
@@ -2181,8 +2322,8 @@ dependencies = [
  "attohttpc",
  "bytes",
  "futures",
- "http",
- "hyper",
+ "http 0.2.9",
+ "hyper 0.14.27",
  "log",
  "rand 0.8.5",
  "tokio",
@@ -2256,7 +2397,7 @@ name = "interop-tests"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.1",
  "console_error_panic_hook",
  "either",
  "futures",
@@ -3092,7 +3233,7 @@ dependencies = [
  "clap",
  "futures",
  "futures-timer",
- "hyper",
+ "hyper 0.14.27",
  "libp2p",
  "prometheus-client",
  "serde",
@@ -3554,7 +3695,7 @@ name = "metrics-example"
 version = "0.1.0"
 dependencies = [
  "futures",
- "hyper",
+ "hyper 0.14.27",
  "libp2p",
  "opentelemetry",
  "opentelemetry-otlp",
@@ -3952,7 +4093,7 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
 dependencies = [
  "async-trait",
  "futures-core",
- "http",
+ "http 0.2.9",
  "opentelemetry-proto",
  "opentelemetry-semantic-conventions",
  "opentelemetry_api",
@@ -4713,10 +4854,10 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.20",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -5598,7 +5739,7 @@ dependencies = [
  "cookie",
  "fantoccini",
  "futures",
- "http",
+ "http 0.2.9",
  "indexmap 1.9.3",
  "log",
  "parking_lot",
@@ -5801,15 +5942,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
 dependencies = [
  "async-trait",
- "axum",
+ "axum 0.6.20",
  "base64 0.21.5",
  "bytes",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.20",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -5844,16 +5985,16 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d"
 dependencies = [
  "bitflags 2.4.1",
  "bytes",
- "futures-core",
  "futures-util",
- "http",
- "http-body",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
  "http-range-header",
  "httpdate",
  "mime",
@@ -6356,7 +6497,7 @@ dependencies = [
  "base64 0.13.1",
  "bytes",
  "cookie",
- "http",
+ "http 0.2.9",
  "log",
  "serde",
  "serde_derive",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index f242d7977bc..b22713fd00e 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -23,14 +23,14 @@ tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-axum = "0.6.19"
+axum = "0.7.1"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.0.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { version = "1.34", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
-tower-http = { version = "0.4.0", features = ["cors"] }
+tower-http = { version = "0.5.0", features = ["cors"] }
 mime_guess = "2.0.4"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/examples/browser-webrtc/src/main.rs b/examples/browser-webrtc/src/main.rs
index 3fbc8cfec0e..7f06b0d0d99 100644
--- a/examples/browser-webrtc/src/main.rs
+++ b/examples/browser-webrtc/src/main.rs
@@ -18,6 +18,7 @@ use libp2p_webrtc as webrtc;
 use rand::thread_rng;
 use std::net::{Ipv4Addr, SocketAddr};
 use std::time::Duration;
+use tokio::net::TcpListener;
 use tower_http::cors::{Any, CorsLayer};
 
 #[tokio::main]
@@ -112,10 +113,12 @@ pub(crate) async fn serve(libp2p_transport: Multiaddr) {
 
     tracing::info!(url=%format!("http://{addr}"), "Serving client files at url");
 
-    axum::Server::bind(&addr)
-        .serve(server.into_make_service())
-        .await
-        .unwrap();
+    axum::serve(
+        TcpListener::bind((listen_addr, 8080)).await.unwrap(),
+        server.into_make_service(),
+    )
+    .await
+    .unwrap();
 }
 
 #[derive(Clone)]
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index eba65b782e7..bbaa9fe6b48 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -21,7 +21,7 @@ tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-axum = "0.6"
+axum = "0.7"
 libp2p = { path = "../libp2p", features = [ "ping", "noise", "tls", "rsa", "macros", "websocket", "tokio", "yamux", "tcp", "dns", "identify", "quic"] }
 libp2p-mplex = { path = "../muxers/mplex" }
 libp2p-noise = { workspace = true }
@@ -35,7 +35,7 @@ rust-embed = "8.0"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.34.0", features = ["full"] }
-tower-http = { version = "0.4", features = ["cors", "fs", "trace"] }
+tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/interop-tests/src/bin/wasm_ping.rs b/interop-tests/src/bin/wasm_ping.rs
index 8269ff064ad..e1bb2ea49fb 100644
--- a/interop-tests/src/bin/wasm_ping.rs
+++ b/interop-tests/src/bin/wasm_ping.rs
@@ -1,9 +1,10 @@
 #![allow(non_upper_case_globals)]
+
+use std::future::IntoFuture;
 use std::process::Stdio;
 use std::time::Duration;
 
 use anyhow::{bail, Context, Result};
-use axum::body;
 use axum::http::{header, Uri};
 use axum::response::{Html, IntoResponse, Response};
 use axum::routing::get;
@@ -11,6 +12,7 @@ use axum::{extract::State, http::StatusCode, routing::post, Json, Router};
 use redis::{AsyncCommands, Client};
 use thirtyfour::prelude::*;
 use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio::net::TcpListener;
 use tokio::process::Child;
 use tokio::sync::mpsc;
 use tower_http::cors::CorsLayer;
@@ -76,7 +78,7 @@ async fn main() -> Result<()> {
         .with_state(state);
 
     // Run the service in background
-    tokio::spawn(axum::Server::bind(&BIND_ADDR.parse()?).serve(app.into_make_service()));
+    tokio::spawn(axum::serve(TcpListener::bind(BIND_ADDR).await?, app).into_future());
 
     // Start executing the test in a browser
     let (mut chrome, driver) = open_in_browser().await?;
@@ -229,7 +231,7 @@ async fn serve_wasm_pkg(uri: Uri) -> Result<Response, StatusCode> {
         let mime = mime_guess::from_path(&path).first_or_octet_stream();
         Ok(Response::builder()
             .header(header::CONTENT_TYPE, mime.as_ref())
-            .body(body::boxed(body::Full::from(content.data)))
+            .body(content.data.into())
             .unwrap())
     } else {
         Err(StatusCode::NOT_FOUND)

From b7914e407da34c99fb76dcc300b3d44b9af97fac Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 7 Dec 2023 10:55:55 +1100
Subject: [PATCH 012/455] chore(webrtc-websys): remove unused dependencies

Pull-Request: #4973.
---
 Cargo.lock                          | 5 -----
 transports/webrtc-websys/Cargo.toml | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 029b42d505b..8fef5c62105 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3428,18 +3428,13 @@ version = "0.3.0-alpha"
 dependencies = [
  "bytes",
  "futures",
- "futures-timer",
  "getrandom 0.2.11",
  "hex",
- "hex-literal",
  "js-sys",
  "libp2p-core",
  "libp2p-identity",
- "libp2p-ping",
- "libp2p-swarm",
  "libp2p-webrtc-utils",
  "send_wrapper 0.6.0",
- "serde",
  "thiserror",
  "tracing",
  "wasm-bindgen",
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 11dab48ea53..34da24a3f5f 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -14,7 +14,6 @@ publish = true
 [dependencies]
 bytes = "1"
 futures = "0.3"
-futures-timer = "3"
 getrandom = { version = "0.2.11", features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
@@ -22,17 +21,11 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-webrtc-utils = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-serde = { version = "1.0", features = ["derive"] }
 thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.89" }
 wasm-bindgen-futures = { version = "0.4.39" }
 web-sys = { version = "0.3.66", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
-[dev-dependencies]
-hex-literal = "0.4"
-libp2p-ping = { workspace = true }
-libp2p-swarm = { workspace = true, features = ["wasm-bindgen"] }
-
 [lints]
 workspace = true

From 084b12313ec914612cef917aa62a6df432fa3570 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 11 Dec 2023 16:39:48 +1100
Subject: [PATCH 013/455] chore(quic): fix link to PR in changelog

Pull-Request: #4993.
---
 transports/quic/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md
index 538db11d79e..3c34a1989f9 100644
--- a/transports/quic/CHANGELOG.md
+++ b/transports/quic/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 0.10.2
 
 - Change `max_idle_timeout`to 10s.
-  See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/XXXX).
+  See [PR 4965](https://github.com/libp2p/rust-libp2p/pull/4965).
 
 ## 0.10.1
 

From 34d04c2f1268b13f24d6c5cc310b5ceec86d3c15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 08:50:34 +0000
Subject: [PATCH 014/455] deps: bump tokio from 1.34.0 to 1.35.0

Pull-Request: #4995.
---
 Cargo.lock                         | 4 ++--
 examples/autonat/Cargo.toml        | 2 +-
 examples/browser-webrtc/Cargo.toml | 2 +-
 examples/chat/Cargo.toml           | 2 +-
 examples/dcutr/Cargo.toml          | 2 +-
 examples/ipfs-kad/Cargo.toml       | 2 +-
 examples/ipfs-private/Cargo.toml   | 2 +-
 examples/ping/Cargo.toml           | 2 +-
 examples/rendezvous/Cargo.toml     | 2 +-
 hole-punching-tests/Cargo.toml     | 2 +-
 interop-tests/Cargo.toml           | 2 +-
 misc/futures-bounded/Cargo.toml    | 2 +-
 protocols/mdns/Cargo.toml          | 4 ++--
 protocols/perf/Cargo.toml          | 2 +-
 protocols/rendezvous/Cargo.toml    | 2 +-
 protocols/upnp/Cargo.toml          | 2 +-
 swarm/Cargo.toml                   | 4 ++--
 transports/pnet/Cargo.toml         | 2 +-
 transports/quic/Cargo.toml         | 4 ++--
 transports/tcp/Cargo.toml          | 4 ++--
 transports/tls/Cargo.toml          | 2 +-
 transports/uds/Cargo.toml          | 2 +-
 transports/webrtc/Cargo.toml       | 4 ++--
 23 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8fef5c62105..69d72dace98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5845,9 +5845,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index cca3b5e326e..e530cbe9561 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.34", features = ["full"] }
+tokio = { version = "1.35", features = ["full"] }
 clap = { version = "4.4.10", features = ["derive"] }
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index b22713fd00e..c94baf5f7ba 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -27,7 +27,7 @@ axum = "0.7.1"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.0.0", features = ["include-exclude", "interpolate-folder-path"] }
-tokio = { version = "1.34", features = ["macros", "net", "rt", "signal"] }
+tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
 tower-http = { version = "0.5.0", features = ["cors"] }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index 9b3561dab48..9e6f58852f8 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.34", features = ["full"] }
+tokio = { version = "1.35", features = ["full"] }
 async-trait = "0.1"
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 8dcb403218e..6eeb1969745 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.29"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
-tokio = { version = "1.34", features = ["macros", "net", "rt", "signal"] }
+tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 7870d3adb79..4e4a1eafdd5 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.34", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.4.10", features = ["derive"] }
 env_logger = "0.10"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 97c1ca59368..076c863543b 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.34", features = ["rt-multi-thread", "macros", "io-std"] }
+tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.9"
 futures = "0.3.29"
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 66d2847cb8f..128d33d26f4 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.35.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index fbb2ed44a03..bc48b70d30d 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.34", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "time"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index a6f1bd6571c..e080b76a0d7 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.29"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.35.0", features = ["full"] }
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
 either = "1.9.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index bbaa9fe6b48..b09371fc8b1 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -34,7 +34,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 rust-embed = "8.0"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.35.0", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
index b375242bb3c..fe4328b41d9 100644
--- a/misc/futures-bounded/Cargo.toml
+++ b/misc/futures-bounded/Cargo.toml
@@ -17,7 +17,7 @@ futures-util = { version = "0.3.29" }
 futures-timer = "3.0.2"
 
 [dev-dependencies]
-tokio = { version = "1.34.0", features = ["macros", "rt", "sync"] }
+tokio = { version = "1.35.0", features = ["macros", "rt", "sync"] }
 futures = "0.3.28"
 
 [lints]
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 97e7204cd63..5561575bf2a 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8.3"
 smallvec = "1.11.2"
 socket2 = { version = "0.5.5", features = ["all"] }
-tokio = { version = "1.34", default-features = false, features = ["net", "time"], optional = true}
+tokio = { version = "1.35", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
 void = "1.0.2"
@@ -37,7 +37,7 @@ libp2p-noise = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] }
 libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.34", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
+tokio = { version = "1.35", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index c2fc146f231..cca7631d67d 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tokio = { version = "1.34", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
+tokio = { version = "1.35", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
 void = "1"
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 4dfd77e1eba..edc0ec8a38a 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -37,7 +37,7 @@ libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
-tokio = { version = "1.34", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
+tokio = { version = "1.35", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index f00c80aabb3..2353463bfaa 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -16,7 +16,7 @@ futures-timer = "3.0.2"
 igd-next = "0.14.2"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
-tokio = { version = "1.34", default-features = false, features = ["rt"], optional = true }
+tokio = { version = "1.35", default-features = false, features = ["rt"], optional = true }
 tracing = "0.1.37"
 void = "1.0.2"
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 1f5ce9fc08f..dd5dda05d55 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -30,7 +30,7 @@ wasm-bindgen-futures = { version = "0.4.39", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
-tokio = { version = "1.34", features = ["rt"], optional = true }
+tokio = { version = "1.35", features = ["rt"], optional = true }
 
 [features]
 macros = ["dep:libp2p-swarm-derive"]
@@ -54,7 +54,7 @@ quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.18.0"
 trybuild = "1.0.85"
-tokio = { version = "1.34.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.35.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index ab23de720e7..f598e876c09 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -27,7 +27,7 @@ libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-websocket = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.35.0", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 3bf57dddb51..8a1ca4287ff 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -22,7 +22,7 @@ quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls"
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.50"
-tokio = { version = "1.34.0", default-features = false, features = ["net", "rt", "time"], optional = true }
+tokio = { version = "1.35.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
 ring = "0.16.20"
@@ -46,7 +46,7 @@ libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
-tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { version = "1.35.0", features = ["macros", "rt-multi-thread", "time"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 13eeb01786d..b4517cf269b 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -19,7 +19,7 @@ libc = "0.2.150"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.5", features = ["all"] }
-tokio = { version = "1.34.0", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.35.0", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [features]
@@ -29,7 +29,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.34.0", default-features = false, features = ["full"] }
+tokio = { version = "1.35.0", default-features = false, features = ["full"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 5a1e4788245..2a683decec0 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -33,7 +33,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rsa", "secp256k1", "ecdsa", "rand"] }
 libp2p-swarm = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.35.0", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index bcf7570c44f..e730bf87895 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
 futures = "0.3.29"
-tokio = { version = "1.34", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.35", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [dev-dependencies]
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 214d6778bf0..de805840683 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] }
 stun = "0.5"
 thiserror = "1"
 tinytemplate = "1.2"
-tokio = { version = "1.34", features = ["net"], optional = true }
+tokio = { version = "1.35", features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
 tracing = "0.1.37"
 webrtc = { version = "0.9.0", optional = true }
@@ -39,7 +39,7 @@ pem = ["webrtc?/pem"]
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.34", features = ["full"] }
+tokio = { version = "1.35", features = ["full"] }
 quickcheck = "1.0.3"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From fc53d4e9d5b7fe669c8084eed08c6d0097702550 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:01:15 +0000
Subject: [PATCH 015/455] deps: bump syn from 2.0.39 to 2.0.40

Pull-Request: #4996.
---
 Cargo.lock              | 44 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69d72dace98..cdd7a6f7817 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,7 +424,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -927,7 +927,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -1204,7 +1204,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -1426,7 +1426,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -1696,7 +1696,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -3285,7 +3285,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4049,7 +4049,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4275,7 +4275,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -4472,7 +4472,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -5017,7 +5017,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.39",
+ "syn 2.0.40",
  "walkdir",
 ]
 
@@ -5302,7 +5302,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -5335,7 +5335,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -5638,9 +5638,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5778,7 +5778,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -5880,7 +5880,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -6035,7 +6035,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -6392,7 +6392,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
  "wasm-bindgen-shared",
 ]
 
@@ -6426,7 +6426,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6459,7 +6459,7 @@ checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
 
 [[package]]
@@ -7042,5 +7042,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.40",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 78ffd337101..9259d63c4ed 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.39", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.40", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From 305e02cccd88de935aca4f14ca937a50b4945e35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:12:54 +0000
Subject: [PATCH 016/455] deps: bump once_cell from 1.18.0 to 1.19.0

Pull-Request: #4998.
---
 Cargo.lock                  | 4 ++--
 core/Cargo.toml             | 2 +-
 swarm/Cargo.toml            | 4 ++--
 transports/noise/Cargo.toml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cdd7a6f7817..2e79300cff9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4010,9 +4010,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 7ead34b69d9..5c941db6e33 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 multistream-select = { workspace = true }
-once_cell = "1.18.0"
+once_cell = "1.19.0"
 parking_lot = "0.12.0"
 pin-project = "1.1.3"
 quick-protobuf = "0.8"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index dd5dda05d55..0e87f30979d 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }
 multistream-select = { workspace = true }
-once_cell = "1.18.0"
+once_cell = "1.19.0"
 rand = "0.8"
 smallvec = "1.11.2"
 tracing = "0.1.37"
@@ -52,7 +52,7 @@ libp2p-swarm-test = { path = "../swarm-test" }                      # Using `pat
 libp2p-yamux = { path = "../muxers/yamux" }                         # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 quickcheck = { workspace = true }
 void = "1"
-once_cell = "1.18.0"
+once_cell = "1.19.0"
 trybuild = "1.0.85"
 tokio = { version = "1.35.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 772b74c7acb..d4168246b66 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -17,7 +17,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
-once_cell = "1.18.0"
+once_cell = "1.19.0"
 quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"

From 4d1a539504ce49739204e64b286d6209855f91af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:07:31 +0000
Subject: [PATCH 017/455] deps: bump hkdf from 0.12.3 to 0.12.4

Pull-Request: #5009.
---
 Cargo.lock          | 4 ++--
 identity/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2e79300cff9..dcaf0eba016 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2003,9 +2003,9 @@ dependencies = [
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac 0.12.1",
 ]
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index e7aa15fef07..5234507ec2d 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["cryptography"]
 asn1_der = { version = "0.7.6", optional = true }
 bs58 = { version = "0.5.0", optional = true }
 ed25519-dalek = { version = "2.1", optional = true }
-hkdf = { version = "0.12.3", optional = true }
+hkdf = { version = "0.12.4", optional = true }
 libsecp256k1 = { version = "0.7.0", optional = true }
 tracing = "0.1.37"
 multihash = { version = "0.19.1", optional = true }

From f719089f4eadd76962d26bfbc8cc99adedc59175 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:24:43 +0000
Subject: [PATCH 018/455] deps: bump clap from 4.4.10 to 4.4.11

Pull-Request: #4997.
---
 Cargo.lock                       | 8 ++++----
 examples/autonat/Cargo.toml      | 2 +-
 examples/dcutr/Cargo.toml        | 2 +-
 examples/file-sharing/Cargo.toml | 2 +-
 examples/ipfs-kad/Cargo.toml     | 2 +-
 examples/relay-server/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml           | 2 +-
 misc/server/Cargo.toml           | 2 +-
 protocols/dcutr/Cargo.toml       | 2 +-
 protocols/perf/Cargo.toml        | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dcaf0eba016..1657fd4ee31 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -898,9 +898,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.10"
+version = "4.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272"
+checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -908,9 +908,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.9"
+version = "4.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1"
+checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
 dependencies = [
  "anstream",
  "anstyle",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index e530cbe9561..63dfb355893 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 6eeb1969745..b9cafa1577f 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 futures = "0.3.29"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index 52d1b3b9b20..1a551ef9a23 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 either = "1.9"
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 4e4a1eafdd5..2c060ffc2db 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.29"
 anyhow = "1.0.75"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index fe18106e60c..790a620f6ea 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.2"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 9c1c37bd428..2a4b7e28418 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 release = false
 
 [dependencies]
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 87bdc20b169..e23660311bd 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.21"
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 1fc4b367dc8..1087e143d75 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -29,7 +29,7 @@ futures-bounded = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index cca7631d67d..6c30837db85 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.4.10", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
 futures = "0.3.29"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"

From 191396e18e9d955c09229f0d7626b87b3467feca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:35:19 +0000
Subject: [PATCH 019/455] deps: bump thiserror from 1.0.50 to 1.0.51

Pull-Request: #5010.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1657fd4ee31..7641f90744d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5763,18 +5763,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 87f0e636272..b8dbe1c32aa 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.11.2"
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 tracing = "0.1.37"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index d4168246b66..009fadf5f8b 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 tracing = "0.1.37"
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 8a1ca4287ff..80e6e78905e 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 tokio = { version = "1.35.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 2a683decec0..de1602d0c47 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = "0.16.20"
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.15.1"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 568bd22e20e..f10d0d0277d 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 wasm-bindgen = "0.2.89"
 web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 96afd159ff8..2831a2e8c89 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"

From 9323bc03795879324651f7fbaae9da9f386bd177 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:46:04 +0000
Subject: [PATCH 020/455] deps: bump syn from 2.0.40 to 2.0.41

Pull-Request: #5011.
---
 Cargo.lock              | 44 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7641f90744d..7550fe4a18a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,7 +424,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -927,7 +927,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -1204,7 +1204,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -1426,7 +1426,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -1696,7 +1696,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -3285,7 +3285,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -4049,7 +4049,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -4275,7 +4275,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -4472,7 +4472,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -5017,7 +5017,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.40",
+ "syn 2.0.41",
  "walkdir",
 ]
 
@@ -5302,7 +5302,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -5335,7 +5335,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -5638,9 +5638,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5778,7 +5778,7 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -5880,7 +5880,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -6035,7 +6035,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -6392,7 +6392,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
  "wasm-bindgen-shared",
 ]
 
@@ -6426,7 +6426,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6459,7 +6459,7 @@ checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
 
 [[package]]
@@ -7042,5 +7042,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.41",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 9259d63c4ed..9fa9cf3d884 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.40", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.41", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From e580f3423ae63d258232f57e37162cd4886497aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:55:56 +0000
Subject: [PATCH 021/455] deps: bump async-io from 2.2.1 to 2.2.2

Pull-Request: #5012.
---
 Cargo.lock                | 10 +++++-----
 protocols/mdns/Cargo.toml |  2 +-
 transports/tcp/Cargo.toml |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7550fe4a18a..9888cce52bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -300,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff"
+checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
 dependencies = [
  "async-lock 3.1.0",
  "cfg-if",
@@ -2298,7 +2298,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io 2.2.1",
+ "async-io 2.2.2",
  "core-foundation",
  "fnv",
  "futures",
@@ -2898,7 +2898,7 @@ dependencies = [
 name = "libp2p-mdns"
 version = "0.45.1"
 dependencies = [
- "async-io 2.2.1",
+ "async-io 2.2.2",
  "async-std",
  "data-encoding",
  "futures",
@@ -3309,7 +3309,7 @@ dependencies = [
 name = "libp2p-tcp"
 version = "0.41.0"
 dependencies = [
- "async-io 2.2.1",
+ "async-io 2.2.2",
  "async-std",
  "futures",
  "futures-timer",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 5561575bf2a..0bba93e2c53 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
-async-io  = { version = "2.2.1", optional = true }
+async-io  = { version = "2.2.2", optional = true }
 data-encoding = "2.5.0"
 futures = "0.3.29"
 if-watch = "3.2.0"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index b4517cf269b..928f7f57209 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-io = { version = "2.2.1", optional = true }
+async-io = { version = "2.2.2", optional = true }
 futures = "0.3.29"
 futures-timer = "3.0"
 if-watch = "3.2.0"

From c115cdd9efb5c95617a2b0c8efc9939afed07e62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:06:49 +0000
Subject: [PATCH 022/455] deps: bump rust-embed from 8.0.0 to 8.1.0

Pull-Request: #5000.
---
 Cargo.lock                         | 16 ++++++++--------
 examples/browser-webrtc/Cargo.toml |  2 +-
 interop-tests/Cargo.toml           |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9888cce52bb..88b881232ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4998,9 +4998,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40"
+checksum = "810294a8a4a0853d4118e3b94bb079905f2107c7fe979d8f0faae98765eb6378"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5009,9 +5009,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29"
+checksum = "bfc144a1273124a67b8c1d7cd19f5695d1878b31569c0512f6086f0f4676604e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5023,9 +5023,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada"
+checksum = "816ccd4875431253d6bb54b804bcff4369cbde9bae33defde25fdf6c2ef91d40"
 dependencies = [
  "globset",
  "sha2 0.10.8",
@@ -5419,9 +5419,9 @@ dependencies = [
 
 [[package]]
 name = "shellexpand"
-version = "2.1.2"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
+checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
 dependencies = [
  "dirs",
 ]
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index c94baf5f7ba..e805d7e22a6 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -26,7 +26,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 axum = "0.7.1"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
-rust-embed = { version = "8.0.0", features = ["include-exclude", "interpolate-folder-path"] }
+rust-embed = { version = "8.1.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index b09371fc8b1..cf9c655ce72 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -31,7 +31,7 @@ mime_guess = "2.0"
 redis = { version = "0.23.3", default-features = false, features = [
     "tokio-comp",
 ] }
-rust-embed = "8.0"
+rust-embed = "8.1"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.35.0", features = ["full"] }

From 848bb7428e27a4eb70c2c2d4cf8f5ff9fa678279 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 09:13:53 +0000
Subject: [PATCH 023/455] chore(deps): bump golang.org/x/crypto from 0.7.0 to
 0.17.0

Pull-Request: #5019.
---
 wasm-tests/webtransport-tests/echo-server/go.mod |  8 ++++----
 wasm-tests/webtransport-tests/echo-server/go.sum | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wasm-tests/webtransport-tests/echo-server/go.mod b/wasm-tests/webtransport-tests/echo-server/go.mod
index 669124e1f69..9dde12fdcfe 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.mod
+++ b/wasm-tests/webtransport-tests/echo-server/go.mod
@@ -52,12 +52,12 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect
diff --git a/wasm-tests/webtransport-tests/echo-server/go.sum b/wasm-tests/webtransport-tests/echo-server/go.sum
index 2e4b66d2ec0..95c1618a0cb 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.sum
+++ b/wasm-tests/webtransport-tests/echo-server/go.sum
@@ -224,8 +224,8 @@ golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
@@ -251,8 +251,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -277,14 +277,14 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

From c3500bb79a57fde067394911bd2cde76c403da9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 09:53:45 +0000
Subject: [PATCH 024/455] deps: bump libc from 0.2.150 to 0.2.151

Pull-Request: #5002.
---
 Cargo.lock                | 4 ++--
 transports/tcp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 88b881232ed..ecbb73b7cc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2557,9 +2557,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "libp2p"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 928f7f57209..ae43c2cba1b 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -15,7 +15,7 @@ async-io = { version = "2.2.2", optional = true }
 futures = "0.3.29"
 futures-timer = "3.0"
 if-watch = "3.2.0"
-libc = "0.2.150"
+libc = "0.2.151"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.5", features = ["all"] }

From 1d04b1e4d331418ad9906e519de1d1c85e688b5c Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Tue, 19 Dec 2023 13:37:47 +0100
Subject: [PATCH 025/455] docs: remove security@libp2p.io

I no longer have access to the mailing list. See
https://github.com/libp2p/rust-libp2p/discussions/5007.

Pull-Request: #5020.
---
 README.md   | 5 ++---
 SECURITY.md | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 62375b3dab0..48fa976635a 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,8 @@ This repository is the central place for Rust development of the [libp2p](https:
   many protocols in this repository.
 
 - For **security related issues** please [file a private security vulnerability
-  report](https://github.com/libp2p/rust-libp2p/security/advisories/new)
-  or reach out to [security@libp2p.io](mailto:security@libp2p.io). Please do not
-  file a public issue on GitHub.
+  report](https://github.com/libp2p/rust-libp2p/security/advisories/new) . Please do not file a
+  public issue on GitHub.
 
 - To **report bugs, suggest improvements or request new features** please open a
   GitHub issue on this repository.
diff --git a/SECURITY.md b/SECURITY.md
index 0e5a3f2e55f..f3ae83405e8 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,5 +7,3 @@ By default we provide security patches for the latest released version only. On
 ## Reporting a Vulnerability
 
 Please do not file a public issue on GitHub. Instead, please [file a private security vulnerability report](https://github.com/libp2p/rust-libp2p/security/advisories/new).
-
-If you need further assistance, please reach out to [security@libp2p.io](mailto:security@libp2p.io).

From bdcb081b8860f302404c11b7c3dde393f4c38ba4 Mon Sep 17 00:00:00 2001
From: alex <152680487+bodhi-crypo@users.noreply.github.com>
Date: Wed, 20 Dec 2023 16:16:35 +0800
Subject: [PATCH 026/455] chore: fix typos

Pull-Request: #5021.
---
 libp2p/src/transport_ext.rs      | 2 +-
 protocols/relay/src/behaviour.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libp2p/src/transport_ext.rs b/libp2p/src/transport_ext.rs
index bca0b8f4576..4f07484fc1f 100644
--- a/libp2p/src/transport_ext.rs
+++ b/libp2p/src/transport_ext.rs
@@ -33,7 +33,7 @@ use std::sync::Arc;
 /// Trait automatically implemented on all objects that implement `Transport`. Provides some
 /// additional utilities.
 pub trait TransportExt: Transport {
-    /// Adds a layer on the `Transport` that logs all trafic that passes through the streams
+    /// Adds a layer on the `Transport` that logs all traffic that passes through the streams
     /// created by it.
     ///
     /// This method returns an `Arc<BandwidthSinks>` that can be used to retrieve the total number
diff --git a/protocols/relay/src/behaviour.rs b/protocols/relay/src/behaviour.rs
index 59f679c9890..df8443e8359 100644
--- a/protocols/relay/src/behaviour.rs
+++ b/protocols/relay/src/behaviour.rs
@@ -202,12 +202,12 @@ pub enum Event {
         dst_peer_id: PeerId,
         error: inbound_hop::Error,
     },
-    /// An inbound cirucit request has been accepted.
+    /// An inbound circuit request has been accepted.
     CircuitReqAccepted {
         src_peer_id: PeerId,
         dst_peer_id: PeerId,
     },
-    /// An outbound connect for an inbound cirucit request failed.
+    /// An outbound connect for an inbound circuit request failed.
     #[deprecated(
         note = "Will be removed in favor of logging them internally, see <https://github.com/libp2p/rust-libp2p/issues/4757> for details."
     )]

From be1cfda93ef0bc4e243545f943b3b8ad1c159d1a Mon Sep 17 00:00:00 2001
From: Akosh Farkash <aakoshh@gmail.com>
Date: Thu, 21 Dec 2023 08:42:36 +0000
Subject: [PATCH 027/455] fix(derive): restore support for inline generic type
 constraints

Fixes the `#[NetworkBehaviour]` macro to support generic constraints on behaviours without a where clause, which was the case before v0.51.

Pull-Request: #5003.
---
 Cargo.lock                  |  2 +-
 Cargo.toml                  |  2 +-
 swarm-derive/CHANGELOG.md   |  5 +++
 swarm-derive/Cargo.toml     |  2 +-
 swarm-derive/src/lib.rs     |  2 +-
 swarm/tests/swarm_derive.rs | 85 +++++++++++++++++++++++++++++++++++++
 6 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ecbb73b7cc7..fce2aa000ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.34.1"
+version = "0.34.2"
 dependencies = [
  "heck",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 11ac47b0be4..d10ed7e3bbf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,7 @@ libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.1", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.5", path = "misc/server" }
 libp2p-swarm = { version = "0.44.1", path = "swarm" }
-libp2p-swarm-derive = { version = "=0.34.1", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
+libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
diff --git a/swarm-derive/CHANGELOG.md b/swarm-derive/CHANGELOG.md
index 85ea1a46048..74f35806eec 100644
--- a/swarm-derive/CHANGELOG.md
+++ b/swarm-derive/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.34.2
+
+- Restore support for generic constraints on behaviours combined with `out_event` generated by `NetworkBehaviour` where no where clause is used.
+  See [PR 5003](https://github.com/libp2p/rust-libp2p/pull/5003).
+
 ## 0.34.1
 
 - Always forward all variants of `FromSwarm`.
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 9fa9cf3d884..0326a3a03ca 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm-derive"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Procedural macros of libp2p-swarm"
-version = "0.34.1"
+version = "0.34.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm-derive/src/lib.rs b/swarm-derive/src/lib.rs
index 5c8ce93966d..2e7daf7acc4 100644
--- a/swarm-derive/src/lib.rs
+++ b/swarm-derive/src/lib.rs
@@ -162,7 +162,7 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
 
                     Some(quote! {
                         #[doc = #msg]
-                        #visibility enum #enum_name #ty_generics
+                        #visibility enum #enum_name #impl_generics
                             #where_clause
                         {
                             #(#enum_variants),*
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 3337cb7b137..707abb03d6e 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -371,6 +371,91 @@ fn with_generics_mixed() {
     }
 }
 
+#[test]
+fn with_generics_constrained() {
+    use std::task::{Context, Poll};
+    trait Mark {}
+    struct Marked;
+    impl Mark for Marked {}
+
+    /// A struct with a generic constraint, for which we manually implement `NetworkBehaviour`.
+    #[allow(dead_code)]
+    struct Bar<A: Mark> {
+        a: A,
+    }
+
+    impl<A: Mark + 'static> NetworkBehaviour for Bar<A> {
+        type ConnectionHandler = dummy::ConnectionHandler;
+        type ToSwarm = void::Void;
+
+        fn handle_established_inbound_connection(
+            &mut self,
+            _: libp2p_swarm::ConnectionId,
+            _: libp2p_identity::PeerId,
+            _: &Multiaddr,
+            _: &Multiaddr,
+        ) -> Result<THandler<Self>, ConnectionDenied> {
+            Ok(dummy::ConnectionHandler)
+        }
+
+        fn handle_established_outbound_connection(
+            &mut self,
+            _: libp2p_swarm::ConnectionId,
+            _: libp2p_identity::PeerId,
+            _: &Multiaddr,
+            _: Endpoint,
+        ) -> Result<THandler<Self>, ConnectionDenied> {
+            Ok(dummy::ConnectionHandler)
+        }
+
+        fn on_swarm_event(&mut self, _event: FromSwarm) {}
+
+        fn on_connection_handler_event(
+            &mut self,
+            _: libp2p_identity::PeerId,
+            _: libp2p_swarm::ConnectionId,
+            _: THandlerOutEvent<Self>,
+        ) {
+        }
+
+        fn poll(
+            &mut self,
+            _: &mut Context<'_>,
+        ) -> Poll<libp2p_swarm::ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+            Poll::Pending
+        }
+    }
+
+    /// A struct which uses the above, inheriting the generic constraint,
+    /// for which we want to derive the `NetworkBehaviour`.
+    #[allow(dead_code)]
+    #[derive(NetworkBehaviour)]
+    #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
+    struct Foo1<A: Mark> {
+        bar: Bar<A>,
+    }
+
+    /// A struct which uses the above, inheriting the generic constraint,
+    /// for which we want to derive the `NetworkBehaviour`.
+    ///
+    /// Using a where clause instead of inline constraint.
+    #[allow(dead_code)]
+    #[derive(NetworkBehaviour)]
+    #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
+    struct Foo2<A>
+    where
+        A: Mark,
+    {
+        bar: Bar<A>,
+    }
+
+    #[allow(dead_code)]
+    fn foo() {
+        require_net_behaviour::<Foo1<Marked>>();
+        require_net_behaviour::<Foo2<Marked>>();
+    }
+}
+
 #[test]
 fn custom_event_with_either() {
     use either::Either;

From b6bb02b9305b56ed2a4e2ff44b510fa84d8d7401 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 07:55:51 +0000
Subject: [PATCH 028/455] deps: bump actions/deploy-pages from 3 to 4

Pull-Request: #5022.
---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 87fb4732b6e..196b389fd2e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -42,5 +42,5 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v3
+        uses: actions/deploy-pages@v4
 

From 2c6da31b6f1bbdd648537b581613b0acd6885f0c Mon Sep 17 00:00:00 2001
From: Frieren <153332328+Frierened@users.noreply.github.com>
Date: Sun, 24 Dec 2023 05:34:57 +0100
Subject: [PATCH 029/455] chore: fix several typos in documentation

Pull-Request: #5008.
---
 transports/dns/src/lib.rs              | 2 +-
 transports/noise/tests/smoke.rs        | 2 +-
 transports/pnet/CHANGELOG.md           | 2 +-
 transports/tls/src/certificate.rs      | 4 ++--
 transports/webrtc/src/tokio/udp_mux.rs | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index 0c41990fab1..3aeac4e4154 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -277,7 +277,7 @@ where
         let resolver = self.resolver.clone();
         let inner = self.inner.clone();
 
-        // Asynchronlously resolve all DNS names in the address before proceeding
+        // Asynchronously resolve all DNS names in the address before proceeding
         // with dialing on the underlying transport.
         Ok(async move {
             let mut last_err = None;
diff --git a/transports/noise/tests/smoke.rs b/transports/noise/tests/smoke.rs
index 0afebc0cbea..7100e7c7a8d 100644
--- a/transports/noise/tests/smoke.rs
+++ b/transports/noise/tests/smoke.rs
@@ -30,7 +30,7 @@ use tracing_subscriber::EnvFilter;
 
 #[allow(dead_code)]
 fn core_upgrade_compat() {
-    // Tests API compaibility with the libp2p-core upgrade API,
+    // Tests API compatibility with the libp2p-core upgrade API,
     // i.e. if it compiles, the "test" is considered a success.
     let id_keys = identity::Keypair::generate_ed25519();
     let noise = noise::Config::new(&id_keys).unwrap();
diff --git a/transports/pnet/CHANGELOG.md b/transports/pnet/CHANGELOG.md
index e6c3d1974dc..1fbc2d08807 100644
--- a/transports/pnet/CHANGELOG.md
+++ b/transports/pnet/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ## 0.23.1
 
-<!-- Interal changes:
+<!-- Internal changes:
 
 - Allow new clippy lint.
 
diff --git a/transports/tls/src/certificate.rs b/transports/tls/src/certificate.rs
index ff9d296bb16..801ba3fe3ce 100644
--- a/transports/tls/src/certificate.rs
+++ b/transports/tls/src/certificate.rs
@@ -27,7 +27,7 @@ use libp2p_identity::PeerId;
 use x509_parser::{prelude::*, signature_algorithm::SignatureAlgorithm};
 
 /// The libp2p Public Key Extension is a X.509 extension
-/// with the Object Identier 1.3.6.1.4.1.53594.1.1,
+/// with the Object Identifier 1.3.6.1.4.1.53594.1.1,
 /// allocated by IANA to the libp2p project at Protocol Labs.
 const P2P_EXT_OID: [u64; 9] = [1, 3, 6, 1, 4, 1, 53594, 1, 1];
 
@@ -374,7 +374,7 @@ impl P2pCertificate<'_> {
             }
             if signature_algorithm.algorithm == OID_PKCS1_RSASSAPSS {
                 // According to https://datatracker.ietf.org/doc/html/rfc4055#section-3.1:
-                // Inside of params there shuld be a sequence of:
+                // Inside of params there should be a sequence of:
                 // - Hash Algorithm
                 // - Mask Algorithm
                 // - Salt Length
diff --git a/transports/webrtc/src/tokio/udp_mux.rs b/transports/webrtc/src/tokio/udp_mux.rs
index 20e04edaf72..7a8d960826d 100644
--- a/transports/webrtc/src/tokio/udp_mux.rs
+++ b/transports/webrtc/src/tokio/udp_mux.rs
@@ -337,7 +337,7 @@ impl UDPMuxNewAddr {
 
                             let conn = match conn {
                                 // If we couldn't find the connection based on source address, see if
-                                // this is a STUN mesage and if so if we can find the connection based on ufrag.
+                                // this is a STUN message and if so if we can find the connection based on ufrag.
                                 None if is_stun_message(read.filled()) => {
                                     match self.conn_from_stun_message(read.filled(), &addr) {
                                         Some(Ok(s)) => Some(s),

From 71c9170ad7a93832a5f387011da451c51ad40dd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:07:32 +0000
Subject: [PATCH 030/455] deps: bump async-trait from 0.1.74 to 0.1.75

Pull-Request: #5029.
---
 Cargo.lock                | 4 ++--
 swarm-test/Cargo.toml     | 2 +-
 transports/dns/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fce2aa000ae..74029709fa1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -418,9 +418,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index 12f8be2a1d8..ca59d450ed8 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.74"
+async-trait = "0.1.75"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index f1946af7c0e..87bfeca3c01 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
-async-trait = "0.1.74"
+async-trait = "0.1.75"
 futures = "0.3.28"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From 14c47c6cdcad423be3e49e306b38158e774705d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:23:50 +0000
Subject: [PATCH 031/455] deps: bump anyhow from 1.0.75 to 1.0.76

Pull-Request: #5030.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 74029709fa1..b597de05b5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -143,9 +143,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index e805d7e22a6..9528502fda6 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.72"
+anyhow = "1.0.76"
 futures = "0.3.29"
 rand = "0.8"
 tracing = "0.1.37"
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 2c060ffc2db..066b1253661 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.4.11", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.29"
-anyhow = "1.0.75"
+anyhow = "1.0.76"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 6da25e24862..c39800e2f51 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.75"
+anyhow = "1.0.76"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From be5bd0eeb3501ba40aef1c713d8e4777604fe08c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:33:47 +0000
Subject: [PATCH 032/455] deps: bump futures-util from 0.3.29 to 0.3.30

Pull-Request: #5031.
---
 Cargo.lock                      | 28 ++++++++++++++--------------
 misc/futures-bounded/Cargo.toml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b597de05b5a..0a16b82caca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1631,9 +1631,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1641,9 +1641,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
@@ -1659,9 +1659,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -1690,9 +1690,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1711,15 +1711,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-ticker"
@@ -1744,9 +1744,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
index fe4328b41d9..0d54409e846 100644
--- a/misc/futures-bounded/Cargo.toml
+++ b/misc/futures-bounded/Cargo.toml
@@ -13,7 +13,7 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-futures-util = { version = "0.3.29" }
+futures-util = { version = "0.3.30" }
 futures-timer = "3.0.2"
 
 [dev-dependencies]

From 37517738772d6b25507867a6776f0b4ffe308fe9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:43:39 +0000
Subject: [PATCH 033/455] deps: bump syn from 2.0.41 to 2.0.43

Pull-Request: #5033.
---
 Cargo.lock              | 44 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a16b82caca..8722a7a4942 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,7 +424,7 @@ checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -927,7 +927,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -1204,7 +1204,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -1426,7 +1426,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -1696,7 +1696,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -3285,7 +3285,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -4049,7 +4049,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -4275,7 +4275,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -4472,7 +4472,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -5017,7 +5017,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.41",
+ "syn 2.0.43",
  "walkdir",
 ]
 
@@ -5302,7 +5302,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -5335,7 +5335,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -5638,9 +5638,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5778,7 +5778,7 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -5880,7 +5880,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -6035,7 +6035,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -6392,7 +6392,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
  "wasm-bindgen-shared",
 ]
 
@@ -6426,7 +6426,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6459,7 +6459,7 @@ checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
 
 [[package]]
@@ -7042,5 +7042,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.43",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 0326a3a03ca..7740d57feb1 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.41", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.43", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From 0e3843c9054fbec6e6d6b0e495c8a317d2b4f782 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:53:51 +0000
Subject: [PATCH 034/455] deps: bump tokio from 1.35.0 to 1.35.1

Pull-Request: #5034.
---
 Cargo.lock                      | 4 ++--
 examples/ping/Cargo.toml        | 2 +-
 hole-punching-tests/Cargo.toml  | 2 +-
 interop-tests/Cargo.toml        | 2 +-
 misc/futures-bounded/Cargo.toml | 2 +-
 swarm/Cargo.toml                | 2 +-
 transports/pnet/Cargo.toml      | 2 +-
 transports/quic/Cargo.toml      | 4 ++--
 transports/tcp/Cargo.toml       | 4 ++--
 transports/tls/Cargo.toml       | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8722a7a4942..6cc893ae858 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5845,9 +5845,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 128d33d26f4..7a30424f495 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.35.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index e080b76a0d7..a3a5658e738 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.29"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
-tokio = { version = "1.35.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
 either = "1.9.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index cf9c655ce72..cf69ed17556 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -34,7 +34,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 rust-embed = "8.1"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
-tokio = { version = "1.35.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
index 0d54409e846..c3a7c75186e 100644
--- a/misc/futures-bounded/Cargo.toml
+++ b/misc/futures-bounded/Cargo.toml
@@ -17,7 +17,7 @@ futures-util = { version = "0.3.30" }
 futures-timer = "3.0.2"
 
 [dev-dependencies]
-tokio = { version = "1.35.0", features = ["macros", "rt", "sync"] }
+tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
 futures = "0.3.28"
 
 [lints]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 0e87f30979d..28134a809c8 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -54,7 +54,7 @@ quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.85"
-tokio = { version = "1.35.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.35.1", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index f598e876c09..06164a46ff9 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -27,7 +27,7 @@ libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-websocket = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tokio = { version = "1.35.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 80e6e78905e..0ce55486700 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -22,7 +22,7 @@ quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls"
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.51"
-tokio = { version = "1.35.0", default-features = false, features = ["net", "rt", "time"], optional = true }
+tokio = { version = "1.35.1", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
 ring = "0.16.20"
@@ -46,7 +46,7 @@ libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
-tokio = { version = "1.35.0", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread", "time"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index ae43c2cba1b..4bcc650f091 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -19,7 +19,7 @@ libc = "0.2.151"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.5", features = ["all"] }
-tokio = { version = "1.35.0", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.35.1", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [features]
@@ -29,7 +29,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.35.0", default-features = false, features = ["full"] }
+tokio = { version = "1.35.1", default-features = false, features = ["full"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index de1602d0c47..25c660657b7 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -33,7 +33,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rsa", "secp256k1", "ecdsa", "rand"] }
 libp2p-swarm = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.35.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling

From 4260702f749d45fb53ea7edd2fb0a728afb83488 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 10:03:55 +0000
Subject: [PATCH 035/455] deps: bump reqwest from 0.11.22 to 0.11.23

Pull-Request: #5035.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6cc893ae858..79059727317 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4840,9 +4840,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
  "base64 0.21.5",
  "bytes",

From d5ba324c2268d08190c953e4e6638ed6ccc6e319 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 05:14:21 +0000
Subject: [PATCH 036/455] deps: bump futures from 0.3.29 to 0.3.30

Pull-Request: #5032.
---
 Cargo.lock                                      | 8 ++++----
 core/Cargo.toml                                 | 2 +-
 examples/autonat/Cargo.toml                     | 2 +-
 examples/browser-webrtc/Cargo.toml              | 2 +-
 examples/chat/Cargo.toml                        | 2 +-
 examples/dcutr/Cargo.toml                       | 2 +-
 examples/distributed-key-value-store/Cargo.toml | 2 +-
 examples/file-sharing/Cargo.toml                | 2 +-
 examples/identify/Cargo.toml                    | 2 +-
 examples/ipfs-kad/Cargo.toml                    | 2 +-
 examples/ipfs-private/Cargo.toml                | 2 +-
 examples/metrics/Cargo.toml                     | 2 +-
 examples/ping/Cargo.toml                        | 2 +-
 examples/relay-server/Cargo.toml                | 2 +-
 examples/rendezvous/Cargo.toml                  | 2 +-
 examples/upnp/Cargo.toml                        | 2 +-
 hole-punching-tests/Cargo.toml                  | 2 +-
 interop-tests/Cargo.toml                        | 2 +-
 misc/futures-bounded/Cargo.toml                 | 2 +-
 misc/metrics/Cargo.toml                         | 2 +-
 misc/quick-protobuf-codec/Cargo.toml            | 2 +-
 misc/rw-stream-sink/Cargo.toml                  | 2 +-
 muxers/mplex/Cargo.toml                         | 2 +-
 muxers/test-harness/Cargo.toml                  | 2 +-
 muxers/yamux/Cargo.toml                         | 2 +-
 protocols/dcutr/Cargo.toml                      | 2 +-
 protocols/floodsub/Cargo.toml                   | 2 +-
 protocols/gossipsub/Cargo.toml                  | 2 +-
 protocols/identify/Cargo.toml                   | 2 +-
 protocols/kad/Cargo.toml                        | 2 +-
 protocols/mdns/Cargo.toml                       | 2 +-
 protocols/perf/Cargo.toml                       | 2 +-
 protocols/ping/Cargo.toml                       | 2 +-
 protocols/relay/Cargo.toml                      | 2 +-
 protocols/request-response/Cargo.toml           | 2 +-
 protocols/upnp/Cargo.toml                       | 2 +-
 swarm-test/Cargo.toml                           | 2 +-
 swarm/Cargo.toml                                | 4 ++--
 transports/dns/Cargo.toml                       | 2 +-
 transports/noise/Cargo.toml                     | 2 +-
 transports/plaintext/Cargo.toml                 | 2 +-
 transports/pnet/Cargo.toml                      | 2 +-
 transports/quic/Cargo.toml                      | 2 +-
 transports/tcp/Cargo.toml                       | 2 +-
 transports/tls/Cargo.toml                       | 2 +-
 transports/uds/Cargo.toml                       | 2 +-
 transports/websocket-websys/Cargo.toml          | 2 +-
 transports/websocket/Cargo.toml                 | 2 +-
 transports/webtransport-websys/Cargo.toml       | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml        | 2 +-
 50 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79059727317..3094ec7bb54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1606,9 +1606,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1647,9 +1647,9 @@ checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 5c941db6e33..34b2202c166 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 either = "1.9"
 fnv = "1.0"
-futures = { version = "0.3.29", features = ["executor", "thread-pool"] }
+futures = { version = "0.3.30", features = ["executor", "thread-pool"] }
 futures-timer = "3"
 instant = "0.1.12"
 libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 63dfb355893..9dbe1cabd01 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
 clap = { version = "4.4.11", features = ["derive"] }
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 9528502fda6..0587f23e234 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -17,7 +17,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow = "1.0.76"
-futures = "0.3.29"
+futures = "0.3.30"
 rand = "0.8"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index 9e6f58852f8..a8349344c03 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index b9cafa1577f..8bbc02debe1 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 clap = { version = "4.4.11", features = ["derive"] }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
index dc084b30091..a7efe3c0697 100644
--- a/examples/distributed-key-value-store/Cargo.toml
+++ b/examples/distributed-key-value-store/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index 1a551ef9a23..c903b515e07 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -13,7 +13,7 @@ serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 clap = { version = "4.4.11", features = ["derive"] }
 either = "1.9"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
index 48449636c61..2dcc780ac22 100644
--- a/examples/identify/Cargo.toml
+++ b/examples/identify/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 066b1253661..52001626de4 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -13,7 +13,7 @@ tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.4.11", features = ["derive"] }
 env_logger = "0.10"
-futures = "0.3.29"
+futures = "0.3.30"
 anyhow = "1.0.76"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 076c863543b..3b266cf35a6 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.9"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index c8f74a17ebd..39412d29aea 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
 opentelemetry = { version = "0.20.0", features = ["rt-tokio", "metrics"] }
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 7a30424f495..93128c3ed13 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
 tokio = { version = "1.35.1", features = ["full"] }
 tracing = "0.1.37"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 790a620f6ea..127c002a73c 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 clap = { version = "4.4.11", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.2"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index bc48b70d30d..4ee410f503f 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "time"] }
 tracing = "0.1.37"
diff --git a/examples/upnp/Cargo.toml b/examples/upnp/Cargo.toml
index 940f3dff65f..db9825c8742 100644
--- a/examples/upnp/Cargo.toml
+++ b/examples/upnp/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "dns", "macros", "noise", "ping", "tcp", "yamux", "upnp"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index a3a5658e738..679e2e8e8a0 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [dependencies]
 anyhow = "1"
 env_logger = "0.10.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index cf69ed17556..c45b50dee64 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 anyhow = "1"
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1.37"
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
index c3a7c75186e..3262f90821b 100644
--- a/misc/futures-bounded/Cargo.toml
+++ b/misc/futures-bounded/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3.0.2"
 
 [dev-dependencies]
 tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
-futures = "0.3.28"
+futures = "0.3.30"
 
 [lints]
 workspace = true
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index 0607808214c..41eed8f2c36 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -19,7 +19,7 @@ ping = ["libp2p-ping"]
 relay = ["libp2p-relay"]
 
 [dependencies]
-futures = "0.3.26"
+futures = "0.3.30"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }
diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
index 484e2c9bc8b..bc07b86b427 100644
--- a/misc/quick-protobuf-codec/Cargo.toml
+++ b/misc/quick-protobuf-codec/Cargo.toml
@@ -19,7 +19,7 @@ quick-protobuf = "0.8"
 
 [dev-dependencies]
 criterion = "0.5.1"
-futures = "0.3.28"
+futures = "0.3.30"
 quickcheck = { workspace = true }
 
 [[bench]]
diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
index ae10cbc35b2..8e093ac3db0 100644
--- a/misc/rw-stream-sink/Cargo.toml
+++ b/misc/rw-stream-sink/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 pin-project = "1.1.3"
 static_assertions = "1"
 
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 1980fd5be0a..726e8a8434f 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 bytes = "1"
-futures = "0.3.29"
+futures = "0.3.30"
 asynchronous-codec = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/muxers/test-harness/Cargo.toml b/muxers/test-harness/Cargo.toml
index 05cef9ad49f..7aad5f1985a 100644
--- a/muxers/test-harness/Cargo.toml
+++ b/muxers/test-harness/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 
 [dependencies]
 libp2p-core = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 futures_ringbuf = "0.4.0"
 tracing = "0.1.37"
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 36601ae56af..14a5c0fe145 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 either = "1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 thiserror = "1.0"
 yamux012 = { version = "0.12.1", package = "yamux" }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 1087e143d75..cf353f5aef6 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index b8dbe1c32aa..9376a91cf9a 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -15,7 +15,7 @@ asynchronous-codec = { workspace = true }
 cuckoofilter = "0.5.0"
 fnv = "1.0"
 bytes = "1.5"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 37873de39f9..9264a866482 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -20,7 +20,7 @@ byteorder = "1.5.0"
 bytes = "1.5"
 either = "1.9"
 fnv = "1.0.7"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-ticker = "0.0.3"
 getrandom = "0.2.11"
 hex_fmt = "0.3.0"
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 8168a3a3fc6..cd5a26d79ac 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index f4ad83972b4..7acb73f074f 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -16,7 +16,7 @@ bytes = "1"
 either = "1.9"
 fnv = "1.0"
 asynchronous-codec = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 futures-bounded = { workspace = true }
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 0bba93e2c53..b18c87dcc71 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.2.2", optional = true }
 data-encoding = "2.5.0"
-futures = "0.3.29"
+futures = "0.3.30"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 6c30837db85..944cc44a5ab 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 anyhow = "1"
 clap = { version = "4.4.11", features = ["derive"] }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"
 instant = "0.1.12"
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 28ae5d39b62..a4d9259e9aa 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 2ef9ed41019..94b9deb1a64 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 asynchronous-codec = { workspace = true }
 bytes = "1"
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3"
 futures-bounded = { workspace = true }
 instant = "0.1.12"
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index c39800e2f51..e85ff691969 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-trait = "0.1"
 cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
-futures = "0.3.29"
+futures = "0.3.30"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 2353463bfaa..2118dd4a728 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["network-programming", "asynchronous"]
 publish = true
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 igd-next = "0.14.2"
 libp2p-core = { workspace = true }
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index ca59d450ed8..cc16a7bccc4 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-plaintext = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["async-std"] }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 rand = "0.8.5"
 tracing = "0.1.37"
 futures-timer = "3.0.2"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 28134a809c8..28f6efa8784 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 either = "1.9.0"
 fnv = "1.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 getrandom = { version = "0.2.11", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"
@@ -41,7 +41,7 @@ wasm-bindgen = ["dep:wasm-bindgen-futures", "dep:getrandom"]
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-identify = { path = "../protocols/identify" }                # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-identity = { workspace = true, features = ["ed25519"] }
 libp2p-kad = { path = "../protocols/kad" }                          # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 87bfeca3c01..644db338ea9 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
 async-trait = "0.1.75"
-futures = "0.3.28"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 009fadf5f8b..70f262cf2d4 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/libp2p/rust-libp2p"
 asynchronous-codec = { workspace = true }
 bytes = "1"
 curve25519-dalek = "4.1.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519"] }
 multiaddr = { workspace = true }
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index 96cb83c7d69..e3f1e280851 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index 06164a46ff9..77dda92321f 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 salsa20 = "0.10"
 sha3 = "0.10"
 tracing = "0.1.37"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 0ce55486700..c959ab09f0f 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 [dependencies]
 async-std = { version = "1.12.0", optional = true }
 bytes = "1.5.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 4bcc650f091..52e38e24b6e 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-io = { version = "2.2.2", optional = true }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0"
 if-watch = "3.2.0"
 libc = "0.2.151"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 25c660657b7..2f8cc0e5880 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 exclude = ["src/test_assets"]
 
 [dependencies]
-futures = { version = "0.3.29", default-features = false }
+futures = { version = "0.3.30", default-features = false }
 futures-rustls = "0.24.0"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index e730bf87895..4efb2e45be4 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 tokio = { version = "1.35", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index f10d0d0277d..1a822f77f1e 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 bytes = "1.4.0"
-futures = "0.3.29"
+futures = "0.3.30"
 js-sys = "0.3.66"
 libp2p-core = { workspace = true }
 tracing = "0.1.37"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 31f91874f68..385e292103c 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 futures-rustls = "0.24.0"
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 2831a2e8c89..25ece175a3f 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 js-sys = "0.3.66"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index d8c11b646f1..5422fe20fe1 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 release = false
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 getrandom = { version = "0.2.11", features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }

From 499928ce479e2fbfdf079d8e29294d45c108adb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 05:25:07 +0000
Subject: [PATCH 037/455] deps: bump trybuild from 1.0.85 to 1.0.86

Pull-Request: #5036.
---
 Cargo.lock       | 4 ++--
 swarm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3094ec7bb54..95d4499bbde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6123,9 +6123,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1"
+checksum = "8419ecd263363827c5730386f418715766f584e2f874d32c23c5b00bd9727e7e"
 dependencies = [
  "basic-toml",
  "glob",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 28f6efa8784..9de312e76d7 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -53,7 +53,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.85"
+trybuild = "1.0.86"
 tokio = { version = "1.35.1", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 507d94a2b3aeb6a6a1b320966f42ca03256439a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 05:35:05 +0000
Subject: [PATCH 038/455] deps: bump proc-macro2 from 1.0.69 to 1.0.71

Pull-Request: #5041.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95d4499bbde..b22fab2d0d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4445,9 +4445,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
 dependencies = [
  "unicode-ident",
 ]

From 4fc911e6b39f8b2f097583fb60178948ae368528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 08:29:07 +0000
Subject: [PATCH 039/455] deps: bump actions/upload-pages-artifact from 2.0.0
 to 3.0.0

Pull-Request: #5023.
---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 196b389fd2e..f1e478c4d80 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -24,7 +24,7 @@ jobs:
         echo "<meta http-equiv=\"refresh\" content=\"0; url=libp2p\">" > target/doc/index.html
         cp -r target/doc/* ./host-docs
     - name: Upload documentation
-      uses: actions/upload-pages-artifact@v2.0.0
+      uses: actions/upload-pages-artifact@v3.0.0
       with:
         path: "host-docs/"
 

From 9862187655c4a827f71aafd1c3568487f4c2d225 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Sat, 30 Dec 2023 21:12:34 +1100
Subject: [PATCH 040/455] deps: bump Rust to 1.75 and fix clippy lints

Pull-Request: #5043.
---
 .github/workflows/ci.yml                      |  5 +--
 muxers/mplex/benches/split_send_size.rs       |  2 +-
 muxers/mplex/src/io.rs                        |  6 +--
 protocols/kad/src/behaviour.rs                | 36 ++++++++++--------
 protocols/kad/src/kbucket.rs                  | 37 +++++++++----------
 protocols/kad/src/kbucket/entry.rs            |  3 --
 protocols/relay/src/behaviour/rate_limiter.rs |  2 +-
 transports/dns/src/lib.rs                     |  1 +
 transports/noise/src/lib.rs                   |  1 +
 transports/webtransport-websys/src/error.rs   |  1 +
 10 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8770a29bc9..b02398bb950 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -234,9 +234,8 @@ jobs:
       fail-fast: false
       matrix:
         rust-version: [
-          # 1.72.0, # current stable
-          # beta,
-          nightly-2023-09-10
+          1.75.0, # current stable
+          beta,
         ]
     steps:
       - uses: actions/checkout@v4
diff --git a/muxers/mplex/benches/split_send_size.rs b/muxers/mplex/benches/split_send_size.rs
index 9a9814d2f2a..0125d49dcef 100644
--- a/muxers/mplex/benches/split_send_size.rs
+++ b/muxers/mplex/benches/split_send_size.rs
@@ -101,7 +101,7 @@ fn prepare(c: &mut Criterion) {
 fn run(
     receiver_trans: &mut BenchTransport,
     sender_trans: &mut BenchTransport,
-    payload: &Vec<u8>,
+    payload: &[u8],
     listen_addr: &Multiaddr,
 ) {
     receiver_trans
diff --git a/muxers/mplex/src/io.rs b/muxers/mplex/src/io.rs
index 753294a7845..50fc0fc1d3f 100644
--- a/muxers/mplex/src/io.rs
+++ b/muxers/mplex/src/io.rs
@@ -224,7 +224,7 @@ where
             // yield to give the current task a chance to read
             // from the respective substreams.
             if num_buffered == self.config.max_buffer_len {
-                cx.waker().clone().wake();
+                cx.waker().wake_by_ref();
                 return Poll::Pending;
             }
 
@@ -456,7 +456,7 @@ where
             // next frame for `id`, yield to give the current task
             // a chance to read from the other substream(s).
             if num_buffered == self.config.max_buffer_len {
-                cx.waker().clone().wake();
+                cx.waker().wake_by_ref();
                 return Poll::Pending;
             }
 
@@ -663,7 +663,7 @@ where
                     connection=%self.id,
                     "No task to read from blocked stream. Waking current task."
                 );
-                cx.waker().clone().wake();
+                cx.waker().wake_by_ref();
             } else if let Some(id) = stream_id {
                 // We woke some other task, but are still interested in
                 // reading `Data` frames from the current stream when unblocked.
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index cde4fbb8536..f7e2fb3a032 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -519,7 +519,7 @@ where
         };
         let key = kbucket::Key::from(*peer);
         match self.kbuckets.entry(&key) {
-            kbucket::Entry::Present(mut entry, _) => {
+            Some(kbucket::Entry::Present(mut entry, _)) => {
                 if entry.value().insert(address) {
                     self.queued_events
                         .push_back(ToSwarm::GenerateEvent(Event::RoutingUpdated {
@@ -536,11 +536,11 @@ where
                 }
                 RoutingUpdate::Success
             }
-            kbucket::Entry::Pending(mut entry, _) => {
+            Some(kbucket::Entry::Pending(mut entry, _)) => {
                 entry.value().insert(address);
                 RoutingUpdate::Pending
             }
-            kbucket::Entry::Absent(entry) => {
+            Some(kbucket::Entry::Absent(entry)) => {
                 let addresses = Addresses::new(address);
                 let status = if self.connected_peers.contains(peer) {
                     NodeStatus::Connected
@@ -578,7 +578,7 @@ where
                     }
                 }
             }
-            kbucket::Entry::SelfEntry => RoutingUpdate::Failed,
+            None => RoutingUpdate::Failed,
         }
     }
 
@@ -599,7 +599,7 @@ where
     ) -> Option<kbucket::EntryView<kbucket::Key<PeerId>, Addresses>> {
         let address = &address.to_owned().with_p2p(*peer).ok()?;
         let key = kbucket::Key::from(*peer);
-        match self.kbuckets.entry(&key) {
+        match self.kbuckets.entry(&key)? {
             kbucket::Entry::Present(mut entry, _) => {
                 if entry.value().remove(address).is_err() {
                     Some(entry.remove()) // it is the last address, thus remove the peer.
@@ -614,7 +614,7 @@ where
                     None
                 }
             }
-            kbucket::Entry::Absent(..) | kbucket::Entry::SelfEntry => None,
+            kbucket::Entry::Absent(..) => None,
         }
     }
 
@@ -627,10 +627,10 @@ where
         peer: &PeerId,
     ) -> Option<kbucket::EntryView<kbucket::Key<PeerId>, Addresses>> {
         let key = kbucket::Key::from(*peer);
-        match self.kbuckets.entry(&key) {
+        match self.kbuckets.entry(&key)? {
             kbucket::Entry::Present(entry, _) => Some(entry.remove()),
             kbucket::Entry::Pending(entry, _) => Some(entry.remove()),
-            kbucket::Entry::Absent(..) | kbucket::Entry::SelfEntry => None,
+            kbucket::Entry::Absent(..) => None,
         }
     }
 
@@ -1164,7 +1164,8 @@ where
                             let key = kbucket::Key::from(node_id);
                             kbuckets
                                 .entry(&key)
-                                .view()
+                                .as_mut()
+                                .and_then(|e| e.view())
                                 .map(|e| e.node.value.clone().into_vec())
                         }
                     } else {
@@ -1220,7 +1221,7 @@ where
     ) {
         let key = kbucket::Key::from(peer);
         match self.kbuckets.entry(&key) {
-            kbucket::Entry::Present(mut entry, old_status) => {
+            Some(kbucket::Entry::Present(mut entry, old_status)) => {
                 if old_status != new_status {
                     entry.update(new_status)
                 }
@@ -1243,7 +1244,7 @@ where
                 }
             }
 
-            kbucket::Entry::Pending(mut entry, old_status) => {
+            Some(kbucket::Entry::Pending(mut entry, old_status)) => {
                 if let Some(address) = address {
                     entry.value().insert(address);
                 }
@@ -1252,7 +1253,7 @@ where
                 }
             }
 
-            kbucket::Entry::Absent(entry) => {
+            Some(kbucket::Entry::Absent(entry)) => {
                 // Only connected nodes with a known address are newly inserted.
                 if new_status != NodeStatus::Connected {
                     return;
@@ -1863,7 +1864,7 @@ where
     fn address_failed(&mut self, peer_id: PeerId, address: &Multiaddr) {
         let key = kbucket::Key::from(peer_id);
 
-        if let Some(addrs) = self.kbuckets.entry(&key).value() {
+        if let Some(addrs) = self.kbuckets.entry(&key).as_mut().and_then(|e| e.value()) {
             // TODO: Ideally, the address should only be removed if the error can
             // be classified as "permanent" but since `err` is currently a borrowed
             // trait object without a `'static` bound, even downcasting for inspection
@@ -1931,7 +1932,12 @@ where
         let (old, new) = (old.get_remote_address(), new.get_remote_address());
 
         // Update routing table.
-        if let Some(addrs) = self.kbuckets.entry(&kbucket::Key::from(peer)).value() {
+        if let Some(addrs) = self
+            .kbuckets
+            .entry(&kbucket::Key::from(peer))
+            .as_mut()
+            .and_then(|e| e.value())
+        {
             if addrs.replace(old, new) {
                 tracing::debug!(
                     %peer,
@@ -2132,7 +2138,7 @@ where
         // the addresses of that peer in the k-buckets.
         let key = kbucket::Key::from(peer_id);
         let mut peer_addrs =
-            if let kbucket::Entry::Present(mut entry, _) = self.kbuckets.entry(&key) {
+            if let Some(kbucket::Entry::Present(mut entry, _)) = self.kbuckets.entry(&key) {
                 let addrs = entry.value().iter().cloned().collect::<Vec<_>>();
                 debug_assert!(!addrs.is_empty(), "Empty peer addresses in routing table.");
                 addrs
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index b42806fcf3c..a0d272c31f1 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -172,17 +172,16 @@ where
 
     /// Returns an `Entry` for the given key, representing the state of the entry
     /// in the routing table.
-    pub(crate) fn entry<'a>(&'a mut self, key: &'a TKey) -> Entry<'a, TKey, TVal> {
-        let index = BucketIndex::new(&self.local_key.as_ref().distance(key));
-        if let Some(i) = index {
-            let bucket = &mut self.buckets[i.get()];
-            if let Some(applied) = bucket.apply_pending() {
-                self.applied_pending.push_back(applied)
-            }
-            Entry::new(bucket, key)
-        } else {
-            Entry::SelfEntry
+    ///
+    /// Returns `None` in case the key points to the local node.
+    pub(crate) fn entry<'a>(&'a mut self, key: &'a TKey) -> Option<Entry<'a, TKey, TVal>> {
+        let index = BucketIndex::new(&self.local_key.as_ref().distance(key))?;
+
+        let bucket = &mut self.buckets[index.get()];
+        if let Some(applied) = bucket.apply_pending() {
+            self.applied_pending.push_back(applied)
         }
+        Some(Entry::new(bucket, key))
     }
 
     /// Returns an iterator over all buckets.
@@ -627,7 +626,7 @@ mod tests {
         let other_id = Key::from(PeerId::random());
 
         let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_secs(5));
-        if let Entry::Absent(entry) = table.entry(&other_id) {
+        if let Some(Entry::Absent(entry)) = table.entry(&other_id) {
             match entry.insert((), NodeStatus::Connected) {
                 InsertResult::Inserted => (),
                 _ => panic!(),
@@ -645,10 +644,8 @@ mod tests {
     fn entry_self() {
         let local_key = Key::from(PeerId::random());
         let mut table = KBucketsTable::<_, ()>::new(local_key.clone(), Duration::from_secs(5));
-        match table.entry(&local_key) {
-            Entry::SelfEntry => (),
-            _ => panic!(),
-        }
+
+        assert!(table.entry(&local_key).is_none())
     }
 
     #[test]
@@ -661,7 +658,7 @@ mod tests {
                 break;
             }
             let key = Key::from(PeerId::random());
-            if let Entry::Absent(e) = table.entry(&key) {
+            if let Some(Entry::Absent(e)) = table.entry(&key) {
                 match e.insert((), NodeStatus::Connected) {
                     InsertResult::Inserted => count += 1,
                     _ => continue,
@@ -694,10 +691,10 @@ mod tests {
         let full_bucket_index;
         loop {
             let key = Key::from(PeerId::random());
-            if let Entry::Absent(e) = table.entry(&key) {
+            if let Some(Entry::Absent(e)) = table.entry(&key) {
                 match e.insert((), NodeStatus::Disconnected) {
                     InsertResult::Full => {
-                        if let Entry::Absent(e) = table.entry(&key) {
+                        if let Some(Entry::Absent(e)) = table.entry(&key) {
                             match e.insert((), NodeStatus::Connected) {
                                 InsertResult::Pending { disconnected } => {
                                     expected_applied = AppliedPending {
@@ -732,12 +729,12 @@ mod tests {
         full_bucket.pending_mut().unwrap().set_ready_at(elapsed);
 
         match table.entry(&expected_applied.inserted.key) {
-            Entry::Present(_, NodeStatus::Connected) => {}
+            Some(Entry::Present(_, NodeStatus::Connected)) => {}
             x => panic!("Unexpected entry: {x:?}"),
         }
 
         match table.entry(&expected_applied.evicted.as_ref().unwrap().key) {
-            Entry::Absent(_) => {}
+            Some(Entry::Absent(_)) => {}
             x => panic!("Unexpected entry: {x:?}"),
         }
 
diff --git a/protocols/kad/src/kbucket/entry.rs b/protocols/kad/src/kbucket/entry.rs
index c38aac4a483..02c90fdfcc7 100644
--- a/protocols/kad/src/kbucket/entry.rs
+++ b/protocols/kad/src/kbucket/entry.rs
@@ -81,8 +81,6 @@ pub(crate) enum Entry<'a, TPeerId, TVal> {
     Pending(PendingEntry<'a, TPeerId, TVal>, NodeStatus),
     /// The entry is absent and may be inserted.
     Absent(AbsentEntry<'a, TPeerId, TVal>),
-    /// The entry represents the local node.
-    SelfEntry,
 }
 
 /// The internal representation of the different states of an `Entry`,
@@ -144,7 +142,6 @@ where
             Entry::Present(entry, _) => Some(entry.value()),
             Entry::Pending(entry, _) => Some(entry.value()),
             Entry::Absent(_) => None,
-            Entry::SelfEntry => None,
         }
     }
 }
diff --git a/protocols/relay/src/behaviour/rate_limiter.rs b/protocols/relay/src/behaviour/rate_limiter.rs
index a4a127e1253..9c4f67d04a8 100644
--- a/protocols/relay/src/behaviour/rate_limiter.rs
+++ b/protocols/relay/src/behaviour/rate_limiter.rs
@@ -124,7 +124,7 @@ impl<Id: Eq + PartialEq + Hash + Clone> GenericRateLimiter<Id> {
         // Note when used with a high number of buckets: This loop refills all the to-be-refilled
         // buckets at once, thus potentially delaying the parent call to `try_next`.
         loop {
-            match self.refill_schedule.get(0) {
+            match self.refill_schedule.front() {
                 // Only continue if (a) there is a bucket and (b) the bucket has not already been
                 // refilled recently.
                 Some((last_refill, _)) if now.duration_since(*last_refill) >= self.interval => {}
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index 3aeac4e4154..be847e568ed 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -416,6 +416,7 @@ pub enum Error<TErr> {
     /// The underlying transport encountered an error.
     Transport(TErr),
     /// DNS resolution failed.
+    #[allow(clippy::enum_variant_names)]
     ResolveError(ResolveError),
     /// DNS resolution was successful, but the underlying transport refused the resolved address.
     MultiaddrNotSupported(Multiaddr),
diff --git a/transports/noise/src/lib.rs b/transports/noise/src/lib.rs
index 70fae9d7ee6..2557e76e276 100644
--- a/transports/noise/src/lib.rs
+++ b/transports/noise/src/lib.rs
@@ -240,6 +240,7 @@ pub enum Error {
     #[error("failed to decode protobuf ")]
     InvalidPayload(#[from] DecodeError),
     #[error(transparent)]
+    #[allow(clippy::enum_variant_names)]
     SigningError(#[from] libp2p_identity::SigningError),
     #[error("Expected WebTransport certhashes ({}) are not a subset of received ones ({})", certhashes_to_string(.0), certhashes_to_string(.1))]
     UnknownWebTransportCerthashes(HashSet<Multihash<64>>, HashSet<Multihash<64>>),
diff --git a/transports/webtransport-websys/src/error.rs b/transports/webtransport-websys/src/error.rs
index ad85cab7537..704cfffb1fd 100644
--- a/transports/webtransport-websys/src/error.rs
+++ b/transports/webtransport-websys/src/error.rs
@@ -11,6 +11,7 @@ pub enum Error {
     Noise(#[from] libp2p_noise::Error),
 
     #[error("JavaScript error: {0}")]
+    #[allow(clippy::enum_variant_names)]
     JsError(String),
 
     #[error("JavaScript typecasting failed")]

From 0289824e59d7ba4851742b1abe4725630a7bcbcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 08:28:51 +0000
Subject: [PATCH 041/455] deps: bump thiserror from 1.0.51 to 1.0.53

Pull-Request: #5044.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b22fab2d0d3..6247efa643e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5763,18 +5763,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.51"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
+checksum = "b2cd5904763bad08ad5513ddbb12cf2ae273ca53fa9f68e843e236ec6dfccc09"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.51"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
+checksum = "3dcf4a824cce0aeacd6f38ae6f24234c8e80d68632338ebaa1443b5df9e29e19"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 9376a91cf9a..4b8cbfa8161 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.11.2"
-thiserror = "1.0.51"
+thiserror = "1.0.53"
 tracing = "0.1.37"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 70f262cf2d4..44feccf94c3 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.51"
+thiserror = "1.0.53"
 tracing = "0.1.37"
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index c959ab09f0f..9e397b46e8a 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.51"
+thiserror = "1.0.53"
 tokio = { version = "1.35.1", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 2f8cc0e5880..540954c096a 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = "0.16.20"
-thiserror = "1.0.51"
+thiserror = "1.0.53"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.15.1"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 1a822f77f1e..91de53b12de 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
-thiserror = "1.0.51"
+thiserror = "1.0.53"
 wasm-bindgen = "0.2.89"
 web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 25ece175a3f..23ed7d6aa42 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.51"
+thiserror = "1.0.53"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"

From e0628e579afce23808e76712d4c98fc668085fdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 22:31:54 +0000
Subject: [PATCH 042/455] deps: bump clap from 4.4.11 to 4.4.12

Pull-Request: #5046.
---
 Cargo.lock                       | 8 ++++----
 examples/autonat/Cargo.toml      | 2 +-
 examples/dcutr/Cargo.toml        | 2 +-
 examples/file-sharing/Cargo.toml | 2 +-
 examples/ipfs-kad/Cargo.toml     | 2 +-
 examples/relay-server/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml           | 2 +-
 misc/server/Cargo.toml           | 2 +-
 protocols/dcutr/Cargo.toml       | 2 +-
 protocols/perf/Cargo.toml        | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6247efa643e..c845ac03615 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -898,9 +898,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.11"
+version = "4.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
+checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -908,9 +908,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.11"
+version = "4.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
+checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
 dependencies = [
  "anstream",
  "anstyle",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 9dbe1cabd01..2e4e5a1295d 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 8bbc02debe1..9d5cb4d2c3e 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index c903b515e07..b9bfdf769f4 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 either = "1.9"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 52001626de4..1b5abe5387d 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
 anyhow = "1.0.76"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 127c002a73c..2a2692913e0 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 2a4b7e28418..a2f6eea99eb 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 release = false
 
 [dependencies]
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index e23660311bd..15e36576c7d 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.21"
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index cf353f5aef6..d878b499157 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -29,7 +29,7 @@ futures-bounded = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 944cc44a5ab..a03bbc267a1 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.4.11", features = ["derive"] }
+clap = { version = "4.4.12", features = ["derive"] }
 futures = "0.3.30"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"

From af989f6e3bef879c37eaa234525f189ce7bd2fc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 13:43:44 +0000
Subject: [PATCH 043/455] deps: bump tempfile from 3.8.1 to 3.9.0

Pull-Request: #5047.
---
 Cargo.lock                | 43 +++++++++++++++------------------------
 transports/uds/Cargo.toml |  2 +-
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c845ac03615..14dee31fb1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -311,7 +311,7 @@ dependencies = [
  "futures-lite 2.0.1",
  "parking",
  "polling 3.3.0",
- "rustix 0.38.21",
+ "rustix 0.38.28",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -1460,23 +1460,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2490,7 +2479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.21",
+ "rustix 0.38.28",
  "windows-sys 0.48.0",
 ]
 
@@ -3580,9 +3569,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
 [[package]]
 name = "lock_api"
@@ -4376,7 +4365,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.21",
+ "rustix 0.38.28",
  "tracing",
  "windows-sys 0.48.0",
 ]
@@ -5078,15 +5067,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
- "linux-raw-sys 0.4.10",
- "windows-sys 0.48.0",
+ "linux-raw-sys 0.4.12",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5703,15 +5692,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.0",
  "redox_syscall 0.4.1",
- "rustix 0.38.21",
- "windows-sys 0.48.0",
+ "rustix 0.38.28",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index 4efb2e45be4..b01a5145604 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -18,7 +18,7 @@ tokio = { version = "1.35", default-features = false, features = ["net"], option
 tracing = "0.1.37"
 
 [dev-dependencies]
-tempfile = "3.8"
+tempfile = "3.9"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling

From 99a6ad452aff8f46e6288d63ac6861a23f2d529a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 20:52:36 +0000
Subject: [PATCH 044/455] deps: bump rust-embed from 8.1.0 to 8.2.0

Pull-Request: #5049.
---
 Cargo.lock                         | 12 ++++++------
 examples/browser-webrtc/Cargo.toml |  2 +-
 interop-tests/Cargo.toml           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14dee31fb1d..8f8c6a5aa82 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4987,9 +4987,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810294a8a4a0853d4118e3b94bb079905f2107c7fe979d8f0faae98765eb6378"
+checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -4998,9 +4998,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc144a1273124a67b8c1d7cd19f5695d1878b31569c0512f6086f0f4676604e"
+checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5012,9 +5012,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ccd4875431253d6bb54b804bcff4369cbde9bae33defde25fdf6c2ef91d40"
+checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665"
 dependencies = [
  "globset",
  "sha2 0.10.8",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 0587f23e234..ba9b781cd4e 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -26,7 +26,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 axum = "0.7.1"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
-rust-embed = { version = "8.1.0", features = ["include-exclude", "interpolate-folder-path"] }
+rust-embed = { version = "8.2.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index c45b50dee64..d4663c9d41f 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -31,7 +31,7 @@ mime_guess = "2.0"
 redis = { version = "0.23.3", default-features = false, features = [
     "tokio-comp",
 ] }
-rust-embed = "8.1"
+rust-embed = "8.2"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.35.1", features = ["full"] }

From c71b7c1ccaad9a2f75749c16f4f8d2c863ea74ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 21:02:48 +0000
Subject: [PATCH 045/455] deps: bump serde_json from 1.0.108 to 1.0.109

Pull-Request: #5050.
---
 Cargo.lock                            | 4 ++--
 hole-punching-tests/Cargo.toml        | 2 +-
 misc/keygen/Cargo.toml                | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8f8c6a5aa82..2f63091c0eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5296,9 +5296,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
 dependencies = [
  "indexmap 2.0.0",
  "itoa",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 679e2e8e8a0..8135e17b536 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.35.1", features = ["full"] }
 serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.108"
+serde_json = "1.0.109"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index a2f6eea99eb..f03c18e99db 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.4.12", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.108"
+serde_json = "1.0.109"
 libp2p-core = { workspace = true }
 base64 = "0.21.5"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index e85ff691969..9a72b5638f6 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.108", optional = true }
+serde_json = { version = "1.0.109", optional = true }
 smallvec = "1.11.2"
 tracing = "0.1.37"
 void = "1.0.2"

From fed424e853304b07118c014df171fd8c4a6f73b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 21:12:30 +0000
Subject: [PATCH 046/455] deps: bump anyhow from 1.0.76 to 1.0.78

Pull-Request: #5051.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2f63091c0eb..cda40ca1b90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -143,9 +143,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.76"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
+checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index ba9b781cd4e..0fe38e70d5d 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.76"
+anyhow = "1.0.78"
 futures = "0.3.30"
 rand = "0.8"
 tracing = "0.1.37"
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 1b5abe5387d..a30f83bdac9 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.4.12", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
-anyhow = "1.0.76"
+anyhow = "1.0.78"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 9a72b5638f6..cca41f22c14 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.76"
+anyhow = "1.0.78"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From e688ee7ba044f01a98f68d84bcf6e184c428c54b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 07:43:58 +0000
Subject: [PATCH 047/455] deps: bump proc-macro2 from 1.0.71 to 1.0.73

Pull-Request: #5054.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cda40ca1b90..fe35c94d07f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4434,9 +4434,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1"
 dependencies = [
  "unicode-ident",
 ]

From 1913fb4cf5ac21c9e30d0bc0387f8e84ebe21626 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 07:53:57 +0000
Subject: [PATCH 048/455] deps: bump quote from 1.0.33 to 1.0.34

Pull-Request: #5055.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe35c94d07f..900c76dac77 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4587,9 +4587,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a"
 dependencies = [
  "proc-macro2",
 ]

From 08728b1674439844e38939728aa2b2893a10648e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 08:26:52 +0000
Subject: [PATCH 049/455] deps: bump anyhow from 1.0.78 to 1.0.79

Pull-Request: #5062.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 900c76dac77..d39ad497a10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -143,9 +143,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 0fe38e70d5d..42e1bdb3651 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.78"
+anyhow = "1.0.79"
 futures = "0.3.30"
 rand = "0.8"
 tracing = "0.1.37"
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index a30f83bdac9..8f2ecc71fa3 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.4.12", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
-anyhow = "1.0.78"
+anyhow = "1.0.79"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index cca41f22c14..3d38cc357a9 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.78"
+anyhow = "1.0.79"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From 53500e294f90506d4985caa886d2a70c24fa37bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 07:45:06 +0000
Subject: [PATCH 050/455] deps: bump serde_json from 1.0.109 to 1.0.111

Pull-Request: #5063.
---
 Cargo.lock                            | 64 +++++++++++++--------------
 hole-punching-tests/Cargo.toml        |  2 +-
 misc/keygen/Cargo.toml                |  2 +-
 protocols/request-response/Cargo.toml |  2 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d39ad497a10..e678dd1789d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,7 +424,7 @@ checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -927,7 +927,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1204,7 +1204,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1426,7 +1426,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1685,7 +1685,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3274,7 +3274,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4038,7 +4038,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4264,7 +4264,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4434,9 +4434,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.73"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
@@ -4461,7 +4461,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4587,9 +4587,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -5006,7 +5006,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.43",
+ "syn 2.0.48",
  "walkdir",
 ]
 
@@ -5276,29 +5276,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.109"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "indexmap 2.0.0",
  "itoa",
@@ -5324,7 +5324,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5627,9 +5627,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.43"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5767,7 +5767,7 @@ checksum = "3dcf4a824cce0aeacd6f38ae6f24234c8e80d68632338ebaa1443b5df9e29e19"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5869,7 +5869,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -6024,7 +6024,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -6381,7 +6381,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -6415,7 +6415,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6448,7 +6448,7 @@ checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -7031,5 +7031,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.48",
 ]
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 8135e17b536..201b493e90a 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.35.1", features = ["full"] }
 serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.111"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index f03c18e99db..c4670f2578a 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.4.12", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.111"
 libp2p-core = { workspace = true }
 base64 = "0.21.5"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 3d38cc357a9..67536294696 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.109", optional = true }
+serde_json = { version = "1.0.111", optional = true }
 smallvec = "1.11.2"
 tracing = "0.1.37"
 void = "1.0.2"

From 3e06e0bca3c2d29bc7fb0e67f880d14a74049483 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 08:29:51 +0000
Subject: [PATCH 051/455] deps: bump thiserror from 1.0.53 to 1.0.56

Pull-Request: #5064.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e678dd1789d..92b7c17cf6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5752,18 +5752,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cd5904763bad08ad5513ddbb12cf2ae273ca53fa9f68e843e236ec6dfccc09"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcf4a824cce0aeacd6f38ae6f24234c8e80d68632338ebaa1443b5df9e29e19"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 4b8cbfa8161..6e26579310d 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.11.2"
-thiserror = "1.0.53"
+thiserror = "1.0.56"
 tracing = "0.1.37"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 44feccf94c3..4621a5112ab 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.53"
+thiserror = "1.0.56"
 tracing = "0.1.37"
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 9e397b46e8a..8ad089042de 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.53"
+thiserror = "1.0.56"
 tokio = { version = "1.35.1", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 540954c096a..cecec003028 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = "0.16.20"
-thiserror = "1.0.53"
+thiserror = "1.0.56"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.15.1"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 91de53b12de..d8907651da9 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
-thiserror = "1.0.53"
+thiserror = "1.0.56"
 wasm-bindgen = "0.2.89"
 web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 23ed7d6aa42..39dc34011d7 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.53"
+thiserror = "1.0.56"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.39"

From 92b2414d62e64a7eba29406757fffb405cbaa6f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 15:31:16 +0000
Subject: [PATCH 052/455] deps: bump libc from 0.2.151 to 0.2.152

Pull-Request: #5065.
---
 Cargo.lock                | 4 ++--
 transports/tcp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 92b7c17cf6a..b5814d46ce3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2546,9 +2546,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libp2p"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 52e38e24b6e..74e804f2d3e 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -15,7 +15,7 @@ async-io = { version = "2.2.2", optional = true }
 futures = "0.3.30"
 futures-timer = "3.0"
 if-watch = "3.2.0"
-libc = "0.2.151"
+libc = "0.2.152"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.5", features = ["all"] }

From 48de34ee6a5f4ec024ad10c9b165783f6c0e5618 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 08:27:25 +0000
Subject: [PATCH 053/455] deps: bump trybuild from 1.0.86 to 1.0.88

Pull-Request: #5068.
---
 Cargo.lock       | 8 ++++----
 swarm/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5814d46ce3..8aa02b8c81c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -620,9 +620,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-toml"
-version = "0.1.4"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
+checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5"
 dependencies = [
  "serde",
 ]
@@ -6112,9 +6112,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.86"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419ecd263363827c5730386f418715766f584e2f874d32c23c5b00bd9727e7e"
+checksum = "76de4f783e610194f6c98bfd53f9fc52bb2e0d02c947621e8a0f4ecc799b2880"
 dependencies = [
  "basic-toml",
  "glob",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 9de312e76d7..47ec94efbf7 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -53,7 +53,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.86"
+trybuild = "1.0.88"
 tokio = { version = "1.35.1", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 3a94460b2386306484cb0f1766d94cedfa415c95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:15:24 +0000
Subject: [PATCH 054/455] deps: bump proc-macro2 from 1.0.73 to 1.0.76

Pull-Request: #5069.

From fa3e5b6f9d5bc1ce0456148cd9682493fdbc4eea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 08:20:06 +0000
Subject: [PATCH 055/455] deps: bump clap from 4.4.12 to 4.4.13

Pull-Request: #5070.
---
 Cargo.lock                       | 4 ++--
 examples/autonat/Cargo.toml      | 2 +-
 examples/dcutr/Cargo.toml        | 2 +-
 examples/file-sharing/Cargo.toml | 2 +-
 examples/ipfs-kad/Cargo.toml     | 2 +-
 examples/relay-server/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml           | 2 +-
 misc/server/Cargo.toml           | 2 +-
 protocols/dcutr/Cargo.toml       | 2 +-
 protocols/perf/Cargo.toml        | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8aa02b8c81c..9bdedbb4dcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -898,9 +898,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.12"
+version = "4.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d"
+checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
 dependencies = [
  "clap_builder",
  "clap_derive",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 2e4e5a1295d..17c456e4334 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 9d5cb4d2c3e..b07b66ab69f 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index b9bfdf769f4..1bac0306649 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 either = "1.9"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 8f2ecc71fa3..9b7c760b36b 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
 anyhow = "1.0.79"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 2a2692913e0..449e27b299e 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index c4670f2578a..51bd3f38c3b 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 release = false
 
 [dependencies]
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.111"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 15e36576c7d..38980d1894a 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.21"
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index d878b499157..4359f2f02d7 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -29,7 +29,7 @@ futures-bounded = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index a03bbc267a1..705b4e93729 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.4.12", features = ["derive"] }
+clap = { version = "4.4.13", features = ["derive"] }
 futures = "0.3.30"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"

From 5ad9485bd402d0f16cb1d2b521bb4abed0938d7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 08:08:03 +0000
Subject: [PATCH 056/455] deps: bump Swatinem/rust-cache from 2.7.1 to 2.7.2

Pull-Request: #5076.
---
 .github/workflows/cache-factory.yml |  2 +-
 .github/workflows/ci.yml            | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cache-factory.yml b/.github/workflows/cache-factory.yml
index 07e2bb1f7cf..66b88a8a606 100644
--- a/.github/workflows/cache-factory.yml
+++ b/.github/workflows/cache-factory.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           shared-key: stable-cache
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b02398bb950..0b160055bb1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           shared-key: stable-cache
           save-if: false
@@ -158,7 +158,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           key: ${{ matrix.target }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -183,7 +183,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -204,7 +204,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           key: ${{ matrix.features }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -221,7 +221,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -247,7 +247,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -263,7 +263,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -282,7 +282,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
         with:
           shared-key: stable-cache
           save-if: false
@@ -374,7 +374,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
 
       - run: cargo install --version 0.10.0 pb-rs --locked
 
@@ -400,7 +400,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
       - run: cargo metadata --locked --format-version=1 > /dev/null
 
   cargo-deny:

From ca376f100a67cdb341d0d0619f51bb5482dfeb46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Jan 2024 00:02:49 +0000
Subject: [PATCH 057/455] deps: bump tj-actions/glob from 17 to 18

Pull-Request: #5058.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b160055bb1..3dbb50353ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -379,7 +379,7 @@ jobs:
       - run: cargo install --version 0.10.0 pb-rs --locked
 
       - name: Glob match
-        uses: tj-actions/glob@v17
+        uses: tj-actions/glob@v18
         id: glob
         with:
           files: |

From 830f93f36ba7fbdf5f9bfdc6bdde3cedc75ac904 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Jan 2024 00:14:26 +0000
Subject: [PATCH 058/455] deps: bump the axum group with 1 update

Pull-Request: #5045.
---
 Cargo.lock                         | 30 +++++++++++++++---------------
 examples/browser-webrtc/Cargo.toml |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9bdedbb4dcd..369c781800a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -505,18 +505,18 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8"
+checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d"
 dependencies = [
  "async-trait",
- "axum-core 0.4.0",
+ "axum-core 0.4.2",
  "bytes",
  "futures-util",
  "http 1.0.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.0.1",
+ "hyper 1.1.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -534,6 +534,7 @@ dependencies = [
  "tower",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -555,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73"
+checksum = "e87c8503f93e6d144ee5690907ba22db7ba79ab001a932ab99034f0fe836b3df"
 dependencies = [
  "async-trait",
  "bytes",
@@ -571,6 +572,7 @@ dependencies = [
  "sync_wrapper",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -710,7 +712,7 @@ name = "browser-webrtc-example"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.1",
+ "axum 0.7.3",
  "futures",
  "js-sys",
  "libp2p",
@@ -2162,9 +2164,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56"
+checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2221,21 +2223,19 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d"
+checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.0.0",
  "http-body 1.0.0",
- "hyper 1.0.1",
+ "hyper 1.1.0",
  "pin-project-lite",
  "socket2 0.5.5",
  "tokio",
- "tower",
- "tower-service",
  "tracing",
 ]
 
@@ -2386,7 +2386,7 @@ name = "interop-tests"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.1",
+ "axum 0.7.3",
  "console_error_panic_hook",
  "either",
  "futures",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 42e1bdb3651..ba18ddfb0fc 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -23,7 +23,7 @@ tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-axum = "0.7.1"
+axum = "0.7.3"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.2.0", features = ["include-exclude", "interpolate-folder-path"] }

From 1e40ee63a9dfe9cd9072237b8f645c62dca05a25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 01:01:32 +0000
Subject: [PATCH 059/455] deps: bump quote from 1.0.34 to 1.0.35

Pull-Request: #5071.

From 577e387b4cdad281d069ee6cd532ba0f4241953d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 01:34:12 +0000
Subject: [PATCH 060/455] deps: bump async-trait from 0.1.75 to 0.1.77

Pull-Request: #5081.
---
 Cargo.lock                | 4 ++--
 swarm-test/Cargo.toml     | 2 +-
 transports/dns/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 369c781800a..b7ef35e87fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -418,9 +418,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.75"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index cc16a7bccc4..ca66e115746 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.75"
+async-trait = "0.1.77"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 644db338ea9..d2a85ac1f16 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
-async-trait = "0.1.75"
+async-trait = "0.1.77"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From 9317726a7d40ca98dd4f9af3c7f940e475c77c1a Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 15 Jan 2024 19:09:22 +1100
Subject: [PATCH 061/455] ci: add dependabot group for webrtc

Pull-Request: #5082.
---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a0656e6162c..6c43a31d2c1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,6 +22,10 @@ updates:
           - "axum"
           - "tower"
           - "tower-http"
+      webrtc:
+        patterns:
+          - "rcgen"
+          - "webrtc"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From 795c856f8a2b2e07d7780e22da9a35474e093082 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 08:23:16 +0000
Subject: [PATCH 062/455] deps: bump base64 from 0.21.5 to 0.21.7

Pull-Request: #5086.
---
 Cargo.lock                     | 26 +++++++++++++-------------
 identity/Cargo.toml            |  2 +-
 misc/keygen/Cargo.toml         |  2 +-
 protocols/gossipsub/Cargo.toml |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7ef35e87fa..a051b8d096e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -610,9 +610,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -2520,7 +2520,7 @@ dependencies = [
 name = "keygen"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "clap",
  "libp2p-core",
  "libp2p-identity",
@@ -2764,7 +2764,7 @@ version = "0.46.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
- "base64 0.21.5",
+ "base64 0.21.7",
  "byteorder",
  "bytes",
  "either",
@@ -2824,7 +2824,7 @@ name = "libp2p-identity"
 version = "0.2.8"
 dependencies = [
  "asn1_der",
- "base64 0.21.5",
+ "base64 0.21.7",
  "bs58",
  "criterion",
  "ed25519-dalek",
@@ -3218,7 +3218,7 @@ dependencies = [
 name = "libp2p-server"
 version = "0.12.5"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "clap",
  "futures",
  "futures-timer",
@@ -4228,7 +4228,7 @@ version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "serde",
 ]
 
@@ -4833,7 +4833,7 @@ version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -5120,7 +5120,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -5586,7 +5586,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7beb1624a3ea34778d58d30e2b8606b4d29fe65e87c4d50b87ed30afd5c3830c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "crc",
  "lazy_static",
  "md-5",
@@ -5719,7 +5719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf0fe180d5f1f7dd32bb5f1a8d19231bb63dc9bbb1985e1dbb6f07163b6a8578"
 dependencies = [
  "async-trait",
- "base64 0.21.5",
+ "base64 0.21.7",
  "cookie",
  "fantoccini",
  "futures",
@@ -5927,7 +5927,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
 dependencies = [
  "async-trait",
  "axum 0.6.20",
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "futures-core",
  "futures-util",
@@ -6132,7 +6132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58f4fcb97da0426e8146fe0e9b78cc13120161087256198701d12d9df77f7701"
 dependencies = [
  "async-trait",
- "base64 0.21.5",
+ "base64 0.21.7",
  "futures",
  "log",
  "md-5",
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 5234507ec2d..920b9a990e4 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -42,7 +42,7 @@ rand = ["dep:rand", "ed25519-dalek?/rand_core"]
 
 [dev-dependencies]
 quickcheck = { workspace = true }
-base64 = "0.21.5"
+base64 = "0.21.7"
 serde_json = "1.0"
 rmp-serde = "1.1"
 criterion = "0.5"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 51bd3f38c3b..447616d0b52 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -18,7 +18,7 @@ zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.111"
 libp2p-core = { workspace = true }
-base64 = "0.21.5"
+base64 = "0.21.7"
 libp2p-identity = { workspace = true }
 
 [lints]
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 9264a866482..d3d84fe301f 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -15,7 +15,7 @@ wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-base64 = "0.21.5"
+base64 = "0.21.7"
 byteorder = "1.5.0"
 bytes = "1.5"
 either = "1.9"

From ad2579d284ba109c4143f2654043ddc92e0a4428 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 08:54:29 +0000
Subject: [PATCH 063/455] deps: bump trybuild from 1.0.88 to 1.0.89

Pull-Request: #5087.
---
 Cargo.lock       | 4 ++--
 swarm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a051b8d096e..6ba8b5ff13b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6112,9 +6112,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76de4f783e610194f6c98bfd53f9fc52bb2e0d02c947621e8a0f4ecc799b2880"
+checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f"
 dependencies = [
  "basic-toml",
  "glob",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 47ec94efbf7..7c329ea6cce 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -53,7 +53,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.88"
+trybuild = "1.0.89"
 tokio = { version = "1.35.1", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 1e3b8397f6f76404c8118ec0f06aad9841460fc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:06:40 +0000
Subject: [PATCH 064/455] deps: bump js-sys from 0.3.66 to 0.3.67

Pull-Request: #5091.
---
 Cargo.lock                                | 24 +++++++++++------------
 examples/browser-webrtc/Cargo.toml        |  2 +-
 transports/websocket-websys/Cargo.toml    |  2 +-
 transports/webtransport-websys/Cargo.toml |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ba8b5ff13b..044ea9687ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2500,9 +2500,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -6362,9 +6362,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -6372,9 +6372,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
@@ -6399,9 +6399,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6409,9 +6409,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6422,9 +6422,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index ba18ddfb0fc..c5033378dd0 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -34,7 +34,7 @@ tower-http = { version = "0.5.0", features = ["cors"] }
 mime_guess = "2.0.4"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = "0.3.66"
+js-sys = "0.3.67"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "wasm-bindgen"] }
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index d8907651da9..2bf95d18def 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 bytes = "1.4.0"
 futures = "0.3.30"
-js-sys = "0.3.66"
+js-sys = "0.3.67"
 libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 39dc34011d7..82e1c6ea38a 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures = "0.3.30"
-js-sys = "0.3.66"
+js-sys = "0.3.67"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-noise = { workspace = true }

From 5f90ab333bad40ba1f139e1098a7db5af4914405 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 16:37:44 +0000
Subject: [PATCH 065/455] deps: bump wasm-bindgen from 0.2.89 to 0.2.90

Pull-Request: #5089.
---
 examples/browser-webrtc/Cargo.toml        | 2 +-
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index c5033378dd0..d8bf9232514 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -38,7 +38,7 @@ js-sys = "0.3.67"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "wasm-bindgen"] }
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
-wasm-bindgen = "0.2.89"
+wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.39"
 web-sys = { version = "0.3", features = ['Document', 'Element', 'HtmlElement', 'Node', 'Response', 'Window'] }
 
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 34da24a3f5f..4edee98efc5 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -23,7 +23,7 @@ libp2p-webrtc-utils = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1"
 tracing = "0.1.37"
-wasm-bindgen = { version = "0.2.89" }
+wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.39" }
 web-sys = { version = "0.3.66", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 2bf95d18def..c8cfb1fcaec 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -19,7 +19,7 @@ tracing = "0.1.37"
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
 thiserror = "1.0.56"
-wasm-bindgen = "0.2.89"
+wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 82e1c6ea38a..456f8a1a757 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -24,7 +24,7 @@ multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.56"
 tracing = "0.1.37"
-wasm-bindgen = "0.2.89"
+wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.39"
 web-sys = { version = "0.3.66", features = [
     "ReadableStreamDefaultReader",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 5422fe20fe1..aa70bc2cc7e 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -17,7 +17,7 @@ libp2p-noise = { workspace = true }
 libp2p-webtransport-websys = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
-wasm-bindgen = "0.2.89"
+wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.39"
 wasm-bindgen-test = "0.3.39"
 web-sys = { version = "0.3.66", features = ["Response", "Window"] }

From ca8f7c1d7964acf7647a790a6a0398a1effae4a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 03:18:01 +0000
Subject: [PATCH 066/455] deps: bump smallvec from 1.11.2 to 1.12.0

Pull-Request: #5094.
---
 Cargo.lock                            | 4 ++--
 core/Cargo.toml                       | 2 +-
 misc/multistream-select/Cargo.toml    | 2 +-
 muxers/mplex/Cargo.toml               | 2 +-
 protocols/floodsub/Cargo.toml         | 2 +-
 protocols/gossipsub/Cargo.toml        | 2 +-
 protocols/identify/Cargo.toml         | 2 +-
 protocols/kad/Cargo.toml              | 2 +-
 protocols/mdns/Cargo.toml             | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 swarm/Cargo.toml                      | 2 +-
 transports/dns/Cargo.toml             | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 044ea9687ab..b106b29478e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5455,9 +5455,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
 
 [[package]]
 name = "smol"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 34b2202c166..03b472d9682 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -27,7 +27,7 @@ quick-protobuf = "0.8"
 rand = "0.8"
 rw-stream-sink = { workspace = true }
 serde = { version = "1", optional = true, features = ["derive"] }
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 thiserror = "1.0"
 tracing = "0.1.37"
 unsigned-varint = { workspace = true }
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 34b5b6a636c..19aefb977ff 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -15,7 +15,7 @@ bytes = "1"
 futures = "0.3"
 tracing = "0.1.37"
 pin-project = "1.1.3"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 unsigned-varint = { workspace = true }
 
 [dev-dependencies]
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 726e8a8434f..8de1d66c7d0 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
 nohash-hasher = "0.2"
 parking_lot = "0.12"
 rand = "0.8"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 tracing = "0.1.37"
 unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }
 
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 6e26579310d..177334d2145 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 thiserror = "1.0.56"
 tracing = "0.1.37"
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index d3d84fe301f..5b2471499e5 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -34,7 +34,7 @@ rand = "0.8"
 regex = "1.10.2"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1.0.2"
 
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index cd5a26d79ac..61ef9c47044 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
 lru = "0.12.1"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 thiserror = "1.0"
 tracing = "0.1.37"
 void = "1.0"
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 7acb73f074f..96f5f10819f 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -25,7 +25,7 @@ quick-protobuf-codec = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 rand = "0.8"
 sha2 = "0.10.8"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 uint = "0.9"
 void = "1.0"
 futures-timer = "3.0.2"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index b18c87dcc71..3a11ae71cdf 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8.3"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 socket2 = { version = "0.5.5", features = ["all"] }
 tokio = { version = "1.35", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 67536294696..c2c8d6d3085 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
 serde_json = { version = "1.0.111", optional = true }
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1.0.2"
 futures-timer = "3.0.2"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 7c329ea6cce..c2225204248 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -23,7 +23,7 @@ libp2p-swarm-derive = { workspace = true, optional = true }
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1"
 wasm-bindgen-futures = { version = "0.4.39", optional = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index d2a85ac1f16..9650893d575 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
 hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
-smallvec = "1.11.2"
+smallvec = "1.12.0"
 tracing = "0.1.37"
 
 [dev-dependencies]

From 015338b1b03c353012a7eccb186416e425d77a85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 03:28:11 +0000
Subject: [PATCH 067/455] deps: bump clap from 4.4.13 to 4.4.16

Pull-Request: #5095.
---
 Cargo.lock                       | 12 ++++++------
 examples/autonat/Cargo.toml      |  2 +-
 examples/dcutr/Cargo.toml        |  2 +-
 examples/file-sharing/Cargo.toml |  2 +-
 examples/ipfs-kad/Cargo.toml     |  2 +-
 examples/relay-server/Cargo.toml |  2 +-
 misc/keygen/Cargo.toml           |  2 +-
 misc/server/Cargo.toml           |  2 +-
 protocols/dcutr/Cargo.toml       |  2 +-
 protocols/perf/Cargo.toml        |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b106b29478e..9dba128c01e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -95,9 +95,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -900,9 +900,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.13"
+version = "4.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
+checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -910,9 +910,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.12"
+version = "4.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
+checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb"
 dependencies = [
  "anstream",
  "anstyle",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 17c456e4334..038c1800308 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index b07b66ab69f..b87ae728c04 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index 1bac0306649..e38039a11bb 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 either = "1.9"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 9b7c760b36b..855a9fd801d 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
 anyhow = "1.0.79"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 449e27b299e..65c7c707087 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 447616d0b52..998f1367734 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 release = false
 
 [dependencies]
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.111"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 38980d1894a..10af2cab4bf 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.21"
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 4359f2f02d7..aed7e2bf762 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -29,7 +29,7 @@ futures-bounded = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 705b4e93729..c0e5df3cefc 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 futures = "0.3.30"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"

From 8666d091b7856eb025ffba80ec795ab782b02325 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 03:38:39 +0000
Subject: [PATCH 068/455] deps: bump getrandom from 0.2.11 to 0.2.12

Pull-Request: #5092.
---
 Cargo.lock                               | 22 +++++++++++-----------
 protocols/gossipsub/Cargo.toml           |  2 +-
 swarm/Cargo.toml                         |  2 +-
 transports/webrtc-websys/Cargo.toml      |  2 +-
 wasm-tests/webtransport-tests/Cargo.toml |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9dba128c01e..c524ae56fa5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2561,7 +2561,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-autonat",
@@ -2771,7 +2771,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-ticker",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "hex",
  "hex_fmt",
  "instant",
@@ -3243,7 +3243,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "instant",
  "libp2p-core",
  "libp2p-identify",
@@ -3417,7 +3417,7 @@ version = "0.3.0-alpha"
 dependencies = [
  "bytes",
  "futures",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "hex",
  "js-sys",
  "libp2p-core",
@@ -4653,7 +4653,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
 ]
 
 [[package]]
@@ -4752,7 +4752,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
@@ -4907,7 +4907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
  "cc",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -6281,7 +6281,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
 ]
 
 [[package]]
@@ -6718,7 +6718,7 @@ name = "webtransport-tests"
 version = "0.1.0"
 dependencies = [
  "futures",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 5b2471499e5..bab952f0fb6 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -22,7 +22,7 @@ either = "1.9"
 fnv = "1.0.7"
 futures = "0.3.30"
 futures-ticker = "0.0.3"
-getrandom = "0.2.11"
+getrandom = "0.2.12"
 hex_fmt = "0.3.0"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index c2225204248..3a77aede919 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.9.0"
 fnv = "1.0"
 futures = "0.3.30"
 futures-timer = "3.0.2"
-getrandom = { version = "0.2.11", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
+getrandom = { version = "0.2.12", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 4edee98efc5..ab09725dcca 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -14,7 +14,7 @@ publish = true
 [dependencies]
 bytes = "1"
 futures = "0.3"
-getrandom = { version = "0.2.11", features = ["js"] }
+getrandom = { version = "0.2.12", features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
 libp2p-core = { workspace = true }
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index aa70bc2cc7e..16628fc1aa3 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 futures = "0.3.30"
-getrandom = { version = "0.2.11", features = ["js"] }
+getrandom = { version = "0.2.12", features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-noise = { workspace = true }

From cbbba79b391a8b0be1570a22a822bc652b006996 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 03:48:58 +0000
Subject: [PATCH 069/455] deps: bump igd-next from 0.14.2 to 0.14.3

Pull-Request: #5090.
---
 Cargo.lock                | 4 ++--
 protocols/upnp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c524ae56fa5..42378f90fe0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2303,9 +2303,9 @@ dependencies = [
 
 [[package]]
 name = "igd-next"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e065e90a518ab5fedf79aa1e4b784e10f8e484a834f6bda85c42633a2cb7af"
+checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4"
 dependencies = [
  "async-trait",
  "attohttpc",
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 2118dd4a728..c60aad4fe8f 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -13,7 +13,7 @@ publish = true
 [dependencies]
 futures = "0.3.30"
 futures-timer = "3.0.2"
-igd-next = "0.14.2"
+igd-next = "0.14.3"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 tokio = { version = "1.35", default-features = false, features = ["rt"], optional = true }

From b958897fcd7f108a64b34d109ce0ebfe6da1945f Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 15 Jan 2024 19:59:12 -0800
Subject: [PATCH 070/455] feat: introduce `libp2p-stream`

For a while now, `rust-libp2p` provided the `request-response` abstraction which makes it easy for users to build request-response based protocols without having to implement a `NetworkBehaviour` themselves. This PR introduces an alpha version of `libp2p-stream`: a `NetworkBehaviour` that directly gives access to negotiated streams.

In addition to complementing `request-response`, `libp2p-stream` also diverges in its design from the remaining modules by offering a clonable `Control` that provides `async` functions.

Resolves: #4457.

Pull-Request: #5027.
---
 Cargo.lock                        |  30 ++++++
 Cargo.toml                        |   9 +-
 examples/stream/Cargo.toml        |  22 ++++
 examples/stream/README.md         |  35 +++++++
 examples/stream/src/main.rs       | 154 +++++++++++++++++++++++++++
 protocols/stream/CHANGELOG.md     |   3 +
 protocols/stream/Cargo.toml       |  27 +++++
 protocols/stream/README.md        |  69 ++++++++++++
 protocols/stream/src/behaviour.rs | 143 +++++++++++++++++++++++++
 protocols/stream/src/control.rs   | 124 ++++++++++++++++++++++
 protocols/stream/src/handler.rs   | 165 +++++++++++++++++++++++++++++
 protocols/stream/src/lib.rs       |  10 ++
 protocols/stream/src/shared.rs    | 167 ++++++++++++++++++++++++++++++
 protocols/stream/src/upgrade.rs   |  42 ++++++++
 protocols/stream/tests/lib.rs     |  80 ++++++++++++++
 15 files changed, 1077 insertions(+), 3 deletions(-)
 create mode 100644 examples/stream/Cargo.toml
 create mode 100644 examples/stream/README.md
 create mode 100644 examples/stream/src/main.rs
 create mode 100644 protocols/stream/CHANGELOG.md
 create mode 100644 protocols/stream/Cargo.toml
 create mode 100644 protocols/stream/README.md
 create mode 100644 protocols/stream/src/behaviour.rs
 create mode 100644 protocols/stream/src/control.rs
 create mode 100644 protocols/stream/src/handler.rs
 create mode 100644 protocols/stream/src/lib.rs
 create mode 100644 protocols/stream/src/shared.rs
 create mode 100644 protocols/stream/src/upgrade.rs
 create mode 100644 protocols/stream/tests/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 42378f90fe0..98f2503fa2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3234,6 +3234,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "libp2p-stream"
+version = "0.1.0-alpha"
+dependencies = [
+ "futures",
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "libp2p-swarm-test",
+ "rand 0.8.5",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "void",
+]
+
 [[package]]
 name = "libp2p-swarm"
 version = "0.44.1"
@@ -5565,6 +5581,20 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "stream-example"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "futures",
+ "libp2p",
+ "libp2p-stream",
+ "rand 0.8.5",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "stringmatch"
 version = "0.4.0"
diff --git a/Cargo.toml b/Cargo.toml
index d10ed7e3bbf..9215d68dd9c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ members = [
     "examples/ping",
     "examples/relay-server",
     "examples/rendezvous",
+    "examples/stream",
     "examples/upnp",
     "hole-punching-tests",
     "identity",
@@ -45,10 +46,11 @@ members = [
     "protocols/relay",
     "protocols/rendezvous",
     "protocols/request-response",
+    "protocols/stream",
     "protocols/upnp",
-    "swarm",
     "swarm-derive",
     "swarm-test",
+    "swarm",
     "transports/dns",
     "transports/noise",
     "transports/plaintext",
@@ -57,11 +59,11 @@ members = [
     "transports/tcp",
     "transports/tls",
     "transports/uds",
-    "transports/webrtc",
     "transports/webrtc-websys",
+    "transports/webrtc",
+    "transports/websocket-websys",
     "transports/websocket",
     "transports/webtransport-websys",
-    "transports/websocket-websys",
     "wasm-tests/webtransport-tests",
 ]
 resolver = "2"
@@ -99,6 +101,7 @@ libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.1", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.5", path = "misc/server" }
+libp2p-stream = { version = "0.1.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.1", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
new file mode 100644
index 00000000000..5aab488358b
--- /dev/null
+++ b/examples/stream/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "stream-example"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "MIT"
+
+[package.metadata.release]
+release = false
+
+[dependencies]
+anyhow = "1"
+futures = "0.3.29"
+libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
+libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
+rand = "0.8"
+tokio = { version = "1.35", features = ["full"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+[lints]
+workspace = true
diff --git a/examples/stream/README.md b/examples/stream/README.md
new file mode 100644
index 00000000000..8437a5ea21e
--- /dev/null
+++ b/examples/stream/README.md
@@ -0,0 +1,35 @@
+## Description
+
+This example shows the usage of the `stream::Behaviour`.
+As a counter-part to the `request_response::Behaviour`, the `stream::Behaviour` allows users to write stream-oriented protocols whilst having minimal interaction with the `Swarm`.
+
+In this showcase, we implement an echo protocol: All incoming data is echoed back to the dialer, until the stream is closed.
+
+## Usage
+
+To run the example, follow these steps:
+
+1. Start an instance of the example in one terminal:
+
+   ```sh
+   cargo run --bin stream-example
+   ```
+
+   Observe printed listen address.
+
+2. Start another instance in a new terminal, providing the listen address of the first one.
+
+   ```sh
+   cargo run --bin stream-example -- <address>
+   ```
+
+3. Both terminals should now continuosly print messages. 
+
+## Conclusion
+
+The `stream::Behaviour` is an "escape-hatch" from the way typical rust-libp2p protocols are written.
+It is suitable for several scenarios including:
+
+- prototyping of new protocols
+- experimentation with rust-libp2p
+- integration in `async/await`-heavy applications
\ No newline at end of file
diff --git a/examples/stream/src/main.rs b/examples/stream/src/main.rs
new file mode 100644
index 00000000000..872ab8c3b98
--- /dev/null
+++ b/examples/stream/src/main.rs
@@ -0,0 +1,154 @@
+use std::{io, time::Duration};
+
+use anyhow::{Context, Result};
+use futures::{AsyncReadExt, AsyncWriteExt, StreamExt};
+use libp2p::{multiaddr::Protocol, Multiaddr, PeerId, Stream, StreamProtocol};
+use libp2p_stream as stream;
+use rand::RngCore;
+use tracing::level_filters::LevelFilter;
+use tracing_subscriber::EnvFilter;
+
+const ECHO_PROTOCOL: StreamProtocol = StreamProtocol::new("/echo");
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::builder()
+                .with_default_directive(LevelFilter::INFO.into())
+                .from_env()?,
+        )
+        .init();
+
+    let maybe_address = std::env::args()
+        .nth(1)
+        .map(|arg| arg.parse::<Multiaddr>())
+        .transpose()
+        .context("Failed to parse argument as `Multiaddr`")?;
+
+    let mut swarm = libp2p::SwarmBuilder::with_new_identity()
+        .with_tokio()
+        .with_quic()
+        .with_behaviour(|_| stream::Behaviour::new())?
+        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(10)))
+        .build();
+
+    swarm.listen_on("/ip4/127.0.0.1/udp/0/quic-v1".parse()?)?;
+
+    let mut incoming_streams = swarm
+        .behaviour()
+        .new_control()
+        .accept(ECHO_PROTOCOL)
+        .unwrap();
+
+    // Deal with incoming streams.
+    // Spawning a dedicated task is just one way of doing this.
+    // libp2p doesn't care how you handle incoming streams but you _must_ handle them somehow.
+    // To mitigate DoS attacks, libp2p will internally drop incoming streams if your application cannot keep up processing them.
+    tokio::spawn(async move {
+        // This loop handles incoming streams _sequentially_ but that doesn't have to be the case.
+        // You can also spawn a dedicated task per stream if you want to.
+        // Be aware that this breaks backpressure though as spawning new tasks is equivalent to an unbounded buffer.
+        // Each task needs memory meaning an aggressive remote peer may force you OOM this way.
+
+        while let Some((peer, stream)) = incoming_streams.next().await {
+            match echo(stream).await {
+                Ok(n) => {
+                    tracing::info!(%peer, "Echoed {n} bytes!");
+                }
+                Err(e) => {
+                    tracing::warn!(%peer, "Echo failed: {e}");
+                    continue;
+                }
+            };
+        }
+    });
+
+    // In this demo application, the dialing peer initiates the protocol.
+    if let Some(address) = maybe_address {
+        let Some(Protocol::P2p(peer_id)) = address.iter().last() else {
+            anyhow::bail!("Provided address does not end in `/p2p`");
+        };
+
+        swarm.dial(address)?;
+
+        tokio::spawn(connection_handler(peer_id, swarm.behaviour().new_control()));
+    }
+
+    // Poll the swarm to make progress.
+    loop {
+        let event = swarm.next().await.expect("never terminates");
+
+        match event {
+            libp2p::swarm::SwarmEvent::NewListenAddr { address, .. } => {
+                let listen_address = address.with_p2p(*swarm.local_peer_id()).unwrap();
+                tracing::info!(%listen_address);
+            }
+            event => tracing::trace!(?event),
+        }
+    }
+}
+
+/// A very simple, `async fn`-based connection handler for our custom echo protocol.
+async fn connection_handler(peer: PeerId, mut control: stream::Control) {
+    loop {
+        tokio::time::sleep(Duration::from_secs(1)).await; // Wait a second between echos.
+
+        let stream = match control.open_stream(peer, ECHO_PROTOCOL).await {
+            Ok(stream) => stream,
+            Err(error @ stream::OpenStreamError::UnsupportedProtocol(_)) => {
+                tracing::info!(%peer, %error);
+                return;
+            }
+            Err(error) => {
+                // Other errors may be temporary.
+                // In production, something like an exponential backoff / circuit-breaker may be more appropriate.
+                tracing::debug!(%peer, %error);
+                continue;
+            }
+        };
+
+        if let Err(e) = send(stream).await {
+            tracing::warn!(%peer, "Echo protocol failed: {e}");
+            continue;
+        }
+
+        tracing::info!(%peer, "Echo complete!")
+    }
+}
+
+async fn echo(mut stream: Stream) -> io::Result<usize> {
+    let mut total = 0;
+
+    let mut buf = [0u8; 100];
+
+    loop {
+        let read = stream.read(&mut buf).await?;
+        if read == 0 {
+            return Ok(total);
+        }
+
+        total += read;
+        stream.write_all(&buf[..read]).await?;
+    }
+}
+
+async fn send(mut stream: Stream) -> io::Result<()> {
+    let num_bytes = rand::random::<usize>() % 1000;
+
+    let mut bytes = vec![0; num_bytes];
+    rand::thread_rng().fill_bytes(&mut bytes);
+
+    stream.write_all(&bytes).await?;
+
+    let mut buf = vec![0; num_bytes];
+    stream.read_exact(&mut buf).await?;
+
+    if bytes != buf {
+        return Err(io::Error::new(io::ErrorKind::Other, "incorrect echo"));
+    }
+
+    stream.close().await?;
+
+    Ok(())
+}
diff --git a/protocols/stream/CHANGELOG.md b/protocols/stream/CHANGELOG.md
new file mode 100644
index 00000000000..2e177e2f1bc
--- /dev/null
+++ b/protocols/stream/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 0.1.0-alpha
+
+Initial release.
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
new file mode 100644
index 00000000000..be340939720
--- /dev/null
+++ b/protocols/stream/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "libp2p-stream"
+version = "0.1.0-alpha"
+edition = "2021"
+rust-version.workspace = true
+description = "Generic stream protocols for libp2p"
+license = "MIT"
+repository = "https://github.com/libp2p/rust-libp2p"
+keywords = ["peer-to-peer", "libp2p", "networking"]
+categories = ["network-programming", "asynchronous"]
+
+[dependencies]
+futures = "0.3.29"
+libp2p-core = { workspace = true }
+libp2p-identity = { workspace = true, features = ["peerid"] }
+libp2p-swarm = { workspace = true }
+tracing = "0.1.37"
+void = "1"
+rand = "0.8"
+
+[dev-dependencies]
+libp2p-swarm-test = { workspace = true }
+tokio = { version = "1", features = ["full"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+[lints]
+workspace = true
diff --git a/protocols/stream/README.md b/protocols/stream/README.md
new file mode 100644
index 00000000000..c8a56e119ca
--- /dev/null
+++ b/protocols/stream/README.md
@@ -0,0 +1,69 @@
+# Generic (stream) protocols
+
+This module provides a generic [`NetworkBehaviour`](libp2p_swarm::NetworkBehaviour) for stream-oriented protocols.
+Streams are the fundamental primitive of libp2p and all other protocols are implemented using streams.
+In contrast to other [`NetworkBehaviour`](libp2p_swarm::NetworkBehaviour)s, this module takes a different design approach.
+All interaction happens through a [`Control`] that can be obtained via [`Behaviour::new_control`].
+[`Control`]s can be cloned and thus shared across your application.
+
+## Inbound
+
+To accept streams for a particular [`StreamProtocol`](libp2p_swarm::StreamProtocol) using this module, use [`Control::accept`]:
+
+### Example
+
+```rust,no_run
+# fn main() {
+# use libp2p_swarm::{Swarm, StreamProtocol};
+# use libp2p_stream as stream;
+# use futures::StreamExt as _;
+let mut swarm: Swarm<stream::Behaviour> = todo!();
+
+let mut control = swarm.behaviour().new_control();
+let mut incoming = control.accept(StreamProtocol::new("/my-protocol")).unwrap();
+
+let handler_future = async move {
+    while let Some((peer, stream)) = incoming.next().await {
+        // Execute your protocol using `stream`.
+    }
+};
+# }
+```
+
+### Resource management
+
+[`Control::accept`] returns you an instance of [`IncomingStreams`].
+This struct implements [`Stream`](futures::Stream) and like other streams, is lazy.
+You must continuously poll it to make progress.
+In the example above, this taken care of by using the [`StreamExt::next`](futures::StreamExt::next) helper.
+
+Internally, we will drop streams if your application falls behind in processing these incoming streams, i.e. if whatever loop calls `.next()` is not fast enough.
+
+### Drop
+
+As soon as you drop [`IncomingStreams`], the protocol will be de-registered.
+Any further attempt by remote peers to open a stream using the provided protocol will result in a negotiation error.
+
+## Outbound
+
+To open a new outbound stream for a particular protocol, use [`Control::open_stream`].
+
+### Example
+
+```rust,no_run
+# fn main() {
+# use libp2p_swarm::{Swarm, StreamProtocol};
+# use libp2p_stream as stream;
+# use libp2p_identity::PeerId;
+let mut swarm: Swarm<stream::Behaviour> = todo!();
+let peer_id: PeerId = todo!();
+
+let mut control = swarm.behaviour().new_control();
+
+let protocol_future = async move {
+    let stream = control.open_stream(peer_id, StreamProtocol::new("/my-protocol")).await.unwrap();
+
+    // Execute your protocol here using `stream`.
+};
+# }
+```
\ No newline at end of file
diff --git a/protocols/stream/src/behaviour.rs b/protocols/stream/src/behaviour.rs
new file mode 100644
index 00000000000..e02aca884b7
--- /dev/null
+++ b/protocols/stream/src/behaviour.rs
@@ -0,0 +1,143 @@
+use core::fmt;
+use std::{
+    sync::{Arc, Mutex},
+    task::{Context, Poll},
+};
+
+use futures::{channel::mpsc, StreamExt};
+use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_identity::PeerId;
+use libp2p_swarm::{
+    self as swarm, dial_opts::DialOpts, ConnectionDenied, ConnectionId, FromSwarm,
+    NetworkBehaviour, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+};
+use swarm::{
+    behaviour::ConnectionEstablished, dial_opts::PeerCondition, ConnectionClosed, DialError,
+    DialFailure,
+};
+
+use crate::{handler::Handler, shared::Shared, Control};
+
+/// A generic behaviour for stream-oriented protocols.
+pub struct Behaviour {
+    shared: Arc<Mutex<Shared>>,
+    dial_receiver: mpsc::Receiver<PeerId>,
+}
+
+impl Default for Behaviour {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Behaviour {
+    pub fn new() -> Self {
+        let (dial_sender, dial_receiver) = mpsc::channel(0);
+
+        Self {
+            shared: Arc::new(Mutex::new(Shared::new(dial_sender))),
+            dial_receiver,
+        }
+    }
+
+    /// Obtain a new [`Control`].
+    pub fn new_control(&self) -> Control {
+        Control::new(self.shared.clone())
+    }
+}
+
+/// The protocol is already registered.
+#[derive(Debug)]
+pub struct AlreadyRegistered;
+
+impl fmt::Display for AlreadyRegistered {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "The protocol is already registered")
+    }
+}
+
+impl std::error::Error for AlreadyRegistered {}
+
+impl NetworkBehaviour for Behaviour {
+    type ConnectionHandler = Handler;
+    type ToSwarm = ();
+
+    fn handle_established_inbound_connection(
+        &mut self,
+        connection_id: ConnectionId,
+        peer: PeerId,
+        _: &Multiaddr,
+        _: &Multiaddr,
+    ) -> Result<THandler<Self>, ConnectionDenied> {
+        Ok(Handler::new(
+            peer,
+            self.shared.clone(),
+            Shared::lock(&self.shared).receiver(peer, connection_id),
+        ))
+    }
+
+    fn handle_established_outbound_connection(
+        &mut self,
+        connection_id: ConnectionId,
+        peer: PeerId,
+        _: &Multiaddr,
+        _: Endpoint,
+    ) -> Result<THandler<Self>, ConnectionDenied> {
+        Ok(Handler::new(
+            peer,
+            self.shared.clone(),
+            Shared::lock(&self.shared).receiver(peer, connection_id),
+        ))
+    }
+
+    fn on_swarm_event(&mut self, event: FromSwarm) {
+        match event {
+            FromSwarm::ConnectionEstablished(ConnectionEstablished {
+                peer_id,
+                connection_id,
+                ..
+            }) => Shared::lock(&self.shared).on_connection_established(connection_id, peer_id),
+            FromSwarm::ConnectionClosed(ConnectionClosed { connection_id, .. }) => {
+                Shared::lock(&self.shared).on_connection_closed(connection_id)
+            }
+            FromSwarm::DialFailure(DialFailure {
+                peer_id: Some(peer_id),
+                error:
+                    error @ (DialError::Transport(_)
+                    | DialError::Denied { .. }
+                    | DialError::NoAddresses
+                    | DialError::WrongPeerId { .. }),
+                ..
+            }) => {
+                let reason = error.to_string(); // We can only forward the string repr but it is better than nothing.
+
+                Shared::lock(&self.shared).on_dial_failure(peer_id, reason)
+            }
+            _ => {}
+        }
+    }
+
+    fn on_connection_handler_event(
+        &mut self,
+        _peer_id: PeerId,
+        _connection_id: ConnectionId,
+        event: THandlerOutEvent<Self>,
+    ) {
+        void::unreachable(event);
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
+        if let Poll::Ready(Some(peer)) = self.dial_receiver.poll_next_unpin(cx) {
+            return Poll::Ready(ToSwarm::Dial {
+                opts: DialOpts::peer_id(peer)
+                    .condition(PeerCondition::DisconnectedAndNotDialing)
+                    .build(),
+            });
+        }
+
+        Poll::Pending
+    }
+}
diff --git a/protocols/stream/src/control.rs b/protocols/stream/src/control.rs
new file mode 100644
index 00000000000..6aabaaff30e
--- /dev/null
+++ b/protocols/stream/src/control.rs
@@ -0,0 +1,124 @@
+use core::fmt;
+use std::{
+    io,
+    pin::Pin,
+    sync::{Arc, Mutex},
+    task::{Context, Poll},
+};
+
+use crate::AlreadyRegistered;
+use crate::{handler::NewStream, shared::Shared};
+
+use futures::{
+    channel::{mpsc, oneshot},
+    SinkExt as _, StreamExt as _,
+};
+use libp2p_identity::PeerId;
+use libp2p_swarm::{Stream, StreamProtocol};
+
+/// A (remote) control for opening new streams and registration of inbound protocols.
+///
+/// A [`Control`] can be cloned and thus allows for concurrent access.
+#[derive(Clone)]
+pub struct Control {
+    shared: Arc<Mutex<Shared>>,
+}
+
+impl Control {
+    pub(crate) fn new(shared: Arc<Mutex<Shared>>) -> Self {
+        Self { shared }
+    }
+
+    /// Attempt to open a new stream for the given protocol and peer.
+    ///
+    /// In case we are currently not connected to the peer, we will attempt to make a new connection.
+    ///
+    /// ## Backpressure
+    ///
+    /// [`Control`]s support backpressure similarly to bounded channels:
+    /// Each [`Control`] has a guaranteed slot for internal messages.
+    /// A single control will always open one stream at a time which is enforced by requiring `&mut self`.
+    ///
+    /// This backpressure mechanism breaks if you clone [`Control`]s excessively.
+    pub async fn open_stream(
+        &mut self,
+        peer: PeerId,
+        protocol: StreamProtocol,
+    ) -> Result<Stream, OpenStreamError> {
+        tracing::debug!(%peer, "Requesting new stream");
+
+        let mut new_stream_sender = Shared::lock(&self.shared).sender(peer);
+
+        let (sender, receiver) = oneshot::channel();
+
+        new_stream_sender
+            .send(NewStream { protocol, sender })
+            .await
+            .map_err(|e| io::Error::new(io::ErrorKind::ConnectionReset, e))?;
+
+        let stream = receiver
+            .await
+            .map_err(|e| io::Error::new(io::ErrorKind::ConnectionReset, e))??;
+
+        Ok(stream)
+    }
+
+    /// Accept inbound streams for the provided protocol.
+    ///
+    /// To stop accepting streams, simply drop the returned [`IncomingStreams`] handle.
+    pub fn accept(
+        &mut self,
+        protocol: StreamProtocol,
+    ) -> Result<IncomingStreams, AlreadyRegistered> {
+        Shared::lock(&self.shared).accept(protocol)
+    }
+}
+
+/// Errors while opening a new stream.
+#[derive(Debug)]
+#[non_exhaustive]
+pub enum OpenStreamError {
+    /// The remote does not support the requested protocol.
+    UnsupportedProtocol(StreamProtocol),
+    /// IO Error that occurred during the protocol handshake.
+    Io(std::io::Error),
+}
+
+impl From<std::io::Error> for OpenStreamError {
+    fn from(v: std::io::Error) -> Self {
+        Self::Io(v)
+    }
+}
+
+impl fmt::Display for OpenStreamError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            OpenStreamError::UnsupportedProtocol(p) => {
+                write!(f, "failed to open stream: remote peer does not support {p}")
+            }
+            OpenStreamError::Io(e) => {
+                write!(f, "failed to open stream: io error: {e}")
+            }
+        }
+    }
+}
+
+/// A handle to inbound streams for a particular protocol.
+#[must_use = "Streams do nothing unless polled."]
+pub struct IncomingStreams {
+    receiver: mpsc::Receiver<(PeerId, Stream)>,
+}
+
+impl IncomingStreams {
+    pub(crate) fn new(receiver: mpsc::Receiver<(PeerId, Stream)>) -> Self {
+        Self { receiver }
+    }
+}
+
+impl futures::Stream for IncomingStreams {
+    type Item = (PeerId, Stream);
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        self.receiver.poll_next_unpin(cx)
+    }
+}
diff --git a/protocols/stream/src/handler.rs b/protocols/stream/src/handler.rs
new file mode 100644
index 00000000000..f63b93c1761
--- /dev/null
+++ b/protocols/stream/src/handler.rs
@@ -0,0 +1,165 @@
+use std::{
+    io,
+    sync::{Arc, Mutex},
+    task::{Context, Poll},
+};
+
+use futures::{
+    channel::{mpsc, oneshot},
+    StreamExt as _,
+};
+use libp2p_identity::PeerId;
+use libp2p_swarm::{
+    self as swarm,
+    handler::{ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound},
+    ConnectionHandler, Stream, StreamProtocol,
+};
+
+use crate::{shared::Shared, upgrade::Upgrade, OpenStreamError};
+
+pub struct Handler {
+    remote: PeerId,
+    shared: Arc<Mutex<Shared>>,
+
+    receiver: mpsc::Receiver<NewStream>,
+    pending_upgrade: Option<(
+        StreamProtocol,
+        oneshot::Sender<Result<Stream, OpenStreamError>>,
+    )>,
+}
+
+impl Handler {
+    pub(crate) fn new(
+        remote: PeerId,
+        shared: Arc<Mutex<Shared>>,
+        receiver: mpsc::Receiver<NewStream>,
+    ) -> Self {
+        Self {
+            shared,
+            receiver,
+            pending_upgrade: None,
+            remote,
+        }
+    }
+}
+
+impl ConnectionHandler for Handler {
+    type FromBehaviour = void::Void;
+    type ToBehaviour = void::Void;
+    type InboundProtocol = Upgrade;
+    type OutboundProtocol = Upgrade;
+    type InboundOpenInfo = ();
+    type OutboundOpenInfo = ();
+
+    fn listen_protocol(
+        &self,
+    ) -> swarm::SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
+        swarm::SubstreamProtocol::new(
+            Upgrade {
+                supported_protocols: Shared::lock(&self.shared).supported_inbound_protocols(),
+            },
+            (),
+        )
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<
+        swarm::ConnectionHandlerEvent<
+            Self::OutboundProtocol,
+            Self::OutboundOpenInfo,
+            Self::ToBehaviour,
+        >,
+    > {
+        if self.pending_upgrade.is_some() {
+            return Poll::Pending;
+        }
+
+        match self.receiver.poll_next_unpin(cx) {
+            Poll::Ready(Some(new_stream)) => {
+                self.pending_upgrade = Some((new_stream.protocol.clone(), new_stream.sender));
+                return Poll::Ready(swarm::ConnectionHandlerEvent::OutboundSubstreamRequest {
+                    protocol: swarm::SubstreamProtocol::new(
+                        Upgrade {
+                            supported_protocols: vec![new_stream.protocol],
+                        },
+                        (),
+                    ),
+                });
+            }
+            Poll::Ready(None) => {} // Sender is gone, no more work to do.
+            Poll::Pending => {}
+        }
+
+        Poll::Pending
+    }
+
+    fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+        void::unreachable(event)
+    }
+
+    fn on_connection_event(
+        &mut self,
+        event: ConnectionEvent<
+            Self::InboundProtocol,
+            Self::OutboundProtocol,
+            Self::InboundOpenInfo,
+            Self::OutboundOpenInfo,
+        >,
+    ) {
+        match event {
+            ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
+                protocol: (stream, protocol),
+                info: (),
+            }) => {
+                Shared::lock(&self.shared).on_inbound_stream(self.remote, stream, protocol);
+            }
+            ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
+                protocol: (stream, actual_protocol),
+                info: (),
+            }) => {
+                let Some((expected_protocol, sender)) = self.pending_upgrade.take() else {
+                    debug_assert!(
+                        false,
+                        "Negotiated an outbound stream without a back channel"
+                    );
+                    return;
+                };
+                debug_assert_eq!(expected_protocol, actual_protocol);
+
+                let _ = sender.send(Ok(stream));
+            }
+            ConnectionEvent::DialUpgradeError(DialUpgradeError { error, info: () }) => {
+                let Some((p, sender)) = self.pending_upgrade.take() else {
+                    debug_assert!(
+                        false,
+                        "Received a `DialUpgradeError` without a back channel"
+                    );
+                    return;
+                };
+
+                let error = match error {
+                    swarm::StreamUpgradeError::Timeout => {
+                        OpenStreamError::Io(io::Error::from(io::ErrorKind::TimedOut))
+                    }
+                    swarm::StreamUpgradeError::Apply(v) => void::unreachable(v),
+                    swarm::StreamUpgradeError::NegotiationFailed => {
+                        OpenStreamError::UnsupportedProtocol(p)
+                    }
+                    swarm::StreamUpgradeError::Io(io) => OpenStreamError::Io(io),
+                };
+
+                let _ = sender.send(Err(error));
+            }
+            _ => {}
+        }
+    }
+}
+
+/// Message from a [`Control`](crate::Control) to a [`ConnectionHandler`] to negotiate a new outbound stream.
+#[derive(Debug)]
+pub(crate) struct NewStream {
+    pub(crate) protocol: StreamProtocol,
+    pub(crate) sender: oneshot::Sender<Result<Stream, OpenStreamError>>,
+}
diff --git a/protocols/stream/src/lib.rs b/protocols/stream/src/lib.rs
new file mode 100644
index 00000000000..d498a1b71e5
--- /dev/null
+++ b/protocols/stream/src/lib.rs
@@ -0,0 +1,10 @@
+#![doc = include_str!("../README.md")]
+
+mod behaviour;
+mod control;
+mod handler;
+mod shared;
+mod upgrade;
+
+pub use behaviour::{AlreadyRegistered, Behaviour};
+pub use control::{Control, IncomingStreams, OpenStreamError};
diff --git a/protocols/stream/src/shared.rs b/protocols/stream/src/shared.rs
new file mode 100644
index 00000000000..48aa6613d83
--- /dev/null
+++ b/protocols/stream/src/shared.rs
@@ -0,0 +1,167 @@
+use std::{
+    collections::{hash_map::Entry, HashMap},
+    io,
+    sync::{Arc, Mutex, MutexGuard},
+};
+
+use futures::channel::mpsc;
+use libp2p_identity::PeerId;
+use libp2p_swarm::{ConnectionId, Stream, StreamProtocol};
+use rand::seq::IteratorRandom as _;
+
+use crate::{handler::NewStream, AlreadyRegistered, IncomingStreams};
+
+pub(crate) struct Shared {
+    /// Tracks the supported inbound protocols created via [`Control::accept`](crate::Control::accept).
+    ///
+    /// For each [`StreamProtocol`], we hold the [`mpsc::Sender`] corresponding to the [`mpsc::Receiver`] in [`IncomingStreams`].
+    supported_inbound_protocols: HashMap<StreamProtocol, mpsc::Sender<(PeerId, Stream)>>,
+
+    connections: HashMap<ConnectionId, PeerId>,
+    senders: HashMap<ConnectionId, mpsc::Sender<NewStream>>,
+
+    /// Tracks channel pairs for a peer whilst we are dialing them.
+    pending_channels: HashMap<PeerId, (mpsc::Sender<NewStream>, mpsc::Receiver<NewStream>)>,
+
+    /// Sender for peers we want to dial.
+    ///
+    /// We manage this through a channel to avoid locks as part of [`NetworkBehaviour::poll`](libp2p_swarm::NetworkBehaviour::poll).
+    dial_sender: mpsc::Sender<PeerId>,
+}
+
+impl Shared {
+    pub(crate) fn lock(shared: &Arc<Mutex<Shared>>) -> MutexGuard<'_, Shared> {
+        shared.lock().unwrap_or_else(|e| e.into_inner())
+    }
+}
+
+impl Shared {
+    pub(crate) fn new(dial_sender: mpsc::Sender<PeerId>) -> Self {
+        Self {
+            dial_sender,
+            connections: Default::default(),
+            senders: Default::default(),
+            pending_channels: Default::default(),
+            supported_inbound_protocols: Default::default(),
+        }
+    }
+
+    pub(crate) fn accept(
+        &mut self,
+        protocol: StreamProtocol,
+    ) -> Result<IncomingStreams, AlreadyRegistered> {
+        if self.supported_inbound_protocols.contains_key(&protocol) {
+            return Err(AlreadyRegistered);
+        }
+
+        let (sender, receiver) = mpsc::channel(0);
+        self.supported_inbound_protocols
+            .insert(protocol.clone(), sender);
+
+        Ok(IncomingStreams::new(receiver))
+    }
+
+    /// Lists the protocols for which we have an active [`IncomingStreams`] instance.
+    pub(crate) fn supported_inbound_protocols(&mut self) -> Vec<StreamProtocol> {
+        self.supported_inbound_protocols
+            .retain(|_, sender| !sender.is_closed());
+
+        self.supported_inbound_protocols.keys().cloned().collect()
+    }
+
+    pub(crate) fn on_inbound_stream(
+        &mut self,
+        remote: PeerId,
+        stream: Stream,
+        protocol: StreamProtocol,
+    ) {
+        match self.supported_inbound_protocols.entry(protocol.clone()) {
+            Entry::Occupied(mut entry) => match entry.get_mut().try_send((remote, stream)) {
+                Ok(()) => {}
+                Err(e) if e.is_full() => {
+                    tracing::debug!(%protocol, "Channel is full, dropping inbound stream");
+                }
+                Err(e) if e.is_disconnected() => {
+                    tracing::debug!(%protocol, "Channel is gone, dropping inbound stream");
+                    entry.remove();
+                }
+                _ => unreachable!(),
+            },
+            Entry::Vacant(_) => {
+                tracing::debug!(%protocol, "channel is gone, dropping inbound stream");
+            }
+        }
+    }
+
+    pub(crate) fn on_connection_established(&mut self, conn: ConnectionId, peer: PeerId) {
+        self.connections.insert(conn, peer);
+    }
+
+    pub(crate) fn on_connection_closed(&mut self, conn: ConnectionId) {
+        self.connections.remove(&conn);
+    }
+
+    pub(crate) fn on_dial_failure(&mut self, peer: PeerId, reason: String) {
+        let Some((_, mut receiver)) = self.pending_channels.remove(&peer) else {
+            return;
+        };
+
+        while let Ok(Some(new_stream)) = receiver.try_next() {
+            let _ = new_stream
+                .sender
+                .send(Err(crate::OpenStreamError::Io(io::Error::new(
+                    io::ErrorKind::NotConnected,
+                    reason.clone(),
+                ))));
+        }
+    }
+
+    pub(crate) fn sender(&mut self, peer: PeerId) -> mpsc::Sender<NewStream> {
+        let maybe_sender = self
+            .connections
+            .iter()
+            .filter_map(|(c, p)| (p == &peer).then_some(c))
+            .choose(&mut rand::thread_rng())
+            .and_then(|c| self.senders.get(c));
+
+        match maybe_sender {
+            Some(sender) => {
+                tracing::debug!("Returning sender to existing connection");
+
+                sender.clone()
+            }
+            None => {
+                tracing::debug!(%peer, "Not connected to peer, initiating dial");
+
+                let (sender, _) = self
+                    .pending_channels
+                    .entry(peer)
+                    .or_insert_with(|| mpsc::channel(0));
+
+                let _ = self.dial_sender.try_send(peer);
+
+                sender.clone()
+            }
+        }
+    }
+
+    pub(crate) fn receiver(
+        &mut self,
+        peer: PeerId,
+        connection: ConnectionId,
+    ) -> mpsc::Receiver<NewStream> {
+        if let Some((sender, receiver)) = self.pending_channels.remove(&peer) {
+            tracing::debug!(%peer, %connection, "Returning existing pending receiver");
+
+            self.senders.insert(connection, sender);
+            return receiver;
+        }
+
+        tracing::debug!(%peer, %connection, "Creating new channel pair");
+
+        let (sender, receiver) = mpsc::channel(0);
+        self.senders.insert(connection, sender);
+
+        receiver
+    }
+}
diff --git a/protocols/stream/src/upgrade.rs b/protocols/stream/src/upgrade.rs
new file mode 100644
index 00000000000..ac9fb3ed992
--- /dev/null
+++ b/protocols/stream/src/upgrade.rs
@@ -0,0 +1,42 @@
+use std::future::{ready, Ready};
+
+use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
+use libp2p_swarm::{Stream, StreamProtocol};
+
+pub struct Upgrade {
+    pub(crate) supported_protocols: Vec<StreamProtocol>,
+}
+
+impl UpgradeInfo for Upgrade {
+    type Info = StreamProtocol;
+
+    type InfoIter = std::vec::IntoIter<StreamProtocol>;
+
+    fn protocol_info(&self) -> Self::InfoIter {
+        self.supported_protocols.clone().into_iter()
+    }
+}
+
+impl InboundUpgrade<Stream> for Upgrade {
+    type Output = (Stream, StreamProtocol);
+
+    type Error = void::Void;
+
+    type Future = Ready<Result<Self::Output, Self::Error>>;
+
+    fn upgrade_inbound(self, socket: Stream, info: Self::Info) -> Self::Future {
+        ready(Ok((socket, info)))
+    }
+}
+
+impl OutboundUpgrade<Stream> for Upgrade {
+    type Output = (Stream, StreamProtocol);
+
+    type Error = void::Void;
+
+    type Future = Ready<Result<Self::Output, Self::Error>>;
+
+    fn upgrade_outbound(self, socket: Stream, info: Self::Info) -> Self::Future {
+        ready(Ok((socket, info)))
+    }
+}
diff --git a/protocols/stream/tests/lib.rs b/protocols/stream/tests/lib.rs
new file mode 100644
index 00000000000..cd6caaced5e
--- /dev/null
+++ b/protocols/stream/tests/lib.rs
@@ -0,0 +1,80 @@
+use std::io;
+
+use futures::{AsyncReadExt as _, AsyncWriteExt as _, StreamExt as _};
+use libp2p_identity::PeerId;
+use libp2p_stream as stream;
+use libp2p_swarm::{StreamProtocol, Swarm};
+use libp2p_swarm_test::SwarmExt as _;
+use stream::OpenStreamError;
+use tracing::level_filters::LevelFilter;
+use tracing_subscriber::EnvFilter;
+
+const PROTOCOL: StreamProtocol = StreamProtocol::new("/test");
+
+#[tokio::test]
+async fn dropping_incoming_streams_deregisters() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::builder()
+                .with_default_directive(LevelFilter::DEBUG.into())
+                .from_env()
+                .unwrap(),
+        )
+        .with_test_writer()
+        .try_init();
+
+    let mut swarm1 = Swarm::new_ephemeral(|_| stream::Behaviour::new());
+    let mut swarm2 = Swarm::new_ephemeral(|_| stream::Behaviour::new());
+
+    let mut control = swarm1.behaviour().new_control();
+    let mut incoming = swarm2.behaviour().new_control().accept(PROTOCOL).unwrap();
+
+    swarm2.listen().with_memory_addr_external().await;
+    swarm1.connect(&mut swarm2).await;
+
+    let swarm2_peer_id = *swarm2.local_peer_id();
+
+    let handle = tokio::spawn(async move {
+        while let Some((_, mut stream)) = incoming.next().await {
+            stream.write_all(&[42]).await.unwrap();
+            stream.close().await.unwrap();
+        }
+    });
+    tokio::spawn(swarm1.loop_on_next());
+    tokio::spawn(swarm2.loop_on_next());
+
+    let mut stream = control.open_stream(swarm2_peer_id, PROTOCOL).await.unwrap();
+
+    let mut buf = [0u8; 1];
+    stream.read_exact(&mut buf).await.unwrap();
+    assert_eq!([42], buf);
+
+    handle.abort();
+    let _ = handle.await;
+
+    let error = control
+        .open_stream(swarm2_peer_id, PROTOCOL)
+        .await
+        .unwrap_err();
+    assert!(matches!(error, OpenStreamError::UnsupportedProtocol(_)));
+}
+
+#[tokio::test]
+async fn dial_errors_are_propagated() {
+    let swarm1 = Swarm::new_ephemeral(|_| stream::Behaviour::new());
+
+    let mut control = swarm1.behaviour().new_control();
+    tokio::spawn(swarm1.loop_on_next());
+
+    let error = control
+        .open_stream(PeerId::random(), PROTOCOL)
+        .await
+        .unwrap_err();
+
+    let OpenStreamError::Io(e) = error else {
+        panic!("Unexpected error: {error}")
+    };
+
+    assert_eq!(e.kind(), io::ErrorKind::NotConnected);
+    assert_eq!("Dial error: no addresses for peer.", e.to_string());
+}

From 17acc0543d628b97eb5c9fceabb991bda8011cd2 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 15 Jan 2024 20:08:28 -0800
Subject: [PATCH 071/455] chore: fix clippy lints

Pull-Request: #5083.
---
 protocols/gossipsub/src/behaviour/tests.rs | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 570cdf43f90..2bf1c90c5c8 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -162,7 +162,7 @@ fn inject_nodes1() -> InjectNodes<IdentityTransform, AllowAllSubscriptionFilter>
 
 fn add_peer<D, F>(
     gs: &mut Behaviour<D, F>,
-    topic_hashes: &Vec<TopicHash>,
+    topic_hashes: &[TopicHash],
     outbound: bool,
     explicit: bool,
 ) -> PeerId
@@ -175,7 +175,7 @@ where
 
 fn add_peer_with_addr<D, F>(
     gs: &mut Behaviour<D, F>,
-    topic_hashes: &Vec<TopicHash>,
+    topic_hashes: &[TopicHash],
     outbound: bool,
     explicit: bool,
     address: Multiaddr,
@@ -196,7 +196,7 @@ where
 
 fn add_peer_with_addr_and_kind<D, F>(
     gs: &mut Behaviour<D, F>,
-    topic_hashes: &Vec<TopicHash>,
+    topic_hashes: &[TopicHash],
     outbound: bool,
     explicit: bool,
     address: Multiaddr,
@@ -3165,7 +3165,7 @@ fn test_scoring_p1() {
     );
 }
 
-fn random_message(seq: &mut u64, topics: &Vec<TopicHash>) -> RawMessage {
+fn random_message(seq: &mut u64, topics: &[TopicHash]) -> RawMessage {
     let mut rng = rand::thread_rng();
     *seq += 1;
     RawMessage {
@@ -4027,20 +4027,20 @@ fn test_scoring_p6() {
     //create 5 peers with the same ip
     let addr = Multiaddr::from(Ipv4Addr::new(10, 1, 2, 3));
     let peers = vec![
-        add_peer_with_addr(&mut gs, &vec![], false, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &vec![], false, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &vec![], true, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &vec![], true, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &vec![], true, true, addr.clone()),
+        add_peer_with_addr(&mut gs, &[], false, false, addr.clone()),
+        add_peer_with_addr(&mut gs, &[], false, false, addr.clone()),
+        add_peer_with_addr(&mut gs, &[], true, false, addr.clone()),
+        add_peer_with_addr(&mut gs, &[], true, false, addr.clone()),
+        add_peer_with_addr(&mut gs, &[], true, true, addr.clone()),
     ];
 
     //create 4 other peers with other ip
     let addr2 = Multiaddr::from(Ipv4Addr::new(10, 1, 2, 4));
     let others = vec![
-        add_peer_with_addr(&mut gs, &vec![], false, false, addr2.clone()),
-        add_peer_with_addr(&mut gs, &vec![], false, false, addr2.clone()),
-        add_peer_with_addr(&mut gs, &vec![], true, false, addr2.clone()),
-        add_peer_with_addr(&mut gs, &vec![], true, false, addr2.clone()),
+        add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()),
+        add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()),
+        add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()),
+        add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()),
     ];
 
     //no penalties yet

From 2a06299a4c3b2fc61c278ccd9ee6a589e3522b1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 08:56:02 +0000
Subject: [PATCH 072/455] deps: bump Swatinem/rust-cache from 2.7.2 to 2.7.3

Pull-Request: #5084.
---
 .github/workflows/cache-factory.yml |  2 +-
 .github/workflows/ci.yml            | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cache-factory.yml b/.github/workflows/cache-factory.yml
index 66b88a8a606..8c49b335f1b 100644
--- a/.github/workflows/cache-factory.yml
+++ b/.github/workflows/cache-factory.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           shared-key: stable-cache
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3dbb50353ba..d87cd82da79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           shared-key: stable-cache
           save-if: false
@@ -158,7 +158,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           key: ${{ matrix.target }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -183,7 +183,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -204,7 +204,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           key: ${{ matrix.features }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -221,7 +221,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -247,7 +247,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -263,7 +263,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -282,7 +282,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           shared-key: stable-cache
           save-if: false
@@ -374,7 +374,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
 
       - run: cargo install --version 0.10.0 pb-rs --locked
 
@@ -400,7 +400,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@a22603398250b864f7190077025cf752307154dc # v2.7.2
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
       - run: cargo metadata --locked --format-version=1 > /dev/null
 
   cargo-deny:

From b8b9391221b122943ea9cc4e01267dc54fa11c0d Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Tue, 16 Jan 2024 19:46:53 -0800
Subject: [PATCH 073/455] ci: update `cargo semver-checks` to `v0.27`

Pull-Request: #5098.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d87cd82da79..f0c6b1b0f0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -317,7 +317,7 @@ jobs:
       RUSTFLAGS: ''
     steps:
       - uses: actions/checkout@v4
-      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.25.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
+      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.27.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
       - uses: obi1kenobi/cargo-semver-checks-action@e275dda72e250d4df5b564e969e1348d67fefa52 # v2
 

From ec4c2a7b807657fc850b69c15d25400e7e91585f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:36:44 +0000
Subject: [PATCH 074/455] deps: bump h2 from 0.3.20 to 0.3.24

Pull-Request: #5102.
---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 98f2503fa2f..10398327fb6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1858,9 +1858,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.20"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
@@ -1868,7 +1868,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.9",
- "indexmap 1.9.3",
+ "indexmap 2.0.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2148,7 +2148,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.20",
+ "h2 0.3.24",
  "http 0.2.9",
  "http-body 0.4.5",
  "httparse",
@@ -4854,7 +4854,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.20",
+ "h2 0.3.24",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
@@ -5961,7 +5961,7 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "h2 0.3.20",
+ "h2 0.3.24",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",

From 96c40558261b385f9618a40e2943dc6dc906ac4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Jan 2024 19:02:54 +0000
Subject: [PATCH 075/455] deps: bump tj-actions/glob from 18 to 19

Pull-Request: #5100.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f0c6b1b0f0e..8e8012d82a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -379,7 +379,7 @@ jobs:
       - run: cargo install --version 0.10.0 pb-rs --locked
 
       - name: Glob match
-        uses: tj-actions/glob@v18
+        uses: tj-actions/glob@v19
         id: glob
         with:
           files: |

From db80bbfc9df9cafa8da2b01dea0d0908b64600f9 Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Sun, 21 Jan 2024 12:26:02 -0500
Subject: [PATCH 076/455] fix(upnp): ignore oneshot sender error when receiver
 is dropped

Resolves #5077.

Pull-Request: #5096.
---
 Cargo.lock                  |  2 +-
 Cargo.toml                  |  2 +-
 protocols/upnp/CHANGELOG.md |  4 ++++
 protocols/upnp/Cargo.toml   |  2 +-
 protocols/upnp/src/tokio.rs | 16 ++++++++--------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10398327fb6..5c30be7ed02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3364,7 +3364,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-upnp"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "futures",
  "futures-timer",
diff --git a/Cargo.toml b/Cargo.toml
index 9215d68dd9c..3f0c0217e9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -108,7 +108,7 @@ libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
-libp2p-upnp = { version = "0.2.0", path = "protocols/upnp" }
+libp2p-upnp = { version = "0.2.1", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.0-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
diff --git a/protocols/upnp/CHANGELOG.md b/protocols/upnp/CHANGELOG.md
index 806ed2e11d5..ba031264a0f 100644
--- a/protocols/upnp/CHANGELOG.md
+++ b/protocols/upnp/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.1
+- Fix a panic caused when dropping `upnp::Behaviour` such as when used together with `Toggle`.
+  See [PR 5096](https://github.com/libp2p/rust-libp2p/pull/5096).
+
 ## 0.2.0
 
 
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index c60aad4fe8f..1c5564e2b75 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-upnp"
 edition = "2021"
 rust-version = "1.60.0"
 description = "UPnP support for libp2p transports"
-version = "0.2.0"
+version = "0.2.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/protocols/upnp/src/tokio.rs b/protocols/upnp/src/tokio.rs
index c6a40182b33..9c8b2cafef9 100644
--- a/protocols/upnp/src/tokio.rs
+++ b/protocols/upnp/src/tokio.rs
@@ -100,9 +100,7 @@ pub(crate) fn search_gateway() -> oneshot::Receiver<Result<Gateway, Box<dyn Erro
         let gateway = match igd_next::aio::tokio::search_gateway(SearchOptions::default()).await {
             Ok(gateway) => gateway,
             Err(err) => {
-                search_result_sender
-                    .send(Err(err.into()))
-                    .expect("receiver shouldn't have been dropped");
+                let _ = search_result_sender.send(Err(err.into()));
                 return;
             }
         };
@@ -110,20 +108,22 @@ pub(crate) fn search_gateway() -> oneshot::Receiver<Result<Gateway, Box<dyn Erro
         let external_addr = match gateway.get_external_ip().await {
             Ok(addr) => addr,
             Err(err) => {
-                search_result_sender
-                    .send(Err(err.into()))
-                    .expect("receiver shouldn't have been dropped");
+                let _ = search_result_sender.send(Err(err.into()));
                 return;
             }
         };
 
-        search_result_sender
+        // Check if receiver dropped.
+        if search_result_sender
             .send(Ok(Gateway {
                 sender: events_sender,
                 receiver: events_queue,
                 external_addr,
             }))
-            .expect("receiver shouldn't have been dropped");
+            .is_err()
+        {
+            return;
+        }
 
         loop {
             // The task sender has dropped so we can return.

From 410f4f0891b212a86bb8d3d0dbbee81053412ae6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 08:58:34 +0000
Subject: [PATCH 077/455] deps: bump proc-macro2 from 1.0.76 to 1.0.78

Pull-Request: #5106.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c30be7ed02..4f39095803e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4450,9 +4450,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]

From 41b6fab188f2a66272b434c7a002fae39a3d1d04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:11:39 +0000
Subject: [PATCH 078/455] deps: bump regex from 1.10.2 to 1.10.3

Pull-Request: #5107.
---
 Cargo.lock                     | 10 +++++-----
 protocols/gossipsub/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f39095803e..30c9e4645bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4775,13 +4775,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
- "regex-automata 0.4.3",
+ "regex-automata 0.4.4",
  "regex-syntax 0.8.2",
 ]
 
@@ -4796,9 +4796,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index bab952f0fb6..4d484a81249 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -31,7 +31,7 @@ libp2p-swarm = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-regex = "1.10.2"
+regex = "1.10.3"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 smallvec = "1.12.0"

From 57b0d9a2bcc6c16daad9a2d5936784c2cfee4a75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:36:28 +0000
Subject: [PATCH 079/455] deps: bump web-sys from 0.3.66 to 0.3.67

Pull-Request: #5108.
---
 Cargo.lock                                | 4 ++--
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 30c9e4645bc..089cab945a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6494,9 +6494,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index ab09725dcca..225fe736a1c 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -25,7 +25,7 @@ thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.39" }
-web-sys = { version = "0.3.66", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
+web-sys = { version = "0.3.67", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
 workspace = true
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index c8cfb1fcaec..2b65f3f07a3 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
 thiserror = "1.0.56"
 wasm-bindgen = "0.2.90"
-web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
+web-sys = { version = "0.3.67", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 456f8a1a757..5e06b2af117 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1.0.56"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.39"
-web-sys = { version = "0.3.66", features = [
+web-sys = { version = "0.3.67", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
     "WebTransportBidirectionalStream",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 16628fc1aa3..26e2c4e5b3f 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -20,7 +20,7 @@ multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.39"
 wasm-bindgen-test = "0.3.39"
-web-sys = { version = "0.3.66", features = ["Response", "Window"] }
+web-sys = { version = "0.3.67", features = ["Response", "Window"] }
 
 [lints]
 workspace = true

From ddb554440267c5d441e47827c2aa83e11b171e1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:01:16 +0000
Subject: [PATCH 080/455] deps: bump env_logger from 0.10.1 to 0.10.2

Pull-Request: #5113.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 089cab945a3..931c2bcc8db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1443,9 +1443,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -2037,7 +2037,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "either",
- "env_logger 0.10.1",
+ "env_logger 0.10.2",
  "futures",
  "libp2p",
  "redis",
@@ -2445,7 +2445,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clap",
- "env_logger 0.10.1",
+ "env_logger 0.10.2",
  "futures",
  "libp2p",
  "tokio",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 201b493e90a..0f1a097ce8e 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 
 [dependencies]
 anyhow = "1"
-env_logger = "0.10.1"
+env_logger = "0.10.2"
 futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"

From 1b2000ce021c2d7bedace853c859e7b6875b484e Mon Sep 17 00:00:00 2001
From: Dave Huseby <dhuseby@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:43:14 -0700
Subject: [PATCH 081/455] chore: update config.yml for new issues

Rewording the the choices to clearly direct technical questions to GH dicussions and community discussion to discuss.libp2p.io.

Pull-Request: #5116.
---
 .github/ISSUE_TEMPLATE/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 29c54c335a4..c51267e140f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Question
+  - name: Technical Questions
     url:  https://github.com/libp2p/rust-libp2p/discussions/new?category=q-a
-    about: Please ask questions in the rust-libp2p GitHub Discussions forum.
-  - name: Libp2p Discourse Forum
+    about: Please ask technical questions in the rust-libp2p GitHub Discussions forum.
+  - name: Community-wide libp2p Discussion
     url:  https://discuss.libp2p.io
-    about: Discussions and questions related to multiple libp2p implementations.
+    about: Discussions and questions about the libp2p community.

From fbad30ee03aa8c63ec7862571c115fa05406f502 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 24 Jan 2024 12:59:38 -0800
Subject: [PATCH 082/455] chore(webrtc): release version 0.7.1-alpha

Resolves: #5117.

Pull-Request: #5118.
---
 Cargo.lock                     | 2 +-
 Cargo.toml                     | 2 +-
 transports/webrtc/CHANGELOG.md | 5 +++++
 transports/webrtc/Cargo.toml   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 931c2bcc8db..035055c0621 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3378,7 +3378,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc"
-version = "0.7.0-alpha"
+version = "0.7.1-alpha"
 dependencies = [
  "async-trait",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 3f0c0217e9e..26cfaf80898 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -109,7 +109,7 @@ libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.1", path = "protocols/upnp" }
-libp2p-webrtc = { version = "0.7.0-alpha", path = "transports/webrtc" }
+libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.43.0", path = "transports/websocket" }
diff --git a/transports/webrtc/CHANGELOG.md b/transports/webrtc/CHANGELOG.md
index 7cc2b2b63bc..930526d58d5 100644
--- a/transports/webrtc/CHANGELOG.md
+++ b/transports/webrtc/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.7.1-alpha
+
+- Bump `libp2p-webrtc-utils` dependency to `0.2.0`.
+  See [PR 5118](https://github.com/libp2p/rust-libp2p/pull/5118).
+
 ## 0.7.0-alpha
 
 - Bump version in order to publish a new version dependent on latest `libp2p-core`.
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index de805840683..24afe56e175 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-webrtc"
-version = "0.7.0-alpha"
+version = "0.7.1-alpha"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "WebRTC transport for libp2p"
 repository = "https://github.com/libp2p/rust-libp2p"

From c48a16a5be0b16dae7817bf4a5f5055d8dc64709 Mon Sep 17 00:00:00 2001
From: StemCll <lydjotj6f@mozmail.com>
Date: Wed, 24 Jan 2024 22:09:03 +0100
Subject: [PATCH 083/455] feat(swarm): allow behaviours to share addresses of
 peers

Resolves: #4302.

Pull-Request: #4371.
---
 Cargo.lock                                    |   9 +-
 Cargo.toml                                    |   8 +-
 protocols/autonat/Cargo.toml                  |   2 +-
 protocols/autonat/src/behaviour.rs            |   1 +
 protocols/dcutr/tests/lib.rs                  |   1 +
 protocols/identify/CHANGELOG.md               |   7 +
 protocols/identify/Cargo.toml                 |   2 +-
 protocols/identify/src/behaviour.rs           |  72 ++--
 protocols/identify/tests/smoke.rs             |  74 +++-
 protocols/request-response/CHANGELOG.md       |   5 +
 protocols/request-response/Cargo.toml         |   4 +-
 protocols/request-response/src/lib.rs         |  30 +-
 .../request-response/tests/peer_address.rs    |  60 ++++
 swarm-derive/CHANGELOG.md                     |   5 +
 swarm-derive/Cargo.toml                       |   2 +-
 swarm/CHANGELOG.md                            |   8 +
 swarm/Cargo.toml                              |   3 +-
 swarm/src/behaviour.rs                        |  28 ++
 swarm/src/behaviour/peer_addresses.rs         | 338 ++++++++++++++++++
 swarm/src/lib.rs                              |  27 +-
 20 files changed, 611 insertions(+), 75 deletions(-)
 create mode 100644 protocols/request-response/tests/peer_address.rs
 create mode 100644 swarm/src/behaviour/peer_addresses.rs

diff --git a/Cargo.lock b/Cargo.lock
index 035055c0621..8b8d7d848f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2797,7 +2797,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.44.1"
+version = "0.44.2"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -3187,7 +3187,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.26.1"
+version = "0.26.2"
 dependencies = [
  "anyhow",
  "async-std",
@@ -3252,7 +3252,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.44.1"
+version = "0.44.2"
 dependencies = [
  "async-std",
  "either",
@@ -3270,6 +3270,7 @@ dependencies = [
  "libp2p-swarm-derive",
  "libp2p-swarm-test",
  "libp2p-yamux",
+ "lru",
  "multistream-select",
  "once_cell",
  "quickcheck-ext",
@@ -3285,7 +3286,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.34.2"
+version = "0.34.3"
 dependencies = [
  "heck",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 26cfaf80898..578458a233d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ libp2p-dcutr = { version = "0.11.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.1", path = "protocols/gossipsub" }
-libp2p-identify = { version = "0.44.1", path = "protocols/identify" }
+libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.8" }
 libp2p-kad = { version = "0.45.3", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
@@ -99,11 +99,11 @@ libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.2", path = "transports/quic" }
 libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.26.1", path = "protocols/request-response" }
+libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.5", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha", path = "protocols/stream" }
-libp2p-swarm = { version = "0.44.1", path = "swarm" }
-libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
+libp2p-swarm = { version = "0.44.2", path = "swarm" }
+libp2p-swarm-derive = { version = "=0.34.3", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index a1ecae7ccab..fce64ad0c12 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -3,8 +3,8 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
-version = "0.12.0"
 authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>"]
+version = "0.12.0"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/protocols/autonat/src/behaviour.rs b/protocols/autonat/src/behaviour.rs
index e95163ab23f..a770e61e88a 100644
--- a/protocols/autonat/src/behaviour.rs
+++ b/protocols/autonat/src/behaviour.rs
@@ -268,6 +268,7 @@ impl Behaviour {
     pub fn add_server(&mut self, peer: PeerId, address: Option<Multiaddr>) {
         self.servers.insert(peer);
         if let Some(addr) = address {
+            #[allow(deprecated)]
             self.inner.add_address(&peer, addr);
         }
     }
diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs
index 9e1f0591e6d..084ee744145 100644
--- a/protocols/dcutr/tests/lib.rs
+++ b/protocols/dcutr/tests/lib.rs
@@ -203,6 +203,7 @@ async fn wait_for_reservation(
             SwarmEvent::ExternalAddrConfirmed { address } if !is_renewal => {
                 assert_eq!(address, client_addr);
             }
+            SwarmEvent::NewExternalAddrOfPeer { .. } => {}
             e => panic!("{e:?}"),
         }
     }
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index 22c74b28cae..83984448d07 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.44.2
+
+- Emit `ToSwarm::NewExternalAddrOfPeer` for all external addresses of remote peers.
+  For this work, the address cache must be enabled via `identify::Config::with_cache_size`.
+  The default is 0, i.e. disabled.
+  See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
+
 ## 0.44.1
 
 - Ensure `Multiaddr` handled and returned by `Behaviour` are `/p2p` terminated.
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 61ef9c47044..2fb51d87627 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Nodes identifcation protocol for libp2p"
-version = "0.44.1"
+version = "0.44.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index e4da898f44c..43bddb52fe7 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -26,15 +26,14 @@ use libp2p_identity::PublicKey;
 use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm};
 use libp2p_swarm::{
     ConnectionDenied, DialError, ExternalAddresses, ListenAddresses, NetworkBehaviour,
-    NotifyHandler, StreamUpgradeError, THandlerInEvent, ToSwarm,
+    NotifyHandler, PeerAddresses, StreamUpgradeError, THandlerInEvent, ToSwarm,
 };
 use libp2p_swarm::{ConnectionId, THandler, THandlerOutEvent};
-use lru::LruCache;
+
 use std::collections::hash_map::Entry;
 use std::num::NonZeroUsize;
 use std::{
     collections::{HashMap, HashSet, VecDeque},
-    iter::FromIterator,
     task::Context,
     task::Poll,
     time::Duration,
@@ -200,9 +199,9 @@ impl Behaviour {
             .or_default()
             .insert(conn, addr);
 
-        if let Some(entry) = self.discovered_peers.get_mut(&peer_id) {
+        if let Some(cache) = self.discovered_peers.0.as_mut() {
             for addr in failed_addresses {
-                entry.remove(addr);
+                cache.remove(&peer_id, addr);
             }
         }
     }
@@ -268,13 +267,23 @@ impl NetworkBehaviour for Behaviour {
                 info.listen_addrs
                     .retain(|addr| multiaddr_matches_peer_id(addr, &peer_id));
 
-                // Replace existing addresses to prevent other peer from filling up our memory.
-                self.discovered_peers
-                    .put(peer_id, info.listen_addrs.iter().cloned());
-
                 let observed = info.observed_addr.clone();
                 self.events
-                    .push_back(ToSwarm::GenerateEvent(Event::Received { peer_id, info }));
+                    .push_back(ToSwarm::GenerateEvent(Event::Received {
+                        peer_id,
+                        info: info.clone(),
+                    }));
+
+                if let Some(ref mut discovered_peers) = self.discovered_peers.0 {
+                    for address in &info.listen_addrs {
+                        if discovered_peers.add(peer_id, address.clone()) {
+                            self.events.push_back(ToSwarm::NewExternalAddrOfPeer {
+                                peer_id,
+                                address: address.clone(),
+                            });
+                        }
+                    }
+                }
 
                 match self.our_observed_addresses.entry(id) {
                     Entry::Vacant(not_yet_observed) => {
@@ -387,11 +396,11 @@ impl NetworkBehaviour for Behaviour {
                 self.our_observed_addresses.remove(&connection_id);
             }
             FromSwarm::DialFailure(DialFailure { peer_id, error, .. }) => {
-                if let Some(entry) = peer_id.and_then(|id| self.discovered_peers.get_mut(&id)) {
-                    if let DialError::Transport(errors) = error {
-                        for (addr, _error) in errors {
-                            entry.remove(addr);
-                        }
+                if let (Some(peer_id), Some(cache), DialError::Transport(errors)) =
+                    (peer_id, self.discovered_peers.0.as_mut(), error)
+                {
+                    for (addr, _error) in errors {
+                        cache.remove(&peer_id, addr);
                     }
                 }
             }
@@ -445,7 +454,7 @@ fn multiaddr_matches_peer_id(addr: &Multiaddr, peer_id: &PeerId) -> bool {
     true
 }
 
-struct PeerCache(Option<LruCache<PeerId, HashSet<Multiaddr>>>);
+struct PeerCache(Option<PeerAddresses>);
 
 impl PeerCache {
     fn disabled() -> Self {
@@ -453,34 +462,15 @@ impl PeerCache {
     }
 
     fn enabled(size: NonZeroUsize) -> Self {
-        Self(Some(LruCache::new(size)))
-    }
-
-    fn get_mut(&mut self, peer: &PeerId) -> Option<&mut HashSet<Multiaddr>> {
-        self.0.as_mut()?.get_mut(peer)
-    }
-
-    fn put(&mut self, peer: PeerId, addresses: impl Iterator<Item = Multiaddr>) {
-        let cache = match self.0.as_mut() {
-            None => return,
-            Some(cache) => cache,
-        };
-
-        let addresses = addresses.filter_map(|a| a.with_p2p(peer).ok());
-        cache.put(peer, HashSet::from_iter(addresses));
+        Self(Some(PeerAddresses::new(size)))
     }
 
     fn get(&mut self, peer: &PeerId) -> Vec<Multiaddr> {
-        let cache = match self.0.as_mut() {
-            None => return Vec::new(),
-            Some(cache) => cache,
-        };
-
-        cache
-            .get(peer)
-            .cloned()
-            .map(Vec::from_iter)
-            .unwrap_or_default()
+        if let Some(cache) = self.0.as_mut() {
+            cache.get(peer).collect()
+        } else {
+            Vec::new()
+        }
     }
 }
 
diff --git a/protocols/identify/tests/smoke.rs b/protocols/identify/tests/smoke.rs
index 5cccc09d863..dd92d10979a 100644
--- a/protocols/identify/tests/smoke.rs
+++ b/protocols/identify/tests/smoke.rs
@@ -110,7 +110,7 @@ async fn only_emits_address_candidate_once_per_connection() {
     async_std::task::spawn(swarm2.loop_on_next());
 
     let swarm_events = futures::stream::poll_fn(|cx| swarm1.poll_next_unpin(cx))
-        .take(5)
+        .take(8)
         .collect::<Vec<_>>()
         .await;
 
@@ -156,6 +156,78 @@ async fn only_emits_address_candidate_once_per_connection() {
     );
 }
 
+#[async_std::test]
+async fn emits_unique_listen_addresses() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    let mut swarm1 = Swarm::new_ephemeral(|identity| {
+        identify::Behaviour::new(
+            identify::Config::new("a".to_string(), identity.public())
+                .with_agent_version("b".to_string())
+                .with_interval(Duration::from_secs(1))
+                .with_cache_size(10),
+        )
+    });
+    let mut swarm2 = Swarm::new_ephemeral(|identity| {
+        identify::Behaviour::new(
+            identify::Config::new("c".to_string(), identity.public())
+                .with_agent_version("d".to_string()),
+        )
+    });
+
+    let (swarm2_mem_listen_addr, swarm2_tcp_listen_addr) =
+        swarm2.listen().with_memory_addr_external().await;
+    let swarm2_peer_id = *swarm2.local_peer_id();
+    swarm1.connect(&mut swarm2).await;
+
+    async_std::task::spawn(swarm2.loop_on_next());
+
+    let swarm_events = futures::stream::poll_fn(|cx| swarm1.poll_next_unpin(cx))
+        .take(8)
+        .collect::<Vec<_>>()
+        .await;
+
+    let infos = swarm_events
+        .iter()
+        .filter_map(|e| match e {
+            SwarmEvent::Behaviour(identify::Event::Received { info, .. }) => Some(info.clone()),
+            _ => None,
+        })
+        .collect::<Vec<_>>();
+
+    assert!(
+        infos.len() > 1,
+        "should exchange identify payload more than once"
+    );
+
+    let listen_addrs = infos
+        .iter()
+        .map(|i| i.listen_addrs.clone())
+        .collect::<Vec<_>>();
+
+    for addrs in listen_addrs {
+        assert_eq!(addrs.len(), 2);
+        assert!(addrs.contains(&swarm2_mem_listen_addr));
+        assert!(addrs.contains(&swarm2_tcp_listen_addr));
+    }
+
+    let reported_addrs = swarm_events
+        .iter()
+        .filter_map(|e| match e {
+            SwarmEvent::NewExternalAddrOfPeer { peer_id, address } => {
+                Some((*peer_id, address.clone()))
+            }
+            _ => None,
+        })
+        .collect::<Vec<_>>();
+
+    assert_eq!(reported_addrs.len(), 2, "To have two addresses of remote");
+    assert!(reported_addrs.contains(&(swarm2_peer_id, swarm2_mem_listen_addr)));
+    assert!(reported_addrs.contains(&(swarm2_peer_id, swarm2_tcp_listen_addr)));
+}
+
 #[async_std::test]
 async fn identify_push() {
     let _ = tracing_subscriber::fmt()
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index d53ff479ee2..92417508786 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.26.2
+
+- Deprecate `Behaviour::add_address` in favor of `Swarm::add_peer_address`.
+  See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
+
 ## 0.26.1
 
 - Derive `PartialOrd` and `Ord` for `{Out,In}boundRequestId`.
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index c2c8d6d3085..198e9fe401e 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-request-response"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Generic Request/Response Protocols"
-version = "0.26.1"
+version = "0.26.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -40,7 +40,7 @@ libp2p-yamux = { workspace = true }
 rand = "0.8"
 libp2p-swarm-test = { path = "../../swarm-test" }
 futures_ringbuf = "0.4.0"
-serde = { version = "1.0", features = ["derive"]}
+serde = { version = "1.0", features = ["derive"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/request-response/src/lib.rs b/protocols/request-response/src/lib.rs
index fc68bd6cf1f..4362b3255ad 100644
--- a/protocols/request-response/src/lib.rs
+++ b/protocols/request-response/src/lib.rs
@@ -84,8 +84,8 @@ use libp2p_identity::PeerId;
 use libp2p_swarm::{
     behaviour::{AddressChange, ConnectionClosed, DialFailure, FromSwarm},
     dial_opts::DialOpts,
-    ConnectionDenied, ConnectionHandler, ConnectionId, NetworkBehaviour, NotifyHandler, THandler,
-    THandlerInEvent, THandlerOutEvent, ToSwarm,
+    ConnectionDenied, ConnectionHandler, ConnectionId, NetworkBehaviour, NotifyHandler,
+    PeerAddresses, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use smallvec::SmallVec;
 use std::{
@@ -357,7 +357,7 @@ where
     /// reachable addresses, if any.
     connected: HashMap<PeerId, SmallVec<[Connection; 2]>>,
     /// Externally managed addresses via `add_address` and `remove_address`.
-    addresses: HashMap<PeerId, HashSet<Multiaddr>>,
+    addresses: PeerAddresses,
     /// Requests that have not yet been sent and are waiting for a connection
     /// to be established.
     pending_outbound_requests: HashMap<PeerId, SmallVec<[OutboundMessage<TCodec>; 10]>>,
@@ -406,7 +406,7 @@ where
             pending_events: VecDeque::new(),
             connected: HashMap::new(),
             pending_outbound_requests: HashMap::new(),
-            addresses: HashMap::new(),
+            addresses: PeerAddresses::default(),
         }
     }
 
@@ -470,20 +470,15 @@ where
     ///
     /// Returns true if the address was added, false otherwise (i.e. if the
     /// address is already in the list).
+    #[deprecated(note = "Use `Swarm::add_peer_address` instead.")]
     pub fn add_address(&mut self, peer: &PeerId, address: Multiaddr) -> bool {
-        self.addresses.entry(*peer).or_default().insert(address)
+        self.addresses.add(*peer, address)
     }
 
-    /// Removes an address of a peer previously added via `add_address`.
+    /// Removes an address of a peer previously added via [`Behaviour::add_address`].
+    #[deprecated(note = "Will be removed with the next breaking release and won't be replaced.")]
     pub fn remove_address(&mut self, peer: &PeerId, address: &Multiaddr) {
-        let mut last = false;
-        if let Some(addresses) = self.addresses.get_mut(peer) {
-            addresses.retain(|a| a != address);
-            last = addresses.is_empty();
-        }
-        if last {
-            self.addresses.remove(peer);
-        }
+        self.addresses.remove(peer, address);
     }
 
     /// Checks whether a peer is currently connected.
@@ -764,9 +759,9 @@ where
         if let Some(connections) = self.connected.get(&peer) {
             addresses.extend(connections.iter().filter_map(|c| c.remote_address.clone()))
         }
-        if let Some(more) = self.addresses.get(&peer) {
-            addresses.extend(more.iter().cloned());
-        }
+
+        let cached_addrs = self.addresses.get(&peer);
+        addresses.extend(cached_addrs);
 
         Ok(addresses)
     }
@@ -797,6 +792,7 @@ where
     }
 
     fn on_swarm_event(&mut self, event: FromSwarm) {
+        self.addresses.on_swarm_event(&event);
         match event {
             FromSwarm::ConnectionEstablished(_) => {}
             FromSwarm::ConnectionClosed(connection_closed) => {
diff --git a/protocols/request-response/tests/peer_address.rs b/protocols/request-response/tests/peer_address.rs
new file mode 100644
index 00000000000..2a120931dcd
--- /dev/null
+++ b/protocols/request-response/tests/peer_address.rs
@@ -0,0 +1,60 @@
+use libp2p_core::ConnectedPoint;
+use libp2p_request_response as request_response;
+use libp2p_request_response::ProtocolSupport;
+use libp2p_swarm::{StreamProtocol, Swarm, SwarmEvent};
+use libp2p_swarm_test::SwarmExt;
+use serde::{Deserialize, Serialize};
+use std::iter;
+use tracing_subscriber::EnvFilter;
+
+#[async_std::test]
+async fn dial_succeeds_after_adding_peers_address() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
+    let config = request_response::Config::default();
+
+    let mut swarm = Swarm::new_ephemeral(|_| {
+        request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), config.clone())
+    });
+
+    let mut swarm2 = Swarm::new_ephemeral(|_| {
+        request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), config.clone())
+    });
+
+    let peer_id2 = *swarm2.local_peer_id();
+
+    let (listen_addr, _) = swarm2.listen().with_memory_addr_external().await;
+
+    swarm.add_peer_address(peer_id2, listen_addr.clone());
+
+    swarm.dial(peer_id2).unwrap();
+
+    async_std::task::spawn(swarm2.loop_on_next());
+
+    let (connected_peer_id, connected_address) = swarm
+        .wait(|event| match event {
+            SwarmEvent::ConnectionEstablished {
+                peer_id, endpoint, ..
+            } => {
+                let address = match endpoint {
+                    ConnectedPoint::Dialer { address, .. } => Some(address),
+                    _ => None,
+                };
+                Some((peer_id, address))
+            }
+            _ => None,
+        })
+        .await;
+    let expected_address = listen_addr.with_p2p(peer_id2).unwrap();
+
+    assert_eq!(connected_peer_id, peer_id2);
+    assert_eq!(expected_address, connected_address.unwrap());
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+struct Ping(Vec<u8>);
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+struct Pong(Vec<u8>);
diff --git a/swarm-derive/CHANGELOG.md b/swarm-derive/CHANGELOG.md
index 74f35806eec..55f5e571664 100644
--- a/swarm-derive/CHANGELOG.md
+++ b/swarm-derive/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.34.3
+
+- Generate code for `libp2p-swarm`'s `FromSwarm::NewExternalAddrOfPeer` enum variant.
+  See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
+
 ## 0.34.2
 
 - Restore support for generic constraints on behaviours combined with `out_event` generated by `NetworkBehaviour` where no where clause is used.
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 7740d57feb1..f3c75749602 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm-derive"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Procedural macros of libp2p-swarm"
-version = "0.34.2"
+version = "0.34.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 65dce4b002a..3d8e3981c96 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.44.2
+
+- Allow `NetworkBehaviour`s to share addresses of peers.
+  This is enabled via the new `ToSwarm::NewExternalAddrOfPeer` event.
+  The address is broadcast to all behaviours via `FromSwarm::NewExternalAddrOfPeer`.
+  Protocols that want to collect these addresses can use the new `PeerAddresses` utility.
+  See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
+
 ## 0.44.1
 
 - Implement `Clone` & `Copy` for `FromSwarm.
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3a77aede919..085b59f3b51 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.44.1"
+version = "0.44.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,6 +20,7 @@ instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }
+lru = "0.12.1"
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
index 4be129a4eea..5070871a4c1 100644
--- a/swarm/src/behaviour.rs
+++ b/swarm/src/behaviour.rs
@@ -21,10 +21,12 @@
 mod either;
 mod external_addresses;
 mod listen_addresses;
+mod peer_addresses;
 pub mod toggle;
 
 pub use external_addresses::ExternalAddresses;
 pub use listen_addresses::ListenAddresses;
+pub use peer_addresses::PeerAddresses;
 
 use crate::connection::ConnectionId;
 use crate::dial_opts::DialOpts;
@@ -303,6 +305,9 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
         /// Whether to close a specific or all connections to the given peer.
         connection: CloseConnection,
     },
+
+    /// Reports external address of a remote peer to the [`Swarm`](crate::Swarm) and through that to other [`NetworkBehaviour`]s.
+    NewExternalAddrOfPeer { peer_id: PeerId, address: Multiaddr },
 }
 
 impl<TOutEvent, TInEventOld> ToSwarm<TOutEvent, TInEventOld> {
@@ -335,6 +340,13 @@ impl<TOutEvent, TInEventOld> ToSwarm<TOutEvent, TInEventOld> {
             ToSwarm::NewExternalAddrCandidate(addr) => ToSwarm::NewExternalAddrCandidate(addr),
             ToSwarm::ExternalAddrConfirmed(addr) => ToSwarm::ExternalAddrConfirmed(addr),
             ToSwarm::ExternalAddrExpired(addr) => ToSwarm::ExternalAddrExpired(addr),
+            ToSwarm::NewExternalAddrOfPeer {
+                address: addr,
+                peer_id,
+            } => ToSwarm::NewExternalAddrOfPeer {
+                address: addr,
+                peer_id,
+            },
         }
     }
 }
@@ -366,6 +378,13 @@ impl<TOutEvent, THandlerIn> ToSwarm<TOutEvent, THandlerIn> {
                 peer_id,
                 connection,
             },
+            ToSwarm::NewExternalAddrOfPeer {
+                address: addr,
+                peer_id,
+            } => ToSwarm::NewExternalAddrOfPeer {
+                address: addr,
+                peer_id,
+            },
         }
     }
 }
@@ -432,6 +451,8 @@ pub enum FromSwarm<'a> {
     ExternalAddrConfirmed(ExternalAddrConfirmed<'a>),
     /// Informs the behaviour that an external address of the local node expired, i.e. is no-longer confirmed.
     ExternalAddrExpired(ExternalAddrExpired<'a>),
+    /// Informs the behaviour that we have discovered a new external address for a remote peer.
+    NewExternalAddrOfPeer(NewExternalAddrOfPeer<'a>),
 }
 
 /// [`FromSwarm`] variant that informs the behaviour about a newly established connection to a peer.
@@ -543,3 +564,10 @@ pub struct ExternalAddrConfirmed<'a> {
 pub struct ExternalAddrExpired<'a> {
     pub addr: &'a Multiaddr,
 }
+
+/// [`FromSwarm`] variant that informs the behaviour that a new external address for a remote peer was detected.
+#[derive(Clone, Copy, Debug)]
+pub struct NewExternalAddrOfPeer<'a> {
+    pub peer_id: PeerId,
+    pub addr: &'a Multiaddr,
+}
diff --git a/swarm/src/behaviour/peer_addresses.rs b/swarm/src/behaviour/peer_addresses.rs
new file mode 100644
index 00000000000..a011867dcdf
--- /dev/null
+++ b/swarm/src/behaviour/peer_addresses.rs
@@ -0,0 +1,338 @@
+use crate::behaviour::FromSwarm;
+use crate::{DialError, DialFailure, NewExternalAddrOfPeer};
+
+use libp2p_core::Multiaddr;
+use libp2p_identity::PeerId;
+
+use lru::LruCache;
+
+use std::num::NonZeroUsize;
+
+/// Struct for tracking peers' external addresses of the [`Swarm`](crate::Swarm).
+#[derive(Debug)]
+pub struct PeerAddresses(LruCache<PeerId, LruCache<Multiaddr, ()>>);
+
+impl PeerAddresses {
+    /// Creates a [`PeerAddresses`] cache with capacity for the given number of peers.
+    ///
+    /// For each peer, we will at most store 10 addresses.
+    pub fn new(number_of_peers: NonZeroUsize) -> Self {
+        Self(LruCache::new(number_of_peers))
+    }
+
+    /// Feed a [`FromSwarm`] event to this struct.
+    ///
+    /// Returns whether the event changed peer's known external addresses.
+    pub fn on_swarm_event(&mut self, event: &FromSwarm) -> bool {
+        match event {
+            FromSwarm::NewExternalAddrOfPeer(NewExternalAddrOfPeer { peer_id, addr }) => {
+                self.add(*peer_id, (*addr).clone())
+            }
+            FromSwarm::DialFailure(DialFailure {
+                peer_id: Some(peer_id),
+                error: DialError::Transport(errors),
+                ..
+            }) => {
+                for (addr, _error) in errors {
+                    self.remove(peer_id, addr);
+                }
+                true
+            }
+            _ => false,
+        }
+    }
+
+    /// Adds address to cache.
+    /// Appends address to the existing set if peer addresses already exist.
+    /// Creates a new cache entry for peer_id if no addresses are present.
+    /// Returns true if the newly added address was not previously in the cache.
+    ///
+    pub fn add(&mut self, peer: PeerId, address: Multiaddr) -> bool {
+        match prepare_addr(&peer, &address) {
+            Ok(address) => {
+                if let Some(cached) = self.0.get_mut(&peer) {
+                    cached.put(address, ()).is_none()
+                } else {
+                    let mut set = LruCache::new(NonZeroUsize::new(10).expect("10 > 0"));
+                    set.put(address, ());
+                    self.0.put(peer, set);
+
+                    true
+                }
+            }
+            Err(_) => false,
+        }
+    }
+
+    /// Returns peer's external addresses.
+    pub fn get(&mut self, peer: &PeerId) -> impl Iterator<Item = Multiaddr> + '_ {
+        self.0
+            .get(peer)
+            .into_iter()
+            .flat_map(|c| c.iter().map(|(m, ())| m))
+            .cloned()
+    }
+
+    /// Removes address from peer addresses cache.
+    /// Returns true if the address was removed.
+    pub fn remove(&mut self, peer: &PeerId, address: &Multiaddr) -> bool {
+        match self.0.get_mut(peer) {
+            Some(addrs) => match prepare_addr(peer, address) {
+                Ok(address) => addrs.pop(&address).is_some(),
+                Err(_) => false,
+            },
+            None => false,
+        }
+    }
+}
+
+fn prepare_addr(peer: &PeerId, addr: &Multiaddr) -> Result<Multiaddr, Multiaddr> {
+    addr.clone().with_p2p(*peer)
+}
+
+impl Default for PeerAddresses {
+    fn default() -> Self {
+        Self(LruCache::new(NonZeroUsize::new(100).unwrap()))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io;
+
+    use crate::{ConnectionId, DialError};
+    use libp2p_core::{
+        multiaddr::Protocol,
+        transport::{memory::MemoryTransportError, TransportError},
+    };
+
+    use once_cell::sync::Lazy;
+
+    #[test]
+    fn new_peer_addr_returns_correct_changed_value() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+
+        let event = new_external_addr_of_peer1(peer_id);
+
+        let changed = cache.on_swarm_event(&event);
+        assert!(changed);
+
+        let changed = cache.on_swarm_event(&event);
+        assert!(!changed);
+    }
+
+    #[test]
+    fn new_peer_addr_saves_peer_addrs() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let event = new_external_addr_of_peer1(peer_id);
+
+        let changed = cache.on_swarm_event(&event);
+        assert!(changed);
+
+        let addr1 = MEMORY_ADDR_1000.clone().with_p2p(peer_id).unwrap();
+        let expected = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        assert_eq!(expected, vec![addr1]);
+
+        let event = new_external_addr_of_peer2(peer_id);
+        let changed = cache.on_swarm_event(&event);
+
+        let addr1 = MEMORY_ADDR_1000.clone().with_p2p(peer_id).unwrap();
+        let addr2 = MEMORY_ADDR_2000.clone().with_p2p(peer_id).unwrap();
+
+        let expected_addrs = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        assert!(expected_addrs.contains(&addr1));
+        assert!(expected_addrs.contains(&addr2));
+
+        let expected = cache.get(&peer_id).collect::<Vec<Multiaddr>>().len();
+        assert_eq!(expected, 2);
+
+        assert!(changed);
+    }
+
+    #[test]
+    fn existing_addr_is_not_added_to_cache() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+
+        let event = new_external_addr_of_peer1(peer_id);
+
+        let addr1 = MEMORY_ADDR_1000.clone().with_p2p(peer_id).unwrap();
+        let changed = cache.on_swarm_event(&event);
+        let expected = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        assert!(changed);
+        assert_eq!(expected, vec![addr1]);
+
+        let addr1 = MEMORY_ADDR_1000.clone().with_p2p(peer_id).unwrap();
+        let changed = cache.on_swarm_event(&event);
+        let expected = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        assert!(!changed);
+        assert_eq!(expected, [addr1]);
+    }
+
+    #[test]
+    fn addresses_of_peer_are_removed_when_received_dial_failure() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+        let addr2: Multiaddr = "/ip4/127.0.0.1/tcp/8081".parse().unwrap();
+        let addr3: Multiaddr = "/ip4/127.0.0.1/tcp/8082".parse().unwrap();
+
+        cache.add(peer_id, addr.clone());
+        cache.add(peer_id, addr2.clone());
+        cache.add(peer_id, addr3.clone());
+
+        let error = DialError::Transport(prepare_errors(vec![addr, addr3]));
+
+        let event = FromSwarm::DialFailure(DialFailure {
+            peer_id: Some(peer_id),
+            error: &error,
+            connection_id: ConnectionId::new_unchecked(8),
+        });
+
+        let changed = cache.on_swarm_event(&event);
+
+        assert!(changed);
+
+        let cached = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        let expected = prepare_expected_addrs(peer_id, [addr2].into_iter());
+
+        assert_eq!(cached, expected);
+    }
+
+    #[test]
+    fn remove_removes_address_if_present() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+
+        cache.add(peer_id, addr.clone());
+
+        assert!(cache.remove(&peer_id, &addr));
+    }
+
+    #[test]
+    fn remove_returns_false_if_address_not_present() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+
+        assert!(!cache.remove(&peer_id, &addr));
+    }
+
+    #[test]
+    fn remove_returns_false_if_peer_not_present() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+
+        assert!(!cache.remove(&peer_id, &addr));
+    }
+
+    #[test]
+    fn remove_removes_address_provided_in_param() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+        let addr2: Multiaddr = "/ip4/127.0.0.1/tcp/8081".parse().unwrap();
+        let addr3: Multiaddr = "/ip4/127.0.0.1/tcp/8082".parse().unwrap();
+
+        cache.add(peer_id, addr.clone());
+        cache.add(peer_id, addr2.clone());
+        cache.add(peer_id, addr3.clone());
+
+        assert!(cache.remove(&peer_id, &addr2));
+
+        let mut cached = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        cached.sort();
+
+        let expected = prepare_expected_addrs(peer_id, [addr, addr3].into_iter());
+
+        assert_eq!(cached, expected);
+    }
+
+    #[test]
+    fn add_adds_new_address_to_cache() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+
+        assert!(cache.add(peer_id, addr.clone()));
+
+        let mut cached = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        cached.sort();
+        let expected = prepare_expected_addrs(peer_id, [addr].into_iter());
+
+        assert_eq!(cached, expected);
+    }
+
+    #[test]
+    fn add_adds_address_to_cache_to_existing_key() {
+        let mut cache = PeerAddresses::default();
+        let peer_id = PeerId::random();
+        let addr: Multiaddr = "/ip4/127.0.0.1/tcp/8080".parse().unwrap();
+        let addr2: Multiaddr = "/ip4/127.0.0.1/tcp/8081".parse().unwrap();
+        let addr3: Multiaddr = "/ip4/127.0.0.1/tcp/8082".parse().unwrap();
+
+        assert!(cache.add(peer_id, addr.clone()));
+
+        cache.add(peer_id, addr2.clone());
+        cache.add(peer_id, addr3.clone());
+
+        let expected = prepare_expected_addrs(peer_id, [addr, addr2, addr3].into_iter());
+
+        let mut cached = cache.get(&peer_id).collect::<Vec<Multiaddr>>();
+        cached.sort();
+
+        assert_eq!(cached, expected);
+    }
+
+    fn prepare_expected_addrs(
+        peer_id: PeerId,
+        addrs: impl Iterator<Item = Multiaddr>,
+    ) -> Vec<Multiaddr> {
+        let mut addrs = addrs
+            .filter_map(|a| a.with_p2p(peer_id).ok())
+            .collect::<Vec<Multiaddr>>();
+        addrs.sort();
+        addrs
+    }
+
+    fn new_external_addr_of_peer1(peer_id: PeerId) -> FromSwarm<'static> {
+        FromSwarm::NewExternalAddrOfPeer(NewExternalAddrOfPeer {
+            peer_id,
+            addr: &MEMORY_ADDR_1000,
+        })
+    }
+
+    fn new_external_addr_of_peer2(peer_id: PeerId) -> FromSwarm<'static> {
+        FromSwarm::NewExternalAddrOfPeer(NewExternalAddrOfPeer {
+            peer_id,
+            addr: &MEMORY_ADDR_2000,
+        })
+    }
+
+    fn prepare_errors(addrs: Vec<Multiaddr>) -> Vec<(Multiaddr, TransportError<io::Error>)> {
+        let errors: Vec<(Multiaddr, TransportError<io::Error>)> = addrs
+            .iter()
+            .map(|addr| {
+                (
+                    addr.clone(),
+                    TransportError::Other(io::Error::new(
+                        io::ErrorKind::Other,
+                        MemoryTransportError::Unreachable,
+                    )),
+                )
+            })
+            .collect();
+        errors
+    }
+
+    static MEMORY_ADDR_1000: Lazy<Multiaddr> =
+        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
+    static MEMORY_ADDR_2000: Lazy<Multiaddr> =
+        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(2000)));
+}
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 0354f39cfdc..2f02e43348d 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -84,6 +84,7 @@ pub mod derive_prelude {
     pub use crate::behaviour::ListenerClosed;
     pub use crate::behaviour::ListenerError;
     pub use crate::behaviour::NewExternalAddrCandidate;
+    pub use crate::behaviour::NewExternalAddrOfPeer;
     pub use crate::behaviour::NewListenAddr;
     pub use crate::behaviour::NewListener;
     pub use crate::connection::ConnectionId;
@@ -108,8 +109,8 @@ pub mod derive_prelude {
 pub use behaviour::{
     AddressChange, CloseConnection, ConnectionClosed, DialFailure, ExpiredListenAddr,
     ExternalAddrExpired, ExternalAddresses, FromSwarm, ListenAddresses, ListenFailure,
-    ListenerClosed, ListenerError, NetworkBehaviour, NewExternalAddrCandidate, NewListenAddr,
-    NotifyHandler, ToSwarm,
+    ListenerClosed, ListenerError, NetworkBehaviour, NewExternalAddrCandidate,
+    NewExternalAddrOfPeer, NewListenAddr, NotifyHandler, PeerAddresses, ToSwarm,
 };
 pub use connection::pool::ConnectionCounters;
 pub use connection::{ConnectionError, ConnectionId, SupportedProtocols};
@@ -298,6 +299,8 @@ pub enum SwarmEvent<TBehaviourOutEvent> {
     ExternalAddrConfirmed { address: Multiaddr },
     /// An external address of the local node expired, i.e. is no-longer confirmed.
     ExternalAddrExpired { address: Multiaddr },
+    /// We have discovered a new address of a peer.
+    NewExternalAddrOfPeer { peer_id: PeerId, address: Multiaddr },
 }
 
 impl<TBehaviourOutEvent> SwarmEvent<TBehaviourOutEvent> {
@@ -623,6 +626,17 @@ where
         self.confirmed_external_addr.remove(addr);
     }
 
+    /// Add a new external address of a remote peer.
+    ///
+    /// The address is broadcast to all [`NetworkBehaviour`]s via [`FromSwarm::NewExternalAddrOfPeer`].
+    pub fn add_peer_address(&mut self, peer_id: PeerId, addr: Multiaddr) {
+        self.behaviour
+            .on_swarm_event(FromSwarm::NewExternalAddrOfPeer(NewExternalAddrOfPeer {
+                peer_id,
+                addr: &addr,
+            }))
+    }
+
     /// Disconnects a peer by its peer ID, closing all connections to said peer.
     ///
     /// Returns `Ok(())` if there was one or more established connections to the peer.
@@ -1176,6 +1190,15 @@ where
                     self.pool.disconnect(peer_id);
                 }
             },
+            ToSwarm::NewExternalAddrOfPeer { peer_id, address } => {
+                self.behaviour
+                    .on_swarm_event(FromSwarm::NewExternalAddrOfPeer(NewExternalAddrOfPeer {
+                        peer_id,
+                        addr: &address,
+                    }));
+                self.pending_swarm_events
+                    .push_back(SwarmEvent::NewExternalAddrOfPeer { peer_id, address });
+            }
         }
     }
 

From 1139f1c170c36d7223bb8c52c667b111ea5c5fbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:26:25 +0000
Subject: [PATCH 084/455] deps: bump snow from 0.9.4 to 0.9.5

Pull-Request: #5123.
---
 Cargo.lock                  | 4 ++--
 transports/noise/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b8d7d848f5..12af4f37571 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5504,9 +5504,9 @@ dependencies = [
 
 [[package]]
 name = "snow"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e"
+checksum = "2e87c18a6608909007e75a60e04d03eda77b601c94de1c74d9a9dc2c04ab789a"
 dependencies = [
  "aes-gcm",
  "blake2",
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 4621a5112ab..e4c940e6336 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -28,10 +28,10 @@ x25519-dalek = "2"
 zeroize = "1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-snow = { version = "0.9.4", features = ["ring-resolver"], default-features = false }
+snow = { version = "0.9.5", features = ["ring-resolver"], default-features = false }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-snow = { version = "0.9.2", features = ["default-resolver"], default-features = false }
+snow = { version = "0.9.5", features = ["default-resolver"], default-features = false }
 
 [dev-dependencies]
 futures_ringbuf = "0.4.0"

From 5c964c3a137f218dc973eeef4829872cedfca7e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 08:40:36 +0000
Subject: [PATCH 085/455] deps: bump wasm-bindgen-futures from 0.4.39 to 0.4.40

Pull-Request: #5093.
---
 Cargo.lock                                | 4 ++--
 examples/browser-webrtc/Cargo.toml        | 2 +-
 swarm/Cargo.toml                          | 2 +-
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 12af4f37571..7af8d2cc754 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6418,9 +6418,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
 dependencies = [
  "cfg-if",
  "js-sys",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index d8bf9232514..9358acb0902 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -39,7 +39,7 @@ libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "was
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.39"
+wasm-bindgen-futures = "0.4.40"
 web-sys = { version = "0.3", features = ['Document', 'Element', 'HtmlElement', 'Node', 'Response', 'Window'] }
 
 [lints]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 085b59f3b51..95513e08398 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -27,7 +27,7 @@ rand = "0.8"
 smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1"
-wasm-bindgen-futures = { version = "0.4.39", optional = true }
+wasm-bindgen-futures = { version = "0.4.40", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 225fe736a1c..ecd327a5173 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -24,7 +24,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.90" }
-wasm-bindgen-futures = { version = "0.4.39" }
+wasm-bindgen-futures = { version = "0.4.40" }
 web-sys = { version = "0.3.67", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 5e06b2af117..46d91e279e5 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -25,7 +25,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.56"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.39"
+wasm-bindgen-futures = "0.4.40"
 web-sys = { version = "0.3.67", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 26e2c4e5b3f..6e9efdd0a93 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-webtransport-websys = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.39"
+wasm-bindgen-futures = "0.4.40"
 wasm-bindgen-test = "0.3.39"
 web-sys = { version = "0.3.67", features = ["Response", "Window"] }
 

From c40a8f17a75b6e15aa97a864e7ada24da3376e0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:01:49 +0000
Subject: [PATCH 086/455] deps: bump serde from 1.0.195 to 1.0.196

Pull-Request: #5128.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7af8d2cc754..bdcc514f655 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5293,18 +5293,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.195"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.195"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 0f1a097ce8e..53c438a30dc 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.35.1", features = ["full"] }
-serde = { version = "1.0.193", features = ["derive"] }
+serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.111"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 998f1367734..e5c25ff6fd7 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.4.16", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.193", features = ["derive"] }
+serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.111"
 libp2p-core = { workspace = true }
 base64 = "0.21.7"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 10af2cab4bf..f300e177b6c 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.193"
+serde = "1.0.196"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }

From 880e4d39099489032ddb00417d6542f8a8f3cbb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:12:37 +0000
Subject: [PATCH 087/455] deps: bump snow from 0.9.5 to 0.9.6

Pull-Request: #5129.
---
 Cargo.lock                  | 4 ++--
 transports/noise/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bdcc514f655..9b1bfecdf7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5504,9 +5504,9 @@ dependencies = [
 
 [[package]]
 name = "snow"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e87c18a6608909007e75a60e04d03eda77b601c94de1c74d9a9dc2c04ab789a"
+checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
 dependencies = [
  "aes-gcm",
  "blake2",
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index e4c940e6336..981e1c05831 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -28,7 +28,7 @@ x25519-dalek = "2"
 zeroize = "1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-snow = { version = "0.9.5", features = ["ring-resolver"], default-features = false }
+snow = { version = "0.9.6", features = ["ring-resolver"], default-features = false }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 snow = { version = "0.9.5", features = ["default-resolver"], default-features = false }

From 415e70a6fc07cbc48bc4bfbf95ae5dcdcfda2e5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 03:01:04 +0000
Subject: [PATCH 088/455] deps: bump async-io from 2.2.2 to 2.3.1

Pull-Request: #5131.
---
 Cargo.lock                | 10 +++++-----
 protocols/mdns/Cargo.toml |  2 +-
 transports/tcp/Cargo.toml |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b1bfecdf7a..6269e955759 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -300,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
+checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65"
 dependencies = [
  "async-lock 3.1.0",
  "cfg-if",
@@ -2287,7 +2287,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io 2.2.2",
+ "async-io 2.3.1",
  "core-foundation",
  "fnv",
  "futures",
@@ -2887,7 +2887,7 @@ dependencies = [
 name = "libp2p-mdns"
 version = "0.45.1"
 dependencies = [
- "async-io 2.2.2",
+ "async-io 2.3.1",
  "async-std",
  "data-encoding",
  "futures",
@@ -3315,7 +3315,7 @@ dependencies = [
 name = "libp2p-tcp"
 version = "0.41.0"
 dependencies = [
- "async-io 2.2.2",
+ "async-io 2.3.1",
  "async-std",
  "futures",
  "futures-timer",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 3a11ae71cdf..1e783da7f13 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
-async-io  = { version = "2.2.2", optional = true }
+async-io  = { version = "2.3.1", optional = true }
 data-encoding = "2.5.0"
 futures = "0.3.30"
 if-watch = "3.2.0"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 74e804f2d3e..c7a48bbc9c6 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-io = { version = "2.2.2", optional = true }
+async-io = { version = "2.3.1", optional = true }
 futures = "0.3.30"
 futures-timer = "3.0"
 if-watch = "3.2.0"

From 8d33b3a9e7057870c9ad352fa44aeb9ea1364e26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 03:12:34 +0000
Subject: [PATCH 089/455] deps: bump pin-project from 1.1.3 to 1.1.4

Pull-Request: #5132.
---
 Cargo.lock                         | 8 ++++----
 core/Cargo.toml                    | 2 +-
 misc/metrics/Cargo.toml            | 2 +-
 misc/multistream-select/Cargo.toml | 2 +-
 misc/rw-stream-sink/Cargo.toml     | 2 +-
 transports/pnet/Cargo.toml         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6269e955759..f1a7179979a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4266,18 +4266,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 03b472d9682..619cd357744 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -22,7 +22,7 @@ multihash = { workspace = true }
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 parking_lot = "0.12.0"
-pin-project = "1.1.3"
+pin-project = "1.1.4"
 quick-protobuf = "0.8"
 rand = "0.8"
 rw-stream-sink = { workspace = true }
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index 41eed8f2c36..38c4777d4a6 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -30,7 +30,7 @@ libp2p-kad = { workspace = true, optional = true }
 libp2p-ping = { workspace = true, optional = true }
 libp2p-relay =  { workspace = true, optional = true }
 libp2p-swarm = { workspace = true }
-pin-project = "1.0.0"
+pin-project = "1.1.4"
 prometheus-client = { workspace = true }
 
 [dev-dependencies]
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 19aefb977ff..b2456243252 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 bytes = "1"
 futures = "0.3"
 tracing = "0.1.37"
-pin-project = "1.1.3"
+pin-project = "1.1.4"
 smallvec = "1.12.0"
 unsigned-varint = { workspace = true }
 
diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
index 8e093ac3db0..f8f103bd6d9 100644
--- a/misc/rw-stream-sink/Cargo.toml
+++ b/misc/rw-stream-sink/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures = "0.3.30"
-pin-project = "1.1.3"
+pin-project = "1.1.4"
 static_assertions = "1"
 
 [dev-dependencies]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index 77dda92321f..db9ad2ce341 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -16,7 +16,7 @@ salsa20 = "0.10"
 sha3 = "0.10"
 tracing = "0.1.37"
 rand = "0.8"
-pin-project = "1.1.3"
+pin-project = "1.1.4"
 
 [dev-dependencies]
 libp2p-core = { workspace = true }

From ef08942b8455263b676e5a191160818169e1403d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 03:38:40 +0000
Subject: [PATCH 090/455] deps: bump obi1kenobi/cargo-semver-checks-action from
 2.2 to 2.3

Pull-Request: #5126.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e8012d82a8..0314bfd295f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -319,7 +319,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.27.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
-      - uses: obi1kenobi/cargo-semver-checks-action@e275dda72e250d4df5b564e969e1348d67fefa52 # v2
+      - uses: obi1kenobi/cargo-semver-checks-action@48f4ef7da6d907d69d18249e0ba79aa98c61b9db # v2
 
   rustfmt:
     runs-on: ubuntu-latest

From f2a44075f9e582b48a9e311b7b4aa8746e0b5317 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 03:49:55 +0000
Subject: [PATCH 091/455] deps: bump the axum group with 2 updates

Pull-Request: #5088.
---
 Cargo.lock                         | 18 +++++++++---------
 examples/browser-webrtc/Cargo.toml |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f1a7179979a..47f350d8717 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -505,12 +505,12 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d"
+checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
 dependencies = [
  "async-trait",
- "axum-core 0.4.2",
+ "axum-core 0.4.3",
  "bytes",
  "futures-util",
  "http 1.0.0",
@@ -556,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87c8503f93e6d144ee5690907ba22db7ba79ab001a932ab99034f0fe836b3df"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
 dependencies = [
  "async-trait",
  "bytes",
@@ -712,7 +712,7 @@ name = "browser-webrtc-example"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.3",
+ "axum 0.7.4",
  "futures",
  "js-sys",
  "libp2p",
@@ -2386,7 +2386,7 @@ name = "interop-tests"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.3",
+ "axum 0.7.4",
  "console_error_panic_hook",
  "either",
  "futures",
@@ -6000,9 +6000,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d"
+checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e"
 dependencies = [
  "bitflags 2.4.1",
  "bytes",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 9358acb0902..1dde66b2205 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -23,14 +23,14 @@ tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-axum = "0.7.3"
+axum = "0.7.4"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.2.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
-tower-http = { version = "0.5.0", features = ["cors"] }
+tower-http = { version = "0.5.1", features = ["cors"] }
 mime_guess = "2.0.4"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

From 12e6abe8cbeef6cc7bdc71992cbb14e3456066d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 04:00:14 +0000
Subject: [PATCH 092/455] deps: bump tj-actions/glob from 19 to 20

Pull-Request: #5125.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0314bfd295f..90635ee53e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -379,7 +379,7 @@ jobs:
       - run: cargo install --version 0.10.0 pb-rs --locked
 
       - name: Glob match
-        uses: tj-actions/glob@v19
+        uses: tj-actions/glob@v20
         id: glob
         with:
           files: |

From fe29beee77d09f727b3e901798e9162dece50532 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 04:13:49 +0000
Subject: [PATCH 093/455] deps: bump serde_json from 1.0.111 to 1.0.113

Pull-Request: #5130.
---
 Cargo.lock                            | 47 +++++++++++++++++++--------
 hole-punching-tests/Cargo.toml        |  2 +-
 misc/keygen/Cargo.toml                |  2 +-
 protocols/request-response/Cargo.toml |  2 +-
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47f350d8717..81a2c993a03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,13 +54,14 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
@@ -1868,7 +1869,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.9",
- "indexmap 2.0.0",
+ "indexmap 2.2.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -1887,7 +1888,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 1.0.0",
- "indexmap 2.0.0",
+ "indexmap 2.2.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -1908,9 +1909,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -2332,12 +2333,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -3615,7 +3616,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
 dependencies = [
- "hashbrown 0.14.0",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -5313,11 +5314,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.111"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.2.1",
  "itoa",
  "ryu",
  "serde",
@@ -7045,6 +7046,26 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.7.0"
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 53c438a30dc..d2bb085ef5d 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.35.1", features = ["full"] }
 serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.111"
+serde_json = "1.0.113"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index e5c25ff6fd7..c7989fb4793 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.4.16", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.111"
+serde_json = "1.0.113"
 libp2p-core = { workspace = true }
 base64 = "0.21.7"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 198e9fe401e..7e27c824615 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.111", optional = true }
+serde_json = { version = "1.0.113", optional = true }
 smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1.0.2"

From c17c1127da06bc2c6f35f36a6fac5712344e97c8 Mon Sep 17 00:00:00 2001
From: yanziseeker <153156292+AdventureSeeker987@users.noreply.github.com>
Date: Wed, 31 Jan 2024 03:51:18 +0800
Subject: [PATCH 094/455] docs(gossipsub): fix typos in error.rs

Pull-Request: #5056.
---
 protocols/gossipsub/src/error.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/gossipsub/src/error.rs b/protocols/gossipsub/src/error.rs
index c461abc0d17..8761630467b 100644
--- a/protocols/gossipsub/src/error.rs
+++ b/protocols/gossipsub/src/error.rs
@@ -126,7 +126,7 @@ impl From<std::io::Error> for PublishError {
 pub enum ConfigBuilderError {
     /// Maximum transmission size is too small.
     MaxTransmissionSizeTooSmall,
-    /// Histroy length less than history gossip length.
+    /// History length less than history gossip length.
     HistoryLengthTooSmall,
     /// The ineauality doesn't hold mesh_outbound_min <= mesh_n_low <= mesh_n <= mesh_n_high
     MeshParametersInvalid,
@@ -146,7 +146,7 @@ impl std::fmt::Display for ConfigBuilderError {
             Self::MaxTransmissionSizeTooSmall => {
                 write!(f, "Maximum transmission size is too small")
             }
-            Self::HistoryLengthTooSmall => write!(f, "Histroy length less than history gossip length"),
+            Self::HistoryLengthTooSmall => write!(f, "History length less than history gossip length"),
             Self::MeshParametersInvalid => write!(f, "The ineauality doesn't hold mesh_outbound_min <= mesh_n_low <= mesh_n <= mesh_n_high"),
             Self::MeshOutboundInvalid => write!(f, "The inequality doesn't hold mesh_outbound_min <= self.config.mesh_n / 2"),
             Self::UnsubscribeBackoffIsZero => write!(f, "unsubscribe_backoff is zero"),

From f83d4d4e20b690031bd26e3ff36c09019991ce2d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 31 Jan 2024 16:48:41 +0000
Subject: [PATCH 095/455] chore: Update
 .github/workflows/semantic-pull-request.yml [skip ci]


From 0d9ad329f16f863818ef469f3f37b7a37a9319da Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 31 Jan 2024 16:52:02 +0000
Subject: [PATCH 096/455] chore: Update .github/workflows/stale.yml [skip ci]


From 3b4c636e290628de2352949ab10c2c610bf39e0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 08:19:22 +0000
Subject: [PATCH 097/455] deps: bump prometheus-client from 0.22.0 to 0.22.1

Pull-Request: #5142.
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 81a2c993a03..53a97f1cedf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4461,9 +4461,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510c4f1c9d81d556458f94c98f857748130ea9737bbd6053da497503b26ea63c"
+checksum = "6f87c10af16e0af74010d2a123d202e8363c04db5acfa91d8747f64a8524da3a"
 dependencies = [
  "dtoa",
  "itoa",
diff --git a/Cargo.toml b/Cargo.toml
index 578458a233d..0624c44b390 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,7 +119,7 @@ libp2p-yamux = { version = "0.45.1", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
-prometheus-client = "0.22.0"
+prometheus-client = "0.22.1"
 quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }

From 825e3ddc004504eae4e7d710468acce48d081393 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 19:56:25 +0000
Subject: [PATCH 098/455] deps: bump actions/upload-pages-artifact from 3.0.0
 to 3.0.1

Pull-Request: #5152.
---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index f1e478c4d80..b2a761fd8c1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -24,7 +24,7 @@ jobs:
         echo "<meta http-equiv=\"refresh\" content=\"0; url=libp2p\">" > target/doc/index.html
         cp -r target/doc/* ./host-docs
     - name: Upload documentation
-      uses: actions/upload-pages-artifact@v3.0.0
+      uses: actions/upload-pages-artifact@v3.0.1
       with:
         path: "host-docs/"
 

From 14d2aabb01329a47d04c1bc5153d3690612426b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:42:16 +0000
Subject: [PATCH 099/455] deps: bump tokio from 1.35.1 to 1.36.0

Pull-Request: #5145.
---
 Cargo.lock                         | 4 ++--
 examples/autonat/Cargo.toml        | 2 +-
 examples/browser-webrtc/Cargo.toml | 2 +-
 examples/chat/Cargo.toml           | 2 +-
 examples/dcutr/Cargo.toml          | 2 +-
 examples/ipfs-kad/Cargo.toml       | 2 +-
 examples/ipfs-private/Cargo.toml   | 2 +-
 examples/ping/Cargo.toml           | 2 +-
 examples/rendezvous/Cargo.toml     | 2 +-
 examples/stream/Cargo.toml         | 2 +-
 hole-punching-tests/Cargo.toml     | 2 +-
 interop-tests/Cargo.toml           | 2 +-
 misc/futures-bounded/Cargo.toml    | 2 +-
 protocols/mdns/Cargo.toml          | 4 ++--
 protocols/perf/Cargo.toml          | 2 +-
 protocols/rendezvous/Cargo.toml    | 2 +-
 protocols/upnp/Cargo.toml          | 2 +-
 swarm/Cargo.toml                   | 4 ++--
 transports/pnet/Cargo.toml         | 2 +-
 transports/quic/Cargo.toml         | 4 ++--
 transports/tcp/Cargo.toml          | 4 ++--
 transports/tls/Cargo.toml          | 2 +-
 transports/uds/Cargo.toml          | 2 +-
 transports/webrtc/Cargo.toml       | 4 ++--
 24 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 53a97f1cedf..5705992abc2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5866,9 +5866,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 038c1800308..642e621c257 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.36", features = ["full"] }
 clap = { version = "4.4.16", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 1dde66b2205..b13c0740a46 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -27,7 +27,7 @@ axum = "0.7.4"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.2.0", features = ["include-exclude", "interpolate-folder-path"] }
-tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
+tokio = { version = "1.36", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
 tower-http = { version = "0.5.1", features = ["cors"] }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index a8349344c03..a16c930e5b3 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.36", features = ["full"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index b87ae728c04..8443e9a59c7 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
-tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
+tokio = { version = "1.36", features = ["macros", "net", "rt", "signal"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 855a9fd801d..e82031ce64f 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.36", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.4.16", features = ["derive"] }
 env_logger = "0.10"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 3b266cf35a6..daa68cd8f5a 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "io-std"] }
+tokio = { version = "1.36", features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.9"
 futures = "0.3.30"
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 93128c3ed13..db47e4e2d8e 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index 4ee410f503f..edd5b8031a4 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.36", features = ["rt-multi-thread", "macros", "time"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index 5aab488358b..37f84e6ed62 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
 libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
 rand = "0.8"
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.36", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index d2bb085ef5d..9e6fb15965d 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 either = "1.9.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index d4663c9d41f..81c17e19303 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -34,7 +34,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 rust-embed = "8.2"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
index 3262f90821b..89288b6f70c 100644
--- a/misc/futures-bounded/Cargo.toml
+++ b/misc/futures-bounded/Cargo.toml
@@ -17,7 +17,7 @@ futures-util = { version = "0.3.30" }
 futures-timer = "3.0.2"
 
 [dev-dependencies]
-tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
+tokio = { version = "1.36.0", features = ["macros", "rt", "sync"] }
 futures = "0.3.30"
 
 [lints]
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 1e783da7f13..ef273781b78 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8.3"
 smallvec = "1.12.0"
 socket2 = { version = "0.5.5", features = ["all"] }
-tokio = { version = "1.35", default-features = false, features = ["net", "time"], optional = true}
+tokio = { version = "1.36", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
 void = "1.0.2"
@@ -37,7 +37,7 @@ libp2p-noise = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] }
 libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.35", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
+tokio = { version = "1.36", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index c0e5df3cefc..68b1088a42c 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tokio = { version = "1.35", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
+tokio = { version = "1.36", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
 void = "1"
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index edc0ec8a38a..f9272d011e3 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -37,7 +37,7 @@ libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
-tokio = { version = "1.35", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
+tokio = { version = "1.36", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 1c5564e2b75..a9c9a3c8621 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -16,7 +16,7 @@ futures-timer = "3.0.2"
 igd-next = "0.14.3"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
-tokio = { version = "1.35", default-features = false, features = ["rt"], optional = true }
+tokio = { version = "1.36", default-features = false, features = ["rt"], optional = true }
 tracing = "0.1.37"
 void = "1.0.2"
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 95513e08398..58793a02442 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -31,7 +31,7 @@ wasm-bindgen-futures = { version = "0.4.40", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
-tokio = { version = "1.35", features = ["rt"], optional = true }
+tokio = { version = "1.36", features = ["rt"], optional = true }
 
 [features]
 macros = ["dep:libp2p-swarm-derive"]
@@ -55,7 +55,7 @@ quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.89"
-tokio = { version = "1.35.1", features = ["time", "rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.36.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index db9ad2ce341..bdefa76bbd1 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -27,7 +27,7 @@ libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-websocket = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 8ad089042de..5f9232eaca4 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -22,7 +22,7 @@ quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls"
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.56"
-tokio = { version = "1.35.1", default-features = false, features = ["net", "rt", "time"], optional = true }
+tokio = { version = "1.36.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
 ring = "0.16.20"
@@ -46,7 +46,7 @@ libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "time"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index c7a48bbc9c6..034fa9f30ac 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -19,7 +19,7 @@ libc = "0.2.152"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.5", features = ["all"] }
-tokio = { version = "1.35.1", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.36.0", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [features]
@@ -29,7 +29,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.35.1", default-features = false, features = ["full"] }
+tokio = { version = "1.36.0", default-features = false, features = ["full"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index cecec003028..a5059327bec 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -33,7 +33,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rsa", "secp256k1", "ecdsa", "rand"] }
 libp2p-swarm = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index b01a5145604..19c8178b45c 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
 futures = "0.3.30"
-tokio = { version = "1.35", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.36", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [dev-dependencies]
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 24afe56e175..1bd1bd57a61 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] }
 stun = "0.5"
 thiserror = "1"
 tinytemplate = "1.2"
-tokio = { version = "1.35", features = ["net"], optional = true }
+tokio = { version = "1.36", features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
 tracing = "0.1.37"
 webrtc = { version = "0.9.0", optional = true }
@@ -39,7 +39,7 @@ pem = ["webrtc?/pem"]
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.36", features = ["full"] }
 quickcheck = "1.0.3"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From e42d84f1bc53ad3a4dfb8d2f2b799e86ec5aaf5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 00:19:50 +0000
Subject: [PATCH 100/455] deps: bump wasm-bindgen-futures from 0.4.40 to 0.4.41

Pull-Request: #5157.
---
 Cargo.lock                                | 28 +++++++++++------------
 examples/browser-webrtc/Cargo.toml        |  2 +-
 swarm/Cargo.toml                          |  2 +-
 transports/webrtc-websys/Cargo.toml       |  2 +-
 transports/webtransport-websys/Cargo.toml |  2 +-
 wasm-tests/webtransport-tests/Cargo.toml  |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5705992abc2..9d5ea71a478 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2501,9 +2501,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -6394,9 +6394,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -6404,9 +6404,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
@@ -6419,9 +6419,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6431,9 +6431,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6441,9 +6441,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6454,9 +6454,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index b13c0740a46..79068cdca87 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -39,7 +39,7 @@ libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "was
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.40"
+wasm-bindgen-futures = "0.4.41"
 web-sys = { version = "0.3", features = ['Document', 'Element', 'HtmlElement', 'Node', 'Response', 'Window'] }
 
 [lints]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 58793a02442..a700c1c1c5a 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -27,7 +27,7 @@ rand = "0.8"
 smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1"
-wasm-bindgen-futures = { version = "0.4.40", optional = true }
+wasm-bindgen-futures = { version = "0.4.41", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index ecd327a5173..781afc94475 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -24,7 +24,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.90" }
-wasm-bindgen-futures = { version = "0.4.40" }
+wasm-bindgen-futures = { version = "0.4.41" }
 web-sys = { version = "0.3.67", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 46d91e279e5..f1c92e3ca17 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -25,7 +25,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.56"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.40"
+wasm-bindgen-futures = "0.4.41"
 web-sys = { version = "0.3.67", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 6e9efdd0a93..ef728f80fb0 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-webtransport-websys = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.40"
+wasm-bindgen-futures = "0.4.41"
 wasm-bindgen-test = "0.3.39"
 web-sys = { version = "0.3.67", features = ["Response", "Window"] }
 

From 2feb90fd7d0b0cdaf1c9171d725e9e11e26ec2f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 10:35:20 +0000
Subject: [PATCH 101/455] deps: bump reqwest from 0.11.23 to 0.11.24

Pull-Request: #5146.
---
 Cargo.lock | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9d5ea71a478..a6ddd6f6687 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4847,9 +4847,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.23"
+version = "0.11.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -4869,9 +4869,11 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper",
  "system-configuration",
  "tokio",
  "tokio-native-tls",

From 4e65d84695493f52deddf542cf59690003884928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:55:08 +0000
Subject: [PATCH 102/455] deps: bump curve25519-dalek from 4.1.1 to 4.1.2

Pull-Request: #5158.
---
 Cargo.lock                  | 4 ++--
 transports/noise/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6ddd6f6687..261f24344f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1184,9 +1184,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
  "cfg-if",
  "cpufeatures",
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 981e1c05831..6e346cf7c0e 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/libp2p/rust-libp2p"
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-curve25519-dalek = "4.1.1"
+curve25519-dalek = "4.1.2"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519"] }

From 947b884a0d91502528d830b635dc3042a09278da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:20:22 +0000
Subject: [PATCH 103/455] deps: bump libc from 0.2.152 to 0.2.153

Pull-Request: #5144.
---
 Cargo.lock                | 4 ++--
 transports/tcp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 261f24344f8..4506011256b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2547,9 +2547,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libp2p"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 034fa9f30ac..515d47d2a5a 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -15,7 +15,7 @@ async-io = { version = "2.3.1", optional = true }
 futures = "0.3.30"
 futures-timer = "3.0"
 if-watch = "3.2.0"
-libc = "0.2.152"
+libc = "0.2.153"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.5", features = ["all"] }

From ea9b2397fc570ce21783426c968b76604ba18913 Mon Sep 17 00:00:00 2001
From: Guillaume Michel - guissou <guillaumemichel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 07:19:30 +0100
Subject: [PATCH 104/455] fix(kad): remove default IPFS protocol name

Fixes: #5006.
Related: #5015.

Pull-Request: #5122.
---
 Cargo.lock                          |  4 +--
 Cargo.toml                          |  4 +--
 examples/ipfs-kad/src/main.rs       |  7 +++--
 misc/server/CHANGELOG.md            |  6 ++++
 misc/server/Cargo.toml              |  2 +-
 misc/server/src/behaviour.rs        |  7 +++--
 protocols/kad/CHANGELOG.md          |  6 ++++
 protocols/kad/Cargo.toml            |  2 +-
 protocols/kad/src/behaviour.rs      | 45 ++++++++++++++++++++---------
 protocols/kad/src/behaviour/test.rs | 14 ++++-----
 protocols/kad/src/protocol.rs       | 19 ++++++++++++
 protocols/kad/tests/client_mode.rs  |  2 +-
 12 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4506011256b..a7750ab7e6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2851,7 +2851,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.45.3"
+version = "0.45.4"
 dependencies = [
  "arrayvec",
  "async-std",
@@ -3217,7 +3217,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-server"
-version = "0.12.5"
+version = "0.12.6"
 dependencies = [
  "base64 0.21.7",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 0624c44b390..3d7097f9a88 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,7 +85,7 @@ libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.1", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.8" }
-libp2p-kad = { version = "0.45.3", path = "protocols/kad" }
+libp2p-kad = { version = "0.45.4", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.1", path = "misc/metrics" }
@@ -100,7 +100,7 @@ libp2p-quic = { version = "0.10.2", path = "transports/quic" }
 libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
-libp2p-server = { version = "0.12.5", path = "misc/server" }
+libp2p-server = { version = "0.12.6", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.3", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
diff --git a/examples/ipfs-kad/src/main.rs b/examples/ipfs-kad/src/main.rs
index 0d11bdd851a..95921d6fa35 100644
--- a/examples/ipfs-kad/src/main.rs
+++ b/examples/ipfs-kad/src/main.rs
@@ -27,7 +27,8 @@ use std::time::{Duration, Instant};
 use anyhow::{bail, Result};
 use clap::Parser;
 use futures::StreamExt;
-use libp2p::{bytes::BufMut, identity, kad, noise, swarm::SwarmEvent, tcp, yamux, PeerId};
+use libp2p::swarm::{StreamProtocol, SwarmEvent};
+use libp2p::{bytes::BufMut, identity, kad, noise, tcp, yamux, PeerId};
 use tracing_subscriber::EnvFilter;
 
 const BOOTNODES: [&str; 4] = [
@@ -37,6 +38,8 @@ const BOOTNODES: [&str; 4] = [
     "QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt",
 ];
 
+const IPFS_PROTO_NAME: StreamProtocol = StreamProtocol::new("/ipfs/kad/1.0.0");
+
 #[tokio::main]
 async fn main() -> Result<()> {
     let _ = tracing_subscriber::fmt()
@@ -56,7 +59,7 @@ async fn main() -> Result<()> {
         .with_dns()?
         .with_behaviour(|key| {
             // Create a Kademlia behaviour.
-            let mut cfg = kad::Config::default();
+            let mut cfg = kad::Config::new(IPFS_PROTO_NAME);
             cfg.set_query_timeout(Duration::from_secs(5 * 60));
             let store = kad::store::MemoryStore::new(key.public().to_peer_id());
             kad::Behaviour::with_config(key.public().to_peer_id(), store, cfg)
diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
index e4c5dd4a103..484964e27e9 100644
--- a/misc/server/CHANGELOG.md
+++ b/misc/server/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.12.6
+
+### Changed
+- Stop using kad default protocol.
+  See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122)
+
 ## 0.12.5
 
 ### Added
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index f300e177b6c..9653ddc5d76 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-server"
-version = "0.12.5"
+version = "0.12.6"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/misc/server/src/behaviour.rs b/misc/server/src/behaviour.rs
index ec025e02129..36b18c9798d 100644
--- a/misc/server/src/behaviour.rs
+++ b/misc/server/src/behaviour.rs
@@ -4,7 +4,8 @@ use libp2p::kad;
 use libp2p::ping;
 use libp2p::relay;
 use libp2p::swarm::behaviour::toggle::Toggle;
-use libp2p::{identity, swarm::NetworkBehaviour, Multiaddr, PeerId};
+use libp2p::swarm::{NetworkBehaviour, StreamProtocol};
+use libp2p::{identity, Multiaddr, PeerId};
 use std::str::FromStr;
 use std::time::Duration;
 
@@ -15,6 +16,8 @@ const BOOTNODES: [&str; 4] = [
     "QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt",
 ];
 
+const IPFS_PROTO_NAME: StreamProtocol = StreamProtocol::new("/ipfs/kad/1.0.0");
+
 #[derive(NetworkBehaviour)]
 pub(crate) struct Behaviour {
     relay: relay::Behaviour,
@@ -31,7 +34,7 @@ impl Behaviour {
         enable_autonat: bool,
     ) -> Self {
         let kademlia = if enable_kademlia {
-            let mut kademlia_config = kad::Config::default();
+            let mut kademlia_config = kad::Config::new(IPFS_PROTO_NAME);
             // Instantly remove records and provider records.
             //
             // TODO: Replace hack with option to disable both.
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index b27a6943659..f7baee2d288 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.45.4
+
+- Make it mandatory to provide protocol names when creating a `kad::Config`.
+  Deprecate `kad::Config::default()`, replaced by `kad::Config::new(StreamProtocol)`.
+  See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122).
+
 ## 0.45.3
 
 - The progress of the close query iterator shall be decided by ANY of the new peers.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 96f5f10819f..bde0d5f7c84 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.45.3"
+version = "0.45.4"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index f7e2fb3a032..b237fe11dda 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -24,7 +24,6 @@ mod test;
 
 use crate::addresses::Addresses;
 use crate::handler::{Handler, HandlerEvent, HandlerIn, RequestId};
-use crate::jobs::*;
 use crate::kbucket::{self, Distance, KBucketsTable, NodeStatus};
 use crate::protocol::{ConnectionType, KadPeer, ProtocolConfig};
 use crate::query::{Query, QueryConfig, QueryId, QueryPool, QueryPoolState};
@@ -34,6 +33,7 @@ use crate::record::{
     ProviderRecord, Record,
 };
 use crate::K_VALUE;
+use crate::{jobs::*, protocol};
 use fnv::{FnvHashMap, FnvHashSet};
 use instant::Instant;
 use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
@@ -184,20 +184,11 @@ pub struct Config {
 }
 
 impl Default for Config {
+    /// Returns the default configuration.
+    ///
+    /// Deprecated: use `Config::new` instead.
     fn default() -> Self {
-        Config {
-            kbucket_pending_timeout: Duration::from_secs(60),
-            query_config: QueryConfig::default(),
-            protocol_config: Default::default(),
-            record_ttl: Some(Duration::from_secs(36 * 60 * 60)),
-            record_replication_interval: Some(Duration::from_secs(60 * 60)),
-            record_publication_interval: Some(Duration::from_secs(24 * 60 * 60)),
-            record_filtering: StoreInserts::Unfiltered,
-            provider_publication_interval: Some(Duration::from_secs(12 * 60 * 60)),
-            provider_record_ttl: Some(Duration::from_secs(24 * 60 * 60)),
-            kbucket_inserts: BucketInserts::OnConnected,
-            caching: Caching::Enabled { max_peers: 1 },
-        }
+        Self::new(protocol::DEFAULT_PROTO_NAME)
     }
 }
 
@@ -217,6 +208,30 @@ pub enum Caching {
 }
 
 impl Config {
+    /// Builds a new `Config` with the given protocol name.
+    pub fn new(protocol_name: StreamProtocol) -> Self {
+        Config {
+            kbucket_pending_timeout: Duration::from_secs(60),
+            query_config: QueryConfig::default(),
+            protocol_config: ProtocolConfig::new(protocol_name),
+            record_ttl: Some(Duration::from_secs(36 * 60 * 60)),
+            record_replication_interval: Some(Duration::from_secs(60 * 60)),
+            record_publication_interval: Some(Duration::from_secs(24 * 60 * 60)),
+            record_filtering: StoreInserts::Unfiltered,
+            provider_publication_interval: Some(Duration::from_secs(12 * 60 * 60)),
+            provider_record_ttl: Some(Duration::from_secs(24 * 60 * 60)),
+            kbucket_inserts: BucketInserts::OnConnected,
+            caching: Caching::Enabled { max_peers: 1 },
+        }
+    }
+
+    /// Returns the default configuration.
+    #[deprecated(note = "Use `Config::new` instead")]
+    #[allow(clippy::should_implement_trait)]
+    pub fn default() -> Self {
+        Default::default()
+    }
+
     /// Sets custom protocol names.
     ///
     /// Kademlia nodes only communicate with other nodes using the same protocol
@@ -226,6 +241,8 @@ impl Config {
     /// More than one protocol name can be supplied. In this case the node will
     /// be able to talk to other nodes supporting any of the provided names.
     /// Multiple names must be used with caution to avoid network partitioning.
+    #[deprecated(note = "Use `Config::new` instead")]
+    #[allow(deprecated)]
     pub fn set_protocol_names(&mut self, names: Vec<StreamProtocol>) -> &mut Self {
         self.protocol_config.set_protocol_names(names);
         self
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 522eebcba92..20378bb6a3f 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -24,7 +24,7 @@ use super::*;
 
 use crate::kbucket::Distance;
 use crate::record::{store::MemoryStore, Key};
-use crate::{K_VALUE, SHA_256_MH};
+use crate::{K_VALUE, PROTOCOL_NAME, SHA_256_MH};
 use futures::{executor::block_on, future::poll_fn, prelude::*};
 use futures_timer::Delay;
 use libp2p_core::{
@@ -173,7 +173,7 @@ fn bootstrap() {
         // or smaller than K_VALUE.
         let num_group = rng.gen_range(1..(num_total % K_VALUE.get()) + 2);
 
-        let mut cfg = Config::default();
+        let mut cfg = Config::new(PROTOCOL_NAME);
         if rng.gen() {
             cfg.disjoint_query_paths(true);
         }
@@ -498,7 +498,7 @@ fn put_record() {
         // At least 4 nodes, 1 under test + 3 bootnodes.
         let num_total = usize::max(4, replication_factor.get() * 2);
 
-        let mut config = Config::default();
+        let mut config = Config::new(PROTOCOL_NAME);
         config.set_replication_factor(replication_factor);
         if rng.gen() {
             config.disjoint_query_paths(true);
@@ -867,7 +867,7 @@ fn add_provider() {
         // At least 4 nodes, 1 under test + 3 bootnodes.
         let num_total = usize::max(4, replication_factor.get() * 2);
 
-        let mut config = Config::default();
+        let mut config = Config::new(PROTOCOL_NAME);
         config.set_replication_factor(replication_factor);
         if rng.gen() {
             config.disjoint_query_paths(true);
@@ -1083,14 +1083,14 @@ fn exp_decr_expiration_overflow() {
     }
 
     // Right shifting a u64 by >63 results in a panic.
-    prop_no_panic(Config::default().record_ttl.unwrap(), 64);
+    prop_no_panic(Config::new(PROTOCOL_NAME).record_ttl.unwrap(), 64);
 
     quickcheck(prop_no_panic as fn(_, _))
 }
 
 #[test]
 fn disjoint_query_does_not_finish_before_all_paths_did() {
-    let mut config = Config::default();
+    let mut config = Config::new(PROTOCOL_NAME);
     config.disjoint_query_paths(true);
     // I.e. setting the amount disjoint paths to be explored to 2.
     config.set_parallelism(NonZeroUsize::new(2).unwrap());
@@ -1238,7 +1238,7 @@ fn disjoint_query_does_not_finish_before_all_paths_did() {
 /// the routing table with `BucketInserts::Manual`.
 #[test]
 fn manual_bucket_inserts() {
-    let mut cfg = Config::default();
+    let mut cfg = Config::new(PROTOCOL_NAME);
     cfg.set_kbucket_inserts(BucketInserts::Manual);
     // 1 -> 2 -> [3 -> ...]
     let mut swarms = build_connected_nodes_with_config(3, 1, cfg);
diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs
index 7fe2d1130b1..5abe2089852 100644
--- a/protocols/kad/src/protocol.rs
+++ b/protocols/kad/src/protocol.rs
@@ -144,6 +144,21 @@ pub struct ProtocolConfig {
 }
 
 impl ProtocolConfig {
+    /// Builds a new `ProtocolConfig` with the given protocol name.
+    pub fn new(protocol_name: StreamProtocol) -> Self {
+        ProtocolConfig {
+            protocol_names: vec![protocol_name],
+            max_packet_size: DEFAULT_MAX_PACKET_SIZE,
+        }
+    }
+
+    /// Returns the default configuration.
+    #[deprecated(note = "Use `ProtocolConfig::new` instead")]
+    #[allow(clippy::should_implement_trait)]
+    pub fn default() -> Self {
+        Default::default()
+    }
+
     /// Returns the configured protocol name.
     pub fn protocol_names(&self) -> &[StreamProtocol] {
         &self.protocol_names
@@ -151,6 +166,7 @@ impl ProtocolConfig {
 
     /// Modifies the protocol names used on the wire. Can be used to create incompatibilities
     /// between networks on purpose.
+    #[deprecated(note = "Use `ProtocolConfig::new` instead")]
     pub fn set_protocol_names(&mut self, names: Vec<StreamProtocol>) {
         self.protocol_names = names;
     }
@@ -162,6 +178,9 @@ impl ProtocolConfig {
 }
 
 impl Default for ProtocolConfig {
+    /// Returns the default configuration.
+    ///
+    /// Deprecated: use `ProtocolConfig::new` instead.
     fn default() -> Self {
         ProtocolConfig {
             protocol_names: iter::once(DEFAULT_PROTO_NAME).collect(),
diff --git a/protocols/kad/tests/client_mode.rs b/protocols/kad/tests/client_mode.rs
index f290a36b727..6aceeb27263 100644
--- a/protocols/kad/tests/client_mode.rs
+++ b/protocols/kad/tests/client_mode.rs
@@ -179,7 +179,7 @@ impl MyBehaviour {
             kad: Behaviour::with_config(
                 local_peer_id,
                 MemoryStore::new(local_peer_id),
-                Config::default(),
+                Config::new(libp2p_kad::PROTOCOL_NAME),
             ),
         }
     }

From 96f20e60f2a8d6bc441c30a87d544cdee549b1bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 07:10:07 +0000
Subject: [PATCH 105/455] deps: bump num-traits from 0.2.17 to 0.2.18

Pull-Request: #5166.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a7750ab7e6a..e67564f7f43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3980,9 +3980,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]

From 261965d9fc49d14db36e20ab7dcf9c8c08cfa1a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:07:09 +0000
Subject: [PATCH 106/455] deps: bump ed25519-dalek from 2.1.0 to 2.1.1

Pull-Request: #5160.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e67564f7f43..dee37127768 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1371,9 +1371,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",

From c1a4ddf123813a43728dd6757e401a991c748434 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 12:09:57 +0000
Subject: [PATCH 107/455] deps: bump thiserror from 1.0.56 to 1.0.57

Pull-Request: #5161.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dee37127768..b1634625c4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5786,18 +5786,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 177334d2145..e1bd23fe2d1 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.12.0"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 tracing = "0.1.37"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 6e346cf7c0e..83bb6de8c0e 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 tracing = "0.1.37"
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 5f9232eaca4..b4bf93d6e10 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 tokio = { version = "1.36.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.5"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index a5059327bec..0ca134d418b 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = "0.16.20"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.15.1"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 2b65f3f07a3..38ef70a9d0b 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.67", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index f1c92e3ca17..7e797a1671e 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.41"

From 30feee828ecd238fb29402e03eb63d69bf913fb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 12:20:38 +0000
Subject: [PATCH 108/455] deps: bump x25519-dalek from 2.0.0 to 2.0.1

Pull-Request: #5162.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b1634625c4d..b089bc5dcf5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6965,9 +6965,9 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
  "curve25519-dalek",
  "rand_core 0.6.4",

From 183f35fe7d70efcbe091bb54ca6e537041d85a96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 13:35:18 +0000
Subject: [PATCH 109/455] deps: bump tempfile from 3.9.0 to 3.10.0

Pull-Request: #5159.
---
 Cargo.lock                | 32 +++++++++++---------------------
 transports/uds/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b089bc5dcf5..89ed80d5604 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -312,7 +312,7 @@ dependencies = [
  "futures-lite 2.0.1",
  "parking",
  "polling 3.3.0",
- "rustix 0.38.28",
+ "rustix 0.38.31",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -1531,9 +1531,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "ff"
@@ -2480,7 +2480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.28",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
@@ -4383,7 +4383,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.28",
+ "rustix 0.38.31",
  "tracing",
  "windows-sys 0.48.0",
 ]
@@ -4755,15 +4755,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -5087,9 +5078,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
@@ -5726,14 +5717,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.0",
- "redox_syscall 0.4.1",
- "rustix 0.38.28",
+ "fastrand 2.0.1",
+ "rustix 0.38.31",
  "windows-sys 0.52.0",
 ]
 
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index 19c8178b45c..7b01e0e38d5 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -18,7 +18,7 @@ tokio = { version = "1.36", default-features = false, features = ["net"], option
 tracing = "0.1.37"
 
 [dev-dependencies]
-tempfile = "3.9"
+tempfile = "3.10"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling

From ccc7fd3ab8af9f2bb5cfbc6cdc12f6e664abd881 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 13:45:27 +0000
Subject: [PATCH 110/455] deps: bump wasm-bindgen-test from 0.3.39 to 0.3.41

Pull-Request: #5172.
---
 Cargo.lock                               | 8 ++++----
 wasm-tests/webtransport-tests/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 89ed80d5604..8dc94a5e673 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6452,9 +6452,9 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.39"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403"
+checksum = "143ddeb4f833e2ed0d252e618986e18bfc7b0e52f2d28d77d05b2f045dd8eb61"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -6466,9 +6466,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.39"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
+checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index ef728f80fb0..f860260a996 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -19,7 +19,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.41"
-wasm-bindgen-test = "0.3.39"
+wasm-bindgen-test = "0.3.41"
 web-sys = { version = "0.3.67", features = ["Response", "Window"] }
 
 [lints]

From e033385baa510510cca53b49da7557687d8dbfc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 13:56:02 +0000
Subject: [PATCH 111/455] deps: bump syn from 2.0.48 to 2.0.49

Pull-Request: #5173.
---
 Cargo.lock              | 46 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8dc94a5e673..92929a8bae1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,7 +425,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -930,7 +930,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1207,7 +1207,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1324,7 +1324,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1429,7 +1429,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1688,7 +1688,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -3292,7 +3292,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -4056,7 +4056,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -4282,7 +4282,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -4479,7 +4479,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5017,7 +5017,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.48",
+ "syn 2.0.49",
  "walkdir",
 ]
 
@@ -5302,7 +5302,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5335,7 +5335,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5652,9 +5652,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5791,7 +5791,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5893,7 +5893,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -6048,7 +6048,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -6405,7 +6405,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
  "wasm-bindgen-shared",
 ]
 
@@ -6439,7 +6439,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6472,7 +6472,7 @@ checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -7055,7 +7055,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -7075,5 +7075,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index f3c75749602..32f35a70108 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.43", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.49", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From 580c7db68fee8d689df3898453bcacafb078de01 Mon Sep 17 00:00:00 2001
From: Thabokani <149070269+Thabokani@users.noreply.github.com>
Date: Fri, 23 Feb 2024 02:38:12 +0800
Subject: [PATCH 112/455] chore: fix typos

Pull-Request: #5079.
---
 core/src/connection.rs                      | 2 +-
 core/src/transport/upgrade.rs               | 4 ++--
 misc/multistream-select/src/protocol.rs     | 2 +-
 swarm/src/handler/multi.rs                  | 2 +-
 transports/webtransport-websys/src/utils.rs | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/connection.rs b/core/src/connection.rs
index 7a339b0661b..ff613c5cce0 100644
--- a/core/src/connection.rs
+++ b/core/src/connection.rs
@@ -60,7 +60,7 @@ pub enum ConnectedPoint {
         /// Multiaddress that was successfully dialed.
         address: Multiaddr,
         /// Whether the role of the local node on the connection should be
-        /// overriden. I.e. whether the local node should act as a listener on
+        /// overridden. I.e. whether the local node should act as a listener on
         /// the outgoing connection.
         ///
         /// This option is needed for NAT and firewall hole punching.
diff --git a/core/src/transport/upgrade.rs b/core/src/transport/upgrade.rs
index 8525ab741ff..9626312b5fb 100644
--- a/core/src/transport/upgrade.rs
+++ b/core/src/transport/upgrade.rs
@@ -520,7 +520,7 @@ where
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         // We use a `this` variable because the compiler can't mutably borrow multiple times
-        // accross a `Deref`.
+        // across a `Deref`.
         let this = &mut *self;
 
         loop {
@@ -579,7 +579,7 @@ where
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         // We use a `this` variable because the compiler can't mutably borrow multiple times
-        // accross a `Deref`.
+        // across a `Deref`.
         let this = &mut *self;
 
         loop {
diff --git a/misc/multistream-select/src/protocol.rs b/misc/multistream-select/src/protocol.rs
index d5c2bfa773a..aef9f16c4cf 100644
--- a/misc/multistream-select/src/protocol.rs
+++ b/misc/multistream-select/src/protocol.rs
@@ -49,7 +49,7 @@ const MSG_PROTOCOL_NA: &[u8] = b"na\n";
 /// The encoded form of a multistream-select 'ls' message.
 const MSG_LS: &[u8] = b"ls\n";
 
-/// The multistream-select header lines preceeding negotiation.
+/// The multistream-select header lines preceding negotiation.
 ///
 /// Every [`Version`] has a corresponding header line.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
diff --git a/swarm/src/handler/multi.rs b/swarm/src/handler/multi.rs
index 0b4549ed733..96a77626c01 100644
--- a/swarm/src/handler/multi.rs
+++ b/swarm/src/handler/multi.rs
@@ -437,7 +437,7 @@ where
 pub struct DuplicateProtonameError(Vec<u8>);
 
 impl DuplicateProtonameError {
-    /// The protocol name bytes that occured in more than one handler.
+    /// The protocol name bytes that occurred in more than one handler.
     pub fn protocol_name(&self) -> &[u8] {
         &self.0
     }
diff --git a/transports/webtransport-websys/src/utils.rs b/transports/webtransport-websys/src/utils.rs
index fcde226be87..55bad08e00c 100644
--- a/transports/webtransport-websys/src/utils.rs
+++ b/transports/webtransport-websys/src/utils.rs
@@ -55,7 +55,7 @@ where
     }
 }
 
-/// Parse reponse from `ReadableStreamDefaultReader::read`.
+/// Parse response from `ReadableStreamDefaultReader::read`.
 //
 // Ref: https://streams.spec.whatwg.org/#default-reader-prototype
 pub(crate) fn parse_reader_response(resp: &JsValue) -> Result<Option<JsValue>, JsValue> {

From 45aedc19b0d2178a5c0c2ff6665e639c5a474145 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 08:33:34 +0000
Subject: [PATCH 113/455] deps: bump anyhow from 1.0.79 to 1.0.80

Pull-Request: #5171.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 92929a8bae1..1f13dc81456 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 79068cdca87..5e3c8a0c666 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.80"
 futures = "0.3.30"
 rand = "0.8"
 tracing = "0.1.37"
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index e82031ce64f..5581728794e 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.4.16", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
-anyhow = "1.0.79"
+anyhow = "1.0.80"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 7e27c824615..e3898786b5b 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.80"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From 2d9be841e62e45fe81eda0a1457c1c0fce45a49b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 08:44:15 +0000
Subject: [PATCH 114/455] deps: bump web-sys from 0.3.67 to 0.3.68

Pull-Request: #5174.
---
 Cargo.lock                                | 4 ++--
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f13dc81456..1ed06136646 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6488,9 +6488,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 781afc94475..728b6575f0a 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -25,7 +25,7 @@ thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.41" }
-web-sys = { version = "0.3.67", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
+web-sys = { version = "0.3.68", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
 workspace = true
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 38ef70a9d0b..5855b582c80 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
 thiserror = "1.0.57"
 wasm-bindgen = "0.2.90"
-web-sys = { version = "0.3.67", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
+web-sys = { version = "0.3.68", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 7e797a1671e..b9f8f36d760 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1.0.57"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.41"
-web-sys = { version = "0.3.67", features = [
+web-sys = { version = "0.3.68", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
     "WebTransportBidirectionalStream",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index f860260a996..c9f5170b114 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -20,7 +20,7 @@ multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.41"
 wasm-bindgen-test = "0.3.41"
-web-sys = { version = "0.3.67", features = ["Response", "Window"] }
+web-sys = { version = "0.3.68", features = ["Response", "Window"] }
 
 [lints]
 workspace = true

From 78c7ac19209b6314a6b4f6f2dc8c56042e21e3f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:49:11 +0000
Subject: [PATCH 115/455] deps: bump stun from 0.5.0 to 0.5.1

Pull-Request: #5184.
---
 Cargo.lock | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ed06136646..e64481fc85b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5607,16 +5607,16 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "stun"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7beb1624a3ea34778d58d30e2b8606b4d29fe65e87c4d50b87ed30afd5c3830c"
+checksum = "d3f371788132e9d623e6eab4ba28aac083763a4133f045e6ebaee5ceb869803d"
 dependencies = [
  "base64 0.21.7",
  "crc",
  "lazy_static",
  "md-5",
  "rand 0.8.5",
- "ring 0.16.20",
+ "ring 0.17.5",
  "subtle",
  "thiserror",
  "tokio",
@@ -6718,14 +6718,13 @@ dependencies = [
 
 [[package]]
 name = "webrtc-util"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adc96bee68417e1f4d19dd7698124a7f859db55ae2fd3eedbbb7e732f614735"
+checksum = "5e85154ef743d9a2a116d104faaaa82740a281b8b4bed5ee691a2df6c133d873"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
  "bytes",
- "cc",
  "ipnet",
  "lazy_static",
  "libc",

From e6a4019b5d7821ce2fdf438e21be8db308fa93a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 18:14:37 +0000
Subject: [PATCH 116/455] deps: bump futures-timer from 3.0.2 to 3.0.3

Pull-Request: #5186.
---
 Cargo.lock                            | 4 ++--
 interop-tests/Cargo.toml              | 2 +-
 misc/futures-bounded/Cargo.toml       | 2 +-
 muxers/test-harness/Cargo.toml        | 2 +-
 protocols/identify/Cargo.toml         | 2 +-
 protocols/kad/Cargo.toml              | 2 +-
 protocols/ping/Cargo.toml             | 2 +-
 protocols/rendezvous/Cargo.toml       | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 protocols/upnp/Cargo.toml             | 2 +-
 swarm-test/Cargo.toml                 | 2 +-
 swarm/Cargo.toml                      | 2 +-
 transports/quic/Cargo.toml            | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e64481fc85b..6a9d113b1d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1726,9 +1726,9 @@ dependencies = [
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
  "gloo-timers",
  "send_wrapper 0.4.0",
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 81c17e19303..b9ecc031f5a 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -49,7 +49,7 @@ wasm-logger = { version = "0.2.0" }
 instant = "0.1.12"
 reqwest = { version = "0.11", features = ["json"] }
 console_error_panic_hook = { version = "0.1.7" }
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 
 [lints]
 workspace = true
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
index 89288b6f70c..1d4340df74f 100644
--- a/misc/futures-bounded/Cargo.toml
+++ b/misc/futures-bounded/Cargo.toml
@@ -14,7 +14,7 @@ publish = true
 
 [dependencies]
 futures-util = { version = "0.3.30" }
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 
 [dev-dependencies]
 tokio = { version = "1.36.0", features = ["macros", "rt", "sync"] }
diff --git a/muxers/test-harness/Cargo.toml b/muxers/test-harness/Cargo.toml
index 7aad5f1985a..bfe1e61b9b6 100644
--- a/muxers/test-harness/Cargo.toml
+++ b/muxers/test-harness/Cargo.toml
@@ -13,7 +13,7 @@ release = false
 [dependencies]
 libp2p-core = { workspace = true }
 futures = "0.3.30"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 futures_ringbuf = "0.4.0"
 tracing = "0.1.37"
 
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 2fb51d87627..a8da8d0e762 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 futures = "0.3.30"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index bde0d5f7c84..3bf74808f4a 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -28,7 +28,7 @@ sha2 = "0.10.8"
 smallvec = "1.12.0"
 uint = "0.9"
 void = "1.0"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 instant = "0.1.12"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 thiserror = "1"
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index a4d9259e9aa..5f08ac6fbbd 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 either = "1.9.0"
 futures = "0.3.30"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index f9272d011e3..e588c6d7a6b 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -15,7 +15,7 @@ asynchronous-codec = { workspace = true }
 async-trait = "0.1"
 bimap = "0.6.3"
 futures = { version = "0.3", default-features = false, features = ["std"] }
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index e3898786b5b..69cc343fbb7 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -24,7 +24,7 @@ serde_json = { version = "1.0.113", optional = true }
 smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1.0.2"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 futures-bounded = { workspace = true }
 
 [features]
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index a9c9a3c8621..3119804bf60 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -12,7 +12,7 @@ publish = true
 
 [dependencies]
 futures = "0.3.30"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 igd-next = "0.14.3"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index ca66e115746..ab27e141a4b 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-yamux = { workspace = true }
 futures = "0.3.30"
 rand = "0.8.5"
 tracing = "0.1.37"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 
 [lints]
 workspace = true
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index a700c1c1c5a..4e0d4da0e87 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 either = "1.9.0"
 fnv = "1.0"
 futures = "0.3.30"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 getrandom = { version = "0.2.12", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index b4bf93d6e10..bb472299a53 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 async-std = { version = "1.12.0", optional = true }
 bytes = "1.5.0"
 futures = "0.3.30"
-futures-timer = "3.0.2"
+futures-timer = "3.0.3"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }

From 49f1b510fb02753e3874d0d8a327a73ab2613dc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 18:25:50 +0000
Subject: [PATCH 117/455] deps: bump serde_json from 1.0.113 to 1.0.114

Pull-Request: #5187.
---
 Cargo.lock                            | 4 ++--
 hole-punching-tests/Cargo.toml        | 2 +-
 misc/keygen/Cargo.toml                | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a9d113b1d6..25e97a711be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5307,9 +5307,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "indexmap 2.2.1",
  "itoa",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 9e6fb15965d..2059f4b6258 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.36.0", features = ["full"] }
 serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.113"
+serde_json = "1.0.114"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index c7989fb4793..96a5fac069b 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.4.16", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.113"
+serde_json = "1.0.114"
 libp2p-core = { workspace = true }
 base64 = "0.21.7"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 69cc343fbb7..1f2d0bfe1a1 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.113", optional = true }
+serde_json = { version = "1.0.114", optional = true }
 smallvec = "1.12.0"
 tracing = "0.1.37"
 void = "1.0.2"

From fc237b1d8e81a125f2cde3ae14eea3907d9eecfa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 18:37:06 +0000
Subject: [PATCH 118/455] deps: bump socket2 from 0.5.5 to 0.5.6

Pull-Request: #5188.
---
 Cargo.lock                 | 26 +++++++++++++-------------
 protocols/mdns/Cargo.toml  |  2 +-
 transports/quic/Cargo.toml |  2 +-
 transports/tcp/Cargo.toml  |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25e97a711be..5d23d568d75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -408,7 +408,7 @@ dependencies = [
  "futures-util",
  "hickory-resolver",
  "pin-utils",
- "socket2 0.5.5",
+ "socket2 0.5.6",
 ]
 
 [[package]]
@@ -1964,7 +1964,7 @@ dependencies = [
  "ipnet",
  "once_cell",
  "rand 0.8.5",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "thiserror",
  "tinyvec",
  "tokio",
@@ -2235,7 +2235,7 @@ dependencies = [
  "http-body 1.0.0",
  "hyper 1.1.0",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
  "tracing",
 ]
@@ -2433,7 +2433,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -2903,7 +2903,7 @@ dependencies = [
  "libp2p-yamux",
  "rand 0.8.5",
  "smallvec",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3120,7 +3120,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.16.20",
  "rustls 0.21.9",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "thiserror",
  "tokio",
  "tracing",
@@ -3324,7 +3324,7 @@ dependencies = [
  "libc",
  "libp2p-core",
  "libp2p-identity",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -4598,7 +4598,7 @@ checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0"
 dependencies = [
  "bytes",
  "libc",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tracing",
  "windows-sys 0.48.0",
 ]
@@ -5525,12 +5525,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5870,7 +5870,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -6657,7 +6657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62bebbd40e7f8b630a0f1a74783dbfff1edfc0ccaae891c4689891156a8c4d8c"
 dependencies = [
  "log",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "thiserror",
  "tokio",
  "webrtc-util",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index ef273781b78..311c479fe72 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8.3"
 smallvec = "1.12.0"
-socket2 = { version = "0.5.5", features = ["all"] }
+socket2 = { version = "0.5.6", features = ["all"] }
 tokio = { version = "1.36", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index bb472299a53..abfbf0742f4 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -24,7 +24,7 @@ rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.57"
 tokio = { version = "1.36.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
-socket2 = "0.5.5"
+socket2 = "0.5.6"
 ring = "0.16.20"
 
 [features]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 515d47d2a5a..26528eab840 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -18,7 +18,7 @@ if-watch = "3.2.0"
 libc = "0.2.153"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-socket2 = { version = "0.5.5", features = ["all"] }
+socket2 = { version = "0.5.6", features = ["all"] }
 tokio = { version = "1.36.0", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 

From 7a3101d83f5a75da03fe2cf580862a9c1fc910c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 18:48:19 +0000
Subject: [PATCH 119/455] deps: bump syn from 2.0.49 to 2.0.51

Pull-Request: #5185.
---
 Cargo.lock              | 46 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5d23d568d75..6b50bf74d57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,7 +425,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -930,7 +930,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -1207,7 +1207,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -1324,7 +1324,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -1429,7 +1429,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -1688,7 +1688,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -3292,7 +3292,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -4056,7 +4056,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -4282,7 +4282,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -4479,7 +4479,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -5017,7 +5017,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.49",
+ "syn 2.0.51",
  "walkdir",
 ]
 
@@ -5302,7 +5302,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -5335,7 +5335,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -5652,9 +5652,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.49"
+version = "2.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
+checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5791,7 +5791,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -5893,7 +5893,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -6048,7 +6048,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -6405,7 +6405,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
  "wasm-bindgen-shared",
 ]
 
@@ -6439,7 +6439,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6472,7 +6472,7 @@ checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -7054,7 +7054,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
 
 [[package]]
@@ -7074,5 +7074,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.51",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 32f35a70108..c355acaea14 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.49", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.51", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From cc2986075e8d933d385f33558e7efd3252bca669 Mon Sep 17 00:00:00 2001
From: Bryceson Laing <bklaing2@gmail.com>
Date: Thu, 29 Feb 2024 03:25:20 -0800
Subject: [PATCH 120/455] refactor(examples): change file-sharing from
 async-std to tokio

Closes: https://github.com/libp2p/rust-libp2p/issues/5180
Related: https://github.com/libp2p/rust-libp2p/issues/4449.

Pull-Request: #5191.
---
 Cargo.lock                           | 3 +--
 examples/file-sharing/Cargo.toml     | 5 ++---
 examples/file-sharing/src/main.rs    | 4 ++--
 examples/file-sharing/src/network.rs | 7 ++++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b50bf74d57..7ca3795ff3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1555,12 +1555,11 @@ checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
 name = "file-sharing-example"
 version = "0.1.0"
 dependencies = [
- "async-std",
  "clap",
- "either",
  "futures",
  "libp2p",
  "serde",
+ "tokio",
  "tracing",
  "tracing-subscriber",
  "void",
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index e38039a11bb..8d20a702718 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -10,11 +10,10 @@ release = false
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-async-std = { version = "1.12", features = ["attributes"] }
+tokio = { version = "1.36.0", features = ["full"] }
 clap = { version = "4.4.16", features = ["derive"] }
-either = "1.9"
 futures = "0.3.30"
-libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
+libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 void = "1.0.2"
diff --git a/examples/file-sharing/src/main.rs b/examples/file-sharing/src/main.rs
index a834ee0600e..5f6be83dc11 100644
--- a/examples/file-sharing/src/main.rs
+++ b/examples/file-sharing/src/main.rs
@@ -22,8 +22,8 @@
 
 mod network;
 
-use async_std::task::spawn;
 use clap::Parser;
+use tokio::task::spawn;
 
 use futures::prelude::*;
 use futures::StreamExt;
@@ -33,7 +33,7 @@ use std::io::Write;
 use std::path::PathBuf;
 use tracing_subscriber::EnvFilter;
 
-#[async_std::main]
+#[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
diff --git a/examples/file-sharing/src/network.rs b/examples/file-sharing/src/network.rs
index 59625fc39ea..a74afd1c0da 100644
--- a/examples/file-sharing/src/network.rs
+++ b/examples/file-sharing/src/network.rs
@@ -1,5 +1,6 @@
 use futures::channel::{mpsc, oneshot};
 use futures::prelude::*;
+use futures::StreamExt;
 
 use libp2p::{
     core::Multiaddr,
@@ -40,7 +41,7 @@ pub(crate) async fn new(
     let peer_id = id_keys.public().to_peer_id();
 
     let mut swarm = libp2p::SwarmBuilder::with_existing_identity(id_keys)
-        .with_async_std()
+        .with_tokio()
         .with_tcp(
             tcp::Config::default(),
             noise::Config::new,
@@ -197,8 +198,8 @@ impl EventLoop {
 
     pub(crate) async fn run(mut self) {
         loop {
-            futures::select! {
-                event = self.swarm.next() => self.handle_event(event.expect("Swarm stream to be infinite.")).await  ,
+            tokio::select! {
+                event = self.swarm.select_next_some() => self.handle_event(event).await,
                 command = self.command_receiver.next() => match command {
                     Some(c) => self.handle_command(c).await,
                     // Command channel closed, thus shutting down the network event loop.

From 60fd566a955a33c42a6ab6eefc1f0fedef9f8b83 Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Thu, 29 Feb 2024 14:29:08 -0500
Subject: [PATCH 121/455] fix(stream): Implement Error for OpenStreamError

Pull-Request: #5169.
---
 Cargo.lock                      | 2 +-
 Cargo.toml                      | 2 +-
 protocols/stream/CHANGELOG.md   | 4 ++++
 protocols/stream/Cargo.toml     | 2 +-
 protocols/stream/src/control.rs | 9 +++++++++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7ca3795ff3b..b2b90a3a005 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3236,7 +3236,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-stream"
-version = "0.1.0-alpha"
+version = "0.1.0-alpha.1"
 dependencies = [
  "futures",
  "libp2p-core",
diff --git a/Cargo.toml b/Cargo.toml
index 3d7097f9a88..23fd4774b55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -101,7 +101,7 @@ libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.6", path = "misc/server" }
-libp2p-stream = { version = "0.1.0-alpha", path = "protocols/stream" }
+libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.3", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
diff --git a/protocols/stream/CHANGELOG.md b/protocols/stream/CHANGELOG.md
index 2e177e2f1bc..1e3b85da0b9 100644
--- a/protocols/stream/CHANGELOG.md
+++ b/protocols/stream/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0-alpha.1
+- Implement Error for `OpenStreamError`.
+  See [PR 5169](https://github.com/libp2p/rust-libp2p/pull/5169).
+
 ## 0.1.0-alpha
 
 Initial release.
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index be340939720..6a39794c196 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-stream"
-version = "0.1.0-alpha"
+version = "0.1.0-alpha.1"
 edition = "2021"
 rust-version.workspace = true
 description = "Generic stream protocols for libp2p"
diff --git a/protocols/stream/src/control.rs b/protocols/stream/src/control.rs
index 6aabaaff30e..036d285b2a3 100644
--- a/protocols/stream/src/control.rs
+++ b/protocols/stream/src/control.rs
@@ -103,6 +103,15 @@ impl fmt::Display for OpenStreamError {
     }
 }
 
+impl std::error::Error for OpenStreamError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            Self::Io(error) => Some(error),
+            _ => None,
+        }
+    }
+}
+
 /// A handle to inbound streams for a particular protocol.
 #[must_use = "Streams do nothing unless polled."]
 pub struct IncomingStreams {

From 0f559b3850606899d26a1badb9f4e818cec8ec46 Mon Sep 17 00:00:00 2001
From: Rafael <rvalle@valletech.eu>
Date: Sat, 2 Mar 2024 15:55:33 +0100
Subject: [PATCH 122/455] docs: extend idle connection timeout on ping tutorial

Pull-Request: #5176.
---
 libp2p/src/tutorials/ping.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libp2p/src/tutorials/ping.rs b/libp2p/src/tutorials/ping.rs
index 1413531cd72..309d5b36baa 100644
--- a/libp2p/src/tutorials/ping.rs
+++ b/libp2p/src/tutorials/ping.rs
@@ -216,7 +216,7 @@
 //!             libp2p::yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(30))) // Allows us to observe pings for 30 seconds.
+//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))) // Allows us to observe pings indefinitely.
 //!         .build();
 //!
 //!     Ok(())
@@ -267,7 +267,7 @@
 //!             libp2p::yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(30))) // Allows us to observe pings for 30 seconds.
+//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))) // Allows us to observe pings indefinitely..
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned
@@ -312,7 +312,7 @@
 //!             libp2p::yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(30))) // Allows us to observe pings for 30 seconds.
+//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))) // Allows us to observe pings indefinitely.
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned

From d1dbee771e8797e364dccbd4cb6bbf6ae3977908 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 08:42:32 +0000
Subject: [PATCH 123/455] deps: bump rust-embed from 8.2.0 to 8.3.0

Pull-Request: #5199.
---
 Cargo.lock                         | 12 ++++++------
 examples/browser-webrtc/Cargo.toml |  2 +-
 interop-tests/Cargo.toml           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b2b90a3a005..507b73c9cfb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4997,9 +4997,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.2.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f"
+checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5008,9 +5008,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.2.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16"
+checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5022,9 +5022,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.2.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665"
+checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581"
 dependencies = [
  "globset",
  "sha2 0.10.8",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 5e3c8a0c666..a01ebe71e5f 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -26,7 +26,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 axum = "0.7.4"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
-rust-embed = { version = "8.2.0", features = ["include-exclude", "interpolate-folder-path"] }
+rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { version = "1.36", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index b9ecc031f5a..803225f7bb6 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -31,7 +31,7 @@ mime_guess = "2.0"
 redis = { version = "0.23.3", default-features = false, features = [
     "tokio-comp",
 ] }
-rust-embed = "8.2"
+rust-embed = "8.3"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.36.0", features = ["full"] }

From a3d4b375f73ac9359e817f9f9d0a01ec65e1cf2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:24:26 +0000
Subject: [PATCH 124/455] deps: bump serde from 1.0.196 to 1.0.197

Pull-Request: #5189.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 507b73c9cfb..006a4108b77 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5286,18 +5286,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 2059f4b6258..c8e6cde98e0 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.36.0", features = ["full"] }
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 96a5fac069b..9fe9e926d76 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.4.16", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 libp2p-core = { workspace = true }
 base64 = "0.21.7"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 9653ddc5d76..af71a57561a 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.196"
+serde = "1.0.197"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }

From 46ec6c416a9b06c089236a8d6d44e55d0c3f7edd Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 4 Mar 2024 13:15:03 +0100
Subject: [PATCH 125/455] fix(mergify): disable approve rules (#5208)

---
 .github/mergify.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index c630d23cea0..b464c9aba87 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -52,22 +52,22 @@ pull_request_rules:
         message: Approvals have been dismissed because the PR was updated after the `send-it` label was applied.
         changes_requested: false
 
-  - name: Approve trivial maintainer PRs
-    conditions:
-      - base=master
-      - label=trivial
-      - author=@libp2p/rust-libp2p-maintainers
-    actions:
-      review:
+  # - name: Approve trivial maintainer PRs
+  #   conditions:
+  #     - base=master
+  #     - label=trivial
+  #     - author=@libp2p/rust-libp2p-maintainers
+  #   actions:
+  #     review:
 
-  - name: Approve dependabot PRs of semver-compatible updates
-    conditions:
-      - author=dependabot[bot]
-      - or:
-          - title~=bump [^\s]+ from ([1-9]+)\..+ to \1\.      # For major >= 1 versions, only approve updates with the same major version.
-          - title~=bump [^\s]+ from 0\.([\d]+)\..+ to 0\.\1\. # For major == 0 versions, only approve updates with the same minor version.
-    actions:
-      review:
+  # - name: Approve dependabot PRs of semver-compatible updates
+  #   conditions:
+  #     - author=dependabot[bot]
+  #     - or:
+  #         - title~=bump [^\s]+ from ([1-9]+)\..+ to \1\.      # For major >= 1 versions, only approve updates with the same major version.
+  #         - title~=bump [^\s]+ from 0\.([\d]+)\..+ to 0\.\1\. # For major == 0 versions, only approve updates with the same minor version.
+  #   actions:
+  #     review:
 
 queue_rules:
   - name: default

From 75f6ec78827a9475543f792b8693c3b784d43e57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:16:33 +0000
Subject: [PATCH 126/455] deps: bump tempfile from 3.10.0 to 3.10.1

Pull-Request: #5201.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 006a4108b77..2b846c16a4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5716,9 +5716,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.1",

From 245430ab19586372291a82c4dd7e3b15d658ac76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 06:19:25 +0000
Subject: [PATCH 127/455] deps: bump thirtyfour from 0.32.0-rc.8 to
 0.32.0-rc.10

Pull-Request: #5206.
---
 Cargo.lock               | 166 ++++++++++++---------------------------
 interop-tests/Cargo.toml |   2 +-
 2 files changed, 50 insertions(+), 118 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2b846c16a4d..85cb63ed083 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -984,17 +984,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
 
-[[package]]
-name = "cookie"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -1498,28 +1487,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "fantoccini"
-version = "0.20.0-rc.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5eb32b0001134a1d3b9e16010eb4b119451edf68446963a30a8130a0d056e98"
-dependencies = [
- "base64 0.13.1",
- "cookie",
- "futures-core",
- "futures-util",
- "http 0.2.9",
- "hyper 0.14.27",
- "hyper-rustls",
- "mime",
- "serde",
- "serde_json",
- "time",
- "tokio",
- "url",
- "webdriver",
-]
-
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1697,7 +1664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
 dependencies = [
  "futures-io",
- "rustls 0.21.9",
+ "rustls",
 ]
 
 [[package]]
@@ -2183,15 +2150,14 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.23.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
+ "futures-util",
  "http 0.2.9",
  "hyper 0.14.27",
- "log",
- "rustls 0.20.8",
- "rustls-native-certs",
+ "rustls",
  "tokio",
  "tokio-rustls",
 ]
@@ -3118,7 +3084,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.16.20",
- "rustls 0.21.9",
+ "rustls",
  "socket2 0.5.6",
  "thiserror",
  "tokio",
@@ -3343,7 +3309,7 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.16.20",
- "rustls 0.21.9",
+ "rustls",
  "rustls-webpki",
  "thiserror",
  "tokio",
@@ -4566,7 +4532,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.21.9",
+ "rustls",
  "thiserror",
  "tokio",
  "tracing",
@@ -4582,7 +4548,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.16.20",
  "rustc-hash",
- "rustls 0.21.9",
+ "rustls",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4850,6 +4816,7 @@ dependencies = [
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
+ "hyper-rustls",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -4859,6 +4826,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -4867,11 +4835,13 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -5088,18 +5058,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
-dependencies = [
- "log",
- "ring 0.16.20",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "rustls"
 version = "0.21.9"
@@ -5112,18 +5070,6 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.3"
@@ -5328,9 +5274,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5604,6 +5550,28 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.51",
+]
+
 [[package]]
 name = "stun"
 version = "0.5.1"
@@ -5737,27 +5705,27 @@ dependencies = [
 
 [[package]]
 name = "thirtyfour"
-version = "0.32.0-rc.8"
+version = "0.32.0-rc.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0fe180d5f1f7dd32bb5f1a8d19231bb63dc9bbb1985e1dbb6f07163b6a8578"
+checksum = "bcc8d557d4ac49c0d0bf13722bf7414506ef50b28ac40894400dcd0b8ed25c4d"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
- "cookie",
- "fantoccini",
  "futures",
- "http 0.2.9",
- "indexmap 1.9.3",
- "log",
+ "http 1.0.0",
+ "indexmap 2.2.1",
  "parking_lot",
  "paste",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_repr",
  "stringmatch",
+ "strum",
  "thirtyfour-macros",
  "thiserror",
  "tokio",
+ "tracing",
  "url",
 ]
 
@@ -5907,13 +5875,12 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.23.4"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.20.8",
+ "rustls",
  "tokio",
- "webpki",
 ]
 
 [[package]]
@@ -6215,12 +6182,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -6495,35 +6456,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webdriver"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9973cb72c8587d5ad5efdb91e663d36177dc37725e6c90ca86c626b0cc45c93f"
-dependencies = [
- "base64 0.13.1",
- "bytes",
- "cookie",
- "http 0.2.9",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "unicode-segmentation",
- "url",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.25.2"
@@ -6551,7 +6483,7 @@ dependencies = [
  "ring 0.16.20",
  "rtcp",
  "rtp",
- "rustls 0.21.9",
+ "rustls",
  "sdp",
  "serde",
  "serde_json",
@@ -6612,7 +6544,7 @@ dependencies = [
  "rand_core 0.6.4",
  "rcgen",
  "ring 0.16.20",
- "rustls 0.21.9",
+ "rustls",
  "sec1",
  "serde",
  "sha1",
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 803225f7bb6..410d3dbce2b 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -33,7 +33,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 ] }
 rust-embed = "8.3"
 serde_json = "1"
-thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
+thirtyfour = "=0.32.0-rc.10" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.36.0", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = "0.1.37"

From 6f9c9e5bedce42f53ab24880c7a827ed5adac81b Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 6 Mar 2024 02:31:22 +1100
Subject: [PATCH 128/455] chore: move `futures-bounded` out of mono-repo

I've moved this library to https://github.com/thomaseizinger/rust-futures-bounded to make maintenance easier. Any PRs / fixes etc are of course still welcome.

Pull-Request: #5210.
---
 Cargo.lock                                    |   4 +-
 Cargo.toml                                    |   3 +-
 misc/futures-bounded/CHANGELOG.md             |  23 --
 misc/futures-bounded/Cargo.toml               |  24 --
 misc/futures-bounded/src/futures_map.rs       | 319 ---------------
 misc/futures-bounded/src/futures_set.rs       |  65 ----
 misc/futures-bounded/src/futures_tuple_set.rs |  94 -----
 misc/futures-bounded/src/lib.rs               |  46 ---
 misc/futures-bounded/src/stream_map.rs        | 362 ------------------
 misc/futures-bounded/src/stream_set.rs        |  64 ----
 10 files changed, 3 insertions(+), 1001 deletions(-)
 delete mode 100644 misc/futures-bounded/CHANGELOG.md
 delete mode 100644 misc/futures-bounded/Cargo.toml
 delete mode 100644 misc/futures-bounded/src/futures_map.rs
 delete mode 100644 misc/futures-bounded/src/futures_set.rs
 delete mode 100644 misc/futures-bounded/src/futures_tuple_set.rs
 delete mode 100644 misc/futures-bounded/src/lib.rs
 delete mode 100644 misc/futures-bounded/src/stream_map.rs
 delete mode 100644 misc/futures-bounded/src/stream_set.rs

diff --git a/Cargo.lock b/Cargo.lock
index 85cb63ed083..f662e0c9fbf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1580,11 +1580,11 @@ dependencies = [
 [[package]]
 name = "futures-bounded"
 version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173"
 dependencies = [
- "futures",
  "futures-timer",
  "futures-util",
- "tokio",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 23fd4774b55..556919dcae6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,6 @@ members = [
     "interop-tests",
     "misc/allow-block-list",
     "misc/connection-limits",
-    "misc/futures-bounded",
     "misc/keygen",
     "misc/memory-connection-limits",
     "misc/metrics",
@@ -73,7 +72,7 @@ rust-version = "1.73.0"
 
 [workspace.dependencies]
 asynchronous-codec = { version = "0.7.0" }
-futures-bounded = { version = "0.2.3", path = "misc/futures-bounded" }
+futures-bounded = { version = "0.2.3" }
 libp2p = { version = "0.53.2", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
diff --git a/misc/futures-bounded/CHANGELOG.md b/misc/futures-bounded/CHANGELOG.md
deleted file mode 100644
index 72b0b4f457d..00000000000
--- a/misc/futures-bounded/CHANGELOG.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## 0.2.3
-
-- Introduce `FuturesTupleSet`, holding tuples of a `Future` together with an arbitrary piece of data.
-  See [PR 4841](https://github.com/libp2p/rust-libp2p/pull/4841).
-
-## 0.2.2
-
-- Fix an issue where `{Futures,Stream}Map` returns `Poll::Pending` despite being ready after an item has been replaced as part of `try_push`.
-  See [PR 4865](https://github.com/libp2p/rust-libp2p/pull/4865). 
-
-## 0.2.1
-
-- Add `.len()` getter to `FuturesMap`, `FuturesSet`, `StreamMap` and `StreamSet`.
-  See [PR 4745](https://github.com/libp2p/rust-libp2p/pull/4745).
-
-## 0.2.0
-
-- Add `StreamMap` type and remove `Future`-suffix from `PushError::ReplacedFuture` to reuse it for `StreamMap`.
-  See [PR 4616](https://github.com/libp2p/rust-libp2p/pull/4616).
-
-## 0.1.0
-
-Initial release.
diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
deleted file mode 100644
index 1d4340df74f..00000000000
--- a/misc/futures-bounded/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "futures-bounded"
-version = "0.2.3"
-edition = "2021"
-rust-version.workspace = true
-license = "MIT"
-repository = "https://github.com/libp2p/rust-libp2p"
-keywords = ["futures", "async", "backpressure"]
-categories = ["data-structures", "asynchronous"]
-description = "Utilities for bounding futures in size and time."
-publish = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-futures-util = { version = "0.3.30" }
-futures-timer = "3.0.3"
-
-[dev-dependencies]
-tokio = { version = "1.36.0", features = ["macros", "rt", "sync"] }
-futures = "0.3.30"
-
-[lints]
-workspace = true
diff --git a/misc/futures-bounded/src/futures_map.rs b/misc/futures-bounded/src/futures_map.rs
deleted file mode 100644
index fba3543f67b..00000000000
--- a/misc/futures-bounded/src/futures_map.rs
+++ /dev/null
@@ -1,319 +0,0 @@
-use std::future::Future;
-use std::hash::Hash;
-use std::pin::Pin;
-use std::task::{Context, Poll, Waker};
-use std::time::Duration;
-use std::{future, mem};
-
-use futures_timer::Delay;
-use futures_util::future::BoxFuture;
-use futures_util::stream::FuturesUnordered;
-use futures_util::{FutureExt, StreamExt};
-
-use crate::{PushError, Timeout};
-
-/// Represents a map of [`Future`]s.
-///
-/// Each future must finish within the specified time and the map never outgrows its capacity.
-pub struct FuturesMap<ID, O> {
-    timeout: Duration,
-    capacity: usize,
-    inner: FuturesUnordered<TaggedFuture<ID, TimeoutFuture<BoxFuture<'static, O>>>>,
-    empty_waker: Option<Waker>,
-    full_waker: Option<Waker>,
-}
-
-impl<ID, O> FuturesMap<ID, O> {
-    pub fn new(timeout: Duration, capacity: usize) -> Self {
-        Self {
-            timeout,
-            capacity,
-            inner: Default::default(),
-            empty_waker: None,
-            full_waker: None,
-        }
-    }
-}
-
-impl<ID, O> FuturesMap<ID, O>
-where
-    ID: Clone + Hash + Eq + Send + Unpin + 'static,
-    O: 'static,
-{
-    /// Push a future into the map.
-    ///
-    /// This method inserts the given future with defined `future_id` to the set.
-    /// If the length of the map is equal to the capacity, this method returns [PushError::BeyondCapacity],
-    /// that contains the passed future. In that case, the future is not inserted to the map.
-    /// If a future with the given `future_id` already exists, then the old future will be replaced by a new one.
-    /// In that case, the returned error [PushError::Replaced] contains the old future.
-    pub fn try_push<F>(&mut self, future_id: ID, future: F) -> Result<(), PushError<BoxFuture<O>>>
-    where
-        F: Future<Output = O> + Send + 'static,
-    {
-        if self.inner.len() >= self.capacity {
-            return Err(PushError::BeyondCapacity(future.boxed()));
-        }
-
-        if let Some(waker) = self.empty_waker.take() {
-            waker.wake();
-        }
-
-        let old = self.remove(future_id.clone());
-        self.inner.push(TaggedFuture {
-            tag: future_id,
-            inner: TimeoutFuture {
-                inner: future.boxed(),
-                timeout: Delay::new(self.timeout),
-                cancelled: false,
-            },
-        });
-        match old {
-            None => Ok(()),
-            Some(old) => Err(PushError::Replaced(old)),
-        }
-    }
-
-    pub fn remove(&mut self, id: ID) -> Option<BoxFuture<'static, O>> {
-        let tagged = self.inner.iter_mut().find(|s| s.tag == id)?;
-
-        let inner = mem::replace(&mut tagged.inner.inner, future::pending().boxed());
-        tagged.inner.cancelled = true;
-
-        Some(inner)
-    }
-
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-
-    #[allow(unknown_lints, clippy::needless_pass_by_ref_mut)] // &mut Context is idiomatic.
-    pub fn poll_ready_unpin(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        if self.inner.len() < self.capacity {
-            return Poll::Ready(());
-        }
-
-        self.full_waker = Some(cx.waker().clone());
-
-        Poll::Pending
-    }
-
-    pub fn poll_unpin(&mut self, cx: &mut Context<'_>) -> Poll<(ID, Result<O, Timeout>)> {
-        loop {
-            let maybe_result = futures_util::ready!(self.inner.poll_next_unpin(cx));
-
-            match maybe_result {
-                None => {
-                    self.empty_waker = Some(cx.waker().clone());
-                    return Poll::Pending;
-                }
-                Some((id, Ok(output))) => return Poll::Ready((id, Ok(output))),
-                Some((id, Err(TimeoutError::Timeout))) => {
-                    return Poll::Ready((id, Err(Timeout::new(self.timeout))))
-                }
-                Some((_, Err(TimeoutError::Cancelled))) => continue,
-            }
-        }
-    }
-}
-
-struct TimeoutFuture<F> {
-    inner: F,
-    timeout: Delay,
-
-    cancelled: bool,
-}
-
-impl<F> Future for TimeoutFuture<F>
-where
-    F: Future + Unpin,
-{
-    type Output = Result<F::Output, TimeoutError>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        if self.cancelled {
-            return Poll::Ready(Err(TimeoutError::Cancelled));
-        }
-
-        if self.timeout.poll_unpin(cx).is_ready() {
-            return Poll::Ready(Err(TimeoutError::Timeout));
-        }
-
-        self.inner.poll_unpin(cx).map(Ok)
-    }
-}
-
-enum TimeoutError {
-    Timeout,
-    Cancelled,
-}
-
-struct TaggedFuture<T, F> {
-    tag: T,
-    inner: F,
-}
-
-impl<T, F> Future for TaggedFuture<T, F>
-where
-    T: Clone + Unpin,
-    F: Future + Unpin,
-{
-    type Output = (T, F::Output);
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let output = futures_util::ready!(self.inner.poll_unpin(cx));
-
-        Poll::Ready((self.tag.clone(), output))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use futures::channel::oneshot;
-    use futures_util::task::noop_waker_ref;
-    use std::future::{pending, poll_fn, ready};
-    use std::pin::Pin;
-    use std::time::Instant;
-
-    use super::*;
-
-    #[test]
-    fn cannot_push_more_than_capacity_tasks() {
-        let mut futures = FuturesMap::new(Duration::from_secs(10), 1);
-
-        assert!(futures.try_push("ID_1", ready(())).is_ok());
-        matches!(
-            futures.try_push("ID_2", ready(())),
-            Err(PushError::BeyondCapacity(_))
-        );
-    }
-
-    #[test]
-    fn cannot_push_the_same_id_few_times() {
-        let mut futures = FuturesMap::new(Duration::from_secs(10), 5);
-
-        assert!(futures.try_push("ID", ready(())).is_ok());
-        matches!(
-            futures.try_push("ID", ready(())),
-            Err(PushError::Replaced(_))
-        );
-    }
-
-    #[tokio::test]
-    async fn futures_timeout() {
-        let mut futures = FuturesMap::new(Duration::from_millis(100), 1);
-
-        let _ = futures.try_push("ID", pending::<()>());
-        Delay::new(Duration::from_millis(150)).await;
-        let (_, result) = poll_fn(|cx| futures.poll_unpin(cx)).await;
-
-        assert!(result.is_err())
-    }
-
-    #[test]
-    fn resources_of_removed_future_are_cleaned_up() {
-        let mut futures = FuturesMap::new(Duration::from_millis(100), 1);
-
-        let _ = futures.try_push("ID", pending::<()>());
-        futures.remove("ID");
-
-        let poll = futures.poll_unpin(&mut Context::from_waker(noop_waker_ref()));
-        assert!(poll.is_pending());
-
-        assert_eq!(futures.len(), 0);
-    }
-
-    #[tokio::test]
-    async fn replaced_pending_future_is_polled() {
-        let mut streams = FuturesMap::new(Duration::from_millis(100), 3);
-
-        let (_tx1, rx1) = oneshot::channel();
-        let (tx2, rx2) = oneshot::channel();
-
-        let _ = streams.try_push("ID1", rx1);
-        let _ = streams.try_push("ID2", rx2);
-
-        let _ = tx2.send(2);
-        let (id, res) = poll_fn(|cx| streams.poll_unpin(cx)).await;
-        assert_eq!(id, "ID2");
-        assert_eq!(res.unwrap().unwrap(), 2);
-
-        let (new_tx1, new_rx1) = oneshot::channel();
-        let replaced = streams.try_push("ID1", new_rx1);
-        assert!(matches!(replaced.unwrap_err(), PushError::Replaced(_)));
-
-        let _ = new_tx1.send(4);
-        let (id, res) = poll_fn(|cx| streams.poll_unpin(cx)).await;
-
-        assert_eq!(id, "ID1");
-        assert_eq!(res.unwrap().unwrap(), 4);
-    }
-
-    // Each future causes a delay, `Task` only has a capacity of 1, meaning they must be processed in sequence.
-    // We stop after NUM_FUTURES tasks, meaning the overall execution must at least take DELAY * NUM_FUTURES.
-    #[tokio::test]
-    async fn backpressure() {
-        const DELAY: Duration = Duration::from_millis(100);
-        const NUM_FUTURES: u32 = 10;
-
-        let start = Instant::now();
-        Task::new(DELAY, NUM_FUTURES, 1).await;
-        let duration = start.elapsed();
-
-        assert!(duration >= DELAY * NUM_FUTURES);
-    }
-
-    struct Task {
-        future: Duration,
-        num_futures: usize,
-        num_processed: usize,
-        inner: FuturesMap<u8, ()>,
-    }
-
-    impl Task {
-        fn new(future: Duration, num_futures: u32, capacity: usize) -> Self {
-            Self {
-                future,
-                num_futures: num_futures as usize,
-                num_processed: 0,
-                inner: FuturesMap::new(Duration::from_secs(60), capacity),
-            }
-        }
-    }
-
-    impl Future for Task {
-        type Output = ();
-
-        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            let this = self.get_mut();
-
-            while this.num_processed < this.num_futures {
-                if let Poll::Ready((_, result)) = this.inner.poll_unpin(cx) {
-                    if result.is_err() {
-                        panic!("Timeout is great than future delay")
-                    }
-
-                    this.num_processed += 1;
-                    continue;
-                }
-
-                if let Poll::Ready(()) = this.inner.poll_ready_unpin(cx) {
-                    // We push the constant future's ID to prove that user can use the same ID
-                    // if the future was finished
-                    let maybe_future = this.inner.try_push(1u8, Delay::new(this.future));
-                    assert!(maybe_future.is_ok(), "we polled for readiness");
-
-                    continue;
-                }
-
-                return Poll::Pending;
-            }
-
-            Poll::Ready(())
-        }
-    }
-}
diff --git a/misc/futures-bounded/src/futures_set.rs b/misc/futures-bounded/src/futures_set.rs
deleted file mode 100644
index af7cedfcc85..00000000000
--- a/misc/futures-bounded/src/futures_set.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use std::future::Future;
-use std::task::{ready, Context, Poll};
-use std::time::Duration;
-
-use futures_util::future::BoxFuture;
-
-use crate::{FuturesMap, PushError, Timeout};
-
-/// Represents a list of [Future]s.
-///
-/// Each future must finish within the specified time and the list never outgrows its capacity.
-pub struct FuturesSet<O> {
-    id: u32,
-    inner: FuturesMap<u32, O>,
-}
-
-impl<O> FuturesSet<O> {
-    pub fn new(timeout: Duration, capacity: usize) -> Self {
-        Self {
-            id: 0,
-            inner: FuturesMap::new(timeout, capacity),
-        }
-    }
-}
-
-impl<O> FuturesSet<O>
-where
-    O: 'static,
-{
-    /// Push a future into the list.
-    ///
-    /// This method adds the given future to the list.
-    /// If the length of the list is equal to the capacity, this method returns a error that contains the passed future.
-    /// In that case, the future is not added to the set.
-    pub fn try_push<F>(&mut self, future: F) -> Result<(), BoxFuture<O>>
-    where
-        F: Future<Output = O> + Send + 'static,
-    {
-        self.id = self.id.wrapping_add(1);
-
-        match self.inner.try_push(self.id, future) {
-            Ok(()) => Ok(()),
-            Err(PushError::BeyondCapacity(w)) => Err(w),
-            Err(PushError::Replaced(_)) => unreachable!("we never reuse IDs"),
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-
-    pub fn poll_ready_unpin(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        self.inner.poll_ready_unpin(cx)
-    }
-
-    pub fn poll_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<O, Timeout>> {
-        let (_, res) = ready!(self.inner.poll_unpin(cx));
-
-        Poll::Ready(res)
-    }
-}
diff --git a/misc/futures-bounded/src/futures_tuple_set.rs b/misc/futures-bounded/src/futures_tuple_set.rs
deleted file mode 100644
index e19b236aaf8..00000000000
--- a/misc/futures-bounded/src/futures_tuple_set.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use std::collections::HashMap;
-use std::future::Future;
-use std::task::{ready, Context, Poll};
-use std::time::Duration;
-
-use futures_util::future::BoxFuture;
-
-use crate::{FuturesMap, PushError, Timeout};
-
-/// Represents a list of tuples of a [Future] and an associated piece of data.
-///
-/// Each future must finish within the specified time and the list never outgrows its capacity.
-pub struct FuturesTupleSet<O, D> {
-    id: u32,
-    inner: FuturesMap<u32, O>,
-    data: HashMap<u32, D>,
-}
-
-impl<O, D> FuturesTupleSet<O, D> {
-    pub fn new(timeout: Duration, capacity: usize) -> Self {
-        Self {
-            id: 0,
-            inner: FuturesMap::new(timeout, capacity),
-            data: HashMap::new(),
-        }
-    }
-}
-
-impl<O, D> FuturesTupleSet<O, D>
-where
-    O: 'static,
-{
-    /// Push a future into the list.
-    ///
-    /// This method adds the given future to the list.
-    /// If the length of the list is equal to the capacity, this method returns a error that contains the passed future.
-    /// In that case, the future is not added to the set.
-    pub fn try_push<F>(&mut self, future: F, data: D) -> Result<(), (BoxFuture<O>, D)>
-    where
-        F: Future<Output = O> + Send + 'static,
-    {
-        self.id = self.id.wrapping_add(1);
-
-        match self.inner.try_push(self.id, future) {
-            Ok(()) => {}
-            Err(PushError::BeyondCapacity(w)) => return Err((w, data)),
-            Err(PushError::Replaced(_)) => unreachable!("we never reuse IDs"),
-        }
-        self.data.insert(self.id, data);
-
-        Ok(())
-    }
-
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-
-    pub fn poll_ready_unpin(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        self.inner.poll_ready_unpin(cx)
-    }
-
-    pub fn poll_unpin(&mut self, cx: &mut Context<'_>) -> Poll<(Result<O, Timeout>, D)> {
-        let (id, res) = ready!(self.inner.poll_unpin(cx));
-        let data = self.data.remove(&id).expect("must have data for future");
-
-        Poll::Ready((res, data))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use futures_util::future::poll_fn;
-    use futures_util::FutureExt;
-    use std::future::ready;
-
-    #[test]
-    fn tracks_associated_data_of_future() {
-        let mut set = FuturesTupleSet::new(Duration::from_secs(10), 10);
-
-        let _ = set.try_push(ready(1), 1);
-        let _ = set.try_push(ready(2), 2);
-
-        let (res1, data1) = poll_fn(|cx| set.poll_unpin(cx)).now_or_never().unwrap();
-        let (res2, data2) = poll_fn(|cx| set.poll_unpin(cx)).now_or_never().unwrap();
-
-        assert_eq!(res1.unwrap(), data1);
-        assert_eq!(res2.unwrap(), data2);
-    }
-}
diff --git a/misc/futures-bounded/src/lib.rs b/misc/futures-bounded/src/lib.rs
deleted file mode 100644
index da8483a595f..00000000000
--- a/misc/futures-bounded/src/lib.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-mod futures_map;
-mod futures_set;
-mod futures_tuple_set;
-mod stream_map;
-mod stream_set;
-
-pub use futures_map::FuturesMap;
-pub use futures_set::FuturesSet;
-pub use futures_tuple_set::FuturesTupleSet;
-pub use stream_map::StreamMap;
-pub use stream_set::StreamSet;
-
-use std::fmt;
-use std::fmt::Formatter;
-use std::time::Duration;
-
-/// A future failed to complete within the given timeout.
-#[derive(Debug)]
-pub struct Timeout {
-    limit: Duration,
-}
-
-impl Timeout {
-    fn new(duration: Duration) -> Self {
-        Self { limit: duration }
-    }
-}
-
-impl fmt::Display for Timeout {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "future failed to complete within {:?}", self.limit)
-    }
-}
-
-/// Error of a future pushing
-#[derive(PartialEq, Debug)]
-pub enum PushError<T> {
-    /// The length of the set is equal to the capacity
-    BeyondCapacity(T),
-    /// The map already contained an item with this key.
-    ///
-    /// The old item is returned.
-    Replaced(T),
-}
-
-impl std::error::Error for Timeout {}
diff --git a/misc/futures-bounded/src/stream_map.rs b/misc/futures-bounded/src/stream_map.rs
deleted file mode 100644
index 8464f432d02..00000000000
--- a/misc/futures-bounded/src/stream_map.rs
+++ /dev/null
@@ -1,362 +0,0 @@
-use std::mem;
-use std::pin::Pin;
-use std::task::{Context, Poll, Waker};
-use std::time::Duration;
-
-use futures_timer::Delay;
-use futures_util::stream::{BoxStream, SelectAll};
-use futures_util::{stream, FutureExt, Stream, StreamExt};
-
-use crate::{PushError, Timeout};
-
-/// Represents a map of [`Stream`]s.
-///
-/// Each stream must finish within the specified time and the map never outgrows its capacity.
-pub struct StreamMap<ID, O> {
-    timeout: Duration,
-    capacity: usize,
-    inner: SelectAll<TaggedStream<ID, TimeoutStream<BoxStream<'static, O>>>>,
-    empty_waker: Option<Waker>,
-    full_waker: Option<Waker>,
-}
-
-impl<ID, O> StreamMap<ID, O>
-where
-    ID: Clone + Unpin,
-{
-    pub fn new(timeout: Duration, capacity: usize) -> Self {
-        Self {
-            timeout,
-            capacity,
-            inner: Default::default(),
-            empty_waker: None,
-            full_waker: None,
-        }
-    }
-}
-
-impl<ID, O> StreamMap<ID, O>
-where
-    ID: Clone + PartialEq + Send + Unpin + 'static,
-    O: Send + 'static,
-{
-    /// Push a stream into the map.
-    pub fn try_push<F>(&mut self, id: ID, stream: F) -> Result<(), PushError<BoxStream<O>>>
-    where
-        F: Stream<Item = O> + Send + 'static,
-    {
-        if self.inner.len() >= self.capacity {
-            return Err(PushError::BeyondCapacity(stream.boxed()));
-        }
-
-        if let Some(waker) = self.empty_waker.take() {
-            waker.wake();
-        }
-
-        let old = self.remove(id.clone());
-        self.inner.push(TaggedStream::new(
-            id,
-            TimeoutStream {
-                inner: stream.boxed(),
-                timeout: Delay::new(self.timeout),
-            },
-        ));
-
-        match old {
-            None => Ok(()),
-            Some(old) => Err(PushError::Replaced(old)),
-        }
-    }
-
-    pub fn remove(&mut self, id: ID) -> Option<BoxStream<'static, O>> {
-        let tagged = self.inner.iter_mut().find(|s| s.key == id)?;
-
-        let inner = mem::replace(&mut tagged.inner.inner, stream::pending().boxed());
-        tagged.exhausted = true; // Setting this will emit `None` on the next poll and ensure `SelectAll` cleans up the resources.
-
-        Some(inner)
-    }
-
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-
-    #[allow(unknown_lints, clippy::needless_pass_by_ref_mut)] // &mut Context is idiomatic.
-    pub fn poll_ready_unpin(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        if self.inner.len() < self.capacity {
-            return Poll::Ready(());
-        }
-
-        self.full_waker = Some(cx.waker().clone());
-
-        Poll::Pending
-    }
-
-    pub fn poll_next_unpin(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<(ID, Option<Result<O, Timeout>>)> {
-        match futures_util::ready!(self.inner.poll_next_unpin(cx)) {
-            None => {
-                self.empty_waker = Some(cx.waker().clone());
-                Poll::Pending
-            }
-            Some((id, Some(Ok(output)))) => Poll::Ready((id, Some(Ok(output)))),
-            Some((id, Some(Err(())))) => {
-                self.remove(id.clone()); // Remove stream, otherwise we keep reporting the timeout.
-
-                Poll::Ready((id, Some(Err(Timeout::new(self.timeout)))))
-            }
-            Some((id, None)) => Poll::Ready((id, None)),
-        }
-    }
-}
-
-struct TimeoutStream<S> {
-    inner: S,
-    timeout: Delay,
-}
-
-impl<F> Stream for TimeoutStream<F>
-where
-    F: Stream + Unpin,
-{
-    type Item = Result<F::Item, ()>;
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        if self.timeout.poll_unpin(cx).is_ready() {
-            return Poll::Ready(Some(Err(())));
-        }
-
-        self.inner.poll_next_unpin(cx).map(|a| a.map(Ok))
-    }
-}
-
-struct TaggedStream<K, S> {
-    key: K,
-    inner: S,
-
-    exhausted: bool,
-}
-
-impl<K, S> TaggedStream<K, S> {
-    fn new(key: K, inner: S) -> Self {
-        Self {
-            key,
-            inner,
-            exhausted: false,
-        }
-    }
-}
-
-impl<K, S> Stream for TaggedStream<K, S>
-where
-    K: Clone + Unpin,
-    S: Stream + Unpin,
-{
-    type Item = (K, Option<S::Item>);
-
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        if self.exhausted {
-            return Poll::Ready(None);
-        }
-
-        match futures_util::ready!(self.inner.poll_next_unpin(cx)) {
-            Some(item) => Poll::Ready(Some((self.key.clone(), Some(item)))),
-            None => {
-                self.exhausted = true;
-
-                Poll::Ready(Some((self.key.clone(), None)))
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use futures::channel::mpsc;
-    use futures_util::stream::{once, pending};
-    use futures_util::SinkExt;
-    use std::future::{poll_fn, ready, Future};
-    use std::pin::Pin;
-    use std::time::Instant;
-
-    use super::*;
-
-    #[test]
-    fn cannot_push_more_than_capacity_tasks() {
-        let mut streams = StreamMap::new(Duration::from_secs(10), 1);
-
-        assert!(streams.try_push("ID_1", once(ready(()))).is_ok());
-        matches!(
-            streams.try_push("ID_2", once(ready(()))),
-            Err(PushError::BeyondCapacity(_))
-        );
-    }
-
-    #[test]
-    fn cannot_push_the_same_id_few_times() {
-        let mut streams = StreamMap::new(Duration::from_secs(10), 5);
-
-        assert!(streams.try_push("ID", once(ready(()))).is_ok());
-        matches!(
-            streams.try_push("ID", once(ready(()))),
-            Err(PushError::Replaced(_))
-        );
-    }
-
-    #[tokio::test]
-    async fn streams_timeout() {
-        let mut streams = StreamMap::new(Duration::from_millis(100), 1);
-
-        let _ = streams.try_push("ID", pending::<()>());
-        Delay::new(Duration::from_millis(150)).await;
-        let (_, result) = poll_fn(|cx| streams.poll_next_unpin(cx)).await;
-
-        assert!(result.unwrap().is_err())
-    }
-
-    #[tokio::test]
-    async fn timed_out_stream_gets_removed() {
-        let mut streams = StreamMap::new(Duration::from_millis(100), 1);
-
-        let _ = streams.try_push("ID", pending::<()>());
-        Delay::new(Duration::from_millis(150)).await;
-        poll_fn(|cx| streams.poll_next_unpin(cx)).await;
-
-        let poll = streams.poll_next_unpin(&mut Context::from_waker(
-            futures_util::task::noop_waker_ref(),
-        ));
-        assert!(poll.is_pending())
-    }
-
-    #[test]
-    fn removing_stream() {
-        let mut streams = StreamMap::new(Duration::from_millis(100), 1);
-
-        let _ = streams.try_push("ID", stream::once(ready(())));
-
-        {
-            let cancelled_stream = streams.remove("ID");
-            assert!(cancelled_stream.is_some());
-        }
-
-        let poll = streams.poll_next_unpin(&mut Context::from_waker(
-            futures_util::task::noop_waker_ref(),
-        ));
-
-        assert!(poll.is_pending());
-        assert_eq!(
-            streams.len(),
-            0,
-            "resources of cancelled streams are cleaned up properly"
-        );
-    }
-
-    #[tokio::test]
-    async fn replaced_stream_is_still_registered() {
-        let mut streams = StreamMap::new(Duration::from_millis(100), 3);
-
-        let (mut tx1, rx1) = mpsc::channel(5);
-        let (mut tx2, rx2) = mpsc::channel(5);
-
-        let _ = streams.try_push("ID1", rx1);
-        let _ = streams.try_push("ID2", rx2);
-
-        let _ = tx2.send(2).await;
-        let _ = tx1.send(1).await;
-        let _ = tx2.send(3).await;
-        let (id, res) = poll_fn(|cx| streams.poll_next_unpin(cx)).await;
-        assert_eq!(id, "ID1");
-        assert_eq!(res.unwrap().unwrap(), 1);
-        let (id, res) = poll_fn(|cx| streams.poll_next_unpin(cx)).await;
-        assert_eq!(id, "ID2");
-        assert_eq!(res.unwrap().unwrap(), 2);
-        let (id, res) = poll_fn(|cx| streams.poll_next_unpin(cx)).await;
-        assert_eq!(id, "ID2");
-        assert_eq!(res.unwrap().unwrap(), 3);
-
-        let (mut new_tx1, new_rx1) = mpsc::channel(5);
-        let replaced = streams.try_push("ID1", new_rx1);
-        assert!(matches!(replaced.unwrap_err(), PushError::Replaced(_)));
-
-        let _ = new_tx1.send(4).await;
-        let (id, res) = poll_fn(|cx| streams.poll_next_unpin(cx)).await;
-
-        assert_eq!(id, "ID1");
-        assert_eq!(res.unwrap().unwrap(), 4);
-    }
-
-    // Each stream emits 1 item with delay, `Task` only has a capacity of 1, meaning they must be processed in sequence.
-    // We stop after NUM_STREAMS tasks, meaning the overall execution must at least take DELAY * NUM_STREAMS.
-    #[tokio::test]
-    async fn backpressure() {
-        const DELAY: Duration = Duration::from_millis(100);
-        const NUM_STREAMS: u32 = 10;
-
-        let start = Instant::now();
-        Task::new(DELAY, NUM_STREAMS, 1).await;
-        let duration = start.elapsed();
-
-        assert!(duration >= DELAY * NUM_STREAMS);
-    }
-
-    struct Task {
-        item_delay: Duration,
-        num_streams: usize,
-        num_processed: usize,
-        inner: StreamMap<u8, ()>,
-    }
-
-    impl Task {
-        fn new(item_delay: Duration, num_streams: u32, capacity: usize) -> Self {
-            Self {
-                item_delay,
-                num_streams: num_streams as usize,
-                num_processed: 0,
-                inner: StreamMap::new(Duration::from_secs(60), capacity),
-            }
-        }
-    }
-
-    impl Future for Task {
-        type Output = ();
-
-        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            let this = self.get_mut();
-
-            while this.num_processed < this.num_streams {
-                match this.inner.poll_next_unpin(cx) {
-                    Poll::Ready((_, Some(result))) => {
-                        if result.is_err() {
-                            panic!("Timeout is great than item delay")
-                        }
-
-                        this.num_processed += 1;
-                        continue;
-                    }
-                    Poll::Ready((_, None)) => {
-                        continue;
-                    }
-                    _ => {}
-                }
-
-                if let Poll::Ready(()) = this.inner.poll_ready_unpin(cx) {
-                    // We push the constant ID to prove that user can use the same ID if the stream was finished
-                    let maybe_future = this.inner.try_push(1u8, once(Delay::new(this.item_delay)));
-                    assert!(maybe_future.is_ok(), "we polled for readiness");
-
-                    continue;
-                }
-
-                return Poll::Pending;
-            }
-
-            Poll::Ready(())
-        }
-    }
-}
diff --git a/misc/futures-bounded/src/stream_set.rs b/misc/futures-bounded/src/stream_set.rs
deleted file mode 100644
index bb32835065f..00000000000
--- a/misc/futures-bounded/src/stream_set.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use futures_util::stream::BoxStream;
-use futures_util::Stream;
-use std::task::{ready, Context, Poll};
-use std::time::Duration;
-
-use crate::{PushError, StreamMap, Timeout};
-
-/// Represents a set of [Stream]s.
-///
-/// Each stream must finish within the specified time and the list never outgrows its capacity.
-pub struct StreamSet<O> {
-    id: u32,
-    inner: StreamMap<u32, O>,
-}
-
-impl<O> StreamSet<O> {
-    pub fn new(timeout: Duration, capacity: usize) -> Self {
-        Self {
-            id: 0,
-            inner: StreamMap::new(timeout, capacity),
-        }
-    }
-}
-
-impl<O> StreamSet<O>
-where
-    O: Send + 'static,
-{
-    /// Push a stream into the list.
-    ///
-    /// This method adds the given stream to the list.
-    /// If the length of the list is equal to the capacity, this method returns a error that contains the passed stream.
-    /// In that case, the stream is not added to the set.
-    pub fn try_push<F>(&mut self, stream: F) -> Result<(), BoxStream<O>>
-    where
-        F: Stream<Item = O> + Send + 'static,
-    {
-        self.id = self.id.wrapping_add(1);
-
-        match self.inner.try_push(self.id, stream) {
-            Ok(()) => Ok(()),
-            Err(PushError::BeyondCapacity(w)) => Err(w),
-            Err(PushError::Replaced(_)) => unreachable!("we never reuse IDs"),
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-
-    pub fn poll_ready_unpin(&mut self, cx: &mut Context<'_>) -> Poll<()> {
-        self.inner.poll_ready_unpin(cx)
-    }
-
-    pub fn poll_next_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<O, Timeout>>> {
-        let (_, res) = ready!(self.inner.poll_next_unpin(cx));
-
-        Poll::Ready(res)
-    }
-}

From 6a916174b0d3c16d2cfcebe5b168690d41484d10 Mon Sep 17 00:00:00 2001
From: Panagiotis Ganelis <50522617+PanGan21@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:04:20 +0200
Subject: [PATCH 129/455] feat(kad): add `refresh_interval` config used to poll
 `bootstrap`

Previously, users were responsible for calling `bootstrap` on an interval. This was documented but hard to discover for people new to the library. To maintain healthy routing tables, it is advised to regularly call `bootstrap`. By default, we will now do this automatically every 5 minutes and once we add a peer to our routing table, assuming we didn't bootstrap yet. This is especially useful as part of nodes starting up and connecting to bootstrap nodes.

Closes: #4730.

Pull-Request: #4838.

Co-authored-by: stormshield-frb <francois.ribeau.external@stormshield.eu>
---
 Cargo.lock                          |   2 +-
 Cargo.toml                          |   2 +-
 misc/server/CHANGELOG.md            |   8 +
 misc/server/Cargo.toml              |   2 +-
 misc/server/src/main.rs             |  16 --
 protocols/kad/CHANGELOG.md          |   2 +
 protocols/kad/src/behaviour.rs      |  59 +++++
 protocols/kad/src/behaviour/test.rs |  18 +-
 protocols/kad/src/bootstrap.rs      | 346 ++++++++++++++++++++++++++++
 protocols/kad/src/lib.rs            |   1 +
 10 files changed, 436 insertions(+), 20 deletions(-)
 create mode 100644 protocols/kad/src/bootstrap.rs

diff --git a/Cargo.lock b/Cargo.lock
index f662e0c9fbf..6538b174a54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3182,7 +3182,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-server"
-version = "0.12.6"
+version = "0.12.7"
 dependencies = [
  "base64 0.21.7",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 556919dcae6..8982a65537e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,7 +99,7 @@ libp2p-quic = { version = "0.10.2", path = "transports/quic" }
 libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
-libp2p-server = { version = "0.12.6", path = "misc/server" }
+libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.3", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
index 484964e27e9..254ab1d92be 100644
--- a/misc/server/CHANGELOG.md
+++ b/misc/server/CHANGELOG.md
@@ -1,6 +1,14 @@
+## 0.12.7
+
+### Changed
+
+- Use periodic and automatic bootstrap of Kademlia.
+  See [PR 4838](https://github.com/libp2p/rust-libp2p/pull/4838).
+
 ## 0.12.6
 
 ### Changed
+
 - Stop using kad default protocol.
   See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122)
 
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index af71a57561a..3f46de701e2 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-server"
-version = "0.12.6"
+version = "0.12.7"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/misc/server/src/main.rs b/misc/server/src/main.rs
index 16e6530e946..6dfa035f3b1 100644
--- a/misc/server/src/main.rs
+++ b/misc/server/src/main.rs
@@ -1,7 +1,6 @@
 use base64::Engine;
 use clap::Parser;
 use futures::stream::StreamExt;
-use futures_timer::Delay;
 use libp2p::identity;
 use libp2p::identity::PeerId;
 use libp2p::kad;
@@ -14,8 +13,6 @@ use prometheus_client::registry::Registry;
 use std::error::Error;
 use std::path::PathBuf;
 use std::str::FromStr;
-use std::task::Poll;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 use zeroize::Zeroizing;
 
@@ -23,8 +20,6 @@ mod behaviour;
 mod config;
 mod http_service;
 
-const BOOTSTRAP_INTERVAL: Duration = Duration::from_secs(5 * 60);
-
 #[derive(Debug, Parser)]
 #[clap(name = "libp2p server", about = "A rust-libp2p server binary.")]
 struct Opts {
@@ -127,18 +122,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         }
     });
 
-    let mut bootstrap_timer = Delay::new(BOOTSTRAP_INTERVAL);
-
     loop {
-        if let Poll::Ready(()) = futures::poll!(&mut bootstrap_timer) {
-            bootstrap_timer.reset(BOOTSTRAP_INTERVAL);
-            let _ = swarm
-                .behaviour_mut()
-                .kademlia
-                .as_mut()
-                .map(|k| k.bootstrap());
-        }
-
         let event = swarm.next().await.expect("Swarm not to terminate.");
         metrics.record(&event);
         match event {
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index f7baee2d288..0e781c18916 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 0.45.4
 
+- Add periodic and automatic bootstrap.
+  See [PR 4838](https://github.com/libp2p/rust-libp2p/pull/4838).
 - Make it mandatory to provide protocol names when creating a `kad::Config`.
   Deprecate `kad::Config::default()`, replaced by `kad::Config::new(StreamProtocol)`.
   See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122).
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index b237fe11dda..31568b0f9a8 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -23,6 +23,7 @@
 mod test;
 
 use crate::addresses::Addresses;
+use crate::bootstrap;
 use crate::handler::{Handler, HandlerEvent, HandlerIn, RequestId};
 use crate::kbucket::{self, Distance, KBucketsTable, NodeStatus};
 use crate::protocol::{ConnectionType, KadPeer, ProtocolConfig};
@@ -116,6 +117,9 @@ pub struct Behaviour<TStore> {
 
     /// The record storage.
     store: TStore,
+
+    /// Tracks the status of the current bootstrap.
+    bootstrap_status: bootstrap::Status,
 }
 
 /// The configurable strategies for the insertion of peers
@@ -181,6 +185,8 @@ pub struct Config {
     provider_publication_interval: Option<Duration>,
     kbucket_inserts: BucketInserts,
     caching: Caching,
+    periodic_bootstrap_interval: Option<Duration>,
+    automatic_bootstrap_throttle: Option<Duration>,
 }
 
 impl Default for Config {
@@ -222,6 +228,8 @@ impl Config {
             provider_record_ttl: Some(Duration::from_secs(24 * 60 * 60)),
             kbucket_inserts: BucketInserts::OnConnected,
             caching: Caching::Enabled { max_peers: 1 },
+            periodic_bootstrap_interval: Some(Duration::from_secs(5 * 60)),
+            automatic_bootstrap_throttle: Some(bootstrap::DEFAULT_AUTOMATIC_THROTTLE),
         }
     }
 
@@ -408,6 +416,34 @@ impl Config {
         self.caching = c;
         self
     }
+
+    /// Sets the interval on which [`Behaviour::bootstrap`] is called periodically.
+    ///
+    /// * Default to `5` minutes.
+    /// * Set to `None` to disable periodic bootstrap.
+    pub fn set_periodic_bootstrap_interval(&mut self, interval: Option<Duration>) -> &mut Self {
+        self.periodic_bootstrap_interval = interval;
+        self
+    }
+
+    /// Sets the time to wait before calling [`Behaviour::bootstrap`] after a new peer is inserted in the routing table.
+    /// This prevent cascading bootstrap requests when multiple peers are inserted into the routing table "at the same time".
+    /// This also allows to wait a little bit for other potential peers to be inserted into the routing table before
+    /// triggering a bootstrap, giving more context to the future bootstrap request.  
+    ///
+    /// * Default to `500` ms.
+    /// * Set to `Some(Duration::ZERO)` to never wait before triggering a bootstrap request when a new peer
+    ///     is inserted in the routing table.
+    /// * Set to `None` to disable automatic bootstrap (no bootstrap request will be triggered when a new
+    ///     peer is inserted in the routing table).
+    #[cfg(test)]
+    pub(crate) fn set_automatic_bootstrap_throttle(
+        &mut self,
+        duration: Option<Duration>,
+    ) -> &mut Self {
+        self.automatic_bootstrap_throttle = duration;
+        self
+    }
 }
 
 impl<TStore> Behaviour<TStore>
@@ -465,6 +501,10 @@ where
             mode: Mode::Client,
             auto_mode: true,
             no_events_waker: None,
+            bootstrap_status: bootstrap::Status::new(
+                config.periodic_bootstrap_interval,
+                config.automatic_bootstrap_throttle,
+            ),
         }
     }
 
@@ -566,6 +606,7 @@ where
                 };
                 match entry.insert(addresses.clone(), status) {
                     kbucket::InsertResult::Inserted => {
+                        self.bootstrap_status.on_new_peer_in_routing_table();
                         self.queued_events.push_back(ToSwarm::GenerateEvent(
                             Event::RoutingUpdated {
                                 peer: *peer,
@@ -884,6 +925,13 @@ where
     ///
     /// > **Note**: Bootstrapping requires at least one node of the DHT to be known.
     /// > See [`Behaviour::add_address`].
+    ///
+    /// > **Note**: Bootstrap does not require to be called manually. It is periodically
+    /// invoked at regular intervals based on the configured `periodic_bootstrap_interval` (see
+    /// [`Config::set_periodic_bootstrap_interval`] for details) and it is also automatically invoked
+    /// when a new peer is inserted in the routing table.
+    /// This parameter is used to call [`Behaviour::bootstrap`] periodically and automatically
+    /// to ensure a healthy routing table.
     pub fn bootstrap(&mut self) -> Result<QueryId, NoKnownPeers> {
         let local_key = self.kbuckets.local_key().clone();
         let info = QueryInfo::Bootstrap {
@@ -895,6 +943,7 @@ where
         if peers.is_empty() {
             Err(NoKnownPeers())
         } else {
+            self.bootstrap_status.on_started();
             let inner = QueryInner::new(info);
             Ok(self.queries.add_iter_closest(local_key, peers, inner))
         }
@@ -1291,6 +1340,7 @@ where
                         let addresses = Addresses::new(a);
                         match entry.insert(addresses.clone(), new_status) {
                             kbucket::InsertResult::Inserted => {
+                                self.bootstrap_status.on_new_peer_in_routing_table();
                                 let event = Event::RoutingUpdated {
                                     peer,
                                     is_new_peer: true,
@@ -1406,6 +1456,7 @@ where
                         .continue_iter_closest(query_id, target.clone(), peers, inner);
                 } else {
                     step.last = true;
+                    self.bootstrap_status.on_finish();
                 };
 
                 Some(Event::OutboundQueryProgressed {
@@ -1608,6 +1659,7 @@ where
                         .continue_iter_closest(query_id, target.clone(), peers, inner);
                 } else {
                     step.last = true;
+                    self.bootstrap_status.on_finish();
                 }
 
                 Some(Event::OutboundQueryProgressed {
@@ -2480,6 +2532,13 @@ where
             self.put_record_job = Some(job);
         }
 
+        // Poll bootstrap periodically and automatically.
+        if let Poll::Ready(()) = self.bootstrap_status.poll_next_bootstrap(cx) {
+            if let Err(e) = self.bootstrap() {
+                tracing::warn!("Failed to trigger bootstrap: {e}");
+            }
+        }
+
         loop {
             // Drain queued events first.
             if let Some(event) = self.queued_events.pop_front() {
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 20378bb6a3f..b879084c54f 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -174,6 +174,9 @@ fn bootstrap() {
         let num_group = rng.gen_range(1..(num_total % K_VALUE.get()) + 2);
 
         let mut cfg = Config::new(PROTOCOL_NAME);
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        cfg.set_periodic_bootstrap_interval(None);
+        cfg.set_automatic_bootstrap_throttle(None);
         if rng.gen() {
             cfg.disjoint_query_paths(true);
         }
@@ -252,7 +255,11 @@ fn query_iter() {
 
     fn run(rng: &mut impl Rng) {
         let num_total = rng.gen_range(2..20);
-        let mut swarms = build_connected_nodes(num_total, 1)
+        let mut config = Config::new(PROTOCOL_NAME);
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        config.set_periodic_bootstrap_interval(None);
+        config.set_automatic_bootstrap_throttle(None);
+        let mut swarms = build_connected_nodes_with_config(num_total, 1, config)
             .into_iter()
             .map(|(_a, s)| s)
             .collect::<Vec<_>>();
@@ -500,6 +507,9 @@ fn put_record() {
 
         let mut config = Config::new(PROTOCOL_NAME);
         config.set_replication_factor(replication_factor);
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        config.set_periodic_bootstrap_interval(None);
+        config.set_automatic_bootstrap_throttle(None);
         if rng.gen() {
             config.disjoint_query_paths(true);
         }
@@ -869,6 +879,9 @@ fn add_provider() {
 
         let mut config = Config::new(PROTOCOL_NAME);
         config.set_replication_factor(replication_factor);
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        config.set_periodic_bootstrap_interval(None);
+        config.set_automatic_bootstrap_throttle(None);
         if rng.gen() {
             config.disjoint_query_paths(true);
         }
@@ -1094,6 +1107,9 @@ fn disjoint_query_does_not_finish_before_all_paths_did() {
     config.disjoint_query_paths(true);
     // I.e. setting the amount disjoint paths to be explored to 2.
     config.set_parallelism(NonZeroUsize::new(2).unwrap());
+    // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+    config.set_periodic_bootstrap_interval(None);
+    config.set_automatic_bootstrap_throttle(None);
 
     let mut alice = build_node_with_config(config);
     let mut trudy = build_node(); // Trudy the intrudor, an adversary.
diff --git a/protocols/kad/src/bootstrap.rs b/protocols/kad/src/bootstrap.rs
new file mode 100644
index 00000000000..58fa662d414
--- /dev/null
+++ b/protocols/kad/src/bootstrap.rs
@@ -0,0 +1,346 @@
+use futures::FutureExt;
+use std::task::{Context, Poll, Waker};
+use std::time::Duration;
+
+use futures_timer::Delay;
+
+/// Default value chosen at `<https://github.com/libp2p/rust-libp2p/pull/4838#discussion_r1490184754>`.
+pub(crate) const DEFAULT_AUTOMATIC_THROTTLE: Duration = Duration::from_millis(500);
+
+#[derive(Debug)]
+pub(crate) struct Status {
+    /// If the user did not disable periodic bootstrap (by providing `None` for `periodic_interval`)
+    /// this is the periodic interval and the delay of the current period. When `Delay` finishes,
+    /// a bootstrap will be triggered and the `Delay` will be reset.
+    interval_and_delay: Option<(Duration, Delay)>,
+
+    /// Configured duration to wait before triggering a bootstrap when a new peer
+    /// is inserted in the routing table. `None` if automatic bootstrap is disabled.
+    automatic_throttle: Option<Duration>,
+    /// Timer that will be set (if automatic bootstrap is not disabled) when a new peer is inserted
+    /// in the routing table. When it finishes, it will trigger a bootstrap and will be set to `None`
+    /// again. If an other new peer is inserted in the routing table before this timer finishes,
+    /// the timer is reset.
+    throttle_timer: Option<ThrottleTimer>,
+
+    /// Number of bootstrap requests currently in progress. We ensure neither periodic bootstrap
+    /// or automatic bootstrap trigger new requests when there is still some running.
+    current_bootstrap_requests: usize,
+    /// Waker to wake up the `poll` method if progress is ready to be made.
+    waker: Option<Waker>,
+}
+
+impl Status {
+    pub(crate) fn new(
+        periodic_interval: Option<Duration>,
+        automatic_throttle: Option<Duration>,
+    ) -> Self {
+        Self {
+            interval_and_delay: periodic_interval.map(|interval| (interval, Delay::new(interval))),
+            waker: None,
+            automatic_throttle,
+            throttle_timer: None,
+            current_bootstrap_requests: 0,
+        }
+    }
+
+    pub(crate) fn on_new_peer_in_routing_table(&mut self) {
+        // Registering `self.throttle_timer` means scheduling a bootstrap.
+        // A bootstrap will be triggered when `self.throttle_timer` finishes.
+        // A `throttle_timer` is useful to not trigger a batch of bootstraps when a
+        // batch of peers is inserted into the routing table.
+        if let Some(throttle_duration) = self.automatic_throttle {
+            self.throttle_timer = Some(throttle_duration.into());
+        } else {
+            // The user disabled bootstrapping on new peer in the routing table.
+        }
+
+        // Waking up the waker that could have been registered.
+        if let Some(waker) = self.waker.take() {
+            waker.wake()
+        }
+    }
+
+    pub(crate) fn on_started(&mut self) {
+        // No periodic or automatic bootstrap will be triggered as long as
+        // `self.current_bootstrap_requests > 0` but the user could still manually
+        // trigger a bootstrap.
+        self.current_bootstrap_requests += 1;
+
+        // Canceling the `throttle_timer` if any since a bootstrap request is being triggered right now.
+        self.throttle_timer = None;
+
+        // Resetting the `delay` if any since a bootstrap request is being triggered right now.
+        if let Some((interval, delay)) = self.interval_and_delay.as_mut() {
+            delay.reset(*interval);
+        }
+    }
+
+    pub(crate) fn on_finish(&mut self) {
+        if let Some(value) = self.current_bootstrap_requests.checked_sub(1) {
+            self.current_bootstrap_requests = value;
+        } else {
+            debug_assert!(
+                false,
+                "Could not decrement current_bootstrap_requests because it's already 0"
+            );
+        }
+
+        // Waking up the waker that could have been registered.
+        if let Some(waker) = self.waker.take() {
+            waker.wake();
+        }
+    }
+
+    pub(crate) fn poll_next_bootstrap(&mut self, cx: &mut Context<'_>) -> Poll<()> {
+        if self.current_bootstrap_requests > 0 {
+            // Some bootstrap request(s) is(are) currently running.
+            self.waker = Some(cx.waker().clone());
+            return Poll::Pending;
+        }
+
+        if let Some(throttle_delay) = &mut self.throttle_timer {
+            // A `throttle_timer` has been registered. It means one or more peers have been
+            // inserted into the routing table and that a bootstrap request should be triggered.
+            // However, to not risk cascading bootstrap requests, we wait a little time to ensure
+            // the user will not add more peers in the routing table in the next "throttle_timer" remaining.
+            if throttle_delay.poll_unpin(cx).is_ready() {
+                // The `throttle_timer` is finished, triggering bootstrap right now.
+                // The call to `on_started` will reset `throttle_delay`.
+                return Poll::Ready(());
+            }
+
+            // The `throttle_timer` is not finished but the periodic interval for triggering bootstrap might be reached.
+        } else {
+            // No new peer has recently been inserted into the routing table or automatic bootstrap is disabled.
+        }
+
+        // Checking if the user has enabled the periodic bootstrap feature.
+        if let Some((_, delay)) = self.interval_and_delay.as_mut() {
+            if let Poll::Ready(()) = delay.poll_unpin(cx) {
+                // It is time to run the periodic bootstrap.
+                // The call to `on_started` will reset `delay`.
+                return Poll::Ready(());
+            }
+        } else {
+            // The user disabled periodic bootstrap.
+        }
+
+        // Registering the `waker` so that we can wake up when calling `on_new_peer_in_routing_table`.
+        self.waker = Some(cx.waker().clone());
+        Poll::Pending
+    }
+
+    #[cfg(test)]
+    async fn next(&mut self) {
+        std::future::poll_fn(|cx| self.poll_next_bootstrap(cx)).await
+    }
+}
+
+/// Simple enum to indicate when the throttle timer resolves.
+/// A dedicated `Immediate` variant is necessary because creating
+/// `Delay::new(Duration::ZERO)` does not always actually resolve
+/// immediately.
+#[derive(Debug)]
+enum ThrottleTimer {
+    Immediate,
+    Delay(Delay),
+}
+
+impl From<Duration> for ThrottleTimer {
+    fn from(value: Duration) -> Self {
+        if value.is_zero() {
+            Self::Immediate
+        } else {
+            Self::Delay(Delay::new(value))
+        }
+    }
+}
+
+impl futures::Future for ThrottleTimer {
+    type Output = ();
+
+    fn poll(self: std::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        match self.get_mut() {
+            Self::Immediate => Poll::Ready(()),
+            Self::Delay(delay) => delay.poll_unpin(cx),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use instant::Instant;
+
+    const MS_5: Duration = Duration::from_millis(5);
+    const MS_100: Duration = Duration::from_millis(100);
+
+    fn do_bootstrap(status: &mut Status) {
+        status.on_started();
+        status.on_finish();
+    }
+
+    async fn await_and_do_bootstrap(status: &mut Status) {
+        status.next().await;
+        do_bootstrap(status);
+    }
+
+    #[async_std::test]
+    async fn immediate_automatic_bootstrap_is_triggered_immediately() {
+        let mut status = Status::new(Some(Duration::from_secs(1)), Some(Duration::ZERO));
+
+        await_and_do_bootstrap(&mut status).await; // Wait for periodic bootstrap
+
+        assert!(
+            status.next().now_or_never().is_none(),
+            "bootstrap to not be triggered immediately because periodic bootstrap is in ~1s"
+        );
+
+        status.on_new_peer_in_routing_table(); // Connected to a new peer though!
+        assert!(
+            status.next().now_or_never().is_some(),
+            "bootstrap to be triggered immediately because we connected to a new peer"
+        );
+
+        assert!(
+            async_std::future::timeout(Duration::from_millis(500), status.next())
+                .await
+                .is_ok(),
+            "bootstrap to be triggered in less then the configured delay because we connected to a new peer"
+        );
+    }
+
+    #[async_std::test]
+    async fn delayed_automatic_bootstrap_is_triggered_before_periodic_bootstrap() {
+        let mut status = Status::new(Some(Duration::from_secs(1)), Some(MS_5));
+
+        await_and_do_bootstrap(&mut status).await; // Wait for periodic bootstrap
+
+        assert!(
+            status.next().now_or_never().is_none(),
+            "bootstrap to not be triggered immediately because periodic bootstrap is in ~1s"
+        );
+
+        status.on_new_peer_in_routing_table(); // Connected to a new peer though!
+        assert!(
+            status.next().now_or_never().is_none(),
+            "bootstrap to not be triggered immediately because throttle is 5ms"
+        );
+
+        assert!(
+            async_std::future::timeout(MS_5 * 2, status.next())
+                .await
+                .is_ok(),
+            "bootstrap to be triggered in less then the configured periodic delay because we connected to a new peer"
+        );
+    }
+
+    #[test]
+    fn given_no_periodic_bootstrap_and_immediate_automatic_bootstrap_try_on_next_connection() {
+        let mut status = Status::new(None, Some(Duration::ZERO));
+
+        // User manually triggered a bootstrap
+        do_bootstrap(&mut status);
+
+        status.on_new_peer_in_routing_table(); // Connected to a new peer though!
+
+        assert!(
+            status.next().now_or_never().is_some(),
+            "bootstrap to be triggered immediately because we connected to a new peer"
+        )
+    }
+
+    #[async_std::test]
+    async fn given_periodic_bootstrap_when_routing_table_updated_then_wont_bootstrap_until_next_interval(
+    ) {
+        let mut status = Status::new(Some(MS_100), Some(MS_5));
+
+        status.on_new_peer_in_routing_table();
+
+        let start = Instant::now();
+        await_and_do_bootstrap(&mut status).await;
+        let elapsed = Instant::now().duration_since(start);
+
+        assert!(elapsed < MS_5 * 2);
+
+        let start = Instant::now();
+        await_and_do_bootstrap(&mut status).await;
+        let elapsed = Instant::now().duration_since(start);
+
+        assert!(elapsed > MS_100);
+    }
+
+    #[async_std::test]
+    async fn given_no_periodic_bootstrap_and_automatic_bootstrap_when_new_entry_then_will_bootstrap(
+    ) {
+        let mut status = Status::new(None, Some(Duration::ZERO));
+
+        status.on_new_peer_in_routing_table();
+
+        status.next().await;
+    }
+
+    #[async_std::test]
+    async fn given_periodic_bootstrap_and_no_automatic_bootstrap_triggers_periodically() {
+        let mut status = Status::new(Some(MS_100), None);
+
+        let start = Instant::now();
+        for i in 1..6 {
+            await_and_do_bootstrap(&mut status).await;
+
+            let elapsed = Instant::now().duration_since(start);
+
+            assert!(elapsed > (i * MS_100 - Duration::from_millis(10))); // Subtract 10ms to avoid flakes.
+        }
+    }
+
+    #[async_std::test]
+    async fn given_no_periodic_bootstrap_and_automatic_bootstrap_reset_throttle_when_multiple_peers(
+    ) {
+        let mut status = Status::new(None, Some(MS_100));
+
+        status.on_new_peer_in_routing_table();
+        for _ in 0..10 {
+            Delay::new(MS_100 / 2).await;
+            status.on_new_peer_in_routing_table(); // should reset throttle_timer
+        }
+        assert!(
+            status.next().now_or_never().is_none(),
+            "bootstrap to not be triggered immediately because throttle has been reset"
+        );
+
+        Delay::new(MS_100 - MS_5).await;
+
+        assert!(
+            async_std::future::timeout(MS_5*2, status.next())
+                .await
+                .is_ok(),
+            "bootstrap to be triggered in the configured throttle delay because we connected to a new peer"
+        );
+    }
+
+    #[async_std::test]
+    async fn given_periodic_bootstrap_and_no_automatic_bootstrap_manually_triggering_prevent_periodic(
+    ) {
+        let mut status = Status::new(Some(MS_100), None);
+
+        status.on_started(); // first manually triggering
+        status.on_started(); // second manually triggering
+        status.on_finish(); // one finishes
+
+        assert!(
+            async_std::future::timeout(10 * MS_100, status.next())
+                .await
+                .is_err(),
+            "periodic bootstrap to never be triggered because one is still being run"
+        );
+
+        status.on_finish(); // all manual bootstrap finished
+
+        assert!(
+            status.next().now_or_never().is_some(),
+            "bootstrap to be triggered immediately because no more bootstrap requests are running"
+        )
+    }
+}
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index 519b67f9d7a..bc01b9fd3ce 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -37,6 +37,7 @@
 
 mod addresses;
 mod behaviour;
+mod bootstrap;
 mod handler;
 mod jobs;
 mod kbucket;

From 2961ee465cdb13a07749c41b2150db60d099f3d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 15:20:11 +0000
Subject: [PATCH 130/455] deps: bump syn from 2.0.51 to 2.0.52

Pull-Request: #5200.
---
 Cargo.lock              | 48 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6538b174a54..3a6e137863d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,7 +425,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -930,7 +930,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1196,7 +1196,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1313,7 +1313,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1418,7 +1418,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1654,7 +1654,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3257,7 +3257,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4021,7 +4021,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4247,7 +4247,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4444,7 +4444,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4986,7 +4986,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.51",
+ "syn 2.0.52",
  "walkdir",
 ]
 
@@ -5247,7 +5247,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5280,7 +5280,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5569,7 +5569,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5619,9 +5619,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.51"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5758,7 +5758,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5860,7 +5860,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -6014,7 +6014,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -6365,7 +6365,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
  "wasm-bindgen-shared",
 ]
 
@@ -6399,7 +6399,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6432,7 +6432,7 @@ checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -6985,7 +6985,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -7005,5 +7005,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.51",
+ "syn 2.0.52",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index c355acaea14..b2906e9de96 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.51", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.52", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From 23ee2805bb8bb7fb984d51b58f364e4de416597c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:06:29 +0000
Subject: [PATCH 131/455] deps: bump lru from 0.12.1 to 0.12.2

Pull-Request: #5133.
---
 Cargo.lock                    | 4 ++--
 protocols/dcutr/Cargo.toml    | 2 +-
 protocols/identify/Cargo.toml | 2 +-
 swarm/Cargo.toml              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a6e137863d..14de39265ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3577,9 +3577,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
+checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"
 dependencies = [
  "hashbrown 0.14.3",
 ]
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index aed7e2bf762..8444dc70756 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -24,7 +24,7 @@ quick-protobuf-codec = { workspace = true }
 thiserror = "1.0"
 tracing = "0.1.37"
 void = "1"
-lru = "0.12.1"
+lru = "0.12.2"
 futures-bounded = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index a8da8d0e762..39c2aa469eb 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -18,7 +18,7 @@ futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
-lru = "0.12.1"
+lru = "0.12.2"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.12.0"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 4e0d4da0e87..6aa4221247b 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -20,7 +20,7 @@ instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }
-lru = "0.12.1"
+lru = "0.12.2"
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"

From b2e7c3de60a6b5b1dd725d2413380b35638cdd7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:22:30 +0000
Subject: [PATCH 132/455] deps: bump smallvec from 1.12.0 to 1.13.1

Pull-Request: #5111.
---
 Cargo.lock                            | 4 ++--
 core/Cargo.toml                       | 2 +-
 misc/multistream-select/Cargo.toml    | 2 +-
 muxers/mplex/Cargo.toml               | 2 +-
 protocols/floodsub/Cargo.toml         | 2 +-
 protocols/gossipsub/Cargo.toml        | 2 +-
 protocols/identify/Cargo.toml         | 2 +-
 protocols/kad/Cargo.toml              | 2 +-
 protocols/mdns/Cargo.toml             | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 swarm/Cargo.toml                      | 2 +-
 transports/dns/Cargo.toml             | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14de39265ae..ea7f78f85ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5411,9 +5411,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "smol"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 619cd357744..054627bed38 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -27,7 +27,7 @@ quick-protobuf = "0.8"
 rand = "0.8"
 rw-stream-sink = { workspace = true }
 serde = { version = "1", optional = true, features = ["derive"] }
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 thiserror = "1.0"
 tracing = "0.1.37"
 unsigned-varint = { workspace = true }
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index b2456243252..b6287505ae4 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -15,7 +15,7 @@ bytes = "1"
 futures = "0.3"
 tracing = "0.1.37"
 pin-project = "1.1.4"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 unsigned-varint = { workspace = true }
 
 [dev-dependencies]
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 8de1d66c7d0..7cb4befa22b 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
 nohash-hasher = "0.2"
 parking_lot = "0.12"
 rand = "0.8"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 tracing = "0.1.37"
 unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }
 
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index e1bd23fe2d1..06277273a90 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 thiserror = "1.0.57"
 tracing = "0.1.37"
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 4d484a81249..f44d3f97fa0 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -34,7 +34,7 @@ rand = "0.8"
 regex = "1.10.3"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 tracing = "0.1.37"
 void = "1.0.2"
 
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 39c2aa469eb..340df99e4dc 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
 lru = "0.12.2"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 thiserror = "1.0"
 tracing = "0.1.37"
 void = "1.0"
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 3bf74808f4a..3a91955cc06 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -25,7 +25,7 @@ quick-protobuf-codec = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 rand = "0.8"
 sha2 = "0.10.8"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 uint = "0.9"
 void = "1.0"
 futures-timer = "3.0.3"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 311c479fe72..a18f20227cc 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8.3"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 socket2 = { version = "0.5.6", features = ["all"] }
 tokio = { version = "1.36", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 1f2d0bfe1a1..4b4021285a4 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
 serde_json = { version = "1.0.114", optional = true }
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 tracing = "0.1.37"
 void = "1.0.2"
 futures-timer = "3.0.3"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 6aa4221247b..efcb562dfa6 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -24,7 +24,7 @@ lru = "0.12.2"
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 tracing = "0.1.37"
 void = "1"
 wasm-bindgen-futures = { version = "0.4.41", optional = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 9650893d575..f026aac5157 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
 hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
-smallvec = "1.12.0"
+smallvec = "1.13.1"
 tracing = "0.1.37"
 
 [dev-dependencies]

From 662b78645c27f19d95fc67dd02636d2c2347a282 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:35:04 +0000
Subject: [PATCH 133/455] deps: bump log from 0.4.20 to 0.4.21

Pull-Request: #5204.
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ea7f78f85ee..69d0963f1dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3568,9 +3568,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
  "value-bag",
 ]
@@ -6276,9 +6276,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.4.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
+checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b"
 
 [[package]]
 name = "vcpkg"

From 5b9b2c306813112be38b938e59a9989e35a1c9c9 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Sun, 10 Mar 2024 21:48:37 +0100
Subject: [PATCH 134/455] chore(README/maintainers): remove mxinden

Pull-Request: #5197.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 48fa976635a..4d72626e413 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,6 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 (In alphabetical order.)
 
 - João Oliveira ([@jxs](https://github.com/jxs))
-- Max Inden ([@mxinden](https://github.com/mxinden/))
 - Thomas Eizinger ([@thomaseizinger](https://github.com/thomaseizinger))
 
 ## Notable users

From aa53600b15470bc5ec7644190eaa3f3aa2c793bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 10:54:01 +0000
Subject: [PATCH 135/455] deps: bump wasm-bindgen-futures from 0.4.41 to 0.4.42

Pull-Request: #5224.
---
 Cargo.lock                                | 28 +++++++++++------------
 examples/browser-webrtc/Cargo.toml        |  2 +-
 swarm/Cargo.toml                          |  2 +-
 transports/webrtc-websys/Cargo.toml       |  2 +-
 transports/webtransport-websys/Cargo.toml |  2 +-
 wasm-tests/webtransport-tests/Cargo.toml  |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69d0963f1dc..b38eacbd760 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2466,9 +2466,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -6346,9 +6346,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -6356,9 +6356,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
@@ -6371,9 +6371,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6383,9 +6383,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6393,9 +6393,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6406,9 +6406,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index a01ebe71e5f..900718fcee0 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -39,7 +39,7 @@ libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "was
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.41"
+wasm-bindgen-futures = "0.4.42"
 web-sys = { version = "0.3", features = ['Document', 'Element', 'HtmlElement', 'Node', 'Response', 'Window'] }
 
 [lints]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index efcb562dfa6..3fdf06aa19f 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -27,7 +27,7 @@ rand = "0.8"
 smallvec = "1.13.1"
 tracing = "0.1.37"
 void = "1"
-wasm-bindgen-futures = { version = "0.4.41", optional = true }
+wasm-bindgen-futures = { version = "0.4.42", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 728b6575f0a..3c212e195c1 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -24,7 +24,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.90" }
-wasm-bindgen-futures = { version = "0.4.41" }
+wasm-bindgen-futures = { version = "0.4.42" }
 web-sys = { version = "0.3.68", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index b9f8f36d760..f71b6db5d87 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -25,7 +25,7 @@ send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.57"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.41"
+wasm-bindgen-futures = "0.4.42"
 web-sys = { version = "0.3.68", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index c9f5170b114..b98e56440b1 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-webtransport-websys = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.41"
+wasm-bindgen-futures = "0.4.42"
 wasm-bindgen-test = "0.3.41"
 web-sys = { version = "0.3.68", features = ["Response", "Window"] }
 

From 2ae90a57297728539a6e93f5d6d659cb822f6ef6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:06:03 +0000
Subject: [PATCH 136/455] deps: bump async-io from 2.3.1 to 2.3.2

Pull-Request: #5225.
---
 Cargo.lock                | 10 +++++-----
 protocols/mdns/Cargo.toml |  2 +-
 transports/tcp/Cargo.toml |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b38eacbd760..970082cafeb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -301,9 +301,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65"
+checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
 dependencies = [
  "async-lock 3.1.0",
  "cfg-if",
@@ -2253,7 +2253,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io 2.3.1",
+ "async-io 2.3.2",
  "core-foundation",
  "fnv",
  "futures",
@@ -2853,7 +2853,7 @@ dependencies = [
 name = "libp2p-mdns"
 version = "0.45.1"
 dependencies = [
- "async-io 2.3.1",
+ "async-io 2.3.2",
  "async-std",
  "data-encoding",
  "futures",
@@ -3281,7 +3281,7 @@ dependencies = [
 name = "libp2p-tcp"
 version = "0.41.0"
 dependencies = [
- "async-io 2.3.1",
+ "async-io 2.3.2",
  "async-std",
  "futures",
  "futures-timer",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index a18f20227cc..0d03a839a6f 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
-async-io  = { version = "2.3.1", optional = true }
+async-io  = { version = "2.3.2", optional = true }
 data-encoding = "2.5.0"
 futures = "0.3.30"
 if-watch = "3.2.0"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 26528eab840..6fd4aec73fe 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-io = { version = "2.3.1", optional = true }
+async-io = { version = "2.3.2", optional = true }
 futures = "0.3.30"
 futures-timer = "3.0"
 if-watch = "3.2.0"

From 471e0291144131946bb3b1638035b2848319fa66 Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Mon, 11 Mar 2024 20:28:58 +0800
Subject: [PATCH 137/455] deps: bump h2 from 0.4.0 to 0.4.2

`h2` version `0.4.0` triggers vulnerability error in `cargo-deny` job test. Bumping it to `0.4.2`.

Pull-Request: #5227.
---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 970082cafeb..bfc291828b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1844,9 +1844,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a"
+checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
 dependencies = [
  "bytes",
  "fnv",
@@ -2138,7 +2138,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.0",
+ "h2 0.4.2",
  "http 1.0.0",
  "http-body 1.0.0",
  "httparse",

From b402b75d942b5a4c19905df639e12b1fbbeeb683 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 00:00:12 +0000
Subject: [PATCH 138/455] deps: bump mio from 0.8.9 to 0.8.11

Pull-Request: #5209.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bfc291828b0..3b15c7c2f3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3707,9 +3707,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",

From fb9f3b6f45e5ec2543926b9683fb62125e257986 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 00:12:12 +0000
Subject: [PATCH 139/455] deps: bump prometheus-client from 0.22.1 to 0.22.2

Pull-Request: #5226.
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b15c7c2f3d..8e77bae3fa5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4426,9 +4426,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.22.1"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f87c10af16e0af74010d2a123d202e8363c04db5acfa91d8747f64a8524da3a"
+checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa"
 dependencies = [
  "dtoa",
  "itoa",
diff --git a/Cargo.toml b/Cargo.toml
index 8982a65537e..b6508a3d3f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,7 +118,7 @@ libp2p-yamux = { version = "0.45.1", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
-prometheus-client = "0.22.1"
+prometheus-client = "0.22.2"
 quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }

From c4974cf046fe03285fa64d48c1ffe37d5b9de94d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 00:23:42 +0000
Subject: [PATCH 140/455] deps: bump the axum group with 1 update

Pull-Request: #5183.
---
 Cargo.lock                         | 4 ++--
 examples/browser-webrtc/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e77bae3fa5..9516a82ed2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5959,9 +5959,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
  "bitflags 2.4.1",
  "bytes",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 900718fcee0..322ae2b8348 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -30,7 +30,7 @@ rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-fo
 tokio = { version = "1.36", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
-tower-http = { version = "0.5.1", features = ["cors"] }
+tower-http = { version = "0.5.2", features = ["cors"] }
 mime_guess = "2.0.4"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

From 81c630d2683c6fa0df44bbe1f68578be121ddf64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 01:07:03 +0000
Subject: [PATCH 141/455] deps: bump reqwest from 0.11.24 to 0.11.25

Pull-Request: #5221.
---
 Cargo.lock | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9516a82ed2e..7c3c67392dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2262,7 +2262,7 @@ dependencies = [
  "log",
  "rtnetlink",
  "smol",
- "system-configuration",
+ "system-configuration 0.5.1",
  "tokio",
  "windows",
 ]
@@ -4803,9 +4803,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -4832,7 +4832,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration",
+ "system-configuration 0.6.0",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
@@ -5669,7 +5669,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
+dependencies = [
+ "bitflags 2.4.1",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
 ]
 
 [[package]]
@@ -5682,6 +5693,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.10.1"

From 848e6afc8790a2d6476355f30ab9120496b7530f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 01:18:26 +0000
Subject: [PATCH 142/455] deps: bump soketto from 0.7.1 to 0.8.0

Pull-Request: #5220.
---
 Cargo.lock                      | 27 ++++++++++-----------------
 transports/websocket/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7c3c67392dc..52913f9796e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -615,6 +615,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -5295,19 +5301,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.5"
@@ -5480,17 +5473,17 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
+checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.0",
  "bytes",
  "futures",
  "httparse",
  "log",
  "rand 0.8.5",
- "sha-1",
+ "sha1",
 ]
 
 [[package]]
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 385e292103c..473aeb2c8ff 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
 pin-project-lite = "0.2.13"
 rw-stream-sink = { workspace = true }
-soketto = "0.7.0"
+soketto = "0.8.0"
 tracing = "0.1.37"
 url = "2.5"
 webpki-roots = "0.25"

From d309573bfa08c09dbc230dfeae4b0f2c8aa732d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:58:56 +0000
Subject: [PATCH 143/455] deps: bump tj-actions/glob from 20 to 21

Pull-Request: #5193.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90635ee53e7..24a211966a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -379,7 +379,7 @@ jobs:
       - run: cargo install --version 0.10.0 pb-rs --locked
 
       - name: Glob match
-        uses: tj-actions/glob@v20
+        uses: tj-actions/glob@v21
         id: glob
         with:
           files: |

From 3644879956b6ab93b8d23553a33e8fdb838f576f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:52:37 +0000
Subject: [PATCH 144/455] chore(deps): bump google.golang.org/protobuf from
 1.30.0 to 1.33.0 in /wasm-tests/webtransport-tests/echo-server

Pull-Request: #5228.
---
 wasm-tests/webtransport-tests/echo-server/go.mod | 2 +-
 wasm-tests/webtransport-tests/echo-server/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wasm-tests/webtransport-tests/echo-server/go.mod b/wasm-tests/webtransport-tests/echo-server/go.mod
index 9dde12fdcfe..12804780d8b 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.mod
+++ b/wasm-tests/webtransport-tests/echo-server/go.mod
@@ -59,6 +59,6 @@ require (
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect
 )
diff --git a/wasm-tests/webtransport-tests/echo-server/go.sum b/wasm-tests/webtransport-tests/echo-server/go.sum
index 95c1618a0cb..61dfda6a67d 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.sum
+++ b/wasm-tests/webtransport-tests/echo-server/go.sum
@@ -321,8 +321,8 @@ google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

From 2f5ce0a97decec2b895157b2457e69d24687ea8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 21 Mar 2024 10:27:34 +0000
Subject: [PATCH 145/455] deps: bump opentelemetry dependency (#5181)

## Description

Updates `opentelemetry-otlp` from 0.13.0 to 0.14.0
Changes `opentelemetry` to `opentelemetry_sdk` dependency and updates to
0.21.0
Changes `opentelemetry_api` to `opentelemetry` and updates to 0.21.0

see https://github.com/open-telemetry/opentelemetry-rust/issues/1186 for
more info

superseeds https://github.com/libp2p/rust-libp2p/pull/4858
---
 Cargo.lock                   | 92 ++++++++++++++++--------------------
 examples/metrics/Cargo.toml  |  8 ++--
 examples/metrics/src/main.rs | 14 ++----
 3 files changed, 50 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 52913f9796e..c872cdb48ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3672,7 +3672,7 @@ dependencies = [
  "libp2p",
  "opentelemetry",
  "opentelemetry-otlp",
- "opentelemetry_api",
+ "opentelemetry_sdk",
  "prometheus-client",
  "tokio",
  "tracing",
@@ -4050,26 +4050,32 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54"
+checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a"
 dependencies = [
- "opentelemetry_api",
- "opentelemetry_sdk",
+ "futures-core",
+ "futures-sink",
+ "indexmap 2.2.1",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite",
+ "thiserror",
+ "urlencoding",
 ]
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
+checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930"
 dependencies = [
  "async-trait",
  "futures-core",
  "http 0.2.9",
+ "opentelemetry",
  "opentelemetry-proto",
  "opentelemetry-semantic-conventions",
- "opentelemetry_api",
  "opentelemetry_sdk",
  "prost",
  "thiserror",
@@ -4079,11 +4085,11 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb"
+checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1"
 dependencies = [
- "opentelemetry_api",
+ "opentelemetry",
  "opentelemetry_sdk",
  "prost",
  "tonic",
@@ -4091,47 +4097,30 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-semantic-conventions"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269"
+checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84"
 dependencies = [
  "opentelemetry",
 ]
 
-[[package]]
-name = "opentelemetry_api"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
-dependencies = [
- "futures-channel",
- "futures-util",
- "indexmap 1.9.3",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "thiserror",
- "urlencoding",
-]
-
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.20.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
+checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4"
 dependencies = [
  "async-trait",
  "crossbeam-channel",
  "futures-channel",
  "futures-executor",
  "futures-util",
+ "glob",
  "once_cell",
- "opentelemetry_api",
+ "opentelemetry",
  "ordered-float",
  "percent-encoding",
  "rand 0.8.5",
- "regex",
- "serde_json",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -4139,9 +4128,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "3.9.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
 dependencies = [
  "num-traits",
 ]
@@ -6041,17 +6030,6 @@ dependencies = [
  "valuable",
 ]
 
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -6065,18 +6043,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8"
+checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596"
 dependencies = [
+ "js-sys",
  "once_cell",
  "opentelemetry",
  "opentelemetry_sdk",
  "smallvec",
  "tracing",
  "tracing-core",
- "tracing-log 0.1.3",
+ "tracing-log",
  "tracing-subscriber",
+ "web-time",
 ]
 
 [[package]]
@@ -6094,7 +6074,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log 0.2.0",
+ "tracing-log",
 ]
 
 [[package]]
@@ -6470,6 +6450,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.25.2"
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 39412d29aea..499e1fb7f4b 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -12,13 +12,13 @@ release = false
 futures = "0.3.30"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
-opentelemetry = { version = "0.20.0", features = ["rt-tokio", "metrics"] }
-opentelemetry-otlp = { version = "0.13.0", features = ["metrics"]}
-opentelemetry_api = "0.20.0"
+opentelemetry = { version = "0.21.0", features = ["metrics"] }
+opentelemetry-otlp = { version = "0.14.0", features = ["metrics"] }
+opentelemetry_sdk = { version = "0.21.2", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1.37"
-tracing-opentelemetry = "0.21.0"
+tracing-opentelemetry = "0.22.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/metrics/src/main.rs b/examples/metrics/src/main.rs
index 3ab6815cb32..6b7ad9cedfb 100644
--- a/examples/metrics/src/main.rs
+++ b/examples/metrics/src/main.rs
@@ -25,8 +25,7 @@ use libp2p::core::Multiaddr;
 use libp2p::metrics::{Metrics, Recorder};
 use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
 use libp2p::{identify, identity, noise, ping, tcp, yamux};
-use opentelemetry::sdk;
-use opentelemetry_api::KeyValue;
+use opentelemetry::KeyValue;
 use prometheus_client::registry::Registry;
 use std::error::Error;
 use std::time::Duration;
@@ -87,13 +86,10 @@ fn setup_tracing() -> Result<(), Box<dyn Error>> {
     let tracer = opentelemetry_otlp::new_pipeline()
         .tracing()
         .with_exporter(opentelemetry_otlp::new_exporter().tonic())
-        .with_trace_config(
-            sdk::trace::Config::default().with_resource(sdk::Resource::new(vec![KeyValue::new(
-                "service.name",
-                "libp2p",
-            )])),
-        )
-        .install_batch(opentelemetry::runtime::Tokio)?;
+        .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
+            opentelemetry_sdk::Resource::new(vec![KeyValue::new("service.name", "libp2p")]),
+        ))
+        .install_batch(opentelemetry_sdk::runtime::Tokio)?;
 
     tracing_subscriber::registry()
         .with(tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()))

From 46a043e8cba256c6c3f0e77cec4aa751f546df81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 10:40:53 +0000
Subject: [PATCH 146/455] deps: bump obi1kenobi/cargo-semver-checks-action from
 2.3 to 2.4

Pull-Request: #5249.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24a211966a8..a489fec1f1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -319,7 +319,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.27.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
-      - uses: obi1kenobi/cargo-semver-checks-action@48f4ef7da6d907d69d18249e0ba79aa98c61b9db # v2
+      - uses: obi1kenobi/cargo-semver-checks-action@c7306483f698c511eaf7416d1bf2e1958c90140f # v2
 
   rustfmt:
     runs-on: ubuntu-latest

From 4a6d59c51b9a36540b2ddb29303088622def01a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:13:38 +0000
Subject: [PATCH 147/455] deps: bump wasm-bindgen-test from 0.3.41 to 0.3.42

Pull-Request: #5241.
---
 Cargo.lock                               | 8 ++++----
 wasm-tests/webtransport-tests/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c872cdb48ca..a6ba0896894 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6406,9 +6406,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.41"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143ddeb4f833e2ed0d252e618986e18bfc7b0e52f2d28d77d05b2f045dd8eb61"
+checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -6420,9 +6420,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.41"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
+checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index b98e56440b1..918df42bef7 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -19,7 +19,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"
-wasm-bindgen-test = "0.3.41"
+wasm-bindgen-test = "0.3.42"
 web-sys = { version = "0.3.68", features = ["Response", "Window"] }
 
 [lints]

From cdafe0e63a9e4fd9cd58d35f28f716c9f8edef3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:25:25 +0000
Subject: [PATCH 148/455] deps: bump heck from 0.4.1 to 0.5.0

Pull-Request: #5240.
---
 Cargo.lock              | 14 ++++++++++----
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6ba0896894..d02ad913326 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -933,7 +933,7 @@ version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 2.0.52",
@@ -1421,7 +1421,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 2.0.52",
@@ -1895,6 +1895,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.2"
@@ -3260,7 +3266,7 @@ dependencies = [
 name = "libp2p-swarm-derive"
 version = "0.34.3"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.52",
@@ -5547,7 +5553,7 @@ version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index b2906e9de96..d2d8796acb3 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 proc-macro = true
 
 [dependencies]
-heck = "0.4"
+heck = "0.5"
 quote = "1.0"
 syn = { version = "2.0.52", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"

From a579e691c46a8efd2e38ebafca1c59a9b58fc56c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:14:00 +0000
Subject: [PATCH 149/455] deps: bump reqwest from 0.11.25 to 0.11.26

Pull-Request: #5239.
---
 Cargo.lock | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d02ad913326..4554147f4e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2274,7 +2274,7 @@ dependencies = [
  "log",
  "rtnetlink",
  "smol",
- "system-configuration 0.5.1",
+ "system-configuration",
  "tokio",
  "windows",
 ]
@@ -4804,9 +4804,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.25"
+version = "0.11.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946"
+checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -4833,7 +4833,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration 0.6.0",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
@@ -5657,18 +5657,7 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys 0.5.0",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
-dependencies = [
- "bitflags 2.4.1",
- "core-foundation",
- "system-configuration-sys 0.6.0",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -5681,16 +5670,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.10.1"

From 404a62281238ed53069e73072ab5cb535b4fdb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 25 Mar 2024 00:33:12 +0000
Subject: [PATCH 150/455] chore: address clippy lints and bump ci clippy stable

superseeds #5248, sorry @drHuangMHT only saw yours now, can you review this one?
https://github.com/libp2p/rust-libp2p/actions/runs/8377129630/job/22938498078?pr=5253#step:6:843 is a bug, see [here](https://github.com/rust-lang/rust-clippy/issues/12377)
Thanks!

Pull-Request: #5253.
---
 .github/workflows/ci.yml                      |  4 +-
 core/src/peer_record.rs                       |  1 -
 core/src/translation.rs                       |  2 +-
 core/src/transport/memory.rs                  |  8 +--
 core/src/upgrade/apply.rs                     |  2 +-
 examples/autonat/src/bin/autonat_client.rs    | 19 -------
 examples/autonat/src/bin/autonat_server.rs    | 19 -------
 identity/src/ed25519.rs                       |  1 -
 identity/src/keypair.rs                       | 14 +++--
 identity/src/lib.rs                           |  3 +-
 identity/src/peer_id.rs                       |  2 +-
 misc/metrics/src/identify.rs                  |  7 +--
 .../multistream-select/src/listener_select.rs |  1 -
 misc/multistream-select/src/protocol.rs       |  1 -
 misc/quick-protobuf-codec/src/lib.rs          |  1 -
 misc/rw-stream-sink/src/lib.rs                |  2 +-
 muxers/mplex/src/lib.rs                       |  2 +-
 muxers/yamux/src/lib.rs                       |  2 +-
 protocols/autonat/src/protocol.rs             | 10 ++--
 protocols/dcutr/src/behaviour.rs              |  6 +--
 protocols/dcutr/src/protocol/inbound.rs       |  1 -
 protocols/dcutr/src/protocol/outbound.rs      |  1 -
 protocols/gossipsub/src/behaviour.rs          |  4 +-
 protocols/gossipsub/src/behaviour/tests.rs    | 27 ++++------
 protocols/gossipsub/src/config.rs             |  2 -
 protocols/gossipsub/src/mcache.rs             |  4 +-
 protocols/gossipsub/src/peer_score.rs         |  6 +--
 protocols/gossipsub/src/protocol.rs           |  1 -
 .../gossipsub/src/subscription_filter.rs      |  1 -
 protocols/identify/src/protocol.rs            |  1 -
 protocols/kad/src/behaviour/test.rs           | 18 ++-----
 protocols/kad/src/kbucket.rs                  |  2 +-
 protocols/kad/src/kbucket/bucket.rs           |  1 -
 protocols/kad/src/kbucket/entry.rs            |  2 +-
 protocols/kad/src/protocol.rs                 |  2 +-
 protocols/kad/src/query/peers/closest.rs      |  6 +--
 .../kad/src/query/peers/closest/disjoint.rs   | 19 +------
 protocols/kad/src/query/peers/fixed.rs        |  1 -
 protocols/kad/src/record/store/memory.rs      |  3 --
 protocols/mdns/src/behaviour/iface/dns.rs     |  1 -
 protocols/mdns/src/behaviour/socket.rs        |  1 -
 protocols/mdns/src/behaviour/timer.rs         |  5 +-
 protocols/ping/src/protocol.rs                |  2 -
 protocols/relay/src/behaviour/rate_limiter.rs |  2 -
 protocols/relay/src/copy_future.rs            |  6 +--
 protocols/rendezvous/src/codec.rs             |  2 -
 protocols/rendezvous/src/server.rs            |  2 -
 protocols/rendezvous/tests/rendezvous.rs      |  1 -
 protocols/request-response/src/cbor.rs        |  1 -
 protocols/request-response/src/json.rs        |  1 -
 protocols/request-response/tests/ping.rs      |  2 +-
 swarm/src/behaviour/peer_addresses.rs         |  2 +-
 swarm/src/connection.rs                       | 29 +++++-----
 swarm/src/connection/pool.rs                  | 27 +---------
 swarm/src/handler/multi.rs                    |  2 +-
 swarm/src/handler/one_shot.rs                 |  2 +-
 swarm/src/lib.rs                              |  9 +---
 swarm/tests/swarm_derive.rs                   | 53 +++++++++----------
 transports/dns/src/lib.rs                     |  8 +--
 transports/noise/src/io/handshake.rs          |  2 +-
 transports/noise/src/protocol.rs              |  2 -
 transports/noise/tests/smoke.rs               |  2 +-
 transports/quic/src/transport.rs              |  4 +-
 transports/tcp/src/lib.rs                     |  6 +--
 transports/tcp/src/provider/tokio.rs          |  1 -
 transports/uds/src/lib.rs                     |  2 +-
 .../src/stream/poll_data_channel.rs           |  2 +-
 transports/webrtc/src/tokio/transport.rs      |  6 +--
 transports/websocket-websys/src/lib.rs        |  2 +-
 .../websocket-websys/src/web_context.rs       |  2 +-
 transports/websocket/src/framed.rs            |  2 +-
 transports/websocket/src/quicksink.rs         |  2 +-
 transports/websocket/src/tls.rs               |  1 -
 73 files changed, 111 insertions(+), 292 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a489fec1f1f..9069b2eecf1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Extract version from manifest
         run: |
           CRATE_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -e -r '.packages[] | select(.name == "'"$CRATE"'") | .version')
-          
+
           echo "CRATE_VERSION=$CRATE_VERSION" >> $GITHUB_ENV
 
       - name: Enforce version in `workspace.dependencies` matches latest version
@@ -234,7 +234,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-version: [
-          1.75.0, # current stable
+          1.77.0, # current stable
           beta,
         ]
     steps:
diff --git a/core/src/peer_record.rs b/core/src/peer_record.rs
index 2fd6a39ef2b..d5fc86c391e 100644
--- a/core/src/peer_record.rs
+++ b/core/src/peer_record.rs
@@ -5,7 +5,6 @@ use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
 use libp2p_identity::SigningError;
 use quick_protobuf::{BytesReader, Writer};
-use std::convert::TryInto;
 
 const PAYLOAD_TYPE: &str = "/libp2p/routing-state-record";
 const DOMAIN_SEP: &str = "libp2p-routing-state";
diff --git a/core/src/translation.rs b/core/src/translation.rs
index 70700ca6ae8..efddae31052 100644
--- a/core/src/translation.rs
+++ b/core/src/translation.rs
@@ -65,7 +65,7 @@ mod tests {
             expected: Multiaddr,
         }
 
-        let tests = vec![
+        let tests = [
             // Basic ipv4.
             Test {
                 original: "/ip4/192.0.2.1/tcp/1".parse().unwrap(),
diff --git a/core/src/transport/memory.rs b/core/src/transport/memory.rs
index bf88215dd43..6e4b9322ee5 100644
--- a/core/src/transport/memory.rs
+++ b/core/src/transport/memory.rs
@@ -20,13 +20,7 @@
 
 use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
 use fnv::FnvHashMap;
-use futures::{
-    channel::mpsc,
-    future::{self, Ready},
-    prelude::*,
-    task::Context,
-    task::Poll,
-};
+use futures::{channel::mpsc, future::Ready, prelude::*, task::Context, task::Poll};
 use multiaddr::{Multiaddr, Protocol};
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
diff --git a/core/src/upgrade/apply.rs b/core/src/upgrade/apply.rs
index 15cb0348cf3..f84aaaac9fa 100644
--- a/core/src/upgrade/apply.rs
+++ b/core/src/upgrade/apply.rs
@@ -21,7 +21,7 @@
 use crate::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeError};
 use crate::{connection::ConnectedPoint, Negotiated};
 use futures::{future::Either, prelude::*};
-use multistream_select::{self, DialerSelectFuture, ListenerSelectFuture};
+use multistream_select::{DialerSelectFuture, ListenerSelectFuture};
 use std::{mem, pin::Pin, task::Context, task::Poll};
 
 pub(crate) use multistream_select::Version;
diff --git a/examples/autonat/src/bin/autonat_client.rs b/examples/autonat/src/bin/autonat_client.rs
index 3fb25aa6222..def66c4823b 100644
--- a/examples/autonat/src/bin/autonat_client.rs
+++ b/examples/autonat/src/bin/autonat_client.rs
@@ -110,22 +110,3 @@ impl Behaviour {
         }
     }
 }
-
-#[derive(Debug)]
-#[allow(clippy::large_enum_variant)]
-enum Event {
-    AutoNat(autonat::Event),
-    Identify(identify::Event),
-}
-
-impl From<identify::Event> for Event {
-    fn from(v: identify::Event) -> Self {
-        Self::Identify(v)
-    }
-}
-
-impl From<autonat::Event> for Event {
-    fn from(v: autonat::Event) -> Self {
-        Self::AutoNat(v)
-    }
-}
diff --git a/examples/autonat/src/bin/autonat_server.rs b/examples/autonat/src/bin/autonat_server.rs
index 44a53f0d17f..389cc0fa26f 100644
--- a/examples/autonat/src/bin/autonat_server.rs
+++ b/examples/autonat/src/bin/autonat_server.rs
@@ -94,22 +94,3 @@ impl Behaviour {
         }
     }
 }
-
-#[derive(Debug)]
-#[allow(clippy::large_enum_variant)]
-enum Event {
-    AutoNat(autonat::Event),
-    Identify(identify::Event),
-}
-
-impl From<identify::Event> for Event {
-    fn from(v: identify::Event) -> Self {
-        Self::Identify(v)
-    }
-}
-
-impl From<autonat::Event> for Event {
-    fn from(v: autonat::Event) -> Self {
-        Self::AutoNat(v)
-    }
-}
diff --git a/identity/src/ed25519.rs b/identity/src/ed25519.rs
index 529a4dddea1..d77c44547d6 100644
--- a/identity/src/ed25519.rs
+++ b/identity/src/ed25519.rs
@@ -25,7 +25,6 @@ use core::cmp;
 use core::fmt;
 use core::hash;
 use ed25519_dalek::{self as ed25519, Signer as _, Verifier as _};
-use std::convert::TryFrom;
 use zeroize::Zeroize;
 
 /// An Ed25519 keypair.
diff --git a/identity/src/keypair.rs b/identity/src/keypair.rs
index bdfb68c0091..f1e8a7c2142 100644
--- a/identity/src/keypair.rs
+++ b/identity/src/keypair.rs
@@ -24,32 +24,30 @@
     feature = "ed25519",
     feature = "rsa"
 ))]
-use crate::error::OtherVariantError;
-use crate::error::{DecodingError, SigningError};
+#[cfg(feature = "ed25519")]
+use crate::ed25519;
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
     feature = "ed25519",
     feature = "rsa"
 ))]
-use crate::proto;
+use crate::error::OtherVariantError;
+use crate::error::{DecodingError, SigningError};
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
     feature = "ed25519",
     feature = "rsa"
 ))]
-use quick_protobuf::{BytesReader, Writer};
+use crate::proto;
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
     feature = "ed25519",
     feature = "rsa"
 ))]
-use std::convert::TryFrom;
-
-#[cfg(feature = "ed25519")]
-use crate::ed25519;
+use quick_protobuf::{BytesReader, Writer};
 
 #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
 use crate::rsa;
diff --git a/identity/src/lib.rs b/identity/src/lib.rs
index c78e68d1652..4f4313e8f17 100644
--- a/identity/src/lib.rs
+++ b/identity/src/lib.rs
@@ -34,7 +34,7 @@
 //! All key types have functions to enable conversion to/from their binary representations.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-
+#![allow(unreachable_pub)]
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
@@ -42,7 +42,6 @@
     feature = "rsa"
 ))]
 mod proto {
-    #![allow(unreachable_pub)]
     include!("generated/mod.rs");
     pub(crate) use self::keys_proto::*;
 }
diff --git a/identity/src/peer_id.rs b/identity/src/peer_id.rs
index 1d85fe66ffa..7b3f799f612 100644
--- a/identity/src/peer_id.rs
+++ b/identity/src/peer_id.rs
@@ -21,7 +21,7 @@
 #[cfg(feature = "rand")]
 use rand::Rng;
 use sha2::Digest as _;
-use std::{convert::TryFrom, fmt, str::FromStr};
+use std::{fmt, str::FromStr};
 use thiserror::Error;
 
 /// Local type-alias for multihash.
diff --git a/misc/metrics/src/identify.rs b/misc/metrics/src/identify.rs
index b1d4e9f0c89..03ac3f9634e 100644
--- a/misc/metrics/src/identify.rs
+++ b/misc/metrics/src/identify.rs
@@ -22,7 +22,7 @@ use crate::protocol_stack;
 use libp2p_identity::PeerId;
 use libp2p_swarm::StreamProtocol;
 use prometheus_client::collector::Collector;
-use prometheus_client::encoding::{DescriptorEncoder, EncodeLabelSet, EncodeMetric};
+use prometheus_client::encoding::{DescriptorEncoder, EncodeMetric};
 use prometheus_client::metrics::counter::Counter;
 use prometheus_client::metrics::gauge::ConstGauge;
 use prometheus_client::metrics::MetricType;
@@ -138,11 +138,6 @@ impl<TBvEv> super::Recorder<libp2p_swarm::SwarmEvent<TBvEv>> for Metrics {
     }
 }
 
-#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
-struct AddressLabels {
-    protocols: String,
-}
-
 #[derive(Default, Debug, Clone)]
 struct Peers(Arc<Mutex<HashMap<PeerId, libp2p_identify::Info>>>);
 
diff --git a/misc/multistream-select/src/listener_select.rs b/misc/multistream-select/src/listener_select.rs
index 21c507096e2..b4236310a1d 100644
--- a/misc/multistream-select/src/listener_select.rs
+++ b/misc/multistream-select/src/listener_select.rs
@@ -28,7 +28,6 @@ use futures::prelude::*;
 use smallvec::SmallVec;
 use std::{
     convert::TryFrom as _,
-    iter::FromIterator,
     mem,
     pin::Pin,
     task::{Context, Poll},
diff --git a/misc/multistream-select/src/protocol.rs b/misc/multistream-select/src/protocol.rs
index aef9f16c4cf..2189c50e697 100644
--- a/misc/multistream-select/src/protocol.rs
+++ b/misc/multistream-select/src/protocol.rs
@@ -31,7 +31,6 @@ use crate::Version;
 use bytes::{BufMut, Bytes, BytesMut};
 use futures::{io::IoSlice, prelude::*, ready};
 use std::{
-    convert::TryFrom,
     error::Error,
     fmt, io,
     pin::Pin,
diff --git a/misc/quick-protobuf-codec/src/lib.rs b/misc/quick-protobuf-codec/src/lib.rs
index c50b1264af6..166ee82ff08 100644
--- a/misc/quick-protobuf-codec/src/lib.rs
+++ b/misc/quick-protobuf-codec/src/lib.rs
@@ -182,7 +182,6 @@ impl From<Error> for io::Error {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::proto;
     use asynchronous_codec::FramedRead;
     use futures::io::Cursor;
     use futures::{FutureExt, StreamExt};
diff --git a/misc/rw-stream-sink/src/lib.rs b/misc/rw-stream-sink/src/lib.rs
index ee05196bfb4..f10e683ad33 100644
--- a/misc/rw-stream-sink/src/lib.rs
+++ b/misc/rw-stream-sink/src/lib.rs
@@ -117,7 +117,7 @@ where
 mod tests {
     use super::RwStreamSink;
     use async_std::task;
-    use futures::{channel::mpsc, prelude::*, stream};
+    use futures::{channel::mpsc, prelude::*};
     use std::{
         pin::Pin,
         task::{Context, Poll},
diff --git a/muxers/mplex/src/lib.rs b/muxers/mplex/src/lib.rs
index c67e0e3baec..17ca9ad46f6 100644
--- a/muxers/mplex/src/lib.rs
+++ b/muxers/mplex/src/lib.rs
@@ -30,7 +30,7 @@ pub use config::{MaxBufferBehaviour, MplexConfig};
 
 use bytes::Bytes;
 use codec::LocalStreamId;
-use futures::{future, prelude::*, ready};
+use futures::{prelude::*, ready};
 use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
 use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo};
 use parking_lot::Mutex;
diff --git a/muxers/yamux/src/lib.rs b/muxers/yamux/src/lib.rs
index 2b5eb52a11e..bcfeb62fccf 100644
--- a/muxers/yamux/src/lib.rs
+++ b/muxers/yamux/src/lib.rs
@@ -23,7 +23,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 use either::Either;
-use futures::{future, prelude::*, ready};
+use futures::{prelude::*, ready};
 use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
 use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo};
 use std::collections::VecDeque;
diff --git a/protocols/autonat/src/protocol.rs b/protocols/autonat/src/protocol.rs
index c1862058400..2ce538fddf4 100644
--- a/protocols/autonat/src/protocol.rs
+++ b/protocols/autonat/src/protocol.rs
@@ -27,7 +27,7 @@ use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_request_response::{self as request_response};
 use libp2p_swarm::StreamProtocol;
-use std::{convert::TryFrom, io};
+use std::io;
 
 /// The protocol name used for negotiating with multistream-select.
 pub const DEFAULT_PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/libp2p/autonat/1.0.0");
@@ -121,12 +121,8 @@ impl DialRequest {
         }
 
         let peer_id_result = msg.dial.and_then(|dial| {
-            dial.peer.and_then(|peer_info| {
-                let Some(peer_id) = peer_info.id else {
-                    return None;
-                };
-                Some((peer_id, peer_info.addrs))
-            })
+            dial.peer
+                .and_then(|peer_info| peer_info.id.map(|peer_id| (peer_id, peer_info.addrs)))
         });
 
         let (peer_id, addrs) = peer_id_result
diff --git a/protocols/dcutr/src/behaviour.rs b/protocols/dcutr/src/behaviour.rs
index 3742eb512f5..4409b5f6a64 100644
--- a/protocols/dcutr/src/behaviour.rs
+++ b/protocols/dcutr/src/behaviour.rs
@@ -191,9 +191,9 @@ impl NetworkBehaviour for Behaviour {
             .insert(connection_id);
 
         assert!(
-            self.direct_to_relayed_connections
-                .get(&connection_id)
-                .is_none(),
+            !self
+                .direct_to_relayed_connections
+                .contains_key(&connection_id),
             "state mismatch"
         );
 
diff --git a/protocols/dcutr/src/protocol/inbound.rs b/protocols/dcutr/src/protocol/inbound.rs
index b8f90daf3a1..005d8394f5e 100644
--- a/protocols/dcutr/src/protocol/inbound.rs
+++ b/protocols/dcutr/src/protocol/inbound.rs
@@ -23,7 +23,6 @@ use asynchronous_codec::Framed;
 use futures::prelude::*;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_swarm::Stream;
-use std::convert::TryFrom;
 use std::io;
 use thiserror::Error;
 
diff --git a/protocols/dcutr/src/protocol/outbound.rs b/protocols/dcutr/src/protocol/outbound.rs
index d9cb60a01f6..dc46442fae5 100644
--- a/protocols/dcutr/src/protocol/outbound.rs
+++ b/protocols/dcutr/src/protocol/outbound.rs
@@ -26,7 +26,6 @@ use futures_timer::Delay;
 use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_swarm::Stream;
-use std::convert::TryFrom;
 use std::io;
 use thiserror::Error;
 
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 24a32de4cc7..f2515c3c564 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -528,7 +528,7 @@ where
             return Err(SubscriptionError::NotAllowed);
         }
 
-        if self.mesh.get(&topic_hash).is_some() {
+        if self.mesh.contains_key(&topic_hash) {
             tracing::debug!(%topic, "Topic is already in the mesh");
             return Ok(false);
         }
@@ -554,7 +554,7 @@ where
         tracing::debug!(%topic, "Unsubscribing from topic");
         let topic_hash = topic.hash();
 
-        if self.mesh.get(&topic_hash).is_none() {
+        if !self.mesh.contains_key(&topic_hash) {
             tracing::debug!(topic=%topic_hash, "Already unsubscribed from topic");
             // we are not subscribed
             return Ok(false);
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 2bf1c90c5c8..1a63b52541f 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -22,17 +22,12 @@
 
 use super::*;
 use crate::subscription_filter::WhitelistSubscriptionFilter;
-use crate::transform::{DataTransform, IdentityTransform};
-use crate::ValidationError;
-use crate::{
-    config::Config, config::ConfigBuilder, types::Rpc, IdentTopic as Topic, TopicScoreParams,
-};
+use crate::{config::ConfigBuilder, types::Rpc, IdentTopic as Topic};
 use async_std::net::Ipv4Addr;
 use byteorder::{BigEndian, ByteOrder};
-use libp2p_core::{ConnectedPoint, Endpoint};
+use libp2p_core::ConnectedPoint;
 use rand::Rng;
 use std::thread::sleep;
-use std::time::Duration;
 
 #[derive(Default, Debug)]
 struct InjectNodes<D, F>
@@ -396,7 +391,7 @@ fn test_subscribe() {
         .create_network();
 
     assert!(
-        gs.mesh.get(&topic_hashes[0]).is_some(),
+        gs.mesh.contains_key(&topic_hashes[0]),
         "Subscribe should add a new entry to the mesh[topic] hashmap"
     );
 
@@ -442,11 +437,11 @@ fn test_unsubscribe() {
 
     for topic_hash in &topic_hashes {
         assert!(
-            gs.topic_peers.get(topic_hash).is_some(),
+            gs.topic_peers.contains_key(topic_hash),
             "Topic_peers contain a topic entry"
         );
         assert!(
-            gs.mesh.get(topic_hash).is_some(),
+            gs.mesh.contains_key(topic_hash),
             "mesh should contain a topic entry"
         );
     }
@@ -479,7 +474,7 @@ fn test_unsubscribe() {
     // check we clean up internal structures
     for topic_hash in &topic_hashes {
         assert!(
-            gs.mesh.get(topic_hash).is_none(),
+            !gs.mesh.contains_key(topic_hash),
             "All topics should have been removed from the mesh"
         );
     }
@@ -624,7 +619,7 @@ fn test_publish_without_flood_publishing() {
         .create_network();
 
     assert!(
-        gs.mesh.get(&topic_hashes[0]).is_some(),
+        gs.mesh.contains_key(&topic_hashes[0]),
         "Subscribe should add a new entry to the mesh[topic] hashmap"
     );
 
@@ -703,7 +698,7 @@ fn test_fanout() {
         .create_network();
 
     assert!(
-        gs.mesh.get(&topic_hashes[0]).is_some(),
+        gs.mesh.contains_key(&topic_hashes[0]),
         "Subscribe should add a new entry to the mesh[topic] hashmap"
     );
     // Unsubscribe from topic
@@ -873,7 +868,7 @@ fn test_handle_received_subscriptions() {
     );
 
     assert!(
-        gs.peer_topics.get(&unknown_peer).is_none(),
+        !gs.peer_topics.contains_key(&unknown_peer),
         "Unknown peer should not have been added"
     );
 
@@ -1272,7 +1267,7 @@ fn test_handle_graft_multiple_topics() {
     }
 
     assert!(
-        gs.mesh.get(&topic_hashes[2]).is_none(),
+        !gs.mesh.contains_key(&topic_hashes[2]),
         "Expected the second topic to not be in the mesh"
     );
 }
@@ -5100,7 +5095,7 @@ fn test_graft_without_subscribe() {
         .create_network();
 
     assert!(
-        gs.mesh.get(&topic_hashes[0]).is_some(),
+        gs.mesh.contains_key(&topic_hashes[0]),
         "Subscribe should add a new entry to the mesh[topic] hashmap"
     );
 
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index 7e79912cc4a..cd2326279eb 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -860,10 +860,8 @@ impl std::fmt::Debug for Config {
 mod test {
     use super::*;
     use crate::topic::IdentityHash;
-    use crate::types::PeerKind;
     use crate::Topic;
     use libp2p_core::UpgradeInfo;
-    use libp2p_swarm::StreamProtocol;
     use std::collections::hash_map::DefaultHasher;
     use std::hash::{Hash, Hasher};
 
diff --git a/protocols/gossipsub/src/mcache.rs b/protocols/gossipsub/src/mcache.rs
index ef4a93bc936..aa65e3b7f1d 100644
--- a/protocols/gossipsub/src/mcache.rs
+++ b/protocols/gossipsub/src/mcache.rs
@@ -221,9 +221,7 @@ impl MessageCache {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::types::RawMessage;
-    use crate::{IdentTopic as Topic, TopicHash};
-    use libp2p_identity::PeerId;
+    use crate::IdentTopic as Topic;
 
     fn gen_testm(x: u64, topic: TopicHash) -> (MessageId, RawMessage) {
         let default_id = |message: &RawMessage| {
diff --git a/protocols/gossipsub/src/peer_score.rs b/protocols/gossipsub/src/peer_score.rs
index b1ea9bfae95..386cc85bd3c 100644
--- a/protocols/gossipsub/src/peer_score.rs
+++ b/protocols/gossipsub/src/peer_score.rs
@@ -99,7 +99,7 @@ impl PeerStats {
         topic_hash: TopicHash,
         params: &PeerScoreParams,
     ) -> Option<&mut TopicStats> {
-        if params.topics.get(&topic_hash).is_some() {
+        if params.topics.contains_key(&topic_hash) {
             Some(self.topics.entry(topic_hash).or_default())
         } else {
             self.topics.get_mut(&topic_hash)
@@ -307,7 +307,7 @@ impl PeerScore {
 
         // P6: IP collocation factor
         for ip in peer_stats.known_ips.iter() {
-            if self.params.ip_colocation_factor_whitelist.get(ip).is_some() {
+            if self.params.ip_colocation_factor_whitelist.contains(ip) {
                 continue;
             }
 
@@ -680,7 +680,7 @@ impl PeerScore {
     ) {
         let record = self.deliveries.entry(msg_id.clone()).or_default();
 
-        if record.peers.get(from).is_some() {
+        if record.peers.contains(from) {
             // we have already seen this duplicate!
             return;
         }
diff --git a/protocols/gossipsub/src/protocol.rs b/protocols/gossipsub/src/protocol.rs
index e9600a4d8d8..01a38562c02 100644
--- a/protocols/gossipsub/src/protocol.rs
+++ b/protocols/gossipsub/src/protocol.rs
@@ -29,7 +29,6 @@ use crate::ValidationError;
 use asynchronous_codec::{Decoder, Encoder, Framed};
 use byteorder::{BigEndian, ByteOrder};
 use bytes::BytesMut;
-use futures::future;
 use futures::prelude::*;
 use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_identity::{PeerId, PublicKey};
diff --git a/protocols/gossipsub/src/subscription_filter.rs b/protocols/gossipsub/src/subscription_filter.rs
index 09c323d7904..02bb9b4eab6 100644
--- a/protocols/gossipsub/src/subscription_filter.rs
+++ b/protocols/gossipsub/src/subscription_filter.rs
@@ -212,7 +212,6 @@ impl TopicSubscriptionFilter for RegexSubscriptionFilter {
 mod test {
     use super::*;
     use crate::types::SubscriptionAction::*;
-    use std::iter::FromIterator;
 
     #[test]
     fn test_filter_incoming_allow_all_with_duplicates() {
diff --git a/protocols/identify/src/protocol.rs b/protocols/identify/src/protocol.rs
index c6b22b00c0a..f4dfd544dd1 100644
--- a/protocols/identify/src/protocol.rs
+++ b/protocols/identify/src/protocol.rs
@@ -25,7 +25,6 @@ use libp2p_core::{multiaddr, Multiaddr};
 use libp2p_identity as identity;
 use libp2p_identity::PublicKey;
 use libp2p_swarm::StreamProtocol;
-use std::convert::TryFrom;
 use std::io;
 use thiserror::Error;
 
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index b879084c54f..7005f39e5e6 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -22,32 +22,22 @@
 
 use super::*;
 
-use crate::kbucket::Distance;
 use crate::record::{store::MemoryStore, Key};
-use crate::{K_VALUE, PROTOCOL_NAME, SHA_256_MH};
+use crate::{PROTOCOL_NAME, SHA_256_MH};
 use futures::{executor::block_on, future::poll_fn, prelude::*};
 use futures_timer::Delay;
 use libp2p_core::{
-    connection::ConnectedPoint,
-    multiaddr::{multiaddr, Multiaddr, Protocol},
+    multiaddr::{multiaddr, Protocol},
     multihash::Multihash,
     transport::MemoryTransport,
-    upgrade, Endpoint, Transport,
+    upgrade, Transport,
 };
 use libp2p_identity as identity;
-use libp2p_identity::PeerId;
 use libp2p_noise as noise;
-use libp2p_swarm::behaviour::ConnectionEstablished;
-use libp2p_swarm::{self as swarm, ConnectionId, Swarm, SwarmEvent};
+use libp2p_swarm::{self as swarm, Swarm, SwarmEvent};
 use libp2p_yamux as yamux;
 use quickcheck::*;
 use rand::{random, rngs::StdRng, thread_rng, Rng, SeedableRng};
-use std::{
-    collections::{HashMap, HashSet},
-    num::NonZeroUsize,
-    time::Duration,
-    u64,
-};
 
 type TestSwarm = Swarm<Behaviour<MemoryStore>>;
 
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index a0d272c31f1..cf5591c5cf6 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -75,7 +75,7 @@ mod key;
 pub use bucket::NodeStatus;
 pub use entry::*;
 
-use arrayvec::{self, ArrayVec};
+use arrayvec::ArrayVec;
 use bucket::KBucket;
 use std::collections::VecDeque;
 use std::time::{Duration, Instant};
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
index d70161919e1..5e65bc15a37 100644
--- a/protocols/kad/src/kbucket/bucket.rs
+++ b/protocols/kad/src/kbucket/bucket.rs
@@ -431,7 +431,6 @@ mod tests {
     use super::*;
     use libp2p_identity::PeerId;
     use quickcheck::*;
-    use std::collections::VecDeque;
 
     impl Arbitrary for KBucket<Key<PeerId>, ()> {
         fn arbitrary(g: &mut Gen) -> KBucket<Key<PeerId>, ()> {
diff --git a/protocols/kad/src/kbucket/entry.rs b/protocols/kad/src/kbucket/entry.rs
index 02c90fdfcc7..d89853b1761 100644
--- a/protocols/kad/src/kbucket/entry.rs
+++ b/protocols/kad/src/kbucket/entry.rs
@@ -21,7 +21,7 @@
 //! The `Entry` API for quering and modifying the entries of a `KBucketsTable`
 //! representing the nodes participating in the Kademlia DHT.
 
-pub(crate) use super::bucket::{AppliedPending, InsertResult, Node, NodeStatus, K_VALUE};
+pub(crate) use super::bucket::{AppliedPending, InsertResult, Node, K_VALUE};
 pub use super::key::*;
 
 use super::*;
diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs
index 5abe2089852..9803af00579 100644
--- a/protocols/kad/src/protocol.rs
+++ b/protocols/kad/src/protocol.rs
@@ -37,7 +37,7 @@ use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_swarm::StreamProtocol;
 use std::marker::PhantomData;
-use std::{convert::TryFrom, time::Duration};
+use std::time::Duration;
 use std::{io, iter};
 use tracing::debug;
 
diff --git a/protocols/kad/src/query/peers/closest.rs b/protocols/kad/src/query/peers/closest.rs
index dc913f1bbca..537da6a9d7d 100644
--- a/protocols/kad/src/query/peers/closest.rs
+++ b/protocols/kad/src/query/peers/closest.rs
@@ -23,9 +23,8 @@ use super::*;
 use crate::kbucket::{Distance, Key, KeyBytes};
 use crate::{ALPHA_VALUE, K_VALUE};
 use instant::Instant;
-use libp2p_identity::PeerId;
 use std::collections::btree_map::{BTreeMap, Entry};
-use std::{iter::FromIterator, num::NonZeroUsize, time::Duration};
+use std::{num::NonZeroUsize, time::Duration};
 
 pub(crate) mod disjoint;
 /// A peer iterator for a dynamically changing list of peers, sorted by increasing
@@ -477,10 +476,9 @@ mod tests {
     use super::*;
     use crate::SHA_256_MH;
     use libp2p_core::multihash::Multihash;
-    use libp2p_identity::PeerId;
     use quickcheck::*;
     use rand::{rngs::StdRng, Rng, SeedableRng};
-    use std::{iter, time::Duration};
+    use std::iter;
 
     fn random_peers<R: Rng>(n: usize, g: &mut R) -> Vec<PeerId> {
         (0..n)
diff --git a/protocols/kad/src/query/peers/closest/disjoint.rs b/protocols/kad/src/query/peers/closest/disjoint.rs
index 68721f93d7c..e8309a2deda 100644
--- a/protocols/kad/src/query/peers/closest/disjoint.rs
+++ b/protocols/kad/src/query/peers/closest/disjoint.rs
@@ -19,9 +19,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 use super::*;
-use crate::kbucket::{Key, KeyBytes};
-use instant::Instant;
-use libp2p_identity::PeerId;
 use std::{
     collections::HashMap,
     iter::{Cycle, Map, Peekable},
@@ -438,7 +435,7 @@ impl<I: Iterator<Item = Key<PeerId>>> Iterator for ResultIter<I> {
 mod tests {
     use super::*;
 
-    use crate::{K_VALUE, SHA_256_MH};
+    use crate::SHA_256_MH;
     use libp2p_core::multihash::Multihash;
     use quickcheck::*;
     use std::collections::HashSet;
@@ -602,20 +599,6 @@ mod tests {
         }
     }
 
-    #[derive(Debug, Clone)]
-    struct PeerVec(Vec<Key<PeerId>>);
-
-    impl Arbitrary for PeerVec {
-        fn arbitrary(g: &mut Gen) -> Self {
-            PeerVec(
-                (0..g.gen_range(1..60u8))
-                    .map(|_| ArbitraryPeerId::arbitrary(g).0)
-                    .map(Key::from)
-                    .collect(),
-            )
-        }
-    }
-
     #[test]
     fn s_kademlia_disjoint_paths() {
         let now = Instant::now();
diff --git a/protocols/kad/src/query/peers/fixed.rs b/protocols/kad/src/query/peers/fixed.rs
index 50a969380a3..b34f7516801 100644
--- a/protocols/kad/src/query/peers/fixed.rs
+++ b/protocols/kad/src/query/peers/fixed.rs
@@ -21,7 +21,6 @@
 use super::*;
 
 use fnv::FnvHashMap;
-use libp2p_identity::PeerId;
 use std::{collections::hash_map::Entry, num::NonZeroUsize, vec};
 
 /// A peer iterator for a fixed set of peers.
diff --git a/protocols/kad/src/record/store/memory.rs b/protocols/kad/src/record/store/memory.rs
index edeae188ac6..86c136ebeda 100644
--- a/protocols/kad/src/record/store/memory.rs
+++ b/protocols/kad/src/record/store/memory.rs
@@ -21,9 +21,7 @@
 use super::*;
 
 use crate::kbucket;
-use libp2p_identity::PeerId;
 use smallvec::SmallVec;
-use std::borrow::Cow;
 use std::collections::{hash_map, hash_set, HashMap, HashSet};
 use std::iter;
 
@@ -217,7 +215,6 @@ impl RecordStore for MemoryStore {
 mod tests {
     use super::*;
     use crate::SHA_256_MH;
-    use libp2p_core::multihash::Multihash;
     use quickcheck::*;
     use rand::Rng;
 
diff --git a/protocols/mdns/src/behaviour/iface/dns.rs b/protocols/mdns/src/behaviour/iface/dns.rs
index 6cc5550dbe5..41ce9efa714 100644
--- a/protocols/mdns/src/behaviour/iface/dns.rs
+++ b/protocols/mdns/src/behaviour/iface/dns.rs
@@ -397,7 +397,6 @@ mod tests {
     use super::*;
     use hickory_proto::op::Message;
     use libp2p_identity as identity;
-    use std::time::Duration;
 
     #[test]
     fn build_query_correct() {
diff --git a/protocols/mdns/src/behaviour/socket.rs b/protocols/mdns/src/behaviour/socket.rs
index fa9e0fbaf1e..ebaad17e45f 100644
--- a/protocols/mdns/src/behaviour/socket.rs
+++ b/protocols/mdns/src/behaviour/socket.rs
@@ -20,7 +20,6 @@
 
 use std::{
     io::Error,
-    marker::Unpin,
     net::{SocketAddr, UdpSocket},
     task::{Context, Poll},
 };
diff --git a/protocols/mdns/src/behaviour/timer.rs b/protocols/mdns/src/behaviour/timer.rs
index 29622be9a38..4f6ceec306d 100644
--- a/protocols/mdns/src/behaviour/timer.rs
+++ b/protocols/mdns/src/behaviour/timer.rs
@@ -18,10 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::{
-    marker::Unpin,
-    time::{Duration, Instant},
-};
+use std::time::{Duration, Instant};
 
 /// Simple wrapper for the different type of timers
 #[derive(Debug)]
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index 28549e1c198..fe84cb4ea59 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -89,8 +89,6 @@ mod tests {
         multiaddr::multiaddr,
         transport::{memory::MemoryTransport, ListenerId, Transport},
     };
-    use rand::{thread_rng, Rng};
-    use std::time::Duration;
 
     #[test]
     fn ping_pong() {
diff --git a/protocols/relay/src/behaviour/rate_limiter.rs b/protocols/relay/src/behaviour/rate_limiter.rs
index 9c4f67d04a8..73c164c121c 100644
--- a/protocols/relay/src/behaviour/rate_limiter.rs
+++ b/protocols/relay/src/behaviour/rate_limiter.rs
@@ -22,7 +22,6 @@ use instant::Instant;
 use libp2p_core::multiaddr::{Multiaddr, Protocol};
 use libp2p_identity::PeerId;
 use std::collections::{HashMap, VecDeque};
-use std::convert::TryInto;
 use std::hash::Hash;
 use std::net::IpAddr;
 use std::num::NonZeroU32;
@@ -173,7 +172,6 @@ impl<Id: Eq + PartialEq + Hash + Clone> GenericRateLimiter<Id> {
 mod tests {
     use super::*;
     use quickcheck::{QuickCheck, TestResult};
-    use std::num::NonZeroU32;
 
     #[test]
     fn first() {
diff --git a/protocols/relay/src/copy_future.rs b/protocols/relay/src/copy_future.rs
index 755344cd698..91415065d2c 100644
--- a/protocols/relay/src/copy_future.rs
+++ b/protocols/relay/src/copy_future.rs
@@ -30,7 +30,6 @@ use futures::io::{AsyncBufRead, BufReader};
 use futures::io::{AsyncRead, AsyncWrite};
 use futures::ready;
 use futures_timer::Delay;
-use std::convert::TryInto;
 use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -164,12 +163,9 @@ fn forward_data<S: AsyncBufRead + Unpin, D: AsyncWrite + Unpin>(
 mod tests {
     use super::*;
     use futures::executor::block_on;
-    use futures::io::{AsyncRead, AsyncWrite, BufReader, BufWriter};
+    use futures::io::BufWriter;
     use quickcheck::QuickCheck;
     use std::io::ErrorKind;
-    use std::pin::Pin;
-    use std::task::{Context, Poll};
-    use std::time::Duration;
 
     #[test]
     fn quickcheck() {
diff --git a/protocols/rendezvous/src/codec.rs b/protocols/rendezvous/src/codec.rs
index 41432a91d8c..cad3688e00b 100644
--- a/protocols/rendezvous/src/codec.rs
+++ b/protocols/rendezvous/src/codec.rs
@@ -27,7 +27,6 @@ use libp2p_core::{peer_record, signed_envelope, PeerRecord, SignedEnvelope};
 use libp2p_swarm::StreamProtocol;
 use quick_protobuf_codec::Codec as ProtobufCodec;
 use rand::RngCore;
-use std::convert::{TryFrom, TryInto};
 use std::{fmt, io};
 
 pub type Ttl = u64;
@@ -642,7 +641,6 @@ mod proto {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Namespace;
 
     #[test]
     fn cookie_wire_encoding_roundtrip() {
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index 667c71e20e3..0ed1b6523d1 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -34,7 +34,6 @@ use libp2p_swarm::{
 };
 use std::collections::{HashMap, HashSet};
 use std::iter;
-use std::iter::FromIterator;
 use std::task::{ready, Context, Poll};
 use std::time::Duration;
 
@@ -529,7 +528,6 @@ pub struct CookieNamespaceMismatch;
 #[cfg(test)]
 mod tests {
     use instant::SystemTime;
-    use std::option::Option::None;
 
     use libp2p_core::PeerRecord;
     use libp2p_identity as identity;
diff --git a/protocols/rendezvous/tests/rendezvous.rs b/protocols/rendezvous/tests/rendezvous.rs
index c2de88fd615..d9200780ece 100644
--- a/protocols/rendezvous/tests/rendezvous.rs
+++ b/protocols/rendezvous/tests/rendezvous.rs
@@ -27,7 +27,6 @@ use libp2p_rendezvous as rendezvous;
 use libp2p_rendezvous::client::RegisterError;
 use libp2p_swarm::{DialError, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use std::convert::TryInto;
 use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
diff --git a/protocols/request-response/src/cbor.rs b/protocols/request-response/src/cbor.rs
index f371f6149dc..44d82be2630 100644
--- a/protocols/request-response/src/cbor.rs
+++ b/protocols/request-response/src/cbor.rs
@@ -47,7 +47,6 @@ mod codec {
     use async_trait::async_trait;
     use cbor4ii::core::error::DecodeError;
     use futures::prelude::*;
-    use futures::{AsyncRead, AsyncWrite};
     use libp2p_swarm::StreamProtocol;
     use serde::{de::DeserializeOwned, Serialize};
     use std::{collections::TryReserveError, convert::Infallible, io, marker::PhantomData};
diff --git a/protocols/request-response/src/json.rs b/protocols/request-response/src/json.rs
index 0b3d634573b..85e78e7ddda 100644
--- a/protocols/request-response/src/json.rs
+++ b/protocols/request-response/src/json.rs
@@ -45,7 +45,6 @@ pub type Behaviour<Req, Resp> = crate::Behaviour<codec::Codec<Req, Resp>>;
 mod codec {
     use async_trait::async_trait;
     use futures::prelude::*;
-    use futures::{AsyncRead, AsyncWrite};
     use libp2p_swarm::StreamProtocol;
     use serde::{de::DeserializeOwned, Serialize};
     use std::{io, marker::PhantomData};
diff --git a/protocols/request-response/tests/ping.rs b/protocols/request-response/tests/ping.rs
index b9e7878a78b..827afae249c 100644
--- a/protocols/request-response/tests/ping.rs
+++ b/protocols/request-response/tests/ping.rs
@@ -26,7 +26,7 @@ use libp2p_request_response as request_response;
 use libp2p_request_response::ProtocolSupport;
 use libp2p_swarm::{StreamProtocol, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use rand::{self, Rng};
+use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::{io, iter};
 use tracing_subscriber::EnvFilter;
diff --git a/swarm/src/behaviour/peer_addresses.rs b/swarm/src/behaviour/peer_addresses.rs
index a011867dcdf..1eeead56ca1 100644
--- a/swarm/src/behaviour/peer_addresses.rs
+++ b/swarm/src/behaviour/peer_addresses.rs
@@ -101,7 +101,7 @@ mod tests {
     use super::*;
     use std::io;
 
-    use crate::{ConnectionId, DialError};
+    use crate::ConnectionId;
     use libp2p_core::{
         multiaddr::Protocol,
         transport::{memory::MemoryTransportError, TransportError},
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 15c49bb7bd5..a6e8e1c6851 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -373,7 +373,7 @@ where
                 match shutdown {
                     Shutdown::None => {}
                     Shutdown::Asap => return Poll::Ready(Err(ConnectionError::KeepAliveTimeout)),
-                    Shutdown::Later(delay, _) => match Future::poll(Pin::new(delay), cx) {
+                    Shutdown::Later(delay) => match Future::poll(Pin::new(delay), cx) {
                         Poll::Ready(_) => {
                             return Poll::Ready(Err(ConnectionError::KeepAliveTimeout))
                         }
@@ -470,15 +470,12 @@ fn compute_new_shutdown(
 ) -> Option<Shutdown> {
     match (current_shutdown, handler_keep_alive) {
         (_, false) if idle_timeout == Duration::ZERO => Some(Shutdown::Asap),
-        (Shutdown::Later(_, _), false) => None, // Do nothing, i.e. let the shutdown timer continue to tick.
+        (Shutdown::Later(_), false) => None, // Do nothing, i.e. let the shutdown timer continue to tick.
         (_, false) => {
             let now = Instant::now();
             let safe_keep_alive = checked_add_fraction(now, idle_timeout);
 
-            Some(Shutdown::Later(
-                Delay::new(safe_keep_alive),
-                now + safe_keep_alive,
-            ))
+            Some(Shutdown::Later(Delay::new(safe_keep_alive)))
         }
         (_, true) => Some(Shutdown::None),
     }
@@ -734,7 +731,7 @@ enum Shutdown {
     /// A shut down is planned as soon as possible.
     Asap,
     /// A shut down is planned for when a `Delay` has elapsed.
-    Later(Delay, Instant),
+    Later(Delay),
 }
 
 #[cfg(test)]
@@ -947,11 +944,10 @@ mod tests {
                 let shutdown = match self.0 {
                     Shutdown::None => Shutdown::None,
                     Shutdown::Asap => Shutdown::Asap,
-                    Shutdown::Later(_, instant) => Shutdown::Later(
+                    Shutdown::Later(_) => Shutdown::Later(
                         // compute_new_shutdown does not touch the delay. Delay does not
                         // implement Clone. Thus use a placeholder delay.
                         Delay::new(Duration::from_secs(1)),
-                        instant,
                     ),
                 };
 
@@ -964,12 +960,7 @@ mod tests {
                 let shutdown = match g.gen_range(1u8..4) {
                     1 => Shutdown::None,
                     2 => Shutdown::Asap,
-                    3 => Shutdown::Later(
-                        Delay::new(Duration::from_secs(u32::arbitrary(g) as u64)),
-                        Instant::now()
-                            .checked_add(Duration::arbitrary(g))
-                            .unwrap_or(Instant::now()),
-                    ),
+                    3 => Shutdown::Later(Delay::new(Duration::from_secs(u32::arbitrary(g) as u64))),
                     _ => unreachable!(),
                 };
 
@@ -1000,7 +991,9 @@ mod tests {
             self: Pin<&mut Self>,
             _: &mut Context<'_>,
         ) -> Poll<Result<Self::Substream, Self::Error>> {
-            Poll::Ready(Ok(PendingSubstream(Arc::downgrade(&self.counter))))
+            Poll::Ready(Ok(PendingSubstream {
+                _weak: Arc::downgrade(&self.counter),
+            }))
         }
 
         fn poll_outbound(
@@ -1055,7 +1048,9 @@ mod tests {
         }
     }
 
-    struct PendingSubstream(Weak<()>);
+    struct PendingSubstream {
+        _weak: Weak<()>,
+    }
 
     impl AsyncRead for PendingSubstream {
         fn poll_read(
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index 9bcd1b446d3..f876c39f12c 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -42,7 +42,7 @@ use libp2p_core::connection::Endpoint;
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
 use std::task::Waker;
 use std::{
-    collections::{hash_map, HashMap},
+    collections::HashMap,
     fmt,
     num::{NonZeroU8, NonZeroUsize},
     pin::Pin,
@@ -1029,28 +1029,3 @@ impl PoolConfig {
         self
     }
 }
-
-trait EntryExt<'a, K, V> {
-    fn expect_occupied(self, msg: &'static str) -> hash_map::OccupiedEntry<'a, K, V>;
-}
-
-impl<'a, K: 'a, V: 'a> EntryExt<'a, K, V> for hash_map::Entry<'a, K, V> {
-    fn expect_occupied(self, msg: &'static str) -> hash_map::OccupiedEntry<'a, K, V> {
-        match self {
-            hash_map::Entry::Occupied(entry) => entry,
-            hash_map::Entry::Vacant(_) => panic!("{}", msg),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use futures::future::Future;
-
-    struct Dummy;
-
-    impl Executor for Dummy {
-        fn exec(&self, _: Pin<Box<dyn Future<Output = ()> + Send>>) {}
-    }
-}
diff --git a/swarm/src/handler/multi.rs b/swarm/src/handler/multi.rs
index 96a77626c01..5efcde5c2bb 100644
--- a/swarm/src/handler/multi.rs
+++ b/swarm/src/handler/multi.rs
@@ -35,7 +35,7 @@ use std::{
     error,
     fmt::{self, Debug},
     hash::Hash,
-    iter::{self, FromIterator},
+    iter,
     task::{Context, Poll},
     time::Duration,
 };
diff --git a/swarm/src/handler/one_shot.rs b/swarm/src/handler/one_shot.rs
index b1fc41e9098..fc1074b31e4 100644
--- a/swarm/src/handler/one_shot.rs
+++ b/swarm/src/handler/one_shot.rs
@@ -232,6 +232,6 @@ mod tests {
             }
         }));
 
-        assert!(matches!(handler.connection_keep_alive(), false));
+        assert!(!handler.connection_keep_alive());
     }
 }
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 2f02e43348d..dac380855aa 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -146,7 +146,6 @@ use std::collections::{HashMap, HashSet, VecDeque};
 use std::num::{NonZeroU32, NonZeroU8, NonZeroUsize};
 use std::time::Duration;
 use std::{
-    convert::TryFrom,
     error, fmt, io,
     pin::Pin,
     task::{Context, Poll},
@@ -1771,14 +1770,10 @@ impl NetworkInfo {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::dummy;
     use crate::test::{CallTraceBehaviour, MockBehaviour};
-    use futures::future;
     use libp2p_core::multiaddr::multiaddr;
     use libp2p_core::transport::memory::MemoryTransportError;
-    use libp2p_core::transport::TransportEvent;
-    use libp2p_core::Endpoint;
-    use libp2p_core::{multiaddr, transport, upgrade};
+    use libp2p_core::{multiaddr, upgrade};
     use libp2p_identity as identity;
     use libp2p_plaintext as plaintext;
     use libp2p_yamux as yamux;
@@ -1832,7 +1827,7 @@ mod tests {
             && swarm2.is_connected(swarm1.local_peer_id())
     }
 
-    fn swarms_disconnected<TBehaviour: NetworkBehaviour>(
+    fn swarms_disconnected<TBehaviour>(
         swarm1: &Swarm<CallTraceBehaviour<TBehaviour>>,
         swarm2: &Swarm<CallTraceBehaviour<TBehaviour>>,
     ) -> bool
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 707abb03d6e..12f0d0a5ba8 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -133,19 +133,19 @@ fn custom_event() {
 
     #[allow(clippy::large_enum_variant)]
     enum MyEvent {
-        Ping(ping::Event),
-        Identify(identify::Event),
+        Ping,
+        Identify,
     }
 
     impl From<ping::Event> for MyEvent {
-        fn from(event: ping::Event) -> Self {
-            MyEvent::Ping(event)
+        fn from(_event: ping::Event) -> Self {
+            MyEvent::Ping
         }
     }
 
     impl From<identify::Event> for MyEvent {
-        fn from(event: identify::Event) -> Self {
-            MyEvent::Identify(event)
+        fn from(_event: identify::Event) -> Self {
+            MyEvent::Identify
         }
     }
 
@@ -167,19 +167,19 @@ fn custom_event_mismatching_field_names() {
 
     #[allow(clippy::large_enum_variant)]
     enum MyEvent {
-        Ping(ping::Event),
-        Identify(identify::Event),
+        Ping,
+        Identify,
     }
 
     impl From<ping::Event> for MyEvent {
-        fn from(event: ping::Event) -> Self {
-            MyEvent::Ping(event)
+        fn from(_event: ping::Event) -> Self {
+            MyEvent::Ping
         }
     }
 
     impl From<identify::Event> for MyEvent {
-        fn from(event: identify::Event) -> Self {
-            MyEvent::Identify(event)
+        fn from(_event: identify::Event) -> Self {
+            MyEvent::Identify
         }
     }
 
@@ -252,19 +252,19 @@ fn nested_derives_with_import() {
 fn custom_event_emit_event_through_poll() {
     #[allow(clippy::large_enum_variant)]
     enum BehaviourOutEvent {
-        Ping(ping::Event),
-        Identify(identify::Event),
+        Ping,
+        Identify,
     }
 
     impl From<ping::Event> for BehaviourOutEvent {
-        fn from(event: ping::Event) -> Self {
-            BehaviourOutEvent::Ping(event)
+        fn from(_event: ping::Event) -> Self {
+            BehaviourOutEvent::Ping
         }
     }
 
     impl From<identify::Event> for BehaviourOutEvent {
-        fn from(event: identify::Event) -> Self {
-            BehaviourOutEvent::Identify(event)
+        fn from(_event: identify::Event) -> Self {
+            BehaviourOutEvent::Identify
         }
     }
 
@@ -293,8 +293,8 @@ fn custom_event_emit_event_through_poll() {
         // check that the event is bubbled up all the way to swarm
         loop {
             match _swarm.select_next_some().await {
-                SwarmEvent::Behaviour(BehaviourOutEvent::Ping(_)) => break,
-                SwarmEvent::Behaviour(BehaviourOutEvent::Identify(_)) => break,
+                SwarmEvent::Behaviour(BehaviourOutEvent::Ping) => break,
+                SwarmEvent::Behaviour(BehaviourOutEvent::Identify) => break,
                 _ => {}
             }
         }
@@ -460,21 +460,20 @@ fn with_generics_constrained() {
 fn custom_event_with_either() {
     use either::Either;
 
-    #[allow(clippy::large_enum_variant)]
     enum BehaviourOutEvent {
-        Kad(libp2p_kad::Event),
-        PingOrIdentify(Either<ping::Event, identify::Event>),
+        Kad,
+        PingOrIdentify,
     }
 
     impl From<libp2p_kad::Event> for BehaviourOutEvent {
-        fn from(event: libp2p_kad::Event) -> Self {
-            BehaviourOutEvent::Kad(event)
+        fn from(_event: libp2p_kad::Event) -> Self {
+            BehaviourOutEvent::Kad
         }
     }
 
     impl From<Either<ping::Event, identify::Event>> for BehaviourOutEvent {
-        fn from(event: Either<ping::Event, identify::Event>) -> Self {
-            BehaviourOutEvent::PingOrIdentify(event)
+        fn from(_event: Either<ping::Event, identify::Event>) -> Self {
+            BehaviourOutEvent::PingOrIdentify
         }
     }
 
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index be847e568ed..a0fdaf53bdf 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -157,7 +157,6 @@ use smallvec::SmallVec;
 use std::io;
 use std::net::{Ipv4Addr, Ipv6Addr};
 use std::{
-    convert::TryFrom,
     error, fmt, iter,
     ops::DerefMut,
     pin::Pin,
@@ -628,12 +627,7 @@ where
 #[cfg(all(test, any(feature = "tokio", feature = "async-std")))]
 mod tests {
     use super::*;
-    use futures::future::BoxFuture;
-    use libp2p_core::{
-        multiaddr::{Multiaddr, Protocol},
-        transport::{TransportError, TransportEvent},
-        Transport,
-    };
+    use libp2p_core::Transport;
     use libp2p_identity::PeerId;
 
     #[test]
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
index 7cc0f859e6e..5c1fa806b6d 100644
--- a/transports/noise/src/io/handshake.rs
+++ b/transports/noise/src/io/handshake.rs
@@ -248,7 +248,7 @@ where
         ..Default::default()
     };
 
-    pb.identity_sig = state.identity.signature.clone();
+    pb.identity_sig.clone_from(&state.identity.signature);
 
     // If this is the responder then send WebTransport certhashes to initiator, if any.
     if state.io.codec().is_responder() {
diff --git a/transports/noise/src/protocol.rs b/transports/noise/src/protocol.rs
index e37c55c7f10..29d0c81e2e4 100644
--- a/transports/noise/src/protocol.rs
+++ b/transports/noise/src/protocol.rs
@@ -292,8 +292,6 @@ impl snow::types::Dh for Keypair {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::protocol::PARAMS_XX;
-    use once_cell::sync::Lazy;
 
     #[test]
     fn handshake_hashes_disagree_if_prologue_differs() {
diff --git a/transports/noise/tests/smoke.rs b/transports/noise/tests/smoke.rs
index 7100e7c7a8d..62b5d41d6b9 100644
--- a/transports/noise/tests/smoke.rs
+++ b/transports/noise/tests/smoke.rs
@@ -25,7 +25,7 @@ use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
 use libp2p_identity as identity;
 use libp2p_noise as noise;
 use quickcheck::*;
-use std::{convert::TryInto, io};
+use std::io;
 use tracing_subscriber::EnvFilter;
 
 #[allow(dead_code)]
diff --git a/transports/quic/src/transport.rs b/transports/quic/src/transport.rs
index aea3c91093f..c33931fc798 100644
--- a/transports/quic/src/transport.rs
+++ b/transports/quic/src/transport.rs
@@ -754,10 +754,8 @@ fn socketaddr_to_multiaddr(socket_addr: &SocketAddr, version: ProtocolVersion) -
 #[cfg(test)]
 #[cfg(any(feature = "async-std", feature = "tokio"))]
 mod tests {
-    use futures::future::poll_fn;
-    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-
     use super::*;
+    use futures::future::poll_fn;
 
     #[test]
     fn multiaddr_to_udp_conversion() {
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
index fbb7008aa5b..c8f0410d9e5 100644
--- a/transports/tcp/src/lib.rs
+++ b/transports/tcp/src/lib.rs
@@ -36,11 +36,7 @@ pub use provider::async_io;
 #[cfg(feature = "tokio")]
 pub use provider::tokio;
 
-use futures::{
-    future::{self, Ready},
-    prelude::*,
-    stream::SelectAll,
-};
+use futures::{future::Ready, prelude::*, stream::SelectAll};
 use futures_timer::Delay;
 use if_watch::IfEvent;
 use libp2p_core::{
diff --git a/transports/tcp/src/provider/tokio.rs b/transports/tcp/src/provider/tokio.rs
index b991c6bdae1..ec2d098e3fb 100644
--- a/transports/tcp/src/provider/tokio.rs
+++ b/transports/tcp/src/provider/tokio.rs
@@ -24,7 +24,6 @@ use futures::{
     future::{BoxFuture, FutureExt},
     prelude::*,
 };
-use std::convert::TryFrom;
 use std::io;
 use std::net;
 use std::pin::Pin;
diff --git a/transports/uds/src/lib.rs b/transports/uds/src/lib.rs
index 075cbadb80a..4b1c7a1670d 100644
--- a/transports/uds/src/lib.rs
+++ b/transports/uds/src/lib.rs
@@ -263,7 +263,7 @@ mod tests {
         transport::ListenerId,
         Transport,
     };
-    use std::{self, borrow::Cow, path::Path};
+    use std::{borrow::Cow, path::Path};
 
     #[test]
     fn multiaddr_to_path_conversion() {
diff --git a/transports/webrtc-websys/src/stream/poll_data_channel.rs b/transports/webrtc-websys/src/stream/poll_data_channel.rs
index 0ee4f7920c9..f323d542eaf 100644
--- a/transports/webrtc-websys/src/stream/poll_data_channel.rs
+++ b/transports/webrtc-websys/src/stream/poll_data_channel.rs
@@ -10,7 +10,7 @@ use bytes::BytesMut;
 use futures::task::AtomicWaker;
 use futures::{AsyncRead, AsyncWrite};
 use libp2p_webrtc_utils::MAX_MSG_LEN;
-use wasm_bindgen::{prelude::*, JsCast};
+use wasm_bindgen::prelude::*;
 use web_sys::{Event, MessageEvent, RtcDataChannel, RtcDataChannelEvent, RtcDataChannelState};
 
 /// [`PollDataChannel`] is a wrapper around around [`RtcDataChannel`] which implements [`AsyncRead`] and [`AsyncWrite`].
diff --git a/transports/webrtc/src/tokio/transport.rs b/transports/webrtc/src/tokio/transport.rs
index 02cfa6f7296..2e73ac9c459 100644
--- a/transports/webrtc/src/tokio/transport.rs
+++ b/transports/webrtc/src/tokio/transport.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::{future::BoxFuture, prelude::*, stream::SelectAll, stream::Stream};
+use futures::{future::BoxFuture, prelude::*, stream::SelectAll};
 use if_watch::{tokio::IfWatcher, IfEvent};
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
@@ -431,9 +431,9 @@ fn parse_webrtc_listen_addr(addr: &Multiaddr) -> Option<SocketAddr> {
 mod tests {
     use super::*;
     use futures::future::poll_fn;
-    use libp2p_core::{multiaddr::Protocol, Transport as _};
+    use libp2p_core::Transport as _;
     use rand::thread_rng;
-    use std::net::{IpAddr, Ipv6Addr};
+    use std::net::Ipv6Addr;
 
     #[test]
     fn missing_webrtc_protocol() {
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index 5c1a6ebf1c4..02b6bc837eb 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -36,7 +36,7 @@ use std::rc::Rc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
 use std::{pin::Pin, task::Context, task::Poll};
-use wasm_bindgen::{prelude::*, JsCast};
+use wasm_bindgen::prelude::*;
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket};
 
 use crate::web_context::WebContext;
diff --git a/transports/websocket-websys/src/web_context.rs b/transports/websocket-websys/src/web_context.rs
index c514435d2bb..2b5d7b46431 100644
--- a/transports/websocket-websys/src/web_context.rs
+++ b/transports/websocket-websys/src/web_context.rs
@@ -1,4 +1,4 @@
-use wasm_bindgen::{prelude::*, JsCast};
+use wasm_bindgen::prelude::*;
 use web_sys::window;
 
 /// Web context that abstract the window vs web worker API
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 3593e1eaff2..584bb2b5058 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -34,7 +34,7 @@ use soketto::{
     handshake,
 };
 use std::{collections::HashMap, ops::DerefMut, sync::Arc};
-use std::{convert::TryInto, fmt, io, mem, pin::Pin, task::Context, task::Poll};
+use std::{fmt, io, mem, pin::Pin, task::Context, task::Poll};
 use url::Url;
 
 /// Max. number of payload bytes of a single frame.
diff --git a/transports/websocket/src/quicksink.rs b/transports/websocket/src/quicksink.rs
index d9edb4dfe0d..cb2c98b078f 100644
--- a/transports/websocket/src/quicksink.rs
+++ b/transports/websocket/src/quicksink.rs
@@ -294,7 +294,7 @@ where
 mod tests {
     use crate::quicksink::{make_sink, Action};
     use async_std::{io, task};
-    use futures::{channel::mpsc, prelude::*, stream};
+    use futures::{channel::mpsc, prelude::*};
 
     #[test]
     fn smoke_test() {
diff --git a/transports/websocket/src/tls.rs b/transports/websocket/src/tls.rs
index 5bff818f34c..24b0df97db3 100644
--- a/transports/websocket/src/tls.rs
+++ b/transports/websocket/src/tls.rs
@@ -19,7 +19,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures_rustls::{rustls, TlsAcceptor, TlsConnector};
-use std::convert::TryFrom;
 use std::{fmt, io, sync::Arc};
 
 /// TLS configuration.

From b890b2962018c86dc68bed38ea0abf7799d91406 Mon Sep 17 00:00:00 2001
From: cui fliter <imcusg@gmail.com>
Date: Mon, 25 Mar 2024 20:09:00 +0800
Subject: [PATCH 151/455] docs: fix typos in some comments

The same as https://github.com/libp2p/rust-libp2p/pull/5196

There are some problem when merging #5196, resubmit this mr.

Pull-Request: #5255.
---
 core/src/transport.rs                      | 4 ++--
 deny.toml                                  | 4 ++--
 examples/stream/README.md                  | 2 +-
 identity/src/secp256k1.rs                  | 2 +-
 protocols/gossipsub/src/behaviour/tests.rs | 2 +-
 protocols/gossipsub/src/config.rs          | 8 ++++----
 protocols/kad/src/behaviour.rs             | 2 +-
 protocols/kad/src/kbucket.rs               | 2 +-
 swarm/src/connection.rs                    | 2 +-
 transports/websocket/src/framed.rs         | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/src/transport.rs b/core/src/transport.rs
index 22e7a0532fa..db8c083bd0a 100644
--- a/core/src/transport.rs
+++ b/core/src/transport.rs
@@ -311,7 +311,7 @@ pub enum TransportEvent<TUpgr, TErr> {
 
 impl<TUpgr, TErr> TransportEvent<TUpgr, TErr> {
     /// In case this [`TransportEvent`] is an upgrade, apply the given function
-    /// to the upgrade and produce another transport event based the the function's result.
+    /// to the upgrade and produce another transport event based the function's result.
     pub fn map_upgrade<U>(self, map: impl FnOnce(TUpgr) -> U) -> TransportEvent<U, TErr> {
         match self {
             TransportEvent::Incoming {
@@ -530,7 +530,7 @@ pub enum TransportError<TErr> {
 }
 
 impl<TErr> TransportError<TErr> {
-    /// Applies a function to the the error in [`TransportError::Other`].
+    /// Applies a function to the error in [`TransportError::Other`].
     pub fn map<TNewErr>(self, map: impl FnOnce(TErr) -> TNewErr) -> TransportError<TNewErr> {
         match self {
             TransportError::MultiaddrNotSupported(addr) => {
diff --git a/deny.toml b/deny.toml
index 6634887128e..dedcb7a3a95 100644
--- a/deny.toml
+++ b/deny.toml
@@ -37,7 +37,7 @@ ignore = [
 [licenses]
 # The lint level for crates which do not have a detectable license
 unlicensed = "deny"
-# List of explictly allowed licenses
+# List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.7 short identifier (+ optional exception)].
 allow = [
@@ -46,7 +46,7 @@ allow = [
     "MIT",
     "Unlicense",
 ]
-# List of explictly disallowed licenses
+# List of explicitly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.7 short identifier (+ optional exception)].
 deny = []
diff --git a/examples/stream/README.md b/examples/stream/README.md
index 8437a5ea21e..3b0325519f7 100644
--- a/examples/stream/README.md
+++ b/examples/stream/README.md
@@ -23,7 +23,7 @@ To run the example, follow these steps:
    cargo run --bin stream-example -- <address>
    ```
 
-3. Both terminals should now continuosly print messages. 
+3. Both terminals should now continuously print messages. 
 
 ## Conclusion
 
diff --git a/identity/src/secp256k1.rs b/identity/src/secp256k1.rs
index 5e1fda2933b..a6e9e923268 100644
--- a/identity/src/secp256k1.rs
+++ b/identity/src/secp256k1.rs
@@ -214,7 +214,7 @@ impl PublicKey {
         self.0.serialize()
     }
 
-    /// Decode a public key from a byte slice in the the format produced
+    /// Decode a public key from a byte slice in the format produced
     /// by `encode`.
     pub fn try_from_bytes(k: &[u8]) -> Result<PublicKey, DecodingError> {
         libsecp256k1::PublicKey::parse_slice(k, Some(libsecp256k1::PublicKeyFormat::Compressed))
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 1a63b52541f..077a1bd22fb 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -2392,7 +2392,7 @@ fn test_dont_graft_to_negative_scored_peers() {
 }
 
 ///Note that in this test also without a penalty the px would be ignored because of the
-/// acceptPXThreshold, but the spec still explicitely states the rule that px from negative
+/// acceptPXThreshold, but the spec still explicitly states the rule that px from negative
 /// peers should get ignored, therefore we test it here.
 #[test]
 fn test_ignore_px_from_negative_scored_peer() {
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index cd2326279eb..8d7d11802ad 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -262,9 +262,9 @@ impl Config {
         self.unsubscribe_backoff
     }
 
-    /// Number of heartbeat slots considered as slack for backoffs. This gurantees that we wait
+    /// Number of heartbeat slots considered as slack for backoffs. This guarantees that we wait
     /// at least backoff_slack heartbeats after a backoff is over before we try to graft. This
-    /// solves problems occuring through high latencies. In particular if
+    /// solves problems occurring through high latencies. In particular if
     /// `backoff_slack * heartbeat_interval` is longer than any latencies between processing
     /// prunes on our side and processing prunes on the receiving side this guarantees that we
     /// get not punished for too early grafting. The default is 1.
@@ -660,9 +660,9 @@ impl ConfigBuilder {
         self
     }
 
-    /// Number of heartbeat slots considered as slack for backoffs. This gurantees that we wait
+    /// Number of heartbeat slots considered as slack for backoffs. This guarantees that we wait
     /// at least backoff_slack heartbeats after a backoff is over before we try to graft. This
-    /// solves problems occuring through high latencies. In particular if
+    /// solves problems occurring through high latencies. In particular if
     /// `backoff_slack * heartbeat_interval` is longer than any latencies between processing
     /// prunes on our side and processing prunes on the receiving side this guarantees that we
     /// get not punished for too early grafting. The default is 1.
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 31568b0f9a8..b1701ed9339 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -2203,7 +2203,7 @@ where
             Some(peer) => peer,
         };
 
-        // We should order addresses from decreasing likelyhood of connectivity, so start with
+        // We should order addresses from decreasing likelihood of connectivity, so start with
         // the addresses of that peer in the k-buckets.
         let key = kbucket::Key::from(peer_id);
         let mut peer_addrs =
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index cf5591c5cf6..5a110fd7c3f 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -344,7 +344,7 @@ enum ClosestBucketsIterState {
     /// The starting state of the iterator yields the first bucket index and
     /// then transitions to `ZoomIn`.
     Start(BucketIndex),
-    /// The iterator "zooms in" to to yield the next bucket cotaining nodes that
+    /// The iterator "zooms in" to yield the next bucket cotaining nodes that
     /// are incrementally closer to the local node but further from the `target`.
     /// These buckets are identified by a `1` in the corresponding bit position
     /// of the distance bit string. When bucket `0` is reached, the iterator
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index a6e8e1c6851..c701f1773e6 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -717,7 +717,7 @@ impl<UserData, Upgrade> Future for SubstreamRequested<UserData, Upgrade> {
 
 /// The options for a planned connection & handler shutdown.
 ///
-/// A shutdown is planned anew based on the the return value of
+/// A shutdown is planned anew based on the return value of
 /// [`ConnectionHandler::connection_keep_alive`] of the underlying handler
 /// after every invocation of [`ConnectionHandler::poll`].
 ///
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 584bb2b5058..ab7bfda43db 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -521,7 +521,7 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
     };
 
     // The original address, stripped of the `/ws` and `/wss` protocols,
-    // makes up the the address for the inner TCP-based transport.
+    // makes up the address for the inner TCP-based transport.
     let tcp_addr = match p2p {
         Some(p) => protocols.with(p),
         None => protocols,

From 0687385eb48ac06787dd686537babbb0c665a72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Schwert?= <hello@soerenschwert.de>
Date: Mon, 25 Mar 2024 14:20:13 +0100
Subject: [PATCH 152/455] fix(websocket-websys): change close code in drop
 implementation to 1000

In browsers, only the code 1000 and codes between 3000-4999 are allowed to be set by userland code: https://websockets.spec.whatwg.org/#dom-websocket-close

I found this while debugging use-after-free errors in our WASM application. Turns out, when connections are timing out, libp2p in rust drops them, but does not seem to close them explicitly (we are using libp2p-swarm). This led to these WebSockets still emitting events, the handlers of which were already dropped on the rust side, though.

A long investigation led me to have a look into the `Result` that gets returned from `close_with_code_and_reason`, and it turns out it's an error! Specifically:
```
InvalidAccessError: Failed to execute 'close' on 'WebSocket': The code must be either 1000, or between 3000 and 4999. 1001 is neither.
```

This PR only fixes the failing closing of the WebSocket, not the remaining use-after-free problem.

Pull-Request: #5229.
---
 Cargo.lock                               | 2 +-
 Cargo.toml                               | 2 +-
 transports/websocket-websys/CHANGELOG.md | 7 +++++++
 transports/websocket-websys/Cargo.toml   | 2 +-
 transports/websocket-websys/src/lib.rs   | 5 +++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4554147f4e4..4c739c2f5ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3450,7 +3450,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket-websys"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "bytes",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index b6508a3d3f2..ce33cec2ba0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,7 +112,7 @@ libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.43.0", path = "transports/websocket" }
-libp2p-websocket-websys = { version = "0.3.1", path = "transports/websocket-websys" }
+libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.2.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.45.1", path = "muxers/yamux" }
 multiaddr = "0.18.1"
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
index 3cfb1b2fbf9..f92b76ebeaa 100644
--- a/transports/websocket-websys/CHANGELOG.md
+++ b/transports/websocket-websys/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.3.2
+
+- Change close code in drop implementation to `1000` given that in browsers only
+  the code `1000` and codes between `3000` and `4999` are allowed to be set by
+  userland code.
+  See [PR 5229](https://github.com/libp2p/rust-libp2p/pull/5229).
+
 ## 0.3.1
 
 - Add support for different WASM environments by introducing a `WebContext` that
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 5855b582c80..c73c753e7b4 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket-websys"
 edition = "2021"
 rust-version = "1.60.0"
 description = "WebSocket for libp2p under WASM environment"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Vince Vasta <vince.vasta@gmail.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index 02b6bc837eb..ca56d5727a5 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -434,13 +434,14 @@ impl AsyncWrite for Connection {
 
 impl Drop for Connection {
     fn drop(&mut self) {
-        const GO_AWAY_STATUS_CODE: u16 = 1001; // See https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1.
+        // In browsers, userland code is not allowed to use any other status code than 1000: https://websockets.spec.whatwg.org/#dom-websocket-close
+        const REGULAR_CLOSE: u16 = 1000; // See https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1.
 
         if let ReadyState::Connecting | ReadyState::Open = self.inner.ready_state() {
             let _ = self
                 .inner
                 .socket
-                .close_with_code_and_reason(GO_AWAY_STATUS_CODE, "connection dropped");
+                .close_with_code_and_reason(REGULAR_CLOSE, "connection dropped");
         }
 
         WebContext::new()

From edaa2d857060a69ff4bbaf2cfca0cf9fa39096df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 25 Mar 2024 14:39:34 +0000
Subject: [PATCH 153/455] chore: re-enable mergify for dependabot & trivial 
 (#5264)

## Description
mergify automatic approval for dependabot PR's was disabled on
https://github.com/libp2p/rust-libp2p/pull/5208 following
malfunctioning.
This PR re-enables mergify's automatic merge of Dependabot PR's and the
`trivial` label with the syntax [suggested on mergify's
doc](https://docs.mergify.com/integrations/dependabot/#2-pr-approval)
---
 .github/mergify.yml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index b464c9aba87..91cd8881237 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -52,22 +52,24 @@ pull_request_rules:
         message: Approvals have been dismissed because the PR was updated after the `send-it` label was applied.
         changes_requested: false
 
-  # - name: Approve trivial maintainer PRs
-  #   conditions:
-  #     - base=master
-  #     - label=trivial
-  #     - author=@libp2p/rust-libp2p-maintainers
-  #   actions:
-  #     review:
+  - name: Approve trivial maintainer PRs
+    conditions:
+      - base=master
+      - label=trivial
+      - author=@libp2p/rust-libp2p-maintainers
+    actions:
+      review:
+        type: APPROVE
 
-  # - name: Approve dependabot PRs of semver-compatible updates
-  #   conditions:
-  #     - author=dependabot[bot]
-  #     - or:
-  #         - title~=bump [^\s]+ from ([1-9]+)\..+ to \1\.      # For major >= 1 versions, only approve updates with the same major version.
-  #         - title~=bump [^\s]+ from 0\.([\d]+)\..+ to 0\.\1\. # For major == 0 versions, only approve updates with the same minor version.
-  #   actions:
-  #     review:
+  - name: Approve dependabot PRs of semver-compatible updates
+    conditions:
+      - author=dependabot[bot]
+      - or:
+          - title~=bump [^\s]+ from ([1-9]+)\..+ to \1\.      # For major >= 1 versions, only approve updates with the same major version.
+          - title~=bump [^\s]+ from 0\.([\d]+)\..+ to 0\.\1\. # For major == 0 versions, only approve updates with the same minor version.
+    actions:
+      review:
+        type: APPROVE
 
 queue_rules:
   - name: default

From e004e28a792f7f9bfce9f0c1d33626e1ced63cfb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 14:57:10 +0000
Subject: [PATCH 154/455] deps: bump bs58 from 0.5.0 to 0.5.1

Pull-Request: #5257.
---
 Cargo.lock          | 4 ++--
 identity/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c739c2f5ab..db94ee49392 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -742,9 +742,9 @@ dependencies = [
 
 [[package]]
 name = "bs58"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
  "tinyvec",
 ]
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 920b9a990e4..1f025353af5 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography"]
 
 [dependencies]
 asn1_der = { version = "0.7.6", optional = true }
-bs58 = { version = "0.5.0", optional = true }
+bs58 = { version = "0.5.1", optional = true }
 ed25519-dalek = { version = "2.1", optional = true }
 hkdf = { version = "0.12.4", optional = true }
 libsecp256k1 = { version = "0.7.0", optional = true }

From b6f70de57b81cc80f053a1223a82a936a9d7b967 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:10:10 +0000
Subject: [PATCH 155/455] deps: bump reqwest from 0.11.26 to 0.11.27

Pull-Request: #5258.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index db94ee49392..f14f326a2d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4804,9 +4804,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.26"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",

From d41350ebad7ddd8827febb5a42408431f7155062 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:22:16 +0000
Subject: [PATCH 156/455] deps: bump regex from 1.10.3 to 1.10.4

Pull-Request: #5261.
---
 Cargo.lock                     | 4 ++--
 protocols/gossipsub/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f14f326a2d7..1e83c240be4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4734,9 +4734,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index f44d3f97fa0..83c1ec0bac4 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -31,7 +31,7 @@ libp2p-swarm = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-regex = "1.10.3"
+regex = "1.10.4"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 smallvec = "1.13.1"

From 81f5d75f640e3da219f9737b41a01789bd7aaa2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:34:54 +0000
Subject: [PATCH 157/455] deps: bump bytes from 1.5.0 to 1.6.0

Pull-Request: #5262.
---
 Cargo.lock                             | 4 ++--
 protocols/floodsub/Cargo.toml          | 2 +-
 protocols/gossipsub/Cargo.toml         | 2 +-
 transports/quic/Cargo.toml             | 2 +-
 transports/websocket-websys/Cargo.toml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e83c240be4..807124bf53f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -773,9 +773,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 dependencies = [
  "serde",
 ]
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 06277273a90..5d109cdedc1 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 asynchronous-codec = { workspace = true }
 cuckoofilter = "0.5.0"
 fnv = "1.0"
-bytes = "1.5"
+bytes = "1.6"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 83c1ec0bac4..383673bc086 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -17,7 +17,7 @@ wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
 asynchronous-codec = { workspace = true }
 base64 = "0.21.7"
 byteorder = "1.5.0"
-bytes = "1.5"
+bytes = "1.6"
 either = "1.9"
 fnv = "1.0.7"
 futures = "0.3.30"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index abfbf0742f4..8642761701f 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT"
 
 [dependencies]
 async-std = { version = "1.12.0", optional = true }
-bytes = "1.5.0"
+bytes = "1.6.0"
 futures = "0.3.30"
 futures-timer = "3.0.3"
 if-watch = "3.2.0"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index c73c753e7b4..7347ac71f17 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-bytes = "1.4.0"
+bytes = "1.6.0"
 futures = "0.3.30"
 js-sys = "0.3.67"
 libp2p-core = { workspace = true }

From c5975142980094b7b8086b812b751a0dcde0aebf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:47:29 +0000
Subject: [PATCH 158/455] deps: bump smallvec from 1.13.1 to 1.13.2

Pull-Request: #5263.
---
 Cargo.lock                            | 4 ++--
 core/Cargo.toml                       | 2 +-
 misc/multistream-select/Cargo.toml    | 2 +-
 muxers/mplex/Cargo.toml               | 2 +-
 protocols/floodsub/Cargo.toml         | 2 +-
 protocols/gossipsub/Cargo.toml        | 2 +-
 protocols/identify/Cargo.toml         | 2 +-
 protocols/kad/Cargo.toml              | 2 +-
 protocols/mdns/Cargo.toml             | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 swarm/Cargo.toml                      | 2 +-
 transports/dns/Cargo.toml             | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 807124bf53f..54fa7ab3ae8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5399,9 +5399,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smol"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 054627bed38..1ef40505aac 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -27,7 +27,7 @@ quick-protobuf = "0.8"
 rand = "0.8"
 rw-stream-sink = { workspace = true }
 serde = { version = "1", optional = true, features = ["derive"] }
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 thiserror = "1.0"
 tracing = "0.1.37"
 unsigned-varint = { workspace = true }
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index b6287505ae4..ea11cb299d2 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -15,7 +15,7 @@ bytes = "1"
 futures = "0.3"
 tracing = "0.1.37"
 pin-project = "1.1.4"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 unsigned-varint = { workspace = true }
 
 [dev-dependencies]
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 7cb4befa22b..3ce7dc5c02f 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
 nohash-hasher = "0.2"
 parking_lot = "0.12"
 rand = "0.8"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 tracing = "0.1.37"
 unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }
 
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 5d109cdedc1..a10d60c5c5c 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 thiserror = "1.0.57"
 tracing = "0.1.37"
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 383673bc086..52ffb675d4b 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -34,7 +34,7 @@ rand = "0.8"
 regex = "1.10.4"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 tracing = "0.1.37"
 void = "1.0.2"
 
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 340df99e4dc..77d90875dfe 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
 lru = "0.12.2"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 thiserror = "1.0"
 tracing = "0.1.37"
 void = "1.0"
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 3a91955cc06..ed7f255ccd8 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -25,7 +25,7 @@ quick-protobuf-codec = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 rand = "0.8"
 sha2 = "0.10.8"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 uint = "0.9"
 void = "1.0"
 futures-timer = "3.0.3"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 0d03a839a6f..15c26c34131 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8.3"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 socket2 = { version = "0.5.6", features = ["all"] }
 tokio = { version = "1.36", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 4b4021285a4..639f4d7b56a 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
 serde_json = { version = "1.0.114", optional = true }
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 tracing = "0.1.37"
 void = "1.0.2"
 futures-timer = "3.0.3"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3fdf06aa19f..81a029bc014 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -24,7 +24,7 @@ lru = "0.12.2"
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 tracing = "0.1.37"
 void = "1"
 wasm-bindgen-futures = { version = "0.4.42", optional = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index f026aac5157..22f6650e0ed 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
 hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 tracing = "0.1.37"
 
 [dev-dependencies]

From f05e5247cd426b7b0b1bc07dd129b8c0484ebf39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:59:36 +0000
Subject: [PATCH 159/455] deps: bump the axum group with 1 update

Pull-Request: #5256.
---
 Cargo.lock                         | 54 +++++++++++-------------------
 examples/browser-webrtc/Cargo.toml |  2 +-
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54fa7ab3ae8..315de03de68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -498,7 +498,7 @@ dependencies = [
  "pin-project-lite",
  "rustversion",
  "serde",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tower",
  "tower-layer",
  "tower-service",
@@ -506,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
  "axum-core 0.4.3",
@@ -530,7 +530,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.0",
  "tokio",
  "tower",
  "tower-layer",
@@ -570,7 +570,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -719,7 +719,7 @@ name = "browser-webrtc-example"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.4",
+ "axum 0.7.5",
  "futures",
  "js-sys",
  "libp2p",
@@ -1848,25 +1848,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "h2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 1.0.0",
- "indexmap 2.2.1",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "half"
 version = "1.8.2"
@@ -2127,7 +2108,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2",
  "http 0.2.9",
  "http-body 0.4.5",
  "httparse",
@@ -2150,7 +2131,6 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.2",
  "http 1.0.0",
  "http-body 1.0.0",
  "httparse",
@@ -2201,12 +2181,11 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
+checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
- "futures-channel",
  "futures-util",
  "http 1.0.0",
  "http-body 1.0.0",
@@ -2214,7 +2193,6 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.6",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -2364,7 +2342,7 @@ name = "interop-tests"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.4",
+ "axum 0.7.5",
  "console_error_panic_hook",
  "either",
  "futures",
@@ -4813,7 +4791,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
@@ -4832,7 +4810,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -5622,6 +5600,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
+
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -5909,7 +5893,7 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 322ae2b8348..bbe2df646f4 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -23,7 +23,7 @@ tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-axum = "0.7.4"
+axum = "0.7.5"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-folder-path"] }

From c150c021484431b5cbdd3a824201f18fab0239dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:12:15 +0000
Subject: [PATCH 160/455] deps: bump proc-macro2 from 1.0.78 to 1.0.79

Pull-Request: #5234.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 315de03de68..e159fa1afba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4396,9 +4396,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]

From 3b5fd35c090fc6b64e5d899a7473f20a7bbe2d15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:31:04 +0000
Subject: [PATCH 161/455] deps: bump the opentelemetry group with 4 updates

Pull-Request: #5259.
---
 Cargo.lock                  | 71 +++++++++++++++++++++++--------------
 examples/metrics/Cargo.toml |  8 ++---
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e159fa1afba..5a8380af0e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -411,6 +411,28 @@ dependencies = [
  "socket2 0.5.6",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "async-task"
 version = "4.4.0"
@@ -4034,13 +4056,12 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a"
+checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
 dependencies = [
  "futures-core",
  "futures-sink",
- "indexmap 2.2.1",
  "js-sys",
  "once_cell",
  "pin-project-lite",
@@ -4050,9 +4071,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930"
+checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb"
 dependencies = [
  "async-trait",
  "futures-core",
@@ -4069,9 +4090,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1"
+checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
@@ -4081,18 +4102,15 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-semantic-conventions"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84"
-dependencies = [
- "opentelemetry",
-]
+checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910"
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.21.2"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4"
+checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e"
 dependencies = [
  "async-trait",
  "crossbeam-channel",
@@ -4428,9 +4446,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.11.9"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -4438,15 +4456,15 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.11.9"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
 dependencies = [
  "anyhow",
  "itertools",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5883,16 +5901,15 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.9.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
 dependencies = [
+ "async-stream",
  "async-trait",
  "axum 0.6.20",
  "base64 0.21.7",
  "bytes",
- "futures-core",
- "futures-util",
  "h2",
  "http 0.2.9",
  "http-body 0.4.5",
@@ -6012,9 +6029,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596"
+checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284"
 dependencies = [
  "js-sys",
  "once_cell",
@@ -6421,9 +6438,9 @@ dependencies = [
 
 [[package]]
 name = "web-time"
-version = "0.2.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 499e1fb7f4b..188121fb7d0 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -12,13 +12,13 @@ release = false
 futures = "0.3.30"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
-opentelemetry = { version = "0.21.0", features = ["metrics"] }
-opentelemetry-otlp = { version = "0.14.0", features = ["metrics"] }
-opentelemetry_sdk = { version = "0.21.2", features = ["rt-tokio", "metrics"] }
+opentelemetry = { version = "0.22.0", features = ["metrics"] }
+opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
+opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1.37"
-tracing-opentelemetry = "0.22.0"
+tracing-opentelemetry = "0.23.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]

From 461b7878474bb241dcff36558e8a5e4673a57b3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:44:53 +0000
Subject: [PATCH 162/455] deps: bump thiserror from 1.0.57 to 1.0.58

Pull-Request: #5237.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a8380af0e1..52e7642c2d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5733,18 +5733,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.57"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index a10d60c5c5c..98e7cc7fd49 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0.57"
+thiserror = "1.0.58"
 tracing = "0.1.37"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 83bb6de8c0e..02bd46550e5 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.57"
+thiserror = "1.0.58"
 tracing = "0.1.37"
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 8642761701f..ca6fdf6b779 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.57"
+thiserror = "1.0.58"
 tokio = { version = "1.36.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.6"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 0ca134d418b..fd7f1a57409 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = "0.16.20"
-thiserror = "1.0.57"
+thiserror = "1.0.58"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.15.1"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 7347ac71f17..0ee6808a3ca 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
-thiserror = "1.0.57"
+thiserror = "1.0.58"
 wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.68", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index f71b6db5d87..faeb8c24d15 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.57"
+thiserror = "1.0.58"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"

From 5bbec49b3ec28c8cc353411ef16e15e8b3d089d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 17:16:56 +0000
Subject: [PATCH 163/455] deps: bump async-trait from 0.1.77 to 0.1.78

Pull-Request: #5235.
---
 Cargo.lock                | 4 ++--
 swarm-test/Cargo.toml     | 2 +-
 transports/dns/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 52e7642c2d5..050911e4985 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -441,9 +441,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index ab27e141a4b..3d20ecd625e 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.77"
+async-trait = "0.1.78"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 22f6650e0ed..fb176bbd1ad 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
-async-trait = "0.1.77"
+async-trait = "0.1.78"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From 38e2f7a360b4304f6084e58f3adc674a7ba8039b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 19:20:27 +0000
Subject: [PATCH 164/455] deps: bump syn from 2.0.52 to 2.0.55

Pull-Request: #5265.
---
 Cargo.lock              | 52 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 050911e4985..27ed826accb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -430,7 +430,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -447,7 +447,7 @@ checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -958,7 +958,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1224,7 +1224,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1341,7 +1341,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1446,7 +1446,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1682,7 +1682,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3269,7 +3269,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4033,7 +4033,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4244,7 +4244,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4441,7 +4441,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4464,7 +4464,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -4983,7 +4983,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.52",
+ "syn 2.0.55",
  "walkdir",
 ]
 
@@ -5244,7 +5244,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5277,7 +5277,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5553,7 +5553,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5603,9 +5603,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "2.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5748,7 +5748,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5850,7 +5850,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -6003,7 +6003,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -6345,7 +6345,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
  "wasm-bindgen-shared",
 ]
 
@@ -6379,7 +6379,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6412,7 +6412,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -6975,7 +6975,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -6995,5 +6995,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index d2d8796acb3..0fb2dac8198 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.52", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.55", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From b75c643b9e3146ae0c6a4725df6aba482de49ea1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 19:39:36 +0000
Subject: [PATCH 165/455] deps: bump anyhow from 1.0.80 to 1.0.81

Pull-Request: #5236.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 27ed826accb..341d462a428 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.80"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index bbe2df646f4..ae86b99e447 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.80"
+anyhow = "1.0.81"
 futures = "0.3.30"
 rand = "0.8"
 tracing = "0.1.37"
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 5581728794e..9536d8d1916 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.4.16", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
-anyhow = "1.0.80"
+anyhow = "1.0.81"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 639f4d7b56a..4fa225dc3cd 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.80"
+anyhow = "1.0.81"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From 1c5a527796be07fd913f497069dc8b47126b9fa4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 22:36:43 +0000
Subject: [PATCH 166/455] deps: bump trybuild from 1.0.89 to 1.0.90

Pull-Request: #5233.
---
 Cargo.lock       | 67 +++++++++++++++++++++++++++++++++++++++---------
 swarm/Cargo.toml |  2 +-
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 341d462a428..517562ba923 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -649,15 +649,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
-[[package]]
-name = "basic-toml"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bimap"
 version = "0.6.3"
@@ -5280,6 +5271,15 @@ dependencies = [
  "syn 2.0.55",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -5899,6 +5899,40 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
+dependencies = [
+ "indexmap 2.2.1",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tonic"
 version = "0.11.0"
@@ -6082,17 +6116,17 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.89"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f"
+checksum = "2aa6f84ec205ebf87fb7a0abdbcd1467fa5af0e86878eb6d888b78ecbb10b6d5"
 dependencies = [
- "basic-toml",
  "glob",
  "once_cell",
  "serde",
  "serde_derive",
  "serde_json",
  "termcolor",
+ "toml",
 ]
 
 [[package]]
@@ -6863,6 +6897,15 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
+[[package]]
+name = "winnow"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 81a029bc014..da4b09487f7 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -54,7 +54,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.89"
+trybuild = "1.0.90"
 tokio = { version = "1.36.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From a372723f327f842e4ff6fa66658c6ec303dab22a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 22:59:28 +0000
Subject: [PATCH 167/455] deps: bump pin-project from 1.1.4 to 1.1.5

Pull-Request: #5216.
---
 Cargo.lock                         | 8 ++++----
 core/Cargo.toml                    | 2 +-
 misc/metrics/Cargo.toml            | 2 +-
 misc/multistream-select/Cargo.toml | 2 +-
 misc/rw-stream-sink/Cargo.toml     | 2 +-
 transports/pnet/Cargo.toml         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 517562ba923..671b05ce61c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4220,18 +4220,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 1ef40505aac..582746d4037 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -22,7 +22,7 @@ multihash = { workspace = true }
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 parking_lot = "0.12.0"
-pin-project = "1.1.4"
+pin-project = "1.1.5"
 quick-protobuf = "0.8"
 rand = "0.8"
 rw-stream-sink = { workspace = true }
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index 38c4777d4a6..b9952e36ba3 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -30,7 +30,7 @@ libp2p-kad = { workspace = true, optional = true }
 libp2p-ping = { workspace = true, optional = true }
 libp2p-relay =  { workspace = true, optional = true }
 libp2p-swarm = { workspace = true }
-pin-project = "1.1.4"
+pin-project = "1.1.5"
 prometheus-client = { workspace = true }
 
 [dev-dependencies]
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index ea11cb299d2..37b5f7753f2 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 bytes = "1"
 futures = "0.3"
 tracing = "0.1.37"
-pin-project = "1.1.4"
+pin-project = "1.1.5"
 smallvec = "1.13.2"
 unsigned-varint = { workspace = true }
 
diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
index f8f103bd6d9..8de0555582c 100644
--- a/misc/rw-stream-sink/Cargo.toml
+++ b/misc/rw-stream-sink/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures = "0.3.30"
-pin-project = "1.1.4"
+pin-project = "1.1.5"
 static_assertions = "1"
 
 [dev-dependencies]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index bdefa76bbd1..43a9da2fba9 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -16,7 +16,7 @@ salsa20 = "0.10"
 sha3 = "0.10"
 tracing = "0.1.37"
 rand = "0.8"
-pin-project = "1.1.4"
+pin-project = "1.1.5"
 
 [dev-dependencies]
 libp2p-core = { workspace = true }

From 89c684aa92dc43acaf86a01881c8467ba79b7df7 Mon Sep 17 00:00:00 2001
From: June Han <sorrowitsch@gmail.com>
Date: Thu, 28 Mar 2024 02:54:42 +0900
Subject: [PATCH 168/455] fix(kad): compute `jobs_query_capacity` accurately

Fixes: #4191.

Pull-Request: #5148.
---
 protocols/kad/CHANGELOG.md     | 2 ++
 protocols/kad/src/behaviour.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 0e781c18916..055dde94234 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -5,6 +5,8 @@
 - Make it mandatory to provide protocol names when creating a `kad::Config`.
   Deprecate `kad::Config::default()`, replaced by `kad::Config::new(StreamProtocol)`.
   See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122).
+- Compute `jobs_query_capacity` accurately.
+  See [PR 5148](https://github.com/libp2p/rust-libp2p/pull/5148).
 
 ## 0.45.3
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index b1701ed9339..6b526edccfe 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -2502,14 +2502,14 @@ where
         // Run the periodic provider announcement job.
         if let Some(mut job) = self.add_provider_job.take() {
             let num = usize::min(JOBS_MAX_NEW_QUERIES, jobs_query_capacity);
-            for _ in 0..num {
+            for i in 0..num {
                 if let Poll::Ready(r) = job.poll(cx, &mut self.store, now) {
                     self.start_add_provider(r.key, AddProviderContext::Republish)
                 } else {
+                    jobs_query_capacity -= i;
                     break;
                 }
             }
-            jobs_query_capacity -= num;
             self.add_provider_job = Some(job);
         }
 

From 695404d56bf51cd86d983e3c699d71bdbd9e87d1 Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Thu, 28 Mar 2024 13:48:08 +0100
Subject: [PATCH 169/455] feat(kad): FIND_NODE for own peer id returns closest
 peers

Fixes https://github.com/libp2p/rust-libp2p/issues/5269.

Pull-Request: #5270.
---
 Cargo.lock                     |  4 ++--
 Cargo.toml                     |  4 ++--
 libp2p/CHANGELOG.md            |  6 ++++++
 libp2p/Cargo.toml              |  2 +-
 protocols/kad/CHANGELOG.md     |  5 +++++
 protocols/kad/Cargo.toml       |  2 +-
 protocols/kad/src/behaviour.rs | 16 ++++++----------
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 671b05ce61c..a48e6570cb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2521,7 +2521,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libp2p"
-version = "0.53.2"
+version = "0.54.0"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2819,7 +2819,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.45.4"
+version = "0.46.0"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index ce33cec2ba0..d0234747e06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,7 +73,7 @@ rust-version = "1.73.0"
 [workspace.dependencies]
 asynchronous-codec = { version = "0.7.0" }
 futures-bounded = { version = "0.2.3" }
-libp2p = { version = "0.53.2", path = "libp2p" }
+libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
@@ -84,7 +84,7 @@ libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.1", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.8" }
-libp2p-kad = { version = "0.45.4", path = "protocols/kad" }
+libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.1", path = "misc/metrics" }
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 80b32c35643..afb7f7444f8 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.54.0 -- unreleased
+
+- Update individual crates.
+    - Update to [`libp2p-kad` `v0.46.0`](protocols/kad/CHANGELOG.md#0460).
+
+
 ## 0.53.2
 
 - Allow `SwarmBuilder::with_bandwidth_metrics` after `SwarmBuilder::with_websocket`.
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 9dc9667be10..fcec353e3f6 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Peer-to-peer networking library"
-version = "0.53.2"
+version = "0.54.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 055dde94234..a6578a5882b 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.46.0 -- unreleased
+
+- Changed `FIND_NODE` response: now includes a list of closest peers when querying the recipient peer ID. Previously, this request yielded an empty response.
+  See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
+
 ## 0.45.4
 
 - Add periodic and automatic bootstrap.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index ed7f255ccd8..5b46642d1ea 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.45.4"
+version = "0.46.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 6b526edccfe..742ae1e4bd1 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -1180,16 +1180,12 @@ where
         target: &kbucket::Key<T>,
         source: &PeerId,
     ) -> Vec<KadPeer> {
-        if target == self.kbuckets.local_key() {
-            Vec::new()
-        } else {
-            self.kbuckets
-                .closest(target)
-                .filter(|e| e.node.key.preimage() != source)
-                .take(self.queries.config().replication_factor.get())
-                .map(KadPeer::from)
-                .collect()
-        }
+        self.kbuckets
+            .closest(target)
+            .filter(|e| e.node.key.preimage() != source)
+            .take(self.queries.config().replication_factor.get())
+            .map(KadPeer::from)
+            .collect()
     }
 
     /// Collects all peers who are known to be providers of the value for a given `Multihash`.

From 9805339e384068537b8970031d5b13dff8586a1c Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Fri, 29 Mar 2024 12:34:30 +0100
Subject: [PATCH 170/455] feat(dht)!: update republish interval and expiration
 time defaults

This patch applies changes from https://github.com/libp2p/specs/pull/451. In particular, the new defaults are:

- Record Expiration: 48h
- Record Republish Interval: 22h

Closes #3229.

Pull-Request: #3230.
---
 protocols/kad/CHANGELOG.md     | 2 ++
 protocols/kad/src/behaviour.rs | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index a6578a5882b..c300b3127da 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Changed `FIND_NODE` response: now includes a list of closest peers when querying the recipient peer ID. Previously, this request yielded an empty response.
   See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
+- Update to DHT republish interval and expiration time defaults to 22h and 48h respectively, rationale in [libp2p/specs#451](https://github.com/libp2p/specs/pull/451)
+  See [PR 3230](https://github.com/libp2p/rust-libp2p/pull/3230)
 
 ## 0.45.4
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 742ae1e4bd1..77ce78da237 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -220,12 +220,12 @@ impl Config {
             kbucket_pending_timeout: Duration::from_secs(60),
             query_config: QueryConfig::default(),
             protocol_config: ProtocolConfig::new(protocol_name),
-            record_ttl: Some(Duration::from_secs(36 * 60 * 60)),
+            record_ttl: Some(Duration::from_secs(48 * 60 * 60)),
             record_replication_interval: Some(Duration::from_secs(60 * 60)),
-            record_publication_interval: Some(Duration::from_secs(24 * 60 * 60)),
+            record_publication_interval: Some(Duration::from_secs(22 * 60 * 60)),
             record_filtering: StoreInserts::Unfiltered,
             provider_publication_interval: Some(Duration::from_secs(12 * 60 * 60)),
-            provider_record_ttl: Some(Duration::from_secs(24 * 60 * 60)),
+            provider_record_ttl: Some(Duration::from_secs(48 * 60 * 60)),
             kbucket_inserts: BucketInserts::OnConnected,
             caching: Caching::Enabled { max_peers: 1 },
             periodic_bootstrap_interval: Some(Duration::from_secs(5 * 60)),

From a5439861447c6bd0cc014ed99fa61e04ab5ade04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 15:36:04 +0000
Subject: [PATCH 171/455] chore(deps): bump golang.org/x/net from 0.10.0 to
 0.17.0

Pull-Request: #5275.
---
 wasm-tests/webtransport-tests/echo-server/go.mod | 2 +-
 wasm-tests/webtransport-tests/echo-server/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wasm-tests/webtransport-tests/echo-server/go.mod b/wasm-tests/webtransport-tests/echo-server/go.mod
index 12804780d8b..5022d4d2a7b 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.mod
+++ b/wasm-tests/webtransport-tests/echo-server/go.mod
@@ -55,7 +55,7 @@ require (
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
diff --git a/wasm-tests/webtransport-tests/echo-server/go.sum b/wasm-tests/webtransport-tests/echo-server/go.sum
index 61dfda6a67d..4140abf9a53 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.sum
+++ b/wasm-tests/webtransport-tests/echo-server/go.sum
@@ -251,8 +251,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

From 855ff8cbe42bed471a507258849a673e6a3e8cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 29 Mar 2024 16:06:01 +0000
Subject: [PATCH 172/455] chore: raise MSRV to 1.75

To allow merging https://github.com/libp2p/rust-libp2p/pull/5232
CC @SuperFluffy since you commented on https://github.com/libp2p/rust-libp2p/pull/4692

Pull-Request: #5266.
---
 Cargo.toml                        | 2 +-
 hole-punching-tests/Dockerfile    | 2 +-
 interop-tests/Dockerfile.chromium | 2 +-
 interop-tests/Dockerfile.native   | 2 +-
 libp2p/CHANGELOG.md               | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d0234747e06..6b6c4033aca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.73.0"
+rust-version = "1.75.0"
 
 [workspace.dependencies]
 asynchronous-codec = { version = "0.7.0" }
diff --git a/hole-punching-tests/Dockerfile b/hole-punching-tests/Dockerfile
index 864f058799e..af00ef2272f 100644
--- a/hole-punching-tests/Dockerfile
+++ b/hole-punching-tests/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.73.0 as builder
+FROM rust:1.75.0 as builder
 
 # Run with access to the target cache to speed up builds
 WORKDIR /workspace
diff --git a/interop-tests/Dockerfile.chromium b/interop-tests/Dockerfile.chromium
index 5ec46e313aa..04af84fdc46 100644
--- a/interop-tests/Dockerfile.chromium
+++ b/interop-tests/Dockerfile.chromium
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.73.0 as chef
+FROM rust:1.75.0 as chef
 RUN rustup target add wasm32-unknown-unknown
 RUN wget -q -O- https://github.com/rustwasm/wasm-pack/releases/download/v0.12.1/wasm-pack-v0.12.1-x86_64-unknown-linux-musl.tar.gz | tar -zx -C /usr/local/bin --strip-components 1 --wildcards "wasm-pack-*/wasm-pack"
 RUN wget -q -O- https://github.com/WebAssembly/binaryen/releases/download/version_115/binaryen-version_115-x86_64-linux.tar.gz | tar -zx -C /usr/local/bin --strip-components 2 --wildcards "binaryen-version_*/bin/wasm-opt"
diff --git a/interop-tests/Dockerfile.native b/interop-tests/Dockerfile.native
index 91e6cf8893e..b122ac72991 100644
--- a/interop-tests/Dockerfile.native
+++ b/interop-tests/Dockerfile.native
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.73.0 as chef
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.75.0 as chef
 WORKDIR /app
 
 FROM chef AS planner
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index afb7f7444f8..e7b1f8e4fab 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -3,6 +3,8 @@
 - Update individual crates.
     - Update to [`libp2p-kad` `v0.46.0`](protocols/kad/CHANGELOG.md#0460).
 
+- Raise MSRV to 1.73.
+  See [PR 5266](https://github.com/libp2p/rust-libp2p/pull/5266).
 
 ## 0.53.2
 

From 098dd0275e656adc9266fd5da3fb34846cf4f0e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 16:41:56 +0000
Subject: [PATCH 173/455] deps: bump clap from 4.4.16 to 4.5.4

Pull-Request: #5279.
---
 Cargo.lock                       | 22 +++++++++++-----------
 examples/autonat/Cargo.toml      |  2 +-
 examples/dcutr/Cargo.toml        |  2 +-
 examples/file-sharing/Cargo.toml |  2 +-
 examples/ipfs-kad/Cargo.toml     |  2 +-
 examples/relay-server/Cargo.toml |  2 +-
 misc/keygen/Cargo.toml           |  2 +-
 misc/server/Cargo.toml           |  2 +-
 protocols/dcutr/Cargo.toml       |  2 +-
 protocols/perf/Cargo.toml        |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a48e6570cb1..404165edf75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -920,9 +920,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.16"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -930,9 +930,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.16"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -942,11 +942,11 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.55",
@@ -954,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "colorchoice"
@@ -5530,9 +5530,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "strum"
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 642e621c257..99a0a9c99e5 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1.36", features = ["full"] }
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 8443e9a59c7..abcb9511f76 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index 8d20a702718..62987ea1724 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.36.0", features = ["full"] }
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = "0.1.37"
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 9536d8d1916..442d38511f6 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.36", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
 anyhow = "1.0.81"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 65c7c707087..b06b4adc11f 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 9fe9e926d76..4ba3457b270 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 release = false
 
 [dependencies]
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 3f46de701e2..2f14e534e14 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.21"
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 8444dc70756..1d29ac22b74 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -29,7 +29,7 @@ futures-bounded = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 68b1088a42c..1352f756b5d 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"

From a94e94384b59fbeeefecd3c2378ead02288bc968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 29 Mar 2024 20:21:38 +0000
Subject: [PATCH 174/455] fix(upnp): don't panic when gateway is dropped

There seems to be a situation when the `Behaviour` and therefore it's `Gateway` is dropped leaving the `tokio` loop to panic.  It has been reported on  https://github.com/sigp/lighthouse/issues/5498, this attempts to fix it.
Cc @dariusc93 can you review this please Darius? Thanks!

Pull-Request: #5273.
---
 Cargo.lock                  | 2 +-
 Cargo.toml                  | 2 +-
 protocols/upnp/CHANGELOG.md | 5 +++++
 protocols/upnp/Cargo.toml   | 2 +-
 protocols/upnp/src/tokio.rs | 8 ++++----
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 404165edf75..c8b5437cc84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3334,7 +3334,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-upnp"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "futures",
  "futures-timer",
diff --git a/Cargo.toml b/Cargo.toml
index 6b6c4033aca..a8c99e340f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,7 +107,7 @@ libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
-libp2p-upnp = { version = "0.2.1", path = "protocols/upnp" }
+libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
diff --git a/protocols/upnp/CHANGELOG.md b/protocols/upnp/CHANGELOG.md
index ba031264a0f..9472c7153c6 100644
--- a/protocols/upnp/CHANGELOG.md
+++ b/protocols/upnp/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.2
+- Fix a panic caused when `upnp::Gateway` is dropped and its events queue receiver is no longer
+available.
+  See [PR 5273](https://github.com/libp2p/rust-libp2p/pull/5273).
+
 ## 0.2.1
 - Fix a panic caused when dropping `upnp::Behaviour` such as when used together with `Toggle`.
   See [PR 5096](https://github.com/libp2p/rust-libp2p/pull/5096).
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 3119804bf60..0ecc2c84b23 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-upnp"
 edition = "2021"
 rust-version = "1.60.0"
 description = "UPnP support for libp2p transports"
-version = "0.2.1"
+version = "0.2.2"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/protocols/upnp/src/tokio.rs b/protocols/upnp/src/tokio.rs
index 9c8b2cafef9..b2cad6fa5a7 100644
--- a/protocols/upnp/src/tokio.rs
+++ b/protocols/upnp/src/tokio.rs
@@ -158,10 +158,10 @@ pub(crate) fn search_gateway() -> oneshot::Receiver<Result<Gateway, Box<dyn Erro
                     }
                 }
             };
-            task_sender
-                .send(event)
-                .await
-                .expect("receiver should be available");
+            // Gateway was dropped.
+            if task_sender.send(event).await.is_err() {
+                return;
+            }
         }
     });
 

From 5c9769229a26113ce463b682a0302800be1a6926 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 08:41:30 +0000
Subject: [PATCH 175/455] deps: bump lru from 0.12.2 to 0.12.3

Pull-Request: #5219.
---
 Cargo.lock                    | 4 ++--
 protocols/dcutr/Cargo.toml    | 2 +-
 protocols/identify/Cargo.toml | 2 +-
 swarm/Cargo.toml              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8b5437cc84..464a66e2a62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3580,9 +3580,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
  "hashbrown 0.14.3",
 ]
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 1d29ac22b74..c6975337557 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -24,7 +24,7 @@ quick-protobuf-codec = { workspace = true }
 thiserror = "1.0"
 tracing = "0.1.37"
 void = "1"
-lru = "0.12.2"
+lru = "0.12.3"
 futures-bounded = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 77d90875dfe..db42f4b9df2 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -18,7 +18,7 @@ futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
-lru = "0.12.2"
+lru = "0.12.3"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.13.2"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index da4b09487f7..1efb65f1624 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -20,7 +20,7 @@ instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }
-lru = "0.12.2"
+lru = "0.12.3"
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"

From 896344f6bd9f321e3d448ccb1320412e117adde5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 10:32:01 +0000
Subject: [PATCH 176/455] deps: bump syn from 2.0.55 to 2.0.57

Pull-Request: #5282.
---
 Cargo.lock              | 52 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 464a66e2a62..c5c071676c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -430,7 +430,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -447,7 +447,7 @@ checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -949,7 +949,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1215,7 +1215,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1332,7 +1332,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1437,7 +1437,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1673,7 +1673,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -3260,7 +3260,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -4024,7 +4024,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -4235,7 +4235,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -4432,7 +4432,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -4455,7 +4455,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -4974,7 +4974,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.55",
+ "syn 2.0.57",
  "walkdir",
 ]
 
@@ -5235,7 +5235,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -5268,7 +5268,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -5553,7 +5553,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -5603,9 +5603,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.55"
+version = "2.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
+checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5748,7 +5748,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -5850,7 +5850,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -6037,7 +6037,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -6379,7 +6379,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
  "wasm-bindgen-shared",
 ]
 
@@ -6413,7 +6413,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6446,7 +6446,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -7018,7 +7018,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -7038,5 +7038,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.57",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 0fb2dac8198..153c812e19e 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.55", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.57", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From ab4f664e0437ce486b0aa3401f6eccaf3bcdb541 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 10:46:14 +0000
Subject: [PATCH 177/455] deps: bump trybuild from 1.0.90 to 1.0.91

Pull-Request: #5283.
---
 Cargo.lock       | 4 ++--
 swarm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c5c071676c2..39c13831470 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6116,9 +6116,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.90"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aa6f84ec205ebf87fb7a0abdbcd1467fa5af0e86878eb6d888b78ecbb10b6d5"
+checksum = "8ad7eb6319ebadebca3dacf1f85a93bc54b73dd81b9036795f73de7ddfe27d5a"
 dependencies = [
  "glob",
  "once_cell",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 1efb65f1624..d7e78bf112e 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -54,7 +54,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.90"
+trybuild = "1.0.91"
 tokio = { version = "1.36.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From c34c48d4e32269fd633eca1a957c7ae7ef436860 Mon Sep 17 00:00:00 2001
From: crazeteam <164632007+crazeteam@users.noreply.github.com>
Date: Mon, 1 Apr 2024 19:23:09 +0800
Subject: [PATCH 178/455] docs: fix typos in some comments (#5271)

fix typos in some comments
---
 core/CHANGELOG.md                          | 2 +-
 libp2p/CHANGELOG.md                        | 2 +-
 protocols/gossipsub/src/behaviour.rs       | 2 +-
 protocols/gossipsub/src/behaviour/tests.rs | 2 +-
 swarm/CHANGELOG.md                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index a7cd7fd46b4..73f377a8aa5 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -304,7 +304,7 @@
 
 - Add `From<&PublicKey> for PeerId` (see [PR 2145]).
 
-- Remove `TInEvent` and `TOutEvent` trait paramters on most public types.
+- Remove `TInEvent` and `TOutEvent` trait parameters on most public types.
   `TInEvent` and `TOutEvent` are implied through `THandler` and thus
   superflucious. Both are removed in favor of a derivation through `THandler`
   (see [PR 2183]).
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index e7b1f8e4fab..7acd4ab602d 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1193,7 +1193,7 @@ must not be skipped!
 - Merged `PeriodicPing` and `PingListen` into one `Ping` behaviour.
 - `Floodsub` now generates `FloodsubEvent`s instead of direct floodsub messages.
 - Added `ProtocolsHandler::connection_keep_alive`. If all the handlers return `false`, then the connection to the remote node will automatically be gracefully closed after a few seconds.
-- The crate now successfuly compiles for the `wasm32-unknown-unknown` target.
+- The crate now successfully compiles for the `wasm32-unknown-unknown` target.
 - Updated `ring` to version 0.13.
 - Updated `secp256k1` to version 0.12.
 - The enum returned by `RawSwarm::peer()` can now return `LocalNode`. This makes it impossible to accidentally attempt to dial the local node.
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index f2515c3c564..6da2aceaa08 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -1297,7 +1297,7 @@ where
 
         for id in iwant_msgs {
             // If we have it and the IHAVE count is not above the threshold,
-            // foward the message.
+            // forward the message.
             if let Some((msg, count)) = self
                 .mcache
                 .get_with_iwant_counts(&id, peer_id)
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 077a1bd22fb..3cf61f9bb41 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -1146,7 +1146,7 @@ fn test_handle_ihave_subscribed_and_msg_not_cached() {
 
     assert!(
         iwant_exists,
-        "Expected to send an IWANT control message for unkown message id"
+        "Expected to send an IWANT control message for unknown message id"
     );
 }
 
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 3d8e3981c96..75e18a6a5af 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -605,7 +605,7 @@
 ## 0.34.0 [2022-02-22]
 
 - Rename `ProtocolsHandler` to `ConnectionHandler`. Upgrade should be as simple as renaming all
-  occurences of `ProtocolsHandler` to `ConnectionHandler` with your favorite text manipulation tool
+  occurrences of `ProtocolsHandler` to `ConnectionHandler` with your favorite text manipulation tool
   across your codebase. See [PR 2527].
 
 - Fold `libp2p-core`'s `Network` into `Swarm`. See [PR 2492].

From ad510f3114f6d0bf5691a171ca7d9412d5a3b5c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:12:23 +0000
Subject: [PATCH 179/455] deps: bump web-sys from 0.3.68 to 0.3.69

Pull-Request: #5218.
---
 Cargo.lock                                | 4 ++--
 transports/webrtc-websys/Cargo.toml       | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39c13831470..95d84ce526f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6462,9 +6462,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 3c212e195c1..eb41d1fa3d4 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -25,7 +25,7 @@ thiserror = "1"
 tracing = "0.1.37"
 wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.42" }
-web-sys = { version = "0.3.68", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
+web-sys = { version = "0.3.69", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
 workspace = true
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 0ee6808a3ca..7933eda8566 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
 thiserror = "1.0.58"
 wasm-bindgen = "0.2.90"
-web-sys = { version = "0.3.68", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
+web-sys = { version = "0.3.69", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index faeb8c24d15..0de0c206401 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1.0.58"
 tracing = "0.1.37"
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"
-web-sys = { version = "0.3.68", features = [
+web-sys = { version = "0.3.69", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
     "WebTransportBidirectionalStream",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 918df42bef7..8b0cb85c3be 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -20,7 +20,7 @@ multihash = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"
 wasm-bindgen-test = "0.3.42"
-web-sys = { version = "0.3.68", features = ["Response", "Window"] }
+web-sys = { version = "0.3.69", features = ["Response", "Window"] }
 
 [lints]
 workspace = true

From 0cc520ba5e1b9fe44f9d964c022e4ffb82525804 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:27:36 +0000
Subject: [PATCH 180/455] deps: bump pin-project-lite from 0.2.13 to 0.2.14

Pull-Request: #5285.
---
 Cargo.lock                      | 4 ++--
 transports/websocket/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95d84ce526f..a7b50bcd119 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4240,9 +4240,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 473aeb2c8ff..01a094f2e14 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -17,7 +17,7 @@ futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
-pin-project-lite = "0.2.13"
+pin-project-lite = "0.2.14"
 rw-stream-sink = { workspace = true }
 soketto = "0.8.0"
 tracing = "0.1.37"

From 1bc6c0710ecfe0c51b69e73560caa9ee9e2a8f3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:41:53 +0000
Subject: [PATCH 181/455] deps: bump async-trait from 0.1.78 to 0.1.79

Pull-Request: #5286.
---
 Cargo.lock                | 4 ++--
 swarm-test/Cargo.toml     | 2 +-
 transports/dns/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a7b50bcd119..6dd78a37f00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -441,9 +441,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.78"
+version = "0.1.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
+checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index 3d20ecd625e..8fff18b5d0c 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.78"
+async-trait = "0.1.79"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index fb176bbd1ad..a6061339197 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
-async-trait = "0.1.78"
+async-trait = "0.1.79"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From 6130cd61e67d63d33500ac4da0441ccb70cd527c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:53:31 +0000
Subject: [PATCH 182/455] deps: bump serde_json from 1.0.114 to 1.0.115

Pull-Request: #5287.
---
 Cargo.lock                            | 4 ++--
 hole-punching-tests/Cargo.toml        | 2 +-
 misc/keygen/Cargo.toml                | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6dd78a37f00..94e4fe236b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5240,9 +5240,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "indexmap 2.2.1",
  "itoa",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index c8e6cde98e0..5b95f3851b2 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.36.0", features = ["full"] }
 serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.114"
+serde_json = "1.0.115"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 4ba3457b270..4e6aaa8ddfd 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.114"
+serde_json = "1.0.115"
 libp2p-core = { workspace = true }
 base64 = "0.21.7"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 4fa225dc3cd..ecfd01be945 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.114", optional = true }
+serde_json = { version = "1.0.115", optional = true }
 smallvec = "1.13.2"
 tracing = "0.1.37"
 void = "1.0.2"

From 7580147d675e250d1ae1a38eaecff43e6bc00921 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 15:10:14 +0000
Subject: [PATCH 183/455] deps: bump js-sys from 0.3.68 to 0.3.69

Pull-Request: #5222.
---
 examples/browser-webrtc/Cargo.toml        | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index ae86b99e447..c9f8f2707aa 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -34,7 +34,7 @@ tower-http = { version = "0.5.2", features = ["cors"] }
 mime_guess = "2.0.4"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = "0.3.67"
+js-sys = "0.3.69"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "wasm-bindgen"] }
 libp2p-webrtc-websys = { workspace = true }
 tracing-wasm = "0.2.1"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 7933eda8566..59807509c8b 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 bytes = "1.6.0"
 futures = "0.3.30"
-js-sys = "0.3.67"
+js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 tracing = "0.1.37"
 parking_lot = "0.12.1"
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 0de0c206401..671f377d1d9 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures = "0.3.30"
-js-sys = "0.3.67"
+js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-noise = { workspace = true }

From 367d2a12bfc8a43c722e6139a98bbbfcd164401d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 15:23:28 +0000
Subject: [PATCH 184/455] deps: bump tokio from 1.36.0 to 1.37.0

Pull-Request: #5288.
---
 Cargo.lock                         | 4 ++--
 examples/autonat/Cargo.toml        | 2 +-
 examples/browser-webrtc/Cargo.toml | 2 +-
 examples/chat/Cargo.toml           | 2 +-
 examples/dcutr/Cargo.toml          | 2 +-
 examples/file-sharing/Cargo.toml   | 2 +-
 examples/ipfs-kad/Cargo.toml       | 2 +-
 examples/ipfs-private/Cargo.toml   | 2 +-
 examples/ping/Cargo.toml           | 2 +-
 examples/rendezvous/Cargo.toml     | 2 +-
 examples/stream/Cargo.toml         | 2 +-
 hole-punching-tests/Cargo.toml     | 2 +-
 interop-tests/Cargo.toml           | 2 +-
 protocols/mdns/Cargo.toml          | 4 ++--
 protocols/perf/Cargo.toml          | 2 +-
 protocols/rendezvous/Cargo.toml    | 2 +-
 protocols/upnp/Cargo.toml          | 2 +-
 swarm/Cargo.toml                   | 4 ++--
 transports/pnet/Cargo.toml         | 2 +-
 transports/quic/Cargo.toml         | 4 ++--
 transports/tcp/Cargo.toml          | 4 ++--
 transports/tls/Cargo.toml          | 2 +-
 transports/uds/Cargo.toml          | 2 +-
 transports/webrtc/Cargo.toml       | 4 ++--
 24 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 94e4fe236b4..e8fbfb84274 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5815,9 +5815,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 99a0a9c99e5..b5c314414f7 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.37", features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index c9f8f2707aa..ef7fab331a3 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -27,7 +27,7 @@ axum = "0.7.5"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-folder-path"] }
-tokio = { version = "1.36", features = ["macros", "net", "rt", "signal"] }
+tokio = { version = "1.37", features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
 tower-http = { version = "0.5.2", features = ["cors"] }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index a16c930e5b3..4fb0243dd90 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.37", features = ["full"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index abcb9511f76..17227586951 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
-tokio = { version = "1.36", features = ["macros", "net", "rt", "signal"] }
+tokio = { version = "1.37", features = ["macros", "net", "rt", "signal"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index 62987ea1724..fdade7933cc 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.37.0", features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 442d38511f6..106faff77b6 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.36", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.37", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index daa68cd8f5a..ccfe7484f6a 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.36", features = ["rt-multi-thread", "macros", "io-std"] }
+tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.9"
 futures = "0.3.30"
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index db47e4e2d8e..3ba28b54a5c 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.37.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index edd5b8031a4..14ce7d58012 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.36", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "time"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index 37f84e6ed62..64ca12fbb46 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
 libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
 rand = "0.8"
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.37", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 5b95f3851b2..7c372e23bee 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.37.0", features = ["full"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 either = "1.9.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 410d3dbce2b..fe6c53a13c2 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -34,7 +34,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 rust-embed = "8.3"
 serde_json = "1"
 thirtyfour = "=0.32.0-rc.10" # https://github.com/stevepryde/thirtyfour/issues/169
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.37.0", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 15c26c34131..3d40e2dfe71 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8.3"
 smallvec = "1.13.2"
 socket2 = { version = "0.5.6", features = ["all"] }
-tokio = { version = "1.36", default-features = false, features = ["net", "time"], optional = true}
+tokio = { version = "1.37", default-features = false, features = ["net", "time"], optional = true}
 tracing = "0.1.37"
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
 void = "1.0.2"
@@ -37,7 +37,7 @@ libp2p-noise = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] }
 libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.36", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
+tokio = { version = "1.37", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 1352f756b5d..599c8c21fb2 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tokio = { version = "1.36", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
+tokio = { version = "1.37", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
 void = "1"
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index e588c6d7a6b..5c7d69810b3 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -37,7 +37,7 @@ libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
-tokio = { version = "1.36", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
+tokio = { version = "1.37", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 0ecc2c84b23..d1fec8651d5 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -16,7 +16,7 @@ futures-timer = "3.0.3"
 igd-next = "0.14.3"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
-tokio = { version = "1.36", default-features = false, features = ["rt"], optional = true }
+tokio = { version = "1.37", default-features = false, features = ["rt"], optional = true }
 tracing = "0.1.37"
 void = "1.0.2"
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index d7e78bf112e..fc4094f16ab 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -31,7 +31,7 @@ wasm-bindgen-futures = { version = "0.4.42", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
-tokio = { version = "1.36", features = ["rt"], optional = true }
+tokio = { version = "1.37", features = ["rt"], optional = true }
 
 [features]
 macros = ["dep:libp2p-swarm-derive"]
@@ -55,7 +55,7 @@ quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.91"
-tokio = { version = "1.36.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.37.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index 43a9da2fba9..294d11af14e 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -27,7 +27,7 @@ libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-websocket = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.37.0", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index ca6fdf6b779..52483cbcccd 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -22,7 +22,7 @@ quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls"
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.58"
-tokio = { version = "1.36.0", default-features = false, features = ["net", "rt", "time"], optional = true }
+tokio = { version = "1.37.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = "0.1.37"
 socket2 = "0.5.6"
 ring = "0.16.20"
@@ -46,7 +46,7 @@ libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
-tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "time"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 6fd4aec73fe..9cedec22374 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -19,7 +19,7 @@ libc = "0.2.153"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.6", features = ["all"] }
-tokio = { version = "1.36.0", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.37.0", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [features]
@@ -29,7 +29,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.36.0", default-features = false, features = ["full"] }
+tokio = { version = "1.37.0", default-features = false, features = ["full"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index fd7f1a57409..6fee65f322d 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -33,7 +33,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rsa", "secp256k1", "ecdsa", "rand"] }
 libp2p-swarm = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.37.0", features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index 7b01e0e38d5..b9ae6af7425 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
 futures = "0.3.30"
-tokio = { version = "1.36", default-features = false, features = ["net"], optional = true }
+tokio = { version = "1.37", default-features = false, features = ["net"], optional = true }
 tracing = "0.1.37"
 
 [dev-dependencies]
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 1bd1bd57a61..883d5c92a6c 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] }
 stun = "0.5"
 thiserror = "1"
 tinytemplate = "1.2"
-tokio = { version = "1.36", features = ["net"], optional = true }
+tokio = { version = "1.37", features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
 tracing = "0.1.37"
 webrtc = { version = "0.9.0", optional = true }
@@ -39,7 +39,7 @@ pem = ["webrtc?/pem"]
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.37", features = ["full"] }
 quickcheck = "1.0.3"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 9560261077296ee293701beb2cd57531e15945f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:58:59 +0000
Subject: [PATCH 185/455] deps: bump reqwest from 0.11.27 to 0.12.2

Pull-Request: #5284.
---
 Cargo.lock               | 89 +++++++++++++++++++++++++++++++++++-----
 interop-tests/Cargo.toml |  2 +-
 2 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e8fbfb84274..fa14ee1f847 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1861,6 +1861,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 1.0.0",
+ "indexmap 2.2.1",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "1.8.2"
@@ -2121,7 +2140,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.24",
  "http 0.2.9",
  "http-body 0.4.5",
  "httparse",
@@ -2144,6 +2163,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
+ "h2 0.4.3",
  "http 1.0.0",
  "http-body 1.0.0",
  "httparse",
@@ -2151,6 +2171,7 @@ dependencies = [
  "itoa",
  "pin-project-lite",
  "tokio",
+ "want",
 ]
 
 [[package]]
@@ -2181,15 +2202,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
- "hyper 0.14.27",
+ "http-body-util",
+ "hyper 1.1.0",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
 ]
 
 [[package]]
@@ -2199,6 +2223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
+ "futures-channel",
  "futures-util",
  "http 1.0.0",
  "http-body 1.0.0",
@@ -2206,6 +2231,9 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.6",
  "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -2370,7 +2398,7 @@ dependencies = [
  "mime_guess",
  "rand 0.8.5",
  "redis",
- "reqwest",
+ "reqwest 0.12.2",
  "rust-embed",
  "serde",
  "serde_json",
@@ -4800,17 +4828,15 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.24",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
  "hyper-rustls",
- "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -4822,7 +4848,6 @@ dependencies = [
  "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls",
  "tower-service",
  "url",
@@ -4833,6 +4858,48 @@ dependencies = [
  "winreg",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.3",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.1.0",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.7.0"
@@ -5706,7 +5773,7 @@ dependencies = [
  "indexmap 2.2.1",
  "parking_lot",
  "paste",
- "reqwest",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "serde_repr",
@@ -5944,7 +6011,7 @@ dependencies = [
  "axum 0.6.20",
  "base64 0.21.7",
  "bytes",
- "h2",
+ "h2 0.3.24",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index fe6c53a13c2..5d15fd5a9f0 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -47,7 +47,7 @@ wasm-bindgen = { version = "0.2" }
 wasm-bindgen-futures = { version = "0.4" }
 wasm-logger = { version = "0.2.0" }
 instant = "0.1.12"
-reqwest = { version = "0.11", features = ["json"] }
+reqwest = { version = "0.12", features = ["json"] }
 console_error_panic_hook = { version = "0.1.7" }
 futures-timer = "3.0.3"
 

From 9785dcae9c8634dc6dcd91a07553a9d7b13d8e86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:26:16 +0000
Subject: [PATCH 186/455] deps: bump x509-parser from 0.15.1 to 0.16.0

Pull-Request: #5205.
---
 Cargo.lock                | 114 ++++++++++++++++++++++++++++++++++----
 transports/tls/Cargo.toml |   2 +-
 2 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa14ee1f847..84aae921d7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -178,8 +178,24 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
 dependencies = [
- "asn1-rs-derive",
- "asn1-rs-impl",
+ "asn1-rs-derive 0.4.0",
+ "asn1-rs-impl 0.1.0",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d"
+dependencies = [
+ "asn1-rs-derive 0.5.0",
+ "asn1-rs-impl 0.2.0",
  "displaydoc",
  "nom",
  "num-traits",
@@ -197,7 +213,19 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.57",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -211,6 +239,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "asn1-rs-impl"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.57",
+]
+
 [[package]]
 name = "asn1_der"
 version = "0.7.6"
@@ -1275,7 +1314,21 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
- "asn1-rs",
+ "asn1-rs 0.5.2",
+ "displaydoc",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "der-parser"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
+dependencies = [
+ "asn1-rs 0.6.1",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -3344,7 +3397,7 @@ dependencies = [
  "rustls-webpki",
  "thiserror",
  "tokio",
- "x509-parser",
+ "x509-parser 0.16.0",
  "yasna",
 ]
 
@@ -4008,7 +4061,16 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
 dependencies = [
- "asn1-rs",
+ "asn1-rs 0.5.2",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d"
+dependencies = [
+ "asn1-rs 0.6.1",
 ]
 
 [[package]]
@@ -4695,7 +4757,7 @@ dependencies = [
  "pem",
  "ring 0.16.20",
  "time",
- "x509-parser",
+ "x509-parser 0.15.1",
  "yasna",
 ]
 
@@ -5703,6 +5765,17 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.57",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.29.11"
@@ -6624,7 +6697,7 @@ dependencies = [
  "byteorder",
  "cbc",
  "ccm",
- "der-parser",
+ "der-parser 8.2.0",
  "hkdf",
  "hmac 0.12.1",
  "log",
@@ -6645,7 +6718,7 @@ dependencies = [
  "tokio",
  "webrtc-util",
  "x25519-dalek",
- "x509-parser",
+ "x509-parser 0.15.1",
 ]
 
 [[package]]
@@ -7001,18 +7074,35 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
 dependencies = [
- "asn1-rs",
+ "asn1-rs 0.5.2",
  "data-encoding",
- "der-parser",
+ "der-parser 8.2.0",
  "lazy_static",
  "nom",
- "oid-registry",
+ "oid-registry 0.6.1",
  "ring 0.16.20",
  "rusticata-macros",
  "thiserror",
  "time",
 ]
 
+[[package]]
+name = "x509-parser"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
+dependencies = [
+ "asn1-rs 0.6.1",
+ "data-encoding",
+ "der-parser 9.0.0",
+ "lazy_static",
+ "nom",
+ "oid-registry 0.7.0",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "xml-rs"
 version = "0.8.17"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 6fee65f322d..4fed28c64d4 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -17,7 +17,7 @@ rcgen = "0.11.3"
 ring = "0.16.20"
 thiserror = "1.0.58"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
-x509-parser = "0.15.1"
+x509-parser = "0.16.0"
 yasna = "0.5.2"
 
 # Exposed dependencies. Breaking changes to these are breaking changes to us.

From 3d16353ef972fe072d167bc198cb81c898e9198d Mon Sep 17 00:00:00 2001
From: maqi <qi.ma@maidsafe.net>
Date: Wed, 3 Apr 2024 15:39:39 +0800
Subject: [PATCH 187/455] fix(kad): close progress whenever closer in range

Pull-Request: #4934.
---
 protocols/kad/CHANGELOG.md               |  2 ++
 protocols/kad/src/query/peers/closest.rs | 25 ++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index c300b3127da..0a561b14448 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -4,6 +4,8 @@
   See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
 - Update to DHT republish interval and expiration time defaults to 22h and 48h respectively, rationale in [libp2p/specs#451](https://github.com/libp2p/specs/pull/451)
   See [PR 3230](https://github.com/libp2p/rust-libp2p/pull/3230)
+- QueryClose progress whenever closer in range, instead of having to be the closest.
+  See [PR 4934](https://github.com/libp2p/rust-libp2p/pull/4934).
 
 ## 0.45.4
 
diff --git a/protocols/kad/src/query/peers/closest.rs b/protocols/kad/src/query/peers/closest.rs
index 537da6a9d7d..3ee12b98244 100644
--- a/protocols/kad/src/query/peers/closest.rs
+++ b/protocols/kad/src/query/peers/closest.rs
@@ -174,6 +174,20 @@ impl ClosestPeersIter {
             },
         }
 
+        let mut cur_range = distance;
+        let num_results = self.config.num_results.get();
+        // furthest_peer is the furthest peer in range among the closest_peers
+        let furthest_peer = self
+            .closest_peers
+            .iter()
+            .enumerate()
+            .nth(num_results - 1)
+            .map(|(_, peer)| peer)
+            .or_else(|| self.closest_peers.iter().last());
+        if let Some((dist, _)) = furthest_peer {
+            cur_range = *dist;
+        }
+
         // Incorporate the reported closer peers into the iterator.
         //
         // The iterator makes progress if:
@@ -189,9 +203,16 @@ impl ClosestPeersIter {
                 key,
                 state: PeerState::NotContacted,
             };
-            self.closest_peers.entry(distance).or_insert(peer);
 
-            progress = self.closest_peers.keys().next() == Some(&distance) || progress;
+            let is_first_insert = match self.closest_peers.entry(distance) {
+                Entry::Occupied(_) => false,
+                Entry::Vacant(entry) => {
+                    entry.insert(peer);
+                    true
+                }
+            };
+
+            progress = (is_first_insert && distance < cur_range) || progress;
         }
 
         // Update the iterator state.

From 6be653faf7310047c5935762702ebddd14ab33b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 3 Apr 2024 11:34:40 +0100
Subject: [PATCH 188/455] chore(deps): update wasm tests go dependencies group

Pull-Request: #5290.
---
 .../webtransport-tests/echo-server/Dockerfile |   2 +-
 .../webtransport-tests/echo-server/go.mod     |  93 ++++++---
 .../webtransport-tests/echo-server/go.sum     | 189 ++++++++++++++++--
 .../webtransport-tests/echo-server/main.go    |   3 +-
 4 files changed, 236 insertions(+), 51 deletions(-)

diff --git a/wasm-tests/webtransport-tests/echo-server/Dockerfile b/wasm-tests/webtransport-tests/echo-server/Dockerfile
index f498e2baa1b..2d973c49041 100644
--- a/wasm-tests/webtransport-tests/echo-server/Dockerfile
+++ b/wasm-tests/webtransport-tests/echo-server/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM docker.io/library/golang:1.20 AS builder
+FROM docker.io/library/golang:1.22 AS builder
 WORKDIR /workspace
 ADD . .
 RUN CGO_ENABLED=0 go build .
diff --git a/wasm-tests/webtransport-tests/echo-server/go.mod b/wasm-tests/webtransport-tests/echo-server/go.mod
index 5022d4d2a7b..1df54d5dbea 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.mod
+++ b/wasm-tests/webtransport-tests/echo-server/go.mod
@@ -1,64 +1,91 @@
 module echo-server
 
-go 1.20
+go 1.22
 
 require (
-	github.com/libp2p/go-libp2p v0.27.8
-	github.com/multiformats/go-multiaddr v0.9.0
+	github.com/libp2p/go-libp2p v0.33.1
+	github.com/multiformats/go-multiaddr v0.12.2
 )
 
 require (
-	github.com/benbjohnson/clock v1.3.0 // indirect
+	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/containerd/cgroups v1.1.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
-	github.com/flynn/noise v1.0.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/elastic/gosigar v0.14.2 // indirect
+	github.com/flynn/noise v1.1.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/golang/mock v1.6.0 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
-	github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // indirect
+	github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
-	github.com/klauspost/compress v1.16.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/compress v1.17.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/koron/go-ssdp v0.0.4 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-flow-metrics v0.1.0 // indirect
+	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
+	github.com/libp2p/go-msgio v0.3.0 // indirect
+	github.com/libp2p/go-nat v0.2.0 // indirect
 	github.com/libp2p/go-netroute v0.2.1 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/libp2p/go-reuseport v0.4.0 // indirect
+	github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
+	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/miekg/dns v1.1.58 // indirect
+	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
+	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
+	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
+	github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
+	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multibase v0.2.0 // indirect
-	github.com/multiformats/go-multicodec v0.8.1 // indirect
-	github.com/multiformats/go-multihash v0.2.1 // indirect
-	github.com/multiformats/go-multistream v0.4.1 // indirect
+	github.com/multiformats/go-multicodec v0.9.0 // indirect
+	github.com/multiformats/go-multihash v0.2.3 // indirect
+	github.com/multiformats/go-multistream v0.5.0 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.2 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.15.0 // indirect
+	github.com/opencontainers/runtime-spec v1.2.0 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.6.0 // indirect
+	github.com/prometheus/common v0.47.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.3 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.3 // indirect
-	github.com/quic-go/quic-go v0.33.0 // indirect
-	github.com/quic-go/webtransport-go v0.5.2 // indirect
+	github.com/quic-go/quic-go v0.42.0 // indirect
+	github.com/quic-go/webtransport-go v0.6.0 // indirect
+	github.com/raulk/go-watchdog v1.3.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/dig v1.17.1 // indirect
+	go.uber.org/fx v1.20.1 // indirect
+	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
+	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
-	lukechampine.com/blake3 v1.1.7 // indirect
+	lukechampine.com/blake3 v1.2.1 // indirect
 )
diff --git a/wasm-tests/webtransport-tests/echo-server/go.sum b/wasm-tests/webtransport-tests/echo-server/go.sum
index 4140abf9a53..7cb38f3e7e2 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.sum
+++ b/wasm-tests/webtransport-tests/echo-server/go.sum
@@ -12,6 +12,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
+github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -19,8 +21,18 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBT
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
+github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
+github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -29,26 +41,42 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6Uh
 github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
+github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4=
+github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
 github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
+github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg=
+github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
@@ -57,6 +85,7 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -67,27 +96,43 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b h1:Qcx5LM0fSiks9uCyFZwDBUasd3lxd1RM0GYpL+Li5o4=
 github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
+github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo=
+github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
+github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
 github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
 github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
 github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
+github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
+github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
 github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU=
 github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
+github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
+github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -97,76 +142,139 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
+github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
+github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
 github.com/libp2p/go-libp2p v0.27.8 h1:IX5x/4yKwyPQeVS2AXHZ3J4YATM9oHBGH1gBc23jBAI=
 github.com/libp2p/go-libp2p v0.27.8/go.mod h1:eCFFtd0s5i/EVKR7+5Ki8bM7qwkNW3TPTTSSW9sz8NE=
+github.com/libp2p/go-libp2p v0.33.1 h1:tvJl9b9M6nSLBtZSXSguq+/lRhRj2oLRkyhBmQNMFLA=
+github.com/libp2p/go-libp2p v0.33.1/go.mod h1:zOUTMjG4I7TXwMndNyOBn/CNtVBLlvBlnxfi+8xzx+E=
+github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
+github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
+github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
+github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=
+github.com/libp2p/go-nat v0.2.0/go.mod h1:3MJr+GRpRkyT65EpVPBstXLvOlAPzUVlG6Pwg9ohLJk=
 github.com/libp2p/go-netroute v0.2.1 h1:V8kVrpD8GK0Riv15/7VN6RbUQ3URNZVosw7H2v9tksU=
 github.com/libp2p/go-netroute v0.2.1/go.mod h1:hraioZr0fhBjG0ZRXJJ6Zj2IVEVNx6tDTFQfSmcq7mQ=
+github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s=
+github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU=
 github.com/libp2p/go-yamux/v4 v4.0.0 h1:+Y80dV2Yx/kv7Y7JKu0LECyVdMXm1VUoko+VQ9rBfZQ=
+github.com/libp2p/go-yamux/v4 v4.0.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCypkQ=
+github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
+github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
 github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
+github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
+github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
+github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms=
+github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc=
+github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b/go.mod h1:lxPUiZwKoFL8DUUmalo2yJJUCxbPKtm8OKfqr2/FTNU=
+github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc h1:PTfri+PuQmWDqERdnNMiD9ZejrlswWrCpBEZgWOiTrc=
+github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4SxOuR/czcZ/E2RSJ3sfHs8FpHhQ5CWMf9s=
+github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
+github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
+github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
+github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
 github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI=
 github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0=
 github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
+github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
+github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multiaddr v0.9.0 h1:3h4V1LHIk5w4hJHekMKWALPXErDfz/sggzwC/NcqbDQ=
 github.com/multiformats/go-multiaddr v0.9.0/go.mod h1:mI67Lb1EeTOYb8GQfL/7wpIZwc46ElrvzhYnoJOmTT0=
+github.com/multiformats/go-multiaddr v0.12.2 h1:9G9sTY/wCYajKa9lyfWPmpZAwe6oV+Wb1zcmMS1HG24=
+github.com/multiformats/go-multiaddr v0.12.2/go.mod h1:GKyaTYjZRdcUhyOetrxTk9z0cW+jA/YrnqTOvKgi44M=
+github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
+github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
+github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
+github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
 github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=
 github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk=
 github.com/multiformats/go-multicodec v0.8.1 h1:ycepHwavHafh3grIbR1jIXnKCsFm0fqsfEOsJ8NtKE8=
 github.com/multiformats/go-multicodec v0.8.1/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k=
+github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg=
+github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k=
+github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/multiformats/go-multihash v0.2.1 h1:aem8ZT0VA2nCHHk7bPJ1BjUbHNciqZC/d16Vve9l108=
 github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW5qrI9vb2Lt6evduFc=
+github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
+github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
 github.com/multiformats/go-multistream v0.4.1 h1:rFy0Iiyn3YT0asivDUIR05leAdwZq3de4741sbiSdfo=
 github.com/multiformats/go-multistream v0.4.1/go.mod h1:Mz5eykRVAjJWckE2U78c6xqdtyNUEhKSM0Lwar2p77Q=
+github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf/QGkvOGQAyiE=
+github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA=
+github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
 github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
-github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
-github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
-github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
+github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
+github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
+github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
 github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
+github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
 github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
+github.com/prometheus/common v0.47.0 h1:p5Cz0FNHo7SnWOmWmoRozVcjEp0bIVU8cV7OShpjL1k=
+github.com/prometheus/common v0.47.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
 github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-19 v0.3.3 h1:wznEHvJwd+2X3PqftRha0SUKmGsnb6dfArMhy9PeJVE=
-github.com/quic-go/qtls-go1-19 v0.3.3/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
-github.com/quic-go/qtls-go1-20 v0.2.3 h1:m575dovXn1y2ATOb1XrRFcrv0F+EQmlowTkoraNkDPI=
-github.com/quic-go/qtls-go1-20 v0.2.3/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
-github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
-github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA=
+github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
+github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
 github.com/quic-go/webtransport-go v0.5.2 h1:GA6Bl6oZY+g/flt00Pnu0XtivSD8vukOu3lYhJjnGEk=
 github.com/quic-go/webtransport-go v0.5.2/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU=
+github.com/quic-go/webtransport-go v0.6.0 h1:CvNsKqc4W2HljHJnoT+rMmbRJybShZ0YPFDD3NxaZLY=
+github.com/quic-go/webtransport-go v0.6.0/go.mod h1:9KjU4AEBqEQidGHNDkZrb8CAa1abRaosM2yGOyiikEc=
+github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
+github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
@@ -188,8 +296,10 @@ github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b
 github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
 github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
 github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
@@ -197,47 +307,70 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/dig v1.17.1 h1:Tga8Lz8PcYNsWsyHMZ1Vm0OQOUaJNDyvPImgbAu9YSc=
+go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
+go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk=
+go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg=
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
+golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -249,10 +382,15 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -263,22 +401,34 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -287,18 +437,23 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
+golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -340,5 +495,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
 lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
+lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
+lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
diff --git a/wasm-tests/webtransport-tests/echo-server/main.go b/wasm-tests/webtransport-tests/echo-server/main.go
index def4151bd1b..f5e36692bd0 100644
--- a/wasm-tests/webtransport-tests/echo-server/main.go
+++ b/wasm-tests/webtransport-tests/echo-server/main.go
@@ -12,6 +12,7 @@ import (
     "github.com/libp2p/go-libp2p/core/transport"
     "github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
     webtransport "github.com/libp2p/go-libp2p/p2p/transport/webtransport"
+    "github.com/quic-go/quic-go"
     "github.com/multiformats/go-multiaddr"
 )
 
@@ -69,7 +70,7 @@ func main() {
         panic(err)
     }
 
-    connManager, err := quicreuse.NewConnManager([32]byte{})
+    connManager, err := quicreuse.NewConnManager(quic.StatelessResetKey{}, quic.TokenGeneratorKey{})
     if err != nil {
         panic(err)
     }

From 4a61847da9bb1f833a353ae2256d11ce0785587d Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:44:08 +0200
Subject: [PATCH 189/455] fix(kad): moving changelog entries

`libp2p-kad` `v0.45.4` won't be released. Moving changes to `v0.46.0`.

Pull-Request: #5292.
---
 protocols/kad/CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 0a561b14448..38809b8aafa 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -6,9 +6,6 @@
   See [PR 3230](https://github.com/libp2p/rust-libp2p/pull/3230)
 - QueryClose progress whenever closer in range, instead of having to be the closest.
   See [PR 4934](https://github.com/libp2p/rust-libp2p/pull/4934).
-
-## 0.45.4
-
 - Add periodic and automatic bootstrap.
   See [PR 4838](https://github.com/libp2p/rust-libp2p/pull/4838).
 - Make it mandatory to provide protocol names when creating a `kad::Config`.

From 9af02ca0e4ed7eb42335452f84b06945df2ba6f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:25:59 +0000
Subject: [PATCH 190/455] deps: bump base64 from 0.21.7 to 0.22.0

Pull-Request: #5202.
---
 Cargo.lock                     | 8 ++++----
 identity/Cargo.toml            | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 protocols/gossipsub/Cargo.toml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 84aae921d7a..6e2a21f740f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2570,7 +2570,7 @@ dependencies = [
 name = "keygen"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
  "clap",
  "libp2p-core",
  "libp2p-identity",
@@ -2814,7 +2814,7 @@ version = "0.46.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
- "base64 0.21.7",
+ "base64 0.22.0",
  "byteorder",
  "bytes",
  "either",
@@ -2874,7 +2874,7 @@ name = "libp2p-identity"
 version = "0.2.8"
 dependencies = [
  "asn1_der",
- "base64 0.21.7",
+ "base64 0.22.0",
  "bs58",
  "criterion",
  "ed25519-dalek",
@@ -3268,7 +3268,7 @@ dependencies = [
 name = "libp2p-server"
 version = "0.12.7"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
  "clap",
  "futures",
  "futures-timer",
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 1f025353af5..e4d3b1f4dc2 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -42,7 +42,7 @@ rand = ["dep:rand", "ed25519-dalek?/rand_core"]
 
 [dev-dependencies]
 quickcheck = { workspace = true }
-base64 = "0.21.7"
+base64 = "0.22.0"
 serde_json = "1.0"
 rmp-serde = "1.1"
 criterion = "0.5"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 4e6aaa8ddfd..cefd28ff6e4 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -18,7 +18,7 @@ zeroize = "1"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 libp2p-core = { workspace = true }
-base64 = "0.21.7"
+base64 = "0.22.0"
 libp2p-identity = { workspace = true }
 
 [lints]
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 2f14e534e14..6f9f37571a7 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-base64 = "0.21"
+base64 = "0.22"
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 52ffb675d4b..8615b99f7e5 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -15,7 +15,7 @@ wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-base64 = "0.21.7"
+base64 = "0.22.0"
 byteorder = "1.5.0"
 bytes = "1.6"
 either = "1.9"

From 945209a00cafa9353446b89ffd333032468b5691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 4 Apr 2024 15:26:13 +0100
Subject: [PATCH 191/455] fix: update Cargo.lock

and address [RUSTSEC-2024-0332](https://rustsec.org/advisories/RUSTSEC-2024-0332). More info [here](https://seanmonstar.com/blog/hyper-http2-continuation-flood/)

Pull-Request: #5293.
---
 Cargo.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e2a21f740f..3a9af41a24f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1897,9 +1897,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -1916,9 +1916,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
+checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
 dependencies = [
  "bytes",
  "fnv",
@@ -2193,7 +2193,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2 0.3.26",
  "http 0.2.9",
  "http-body 0.4.5",
  "httparse",
@@ -2216,7 +2216,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.3",
+ "h2 0.4.4",
  "http 1.0.0",
  "http-body 1.0.0",
  "httparse",
@@ -4890,7 +4890,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2 0.3.26",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",
@@ -4931,7 +4931,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.3",
+ "h2 0.4.4",
  "http 1.0.0",
  "http-body 1.0.0",
  "http-body-util",
@@ -6084,7 +6084,7 @@ dependencies = [
  "axum 0.6.20",
  "base64 0.21.7",
  "bytes",
- "h2 0.3.24",
+ "h2 0.3.26",
  "http 0.2.9",
  "http-body 0.4.5",
  "hyper 0.14.27",

From 67ebcdeb05c4189db4ff820a974f84779ed3e81d Mon Sep 17 00:00:00 2001
From: joshuef <joshuef@gmail.com>
Date: Thu, 4 Apr 2024 23:44:08 +0900
Subject: [PATCH 192/455] feat(kad): only dial if not connected AND not dialing

Pull-Request: #4957.
---
 protocols/kad/CHANGELOG.md     | 7 +++++--
 protocols/kad/src/behaviour.rs | 9 ++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 38809b8aafa..b2a06dc691c 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -4,6 +4,8 @@
   See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
 - Update to DHT republish interval and expiration time defaults to 22h and 48h respectively, rationale in [libp2p/specs#451](https://github.com/libp2p/specs/pull/451)
   See [PR 3230](https://github.com/libp2p/rust-libp2p/pull/3230)
+- Use default dial conditions more consistently.
+  See [PR 4957](https://github.com/libp2p/rust-libp2p/pull/4957)
 - QueryClose progress whenever closer in range, instead of having to be the closest.
   See [PR 4934](https://github.com/libp2p/rust-libp2p/pull/4934).
 - Add periodic and automatic bootstrap.
@@ -67,6 +69,7 @@
 -->
 
 ## 0.44.5
+
 - Migrate to `quick-protobuf-codec` crate for codec logic.
   See [PR 4501].
 
@@ -192,7 +195,7 @@
   - Instead of a single event `OutboundQueryCompleted`, there are now multiple events emitted, allowing the user to process them as they come in (via the new `OutboundQueryProgressed`). See `ProgressStep` to identify the final `OutboundQueryProgressed` of a single query.
   - To finish a query early, i.e. before the final `OutboundQueryProgressed` of the query, a caller needs to call `query.finish()`.
   - There is no more automatic caching of records. The user has to manually call `put_record_to` on the `QueryInfo::GetRecord.cache_candidates` to cache a record to a close peer that did not return the record on the foregone query.
-  See [PR 2712].
+    See [PR 2712].
 
 [PR 3085]: https://github.com/libp2p/rust-libp2p/pull/3085
 [PR 3011]: https://github.com/libp2p/rust-libp2p/pull/3011
@@ -271,7 +274,7 @@
 
 - Require owned key in `get_record()` method (see [PR 2477]).
 
-- Merge NetworkBehaviour's inject_\* paired methods (see PR 2445).
+- Merge NetworkBehaviour's inject\_\* paired methods (see PR 2445).
 
 [PR 2477]: https://github.com/libp2p/rust-libp2p/pull/2477
 [PR 2445]: https://github.com/libp2p/rust-libp2p/pull/2445
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 77ce78da237..7f47f93bb39 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -628,9 +628,7 @@ where
                     }
                     kbucket::InsertResult::Pending { disconnected } => {
                         self.queued_events.push_back(ToSwarm::Dial {
-                            opts: DialOpts::peer_id(disconnected.into_preimage())
-                                .condition(dial_opts::PeerCondition::NotDialing)
-                                .build(),
+                            opts: DialOpts::peer_id(disconnected.into_preimage()).build(),
                         });
                         RoutingUpdate::Pending
                     }
@@ -1375,7 +1373,6 @@ where
                                 if !self.connected_peers.contains(disconnected.preimage()) {
                                     self.queued_events.push_back(ToSwarm::Dial {
                                         opts: DialOpts::peer_id(disconnected.into_preimage())
-                                            .condition(dial_opts::PeerCondition::NotDialing)
                                             .build(),
                                     })
                                 }
@@ -2595,9 +2592,7 @@ where
                         } else if &peer_id != self.kbuckets.local_key().preimage() {
                             query.inner.pending_rpcs.push((peer_id, event));
                             self.queued_events.push_back(ToSwarm::Dial {
-                                opts: DialOpts::peer_id(peer_id)
-                                    .condition(dial_opts::PeerCondition::NotDialing)
-                                    .build(),
+                                opts: DialOpts::peer_id(peer_id).build(),
                             });
                         }
                     }

From fdddacc75f70b26e2da24f9e8815eb77a3d6fbdd Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Fri, 5 Apr 2024 00:08:59 +0800
Subject: [PATCH 193/455] fix: allow relay to forward unlimited bytes

Allow relay to forward unlimited bytes from one peer to another by checking if `max_circuit_bytes` equals to 0 before checking if `bytes_sent` exceeds `max_circuit_bytes`.
This will make current implementation follow the spec.
May close #5170.

Pull-Request: #5244.
---
 Cargo.lock                         | 2 +-
 Cargo.toml                         | 2 +-
 protocols/relay/CHANGELOG.md       | 5 +++++
 protocols/relay/Cargo.toml         | 2 +-
 protocols/relay/src/copy_future.rs | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a9af41a24f..82280a5e86a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3178,7 +3178,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-relay"
-version = "0.17.1"
+version = "0.17.2"
 dependencies = [
  "asynchronous-codec",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index a8c99e340f2..f8645b32123 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -96,7 +96,7 @@ libp2p-ping = { version = "0.44.0", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.2", path = "transports/quic" }
-libp2p-relay = { version = "0.17.1", path = "protocols/relay" }
+libp2p-relay = { version = "0.17.2", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index aaade5e48f9..b88dd7784f2 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.17.2
+
+- Fix support for unlimited relay connection according to spec.
+  See [PR 5244](https://github.com/libp2p/rust-libp2p/pull/5244).
+
 ## 0.17.1
 
 - Automatically register relayed addresses as external addresses.
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 94b9deb1a64..b3e9fe4d8dd 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-relay"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Communications relaying for libp2p"
-version = "0.17.1"
+version = "0.17.2"
 authors = ["Parity Technologies <admin@parity.io>", "Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/relay/src/copy_future.rs b/protocols/relay/src/copy_future.rs
index 91415065d2c..c0039c29534 100644
--- a/protocols/relay/src/copy_future.rs
+++ b/protocols/relay/src/copy_future.rs
@@ -72,7 +72,7 @@ where
         let this = &mut *self;
 
         loop {
-            if this.bytes_sent > this.max_circuit_bytes {
+            if this.max_circuit_bytes > 0 && this.bytes_sent > this.max_circuit_bytes {
                 return Poll::Ready(Err(io::Error::new(
                     io::ErrorKind::Other,
                     "Max circuit bytes reached.",

From 47e19f7175edb6954bf69bd2a61edaaf4f521ea9 Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Fri, 5 Apr 2024 21:38:55 +0800
Subject: [PATCH 194/455] feat(ping): impose `Sync` bound to
 `ping::Failure::Other`

Allow `ping::Event` to be shared between threads, instead of only sending between threads but no sharing.
This make it possible to send `ping::Event` through broadcast-style channels, like `tokio::sync::broadcast`.

Pull-Request: #5250.
---
 Cargo.lock                    | 2 +-
 Cargo.toml                    | 2 +-
 protocols/ping/CHANGELOG.md   | 8 ++++++++
 protocols/ping/Cargo.toml     | 2 +-
 protocols/ping/src/handler.rs | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 82280a5e86a..579416ac740 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3090,7 +3090,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.44.0"
+version = "0.44.1"
 dependencies = [
  "async-std",
  "either",
diff --git a/Cargo.toml b/Cargo.toml
index f8645b32123..c1f39ec74c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,7 +92,7 @@ libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.44.0", path = "transports/noise" }
 libp2p-perf = { version = "0.3.0", path = "protocols/perf" }
-libp2p-ping = { version = "0.44.0", path = "protocols/ping" }
+libp2p-ping = { version = "0.44.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.2", path = "transports/quic" }
diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md
index 33e0139b996..17338a4ba9a 100644
--- a/protocols/ping/CHANGELOG.md
+++ b/protocols/ping/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.44.1 - unreleased
+
+- Impose `Sync` on `ping::Failure::Other`.
+  `ping::Event` can now be shared between threads.
+  See [PR 5250]
+
+[PR 5250]: https://github.com/libp2p/rust-libp2p/pull/5250
+
 ## 0.44.0
 
 
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 5f08ac6fbbd..da67b894963 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-ping"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Ping protocol for libp2p"
-version = "0.44.0"
+version = "0.44.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/ping/src/handler.rs b/protocols/ping/src/handler.rs
index 5e6fc2cd2cf..b9bd25c52ea 100644
--- a/protocols/ping/src/handler.rs
+++ b/protocols/ping/src/handler.rs
@@ -95,12 +95,12 @@ pub enum Failure {
     Unsupported,
     /// The ping failed for reasons other than a timeout.
     Other {
-        error: Box<dyn std::error::Error + Send + 'static>,
+        error: Box<dyn std::error::Error + Send + Sync + 'static>,
     },
 }
 
 impl Failure {
-    fn other(e: impl std::error::Error + Send + 'static) -> Self {
+    fn other(e: impl std::error::Error + Send + Sync + 'static) -> Self {
         Self::Other { error: Box::new(e) }
     }
 }

From c92966d7843e5a107dcb77f2fd75166a6039730e Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Sun, 7 Apr 2024 00:23:45 +0800
Subject: [PATCH 195/455] deps: Promote tracing to workspace dependency

Promote tracing to workspace dependency to make mananging depencencies easier.

Pull-Request: #5231.
---
 Cargo.toml                                      | 1 +
 core/Cargo.toml                                 | 2 +-
 examples/autonat/Cargo.toml                     | 2 +-
 examples/browser-webrtc/Cargo.toml              | 2 +-
 examples/chat/Cargo.toml                        | 2 +-
 examples/dcutr/Cargo.toml                       | 2 +-
 examples/distributed-key-value-store/Cargo.toml | 2 +-
 examples/file-sharing/Cargo.toml                | 2 +-
 examples/identify/Cargo.toml                    | 2 +-
 examples/ipfs-kad/Cargo.toml                    | 2 +-
 examples/ipfs-private/Cargo.toml                | 2 +-
 examples/metrics/Cargo.toml                     | 2 +-
 examples/ping/Cargo.toml                        | 2 +-
 examples/relay-server/Cargo.toml                | 2 +-
 examples/rendezvous/Cargo.toml                  | 2 +-
 examples/stream/Cargo.toml                      | 2 +-
 hole-punching-tests/Cargo.toml                  | 2 +-
 identity/Cargo.toml                             | 2 +-
 interop-tests/Cargo.toml                        | 4 ++--
 misc/memory-connection-limits/Cargo.toml        | 2 +-
 misc/multistream-select/Cargo.toml              | 2 +-
 misc/server/Cargo.toml                          | 2 +-
 misc/webrtc-utils/Cargo.toml                    | 2 +-
 muxers/mplex/Cargo.toml                         | 2 +-
 muxers/test-harness/Cargo.toml                  | 2 +-
 muxers/yamux/Cargo.toml                         | 2 +-
 protocols/autonat/Cargo.toml                    | 2 +-
 protocols/dcutr/Cargo.toml                      | 2 +-
 protocols/floodsub/Cargo.toml                   | 2 +-
 protocols/gossipsub/Cargo.toml                  | 2 +-
 protocols/identify/Cargo.toml                   | 2 +-
 protocols/kad/Cargo.toml                        | 2 +-
 protocols/mdns/Cargo.toml                       | 2 +-
 protocols/perf/Cargo.toml                       | 2 +-
 protocols/ping/Cargo.toml                       | 2 +-
 protocols/relay/Cargo.toml                      | 2 +-
 protocols/rendezvous/Cargo.toml                 | 2 +-
 protocols/request-response/Cargo.toml           | 2 +-
 protocols/stream/Cargo.toml                     | 2 +-
 protocols/upnp/Cargo.toml                       | 2 +-
 swarm-test/Cargo.toml                           | 2 +-
 swarm/Cargo.toml                                | 2 +-
 transports/dns/Cargo.toml                       | 2 +-
 transports/noise/Cargo.toml                     | 2 +-
 transports/plaintext/Cargo.toml                 | 2 +-
 transports/pnet/Cargo.toml                      | 2 +-
 transports/quic/Cargo.toml                      | 2 +-
 transports/tcp/Cargo.toml                       | 2 +-
 transports/uds/Cargo.toml                       | 2 +-
 transports/webrtc-websys/Cargo.toml             | 2 +-
 transports/webrtc/Cargo.toml                    | 2 +-
 transports/websocket-websys/Cargo.toml          | 2 +-
 transports/websocket/Cargo.toml                 | 2 +-
 transports/webtransport-websys/Cargo.toml       | 2 +-
 54 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c1f39ec74c5..da05125aa2c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -123,6 +123,7 @@ quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 unsigned-varint = { version = "0.8.0" }
+tracing = "0.1.37"
 
 [patch.crates-io]
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 582746d4037..65b7728b7ba 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -29,7 +29,7 @@ rw-stream-sink = { workspace = true }
 serde = { version = "1", optional = true, features = ["derive"] }
 smallvec = "1.13.2"
 thiserror = "1.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 unsigned-varint = { workspace = true }
 void = "1"
 
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index b5c314414f7..f128347bf04 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -13,7 +13,7 @@ tokio = { version = "1.37", features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index ef7fab331a3..f5a70cfd865 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -19,7 +19,7 @@ crate-type = ["cdylib"]
 anyhow = "1.0.81"
 futures = "0.3.30"
 rand = "0.8"
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index 4fb0243dd90..d6f083962f7 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -13,7 +13,7 @@ tokio = { version = "1.37", features = ["full"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 17227586951..3d4d3a5c154 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -15,7 +15,7 @@ futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
 tokio = { version = "1.37", features = ["macros", "net", "rt", "signal"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
index a7efe3c0697..809a573cc08 100644
--- a/examples/distributed-key-value-store/Cargo.toml
+++ b/examples/distributed-key-value-store/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index fdade7933cc..fdc4c7b26fd 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -14,7 +14,7 @@ tokio = { version = "1.37.0", features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 void = "1.0.2"
 
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
index 2dcc780ac22..cf2996e45cd 100644
--- a/examples/identify/Cargo.toml
+++ b/examples/identify/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 106faff77b6..d27c68c0e59 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -16,7 +16,7 @@ env_logger = "0.10"
 futures = "0.3.30"
 anyhow = "1.0.81"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index ccfe7484f6a..cf0d2689ced 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 either = "1.9"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 188121fb7d0..e84b4819897 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -17,7 +17,7 @@ opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
 opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
 tokio = { version = "1", features = ["full"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-opentelemetry = "0.23.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 3ba28b54a5c..6c74f4619fd 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
 tokio = { version = "1.37.0", features = ["full"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index b06b4adc11f..664c52351cb 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -14,7 +14,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index 14ce7d58012..aecacbd7fa6 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
 tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "time"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index 64ca12fbb46..1e33991f27e 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -15,7 +15,7 @@ libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
 libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
 rand = "0.8"
 tokio = { version = "1.37", features = ["full"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 7c372e23bee..75ed1e31ebe 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -10,7 +10,7 @@ anyhow = "1"
 env_logger = "0.10.2"
 futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.37.0", features = ["full"] }
 serde = { version = "1.0.197", features = ["derive"] }
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index e4d3b1f4dc2..217044d0fcd 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -17,7 +17,7 @@ bs58 = { version = "0.5.1", optional = true }
 ed25519-dalek = { version = "2.1", optional = true }
 hkdf = { version = "0.12.4", optional = true }
 libsecp256k1 = { version = "0.7.0", optional = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 multihash = { version = "0.19.1", optional = true }
 p256 = { version = "0.13", default-features = false, features = [ "ecdsa", "std", "pem"], optional = true }
 quick-protobuf = "0.8.1"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 5d15fd5a9f0..9bb08682d6f 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -17,7 +17,7 @@ either = "1.9.0"
 futures = "0.3.30"
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -36,7 +36,7 @@ serde_json = "1"
 thirtyfour = "=0.32.0-rc.10" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.37.0", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index ae6bb386373..5f8d9b91613 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
 sysinfo = "0.29"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1"
 
 [dev-dependencies]
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 37b5f7753f2..080bd6ee289 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 bytes = "1"
 futures = "0.3"
-tracing = "0.1.37"
+tracing = { workspace = true }
 pin-project = "1.1.5"
 smallvec = "1.13.2"
 unsigned-varint = { workspace = true }
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 6f9f37571a7..74576ad39f5 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -22,7 +22,7 @@ serde = "1.0.197"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 zeroize = "1"
 
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
index 7173dedae7b..b28ed74a4b0 100644
--- a/misc/webrtc-utils/Cargo.toml
+++ b/misc/webrtc-utils/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.10.8"
 thiserror = "1"
 tinytemplate = "1.2"
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [dev-dependencies]
 hex-literal = "0.4"
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 3ce7dc5c02f..4e612939373 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -20,7 +20,7 @@ nohash-hasher = "0.2"
 parking_lot = "0.12"
 rand = "0.8"
 smallvec = "1.13.2"
-tracing = "0.1.37"
+tracing = { workspace = true }
 unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }
 
 [dev-dependencies]
diff --git a/muxers/test-harness/Cargo.toml b/muxers/test-harness/Cargo.toml
index bfe1e61b9b6..421292cf0a7 100644
--- a/muxers/test-harness/Cargo.toml
+++ b/muxers/test-harness/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 futures = "0.3.30"
 futures-timer = "3.0.3"
 futures_ringbuf = "0.4.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 14a5c0fe145..7c36faf022a 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -17,7 +17,7 @@ libp2p-core = { workspace = true }
 thiserror = "1.0"
 yamux012 = { version = "0.12.1", package = "yamux" }
 yamux013 = { version = "0.13.1", package = "yamux" }
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.7.0", features = ["attributes"] }
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index fce64ad0c12..2780016cebd 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-request-response = { workspace = true }
 libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 rand = "0.8"
-tracing = "0.1.37"
+tracing = { workspace = true }
 quick-protobuf-codec = { workspace = true }
 asynchronous-codec = { workspace = true }
 
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index c6975337557..414eff4775b 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 thiserror = "1.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1"
 lru = "0.12.3"
 futures-bounded = { workspace = true }
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 98e7cc7fd49..fe1b509735d 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -24,7 +24,7 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
 thiserror = "1.0.58"
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 8615b99f7e5..22e11180439 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -35,7 +35,7 @@ regex = "1.10.4"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 smallvec = "1.13.2"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1.0.2"
 
 # Metrics dependencies
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index db42f4b9df2..a794d1e0409 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.13.2"
 thiserror = "1.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1.0"
 either = "1.9.0"
 
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 5b46642d1ea..fb89337b61e 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -32,7 +32,7 @@ futures-timer = "3.0.3"
 instant = "0.1.12"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 thiserror = "1"
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 3d40e2dfe71..c2dba2cf2f6 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -23,7 +23,7 @@ rand = "0.8.3"
 smallvec = "1.13.2"
 socket2 = { version = "0.5.6", features = ["all"] }
 tokio = { version = "1.37", default-features = false, features = ["net", "time"], optional = true}
-tracing = "0.1.37"
+tracing = { workspace = true }
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
 void = "1.0.2"
 
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 599c8c21fb2..b73c7d599cb 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -29,7 +29,7 @@ libp2p-yamux = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tokio = { version = "1.37", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
 void = "1"
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index da67b894963..5d982c90b7f 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1.0"
 
 [dev-dependencies]
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index b3e9fe4d8dd..4183e0facd3 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -26,7 +26,7 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8.4"
 static_assertions = "1"
 thiserror = "1.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1"
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 5c7d69810b3..e2424a9258b 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -25,7 +25,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 thiserror = "1"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1"
 
 [dev-dependencies]
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index ecfd01be945..c3c43eec286 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -22,7 +22,7 @@ rand = "0.8"
 serde = { version = "1.0", optional = true}
 serde_json = { version = "1.0.115", optional = true }
 smallvec = "1.13.2"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1.0.2"
 futures-timer = "3.0.3"
 futures-bounded = { workspace = true }
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index 6a39794c196..f58daff0bb6 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.29"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
 libp2p-swarm = { workspace = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1"
 rand = "0.8"
 
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index d1fec8651d5..116941cb75f 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -17,7 +17,7 @@ igd-next = "0.14.3"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 tokio = { version = "1.37", default-features = false, features = ["rt"], optional = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1.0.2"
 
 [features]
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index 8fff18b5d0c..ad7b05264b8 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 futures = "0.3.30"
 rand = "0.8.5"
-tracing = "0.1.37"
+tracing = { workspace = true }
 futures-timer = "3.0.3"
 
 [lints]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index fc4094f16ab..3601e03d368 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -25,7 +25,7 @@ multistream-select = { workspace = true }
 once_cell = "1.19.0"
 rand = "0.8"
 smallvec = "1.13.2"
-tracing = "0.1.37"
+tracing = { workspace = true }
 void = "1"
 wasm-bindgen-futures = { version = "0.4.42", optional = true }
 
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index a6061339197..b06ab6d7d8b 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
 hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
 smallvec = "1.13.2"
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 02bd46550e5..130fce156a9 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -23,7 +23,7 @@ rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
 thiserror = "1.0.58"
-tracing = "0.1.37"
+tracing = { workspace = true }
 x25519-dalek = "2"
 zeroize = "1"
 
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index e3f1e280851..9a4576ef29f 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -17,7 +17,7 @@ futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
-tracing = "0.1.37"
+tracing = { workspace = true }
 quick-protobuf-codec = { workspace = true }
 
 [dev-dependencies]
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index 294d11af14e..e13d9dbd0d4 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 futures = "0.3.30"
 salsa20 = "0.10"
 sha3 = "0.10"
-tracing = "0.1.37"
+tracing = { workspace = true }
 rand = "0.8"
 pin-project = "1.1.5"
 
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 52483cbcccd..f6fad337bb7 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -23,7 +23,7 @@ rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.58"
 tokio = { version = "1.37.0", default-features = false, features = ["net", "rt", "time"], optional = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 socket2 = "0.5.6"
 ring = "0.16.20"
 
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 9cedec22374..2b6ecf7189b 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.6", features = ["all"] }
 tokio = { version = "1.37.0", default-features = false, features = ["net"], optional = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [features]
 tokio = ["dep:tokio", "if-watch/tokio"]
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index b9ae6af7425..b99e869b1df 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -15,7 +15,7 @@ async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
 futures = "0.3.30"
 tokio = { version = "1.37", default-features = false, features = ["net"], optional = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [dev-dependencies]
 tempfile = "3.10"
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index eb41d1fa3d4..12d825b2ce7 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 libp2p-webrtc-utils = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1"
-tracing = "0.1.37"
+tracing = { workspace = true }
 wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.42" }
 web-sys = { version = "0.3.69", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 883d5c92a6c..d9d7f8c97d6 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -30,7 +30,7 @@ thiserror = "1"
 tinytemplate = "1.2"
 tokio = { version = "1.37", features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 webrtc = { version = "0.9.0", optional = true }
 
 [features]
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 59807509c8b..7f3c64a826a 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -15,7 +15,7 @@ bytes = "1.6.0"
 futures = "0.3.30"
 js-sys = "0.3.69"
 libp2p-core = { workspace = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
 thiserror = "1.0.58"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 01a094f2e14..f04c42084c1 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -20,7 +20,7 @@ parking_lot = "0.12.0"
 pin-project-lite = "0.2.14"
 rw-stream-sink = { workspace = true }
 soketto = "0.8.0"
-tracing = "0.1.37"
+tracing = { workspace = true }
 url = "2.5"
 webpki-roots = "0.25"
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 671f377d1d9..7d844684f0d 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -23,7 +23,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.58"
-tracing = "0.1.37"
+tracing = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"
 web-sys = { version = "0.3.69", features = [

From 8027c54c262c6c652df52c7f6ade81f44be34d7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:55:52 +0000
Subject: [PATCH 196/455] deps: bump getrandom from 0.2.12 to 0.2.13

Pull-Request: #5299.
---
 Cargo.lock                               | 22 +++++++++++-----------
 protocols/gossipsub/Cargo.toml           |  2 +-
 swarm/Cargo.toml                         |  2 +-
 transports/webrtc-websys/Cargo.toml      |  2 +-
 wasm-tests/webtransport-tests/Cargo.toml |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 579416ac740..b1e21a8408a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1826,9 +1826,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2611,7 +2611,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-autonat",
@@ -2821,7 +2821,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-ticker",
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "hex",
  "hex_fmt",
  "instant",
@@ -3309,7 +3309,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "instant",
  "libp2p-core",
  "libp2p-identify",
@@ -3484,7 +3484,7 @@ version = "0.3.0-alpha"
 dependencies = [
  "bytes",
  "futures",
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "hex",
  "js-sys",
  "libp2p-core",
@@ -4714,7 +4714,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
 ]
 
 [[package]]
@@ -4804,7 +4804,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
@@ -5004,7 +5004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
  "cc",
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -6419,7 +6419,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
 ]
 
 [[package]]
@@ -6836,7 +6836,7 @@ name = "webtransport-tests"
 version = "0.1.0"
 dependencies = [
  "futures",
- "getrandom 0.2.12",
+ "getrandom 0.2.13",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 22e11180439..4101a4aa4e9 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -22,7 +22,7 @@ either = "1.9"
 fnv = "1.0.7"
 futures = "0.3.30"
 futures-ticker = "0.0.3"
-getrandom = "0.2.12"
+getrandom = "0.2.13"
 hex_fmt = "0.3.0"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3601e03d368..90aa57a4d12 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.9.0"
 fnv = "1.0"
 futures = "0.3.30"
 futures-timer = "3.0.3"
-getrandom = { version = "0.2.12", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
+getrandom = { version = "0.2.13", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 12d825b2ce7..0099851f4d5 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -14,7 +14,7 @@ publish = true
 [dependencies]
 bytes = "1"
 futures = "0.3"
-getrandom = { version = "0.2.12", features = ["js"] }
+getrandom = { version = "0.2.13", features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
 libp2p-core = { workspace = true }
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 8b0cb85c3be..11b85910833 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 futures = "0.3.30"
-getrandom = { version = "0.2.12", features = ["js"] }
+getrandom = { version = "0.2.13", features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-noise = { workspace = true }

From 16e52487627e66b15d31b2a24b78e209f12d804d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:10:35 +0000
Subject: [PATCH 197/455] deps: bump syn from 2.0.57 to 2.0.58

Pull-Request: #5300.
---
 Cargo.lock              | 58 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b1e21a8408a..2d3bef6b5be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
  "synstructure 0.13.1",
 ]
 
@@ -247,7 +247,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -469,7 +469,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -486,7 +486,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -1254,7 +1254,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -1385,7 +1385,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -1490,7 +1490,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -3341,7 +3341,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -4114,7 +4114,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -4325,7 +4325,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -4522,7 +4522,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -4545,7 +4545,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -5103,7 +5103,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.57",
+ "syn 2.0.58",
  "walkdir",
 ]
 
@@ -5364,7 +5364,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -5397,7 +5397,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -5682,7 +5682,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -5732,9 +5732,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.57"
+version = "2.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5773,7 +5773,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -5888,7 +5888,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -5990,7 +5990,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -6177,7 +6177,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -6519,7 +6519,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
  "wasm-bindgen-shared",
 ]
 
@@ -6553,7 +6553,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6586,7 +6586,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -7175,7 +7175,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -7195,5 +7195,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.58",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 153c812e19e..6396dd3f052 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.57", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.58", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From f1df03e0ccec720882b5e6d501f57c3f862b9cb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:23:10 +0000
Subject: [PATCH 198/455] deps: bump thirtyfour from 0.32.0-rc.10 to 0.32.0

Pull-Request: #5301.
---
 Cargo.lock               | 144 +++++++++++++++++++++------------------
 interop-tests/Cargo.toml |   2 +-
 2 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2d3bef6b5be..ef8fd9df004 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1736,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
 dependencies = [
  "futures-io",
- "rustls",
+ "rustls 0.21.9",
 ]
 
 [[package]]
@@ -2229,16 +2229,19 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
- "http 0.2.9",
- "hyper 0.14.27",
- "rustls",
+ "http 1.0.0",
+ "hyper 1.1.0",
+ "hyper-util",
+ "rustls 0.22.3",
+ "rustls-pki-types",
  "tokio",
  "tokio-rustls",
+ "tower-service",
 ]
 
 [[package]]
@@ -2451,7 +2454,7 @@ dependencies = [
  "mime_guess",
  "rand 0.8.5",
  "redis",
- "reqwest 0.12.2",
+ "reqwest",
  "rust-embed",
  "serde",
  "serde_json",
@@ -3168,7 +3171,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.16.20",
- "rustls",
+ "rustls 0.21.9",
  "socket2 0.5.6",
  "thiserror",
  "tokio",
@@ -3393,8 +3396,8 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.16.20",
- "rustls",
- "rustls-webpki",
+ "rustls 0.21.9",
+ "rustls-webpki 0.101.7",
  "thiserror",
  "tokio",
  "x509-parser 0.16.0",
@@ -3517,7 +3520,7 @@ dependencies = [
  "soketto",
  "tracing",
  "url",
- "webpki-roots",
+ "webpki-roots 0.25.2",
 ]
 
 [[package]]
@@ -4610,7 +4613,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls",
+ "rustls 0.21.9",
  "thiserror",
  "tokio",
  "tracing",
@@ -4626,7 +4629,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.16.20",
  "rustc-hash",
- "rustls",
+ "rustls 0.21.9",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4879,47 +4882,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.27",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.2"
@@ -4936,6 +4898,7 @@ dependencies = [
  "http-body 1.0.0",
  "http-body-util",
  "hyper 1.1.0",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -4946,7 +4909,9 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls 0.22.3",
  "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -4954,11 +4919,13 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots 0.26.1",
  "winreg",
 ]
 
@@ -5183,10 +5150,24 @@ checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
 dependencies = [
  "log",
  "ring 0.17.5",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
+dependencies = [
+ "log",
+ "ring 0.17.5",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.2",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.3"
@@ -5196,6 +5177,12 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pki-types"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -5206,6 +5193,17 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+dependencies = [
+ "ring 0.17.5",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -5665,18 +5663,18 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "strum"
-version = "0.25.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.25.3"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -5835,18 +5833,18 @@ dependencies = [
 
 [[package]]
 name = "thirtyfour"
-version = "0.32.0-rc.10"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc8d557d4ac49c0d0bf13722bf7414506ef50b28ac40894400dcd0b8ed25c4d"
+checksum = "0641fa1353dd7b7864a7a7782e495433de18a9096bc91b5a2d5838ac209c2fa8"
 dependencies = [
  "async-trait",
- "base64 0.21.7",
+ "base64 0.22.0",
  "futures",
  "http 1.0.0",
  "indexmap 2.2.1",
  "parking_lot",
  "paste",
- "reqwest 0.11.27",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_repr",
@@ -6005,11 +6003,12 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls",
+ "rustls 0.22.3",
+ "rustls-pki-types",
  "tokio",
 ]
 
@@ -6626,6 +6625,15 @@ version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "webrtc"
 version = "0.9.0"
@@ -6647,7 +6655,7 @@ dependencies = [
  "ring 0.16.20",
  "rtcp",
  "rtp",
- "rustls",
+ "rustls 0.21.9",
  "sdp",
  "serde",
  "serde_json",
@@ -6708,7 +6716,7 @@ dependencies = [
  "rand_core 0.6.4",
  "rcgen",
  "ring 0.16.20",
- "rustls",
+ "rustls 0.21.9",
  "sec1",
  "serde",
  "sha1",
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 9bb08682d6f..4d162c5786a 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -33,7 +33,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 ] }
 rust-embed = "8.3"
 serde_json = "1"
-thirtyfour = "=0.32.0-rc.10" # https://github.com/stevepryde/thirtyfour/issues/169
+thirtyfour = "=0.32.0" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { version = "1.37.0", features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = { workspace = true }

From 9bb2a871939ded657d380cc2b7beb519840f3e8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 12:33:36 +0000
Subject: [PATCH 199/455] deps: bump reqwest from 0.12.2 to 0.12.3

Pull-Request: #5302.
---
 Cargo.lock | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef8fd9df004..b3b796c031d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2488,7 +2488,7 @@ dependencies = [
  "socket2 0.5.6",
  "widestring",
  "windows-sys 0.48.0",
- "winreg",
+ "winreg 0.50.0",
 ]
 
 [[package]]
@@ -4884,11 +4884,11 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338"
+checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -4926,7 +4926,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webpki-roots 0.26.1",
- "winreg",
+ "winreg 0.52.0",
 ]
 
 [[package]]
@@ -5170,11 +5170,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.3"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
+ "rustls-pki-types",
 ]
 
 [[package]]
@@ -7064,6 +7065,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"

From 042174ebfda46ebba605015ded9314ea3699801a Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Fri, 12 Apr 2024 07:29:34 +0800
Subject: [PATCH 200/455] deps: move libp2p-server and metrics example to use
 axum 0.7

Move from `hyper` to `axum` for `libp2p-server` and metrics example.
Running in parallel with #5038.

Pull-Request: #5246.
---
 Cargo.lock                           |   4 +-
 examples/metrics/Cargo.toml          |   2 +-
 examples/metrics/src/http_service.rs | 113 +++++++-----------------
 misc/server/Cargo.toml               |   2 +-
 misc/server/src/http_service.rs      | 125 ++++++++-------------------
 5 files changed, 72 insertions(+), 174 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b3b796c031d..eeed878cb39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3271,11 +3271,11 @@ dependencies = [
 name = "libp2p-server"
 version = "0.12.7"
 dependencies = [
+ "axum 0.7.5",
  "base64 0.22.0",
  "clap",
  "futures",
  "futures-timer",
- "hyper 0.14.27",
  "libp2p",
  "prometheus-client",
  "serde",
@@ -3748,8 +3748,8 @@ dependencies = [
 name = "metrics-example"
 version = "0.1.0"
 dependencies = [
+ "axum 0.7.5",
  "futures",
- "hyper 0.14.27",
  "libp2p",
  "opentelemetry",
  "opentelemetry-otlp",
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index e84b4819897..5059bc4085b 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 futures = "0.3.30"
-hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
+axum = "0.7"
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
 opentelemetry = { version = "0.22.0", features = ["metrics"] }
 opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
diff --git a/examples/metrics/src/http_service.rs b/examples/metrics/src/http_service.rs
index 8c77d724ea3..4a9c9785bb3 100644
--- a/examples/metrics/src/http_service.rs
+++ b/examples/metrics/src/http_service.rs
@@ -18,109 +18,60 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use hyper::http::StatusCode;
-use hyper::service::Service;
-use hyper::{Body, Method, Request, Response, Server};
+use axum::extract::State;
+use axum::http::StatusCode;
+use axum::response::IntoResponse;
+use axum::routing::get;
+use axum::Router;
 use prometheus_client::encoding::text::encode;
 use prometheus_client::registry::Registry;
-use std::future::Future;
-use std::pin::Pin;
+use std::net::SocketAddr;
 use std::sync::{Arc, Mutex};
-use std::task::{Context, Poll};
+use tokio::net::TcpListener;
 
 const METRICS_CONTENT_TYPE: &str = "application/openmetrics-text;charset=utf-8;version=1.0.0";
 
 pub(crate) async fn metrics_server(registry: Registry) -> Result<(), std::io::Error> {
     // Serve on localhost.
-    let addr = ([127, 0, 0, 1], 0).into();
-
-    let server = Server::bind(&addr).serve(MakeMetricService::new(registry));
-    tracing::info!(metrics_server=%format!("http://{}/metrics", server.local_addr()));
-    if let Err(e) = server.await {
-        tracing::error!("server error: {}", e);
-    }
+    let addr: SocketAddr = ([127, 0, 0, 1], 0).into();
+    let service = MetricService::new(registry);
+    let server = Router::new()
+        .route("/metrics", get(respond_with_metrics))
+        .with_state(service);
+    let tcp_listener = TcpListener::bind(addr).await?;
+    let local_addr = tcp_listener.local_addr()?;
+    tracing::info!(metrics_server=%format!("http://{}/metrics", local_addr));
+    axum::serve(tcp_listener, server.into_make_service()).await?;
     Ok(())
 }
 
+#[derive(Clone)]
 pub(crate) struct MetricService {
     reg: Arc<Mutex<Registry>>,
 }
 
-type SharedRegistry = Arc<Mutex<Registry>>;
-
-impl MetricService {
-    fn get_reg(&mut self) -> SharedRegistry {
-        Arc::clone(&self.reg)
-    }
-    fn respond_with_metrics(&mut self) -> Response<String> {
-        let mut response: Response<String> = Response::default();
-
-        response.headers_mut().insert(
-            hyper::header::CONTENT_TYPE,
-            METRICS_CONTENT_TYPE.try_into().unwrap(),
-        );
-
-        let reg = self.get_reg();
-        encode(&mut response.body_mut(), &reg.lock().unwrap()).unwrap();
-
-        *response.status_mut() = StatusCode::OK;
-
-        response
-    }
-    fn respond_with_404_not_found(&mut self) -> Response<String> {
-        Response::builder()
-            .status(StatusCode::NOT_FOUND)
-            .body("Not found try localhost:[port]/metrics".to_string())
-            .unwrap()
-    }
-}
-
-impl Service<Request<Body>> for MetricService {
-    type Response = Response<String>;
-    type Error = hyper::Error;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
-
-    fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
+async fn respond_with_metrics(state: State<MetricService>) -> impl IntoResponse {
+    let mut sink = String::new();
+    let reg = state.get_reg();
+    encode(&mut sink, &reg.lock().unwrap()).unwrap();
 
-    fn call(&mut self, req: Request<Body>) -> Self::Future {
-        let req_path = req.uri().path();
-        let req_method = req.method();
-        let resp = if (req_method == Method::GET) && (req_path == "/metrics") {
-            // Encode and serve metrics from registry.
-            self.respond_with_metrics()
-        } else {
-            self.respond_with_404_not_found()
-        };
-        Box::pin(async { Ok(resp) })
-    }
+    (
+        StatusCode::OK,
+        [(axum::http::header::CONTENT_TYPE, METRICS_CONTENT_TYPE)],
+        sink,
+    )
 }
 
-pub(crate) struct MakeMetricService {
-    reg: SharedRegistry,
-}
+type SharedRegistry = Arc<Mutex<Registry>>;
 
-impl MakeMetricService {
-    pub(crate) fn new(registry: Registry) -> MakeMetricService {
-        MakeMetricService {
+impl MetricService {
+    fn new(registry: Registry) -> Self {
+        Self {
             reg: Arc::new(Mutex::new(registry)),
         }
     }
-}
-
-impl<T> Service<T> for MakeMetricService {
-    type Response = MetricService;
-    type Error = hyper::Error;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
-
-    fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
 
-    fn call(&mut self, _: T) -> Self::Future {
-        let reg = self.reg.clone();
-        let fut = async move { Ok(MetricService { reg }) };
-        Box::pin(fut)
+    fn get_reg(&self) -> SharedRegistry {
+        Arc::clone(&self.reg)
     }
 }
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 74576ad39f5..14c29b3ebb9 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -15,7 +15,7 @@ base64 = "0.22"
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3"
 futures-timer = "3"
-hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
+axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
 serde = "1.0.197"
diff --git a/misc/server/src/http_service.rs b/misc/server/src/http_service.rs
index 7905933fbf5..cee1aa96e28 100644
--- a/misc/server/src/http_service.rs
+++ b/misc/server/src/http_service.rs
@@ -18,115 +18,62 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use hyper::http::StatusCode;
-use hyper::service::Service;
-use hyper::{Body, Method, Request, Response, Server};
+use axum::extract::State;
+use axum::http::StatusCode;
+use axum::response::IntoResponse;
+use axum::routing::get;
+use axum::Router;
 use prometheus_client::encoding::text::encode;
 use prometheus_client::registry::Registry;
-use std::future::Future;
-use std::pin::Pin;
+use std::net::SocketAddr;
 use std::sync::{Arc, Mutex};
-use std::task::{Context, Poll};
+use tokio::net::TcpListener;
 
 const METRICS_CONTENT_TYPE: &str = "application/openmetrics-text;charset=utf-8;version=1.0.0";
 pub(crate) async fn metrics_server(
     registry: Registry,
     metrics_path: String,
-) -> Result<(), hyper::Error> {
+) -> Result<(), std::io::Error> {
     // Serve on localhost.
-    let addr = ([0, 0, 0, 0], 8888).into();
-
-    let server = Server::bind(&addr).serve(MakeMetricService::new(registry, metrics_path.clone()));
-    tracing::info!(metrics_server=%format!("http://{}{}", server.local_addr(), metrics_path));
-    server.await?;
+    let addr: SocketAddr = ([0, 0, 0, 0], 8888).into();
+    let service = MetricService::new(registry);
+    let server = Router::new()
+        .route(&metrics_path, get(respond_with_metrics))
+        .with_state(service);
+    let tcp_listener = TcpListener::bind(addr).await?;
+    let local_addr = tcp_listener.local_addr()?;
+    tracing::info!(metrics_server=%format!("http://{}{}", local_addr, metrics_path));
+    axum::serve(tcp_listener, server.into_make_service()).await?;
     Ok(())
 }
-pub(crate) struct MetricService {
-    reg: Arc<Mutex<Registry>>,
-    metrics_path: String,
-}
 
-type SharedRegistry = Arc<Mutex<Registry>>;
+async fn respond_with_metrics(state: State<MetricService>) -> impl IntoResponse {
+    let mut sink = String::new();
+    let reg = state.get_reg();
+    encode(&mut sink, &reg.lock().unwrap()).unwrap();
 
-impl MetricService {
-    fn get_reg(&mut self) -> SharedRegistry {
-        Arc::clone(&self.reg)
-    }
-    fn respond_with_metrics(&mut self) -> Response<String> {
-        let mut response: Response<String> = Response::default();
-
-        response.headers_mut().insert(
-            hyper::header::CONTENT_TYPE,
-            METRICS_CONTENT_TYPE.try_into().unwrap(),
-        );
-
-        let reg = self.get_reg();
-        encode(&mut response.body_mut(), &reg.lock().unwrap()).unwrap();
-
-        *response.status_mut() = StatusCode::OK;
-
-        response
-    }
-    fn respond_with_404_not_found(&mut self) -> Response<String> {
-        Response::builder()
-            .status(StatusCode::NOT_FOUND)
-            .body(format!(
-                "Not found try localhost:[port]/{}",
-                self.metrics_path
-            ))
-            .unwrap()
-    }
+    (
+        StatusCode::OK,
+        [(axum::http::header::CONTENT_TYPE, METRICS_CONTENT_TYPE)],
+        sink,
+    )
 }
 
-impl Service<Request<Body>> for MetricService {
-    type Response = Response<String>;
-    type Error = hyper::Error;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
-
-    fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
-    fn call(&mut self, req: Request<Body>) -> Self::Future {
-        let req_path = req.uri().path();
-        let req_method = req.method();
-        let resp = if (req_method == Method::GET) && (req_path == self.metrics_path) {
-            // Encode and serve metrics from registry.
-            self.respond_with_metrics()
-        } else {
-            self.respond_with_404_not_found()
-        };
-        Box::pin(async { Ok(resp) })
-    }
+#[derive(Clone)]
+pub(crate) struct MetricService {
+    reg: Arc<Mutex<Registry>>,
 }
 
-pub(crate) struct MakeMetricService {
-    reg: SharedRegistry,
-    metrics_path: String,
-}
+type SharedRegistry = Arc<Mutex<Registry>>;
 
-impl MakeMetricService {
-    pub(crate) fn new(registry: Registry, metrics_path: String) -> MakeMetricService {
-        MakeMetricService {
-            reg: Arc::new(Mutex::new(registry)),
-            metrics_path,
+impl MetricService {
+    fn new(reg: Registry) -> Self {
+        Self {
+            reg: Arc::new(Mutex::new(reg)),
         }
     }
-}
-
-impl<T> Service<T> for MakeMetricService {
-    type Response = MetricService;
-    type Error = hyper::Error;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
 
-    fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
-    fn call(&mut self, _: T) -> Self::Future {
-        let reg = self.reg.clone();
-        let metrics_path = self.metrics_path.clone();
-        let fut = async move { Ok(MetricService { reg, metrics_path }) };
-        Box::pin(fut)
+    fn get_reg(&self) -> SharedRegistry {
+        Arc::clone(&self.reg)
     }
 }

From bec3037398643733b1ac974e5fbf9b67c3e4752d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:03:48 +0000
Subject: [PATCH 201/455] deps: bump quote from 1.0.35 to 1.0.36

Pull-Request: #5307.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eeed878cb39..8e4628a1b11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4651,9 +4651,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]

From c1891bc0771618f95e3bab1e1b976a5b7ccc21fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:22:57 +0000
Subject: [PATCH 202/455] deps: bump async-trait from 0.1.79 to 0.1.80

Pull-Request: #5308.
---
 Cargo.lock                | 4 ++--
 swarm-test/Cargo.toml     | 2 +-
 transports/dns/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e4628a1b11..79f0a1834bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -480,9 +480,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.79"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index ad7b05264b8..0ea404fad7f 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.79"
+async-trait = "0.1.80"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index b06ab6d7d8b..750317b307d 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
-async-trait = "0.1.79"
+async-trait = "0.1.80"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From ec9767acf969ca560af1491ee65cfd9a8929352c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:41:57 +0000
Subject: [PATCH 203/455] deps: bump syn from 2.0.58 to 2.0.59

Pull-Request: #5309.
---
 Cargo.lock              | 62 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79f0a1834bf..00c9a73ecfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
  "synstructure 0.13.1",
 ]
 
@@ -247,7 +247,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -469,7 +469,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -486,7 +486,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1254,7 +1254,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1385,7 +1385,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1490,7 +1490,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -3344,7 +3344,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -4117,7 +4117,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -4328,7 +4328,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -4498,9 +4498,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e"
 dependencies = [
  "unicode-ident",
 ]
@@ -4525,7 +4525,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -4548,7 +4548,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -5070,7 +5070,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.58",
+ "syn 2.0.59",
  "walkdir",
 ]
 
@@ -5363,7 +5363,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -5396,7 +5396,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -5681,7 +5681,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -5731,9 +5731,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5772,7 +5772,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -5887,7 +5887,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -5989,7 +5989,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -6177,7 +6177,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -6519,7 +6519,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
  "wasm-bindgen-shared",
 ]
 
@@ -6553,7 +6553,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6586,7 +6586,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -7194,7 +7194,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -7214,5 +7214,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.59",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 6396dd3f052..072efcf0b9b 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.58", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.59", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From c504eef7678956895548475191b922a4bd22dcb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:54:11 +0000
Subject: [PATCH 204/455] deps: bump proc-macro2 from 1.0.79 to 1.0.80

Pull-Request: #5311.

From bee8199c0db79e2b621e3a076ed09ece65337553 Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Mon, 15 Apr 2024 18:09:18 +0800
Subject: [PATCH 205/455] deps: promote tokio to workspace dependency

Promote `tokio` to workspace dependency.

Pull-Request: #5251.
---
 Cargo.toml                         | 1 +
 examples/autonat/Cargo.toml        | 2 +-
 examples/browser-webrtc/Cargo.toml | 2 +-
 examples/chat/Cargo.toml           | 2 +-
 examples/dcutr/Cargo.toml          | 2 +-
 examples/file-sharing/Cargo.toml   | 2 +-
 examples/ipfs-kad/Cargo.toml       | 2 +-
 examples/ipfs-private/Cargo.toml   | 2 +-
 examples/metrics/Cargo.toml        | 2 +-
 examples/ping/Cargo.toml           | 2 +-
 examples/rendezvous/Cargo.toml     | 2 +-
 examples/stream/Cargo.toml         | 2 +-
 examples/upnp/Cargo.toml           | 2 +-
 hole-punching-tests/Cargo.toml     | 2 +-
 interop-tests/Cargo.toml           | 2 +-
 libp2p/Cargo.toml                  | 2 +-
 misc/server/Cargo.toml             | 2 +-
 protocols/mdns/Cargo.toml          | 4 ++--
 protocols/perf/Cargo.toml          | 2 +-
 protocols/rendezvous/Cargo.toml    | 2 +-
 protocols/stream/Cargo.toml        | 2 +-
 protocols/upnp/Cargo.toml          | 2 +-
 swarm/Cargo.toml                   | 4 ++--
 transports/dns/Cargo.toml          | 2 +-
 transports/dns/src/lib.rs          | 2 +-
 transports/pnet/Cargo.toml         | 2 +-
 transports/quic/Cargo.toml         | 4 ++--
 transports/tcp/Cargo.toml          | 4 ++--
 transports/tls/Cargo.toml          | 2 +-
 transports/uds/Cargo.toml          | 2 +-
 transports/webrtc/Cargo.toml       | 4 ++--
 31 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index da05125aa2c..796daaae0b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -123,6 +123,7 @@ quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 unsigned-varint = { version = "0.8.0" }
+tokio = { version = "1.37", default-features = false }
 tracing = "0.1.37"
 
 [patch.crates-io]
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index f128347bf04..89cc951c4c8 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.37", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index f5a70cfd865..fc4adfc1560 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -27,7 +27,7 @@ axum = "0.7.5"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-folder-path"] }
-tokio = { version = "1.37", features = ["macros", "net", "rt", "signal"] }
+tokio = { workspace = true, features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
 tower-http = { version = "0.5.2", features = ["cors"] }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index d6f083962f7..0c7241eae52 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.37", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 3d4d3a5c154..497a9dc11ae 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
-tokio = { version = "1.37", features = ["macros", "net", "rt", "signal"] }
+tokio = { workspace = true, features = ["macros", "net", "rt", "signal"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index fdc4c7b26fd..f364b9305c9 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index d27c68c0e59..2dbaa21365a 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.37", features = ["rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index cf0d2689ced..05798ea82c2 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "io-std"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.9"
 futures = "0.3.30"
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 5059bc4085b..f3119b0f0fa 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -16,7 +16,7 @@ opentelemetry = { version = "0.22.0", features = ["metrics"] }
 opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
 opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
-tokio = { version = "1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-opentelemetry = "0.23.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 6c74f4619fd..d712f482f03 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index aecacbd7fa6..8ce668a98be 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
-tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index 1e33991f27e..37a511d857f 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.3.29"
 libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
 libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
 rand = "0.8"
-tokio = { version = "1.37", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/examples/upnp/Cargo.toml b/examples/upnp/Cargo.toml
index db9825c8742..20c1323c7d6 100644
--- a/examples/upnp/Cargo.toml
+++ b/examples/upnp/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "dns", "macros", "noise", "ping", "tcp", "yamux", "upnp"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 75ed1e31ebe..0a64de1956d 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 either = "1.9.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 4d162c5786a..4749e808a70 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -34,7 +34,7 @@ redis = { version = "0.23.3", default-features = false, features = [
 rust-embed = "8.3"
 serde_json = "1"
 thirtyfour = "=0.32.0" # https://github.com/stevepryde/thirtyfour/issues/169
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index fcec353e3f6..12b895894ab 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -140,7 +140,7 @@ libp2p-websocket = { workspace = true, optional = true }
 async-std = { version = "1.6.2", features = ["attributes"] }
 async-trait = "0.1"
 clap = { version = "4.1.6", features = ["derive"] }
-tokio = { version = "1.15", features = [ "io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
+tokio = { workspace = true, features = [ "io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
 
 libp2p-mplex = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 14c29b3ebb9..d744a2f9a08 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -21,7 +21,7 @@ prometheus-client = { workspace = true }
 serde = "1.0.197"
 serde_derive = "1.0.125"
 serde_json = "1.0"
-tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 zeroize = "1"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index c2dba2cf2f6..af8f555156a 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identity = { workspace = true }
 rand = "0.8.3"
 smallvec = "1.13.2"
 socket2 = { version = "0.5.6", features = ["all"] }
-tokio = { version = "1.37", default-features = false, features = ["net", "time"], optional = true}
+tokio = { workspace = true, default-features = false, features = ["net", "time"], optional = true}
 tracing = { workspace = true }
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
 void = "1.0.2"
@@ -37,7 +37,7 @@ libp2p-noise = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] }
 libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.37", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] }
+tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index b73c7d599cb..655f7e13658 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tokio = { version = "1.37", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
+tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
 void = "1"
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index e2424a9258b..609ea207bae 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -37,7 +37,7 @@ libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
-tokio = { version = "1.37", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
+tokio = { workspace = true, features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index f58daff0bb6..964d69027f1 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -20,7 +20,7 @@ rand = "0.8"
 
 [dev-dependencies]
 libp2p-swarm-test = { workspace = true }
-tokio = { version = "1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 116941cb75f..a73f955ae62 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -16,7 +16,7 @@ futures-timer = "3.0.3"
 igd-next = "0.14.3"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
-tokio = { version = "1.37", default-features = false, features = ["rt"], optional = true }
+tokio = { workspace = true, default-features = false, features = ["rt"], optional = true }
 tracing = { workspace = true }
 void = "1.0.2"
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 90aa57a4d12..e846e4251d8 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -31,7 +31,7 @@ wasm-bindgen-futures = { version = "0.4.42", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 async-std = { version = "1.6.2", optional = true }
-tokio = { version = "1.37", features = ["rt"], optional = true }
+tokio = { workspace = true, features = ["rt"], optional = true }
 
 [features]
 macros = ["dep:libp2p-swarm-derive"]
@@ -55,7 +55,7 @@ quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.91"
-tokio = { version = "1.37.0", features = ["time", "rt", "macros", "rt-multi-thread"] }
+tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 750317b307d..d35d87da075 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -23,7 +23,7 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio-crate = { package = "tokio", version = "1.0", default-features = false, features = ["rt", "time"] }
+tokio = { workspace = true, features = ["rt", "time"] }
 async-std-crate = { package = "async-std", version = "1.6" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index a0fdaf53bdf..505a91f0791 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -777,7 +777,7 @@ mod tests {
             // type record lookups may not work with the system DNS resolver.
             let config = ResolverConfig::quad9();
             let opts = ResolverOpts::default();
-            let rt = tokio_crate::runtime::Builder::new_current_thread()
+            let rt = ::tokio::runtime::Builder::new_current_thread()
                 .enable_io()
                 .enable_time()
                 .build()
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index e13d9dbd0d4..bb8b1c03f6f 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -27,7 +27,7 @@ libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-websocket = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index f6fad337bb7..1d283aeef45 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -22,7 +22,7 @@ quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls"
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.58"
-tokio = { version = "1.37.0", default-features = false, features = ["net", "rt", "time"], optional = true }
+tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.6"
 ring = "0.16.20"
@@ -46,7 +46,7 @@ libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
-tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [[test]]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 2b6ecf7189b..b074e8e8b22 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -19,7 +19,7 @@ libc = "0.2.153"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.6", features = ["all"] }
-tokio = { version = "1.37.0", default-features = false, features = ["net"], optional = true }
+tokio = { workspace = true, default-features = false, features = ["net"], optional = true }
 tracing = { workspace = true }
 
 [features]
@@ -29,7 +29,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.37.0", default-features = false, features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 4fed28c64d4..bd0ef91279c 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -33,7 +33,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rsa", "secp256k1", "ecdsa", "rand"] }
 libp2p-swarm = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index b99e869b1df..84df8dc569e 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
 futures = "0.3.30"
-tokio = { version = "1.37", default-features = false, features = ["net"], optional = true }
+tokio = { workspace = true, default-features = false, features = ["net"], optional = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index d9d7f8c97d6..4a7c94ab1ca 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] }
 stun = "0.5"
 thiserror = "1"
 tinytemplate = "1.2"
-tokio = { version = "1.37", features = ["net"], optional = true }
+tokio = { workspace = true, features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
 tracing = { workspace = true }
 webrtc = { version = "0.9.0", optional = true }
@@ -39,7 +39,7 @@ pem = ["webrtc?/pem"]
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
-tokio = { version = "1.37", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 quickcheck = "1.0.3"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 33ac975d0ffc7db50b410692714024a6691311d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 09:26:47 +0000
Subject: [PATCH 206/455] deps: bump getrandom from 0.2.13 to 0.2.14

Pull-Request: #5310.
---
 Cargo.lock                               | 22 +++++++++++-----------
 protocols/gossipsub/Cargo.toml           |  2 +-
 swarm/Cargo.toml                         |  2 +-
 transports/webrtc-websys/Cargo.toml      |  2 +-
 wasm-tests/webtransport-tests/Cargo.toml |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00c9a73ecfc..af75b3f307e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1826,9 +1826,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2614,7 +2614,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-autonat",
@@ -2824,7 +2824,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-ticker",
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "hex",
  "hex_fmt",
  "instant",
@@ -3312,7 +3312,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "instant",
  "libp2p-core",
  "libp2p-identify",
@@ -3487,7 +3487,7 @@ version = "0.3.0-alpha"
 dependencies = [
  "bytes",
  "futures",
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "hex",
  "js-sys",
  "libp2p-core",
@@ -4717,7 +4717,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -4807,7 +4807,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
@@ -4971,7 +4971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
  "cc",
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -6419,7 +6419,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -6845,7 +6845,7 @@ name = "webtransport-tests"
 version = "0.1.0"
 dependencies = [
  "futures",
- "getrandom 0.2.13",
+ "getrandom 0.2.14",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 4101a4aa4e9..aec1712be61 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -22,7 +22,7 @@ either = "1.9"
 fnv = "1.0.7"
 futures = "0.3.30"
 futures-ticker = "0.0.3"
-getrandom = "0.2.13"
+getrandom = "0.2.14"
 hex_fmt = "0.3.0"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index e846e4251d8..3b1e0979e81 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.9.0"
 fnv = "1.0"
 futures = "0.3.30"
 futures-timer = "3.0.3"
-getrandom = { version = "0.2.13", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
+getrandom = { version = "0.2.14", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 0099851f4d5..b5682a7c7da 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -14,7 +14,7 @@ publish = true
 [dependencies]
 bytes = "1"
 futures = "0.3"
-getrandom = { version = "0.2.13", features = ["js"] }
+getrandom = { version = "0.2.14", features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
 libp2p-core = { workspace = true }
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 11b85910833..f50a3909bd0 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 futures = "0.3.30"
-getrandom = { version = "0.2.13", features = ["js"] }
+getrandom = { version = "0.2.14", features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-noise = { workspace = true }

From 9a6eccd4b3315848205063a7b2367270d02dc24f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 21:58:06 +0000
Subject: [PATCH 207/455] deps: bump either from 1.9.0 to 1.11.0

Pull-Request: #5320.
---
 Cargo.lock                       | 4 ++--
 core/Cargo.toml                  | 2 +-
 examples/ipfs-private/Cargo.toml | 2 +-
 hole-punching-tests/Cargo.toml   | 2 +-
 interop-tests/Cargo.toml         | 2 +-
 protocols/dcutr/Cargo.toml       | 2 +-
 protocols/gossipsub/Cargo.toml   | 2 +-
 protocols/identify/Cargo.toml    | 2 +-
 protocols/kad/Cargo.toml         | 2 +-
 protocols/ping/Cargo.toml        | 2 +-
 protocols/relay/Cargo.toml       | 2 +-
 swarm/Cargo.toml                 | 4 ++--
 transports/websocket/Cargo.toml  | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index af75b3f307e..455bd9d99e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1447,9 +1447,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "elliptic-curve"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 65b7728b7ba..554d0091866 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.9"
+either = "1.11"
 fnv = "1.0"
 futures = { version = "0.3.30", features = ["executor", "thread-pool"] }
 futures-timer = "3"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 05798ea82c2..7b017111d26 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
-either = "1.9"
+either = "1.11"
 futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 0a64de1956d..129adca499a 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -15,4 +15,4 @@ redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"
 tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
-either = "1.9.0"
+either = "1.11.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 4749e808a70..6e6ba028847 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 anyhow = "1"
-either = "1.9.0"
+either = "1.11.0"
 futures = "0.3.30"
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 414eff4775b..10322fb63da 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-either = "1.9.0"
+either = "1.11.0"
 futures = "0.3.30"
 futures-timer = "3.0"
 instant = "0.1.12"
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index aec1712be61..830866150ac 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -18,7 +18,7 @@ asynchronous-codec = { workspace = true }
 base64 = "0.22.0"
 byteorder = "1.5.0"
 bytes = "1.6"
-either = "1.9"
+either = "1.11"
 fnv = "1.0.7"
 futures = "0.3.30"
 futures-ticker = "0.0.3"
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index a794d1e0409..16cfef4a05a 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -25,7 +25,7 @@ smallvec = "1.13.2"
 thiserror = "1.0"
 tracing = { workspace = true }
 void = "1.0"
-either = "1.9.0"
+either = "1.11.0"
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index fb89337b61e..3d2739c6004 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 arrayvec = "0.7.4"
 bytes = "1"
-either = "1.9"
+either = "1.11"
 fnv = "1.0"
 asynchronous-codec = { workspace = true }
 futures = "0.3.30"
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 5d982c90b7f..0a07b403260 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.9.0"
+either = "1.11.0"
 futures = "0.3.30"
 futures-timer = "3.0.3"
 instant = "0.1.12"
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 4183e0facd3..750f5550dde 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-either = "1.9.0"
+either = "1.11.0"
 futures = "0.3.30"
 futures-timer = "3"
 futures-bounded = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3b1e0979e81..10749def335 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.9.0"
+either = "1.11.0"
 fnv = "1.0"
 futures = "0.3.30"
 futures-timer = "3.0.3"
@@ -41,7 +41,7 @@ wasm-bindgen = ["dep:wasm-bindgen-futures", "dep:getrandom"]
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
-either = "1.9.0"
+either = "1.11.0"
 futures = "0.3.30"
 libp2p-identify = { path = "../protocols/identify" }                # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-identity = { workspace = true, features = ["ed25519"] }
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index f04c42084c1..5327d6577b3 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures-rustls = "0.24.0"
-either = "1.9.0"
+either = "1.11.0"
 futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From 31457f61731d93bb3a5b90a9d46319138b420695 Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Fri, 19 Apr 2024 15:40:23 +0800
Subject: [PATCH 208/455] feat(kad): derive Copy for kbucket::key::Key

Derive `Copy` for `kbucket::key::Key` and `kbucket::key::KeyBytes` because `Key` is almost always used with `PeerId`, which is `Copy`.
This will make it easier to iterate over kbuckets.

Pull-Request: #5317.
---
 protocols/kad/CHANGELOG.md                    |  2 +
 protocols/kad/src/behaviour.rs                | 10 ++---
 protocols/kad/src/kbucket.rs                  | 18 +++-----
 protocols/kad/src/kbucket/bucket.rs           | 41 +++++--------------
 protocols/kad/src/kbucket/key.rs              |  4 +-
 protocols/kad/src/query/peers/closest.rs      | 11 +++--
 .../kad/src/query/peers/closest/disjoint.rs   | 10 ++---
 protocols/kad/src/record/store/memory.rs      |  2 +-
 8 files changed, 36 insertions(+), 62 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index b2a06dc691c..bd0c9857cb5 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -15,6 +15,8 @@
   See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122).
 - Compute `jobs_query_capacity` accurately.
   See [PR 5148](https://github.com/libp2p/rust-libp2p/pull/5148).
+- Derive `Copy` for `kbucket::key::Key<T>`.
+  See [PR 5317](https://github.com/libp2p/rust-libp2p/pull/5317).
 
 ## 0.45.3
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 7f47f93bb39..fb77f3c0e0f 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -931,7 +931,7 @@ where
     /// This parameter is used to call [`Behaviour::bootstrap`] periodically and automatically
     /// to ensure a healthy routing table.
     pub fn bootstrap(&mut self) -> Result<QueryId, NoKnownPeers> {
-        let local_key = self.kbuckets.local_key().clone();
+        let local_key = *self.kbuckets.local_key();
         let info = QueryInfo::Bootstrap {
             peer: *local_key.preimage(),
             remaining: None,
@@ -1396,7 +1396,7 @@ where
                 remaining,
                 mut step,
             } => {
-                let local_key = self.kbuckets.local_key().clone();
+                let local_key = *self.kbuckets.local_key();
                 let mut remaining = remaining.unwrap_or_else(|| {
                     debug_assert_eq!(&peer, local_key.preimage());
                     // The lookup for the local key finished. To complete the bootstrap process,
@@ -1446,7 +1446,7 @@ where
                     let peers = self.kbuckets.closest_keys(&target);
                     let inner = QueryInner::new(info);
                     self.queries
-                        .continue_iter_closest(query_id, target.clone(), peers, inner);
+                        .continue_iter_closest(query_id, target, peers, inner);
                 } else {
                     step.last = true;
                     self.bootstrap_status.on_finish();
@@ -1642,14 +1642,14 @@ where
                     remaining.take().and_then(|mut r| Some((r.next()?, r)))
                 {
                     let info = QueryInfo::Bootstrap {
-                        peer: target.clone().into_preimage(),
+                        peer: target.into_preimage(),
                         remaining: Some(remaining),
                         step: step.next(),
                     };
                     let peers = self.kbuckets.closest_keys(&target);
                     let inner = QueryInner::new(info);
                     self.queries
-                        .continue_iter_closest(query_id, target.clone(), peers, inner);
+                        .continue_iter_closest(query_id, target, peers, inner);
                 } else {
                     step.last = true;
                     self.bootstrap_status.on_finish();
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 5a110fd7c3f..fbc10f22af8 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -534,7 +534,7 @@ mod tests {
         fn arbitrary(g: &mut Gen) -> TestTable {
             let local_key = Key::from(PeerId::random());
             let timeout = Duration::from_secs(g.gen_range(1..360));
-            let mut table = TestTable::new(local_key.clone().into(), timeout);
+            let mut table = TestTable::new(local_key.into(), timeout);
             let mut num_total = g.gen_range(0..100);
             for (i, b) in &mut table.buckets.iter_mut().enumerate().rev() {
                 let ix = BucketIndex(i);
@@ -543,10 +543,7 @@ mod tests {
                 for _ in 0..num {
                     let distance = ix.rand_distance(&mut rand::thread_rng());
                     let key = local_key.for_distance(distance);
-                    let node = Node {
-                        key: key.clone(),
-                        value: (),
-                    };
+                    let node = Node { key, value: () };
                     let status = NodeStatus::arbitrary(g);
                     match b.insert(node, status) {
                         InsertResult::Inserted => {}
@@ -643,7 +640,7 @@ mod tests {
     #[test]
     fn entry_self() {
         let local_key = Key::from(PeerId::random());
-        let mut table = KBucketsTable::<_, ()>::new(local_key.clone(), Duration::from_secs(5));
+        let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_secs(5));
 
         assert!(table.entry(&local_key).is_none())
     }
@@ -671,7 +668,7 @@ mod tests {
         let mut expected_keys: Vec<_> = table
             .buckets
             .iter()
-            .flat_map(|t| t.iter().map(|(n, _)| n.key.clone()))
+            .flat_map(|t| t.iter().map(|(n, _)| n.key))
             .collect();
 
         for _ in 0..10 {
@@ -686,7 +683,7 @@ mod tests {
     #[test]
     fn applied_pending() {
         let local_key = Key::from(PeerId::random());
-        let mut table = KBucketsTable::<_, ()>::new(local_key.clone(), Duration::from_millis(1));
+        let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_millis(1));
         let expected_applied;
         let full_bucket_index;
         loop {
@@ -698,10 +695,7 @@ mod tests {
                             match e.insert((), NodeStatus::Connected) {
                                 InsertResult::Pending { disconnected } => {
                                     expected_applied = AppliedPending {
-                                        inserted: Node {
-                                            key: key.clone(),
-                                            value: (),
-                                        },
+                                        inserted: Node { key, value: () },
                                         evicted: Some(Node {
                                             key: disconnected,
                                             value: (),
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
index 5e65bc15a37..1bd4389eb3d 100644
--- a/protocols/kad/src/kbucket/bucket.rs
+++ b/protocols/kad/src/kbucket/bucket.rs
@@ -439,10 +439,7 @@ mod tests {
             let num_nodes = g.gen_range(1..K_VALUE.get() + 1);
             for _ in 0..num_nodes {
                 let key = Key::from(PeerId::random());
-                let node = Node {
-                    key: key.clone(),
-                    value: (),
-                };
+                let node = Node { key, value: () };
                 let status = NodeStatus::arbitrary(g);
                 match bucket.insert(node, status) {
                     InsertResult::Inserted => {}
@@ -492,10 +489,7 @@ mod tests {
             // Fill the bucket, thereby populating the expected lists in insertion order.
             for status in status {
                 let key = Key::from(PeerId::random());
-                let node = Node {
-                    key: key.clone(),
-                    value: (),
-                };
+                let node = Node { key, value: () };
                 let full = bucket.num_entries() == K_VALUE.get();
                 if let InsertResult::Inserted = bucket.insert(node, status) {
                     let vec = match status {
@@ -505,15 +499,12 @@ mod tests {
                     if full {
                         vec.pop_front();
                     }
-                    vec.push_back((status, key.clone()));
+                    vec.push_back((status, key));
                 }
             }
 
             // Get all nodes from the bucket, together with their status.
-            let mut nodes = bucket
-                .iter()
-                .map(|(n, s)| (s, n.key.clone()))
-                .collect::<Vec<_>>();
+            let mut nodes = bucket.iter().map(|(n, s)| (s, n.key)).collect::<Vec<_>>();
 
             // Split the list of nodes at the first connected node.
             let first_connected_pos = nodes.iter().position(|(s, _)| *s == NodeStatus::Connected);
@@ -553,10 +544,7 @@ mod tests {
             // Add a connected node, which is expected to be pending, scheduled to
             // replace the first (i.e. least-recently connected) node.
             let key = Key::from(PeerId::random());
-            let node = Node {
-                key: key.clone(),
-                value: (),
-            };
+            let node = Node { key, value: () };
             match bucket.insert(node.clone(), NodeStatus::Connected) {
                 InsertResult::Pending { disconnected } => {
                     assert_eq!(disconnected, first_disconnected.key)
@@ -609,10 +597,7 @@ mod tests {
 
         // Add a connected pending node.
         let key = Key::from(PeerId::random());
-        let node = Node {
-            key: key.clone(),
-            value: (),
-        };
+        let node = Node { key, value: () };
         if let InsertResult::Pending { disconnected } = bucket.insert(node, NodeStatus::Connected) {
             assert_eq!(&disconnected, &first_disconnected.key);
         } else {
@@ -647,13 +632,10 @@ mod tests {
 
             // Capture position and key of the random node to update.
             let pos = pos.0 % num_nodes;
-            let key = bucket.nodes[pos].key.clone();
+            let key = bucket.nodes[pos].key;
 
             // Record the (ordered) list of status of all nodes in the bucket.
-            let mut expected = bucket
-                .iter()
-                .map(|(n, s)| (n.key.clone(), s))
-                .collect::<Vec<_>>();
+            let mut expected = bucket.iter().map(|(n, s)| (n.key, s)).collect::<Vec<_>>();
 
             // Update the node in the bucket.
             bucket.update(&key, status);
@@ -665,11 +647,8 @@ mod tests {
                 NodeStatus::Disconnected => bucket.first_connected_pos.unwrap_or(num_nodes) - 1,
             };
             expected.remove(pos);
-            expected.insert(expected_pos, (key.clone(), status));
-            let actual = bucket
-                .iter()
-                .map(|(n, s)| (n.key.clone(), s))
-                .collect::<Vec<_>>();
+            expected.insert(expected_pos, (key, status));
+            let actual = bucket.iter().map(|(n, s)| (n.key, s)).collect::<Vec<_>>();
             expected == actual
         }
 
diff --git a/protocols/kad/src/kbucket/key.rs b/protocols/kad/src/kbucket/key.rs
index bc5d6a53750..f35849c6b26 100644
--- a/protocols/kad/src/kbucket/key.rs
+++ b/protocols/kad/src/kbucket/key.rs
@@ -39,7 +39,7 @@ construct_uint! {
 ///
 /// `Key`s have an XOR metric as defined in the Kademlia paper, i.e. the bitwise XOR of
 /// the hash digests, interpreted as an integer. See [`Key::distance`].
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct Key<T> {
     preimage: T,
     bytes: KeyBytes,
@@ -145,7 +145,7 @@ impl<T> Hash for Key<T> {
 }
 
 /// The raw bytes of a key in the DHT keyspace.
-#[derive(PartialEq, Eq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
 pub struct KeyBytes(GenericArray<u8, U32>);
 
 impl KeyBytes {
diff --git a/protocols/kad/src/query/peers/closest.rs b/protocols/kad/src/query/peers/closest.rs
index 3ee12b98244..a0b5a96708a 100644
--- a/protocols/kad/src/query/peers/closest.rs
+++ b/protocols/kad/src/query/peers/closest.rs
@@ -556,12 +556,12 @@ mod tests {
     #[test]
     fn new_iter() {
         fn prop(iter: ClosestPeersIter) {
-            let target = iter.target.clone();
+            let target = iter.target;
 
             let (keys, states): (Vec<_>, Vec<_>) = iter
                 .closest_peers
                 .values()
-                .map(|e| (e.key.clone(), &e.state))
+                .map(|e| (e.key, &e.state))
                 .unzip();
 
             let none_contacted = states.iter().all(|s| matches!(s, PeerState::NotContacted));
@@ -595,12 +595,12 @@ mod tests {
             let mut expected = iter
                 .closest_peers
                 .values()
-                .map(|e| e.key.clone())
+                .map(|e| e.key)
                 .collect::<Vec<_>>();
             let num_known = expected.len();
             let max_parallelism = usize::min(iter.config.parallelism.get(), num_known);
 
-            let target = iter.target.clone();
+            let target = iter.target;
             let mut remaining;
             let mut num_failures = 0;
 
@@ -667,7 +667,7 @@ mod tests {
                 .values()
                 .all(|e| !matches!(e.state, PeerState::NotContacted | PeerState::Waiting { .. }));
 
-            let target = iter.target.clone();
+            let target = iter.target;
             let num_results = iter.config.num_results;
             let result = iter.into_result();
             let closest = result.map(Key::from).collect::<Vec<_>>();
@@ -744,7 +744,6 @@ mod tests {
                 .next()
                 .unwrap()
                 .key
-                .clone()
                 .into_preimage();
 
             // Poll the iterator for the first peer to be in progress.
diff --git a/protocols/kad/src/query/peers/closest/disjoint.rs b/protocols/kad/src/query/peers/closest/disjoint.rs
index e8309a2deda..cafe87b6ef4 100644
--- a/protocols/kad/src/query/peers/closest/disjoint.rs
+++ b/protocols/kad/src/query/peers/closest/disjoint.rs
@@ -460,7 +460,7 @@ mod tests {
                 peers.into_iter()
             });
 
-            ResultIter::new(target.clone(), iters)
+            ResultIter::new(target, iters)
         }
 
         fn shrink(&self) -> Box<dyn Iterator<Item = Self>> {
@@ -481,7 +481,7 @@ mod tests {
                 .collect();
 
             Box::new(ResultIterShrinker {
-                target: self.target.clone(),
+                target: self.target,
                 peers,
                 iters,
             })
@@ -511,7 +511,7 @@ mod tests {
                 Some(iter.into_iter())
             });
 
-            Some(ResultIter::new(self.target.clone(), iters))
+            Some(ResultIter::new(self.target, iters))
         }
     }
 
@@ -867,7 +867,7 @@ mod tests {
             let closest = drive_to_finish(
                 PeerIterator::Closest(ClosestPeersIter::with_config(
                     cfg.clone(),
-                    target.clone(),
+                    target,
                     known_closest_peers.clone(),
                 )),
                 graph.clone(),
@@ -877,7 +877,7 @@ mod tests {
             let disjoint = drive_to_finish(
                 PeerIterator::Disjoint(ClosestDisjointPeersIter::with_config(
                     cfg,
-                    target.clone(),
+                    target,
                     known_closest_peers.clone(),
                 )),
                 graph,
diff --git a/protocols/kad/src/record/store/memory.rs b/protocols/kad/src/record/store/memory.rs
index 86c136ebeda..3bd3c56e30c 100644
--- a/protocols/kad/src/record/store/memory.rs
+++ b/protocols/kad/src/record/store/memory.rs
@@ -157,7 +157,7 @@ impl RecordStore for MemoryStore {
             providers.as_mut()[i] = record;
         } else {
             // It is a new provider record for that key.
-            let local_key = self.local_key.clone();
+            let local_key = self.local_key;
             let key = kbucket::Key::new(record.key.clone());
             let provider = kbucket::Key::from(record.provider);
             if let Some(i) = providers.iter().position(|p| {

From 44bc941c715c51ca2386f9532cd8748da4a126c4 Mon Sep 17 00:00:00 2001
From: Snoppy <michaleli@foxmail.com>
Date: Mon, 22 Apr 2024 05:31:34 +0800
Subject: [PATCH 209/455] chore: fix typos in doc comments

Pull-Request: #5323.
---
 swarm/src/lib.rs                   | 2 +-
 transports/webrtc/src/tokio/sdp.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index dac380855aa..cf2961cef6d 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -1147,7 +1147,7 @@ where
                     addrs
                 };
 
-                // If address translation yielded nothing, broacast the original candidate address.
+                // If address translation yielded nothing, broadcast the original candidate address.
                 if translated_addresses.is_empty() {
                     self.behaviour
                         .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
diff --git a/transports/webrtc/src/tokio/sdp.rs b/transports/webrtc/src/tokio/sdp.rs
index 8549a864dcc..4be4c19f188 100644
--- a/transports/webrtc/src/tokio/sdp.rs
+++ b/transports/webrtc/src/tokio/sdp.rs
@@ -98,7 +98,7 @@ pub(crate) fn offer(addr: SocketAddr, client_ufrag: &str) -> RTCSessionDescripti
 //
 // a=ice-options:ice2
 //
-//     Indicates that we are complying with RFC8839 (as oppposed to the legacy RFC5245).
+//     Indicates that we are complying with RFC8839 (as opposed to the legacy RFC5245).
 //
 // a=ice-ufrag:<ICE user>
 // a=ice-pwd:<ICE password>

From cde12ee94b632cd6399a2f965287894f68ee0991 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 08:45:46 +0000
Subject: [PATCH 210/455] deps: bump anyhow from 1.0.81 to 1.0.82

Pull-Request: #5306.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 455bd9d99e4..fbd938d8336 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index fc4adfc1560..70010c5e1b1 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.81"
+anyhow = "1.0.82"
 futures = "0.3.30"
 rand = "0.8"
 tracing = { workspace = true }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 2dbaa21365a..f18d7b41406 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
 futures = "0.3.30"
-anyhow = "1.0.81"
+anyhow = "1.0.82"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index c3c43eec286..aa509eae9e9 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.81"
+anyhow = "1.0.82"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From d481da7e9bc6df3d91b6324ce484ce77aeb4aa12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:04:29 +0000
Subject: [PATCH 211/455] deps: bump thiserror from 1.0.58 to 1.0.59

Pull-Request: #5331.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fbd938d8336..22e6345158b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5872,18 +5872,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index fe1b509735d..8e7e0ef3621 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 tracing = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 130fce156a9..9d6229343bd 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 tracing = { workspace = true }
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 1d283aeef45..4dd72bee1fe 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.6"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index bd0ef91279c..d8829f0ae4b 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = "0.16.20"
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.16.0"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 7f3c64a826a..3769806da8c 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = { workspace = true }
 parking_lot = "0.12.1"
 send_wrapper = "0.6.0"
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.69", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 7d844684f0d..ed3d4f0b8c4 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 tracing = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"

From 41b55d360af4f9dec630acfacbd3fd33f3bf1874 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:18:05 +0000
Subject: [PATCH 212/455] deps: bump serde_json from 1.0.115 to 1.0.116

Pull-Request: #5332.
---
 Cargo.lock                            | 4 ++--
 hole-punching-tests/Cargo.toml        | 2 +-
 misc/keygen/Cargo.toml                | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 22e6345158b..779612e4dde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5368,9 +5368,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
  "indexmap 2.2.1",
  "itoa",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 129adca499a..a4a17f3cfd0 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.115"
+serde_json = "1.0.116"
 either = "1.11.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index cefd28ff6e4..8292414ea5a 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.115"
+serde_json = "1.0.116"
 libp2p-core = { workspace = true }
 base64 = "0.22.0"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index aa509eae9e9..fd628da2420 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.115", optional = true }
+serde_json = { version = "1.0.116", optional = true }
 smallvec = "1.13.2"
 tracing = { workspace = true }
 void = "1.0.2"

From db7c72654777b63e9377052217dfee57bfc97f2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:30:21 +0000
Subject: [PATCH 213/455] deps: bump proc-macro2 from 1.0.80 to 1.0.81

Pull-Request: #5333.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 779612e4dde..2311f520365 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4498,9 +4498,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.80"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]

From f525705533f63f85acd83adb118ae3dcfea1be0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:42:57 +0000
Subject: [PATCH 214/455] deps: bump syn from 2.0.59 to 2.0.60

Pull-Request: #5335.
---
 Cargo.lock              | 58 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2311f520365..18d9a03c556 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
  "synstructure 0.13.1",
 ]
 
@@ -247,7 +247,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -469,7 +469,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -486,7 +486,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1254,7 +1254,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1385,7 +1385,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1490,7 +1490,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -3344,7 +3344,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4117,7 +4117,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4328,7 +4328,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4525,7 +4525,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4548,7 +4548,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5070,7 +5070,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.59",
+ "syn 2.0.60",
  "walkdir",
 ]
 
@@ -5363,7 +5363,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5396,7 +5396,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5681,7 +5681,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5731,9 +5731,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.59"
+version = "2.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5772,7 +5772,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5887,7 +5887,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5989,7 +5989,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -6177,7 +6177,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -6519,7 +6519,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
  "wasm-bindgen-shared",
 ]
 
@@ -6553,7 +6553,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6586,7 +6586,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -7194,7 +7194,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -7214,5 +7214,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.60",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 072efcf0b9b..7a8a1062d2c 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.59", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.60", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From d4dd9d0aebf8bb183f0c6a0431db36781d493259 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:54:32 +0000
Subject: [PATCH 215/455] deps: bump rmp-serde from 1.1.2 to 1.2.0

Pull-Request: #5336.
---
 Cargo.lock          | 8 ++++----
 identity/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 18d9a03c556..3463c7347c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4989,9 +4989,9 @@ dependencies = [
 
 [[package]]
 name = "rmp"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
 dependencies = [
  "byteorder",
  "num-traits",
@@ -5000,9 +5000,9 @@ dependencies = [
 
 [[package]]
 name = "rmp-serde"
-version = "1.1.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
+checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188"
 dependencies = [
  "byteorder",
  "rmp",
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 217044d0fcd..fbc7bae3d11 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -44,7 +44,7 @@ rand = ["dep:rand", "ed25519-dalek?/rand_core"]
 quickcheck = { workspace = true }
 base64 = "0.22.0"
 serde_json = "1.0"
-rmp-serde = "1.1"
+rmp-serde = "1.2"
 criterion = "0.5"
 hex-literal = "0.4.1"
 

From 0340c5236eea2e847e7c3011fc5364118748ee46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 14:06:34 +0000
Subject: [PATCH 216/455] deps: bump reqwest from 0.12.3 to 0.12.4

Pull-Request: #5337.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3463c7347c5..fe1af435e52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4884,9 +4884,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
  "base64 0.22.0",
  "bytes",

From cf7b678eee7a65d91f736b2231cd2d199a23f3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 25 Apr 2024 12:56:41 +0100
Subject: [PATCH 217/455] fix: update Cargo.lock

Pull-Request: #5342.
---
 Cargo.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe1af435e52..d44fbc0b47a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1453,9 +1453,9 @@ checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.5"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -1736,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
 dependencies = [
  "futures-io",
- "rustls 0.21.9",
+ "rustls 0.21.11",
 ]
 
 [[package]]
@@ -2237,7 +2237,7 @@ dependencies = [
  "http 1.0.0",
  "hyper 1.1.0",
  "hyper-util",
- "rustls 0.22.3",
+ "rustls 0.22.4",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -3171,7 +3171,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.16.20",
- "rustls 0.21.9",
+ "rustls 0.21.11",
  "socket2 0.5.6",
  "thiserror",
  "tokio",
@@ -3396,7 +3396,7 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.16.20",
- "rustls 0.21.9",
+ "rustls 0.21.11",
  "rustls-webpki 0.101.7",
  "thiserror",
  "tokio",
@@ -4613,7 +4613,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.21.9",
+ "rustls 0.21.11",
  "thiserror",
  "tokio",
  "tracing",
@@ -4629,7 +4629,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.16.20",
  "rustc-hash",
- "rustls 0.21.9",
+ "rustls 0.21.11",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4909,7 +4909,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.22.3",
+ "rustls 0.22.4",
  "rustls-pemfile",
  "rustls-pki-types",
  "serde",
@@ -5144,9 +5144,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.9"
+version = "0.21.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
+checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
 dependencies = [
  "log",
  "ring 0.17.5",
@@ -5156,9 +5156,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.3"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
  "ring 0.17.5",
@@ -6008,7 +6008,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls 0.22.3",
+ "rustls 0.22.4",
  "rustls-pki-types",
  "tokio",
 ]
@@ -6656,7 +6656,7 @@ dependencies = [
  "ring 0.16.20",
  "rtcp",
  "rtp",
- "rustls 0.21.9",
+ "rustls 0.21.11",
  "sdp",
  "serde",
  "serde_json",
@@ -6717,7 +6717,7 @@ dependencies = [
  "rand_core 0.6.4",
  "rcgen",
  "ring 0.16.20",
- "rustls 0.21.9",
+ "rustls 0.21.11",
  "sec1",
  "serde",
  "sha1",

From 2dcdda4a72ae814acacdd4ea30851692b6ee9175 Mon Sep 17 00:00:00 2001
From: largemouth <167662830+largemouth@users.noreply.github.com>
Date: Thu, 25 Apr 2024 20:23:15 +0800
Subject: [PATCH 218/455] docs: fix typos in some comments

fix typos in some comments

Pull-Request: #5338.
---
 core/src/transport/dummy.rs        | 2 +-
 protocols/gossipsub/src/config.rs  | 4 ++--
 protocols/kad/src/kbucket.rs       | 2 +-
 protocols/kad/src/kbucket/entry.rs | 2 +-
 protocols/rendezvous/src/server.rs | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/transport/dummy.rs b/core/src/transport/dummy.rs
index 951d1039328..0aab94b0396 100644
--- a/core/src/transport/dummy.rs
+++ b/core/src/transport/dummy.rs
@@ -94,7 +94,7 @@ impl<TOut> Transport for DummyTransport<TOut> {
     }
 }
 
-/// Implementation of `AsyncRead` and `AsyncWrite`. Not meant to be instanciated.
+/// Implementation of `AsyncRead` and `AsyncWrite`. Not meant to be instantiated.
 pub struct DummyStream(());
 
 impl fmt::Debug for DummyStream {
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index 8d7d11802ad..febe2514a30 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -292,7 +292,7 @@ impl Config {
         self.mesh_outbound_min
     }
 
-    /// Number of heartbeat ticks that specifcy the interval in which opportunistic grafting is
+    /// Number of heartbeat ticks that specify the interval in which opportunistic grafting is
     /// applied. Every `opportunistic_graft_ticks` we will attempt to select some high-scoring mesh
     /// peers to replace lower-scoring ones, if the median score of our mesh peers falls below a
     /// threshold (see <https://godoc.org/github.com/libp2p/go-libp2p-pubsub#PeerScoreThresholds>).
@@ -694,7 +694,7 @@ impl ConfigBuilder {
         self
     }
 
-    /// Number of heartbeat ticks that specifcy the interval in which opportunistic grafting is
+    /// Number of heartbeat ticks that specify the interval in which opportunistic grafting is
     /// applied. Every `opportunistic_graft_ticks` we will attempt to select some high-scoring mesh
     /// peers to replace lower-scoring ones, if the median score of our mesh peers falls below a
     /// threshold (see <https://godoc.org/github.com/libp2p/go-libp2p-pubsub#PeerScoreThresholds>).
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index fbc10f22af8..459f769fb12 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -344,7 +344,7 @@ enum ClosestBucketsIterState {
     /// The starting state of the iterator yields the first bucket index and
     /// then transitions to `ZoomIn`.
     Start(BucketIndex),
-    /// The iterator "zooms in" to yield the next bucket cotaining nodes that
+    /// The iterator "zooms in" to yield the next bucket containing nodes that
     /// are incrementally closer to the local node but further from the `target`.
     /// These buckets are identified by a `1` in the corresponding bit position
     /// of the distance bit string. When bucket `0` is reached, the iterator
diff --git a/protocols/kad/src/kbucket/entry.rs b/protocols/kad/src/kbucket/entry.rs
index d89853b1761..808db08d858 100644
--- a/protocols/kad/src/kbucket/entry.rs
+++ b/protocols/kad/src/kbucket/entry.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//! The `Entry` API for quering and modifying the entries of a `KBucketsTable`
+//! The `Entry` API for querying and modifying the entries of a `KBucketsTable`
 //! representing the nodes participating in the Kademlia DHT.
 
 pub(crate) use super::bucket::{AppliedPending, InsertResult, Node, K_VALUE};
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index 0ed1b6523d1..a6e523302d7 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -442,7 +442,7 @@ impl Registrations {
         match (discover_namespace.as_ref(), cookie_namespace) {
             // discover all namespace but cookie is specific to a namespace? => bad
             (None, Some(_)) => return Err(CookieNamespaceMismatch),
-            // discover for a namespace but cookie is for a different namesapce? => bad
+            // discover for a namespace but cookie is for a different namespace? => bad
             (Some(namespace), Some(cookie_namespace)) if namespace != cookie_namespace => {
                 return Err(CookieNamespaceMismatch)
             }

From bc24ab9cee3803fa116d6672779777620d3f5a7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 15:59:32 +0000
Subject: [PATCH 219/455] deps: bump serde from 1.0.197 to 1.0.198

Pull-Request: #5334.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d44fbc0b47a..c009be3ab93 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5348,18 +5348,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.198"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.198"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index a4a17f3cfd0..e725d96912e 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
-serde = { version = "1.0.197", features = ["derive"] }
+serde = { version = "1.0.198", features = ["derive"] }
 serde_json = "1.0.116"
 either = "1.11.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 8292414ea5a..5b1a2673588 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.197", features = ["derive"] }
+serde = { version = "1.0.198", features = ["derive"] }
 serde_json = "1.0.116"
 libp2p-core = { workspace = true }
 base64 = "0.22.0"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index d744a2f9a08..f6d09103359 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.197"
+serde = "1.0.198"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

From cc432cae2b8d473a8a215338d06aeb3d5e737a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Cie=C4=87ka?=
 <34537442+CieciaOne@users.noreply.github.com>
Date: Thu, 25 Apr 2024 19:20:02 +0200
Subject: [PATCH 220/455] chore: fix typo in ipfs-kad example README.md

Pull-Request: #5326.
---
 examples/ipfs-kad/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ipfs-kad/README.md b/examples/ipfs-kad/README.md
index ccefb6b1d9f..a46246a3920 100644
--- a/examples/ipfs-kad/README.md
+++ b/examples/ipfs-kad/README.md
@@ -11,7 +11,7 @@ By running this example, users can gain a better understanding of how the Kademl
 
 The example code demonstrates how to perform Kademlia queries on the IPFS network using the Rust P2P Library.
 
-### Getting closes peers
+### Getting closest peers
 
 By specifying a peer ID as a parameter, the code will search for the closest peers to the given peer ID.
 

From 66e56fa78aab583efd5f23b05513bc9066393576 Mon Sep 17 00:00:00 2001
From: tesseract <146037313+DoTheBestToGetTheBest@users.noreply.github.com>
Date: Thu, 25 Apr 2024 12:07:11 -0700
Subject: [PATCH 221/455] docs: enhance  code documentation

Pull-Request: #5198.
---
 libp2p/src/builder/phase/provider.rs | 44 ++++++++++++++++++----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/libp2p/src/builder/phase/provider.rs b/libp2p/src/builder/phase/provider.rs
index 32321442689..2a9154cda74 100644
--- a/libp2p/src/builder/phase/provider.rs
+++ b/libp2p/src/builder/phase/provider.rs
@@ -1,46 +1,60 @@
 #[allow(unused_imports)]
 use super::*;
-
 use crate::SwarmBuilder;
+use std::marker::PhantomData;
+/// Represents the phase where a provider is not yet specified.
+/// This is a marker type used in the type-state pattern to ensure compile-time checks of the builder's state.
+pub enum NoProviderSpecified {}
+
+// Define enums for each of the possible runtime environments. These are used as markers in the type-state pattern,
+// allowing compile-time checks for the appropriate environment configuration.
+
+#[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
+/// Represents the AsyncStd runtime environment.
+pub enum AsyncStd {}
+
+#[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
+/// Represents the Tokio runtime environment.
+pub enum Tokio {}
+
+#[cfg(feature = "wasm-bindgen")]
+/// Represents the WasmBindgen environment for WebAssembly.
+pub enum WasmBindgen {}
 
+/// Represents a phase in the SwarmBuilder where a provider has been chosen but not yet specified.
 pub struct ProviderPhase {}
 
 impl SwarmBuilder<NoProviderSpecified, ProviderPhase> {
+    /// Configures the SwarmBuilder to use the AsyncStd runtime.
+    /// This method is only available when compiling for non-Wasm targets with the `async-std` feature enabled.
     #[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
     pub fn with_async_std(self) -> SwarmBuilder<AsyncStd, TcpPhase> {
         SwarmBuilder {
             keypair: self.keypair,
-            phantom: std::marker::PhantomData,
+            phantom: PhantomData,
             phase: TcpPhase {},
         }
     }
 
+    /// Configures the SwarmBuilder to use the Tokio runtime.
+    /// This method is only available when compiling for non-Wasm targets with the `tokio` feature enabled
     #[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
     pub fn with_tokio(self) -> SwarmBuilder<Tokio, TcpPhase> {
         SwarmBuilder {
             keypair: self.keypair,
-            phantom: std::marker::PhantomData,
+            phantom: PhantomData,
             phase: TcpPhase {},
         }
     }
 
+    /// Configures the SwarmBuilder for WebAssembly using WasmBindgen.
+    /// This method is available when the `wasm-bindgen` feature is enabled.
     #[cfg(feature = "wasm-bindgen")]
     pub fn with_wasm_bindgen(self) -> SwarmBuilder<WasmBindgen, TcpPhase> {
         SwarmBuilder {
             keypair: self.keypair,
-            phantom: std::marker::PhantomData,
+            phantom: PhantomData,
             phase: TcpPhase {},
         }
     }
 }
-
-pub enum NoProviderSpecified {}
-
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
-pub enum AsyncStd {}
-
-#[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
-pub enum Tokio {}
-
-#[cfg(feature = "wasm-bindgen")]
-pub enum WasmBindgen {}

From 954c967f7b5c7689b9f5e7d3fea4019abd00c80a Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Sat, 27 Apr 2024 21:10:33 +0800
Subject: [PATCH 222/455] deps: promote `futures` to workspace dependency

Promote `futures` to workspace dependency for easier management.

Pull-Request: #5329.
---
 Cargo.toml                                      | 1 +
 core/Cargo.toml                                 | 2 +-
 examples/autonat/Cargo.toml                     | 2 +-
 examples/browser-webrtc/Cargo.toml              | 2 +-
 examples/chat/Cargo.toml                        | 2 +-
 examples/dcutr/Cargo.toml                       | 2 +-
 examples/distributed-key-value-store/Cargo.toml | 2 +-
 examples/file-sharing/Cargo.toml                | 2 +-
 examples/identify/Cargo.toml                    | 2 +-
 examples/ipfs-kad/Cargo.toml                    | 2 +-
 examples/ipfs-private/Cargo.toml                | 2 +-
 examples/metrics/Cargo.toml                     | 2 +-
 examples/ping/Cargo.toml                        | 2 +-
 examples/relay-server/Cargo.toml                | 2 +-
 examples/rendezvous/Cargo.toml                  | 2 +-
 examples/stream/Cargo.toml                      | 2 +-
 examples/upnp/Cargo.toml                        | 2 +-
 hole-punching-tests/Cargo.toml                  | 2 +-
 interop-tests/Cargo.toml                        | 2 +-
 libp2p/Cargo.toml                               | 2 +-
 misc/metrics/Cargo.toml                         | 2 +-
 misc/multistream-select/Cargo.toml              | 2 +-
 misc/quick-protobuf-codec/Cargo.toml            | 2 +-
 misc/rw-stream-sink/Cargo.toml                  | 2 +-
 misc/server/Cargo.toml                          | 2 +-
 misc/webrtc-utils/Cargo.toml                    | 2 +-
 muxers/mplex/Cargo.toml                         | 4 ++--
 muxers/test-harness/Cargo.toml                  | 2 +-
 muxers/yamux/Cargo.toml                         | 2 +-
 protocols/autonat/Cargo.toml                    | 2 +-
 protocols/dcutr/Cargo.toml                      | 2 +-
 protocols/floodsub/Cargo.toml                   | 2 +-
 protocols/gossipsub/Cargo.toml                  | 2 +-
 protocols/identify/Cargo.toml                   | 2 +-
 protocols/kad/Cargo.toml                        | 2 +-
 protocols/mdns/Cargo.toml                       | 2 +-
 protocols/perf/Cargo.toml                       | 2 +-
 protocols/ping/Cargo.toml                       | 2 +-
 protocols/relay/Cargo.toml                      | 2 +-
 protocols/rendezvous/Cargo.toml                 | 2 +-
 protocols/request-response/Cargo.toml           | 2 +-
 protocols/stream/Cargo.toml                     | 2 +-
 protocols/upnp/Cargo.toml                       | 2 +-
 swarm-test/Cargo.toml                           | 2 +-
 swarm/Cargo.toml                                | 4 ++--
 transports/dns/Cargo.toml                       | 2 +-
 transports/noise/Cargo.toml                     | 2 +-
 transports/plaintext/Cargo.toml                 | 2 +-
 transports/pnet/Cargo.toml                      | 2 +-
 transports/quic/Cargo.toml                      | 2 +-
 transports/tcp/Cargo.toml                       | 2 +-
 transports/tls/Cargo.toml                       | 2 +-
 transports/uds/Cargo.toml                       | 2 +-
 transports/webrtc-websys/Cargo.toml             | 2 +-
 transports/webrtc/Cargo.toml                    | 2 +-
 transports/websocket-websys/Cargo.toml          | 2 +-
 transports/websocket/Cargo.toml                 | 2 +-
 transports/webtransport-websys/Cargo.toml       | 2 +-
 wasm-tests/webtransport-tests/Cargo.toml        | 2 +-
 59 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 796daaae0b9..dd8efeddb12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -125,6 +125,7 @@ rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 unsigned-varint = { version = "0.8.0" }
 tokio = { version = "1.37", default-features = false }
 tracing = "0.1.37"
+futures = "0.3.30"
 
 [patch.crates-io]
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 554d0091866..92e6e02351a 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 either = "1.11"
 fnv = "1.0"
-futures = { version = "0.3.30", features = ["executor", "thread-pool"] }
+futures = { workspace = true, features = ["executor", "thread-pool"] }
 futures-timer = "3"
 instant = "0.1.12"
 libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 89cc951c4c8..80ee30db72b 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 70010c5e1b1..ec95b75287f 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -17,7 +17,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow = "1.0.82"
-futures = "0.3.30"
+futures = { workspace = true }
 rand = "0.8"
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index 0c7241eae52..b276791d39b 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
 async-trait = "0.1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 497a9dc11ae..ce027a65ed8 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
index 809a573cc08..4755b499709 100644
--- a/examples/distributed-key-value-store/Cargo.toml
+++ b/examples/distributed-key-value-store/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index f364b9305c9..b53c8732a33 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 serde = { version = "1.0", features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
 clap = { version = "4.5.4", features = ["derive"] }
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
index cf2996e45cd..8ed26ba5fc2 100644
--- a/examples/identify/Cargo.toml
+++ b/examples/identify/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index f18d7b41406..34f92b28979 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -13,7 +13,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
-futures = "0.3.30"
+futures = { workspace = true }
 anyhow = "1.0.82"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = { workspace = true }
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 7b017111d26..8d3a49e85c0 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.11"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index f3119b0f0fa..214b4450de7 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 axum = "0.7"
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
 opentelemetry = { version = "0.22.0", features = ["metrics"] }
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index d712f482f03..e92b5392c7a 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 664c52351cb..49b58c9b6bf 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 clap = { version = "4.5.4", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index 8ce668a98be..0a6229e4f07 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }
 tracing = { workspace = true }
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index 37a511d857f..2c1f5ad1e9d 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 anyhow = "1"
-futures = "0.3.29"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
 libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
 rand = "0.8"
diff --git a/examples/upnp/Cargo.toml b/examples/upnp/Cargo.toml
index 20c1323c7d6..6abe3f8354b 100644
--- a/examples/upnp/Cargo.toml
+++ b/examples/upnp/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "dns", "macros", "noise", "ping", "tcp", "yamux", "upnp"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index e725d96912e..6e0c692b5c9 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [dependencies]
 anyhow = "1"
 env_logger = "0.10.2"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 6e6ba028847..cfc85b75755 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 anyhow = "1"
 either = "1.11.0"
-futures = "0.3.30"
+futures = { workspace = true }
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
 tracing = { workspace = true }
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 12b895894ab..01419445b8b 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -92,7 +92,7 @@ upnp = ["dep:libp2p-upnp"]
 [dependencies]
 bytes = "1"
 either = "1.9.0"
-futures = "0.3.26"
+futures = { workspace = true }
 futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature
 getrandom = "0.2.3"     # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"      # Explicit dependency to be used in `wasm-bindgen` feature
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index b9952e36ba3..4901a3852d7 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -19,7 +19,7 @@ ping = ["libp2p-ping"]
 relay = ["libp2p-relay"]
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 080bd6ee289..3d40f50d967 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 bytes = "1"
-futures = "0.3"
+futures = { workspace = true }
 tracing = { workspace = true }
 pin-project = "1.1.5"
 smallvec = "1.13.2"
diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
index bc07b86b427..a98ffa5308f 100644
--- a/misc/quick-protobuf-codec/Cargo.toml
+++ b/misc/quick-protobuf-codec/Cargo.toml
@@ -19,7 +19,7 @@ quick-protobuf = "0.8"
 
 [dev-dependencies]
 criterion = "0.5.1"
-futures = "0.3.30"
+futures = { workspace = true }
 quickcheck = { workspace = true }
 
 [[bench]]
diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
index 8de0555582c..557163c438a 100644
--- a/misc/rw-stream-sink/Cargo.toml
+++ b/misc/rw-stream-sink/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 pin-project = "1.1.5"
 static_assertions = "1"
 
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index f6d09103359..f304d4b6346 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -13,7 +13,7 @@ license = "MIT"
 [dependencies]
 base64 = "0.22"
 clap = { version = "4.5.4", features = ["derive"] }
-futures = "0.3"
+futures = { workspace = true }
 futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
index b28ed74a4b0..f548773b8dd 100644
--- a/misc/webrtc-utils/Cargo.toml
+++ b/misc/webrtc-utils/Cargo.toml
@@ -13,7 +13,7 @@ publish = true
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-futures = "0.3"
+futures = { workspace = true }
 hex = "0.4"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 4e612939373..52920479158 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 bytes = "1"
-futures = "0.3.30"
+futures = { workspace = true }
 asynchronous-codec = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
@@ -26,7 +26,7 @@ unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }
 [dev-dependencies]
 async-std = { version = "1.7.0", features = ["attributes"] }
 criterion = "0.5"
-futures = "0.3"
+futures = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-muxer-test-harness = { path = "../test-harness" }
 libp2p-plaintext = { workspace = true }
diff --git a/muxers/test-harness/Cargo.toml b/muxers/test-harness/Cargo.toml
index 421292cf0a7..f4632437ce6 100644
--- a/muxers/test-harness/Cargo.toml
+++ b/muxers/test-harness/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 
 [dependencies]
 libp2p-core = { workspace = true }
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0.3"
 futures_ringbuf = "0.4.0"
 tracing = { workspace = true }
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 7c36faf022a..ddb9424895b 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 either = "1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 thiserror = "1.0"
 yamux012 = { version = "0.12.1", package = "yamux" }
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 2780016cebd..3dd11be4366 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-trait = "0.1"
-futures = "0.3"
+futures = { workspace = true }
 futures-timer = "3.0"
 instant = "0.1"
 libp2p-core = { workspace = true }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 10322fb63da..7be4b01fef5 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 either = "1.11.0"
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 8e7e0ef3621..e95fa00697e 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -15,7 +15,7 @@ asynchronous-codec = { workspace = true }
 cuckoofilter = "0.5.0"
 fnv = "1.0"
 bytes = "1.6"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 830866150ac..3a5e27f7b5f 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -20,7 +20,7 @@ byteorder = "1.5.0"
 bytes = "1.6"
 either = "1.11"
 fnv = "1.0.7"
-futures = "0.3.30"
+futures = { workspace = true }
 futures-ticker = "0.0.3"
 getrandom = "0.2.14"
 hex_fmt = "0.3.0"
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 16cfef4a05a..626db2ab944 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0.3"
 futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 3d2739c6004..bf4caf28e97 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -16,7 +16,7 @@ bytes = "1"
 either = "1.11"
 fnv = "1.0"
 asynchronous-codec = { workspace = true }
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 futures-bounded = { workspace = true }
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index af8f555156a..9db161779dc 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.3.2", optional = true }
 data-encoding = "2.5.0"
-futures = "0.3.30"
+futures = { workspace = true }
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 655f7e13658..9a3d0d57f02 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 anyhow = "1"
 clap = { version = "4.5.4", features = ["derive"] }
-futures = "0.3.30"
+futures = { workspace = true }
 futures-bounded = { workspace = true }
 futures-timer = "3.0"
 instant = "0.1.12"
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 0a07b403260..eb08d21ca92 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 either = "1.11.0"
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0.3"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 750f5550dde..d4ba1b37d86 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 asynchronous-codec = { workspace = true }
 bytes = "1"
 either = "1.11.0"
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3"
 futures-bounded = { workspace = true }
 instant = "0.1.12"
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 609ea207bae..2937cbbdd93 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 asynchronous-codec = { workspace = true }
 async-trait = "0.1"
 bimap = "0.6.3"
-futures = { version = "0.3", default-features = false, features = ["std"] }
+futures = { workspace = true, default-features = false, features = ["std"] }
 futures-timer = "3.0.3"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index fd628da2420..2e10b3e4206 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-trait = "0.1"
 cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
-futures = "0.3.30"
+futures = { workspace = true }
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index 964d69027f1..b90f9958173 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.29"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index a73f955ae62..944b3323842 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["network-programming", "asynchronous"]
 publish = true
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0.3"
 igd-next = "0.14.3"
 libp2p-core = { workspace = true }
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index 0ea404fad7f..1bd40bdace3 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-plaintext = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["async-std"] }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
-futures = "0.3.30"
+futures = { workspace = true }
 rand = "0.8.5"
 tracing = { workspace = true }
 futures-timer = "3.0.3"
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 10749def335..ad224b6168d 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 either = "1.11.0"
 fnv = "1.0"
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0.3"
 getrandom = { version = "0.2.14", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.12"
@@ -42,7 +42,7 @@ wasm-bindgen = ["dep:wasm-bindgen-futures", "dep:getrandom"]
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
 either = "1.11.0"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-identify = { path = "../protocols/identify" }                # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-identity = { workspace = true, features = ["ed25519"] }
 libp2p-kad = { path = "../protocols/kad" }                          # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index d35d87da075..329268645ab 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std-resolver = { version = "0.24", optional = true }
 async-trait = "0.1.80"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 9d6229343bd..8e17ba3d6a3 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/libp2p/rust-libp2p"
 asynchronous-codec = { workspace = true }
 bytes = "1"
 curve25519-dalek = "4.1.2"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519"] }
 multiaddr = { workspace = true }
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index 9a4576ef29f..33e7ae1ab5c 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index bb8b1c03f6f..76964ce3152 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 salsa20 = "0.10"
 sha3 = "0.10"
 tracing = { workspace = true }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 4dd72bee1fe..26ff0aa6fac 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 [dependencies]
 async-std = { version = "1.12.0", optional = true }
 bytes = "1.6.0"
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0.3"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index b074e8e8b22..6a463a72062 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-io = { version = "2.3.2", optional = true }
-futures = "0.3.30"
+futures = { workspace = true }
 futures-timer = "3.0"
 if-watch = "3.2.0"
 libc = "0.2.153"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index d8829f0ae4b..1494f110c97 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 exclude = ["src/test_assets"]
 
 [dependencies]
-futures = { version = "0.3.30", default-features = false }
+futures = { workspace = true, default-features = false }
 futures-rustls = "0.24.0"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index 84df8dc569e..13642a38a48 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std = { version = "1.6.2", optional = true }
 libp2p-core = { workspace = true }
-futures = "0.3.30"
+futures = { workspace = true }
 tokio = { workspace = true, default-features = false, features = ["net"], optional = true }
 tracing = { workspace = true }
 
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index b5682a7c7da..e1590404fda 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -13,7 +13,7 @@ publish = true
 
 [dependencies]
 bytes = "1"
-futures = "0.3"
+futures = { workspace = true }
 getrandom = { version = "0.2.14", features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 4a7c94ab1ca..a1de95a1993 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-trait = "0.1"
 bytes = "1"
-futures = "0.3"
+futures = { workspace = true }
 futures-timer = "3"
 hex = "0.4"
 if-watch = "3.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 3769806da8c..06505c7e1c2 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 bytes = "1.6.0"
-futures = "0.3.30"
+futures = { workspace = true }
 js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 tracing = { workspace = true }
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 5327d6577b3..89436af1f0c 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 futures-rustls = "0.24.0"
 either = "1.11.0"
-futures = "0.3.30"
+futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.0"
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index ed3d4f0b8c4..a1bd3832177 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index f50a3909bd0..2ea3745ee80 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 release = false
 
 [dependencies]
-futures = "0.3.30"
+futures = { workspace = true }
 getrandom = { version = "0.2.14", features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }

From 9d86b85ba37587ae67eeb336acf802328fb72e19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 08:27:05 +0000
Subject: [PATCH 223/455] deps: bump parking_lot from 0.12.1 to 0.12.2

Pull-Request: #5345.
---
 Cargo.lock                             | 4 ++--
 core/Cargo.toml                        | 2 +-
 transports/dns/Cargo.toml              | 2 +-
 transports/quic/Cargo.toml             | 2 +-
 transports/websocket-websys/Cargo.toml | 2 +-
 transports/websocket/Cargo.toml        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c009be3ab93..ca1df9ca639 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4259,9 +4259,9 @@ checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
 dependencies = [
  "lock_api",
  "parking_lot_core",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 92e6e02351a..f06769ebb41 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -21,7 +21,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
-parking_lot = "0.12.0"
+parking_lot = "0.12.2"
 pin-project = "1.1.5"
 quick-protobuf = "0.8"
 rand = "0.8"
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 329268645ab..78adccc6069 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -16,7 +16,7 @@ async-trait = "0.1.80"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.0"
+parking_lot = "0.12.2"
 hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
 smallvec = "1.13.2"
 tracing = { workspace = true }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 26ff0aa6fac..1bbac27d67f 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -17,7 +17,7 @@ if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.0"
+parking_lot = "0.12.2"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 06505c7e1c2..a7713e1fa59 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -16,7 +16,7 @@ futures = { workspace = true }
 js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 tracing = { workspace = true }
-parking_lot = "0.12.1"
+parking_lot = "0.12.2"
 send_wrapper = "0.6.0"
 thiserror = "1.0.59"
 wasm-bindgen = "0.2.90"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 89436af1f0c..cc10a0ab727 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -16,7 +16,7 @@ either = "1.11.0"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.0"
+parking_lot = "0.12.2"
 pin-project-lite = "0.2.14"
 rw-stream-sink = { workspace = true }
 soketto = "0.8.0"

From 6b270f6c6bd0ab783d4050569c6bde3d46426705 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 08:43:09 +0000
Subject: [PATCH 224/455] deps: bump data-encoding from 2.5.0 to 2.6.0

Pull-Request: #5346.
---
 Cargo.lock                | 4 ++--
 protocols/mdns/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca1df9ca639..c9ea14807af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1259,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 9db161779dc..061651c07d4 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.3.2", optional = true }
-data-encoding = "2.5.0"
+data-encoding = "2.6.0"
 futures = { workspace = true }
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }

From e5c072c04c1e8ae5899b46eb17bdf9a32c4eaeee Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Tue, 30 Apr 2024 08:32:57 -0400
Subject: [PATCH 225/455] fix(relay): use `web_time` `Instant` and `SystemTime`
 versions for wasm support.

Resolves #5305.

Pull-Request: #5328.
---
 Cargo.lock                                    | 2 +-
 protocols/relay/CHANGELOG.md                  | 2 ++
 protocols/relay/Cargo.toml                    | 2 +-
 protocols/relay/src/behaviour.rs              | 2 +-
 protocols/relay/src/behaviour/handler.rs      | 2 +-
 protocols/relay/src/behaviour/rate_limiter.rs | 2 +-
 protocols/relay/src/protocol/inbound_hop.rs   | 3 ++-
 protocols/relay/src/protocol/outbound_hop.rs  | 3 ++-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c9ea14807af..67c1ba524ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3189,7 +3189,6 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-ping",
@@ -3206,6 +3205,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index b88dd7784f2..83dbf4739ac 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Fix support for unlimited relay connection according to spec.
   See [PR 5244](https://github.com/libp2p/rust-libp2p/pull/5244).
+- use `web_time` `Instant` and `SystemTime` versions for wasm support.
+  See [PR 5328](https://github.com/libp2p/rust-libp2p/pull/5328).
 
 ## 0.17.1
 
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index d4ba1b37d86..35f404d89b4 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -17,7 +17,6 @@ either = "1.11.0"
 futures = { workspace = true }
 futures-timer = "3"
 futures-bounded = { workspace = true }
-instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
@@ -28,6 +27,7 @@ static_assertions = "1"
 thiserror = "1.0"
 tracing = { workspace = true }
 void = "1"
+web-time = "1"
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
diff --git a/protocols/relay/src/behaviour.rs b/protocols/relay/src/behaviour.rs
index df8443e8359..cf0e76e3662 100644
--- a/protocols/relay/src/behaviour.rs
+++ b/protocols/relay/src/behaviour.rs
@@ -27,7 +27,6 @@ use crate::multiaddr_ext::MultiaddrExt;
 use crate::proto;
 use crate::protocol::{inbound_hop, outbound_stop};
 use either::Either;
-use instant::Instant;
 use libp2p_core::multiaddr::Protocol;
 use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
@@ -41,6 +40,7 @@ use std::num::NonZeroU32;
 use std::ops::Add;
 use std::task::{Context, Poll};
 use std::time::Duration;
+use web_time::Instant;
 
 /// Configuration for the relay [`Behaviour`].
 ///
diff --git a/protocols/relay/src/behaviour/handler.rs b/protocols/relay/src/behaviour/handler.rs
index 958c6a9b906..92557287099 100644
--- a/protocols/relay/src/behaviour/handler.rs
+++ b/protocols/relay/src/behaviour/handler.rs
@@ -28,7 +28,6 @@ use futures::future::{BoxFuture, FutureExt, TryFutureExt};
 use futures::io::AsyncWriteExt;
 use futures::stream::{FuturesUnordered, StreamExt};
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::upgrade::ReadyUpgrade;
 use libp2p_core::{ConnectedPoint, Multiaddr};
 use libp2p_identity::PeerId;
@@ -43,6 +42,7 @@ use std::collections::{HashMap, VecDeque};
 use std::task::{Context, Poll};
 use std::time::Duration;
 use std::{fmt, io};
+use web_time::Instant;
 
 const MAX_CONCURRENT_STREAMS_PER_CONNECTION: usize = 10;
 const STREAM_TIMEOUT: Duration = Duration::from_secs(60);
diff --git a/protocols/relay/src/behaviour/rate_limiter.rs b/protocols/relay/src/behaviour/rate_limiter.rs
index 73c164c121c..45b701c1b50 100644
--- a/protocols/relay/src/behaviour/rate_limiter.rs
+++ b/protocols/relay/src/behaviour/rate_limiter.rs
@@ -18,7 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use instant::Instant;
 use libp2p_core::multiaddr::{Multiaddr, Protocol};
 use libp2p_identity::PeerId;
 use std::collections::{HashMap, VecDeque};
@@ -26,6 +25,7 @@ use std::hash::Hash;
 use std::net::IpAddr;
 use std::num::NonZeroU32;
 use std::time::Duration;
+use web_time::Instant;
 
 /// Allows rate limiting access to some resource based on the [`PeerId`] and
 /// [`Multiaddr`] of a remote peer.
diff --git a/protocols/relay/src/protocol/inbound_hop.rs b/protocols/relay/src/protocol/inbound_hop.rs
index 41fe2675dce..57b5d9ad039 100644
--- a/protocols/relay/src/protocol/inbound_hop.rs
+++ b/protocols/relay/src/protocol/inbound_hop.rs
@@ -18,7 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::time::{Duration, SystemTime};
+use std::time::Duration;
+use web_time::SystemTime;
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
diff --git a/protocols/relay/src/protocol/outbound_hop.rs b/protocols/relay/src/protocol/outbound_hop.rs
index 3ae824be167..b349f8848be 100644
--- a/protocols/relay/src/protocol/outbound_hop.rs
+++ b/protocols/relay/src/protocol/outbound_hop.rs
@@ -19,13 +19,14 @@
 // DEALINGS IN THE SOFTWARE.
 
 use std::io;
-use std::time::{Duration, SystemTime};
+use std::time::Duration;
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use futures::prelude::*;
 use futures_timer::Delay;
 use thiserror::Error;
+use web_time::SystemTime;
 
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;

From a91c48fe5e43f245f4f7da600d425c499c3e3bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 1 May 2024 20:19:09 +0100
Subject: [PATCH 226/455] chore(swarm-derive): lower unreleased version to
 0.32.2

`libp2p-swarm-derive` `0.32.2` wasn't released, last released version was `0.32.1` see [here](https://crates.io/crates/libp2p-swarm-derive).
Lower `Cargo.toml`  and `CHANGELOG.md` to `0.32.2`.

Pull-Request: #5350.
---
 Cargo.lock                | 2 +-
 Cargo.toml                | 2 +-
 swarm-derive/CHANGELOG.md | 4 +---
 swarm-derive/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 67c1ba524ad..5f7144269d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3339,7 +3339,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.34.3"
+version = "0.34.2"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index dd8efeddb12..d1f53569389 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ libp2p-request-response = { version = "0.26.2", path = "protocols/request-respon
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
-libp2p-swarm-derive = { version = "=0.34.3", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
+libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
diff --git a/swarm-derive/CHANGELOG.md b/swarm-derive/CHANGELOG.md
index 55f5e571664..271025aee9f 100644
--- a/swarm-derive/CHANGELOG.md
+++ b/swarm-derive/CHANGELOG.md
@@ -1,10 +1,8 @@
-## 0.34.3
+## 0.34.2
 
 - Generate code for `libp2p-swarm`'s `FromSwarm::NewExternalAddrOfPeer` enum variant.
   See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
 
-## 0.34.2
-
 - Restore support for generic constraints on behaviours combined with `out_event` generated by `NetworkBehaviour` where no where clause is used.
   See [PR 5003](https://github.com/libp2p/rust-libp2p/pull/5003).
 
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 7a8a1062d2c..babcfb8587c 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm-derive"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Procedural macros of libp2p-swarm"
-version = "0.34.3"
+version = "0.34.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From 9331d9e9c6e9d8f7ff5f185cb1066ace4ac4ce02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 7 May 2024 01:00:37 +0100
Subject: [PATCH 227/455] chore: address clippy lints for Rust 1.78

Pull-Request: #5368.
---
 .github/workflows/ci.yml                                  | 2 +-
 libp2p/src/bandwidth.rs                                   | 8 ++++----
 .../tests/{util.rs => util/mod.rs}                        | 0
 misc/metrics/src/bandwidth.rs                             | 8 ++++----
 misc/multistream-select/src/length_delimited.rs           | 1 -
 misc/quickcheck-ext/src/lib.rs                            | 2 +-
 protocols/kad/src/kbucket.rs                              | 2 +-
 protocols/mdns/src/behaviour/iface/dns.rs                 | 2 +-
 protocols/mdns/src/behaviour/timer.rs                     | 4 ++--
 transports/websocket-websys/src/web_context.rs            | 3 +++
 10 files changed, 17 insertions(+), 15 deletions(-)
 rename misc/memory-connection-limits/tests/{util.rs => util/mod.rs} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9069b2eecf1..69528ec80c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -234,7 +234,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-version: [
-          1.77.0, # current stable
+          1.78.0, # current stable
           beta,
         ]
     steps:
diff --git a/libp2p/src/bandwidth.rs b/libp2p/src/bandwidth.rs
index b84cbb7e27b..8931c5c4166 100644
--- a/libp2p/src/bandwidth.rs
+++ b/libp2p/src/bandwidth.rs
@@ -154,7 +154,7 @@ impl<SMInner: AsyncRead> AsyncRead for InstrumentedStream<SMInner> {
         let this = self.project();
         let num_bytes = ready!(this.inner.poll_read(cx, buf))?;
         this.sinks.inbound.fetch_add(
-            u64::try_from(num_bytes).unwrap_or(u64::max_value()),
+            u64::try_from(num_bytes).unwrap_or(u64::MAX),
             Ordering::Relaxed,
         );
         Poll::Ready(Ok(num_bytes))
@@ -168,7 +168,7 @@ impl<SMInner: AsyncRead> AsyncRead for InstrumentedStream<SMInner> {
         let this = self.project();
         let num_bytes = ready!(this.inner.poll_read_vectored(cx, bufs))?;
         this.sinks.inbound.fetch_add(
-            u64::try_from(num_bytes).unwrap_or(u64::max_value()),
+            u64::try_from(num_bytes).unwrap_or(u64::MAX),
             Ordering::Relaxed,
         );
         Poll::Ready(Ok(num_bytes))
@@ -184,7 +184,7 @@ impl<SMInner: AsyncWrite> AsyncWrite for InstrumentedStream<SMInner> {
         let this = self.project();
         let num_bytes = ready!(this.inner.poll_write(cx, buf))?;
         this.sinks.outbound.fetch_add(
-            u64::try_from(num_bytes).unwrap_or(u64::max_value()),
+            u64::try_from(num_bytes).unwrap_or(u64::MAX),
             Ordering::Relaxed,
         );
         Poll::Ready(Ok(num_bytes))
@@ -198,7 +198,7 @@ impl<SMInner: AsyncWrite> AsyncWrite for InstrumentedStream<SMInner> {
         let this = self.project();
         let num_bytes = ready!(this.inner.poll_write_vectored(cx, bufs))?;
         this.sinks.outbound.fetch_add(
-            u64::try_from(num_bytes).unwrap_or(u64::max_value()),
+            u64::try_from(num_bytes).unwrap_or(u64::MAX),
             Ordering::Relaxed,
         );
         Poll::Ready(Ok(num_bytes))
diff --git a/misc/memory-connection-limits/tests/util.rs b/misc/memory-connection-limits/tests/util/mod.rs
similarity index 100%
rename from misc/memory-connection-limits/tests/util.rs
rename to misc/memory-connection-limits/tests/util/mod.rs
diff --git a/misc/metrics/src/bandwidth.rs b/misc/metrics/src/bandwidth.rs
index 2792e00612c..ac6a4178ce9 100644
--- a/misc/metrics/src/bandwidth.rs
+++ b/misc/metrics/src/bandwidth.rs
@@ -255,7 +255,7 @@ impl<SMInner: AsyncRead> AsyncRead for InstrumentedStream<SMInner> {
         let num_bytes = ready!(this.inner.poll_read(cx, buf))?;
         this.metrics
             .inbound
-            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value()));
+            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX));
         Poll::Ready(Ok(num_bytes))
     }
 
@@ -268,7 +268,7 @@ impl<SMInner: AsyncRead> AsyncRead for InstrumentedStream<SMInner> {
         let num_bytes = ready!(this.inner.poll_read_vectored(cx, bufs))?;
         this.metrics
             .inbound
-            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value()));
+            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX));
         Poll::Ready(Ok(num_bytes))
     }
 }
@@ -283,7 +283,7 @@ impl<SMInner: AsyncWrite> AsyncWrite for InstrumentedStream<SMInner> {
         let num_bytes = ready!(this.inner.poll_write(cx, buf))?;
         this.metrics
             .outbound
-            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value()));
+            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX));
         Poll::Ready(Ok(num_bytes))
     }
 
@@ -296,7 +296,7 @@ impl<SMInner: AsyncWrite> AsyncWrite for InstrumentedStream<SMInner> {
         let num_bytes = ready!(this.inner.poll_write_vectored(cx, bufs))?;
         this.metrics
             .outbound
-            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value()));
+            .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX));
         Poll::Ready(Ok(num_bytes))
     }
 
diff --git a/misc/multistream-select/src/length_delimited.rs b/misc/multistream-select/src/length_delimited.rs
index 6515d00c717..3a7988d0548 100644
--- a/misc/multistream-select/src/length_delimited.rs
+++ b/misc/multistream-select/src/length_delimited.rs
@@ -25,7 +25,6 @@ use std::{
     io,
     pin::Pin,
     task::{Context, Poll},
-    u16,
 };
 
 const MAX_LEN_BYTES: u16 = 2;
diff --git a/misc/quickcheck-ext/src/lib.rs b/misc/quickcheck-ext/src/lib.rs
index a3b9ce26e6e..4ada7e73ba1 100644
--- a/misc/quickcheck-ext/src/lib.rs
+++ b/misc/quickcheck-ext/src/lib.rs
@@ -9,7 +9,7 @@ pub trait GenRange {
     fn gen_range<T: Unsigned + Arbitrary + Copy>(&mut self, _range: Range<T>) -> T;
 
     fn gen_index(&mut self, ubound: usize) -> usize {
-        if ubound <= (core::u32::MAX as usize) {
+        if ubound <= (u32::MAX as usize) {
             self.gen_range(0..ubound as u32) as usize
         } else {
             self.gen_range(0..ubound)
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 459f769fb12..6eb2e42909a 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -594,7 +594,7 @@ mod tests {
                 assert!(!bucket_ref.contains(&Distance(min.0 - 1)));
             }
 
-            if max != Distance(U256::max_value()) {
+            if max != Distance(U256::MAX) {
                 // ^ avoid overflow
                 assert!(!bucket_ref.contains(&Distance(max.0 + 1)));
             }
diff --git a/protocols/mdns/src/behaviour/iface/dns.rs b/protocols/mdns/src/behaviour/iface/dns.rs
index 41ce9efa714..39dbf08c731 100644
--- a/protocols/mdns/src/behaviour/iface/dns.rs
+++ b/protocols/mdns/src/behaviour/iface/dns.rs
@@ -247,7 +247,7 @@ fn duration_to_secs(duration: Duration) -> u32 {
     let secs = duration
         .as_secs()
         .saturating_add(u64::from(duration.subsec_nanos() > 0));
-    cmp::min(secs, From::from(u32::max_value())) as u32
+    cmp::min(secs, From::from(u32::MAX)) as u32
 }
 
 /// Appends a big-endian u32 to `out`.
diff --git a/protocols/mdns/src/behaviour/timer.rs b/protocols/mdns/src/behaviour/timer.rs
index 4f6ceec306d..5e284654676 100644
--- a/protocols/mdns/src/behaviour/timer.rs
+++ b/protocols/mdns/src/behaviour/timer.rs
@@ -98,7 +98,7 @@ pub(crate) mod tokio {
             // Taken from: https://docs.rs/async-io/1.7.0/src/async_io/lib.rs.html#91
             let mut inner = time::interval_at(
                 TokioInstant::from_std(instant),
-                Duration::new(std::u64::MAX, 1_000_000_000 - 1),
+                Duration::new(u64::MAX, 1_000_000_000 - 1),
             );
             inner.set_missed_tick_behavior(MissedTickBehavior::Skip);
             Self { inner }
@@ -125,7 +125,7 @@ pub(crate) mod tokio {
         }
 
         fn size_hint(&self) -> (usize, Option<usize>) {
-            (std::usize::MAX, None)
+            (usize::MAX, None)
         }
     }
 }
diff --git a/transports/websocket-websys/src/web_context.rs b/transports/websocket-websys/src/web_context.rs
index 2b5d7b46431..40efbb1d9b0 100644
--- a/transports/websocket-websys/src/web_context.rs
+++ b/transports/websocket-websys/src/web_context.rs
@@ -1,3 +1,6 @@
+// TODO: remove when https://github.com/rust-lang/rust-clippy/issues/12377 fix lands in stable clippy.
+#![allow(clippy::empty_docs)]
+
 use wasm_bindgen::prelude::*;
 use web_sys::window;
 

From 910bf7671afc0ed5acdc314a607964387f161f4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 08:31:05 +0000
Subject: [PATCH 228/455] deps: bump r7kamura/rust-problem-matchers from 1.4.0
 to 1.5.0

Pull-Request: #5356.
---
 .github/workflows/ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69528ec80c2..828882b4615 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: dtolnay/rust-toolchain@stable
 
@@ -156,7 +156,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -181,7 +181,7 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -202,7 +202,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -219,7 +219,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -245,7 +245,7 @@ jobs:
           toolchain: ${{ matrix.rust-version }}
           components: clippy
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -261,7 +261,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -280,7 +280,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
@@ -330,7 +330,7 @@ jobs:
         with:
           components: rustfmt
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - name: Check formatting
         run: cargo fmt -- --check
@@ -342,7 +342,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: r7kamura/rust-problem-matchers@2c2f1016021a7455a6b5b4bbae31145f3b3cd83a #v1.4.0
+      - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
       - name: Ensure `full` feature contains all features
         run: |

From b9353d5770b3bca9589ef97b640936154dda7158 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 11:37:41 +0000
Subject: [PATCH 229/455] deps: bump num-traits from 0.2.18 to 0.2.19

Pull-Request: #5365.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f7144269d1..93c3b611249 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4032,9 +4032,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]

From d64173a492b6b3ff86cd43b186d51c7ad61471a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 11:50:56 +0000
Subject: [PATCH 230/455] deps: bump base64 from 0.22.0 to 0.22.1

Pull-Request: #5363.
---
 Cargo.lock                     | 20 ++++++++++----------
 identity/Cargo.toml            |  2 +-
 misc/keygen/Cargo.toml         |  2 +-
 protocols/gossipsub/Cargo.toml |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93c3b611249..74f9d02b65c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -678,9 +678,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
@@ -2573,7 +2573,7 @@ dependencies = [
 name = "keygen"
 version = "0.1.0"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "clap",
  "libp2p-core",
  "libp2p-identity",
@@ -2817,7 +2817,7 @@ version = "0.46.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
- "base64 0.22.0",
+ "base64 0.22.1",
  "byteorder",
  "bytes",
  "either",
@@ -2877,7 +2877,7 @@ name = "libp2p-identity"
 version = "0.2.8"
 dependencies = [
  "asn1_der",
- "base64 0.22.0",
+ "base64 0.22.1",
  "bs58",
  "criterion",
  "ed25519-dalek",
@@ -3272,7 +3272,7 @@ name = "libp2p-server"
 version = "0.12.7"
 dependencies = [
  "axum 0.7.5",
- "base64 0.22.0",
+ "base64 0.22.1",
  "clap",
  "futures",
  "futures-timer",
@@ -4888,7 +4888,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -5174,7 +5174,7 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "rustls-pki-types",
 ]
 
@@ -5596,7 +5596,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "bytes",
  "futures",
  "httparse",
@@ -5839,7 +5839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0641fa1353dd7b7864a7a7782e495433de18a9096bc91b5a2d5838ac209c2fa8"
 dependencies = [
  "async-trait",
- "base64 0.22.0",
+ "base64 0.22.1",
  "futures",
  "http 1.0.0",
  "indexmap 2.2.1",
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index fbc7bae3d11..fac5c8dea48 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -42,7 +42,7 @@ rand = ["dep:rand", "ed25519-dalek?/rand_core"]
 
 [dev-dependencies]
 quickcheck = { workspace = true }
-base64 = "0.22.0"
+base64 = "0.22.1"
 serde_json = "1.0"
 rmp-serde = "1.2"
 criterion = "0.5"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 5b1a2673588..0c6f0d15e33 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -18,7 +18,7 @@ zeroize = "1"
 serde = { version = "1.0.198", features = ["derive"] }
 serde_json = "1.0.116"
 libp2p-core = { workspace = true }
-base64 = "0.22.0"
+base64 = "0.22.1"
 libp2p-identity = { workspace = true }
 
 [lints]
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 3a5e27f7b5f..dbe9e6c161c 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -15,7 +15,7 @@ wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-base64 = "0.22.0"
+base64 = "0.22.1"
 byteorder = "1.5.0"
 bytes = "1.6"
 either = "1.11"

From adb0d236f3eac6b6a90160acfcc75391137f4415 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 12:02:31 +0000
Subject: [PATCH 231/455] deps: bump trybuild from 1.0.91 to 1.0.93

Pull-Request: #5362.
---
 Cargo.lock       | 5 ++---
 swarm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 74f9d02b65c..565eb6a4bcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6256,12 +6256,11 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.91"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad7eb6319ebadebca3dacf1f85a93bc54b73dd81b9036795f73de7ddfe27d5a"
+checksum = "2a0e5d82932dfbf36df38de5df0cfe846d13430b3ae3fdc48b2e91ed692c8df7"
 dependencies = [
  "glob",
- "once_cell",
  "serde",
  "serde_derive",
  "serde_json",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index ad224b6168d..2a928dc0467 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -54,7 +54,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.91"
+trybuild = "1.0.93"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 0ba0b8a51944983c87ca7feddb3219591f29c2dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 12:14:39 +0000
Subject: [PATCH 232/455] deps: bump tokio-util from 0.7.10 to 0.7.11

Pull-Request: #5361.
---
 Cargo.lock | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 565eb6a4bcd..0236820a31f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6026,9 +6026,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6036,7 +6036,6 @@ dependencies = [
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]

From 6df23046ffad2e97260ed9a56878988ea783ea42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 12:38:20 +0000
Subject: [PATCH 233/455] deps: bump rmp-serde from 1.2.0 to 1.3.0

Pull-Request: #5360.
---
 Cargo.lock          | 4 ++--
 identity/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0236820a31f..143b9d6fcf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5000,9 +5000,9 @@ dependencies = [
 
 [[package]]
 name = "rmp-serde"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
 dependencies = [
  "byteorder",
  "rmp",
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index fac5c8dea48..40af2f9a972 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -44,7 +44,7 @@ rand = ["dep:rand", "ed25519-dalek?/rand_core"]
 quickcheck = { workspace = true }
 base64 = "0.22.1"
 serde_json = "1.0"
-rmp-serde = "1.2"
+rmp-serde = "1.3"
 criterion = "0.5"
 hex-literal = "0.4.1"
 

From fa55c621012c673a8682e4ab9f5b2c6750d930a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 12:50:41 +0000
Subject: [PATCH 234/455] deps: bump serde from 1.0.198 to 1.0.199

Pull-Request: #5344.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 143b9d6fcf0..c78de716a06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5348,18 +5348,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.198"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
+checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.198"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
+checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 6e0c692b5c9..b38c54fb586 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
-serde = { version = "1.0.198", features = ["derive"] }
+serde = { version = "1.0.199", features = ["derive"] }
 serde_json = "1.0.116"
 either = "1.11.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 0c6f0d15e33..d7de2725b0c 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.198", features = ["derive"] }
+serde = { version = "1.0.199", features = ["derive"] }
 serde_json = "1.0.116"
 libp2p-core = { workspace = true }
 base64 = "0.22.1"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index f304d4b6346..59b71e5759d 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.198"
+serde = "1.0.199"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

From 625743bd37482d4b590620695ba3d6dcd3009125 Mon Sep 17 00:00:00 2001
From: Kapena Cunmin <168894316+kapenacunmin@users.noreply.github.com>
Date: Thu, 9 May 2024 18:47:47 +0800
Subject: [PATCH 235/455] chore: fix typo at pull_request_template.md

`mesages` to `messages`

Pull-Request: #5370.
---
 .github/pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f724d2fd7de..90e8b2cda53 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,7 +4,7 @@
 Please write a summary of your changes and why you made them.
 This section will appear as the commit message after merging.
 Please craft it accordingly.
-For a quick primer on good commit mesages, check out this blog post: https://cbea.ms/git-commit/
+For a quick primer on good commit messages, check out this blog post: https://cbea.ms/git-commit/
 
 Please include any relevant issues in here, for example:
 

From 0e11c61b2a6e20f6838e9cb906c9bf8cfb53c04b Mon Sep 17 00:00:00 2001
From: "zkElton.eth" <123023258+elton-cs@users.noreply.github.com>
Date: Thu, 9 May 2024 07:39:47 -0500
Subject: [PATCH 236/455] chore: add missing "cbor" feature flag on test

Found a failing test while looking through the request-response protocol crate. The function `dial_succeeds_after_adding_peers_address()` was just missing the `cbor` feature flag. Added the flag and the test passed.

Pull-Request: #5321.
---
 protocols/request-response/tests/peer_address.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/protocols/request-response/tests/peer_address.rs b/protocols/request-response/tests/peer_address.rs
index 2a120931dcd..0ed7ffe5551 100644
--- a/protocols/request-response/tests/peer_address.rs
+++ b/protocols/request-response/tests/peer_address.rs
@@ -8,6 +8,7 @@ use std::iter;
 use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
+#[cfg(feature = "cbor")]
 async fn dial_succeeds_after_adding_peers_address() {
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())

From b88ff17173ffe1b88d8cfe489033ea3a3f1df75e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 08:34:59 +0000
Subject: [PATCH 237/455] deps: bump libc from 0.2.153 to 0.2.154

Pull-Request: #5367.
---
 Cargo.lock                | 4 ++--
 transports/tcp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c78de716a06..415accc9e0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2599,9 +2599,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libp2p"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 6a463a72062..41d128506dd 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -15,7 +15,7 @@ async-io = { version = "2.3.2", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0"
 if-watch = "3.2.0"
-libc = "0.2.153"
+libc = "0.2.154"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.6", features = ["all"] }

From b37a788beac8d957b80bb878bb32898c51c6b72c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 08:55:37 +0000
Subject: [PATCH 238/455] deps: bump proc-macro2 from 1.0.81 to 1.0.82

Pull-Request: #5373.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 415accc9e0d..2aa830da03b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4498,9 +4498,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]

From 95e0fca97fc1c686705fdfae939bfb06e5be7044 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:06:40 +0000
Subject: [PATCH 239/455] deps: bump serde from 1.0.199 to 1.0.201

Pull-Request: #5374.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2aa830da03b..c3530cdcb7e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5348,18 +5348,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.199"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.199"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index b38c54fb586..5f93c158b98 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.201", features = ["derive"] }
 serde_json = "1.0.116"
 either = "1.11.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index d7de2725b0c..93639e309ce 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.199", features = ["derive"] }
+serde = { version = "1.0.201", features = ["derive"] }
 serde_json = "1.0.116"
 libp2p-core = { workspace = true }
 base64 = "0.22.1"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 59b71e5759d..3fb69fdf20f 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.199"
+serde = "1.0.201"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

From c6c09ad7d6262e3056283ea4e2bc8f94d7f2612e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:18:14 +0000
Subject: [PATCH 240/455] deps: bump trybuild from 1.0.93 to 1.0.95

Pull-Request: #5375.
---
 Cargo.lock       | 4 ++--
 swarm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c3530cdcb7e..b89316ee94e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6255,9 +6255,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.93"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0e5d82932dfbf36df38de5df0cfe846d13430b3ae3fdc48b2e91ed692c8df7"
+checksum = "4ddb747392ea12569d501a5bbca08852e4c8cd88b92566074b2243b8846f09e6"
 dependencies = [
  "glob",
  "serde",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 2a928dc0467..13fdfa3757e 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -54,7 +54,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.93"
+trybuild = "1.0.95"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 6e528cac7a4a51a82892d95daac94ddd2795b1cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:43:42 +0000
Subject: [PATCH 241/455] deps: bump syn from 2.0.60 to 2.0.63

Pull-Request: #5377.
---
 Cargo.lock              | 58 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b89316ee94e..febdea9d0f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
  "synstructure 0.13.1",
 ]
 
@@ -247,7 +247,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -469,7 +469,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -486,7 +486,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -1254,7 +1254,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -1385,7 +1385,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -1490,7 +1490,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -3344,7 +3344,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -4117,7 +4117,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -4328,7 +4328,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -4525,7 +4525,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -4548,7 +4548,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -5070,7 +5070,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.60",
+ "syn 2.0.63",
  "walkdir",
 ]
 
@@ -5363,7 +5363,7 @@ checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -5396,7 +5396,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -5681,7 +5681,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -5731,9 +5731,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5772,7 +5772,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -5887,7 +5887,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -5989,7 +5989,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -6176,7 +6176,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -6517,7 +6517,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
  "wasm-bindgen-shared",
 ]
 
@@ -6551,7 +6551,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6584,7 +6584,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -7192,7 +7192,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -7212,5 +7212,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.63",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index babcfb8587c..407436766dc 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.60", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.63", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From 64a4cf4156e6777fd1394fda9771a6c76d49b133 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:55:10 +0000
Subject: [PATCH 242/455] deps: bump rust-embed from 8.3.0 to 8.4.0

Pull-Request: #5378.
---
 Cargo.lock                         | 12 ++++++------
 examples/browser-webrtc/Cargo.toml |  2 +-
 interop-tests/Cargo.toml           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index febdea9d0f5..17fe3d3907f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5051,9 +5051,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.3.0"
+version = "8.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745"
+checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5062,9 +5062,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.3.0"
+version = "8.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8"
+checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5076,9 +5076,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.3.0"
+version = "8.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581"
+checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32"
 dependencies = [
  "globset",
  "sha2 0.10.8",
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index ec95b75287f..1744482dddf 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -26,7 +26,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 axum = "0.7.5"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
-rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-folder-path"] }
+rust-embed = { version = "8.4.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { workspace = true, features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index cfc85b75755..091ecc86558 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -31,7 +31,7 @@ mime_guess = "2.0"
 redis = { version = "0.23.3", default-features = false, features = [
     "tokio-comp",
 ] }
-rust-embed = "8.3"
+rust-embed = "8.4"
 serde_json = "1"
 thirtyfour = "=0.32.0" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { workspace = true, features = ["full"] }

From 5f04badcc7eb1d4ed32c470f1a126cdcbd41e5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 13 May 2024 13:31:32 +0100
Subject: [PATCH 243/455] chore: remove default-features on futures

remove default-features on futures subcrate imports to avoid warnings

Pull-Request: #5381.
---
 protocols/rendezvous/Cargo.toml | 2 +-
 transports/tls/Cargo.toml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 2937cbbdd93..0de7e5fc2d2 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 asynchronous-codec = { workspace = true }
 async-trait = "0.1"
 bimap = "0.6.3"
-futures = { workspace = true, default-features = false, features = ["std"] }
+futures = { workspace = true, features = ["std"] }
 futures-timer = "3.0.3"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 1494f110c97..1211dcf2dcf 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 exclude = ["src/test_assets"]
 
 [dependencies]
-futures = { workspace = true, default-features = false }
+futures = { workspace = true }
 futures-rustls = "0.24.0"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From 65ffb8e7167f7716e40d593e05119ebb9f66e4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 13 May 2024 14:15:13 +0100
Subject: [PATCH 244/455] deps: update ring to 0.17.8

deps: update ring to 0.17.8 and move it to a workspace dependency
`quic`'s `ring` dependency will be upgraded in its own PR as it also needs `quinn` to be upgraded

Pull-Request: #5382.
---
 Cargo.lock                | 23 ++++++++++++-----------
 Cargo.toml                |  1 +
 identity/Cargo.toml       |  4 ++--
 transports/tls/Cargo.toml |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17fe3d3907f..7e6477dc99b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2889,7 +2889,7 @@ dependencies = [
  "quick-protobuf",
  "quickcheck-ext",
  "rand 0.8.5",
- "ring 0.17.5",
+ "ring 0.17.8",
  "rmp-serde",
  "sec1",
  "serde",
@@ -3395,7 +3395,7 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-yamux",
  "rcgen",
- "ring 0.16.20",
+ "ring 0.17.8",
  "rustls 0.21.11",
  "rustls-webpki 0.101.7",
  "thiserror",
@@ -4966,16 +4966,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.5"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
  "getrandom 0.2.14",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5149,7 +5150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
 dependencies = [
  "log",
- "ring 0.17.5",
+ "ring 0.17.8",
  "rustls-webpki 0.101.7",
  "sct",
 ]
@@ -5161,7 +5162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring 0.17.5",
+ "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.2",
  "subtle",
@@ -5190,7 +5191,7 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.17.5",
+ "ring 0.17.8",
  "untrusted 0.9.0",
 ]
 
@@ -5200,7 +5201,7 @@ version = "0.102.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
 dependencies = [
- "ring 0.17.5",
+ "ring 0.17.8",
  "rustls-pki-types",
  "untrusted 0.9.0",
 ]
@@ -5564,7 +5565,7 @@ dependencies = [
  "chacha20poly1305",
  "curve25519-dalek",
  "rand_core 0.6.4",
- "ring 0.17.5",
+ "ring 0.17.8",
  "rustc_version",
  "sha2 0.10.8",
  "subtle",
@@ -5695,7 +5696,7 @@ dependencies = [
  "lazy_static",
  "md-5",
  "rand 0.8.5",
- "ring 0.17.5",
+ "ring 0.17.8",
  "subtle",
  "thiserror",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index d1f53569389..ec38ffb72fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,6 +126,7 @@ unsigned-varint = { version = "0.8.0" }
 tokio = { version = "1.37", default-features = false }
 tracing = "0.1.37"
 futures = "0.3.30"
+ring = "0.17.8"
 
 [patch.crates-io]
 
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 40af2f9a972..2e3a75475a1 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -19,7 +19,7 @@ hkdf = { version = "0.12.4", optional = true }
 libsecp256k1 = { version = "0.7.0", optional = true }
 tracing = { workspace = true }
 multihash = { version = "0.19.1", optional = true }
-p256 = { version = "0.13", default-features = false, features = [ "ecdsa", "std", "pem"], optional = true }
+p256 = { version = "0.13", default-features = false, features = ["ecdsa", "std", "pem"], optional = true }
 quick-protobuf = "0.8.1"
 rand = { version = "0.8", optional = true }
 sec1 = { version = "0.7", default-features = false, optional = true }
@@ -30,7 +30,7 @@ void = { version = "1.0", optional = true }
 zeroize = { version = "1.7", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ring = { version = "0.17.5", features = [ "alloc", "std"], default-features = false, optional = true }
+ring = { workspace = true, features = ["alloc", "std"], optional = true }
 
 [features]
 secp256k1 = ["dep:libsecp256k1", "dep:asn1_der", "dep:sha2", "dep:hkdf", "dep:zeroize"]
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 1211dcf2dcf..7fad6c1f45b 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -14,7 +14,7 @@ futures-rustls = "0.24.0"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
-ring = "0.16.20"
+ring = { workspace = true }
 thiserror = "1.0.59"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.16.0"

From ae0a187e4adf8946e9046c001154b364ca637ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 14 May 2024 10:39:01 +0100
Subject: [PATCH 245/455] deps(websocket): update futures-rustls to 0.26.0

Pull-Request: #5384.
---
 Cargo.lock                         | 29 ++++++++++++++--
 transports/websocket/Cargo.toml    |  2 +-
 transports/websocket/src/framed.rs |  2 +-
 transports/websocket/src/tls.rs    | 55 +++++++++++++++++++-----------
 4 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7e6477dc99b..a054df9fb35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1739,6 +1739,17 @@ dependencies = [
  "rustls 0.21.11",
 ]
 
+[[package]]
+name = "futures-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
+dependencies = [
+ "futures-io",
+ "rustls 0.23.5",
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "futures-sink"
 version = "0.3.30"
@@ -3387,7 +3398,7 @@ name = "libp2p-tls"
 version = "0.3.0"
 dependencies = [
  "futures",
- "futures-rustls",
+ "futures-rustls 0.24.0",
  "hex",
  "hex-literal",
  "libp2p-core",
@@ -3508,7 +3519,7 @@ dependencies = [
  "async-std",
  "either",
  "futures",
- "futures-rustls",
+ "futures-rustls 0.26.0",
  "libp2p-core",
  "libp2p-dns",
  "libp2p-identity",
@@ -5169,6 +5180,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e"
+dependencies = [
+ "once_cell",
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.2",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.1.2"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index cc10a0ab727..9156da7c83b 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures-rustls = "0.24.0"
+futures-rustls = { version = "0.26.0", default-features = false, features = ["ring"] }
 either = "1.11.0"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index ab7bfda43db..26634df9830 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -461,7 +461,7 @@ where
 struct WsAddress {
     host_port: String,
     path: String,
-    dns_name: Option<rustls::ServerName>,
+    dns_name: Option<rustls::pki_types::ServerName<'static>>,
     use_tls: bool,
     tcp_addr: Multiaddr,
 }
diff --git a/transports/websocket/src/tls.rs b/transports/websocket/src/tls.rs
index 24b0df97db3..77090e21675 100644
--- a/transports/websocket/src/tls.rs
+++ b/transports/websocket/src/tls.rs
@@ -35,24 +35,32 @@ impl fmt::Debug for Config {
 }
 
 /// Private key, DER-encoded ASN.1 in either PKCS#8 or PKCS#1 format.
-#[derive(Clone)]
-pub struct PrivateKey(rustls::PrivateKey);
+pub struct PrivateKey(rustls::pki_types::PrivateKeyDer<'static>);
 
 impl PrivateKey {
     /// Assert the given bytes are DER-encoded ASN.1 in either PKCS#8 or PKCS#1 format.
     pub fn new(bytes: Vec<u8>) -> Self {
-        PrivateKey(rustls::PrivateKey(bytes))
+        PrivateKey(
+            rustls::pki_types::PrivateKeyDer::try_from(bytes)
+                .expect("unknown or invalid key format"),
+        )
+    }
+}
+
+impl Clone for PrivateKey {
+    fn clone(&self) -> Self {
+        Self(self.0.clone_key())
     }
 }
 
 /// Certificate, DER-encoded X.509 format.
 #[derive(Debug, Clone)]
-pub struct Certificate(rustls::Certificate);
+pub struct Certificate(rustls::pki_types::CertificateDer<'static>);
 
 impl Certificate {
     /// Assert the given bytes are in DER-encoded X.509 format.
     pub fn new(bytes: Vec<u8>) -> Self {
-        Certificate(rustls::Certificate(bytes))
+        Certificate(rustls::pki_types::CertificateDer::from(bytes))
     }
 }
 
@@ -69,8 +77,10 @@ impl Config {
 
     /// Create a client-only configuration.
     pub fn client() -> Self {
-        let client = rustls::ClientConfig::builder()
-            .with_safe_defaults()
+        let provider = rustls::crypto::ring::default_provider();
+        let client = rustls::ClientConfig::builder_with_provider(provider.into())
+            .with_safe_default_protocol_versions()
+            .unwrap()
             .with_root_certificates(client_root_store())
             .with_no_client_auth();
         Config {
@@ -91,12 +101,12 @@ impl Config {
 /// Setup the rustls client configuration.
 fn client_root_store() -> rustls::RootCertStore {
     let mut client_root_store = rustls::RootCertStore::empty();
-    client_root_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
-        rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
-            ta.subject,
-            ta.spki,
-            ta.name_constraints,
-        )
+    client_root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
+        rustls::pki_types::TrustAnchor {
+            subject: ta.subject.into(),
+            subject_public_key_info: ta.spki.into(),
+            name_constraints: ta.name_constraints.map(|v| v.into()),
+        }
     }));
     client_root_store
 }
@@ -114,8 +124,10 @@ impl Builder {
         I: IntoIterator<Item = Certificate>,
     {
         let certs = certs.into_iter().map(|c| c.0).collect();
-        let server = rustls::ServerConfig::builder()
-            .with_safe_defaults()
+        let provider = rustls::crypto::ring::default_provider();
+        let server = rustls::ServerConfig::builder_with_provider(provider.into())
+            .with_safe_default_protocol_versions()
+            .unwrap()
             .with_no_client_auth()
             .with_single_cert(certs, key.0)
             .map_err(|e| Error::Tls(Box::new(e)))?;
@@ -126,15 +138,17 @@ impl Builder {
     /// Add an additional trust anchor.
     pub fn add_trust(&mut self, cert: &Certificate) -> Result<&mut Self, Error> {
         self.client_root_store
-            .add(&cert.0)
+            .add(cert.0.to_owned())
             .map_err(|e| Error::Tls(Box::new(e)))?;
         Ok(self)
     }
 
     /// Finish configuration.
     pub fn finish(self) -> Config {
-        let client = rustls::ClientConfig::builder()
-            .with_safe_defaults()
+        let provider = rustls::crypto::ring::default_provider();
+        let client = rustls::ClientConfig::builder_with_provider(provider.into())
+            .with_safe_default_protocol_versions()
+            .unwrap()
             .with_root_certificates(self.client_root_store)
             .with_no_client_auth();
 
@@ -145,8 +159,9 @@ impl Builder {
     }
 }
 
-pub(crate) fn dns_name_ref(name: &str) -> Result<rustls::ServerName, Error> {
-    rustls::ServerName::try_from(name).map_err(|_| Error::InvalidDnsName(name.into()))
+pub(crate) fn dns_name_ref(name: &str) -> Result<rustls::pki_types::ServerName<'static>, Error> {
+    rustls::pki_types::ServerName::try_from(String::from(name))
+        .map_err(|_| Error::InvalidDnsName(name.into()))
 }
 
 // Error //////////////////////////////////////////////////////////////////////////////////////////

From 6061172518b4b3ed9fdb609b734ba4f2e31e8226 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 May 2024 15:46:15 +0000
Subject: [PATCH 246/455] chore(deps): bump golang.org/x/net from 0.21.0 to
 0.23.0

Pull-Request: #5325.
---
 .../webtransport-tests/echo-server/go.mod     |  48 +---
 .../webtransport-tests/echo-server/go.sum     | 227 +++---------------
 2 files changed, 35 insertions(+), 240 deletions(-)

diff --git a/wasm-tests/webtransport-tests/echo-server/go.mod b/wasm-tests/webtransport-tests/echo-server/go.mod
index 1df54d5dbea..e2e0c6591ba 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.mod
+++ b/wasm-tests/webtransport-tests/echo-server/go.mod
@@ -5,85 +5,49 @@ go 1.22
 require (
 	github.com/libp2p/go-libp2p v0.33.1
 	github.com/multiformats/go-multiaddr v0.12.2
+	github.com/quic-go/quic-go v0.42.0
 )
 
 require (
 	github.com/benbjohnson/clock v1.3.5 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/cgroups v1.1.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/flynn/noise v1.1.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
-	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
-	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
 	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
-	github.com/koron/go-ssdp v0.0.4 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-flow-metrics v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
-	github.com/libp2p/go-msgio v0.3.0 // indirect
-	github.com/libp2p/go-nat v0.2.0 // indirect
 	github.com/libp2p/go-netroute v0.2.1 // indirect
-	github.com/libp2p/go-reuseport v0.4.0 // indirect
-	github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
-	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/miekg/dns v1.1.58 // indirect
-	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
-	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
-	github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
-	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multibase v0.2.0 // indirect
 	github.com/multiformats/go-multicodec v0.9.0 // indirect
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-multistream v0.5.0 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/onsi/ginkgo/v2 v2.15.0 // indirect
-	github.com/opencontainers/runtime-spec v1.2.0 // indirect
-	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.18.0 // indirect
-	github.com/prometheus/client_model v0.6.0 // indirect
-	github.com/prometheus/common v0.47.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/quic-go v0.42.0 // indirect
 	github.com/quic-go/webtransport-go v0.6.0 // indirect
-	github.com/raulk/go-watchdog v1.3.0 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
-	go.uber.org/dig v1.17.1 // indirect
-	go.uber.org/fx v1.20.1 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
 	golang.org/x/mod v0.15.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.18.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
diff --git a/wasm-tests/webtransport-tests/echo-server/go.sum b/wasm-tests/webtransport-tests/echo-server/go.sum
index 7cb38f3e7e2..a9d53233159 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.sum
+++ b/wasm-tests/webtransport-tests/echo-server/go.sum
@@ -10,49 +10,25 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
-github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
 github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
-github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
-github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
-github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
-github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc=
+github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
+github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
-github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4=
-github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
-github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
 github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg=
 github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
@@ -61,220 +37,123 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b h1:Qcx5LM0fSiks9uCyFZwDBUasd3lxd1RM0GYpL+Li5o4=
-github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
 github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo=
 github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
-github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
 github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
 github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
 github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
-github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
-github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
 github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU=
-github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
 github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
-github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
-github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.8 h1:IX5x/4yKwyPQeVS2AXHZ3J4YATM9oHBGH1gBc23jBAI=
-github.com/libp2p/go-libp2p v0.27.8/go.mod h1:eCFFtd0s5i/EVKR7+5Ki8bM7qwkNW3TPTTSSW9sz8NE=
 github.com/libp2p/go-libp2p v0.33.1 h1:tvJl9b9M6nSLBtZSXSguq+/lRhRj2oLRkyhBmQNMFLA=
 github.com/libp2p/go-libp2p v0.33.1/go.mod h1:zOUTMjG4I7TXwMndNyOBn/CNtVBLlvBlnxfi+8xzx+E=
-github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
-github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
 github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
-github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=
-github.com/libp2p/go-nat v0.2.0/go.mod h1:3MJr+GRpRkyT65EpVPBstXLvOlAPzUVlG6Pwg9ohLJk=
 github.com/libp2p/go-netroute v0.2.1 h1:V8kVrpD8GK0Riv15/7VN6RbUQ3URNZVosw7H2v9tksU=
 github.com/libp2p/go-netroute v0.2.1/go.mod h1:hraioZr0fhBjG0ZRXJJ6Zj2IVEVNx6tDTFQfSmcq7mQ=
-github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s=
-github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU=
-github.com/libp2p/go-yamux/v4 v4.0.0 h1:+Y80dV2Yx/kv7Y7JKu0LECyVdMXm1VUoko+VQ9rBfZQ=
 github.com/libp2p/go-yamux/v4 v4.0.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCypkQ=
 github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
-github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
-github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
-github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms=
-github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc=
-github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b/go.mod h1:lxPUiZwKoFL8DUUmalo2yJJUCxbPKtm8OKfqr2/FTNU=
-github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc h1:PTfri+PuQmWDqERdnNMiD9ZejrlswWrCpBEZgWOiTrc=
-github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4SxOuR/czcZ/E2RSJ3sfHs8FpHhQ5CWMf9s=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
-github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
-github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
 github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI=
 github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0=
 github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
-github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
-github.com/multiformats/go-multiaddr v0.9.0 h1:3h4V1LHIk5w4hJHekMKWALPXErDfz/sggzwC/NcqbDQ=
-github.com/multiformats/go-multiaddr v0.9.0/go.mod h1:mI67Lb1EeTOYb8GQfL/7wpIZwc46ElrvzhYnoJOmTT0=
 github.com/multiformats/go-multiaddr v0.12.2 h1:9G9sTY/wCYajKa9lyfWPmpZAwe6oV+Wb1zcmMS1HG24=
 github.com/multiformats/go-multiaddr v0.12.2/go.mod h1:GKyaTYjZRdcUhyOetrxTk9z0cW+jA/YrnqTOvKgi44M=
-github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
-github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
-github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
-github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
 github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=
 github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk=
-github.com/multiformats/go-multicodec v0.8.1 h1:ycepHwavHafh3grIbR1jIXnKCsFm0fqsfEOsJ8NtKE8=
-github.com/multiformats/go-multicodec v0.8.1/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k=
 github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg=
 github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k=
-github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.2.1 h1:aem8ZT0VA2nCHHk7bPJ1BjUbHNciqZC/d16Vve9l108=
-github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW5qrI9vb2Lt6evduFc=
 github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
 github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
-github.com/multiformats/go-multistream v0.4.1 h1:rFy0Iiyn3YT0asivDUIR05leAdwZq3de4741sbiSdfo=
-github.com/multiformats/go-multistream v0.4.1/go.mod h1:Mz5eykRVAjJWckE2U78c6xqdtyNUEhKSM0Lwar2p77Q=
 github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf/QGkvOGQAyiE=
 github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA=
-github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
 github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
-github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
-github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
 github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
-github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
-github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
-github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
-github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
-github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
-github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
-github.com/prometheus/common v0.47.0 h1:p5Cz0FNHo7SnWOmWmoRozVcjEp0bIVU8cV7OShpjL1k=
-github.com/prometheus/common v0.47.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
-github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
 github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
-github.com/quic-go/webtransport-go v0.5.2 h1:GA6Bl6oZY+g/flt00Pnu0XtivSD8vukOu3lYhJjnGEk=
-github.com/quic-go/webtransport-go v0.5.2/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU=
 github.com/quic-go/webtransport-go v0.6.0 h1:CvNsKqc4W2HljHJnoT+rMmbRJybShZ0YPFDD3NxaZLY=
 github.com/quic-go/webtransport-go v0.6.0/go.mod h1:9KjU4AEBqEQidGHNDkZrb8CAa1abRaosM2yGOyiikEc=
-github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
-github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
@@ -296,10 +175,8 @@ github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b
 github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
 github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
 github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
@@ -307,36 +184,25 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/dig v1.17.1 h1:Tga8Lz8PcYNsWsyHMZ1Vm0OQOUaJNDyvPImgbAu9YSc=
-go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
-go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk=
-go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg=
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
@@ -344,18 +210,12 @@ golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
 golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -364,11 +224,7 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -382,15 +238,10 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -401,34 +252,22 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -438,25 +277,20 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
-golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
 golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -474,8 +308,6 @@ google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -489,12 +321,11 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
-lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
 lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
 lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=

From 1aa016e1c7e3976748a726eab37af44d1c5b7a6e Mon Sep 17 00:00:00 2001
From: Adam Wierzbicki <a.wierzbicki@subsquid.io>
Date: Tue, 14 May 2024 22:49:37 +0200
Subject: [PATCH 247/455] feat(quic): allow setting the MTU discovery upper
 bound

The default MTU discovery upper bound is too high for some environments and results in permanent warnings. As I'd like to be able to configure this setting, adding a new method for the `Config`.

Pull-Request: #5386.
---
 Cargo.lock                    |  2 +-
 Cargo.toml                    |  2 +-
 transports/quic/CHANGELOG.md  |  4 ++++
 transports/quic/Cargo.toml    |  2 +-
 transports/quic/src/config.rs | 12 ++++++++++--
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a054df9fb35..3d49f0c51e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3163,7 +3163,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.10.2"
+version = "0.10.3"
 dependencies = [
  "async-std",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index ec38ffb72fd..f6a4f72df3d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -95,7 +95,7 @@ libp2p-perf = { version = "0.3.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.44.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
-libp2p-quic = { version = "0.10.2", path = "transports/quic" }
+libp2p-quic = { version = "0.10.3", path = "transports/quic" }
 libp2p-relay = { version = "0.17.2", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md
index 3c34a1989f9..cd0146afbb2 100644
--- a/transports/quic/CHANGELOG.md
+++ b/transports/quic/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.3
+- Allow configuring MTU discovery upper bound.
+  See [PR 5386](https://github.com/libp2p/rust-libp2p/pull/5386).
+
 ## 0.10.2
 
 - Change `max_idle_timeout`to 10s.
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 1bbac27d67f..5a7e79441db 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-quic"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 rust-version = { workspace = true }
diff --git a/transports/quic/src/config.rs b/transports/quic/src/config.rs
index 540f13e726b..c5189ce36cd 100644
--- a/transports/quic/src/config.rs
+++ b/transports/quic/src/config.rs
@@ -40,10 +40,10 @@ pub struct Config {
     /// concurrently by the remote peer.
     pub max_concurrent_stream_limit: u32,
 
-    /// Max unacknowledged data in bytes that may be send on a single stream.
+    /// Max unacknowledged data in bytes that may be sent on a single stream.
     pub max_stream_data: u32,
 
-    /// Max unacknowledged data in bytes that may be send in total on all streams
+    /// Max unacknowledged data in bytes that may be sent in total on all streams
     /// of a connection.
     pub max_connection_data: u32,
 
@@ -90,6 +90,14 @@ impl Config {
         }
     }
 
+    /// Set the upper bound to the max UDP payload size that MTU discovery will search for.
+    pub fn mtu_upper_bound(mut self, value: u16) -> Self {
+        self.mtu_discovery_config
+            .get_or_insert_with(Default::default)
+            .upper_bound(value);
+        self
+    }
+
     /// Disable MTU path discovery (it is enabled by default).
     pub fn disable_path_mtu_discovery(mut self) -> Self {
         self.mtu_discovery_config = None;

From 1fba3893e90ca442b4dfa01ddd84dd88b1422b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 16 May 2024 16:34:23 +0100
Subject: [PATCH 248/455] chore: fix ci wasm tests

by updating chrome download location.

Pull-Request: #5394.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 828882b4615..ea2f5a54e1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,7 +108,7 @@ jobs:
     name: Run all WASM tests
     runs-on: ubuntu-latest
     env:
-      CHROMEDRIVER_VERSION: '114.0.5735.90'
+      CHROMEDRIVER_VERSION: '125.0.6422.60'
     steps:
       - uses: actions/checkout@v4
 

From 2ad7a25969dab1fea4be4b0198594fec7b738e69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 21:31:10 +0000
Subject: [PATCH 249/455] deps: bump anyhow from 1.0.82 to 1.0.83

Pull-Request: #5379.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d49f0c51e4..8724c427953 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 1744482dddf..87b4a955ed3 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.82"
+anyhow = "1.0.83"
 futures = { workspace = true }
 rand = "0.8"
 tracing = { workspace = true }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 34f92b28979..e2b3a2ae83b 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
 futures = { workspace = true }
-anyhow = "1.0.82"
+anyhow = "1.0.83"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 2e10b3e4206..2bf6f285f0a 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.82"
+anyhow = "1.0.83"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From 451bcb60bb472262f96071006b19e5d236b1dd54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 21:43:17 +0000
Subject: [PATCH 250/455] deps: bump serde_json from 1.0.116 to 1.0.117

Pull-Request: #5380.
---
 Cargo.lock                            | 4 ++--
 hole-punching-tests/Cargo.toml        | 2 +-
 misc/keygen/Cargo.toml                | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8724c427953..11eb83796cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5394,9 +5394,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "indexmap 2.2.1",
  "itoa",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 5f93c158b98..074a09a4327 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -14,5 +14,5 @@ tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.201", features = ["derive"] }
-serde_json = "1.0.116"
+serde_json = "1.0.117"
 either = "1.11.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 93639e309ce..91845657526 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.201", features = ["derive"] }
-serde_json = "1.0.116"
+serde_json = "1.0.117"
 libp2p-core = { workspace = true }
 base64 = "0.22.1"
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 2bf6f285f0a..f33ee9bb916 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", optional = true}
-serde_json = { version = "1.0.116", optional = true }
+serde_json = { version = "1.0.117", optional = true }
 smallvec = "1.13.2"
 tracing = { workspace = true }
 void = "1.0.2"

From 35f7f23c1aa35a0a80dec2ce3bef8e35684ac6b8 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Fri, 17 May 2024 17:36:52 +0300
Subject: [PATCH 251/455] fix: Revert "deps: bump libc from 0.2.153 to 0.2.154"

libc 0.2.154 is version is not published in crates.io and it breaks the build. The CI of #5390 fails because of this.

Pull-Request: #5395.
---
 Cargo.lock                  | 6 +++---
 Cargo.toml                  | 2 +-
 transports/tcp/CHANGELOG.md | 3 +++
 transports/tcp/Cargo.toml   | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 11eb83796cd..77c102c1fa8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2610,9 +2610,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libp2p"
@@ -3377,7 +3377,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.41.0"
+version = "0.41.1"
 dependencies = [
  "async-io 2.3.2",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index f6a4f72df3d..1dec9052c94 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
-libp2p-tcp = { version = "0.41.0", path = "transports/tcp" }
+libp2p-tcp = { version = "0.41.1", path = "transports/tcp" }
 libp2p-tls = { version = "0.3.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md
index 2bde64056cb..36ed93a0f5b 100644
--- a/transports/tcp/CHANGELOG.md
+++ b/transports/tcp/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.41.1
+
+
 ## 0.41.0
 
 
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 41d128506dd..ea89b523fc2 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-tcp"
 edition = "2021"
 rust-version = { workspace = true }
 description = "TCP/IP transport protocol for libp2p"
-version = "0.41.0"
+version = "0.41.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -15,7 +15,7 @@ async-io = { version = "2.3.2", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0"
 if-watch = "3.2.0"
-libc = "0.2.154"
+libc = "0.2.153"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.6", features = ["all"] }

From 80f06d82f3de7edf52c2cf3daa6cc19582806341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Zwoli=C5=84ski?= <mac.zwolinski@gmail.com>
Date: Fri, 17 May 2024 17:04:43 +0200
Subject: [PATCH 252/455] fix(webtransport-websys): handle exceptions in
 WebTransport::close

Calls to `close` can result in exceptions being thrown eg. when the connection is not yet fully initialized (in `connecting` state). Currently webtransport-websys doesn't catch those resulting in errors like:
```
Uncaught (in promise)
WebTransportError { source: "session", streamErrorCode: null, name: "WebTransportError", message: "remote WebTransport close", code: 0, result: 0, filename: "", lineNumber: 0, columnNumber: 0, data: null }
```

Those cannot be caught even by wrapping `.close()` in the `try { ... } catch () {...}` blocks. It's rather poorly documented, indirectly with just an example [here](https://developer.mozilla.org/en-US/docs/Web/API/WebTransport/closed), but the way to catch those is through the promise created by `.closed`.

Pull-Request: #5390.
---
 Cargo.lock                                       | 2 +-
 Cargo.toml                                       | 2 +-
 transports/webtransport-websys/CHANGELOG.md      | 5 +++++
 transports/webtransport-websys/Cargo.toml        | 2 +-
 transports/webtransport-websys/src/connection.rs | 6 ++++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 77c102c1fa8..daaaf364baa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3555,7 +3555,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webtransport-websys"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "futures",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 1dec9052c94..a2c2211c2de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -113,7 +113,7 @@ libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.43.0", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.2.0", path = "transports/webtransport-websys" }
+libp2p-webtransport-websys = { version = "0.2.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.45.1", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
index b368a943395..91749001010 100644
--- a/transports/webtransport-websys/CHANGELOG.md
+++ b/transports/webtransport-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.1 
+
+* Fix unhandled exceptions thrown when calling `Webtransport::close`.
+  See [PR 5390](https://github.com/libp2p/rust-libp2p/pull/5390)
+
 ## 0.2.0
 
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index a1bd3832177..ac4fcd35d1c 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-webtransport-websys"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebTransport for libp2p under WASM environment"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
     "Yiannis Marangos <yiannis@eiger.co>",
     "oblique <psyberbits@gmail.com>",
diff --git a/transports/webtransport-websys/src/connection.rs b/transports/webtransport-websys/src/connection.rs
index 982f9e5a32c..956a66288af 100644
--- a/transports/webtransport-websys/src/connection.rs
+++ b/transports/webtransport-websys/src/connection.rs
@@ -47,6 +47,12 @@ impl Connection {
             let opts = endpoint.webtransport_opts();
             WebTransport::new_with_options(&url, &opts).map_err(Error::from_js_value)?
         };
+        // Create a promise that will resolve once session is closed.
+        // It will catch the errors that can eventually happen when
+        // `.close()` is called. Without it, there is no way of catching
+        // those from the `.close()` itself, resulting in `Uncaught in promise...`
+        // logs popping up.
+        detach_promise(session.closed());
 
         let incoming_streams = session.incoming_bidirectional_streams();
         let incoming_streams_reader =

From 6c2eacae47fa555c2d9512b9efbccd87799ee8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sat, 18 May 2024 01:42:05 +0100
Subject: [PATCH 253/455] deps(tls): upgrade rustls to 0.23

Pull-Request: #5385.
---
 Cargo.lock                        | 174 +++++++++++++++++++++---------
 Cargo.toml                        |   3 +-
 transports/quic/Cargo.toml        |   2 +-
 transports/tls/CHANGELOG.md       |   4 +
 transports/tls/Cargo.toml         |   9 +-
 transports/tls/src/certificate.rs |  30 ++++--
 transports/tls/src/lib.rs         |  15 +--
 transports/tls/src/upgrade.rs     |   7 +-
 transports/tls/src/verifier.rs    |  49 +++++----
 transports/websocket/Cargo.toml   |   2 +-
 10 files changed, 198 insertions(+), 97 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index daaaf364baa..945fc2bbc9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2459,7 +2459,7 @@ dependencies = [
  "libp2p",
  "libp2p-mplex",
  "libp2p-noise",
- "libp2p-tls",
+ "libp2p-tls 0.4.0",
  "libp2p-webrtc",
  "libp2p-webrtc-websys",
  "mime_guess",
@@ -2586,7 +2586,7 @@ version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "clap",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "serde",
  "serde_json",
@@ -2630,7 +2630,7 @@ dependencies = [
  "libp2p-allow-block-list",
  "libp2p-autonat",
  "libp2p-connection-limits",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-dcutr",
  "libp2p-dns",
  "libp2p-floodsub",
@@ -2652,7 +2652,7 @@ dependencies = [
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-tcp",
- "libp2p-tls",
+ "libp2p-tls 0.4.0",
  "libp2p-uds",
  "libp2p-upnp",
  "libp2p-websocket",
@@ -2661,7 +2661,7 @@ dependencies = [
  "libp2p-yamux",
  "multiaddr",
  "pin-project",
- "rw-stream-sink",
+ "rw-stream-sink 0.4.0",
  "thiserror",
  "tokio",
  "tracing-subscriber",
@@ -2672,7 +2672,7 @@ name = "libp2p-allow-block-list"
 version = "0.3.0"
 dependencies = [
  "async-std",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-derive",
@@ -2690,7 +2690,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-request-response",
  "libp2p-swarm",
@@ -2707,7 +2707,7 @@ name = "libp2p-connection-limits"
 version = "0.3.1"
 dependencies = [
  "async-std",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-ping",
@@ -2734,14 +2734,14 @@ dependencies = [
  "libp2p-noise",
  "multiaddr",
  "multihash",
- "multistream-select",
+ "multistream-select 0.13.0",
  "once_cell",
  "parking_lot",
  "pin-project",
  "quick-protobuf",
  "quickcheck-ext",
  "rand 0.8.5",
- "rw-stream-sink",
+ "rw-stream-sink 0.4.0",
  "serde",
  "smallvec",
  "thiserror",
@@ -2750,6 +2750,34 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "libp2p-core"
+version = "0.41.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05"
+dependencies = [
+ "either",
+ "fnv",
+ "futures",
+ "futures-timer",
+ "instant",
+ "libp2p-identity",
+ "multiaddr",
+ "multihash",
+ "multistream-select 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell",
+ "parking_lot",
+ "pin-project",
+ "quick-protobuf",
+ "rand 0.8.5",
+ "rw-stream-sink 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec",
+ "thiserror",
+ "tracing",
+ "unsigned-varint 0.8.0",
+ "void",
+]
+
 [[package]]
 name = "libp2p-dcutr"
 version = "0.11.0"
@@ -2762,7 +2790,7 @@ dependencies = [
  "futures-bounded",
  "futures-timer",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-dns",
  "libp2p-identify",
  "libp2p-identity",
@@ -2793,7 +2821,7 @@ dependencies = [
  "async-trait",
  "futures",
  "hickory-resolver",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "parking_lot",
  "smallvec",
@@ -2811,7 +2839,7 @@ dependencies = [
  "cuckoofilter",
  "fnv",
  "futures",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-swarm",
  "quick-protobuf",
@@ -2839,7 +2867,7 @@ dependencies = [
  "hex",
  "hex_fmt",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -2869,7 +2897,7 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
@@ -2926,7 +2954,7 @@ dependencies = [
  "futures-bounded",
  "futures-timer",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-noise",
@@ -2957,7 +2985,7 @@ dependencies = [
  "futures",
  "hickory-proto",
  "if-watch",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -2978,7 +3006,7 @@ name = "libp2p-memory-connection-limits"
 version = "0.2.0"
 dependencies = [
  "async-std",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-swarm",
@@ -2997,7 +3025,7 @@ version = "0.14.1"
 dependencies = [
  "futures",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-dcutr",
  "libp2p-gossipsub",
  "libp2p-identify",
@@ -3019,7 +3047,7 @@ dependencies = [
  "bytes",
  "criterion",
  "futures",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-muxer-test-harness",
  "libp2p-plaintext",
@@ -3041,7 +3069,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "futures_ringbuf",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "tracing",
 ]
 
@@ -3054,7 +3082,7 @@ dependencies = [
  "curve25519-dalek",
  "futures",
  "futures_ringbuf",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "multiaddr",
  "multihash",
@@ -3083,14 +3111,14 @@ dependencies = [
  "futures-timer",
  "instant",
  "libp2p",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-dns",
  "libp2p-identity",
  "libp2p-quic",
  "libp2p-swarm",
  "libp2p-swarm-test",
  "libp2p-tcp",
- "libp2p-tls",
+ "libp2p-tls 0.4.0",
  "libp2p-yamux",
  "rand 0.8.5",
  "serde",
@@ -3111,7 +3139,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
@@ -3130,7 +3158,7 @@ dependencies = [
  "bytes",
  "futures",
  "futures_ringbuf",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "quick-protobuf",
  "quick-protobuf-codec",
@@ -3145,7 +3173,7 @@ name = "libp2p-pnet"
 version = "0.24.0"
 dependencies = [
  "futures",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -3170,12 +3198,12 @@ dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-muxer-test-harness",
  "libp2p-noise",
  "libp2p-tcp",
- "libp2p-tls",
+ "libp2p-tls 0.3.0",
  "libp2p-yamux",
  "parking_lot",
  "quickcheck",
@@ -3200,7 +3228,7 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-ping",
  "libp2p-plaintext",
@@ -3229,7 +3257,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-noise",
@@ -3262,7 +3290,7 @@ dependencies = [
  "futures-timer",
  "futures_ringbuf",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -3303,7 +3331,7 @@ name = "libp2p-stream"
 version = "0.1.0-alpha.1"
 dependencies = [
  "futures",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
@@ -3325,7 +3353,7 @@ dependencies = [
  "futures-timer",
  "getrandom 0.2.14",
  "instant",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-kad",
@@ -3335,7 +3363,7 @@ dependencies = [
  "libp2p-swarm-test",
  "libp2p-yamux",
  "lru",
- "multistream-select",
+ "multistream-select 0.13.0",
  "once_cell",
  "quickcheck-ext",
  "rand 0.8.5",
@@ -3365,7 +3393,7 @@ dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-plaintext",
  "libp2p-swarm",
@@ -3385,7 +3413,7 @@ dependencies = [
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "socket2 0.5.6",
  "tokio",
@@ -3396,18 +3424,37 @@ dependencies = [
 [[package]]
 name = "libp2p-tls"
 version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93ce7e3c2e7569d685d08ec795157981722ff96e9e9f9eae75df3c29d02b07a5"
 dependencies = [
  "futures",
  "futures-rustls 0.24.0",
+ "libp2p-core 0.41.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-identity",
+ "rcgen",
+ "ring 0.16.20",
+ "rustls 0.21.11",
+ "rustls-webpki 0.101.7",
+ "thiserror",
+ "x509-parser 0.15.1",
+ "yasna",
+]
+
+[[package]]
+name = "libp2p-tls"
+version = "0.4.0"
+dependencies = [
+ "futures",
+ "futures-rustls 0.26.0",
  "hex",
  "hex-literal",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-yamux",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.21.11",
+ "rustls 0.23.5",
  "rustls-webpki 0.101.7",
  "thiserror",
  "tokio",
@@ -3421,7 +3468,7 @@ version = "0.40.0"
 dependencies = [
  "async-std",
  "futures",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "tempfile",
  "tokio",
  "tracing",
@@ -3434,7 +3481,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "igd-next",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-swarm",
  "tokio",
  "tracing",
@@ -3451,7 +3498,7 @@ dependencies = [
  "futures-timer",
  "hex",
  "if-watch",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-webrtc-utils",
@@ -3479,7 +3526,7 @@ dependencies = [
  "futures",
  "hex",
  "hex-literal",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "quick-protobuf",
@@ -3501,7 +3548,7 @@ dependencies = [
  "getrandom 0.2.14",
  "hex",
  "js-sys",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-webrtc-utils",
  "send_wrapper 0.6.0",
@@ -3520,14 +3567,14 @@ dependencies = [
  "either",
  "futures",
  "futures-rustls 0.26.0",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-dns",
  "libp2p-identity",
  "libp2p-tcp",
  "parking_lot",
  "pin-project-lite",
  "rcgen",
- "rw-stream-sink",
+ "rw-stream-sink 0.4.0",
  "soketto",
  "tracing",
  "url",
@@ -3541,7 +3588,7 @@ dependencies = [
  "bytes",
  "futures",
  "js-sys",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-yamux",
@@ -3559,7 +3606,7 @@ version = "0.2.1"
 dependencies = [
  "futures",
  "js-sys",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "multiaddr",
@@ -3580,7 +3627,7 @@ dependencies = [
  "async-std",
  "either",
  "futures",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-muxer-test-harness",
  "thiserror",
  "tracing",
@@ -3869,13 +3916,27 @@ dependencies = [
  "pin-project",
  "quickcheck-ext",
  "rand 0.8.5",
- "rw-stream-sink",
+ "rw-stream-sink 0.4.0",
  "smallvec",
  "tracing",
  "tracing-subscriber",
  "unsigned-varint 0.8.0",
 ]
 
+[[package]]
+name = "multistream-select"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19"
+dependencies = [
+ "bytes",
+ "futures",
+ "log",
+ "pin-project",
+ "smallvec",
+ "unsigned-varint 0.7.2",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@@ -5247,6 +5308,17 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "rw-stream-sink"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1"
+dependencies = [
+ "futures",
+ "pin-project",
+ "static_assertions",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -6870,7 +6942,7 @@ version = "0.1.0"
 dependencies = [
  "futures",
  "getrandom 0.2.14",
- "libp2p-core",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-webtransport-websys",
diff --git a/Cargo.toml b/Cargo.toml
index a2c2211c2de..a0218cd5e75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,6 +73,7 @@ rust-version = "1.75.0"
 [workspace.dependencies]
 asynchronous-codec = { version = "0.7.0" }
 futures-bounded = { version = "0.2.3" }
+futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
@@ -104,8 +105,8 @@ libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
+libp2p-tls = { version = "0.4.0", path = "transports/tls" }
 libp2p-tcp = { version = "0.41.1", path = "transports/tcp" }
-libp2p-tls = { version = "0.3.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 5a7e79441db..399ddd48e1e 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -15,7 +15,7 @@ futures = { workspace = true }
 futures-timer = "3.0.3"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
-libp2p-tls = { workspace = true }
+libp2p-tls = "0.3.0"
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.2"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
diff --git a/transports/tls/CHANGELOG.md b/transports/tls/CHANGELOG.md
index 83f72286559..3c6d0a2a1f5 100644
--- a/transports/tls/CHANGELOG.md
+++ b/transports/tls/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+- Upgrade `rustls` to `0.23`. See [PR 5385](https://github.com/libp2p/rust-libp2p/pull/5385)
+
 ## 0.3.0
 
 - Migrate to `{In,Out}boundConnectionUpgrade` traits.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 7fad6c1f45b..48693524199 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-tls"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 rust-version = { workspace = true }
 description = "TLS configuration based on libp2p TLS specs."
@@ -10,7 +10,7 @@ exclude = ["src/test_assets"]
 
 [dependencies]
 futures = { workspace = true }
-futures-rustls = "0.24.0"
+futures-rustls = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
@@ -22,9 +22,10 @@ yasna = "0.5.2"
 
 # Exposed dependencies. Breaking changes to these are breaking changes to us.
 [dependencies.rustls]
-version = "0.21.9"
+version = "0.23.4"
 default-features = false
-features = ["dangerous_configuration"] # Must enable this to allow for custom verification code.
+features = ["ring", "std"] # Must enable this to allow for custom verification code.
+
 
 [dev-dependencies]
 hex = "0.4.3"
diff --git a/transports/tls/src/certificate.rs b/transports/tls/src/certificate.rs
index 801ba3fe3ce..bbd353e32bd 100644
--- a/transports/tls/src/certificate.rs
+++ b/transports/tls/src/certificate.rs
@@ -46,14 +46,22 @@ static P2P_SIGNATURE_ALGORITHM: &rcgen::SignatureAlgorithm = &rcgen::PKCS_ECDSA_
 /// certificate extension containing the public key of the given keypair.
 pub fn generate(
     identity_keypair: &identity::Keypair,
-) -> Result<(rustls::Certificate, rustls::PrivateKey), GenError> {
+) -> Result<
+    (
+        rustls::pki_types::CertificateDer<'static>,
+        rustls::pki_types::PrivateKeyDer<'static>,
+    ),
+    GenError,
+> {
     // Keypair used to sign the certificate.
     // SHOULD NOT be related to the host's key.
     // Endpoints MAY generate a new key and certificate
     // for every connection attempt, or they MAY reuse the same key
     // and certificate for multiple connections.
     let certificate_keypair = rcgen::KeyPair::generate(P2P_SIGNATURE_ALGORITHM)?;
-    let rustls_key = rustls::PrivateKey(certificate_keypair.serialize_der());
+    let rustls_key = rustls::pki_types::PrivateKeyDer::from(
+        rustls::pki_types::PrivatePkcs8KeyDer::from(certificate_keypair.serialize_der()),
+    );
 
     let certificate = {
         let mut params = rcgen::CertificateParams::new(vec![]);
@@ -67,7 +75,7 @@ pub fn generate(
         rcgen::Certificate::from_params(params)?
     };
 
-    let rustls_certificate = rustls::Certificate(certificate.serialize_der()?);
+    let rustls_certificate = rustls::pki_types::CertificateDer::from(certificate.serialize_der()?);
 
     Ok((rustls_certificate, rustls_key))
 }
@@ -76,7 +84,9 @@ pub fn generate(
 ///
 /// For this to succeed, the certificate must contain the specified extension and the signature must
 /// match the embedded public key.
-pub fn parse(certificate: &rustls::Certificate) -> Result<P2pCertificate<'_>, ParseError> {
+pub fn parse<'a>(
+    certificate: &'a rustls::pki_types::CertificateDer<'a>,
+) -> Result<P2pCertificate<'a>, ParseError> {
     let certificate = parse_unverified(certificate.as_ref())?;
 
     certificate.verify()?;
@@ -481,7 +491,9 @@ mod tests {
 
     #[test]
     fn rsa_pss_sha384() {
-        let cert = rustls::Certificate(include_bytes!("./test_assets/rsa_pss_sha384.der").to_vec());
+        let cert = rustls::pki_types::CertificateDer::from(
+            include_bytes!("./test_assets/rsa_pss_sha384.der").to_vec(),
+        );
 
         let cert = parse(&cert).unwrap();
 
@@ -502,7 +514,7 @@ mod tests {
 
     #[test]
     fn can_parse_certificate_with_ed25519_keypair() {
-        let certificate = rustls::Certificate(hex!("308201773082011ea003020102020900f5bd0debaa597f52300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d030107034200046bf9871220d71dcb3483ecdfcbfcc7c103f8509d0974b3c18ab1f1be1302d643103a08f7a7722c1b247ba3876fe2c59e26526f479d7718a85202ddbe47562358a37f307d307b060a2b0601040183a25a01010101ff046a30680424080112207fda21856709c5ae12fd6e8450623f15f11955d384212b89f56e7e136d2e17280440aaa6bffabe91b6f30c35e3aa4f94b1188fed96b0ffdd393f4c58c1c047854120e674ce64c788406d1c2c4b116581fd7411b309881c3c7f20b46e54c7e6fe7f0f300a06082a8648ce3d040302034700304402207d1a1dbd2bda235ff2ec87daf006f9b04ba076a5a5530180cd9c2e8f6399e09d0220458527178c7e77024601dbb1b256593e9b96d961b96349d1f560114f61a87595").to_vec());
+        let certificate = rustls::pki_types::CertificateDer::from(hex!("308201773082011ea003020102020900f5bd0debaa597f52300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d030107034200046bf9871220d71dcb3483ecdfcbfcc7c103f8509d0974b3c18ab1f1be1302d643103a08f7a7722c1b247ba3876fe2c59e26526f479d7718a85202ddbe47562358a37f307d307b060a2b0601040183a25a01010101ff046a30680424080112207fda21856709c5ae12fd6e8450623f15f11955d384212b89f56e7e136d2e17280440aaa6bffabe91b6f30c35e3aa4f94b1188fed96b0ffdd393f4c58c1c047854120e674ce64c788406d1c2c4b116581fd7411b309881c3c7f20b46e54c7e6fe7f0f300a06082a8648ce3d040302034700304402207d1a1dbd2bda235ff2ec87daf006f9b04ba076a5a5530180cd9c2e8f6399e09d0220458527178c7e77024601dbb1b256593e9b96d961b96349d1f560114f61a87595").to_vec());
 
         let peer_id = parse(&certificate).unwrap().peer_id();
 
@@ -516,7 +528,7 @@ mod tests {
 
     #[test]
     fn fails_to_parse_bad_certificate_with_ed25519_keypair() {
-        let certificate = rustls::Certificate(hex!("308201773082011da003020102020830a73c5d896a1109300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d03010703420004bbe62df9a7c1c46b7f1f21d556deec5382a36df146fb29c7f1240e60d7d5328570e3b71d99602b77a65c9b3655f62837f8d66b59f1763b8c9beba3be07778043a37f307d307b060a2b0601040183a25a01010101ff046a3068042408011220ec8094573afb9728088860864f7bcea2d4fd412fef09a8e2d24d482377c20db60440ecabae8354afa2f0af4b8d2ad871e865cb5a7c0c8d3dbdbf42de577f92461a0ebb0a28703e33581af7d2a4f2270fc37aec6261fcc95f8af08f3f4806581c730a300a06082a8648ce3d040302034800304502202dfb17a6fa0f94ee0e2e6a3b9fb6e986f311dee27392058016464bd130930a61022100ba4b937a11c8d3172b81e7cd04aedb79b978c4379c2b5b24d565dd5d67d3cb3c").to_vec());
+        let certificate = rustls::pki_types::CertificateDer::from(hex!("308201773082011da003020102020830a73c5d896a1109300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d03010703420004bbe62df9a7c1c46b7f1f21d556deec5382a36df146fb29c7f1240e60d7d5328570e3b71d99602b77a65c9b3655f62837f8d66b59f1763b8c9beba3be07778043a37f307d307b060a2b0601040183a25a01010101ff046a3068042408011220ec8094573afb9728088860864f7bcea2d4fd412fef09a8e2d24d482377c20db60440ecabae8354afa2f0af4b8d2ad871e865cb5a7c0c8d3dbdbf42de577f92461a0ebb0a28703e33581af7d2a4f2270fc37aec6261fcc95f8af08f3f4806581c730a300a06082a8648ce3d040302034800304502202dfb17a6fa0f94ee0e2e6a3b9fb6e986f311dee27392058016464bd130930a61022100ba4b937a11c8d3172b81e7cd04aedb79b978c4379c2b5b24d565dd5d67d3cb3c").to_vec());
 
         let error = parse(&certificate).unwrap_err();
 
@@ -525,7 +537,7 @@ mod tests {
 
     #[test]
     fn can_parse_certificate_with_ecdsa_keypair() {
-        let certificate = rustls::Certificate(hex!("308201c030820166a003020102020900eaf419a6e3edb4a6300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d030107034200048dbf1116c7c608d6d5292bd826c3feb53483a89fce434bf64538a359c8e07538ff71f6766239be6a146dcc1a5f3bb934bcd4ae2ae1d4da28ac68b4a20593f06ba381c63081c33081c0060a2b0601040183a25a01010101ff0481ae3081ab045f0803125b3059301306072a8648ce3d020106082a8648ce3d0301070342000484b93fa456a74bd0153919f036db7bc63c802f055bc7023395d0203de718ee0fc7b570b767cdd858aca6c7c4113ff002e78bd2138ac1a3b26dde3519e06979ad04483046022100bc84014cea5a41feabdf4c161096564b9ccf4b62fbef4fe1cd382c84e11101780221009204f086a84cb8ed8a9ddd7868dc90c792ee434adf62c66f99a08a5eba11615b300a06082a8648ce3d0403020348003045022054b437be9a2edf591312d68ff24bf91367ad4143f76cf80b5658f232ade820da022100e23b48de9df9c25d4c83ddddf75d2676f0b9318ee2a6c88a736d85eab94a912f").to_vec());
+        let certificate = rustls::pki_types::CertificateDer::from(hex!("308201c030820166a003020102020900eaf419a6e3edb4a6300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d030107034200048dbf1116c7c608d6d5292bd826c3feb53483a89fce434bf64538a359c8e07538ff71f6766239be6a146dcc1a5f3bb934bcd4ae2ae1d4da28ac68b4a20593f06ba381c63081c33081c0060a2b0601040183a25a01010101ff0481ae3081ab045f0803125b3059301306072a8648ce3d020106082a8648ce3d0301070342000484b93fa456a74bd0153919f036db7bc63c802f055bc7023395d0203de718ee0fc7b570b767cdd858aca6c7c4113ff002e78bd2138ac1a3b26dde3519e06979ad04483046022100bc84014cea5a41feabdf4c161096564b9ccf4b62fbef4fe1cd382c84e11101780221009204f086a84cb8ed8a9ddd7868dc90c792ee434adf62c66f99a08a5eba11615b300a06082a8648ce3d0403020348003045022054b437be9a2edf591312d68ff24bf91367ad4143f76cf80b5658f232ade820da022100e23b48de9df9c25d4c83ddddf75d2676f0b9318ee2a6c88a736d85eab94a912f").to_vec());
 
         let peer_id = parse(&certificate).unwrap().peer_id();
 
@@ -539,7 +551,7 @@ mod tests {
 
     #[test]
     fn can_parse_certificate_with_secp256k1_keypair() {
-        let certificate = rustls::Certificate(hex!("3082018230820128a003020102020900f3b305f55622cfdf300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d0301070342000458f7e9581748ff9bdd933b655cc0e5552a1248f840658cc221dec2186b5a2fe4641b86ab7590a3422cdbb1000cf97662f27e5910d7569f22feed8829c8b52e0fa38188308185308182060a2b0601040183a25a01010101ff0471306f042508021221026b053094d1112bce799dc8026040ae6d4eb574157929f1598172061f753d9b1b04463044022040712707e97794c478d93989aaa28ae1f71c03af524a8a4bd2d98424948a782302207b61b7f074b696a25fb9e0059141a811cccc4cc28042d9301b9b2a4015e87470300a06082a8648ce3d04030203480030450220143ae4d86fdc8675d2480bb6912eca5e39165df7f572d836aa2f2d6acfab13f8022100831d1979a98f0c4a6fb5069ca374de92f1a1205c962a6d90ad3d7554cb7d9df4").to_vec());
+        let certificate = rustls::pki_types::CertificateDer::from(hex!("3082018230820128a003020102020900f3b305f55622cfdf300a06082a8648ce3d04030230003020170d3735303130313030303030305a180f34303936303130313030303030305a30003059301306072a8648ce3d020106082a8648ce3d0301070342000458f7e9581748ff9bdd933b655cc0e5552a1248f840658cc221dec2186b5a2fe4641b86ab7590a3422cdbb1000cf97662f27e5910d7569f22feed8829c8b52e0fa38188308185308182060a2b0601040183a25a01010101ff0471306f042508021221026b053094d1112bce799dc8026040ae6d4eb574157929f1598172061f753d9b1b04463044022040712707e97794c478d93989aaa28ae1f71c03af524a8a4bd2d98424948a782302207b61b7f074b696a25fb9e0059141a811cccc4cc28042d9301b9b2a4015e87470300a06082a8648ce3d04030203480030450220143ae4d86fdc8675d2480bb6912eca5e39165df7f572d836aa2f2d6acfab13f8022100831d1979a98f0c4a6fb5069ca374de92f1a1205c962a6d90ad3d7554cb7d9df4").to_vec());
 
         let peer_id = parse(&certificate).unwrap().peer_id();
 
diff --git a/transports/tls/src/lib.rs b/transports/tls/src/lib.rs
index 1edd83e9807..741a4b48077 100644
--- a/transports/tls/src/lib.rs
+++ b/transports/tls/src/lib.rs
@@ -46,11 +46,13 @@ pub fn make_client_config(
 ) -> Result<rustls::ClientConfig, certificate::GenError> {
     let (certificate, private_key) = certificate::generate(keypair)?;
 
-    let mut crypto = rustls::ClientConfig::builder()
-        .with_cipher_suites(verifier::CIPHERSUITES)
-        .with_safe_default_kx_groups()
+    let mut provider = rustls::crypto::ring::default_provider();
+    provider.cipher_suites = verifier::CIPHERSUITES.to_vec();
+
+    let mut crypto = rustls::ClientConfig::builder_with_provider(provider.into())
         .with_protocol_versions(verifier::PROTOCOL_VERSIONS)
         .expect("Cipher suites and kx groups are configured; qed")
+        .dangerous()
         .with_custom_certificate_verifier(Arc::new(
             verifier::Libp2pCertificateVerifier::with_remote_peer_id(remote_peer_id),
         ))
@@ -67,9 +69,10 @@ pub fn make_server_config(
 ) -> Result<rustls::ServerConfig, certificate::GenError> {
     let (certificate, private_key) = certificate::generate(keypair)?;
 
-    let mut crypto = rustls::ServerConfig::builder()
-        .with_cipher_suites(verifier::CIPHERSUITES)
-        .with_safe_default_kx_groups()
+    let mut provider = rustls::crypto::ring::default_provider();
+    provider.cipher_suites = verifier::CIPHERSUITES.to_vec();
+
+    let mut crypto = rustls::ServerConfig::builder_with_provider(provider.into())
         .with_protocol_versions(verifier::PROTOCOL_VERSIONS)
         .expect("Cipher suites and kx groups are configured; qed")
         .with_client_cert_verifier(Arc::new(verifier::Libp2pCertificateVerifier::new()))
diff --git a/transports/tls/src/upgrade.rs b/transports/tls/src/upgrade.rs
index 84510b6bab0..1c61d265ea6 100644
--- a/transports/tls/src/upgrade.rs
+++ b/transports/tls/src/upgrade.rs
@@ -28,7 +28,8 @@ use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
 use libp2p_core::UpgradeInfo;
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
-use rustls::{CommonState, ServerName};
+use rustls::{pki_types::ServerName, CommonState};
+
 use std::net::{IpAddr, Ipv4Addr};
 use std::sync::Arc;
 
@@ -103,7 +104,9 @@ where
         async move {
             // Spec: In order to keep this flexibility for future versions, clients that only support the version of the handshake defined in this document MUST NOT send any value in the Server Name Indication.
             // Setting `ServerName` to unspecified will disable the use of the SNI extension.
-            let name = ServerName::IpAddress(IpAddr::V4(Ipv4Addr::UNSPECIFIED));
+            let name = ServerName::IpAddress(rustls::pki_types::IpAddr::from(IpAddr::V4(
+                Ipv4Addr::UNSPECIFIED,
+            )));
 
             let stream = futures_rustls::TlsConnector::from(Arc::new(self.client))
                 .connect(name, socket)
diff --git a/transports/tls/src/verifier.rs b/transports/tls/src/verifier.rs
index 01fdb8fdf11..65636cbe708 100644
--- a/transports/tls/src/verifier.rs
+++ b/transports/tls/src/verifier.rs
@@ -26,12 +26,13 @@
 use crate::certificate;
 use libp2p_identity::PeerId;
 use rustls::{
-    cipher_suite::{
+    client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
+    crypto::ring::cipher_suite::{
         TLS13_AES_128_GCM_SHA256, TLS13_AES_256_GCM_SHA384, TLS13_CHACHA20_POLY1305_SHA256,
     },
-    client::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
-    server::{ClientCertVerified, ClientCertVerifier},
-    Certificate, CertificateError, DigitallySignedStruct, DistinguishedName, SignatureScheme,
+    pki_types::CertificateDer,
+    server::danger::{ClientCertVerified, ClientCertVerifier},
+    CertificateError, DigitallySignedStruct, DistinguishedName, OtherError, SignatureScheme,
     SupportedCipherSuite, SupportedProtocolVersion,
 };
 use std::sync::Arc;
@@ -56,6 +57,7 @@ pub(crate) static CIPHERSUITES: &[SupportedCipherSuite] = &[
 /// Implementation of the `rustls` certificate verification traits for libp2p.
 ///
 /// Only TLS 1.3 is supported. TLS 1.2 should be disabled in the configuration of `rustls`.
+#[derive(Debug)]
 pub(crate) struct Libp2pCertificateVerifier {
     /// The peer ID we intend to connect to
     remote_peer_id: Option<PeerId>,
@@ -103,12 +105,11 @@ impl Libp2pCertificateVerifier {
 impl ServerCertVerifier for Libp2pCertificateVerifier {
     fn verify_server_cert(
         &self,
-        end_entity: &Certificate,
-        intermediates: &[Certificate],
-        _server_name: &rustls::ServerName,
-        _scts: &mut dyn Iterator<Item = &[u8]>,
+        end_entity: &CertificateDer,
+        intermediates: &[CertificateDer],
+        _server_name: &rustls::pki_types::ServerName,
         _ocsp_response: &[u8],
-        _now: std::time::SystemTime,
+        _now: rustls::pki_types::UnixTime,
     ) -> Result<ServerCertVerified, rustls::Error> {
         let peer_id = verify_presented_certs(end_entity, intermediates)?;
 
@@ -130,7 +131,7 @@ impl ServerCertVerifier for Libp2pCertificateVerifier {
     fn verify_tls12_signature(
         &self,
         _message: &[u8],
-        _cert: &Certificate,
+        _cert: &CertificateDer,
         _dss: &DigitallySignedStruct,
     ) -> Result<HandshakeSignatureValid, rustls::Error> {
         unreachable!("`PROTOCOL_VERSIONS` only allows TLS 1.3")
@@ -139,7 +140,7 @@ impl ServerCertVerifier for Libp2pCertificateVerifier {
     fn verify_tls13_signature(
         &self,
         message: &[u8],
-        cert: &Certificate,
+        cert: &CertificateDer,
         dss: &DigitallySignedStruct,
     ) -> Result<HandshakeSignatureValid, rustls::Error> {
         verify_tls13_signature(cert, dss.scheme, message, dss.signature())
@@ -162,15 +163,15 @@ impl ClientCertVerifier for Libp2pCertificateVerifier {
         true
     }
 
-    fn client_auth_root_subjects(&self) -> &[DistinguishedName] {
+    fn root_hint_subjects(&self) -> &[DistinguishedName] {
         &[]
     }
 
     fn verify_client_cert(
         &self,
-        end_entity: &Certificate,
-        intermediates: &[Certificate],
-        _now: std::time::SystemTime,
+        end_entity: &CertificateDer,
+        intermediates: &[CertificateDer],
+        _now: rustls::pki_types::UnixTime,
     ) -> Result<ClientCertVerified, rustls::Error> {
         verify_presented_certs(end_entity, intermediates)?;
 
@@ -180,7 +181,7 @@ impl ClientCertVerifier for Libp2pCertificateVerifier {
     fn verify_tls12_signature(
         &self,
         _message: &[u8],
-        _cert: &Certificate,
+        _cert: &CertificateDer,
         _dss: &DigitallySignedStruct,
     ) -> Result<HandshakeSignatureValid, rustls::Error> {
         unreachable!("`PROTOCOL_VERSIONS` only allows TLS 1.3")
@@ -189,7 +190,7 @@ impl ClientCertVerifier for Libp2pCertificateVerifier {
     fn verify_tls13_signature(
         &self,
         message: &[u8],
-        cert: &Certificate,
+        cert: &CertificateDer,
         dss: &DigitallySignedStruct,
     ) -> Result<HandshakeSignatureValid, rustls::Error> {
         verify_tls13_signature(cert, dss.scheme, message, dss.signature())
@@ -207,8 +208,8 @@ impl ClientCertVerifier for Libp2pCertificateVerifier {
 /// Endpoints MUST abort the connection attempt if more than one certificate is received,
 /// or if the certificate’s self-signature is not valid.
 fn verify_presented_certs(
-    end_entity: &Certificate,
-    intermediates: &[Certificate],
+    end_entity: &CertificateDer,
+    intermediates: &[CertificateDer],
 ) -> Result<PeerId, rustls::Error> {
     if !intermediates.is_empty() {
         return Err(rustls::Error::General(
@@ -222,7 +223,7 @@ fn verify_presented_certs(
 }
 
 fn verify_tls13_signature(
-    cert: &Certificate,
+    cert: &CertificateDer,
     signature_scheme: SignatureScheme,
     message: &[u8],
     signature: &[u8],
@@ -237,7 +238,9 @@ impl From<certificate::ParseError> for rustls::Error {
         use webpki::Error::*;
         match e {
             BadDer => rustls::Error::InvalidCertificate(CertificateError::BadEncoding),
-            e => rustls::Error::InvalidCertificate(CertificateError::Other(Arc::new(e))),
+            e => {
+                rustls::Error::InvalidCertificate(CertificateError::Other(OtherError(Arc::new(e))))
+            }
         }
     }
 }
@@ -248,7 +251,9 @@ impl From<certificate::VerificationError> for rustls::Error {
             InvalidSignatureForPublicKey => {
                 rustls::Error::InvalidCertificate(CertificateError::BadSignature)
             }
-            other => rustls::Error::InvalidCertificate(CertificateError::Other(Arc::new(other))),
+            other => rustls::Error::InvalidCertificate(CertificateError::Other(OtherError(
+                Arc::new(other),
+            ))),
         }
     }
 }
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 9156da7c83b..806086a4369 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures-rustls = { version = "0.26.0", default-features = false, features = ["ring"] }
+futures-rustls = { workspace = true, features = ["ring"] }
 either = "1.11.0"
 futures = { workspace = true }
 libp2p-core = { workspace = true }

From e77a8ff073cdd2ddde14e00bf94028189218d062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sun, 19 May 2024 16:14:12 +0100
Subject: [PATCH 254/455] chore: remove chrome installation from CI wasm tests

Remove chrome installation from CI wasm tests and specifying its version. `chromedriver` automatically installs chrome.

Pull-Request: #5397.
---
 .github/workflows/ci.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ea2f5a54e1f..c489d3f5771 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,8 +107,6 @@ jobs:
   wasm_tests:
     name: Run all WASM tests
     runs-on: ubuntu-latest
-    env:
-      CHROMEDRIVER_VERSION: '125.0.6422.60'
     steps:
       - uses: actions/checkout@v4
 
@@ -120,15 +118,8 @@ jobs:
         with:
           tool: wasm-pack@0.12.0
 
-      - name: Install Google Chrome
-        run: |
-          curl -o /tmp/google-chrome-stable_amd64.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROMEDRIVER_VERSION}-1_amd64.deb
-          sudo dpkg -i /tmp/google-chrome-stable_amd64.deb
-
       - name: Install chromedriver
         uses: nanasess/setup-chromedriver@v2
-        with:
-          chromedriver-version: ${{ env.CHROMEDRIVER_VERSION }}
 
       - name: Run all tests
         run: ./wasm-tests/run-all.sh

From dca5b88119b500f00449416abd293cc384819b2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 19 May 2024 15:29:38 +0000
Subject: [PATCH 255/455] deps: bump thiserror from 1.0.59 to 1.0.60

Pull-Request: #5376.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 945fc2bbc9f..707fd8f3829 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5970,18 +5970,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index e95fa00697e..3b1f1039875 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 tracing = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 8e17ba3d6a3..51f980b0e49 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 tracing = { workspace = true }
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 399ddd48e1e..206c7b9d0e2 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.2"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.6"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 48693524199..344780d9758 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = { workspace = true }
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.16.0"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index a7713e1fa59..518c05519be 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = { workspace = true }
 parking_lot = "0.12.2"
 send_wrapper = "0.6.0"
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.69", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index ac4fcd35d1c..c2c4fddbcf4 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 tracing = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"

From b1530f3c06631276928c560fec2fa62f41889bb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 19 May 2024 16:08:46 +0000
Subject: [PATCH 256/455] deps: bump socket2 from 0.5.6 to 0.5.7

Pull-Request: #5364.
---
 Cargo.lock                 | 24 ++++++++++++------------
 protocols/mdns/Cargo.toml  |  2 +-
 transports/quic/Cargo.toml |  2 +-
 transports/tcp/Cargo.toml  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 707fd8f3829..e5cccbe0d48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -447,7 +447,7 @@ dependencies = [
  "futures-util",
  "hickory-resolver",
  "pin-utils",
- "socket2 0.5.6",
+ "socket2 0.5.7",
 ]
 
 [[package]]
@@ -2019,7 +2019,7 @@ dependencies = [
  "ipnet",
  "once_cell",
  "rand 0.8.5",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "thiserror",
  "tinyvec",
  "tokio",
@@ -2296,7 +2296,7 @@ dependencies = [
  "http-body 1.0.0",
  "hyper 1.1.0",
  "pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tower",
  "tower-service",
@@ -2496,7 +2496,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "widestring",
  "windows-sys 0.48.0",
  "winreg 0.50.0",
@@ -2994,7 +2994,7 @@ dependencies = [
  "libp2p-yamux",
  "rand 0.8.5",
  "smallvec",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3211,7 +3211,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.16.20",
  "rustls 0.21.11",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "thiserror",
  "tokio",
  "tracing",
@@ -3415,7 +3415,7 @@ dependencies = [
  "libc",
  "libp2p-core 0.41.2",
  "libp2p-identity",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -4716,7 +4716,7 @@ checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0"
 dependencies = [
  "bytes",
  "libc",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tracing",
  "windows-sys 0.48.0",
 ]
@@ -5680,9 +5680,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -6064,7 +6064,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -6857,7 +6857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62bebbd40e7f8b630a0f1a74783dbfff1edfc0ccaae891c4689891156a8c4d8c"
 dependencies = [
  "log",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "thiserror",
  "tokio",
  "webrtc-util",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 061651c07d4..fb96acc7dc0 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8.3"
 smallvec = "1.13.2"
-socket2 = { version = "0.5.6", features = ["all"] }
+socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { workspace = true, default-features = false, features = ["net", "time"], optional = true}
 tracing = { workspace = true }
 hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 206c7b9d0e2..90cbc1d260e 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -24,7 +24,7 @@ rustls = { version = "0.21.9", default-features = false }
 thiserror = "1.0.60"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
-socket2 = "0.5.6"
+socket2 = "0.5.7"
 ring = "0.16.20"
 
 [features]
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index ea89b523fc2..8c59ec67b3b 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -18,7 +18,7 @@ if-watch = "3.2.0"
 libc = "0.2.153"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-socket2 = { version = "0.5.6", features = ["all"] }
+socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { workspace = true, default-features = false, features = ["net"], optional = true }
 tracing = { workspace = true }
 

From 6276b0ef8e73d9f278b4a23a8b63720f6f02a9fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 08:52:46 +0000
Subject: [PATCH 257/455] deps: bump thiserror from 1.0.60 to 1.0.61

Pull-Request: #5399.
---
 Cargo.lock                                | 8 ++++----
 protocols/floodsub/Cargo.toml             | 2 +-
 transports/noise/Cargo.toml               | 2 +-
 transports/quic/Cargo.toml                | 2 +-
 transports/tls/Cargo.toml                 | 2 +-
 transports/websocket-websys/Cargo.toml    | 2 +-
 transports/webtransport-websys/Cargo.toml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5cccbe0d48..d8311e2db32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5970,18 +5970,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 3b1f1039875..8bcbc4a3557 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0.60"
+thiserror = "1.0.61"
 tracing = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 51f980b0e49..36013f077f2 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.60"
+thiserror = "1.0.61"
 tracing = { workspace = true }
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 90cbc1d260e..1270d89b61e 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.2"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.21.9", default-features = false }
-thiserror = "1.0.60"
+thiserror = "1.0.61"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.7"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 344780d9758..6fa9c426bad 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = "0.11.3"
 ring = { workspace = true }
-thiserror = "1.0.60"
+thiserror = "1.0.61"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.16.0"
 yasna = "0.5.2"
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 518c05519be..f2f9a6300d0 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = { workspace = true }
 parking_lot = "0.12.2"
 send_wrapper = "0.6.0"
-thiserror = "1.0.60"
+thiserror = "1.0.61"
 wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.69", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index c2c4fddbcf4..b039bedb182 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.60"
+thiserror = "1.0.61"
 tracing = { workspace = true }
 wasm-bindgen = "0.2.90"
 wasm-bindgen-futures = "0.4.42"

From 9254fff5d9e4d74a02de47f4943a7339b0053f2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 11:11:27 +0000
Subject: [PATCH 258/455] deps: bump trybuild from 1.0.95 to 1.0.96

Pull-Request: #5400.
---
 Cargo.lock       | 4 ++--
 swarm/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d8311e2db32..d29007c8038 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6353,9 +6353,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.95"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ddb747392ea12569d501a5bbca08852e4c8cd88b92566074b2243b8846f09e6"
+checksum = "33a5f13f11071020bb12de7a16b925d2d58636175c20c11dc5f96cb64bb6c9b3"
 dependencies = [
  "glob",
  "serde",
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 13fdfa3757e..5c4529b5f10 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -54,7 +54,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.95"
+trybuild = "1.0.96"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

From 9f7149d54958c06a72635b375d951d9c5ef643ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:06:11 +0000
Subject: [PATCH 259/455] deps: bump syn from 2.0.63 to 2.0.65

Pull-Request: #5401.
---
 Cargo.lock              | 58 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d29007c8038..df337ad99a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
  "synstructure 0.13.1",
 ]
 
@@ -247,7 +247,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -469,7 +469,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -486,7 +486,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -1254,7 +1254,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -1385,7 +1385,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -1490,7 +1490,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -3383,7 +3383,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -4189,7 +4189,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -4400,7 +4400,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -4597,7 +4597,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -4620,7 +4620,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -5143,7 +5143,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.63",
+ "syn 2.0.65",
  "walkdir",
 ]
 
@@ -5461,7 +5461,7 @@ checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -5494,7 +5494,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -5779,7 +5779,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -5829,9 +5829,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.63"
+version = "2.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
+checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5870,7 +5870,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -5985,7 +5985,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -6087,7 +6087,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -6274,7 +6274,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -6615,7 +6615,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
  "wasm-bindgen-shared",
 ]
 
@@ -6649,7 +6649,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6682,7 +6682,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -7290,7 +7290,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -7310,5 +7310,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.63",
+ "syn 2.0.65",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 407436766dc..215c5fc0311 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.63", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.65", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From 6f944595dea6390284c9d6d0e532858e57c37a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:18:22 +0000
Subject: [PATCH 260/455] deps: bump libc from 0.2.153 to 0.2.155

Pull-Request: #5403.
---
 Cargo.lock                | 4 ++--
 transports/tcp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df337ad99a2..9c6bfb0d999 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2610,9 +2610,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libp2p"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 8c59ec67b3b..cb19bdede3d 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -15,7 +15,7 @@ async-io = { version = "2.3.2", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0"
 if-watch = "3.2.0"
-libc = "0.2.153"
+libc = "0.2.155"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.7", features = ["all"] }

From 06c92d7be0e7e6f7bd41ed00baae5bd1365d5a77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:30:45 +0000
Subject: [PATCH 261/455] deps: bump proc-macro2 from 1.0.82 to 1.0.83

Pull-Request: #5405.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c6bfb0d999..99eac8b107a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4570,9 +4570,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
 dependencies = [
  "unicode-ident",
 ]

From 7b28c6614148a2a37b052ffd6bc070e0412cdf57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:42:23 +0000
Subject: [PATCH 262/455] deps: bump either from 1.11.0 to 1.12.0

Pull-Request: #5406.
---
 Cargo.lock                       | 4 ++--
 core/Cargo.toml                  | 2 +-
 examples/ipfs-private/Cargo.toml | 2 +-
 hole-punching-tests/Cargo.toml   | 2 +-
 interop-tests/Cargo.toml         | 2 +-
 protocols/dcutr/Cargo.toml       | 2 +-
 protocols/gossipsub/Cargo.toml   | 2 +-
 protocols/identify/Cargo.toml    | 2 +-
 protocols/kad/Cargo.toml         | 2 +-
 protocols/ping/Cargo.toml        | 2 +-
 protocols/relay/Cargo.toml       | 2 +-
 swarm/Cargo.toml                 | 4 ++--
 transports/websocket/Cargo.toml  | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 99eac8b107a..667f0371af0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1447,9 +1447,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "elliptic-curve"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index f06769ebb41..4eb9a55e904 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.11"
+either = "1.12"
 fnv = "1.0"
 futures = { workspace = true, features = ["executor", "thread-pool"] }
 futures-timer = "3"
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 8d3a49e85c0..da68256ce59 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
-either = "1.11"
+either = "1.12"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 074a09a4327..6f8fb0b377d 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -15,4 +15,4 @@ redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"
 tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.201", features = ["derive"] }
 serde_json = "1.0.117"
-either = "1.11.0"
+either = "1.12.0"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 091ecc86558..4277429e118 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 anyhow = "1"
-either = "1.11.0"
+either = "1.12.0"
 futures = { workspace = true }
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 7be4b01fef5..e1640a6f459 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-either = "1.11.0"
+either = "1.12.0"
 futures = { workspace = true }
 futures-timer = "3.0"
 instant = "0.1.12"
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index dbe9e6c161c..b50d65064be 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -18,7 +18,7 @@ asynchronous-codec = { workspace = true }
 base64 = "0.22.1"
 byteorder = "1.5.0"
 bytes = "1.6"
-either = "1.11"
+either = "1.12"
 fnv = "1.0.7"
 futures = { workspace = true }
 futures-ticker = "0.0.3"
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 626db2ab944..2717aefeced 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -25,7 +25,7 @@ smallvec = "1.13.2"
 thiserror = "1.0"
 tracing = { workspace = true }
 void = "1.0"
-either = "1.11.0"
+either = "1.12.0"
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index bf4caf28e97..9389518e9d1 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 arrayvec = "0.7.4"
 bytes = "1"
-either = "1.11"
+either = "1.12"
 fnv = "1.0"
 asynchronous-codec = { workspace = true }
 futures = { workspace = true }
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index eb08d21ca92..c12d21e7375 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.11.0"
+either = "1.12.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
 instant = "0.1.12"
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 35f404d89b4..6c9210d6b3d 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-either = "1.11.0"
+either = "1.12.0"
 futures = { workspace = true }
 futures-timer = "3"
 futures-bounded = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 5c4529b5f10..6efaa17db80 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.11.0"
+either = "1.12.0"
 fnv = "1.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
@@ -41,7 +41,7 @@ wasm-bindgen = ["dep:wasm-bindgen-futures", "dep:getrandom"]
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
-either = "1.11.0"
+either = "1.12.0"
 futures = { workspace = true }
 libp2p-identify = { path = "../protocols/identify" }                # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-identity = { workspace = true, features = ["ed25519"] }
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 806086a4369..de748131b81 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures-rustls = { workspace = true, features = ["ring"] }
-either = "1.11.0"
+either = "1.12.0"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

From f99301a550629266d6f3b5da0c164aa0e8c7716b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:54:20 +0000
Subject: [PATCH 263/455] deps: bump serde from 1.0.201 to 1.0.202

Pull-Request: #5407.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 667f0371af0..d55cbfcdd4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5446,18 +5446,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.201"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.201"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 6f8fb0b377d..627813e9d54 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
-serde = { version = "1.0.201", features = ["derive"] }
+serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0.117"
 either = "1.12.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 91845657526..cfe5c161cf4 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.201", features = ["derive"] }
+serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0.117"
 libp2p-core = { workspace = true }
 base64 = "0.22.1"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 3fb69fdf20f..0538e7d3b6d 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.201"
+serde = "1.0.202"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

From ad7ad5b3fc5b4bc9a431ece90e9a5ce8c33ca0e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 13:06:10 +0000
Subject: [PATCH 264/455] deps: bump instant from 0.1.12 to 0.1.13

Pull-Request: #5408.
---
 Cargo.lock                            | 4 ++--
 core/Cargo.toml                       | 2 +-
 interop-tests/Cargo.toml              | 2 +-
 misc/metrics/Cargo.toml               | 2 +-
 protocols/dcutr/Cargo.toml            | 2 +-
 protocols/gossipsub/Cargo.toml        | 2 +-
 protocols/kad/Cargo.toml              | 2 +-
 protocols/perf/Cargo.toml             | 2 +-
 protocols/ping/Cargo.toml             | 2 +-
 protocols/rendezvous/Cargo.toml       | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 swarm/Cargo.toml                      | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d55cbfcdd4f..1fb2d56368d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2416,9 +2416,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
  "js-sys",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4eb9a55e904..011b9e96c21 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.12"
 fnv = "1.0"
 futures = { workspace = true, features = ["executor", "thread-pool"] }
 futures-timer = "3"
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 4277429e118..278ac1b75a5 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -46,7 +46,7 @@ libp2p-webrtc-websys = { workspace = true }
 wasm-bindgen = { version = "0.2" }
 wasm-bindgen-futures = { version = "0.4" }
 wasm-logger = { version = "0.2.0" }
-instant = "0.1.12"
+instant = "0.1.13"
 reqwest = { version = "0.12", features = ["json"] }
 console_error_panic_hook = { version = "0.1.7" }
 futures-timer = "3.0.3"
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index 4901a3852d7..51da56db29f 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -20,7 +20,7 @@ relay = ["libp2p-relay"]
 
 [dependencies]
 futures = { workspace = true }
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }
 libp2p-gossipsub =  { workspace = true, optional = true }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index e1640a6f459..97823acbbc0 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -15,7 +15,7 @@ asynchronous-codec = { workspace = true }
 either = "1.12.0"
 futures = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index b50d65064be..39a838dc8bd 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -24,7 +24,7 @@ futures = { workspace = true }
 futures-ticker = "0.0.3"
 getrandom = "0.2.14"
 hex_fmt = "0.3.0"
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 9389518e9d1..e9067609502 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -29,7 +29,7 @@ smallvec = "1.13.2"
 uint = "0.9"
 void = "1.0"
 futures-timer = "3.0.3"
-instant = "0.1.12"
+instant = "0.1.13"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 thiserror = "1"
 tracing = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 9a3d0d57f02..2f1446f197c 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -16,7 +16,7 @@ clap = { version = "4.5.4", features = ["derive"] }
 futures = { workspace = true }
 futures-bounded = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p = { workspace = true, features = ["tokio", "tcp", "quic", "tls", "yamux", "dns"] }
 libp2p-core = { workspace = true }
 libp2p-dns = { workspace = true, features = ["tokio"] }
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index c12d21e7375..f959e2d5436 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 either = "1.12.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 0de7e5fc2d2..83b1e40af69 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -16,7 +16,7 @@ async-trait = "0.1"
 bimap = "0.6.3"
 futures = { workspace = true, features = ["std"] }
 futures-timer = "3.0.3"
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index f33ee9bb916..f04320ef6b7 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-trait = "0.1"
 cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
 futures = { workspace = true }
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 6efaa17db80..15797716603 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -16,7 +16,7 @@ fnv = "1.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
 getrandom = { version = "0.2.14", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
-instant = "0.1.12"
+instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }

From 6aaf284de47e37c528bceeb0eeaa7f09e48997ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 13:00:30 +0000
Subject: [PATCH 265/455] deps: bump anyhow from 1.0.83 to 1.0.86

Pull-Request: #5409.
---
 Cargo.lock                            | 4 ++--
 examples/browser-webrtc/Cargo.toml    | 2 +-
 examples/ipfs-kad/Cargo.toml          | 2 +-
 protocols/request-response/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fb2d56368d..bb5185446d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arbitrary"
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 87b4a955ed3..731ac289e66 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.83"
+anyhow = "1.0.86"
 futures = { workspace = true }
 rand = "0.8"
 tracing = { workspace = true }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index e2b3a2ae83b..61a1413edf5 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.10"
 futures = { workspace = true }
-anyhow = "1.0.83"
+anyhow = "1.0.86"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = { workspace = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index f04320ef6b7..1eb8c1ae95f 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -32,7 +32,7 @@ json = ["dep:serde", "dep:serde_json", "libp2p-swarm/macros"]
 cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 
 [dev-dependencies]
-anyhow = "1.0.83"
+anyhow = "1.0.86"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }

From 94fef37d9b2e66c25a2baab87ce74ac1adeee4fd Mon Sep 17 00:00:00 2001
From: William Blankenship <code@blankenship.io>
Date: Thu, 23 May 2024 09:08:55 -0600
Subject: [PATCH 266/455] deps(quic): update quinn to 0.11 and libp2p-tls to
 0.4.0

This PR updates the following dependencies `quic`:

* `quinn@0.10.2` -> `quinn@0.11.0`
* `rustls@0.21.9` -> `rustls@0.23.4`

Pull-Request: #5316.
---
 Cargo.lock                                   | 72 +++++++++-----------
 Cargo.toml                                   |  2 +-
 transports/quic/CHANGELOG.md                 |  4 ++
 transports/quic/Cargo.toml                   |  8 +--
 transports/quic/src/config.rs                | 18 +++--
 transports/quic/src/connection/connecting.rs |  3 +-
 transports/quic/src/connection/stream.rs     |  4 +-
 transports/quic/src/transport.rs             | 14 +++-
 transports/quic/tests/smoke.rs               |  2 +-
 9 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb5185446d8..05742c9a961 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1729,16 +1729,6 @@ dependencies = [
  "syn 2.0.65",
 ]
 
-[[package]]
-name = "futures-rustls"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
-dependencies = [
- "futures-io",
- "rustls 0.21.11",
-]
-
 [[package]]
 name = "futures-rustls"
 version = "0.26.0"
@@ -3203,14 +3193,14 @@ dependencies = [
  "libp2p-muxer-test-harness",
  "libp2p-noise",
  "libp2p-tcp",
- "libp2p-tls 0.3.0",
+ "libp2p-tls 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-yamux",
  "parking_lot",
  "quickcheck",
  "quinn",
  "rand 0.8.5",
- "ring 0.16.20",
- "rustls 0.21.11",
+ "ring 0.17.8",
+ "rustls 0.23.5",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -3423,41 +3413,41 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ce7e3c2e7569d685d08ec795157981722ff96e9e9f9eae75df3c29d02b07a5"
+version = "0.4.0"
 dependencies = [
  "futures",
- "futures-rustls 0.24.0",
- "libp2p-core 0.41.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-rustls",
+ "hex",
+ "hex-literal",
+ "libp2p-core 0.41.2",
  "libp2p-identity",
+ "libp2p-swarm",
+ "libp2p-yamux",
  "rcgen",
- "ring 0.16.20",
- "rustls 0.21.11",
+ "ring 0.17.8",
+ "rustls 0.23.5",
  "rustls-webpki 0.101.7",
  "thiserror",
- "x509-parser 0.15.1",
+ "tokio",
+ "x509-parser 0.16.0",
  "yasna",
 ]
 
 [[package]]
 name = "libp2p-tls"
 version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "251b17aebdd29df7e8f80e4d94b782fae42e934c49086e1a81ba23b60a8314f2"
 dependencies = [
  "futures",
- "futures-rustls 0.26.0",
- "hex",
- "hex-literal",
- "libp2p-core 0.41.2",
+ "futures-rustls",
+ "libp2p-core 0.41.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-identity",
- "libp2p-swarm",
- "libp2p-yamux",
  "rcgen",
  "ring 0.17.8",
  "rustls 0.23.5",
  "rustls-webpki 0.101.7",
  "thiserror",
- "tokio",
  "x509-parser 0.16.0",
  "yasna",
 ]
@@ -3566,7 +3556,7 @@ dependencies = [
  "async-std",
  "either",
  "futures",
- "futures-rustls 0.26.0",
+ "futures-rustls",
  "libp2p-core 0.41.2",
  "libp2p-dns",
  "libp2p-identity",
@@ -4673,11 +4663,11 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
+checksum = "4bb80dc034523335a9fcc34271931dd97e9132d1fb078695db500339eb72e712"
 dependencies = [
- "async-io 1.13.0",
+ "async-io 2.3.2",
  "async-std",
  "bytes",
  "futures-io",
@@ -4685,7 +4675,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.21.11",
+ "rustls 0.23.5",
  "thiserror",
  "tokio",
  "tracing",
@@ -4693,15 +4683,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.10.5"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1"
+checksum = "a063a47a1aaee4b3b1c2dd44edb7867c10107a2ef171f3543ac40ec5e9092002"
 dependencies = [
  "bytes",
  "rand 0.8.5",
- "ring 0.16.20",
+ "ring 0.17.8",
  "rustc-hash",
- "rustls 0.21.11",
+ "rustls 0.23.5",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4710,15 +4700,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0"
+checksum = "cb7ad7bc932e4968523fa7d9c320ee135ff779de720e9350fee8728838551764"
 dependencies = [
- "bytes",
  "libc",
+ "once_cell",
  "socket2 0.5.7",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index a0218cd5e75..805661b26d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -105,8 +105,8 @@ libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
-libp2p-tls = { version = "0.4.0", path = "transports/tls" }
 libp2p-tcp = { version = "0.41.1", path = "transports/tcp" }
+libp2p-tls = { version = "0.4.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md
index cd0146afbb2..3ec52ec0ddb 100644
--- a/transports/quic/CHANGELOG.md
+++ b/transports/quic/CHANGELOG.md
@@ -1,4 +1,8 @@
 ## 0.10.3
+
+- Update `quinn` to 0.11 and `libp2p-tls` to 0.4.0.
+  See [PR 5316](https://github.com/libp2p/rust-libp2p/pull/5316)
+
 - Allow configuring MTU discovery upper bound.
   See [PR 5386](https://github.com/libp2p/rust-libp2p/pull/5386).
 
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 1270d89b61e..4a935de585b 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -15,17 +15,17 @@ futures = { workspace = true }
 futures-timer = "3.0.3"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
-libp2p-tls = "0.3.0"
+libp2p-tls = "0.4.0"
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.2"
-quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
+quinn = { version = "0.11.0", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
-rustls = { version = "0.21.9", default-features = false }
+rustls = { version = "0.23.5", default-features = false }
 thiserror = "1.0.61"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.7"
-ring = "0.16.20"
+ring = { workspace = true }
 
 [features]
 tokio = ["dep:tokio", "if-watch/tokio", "quinn/runtime-tokio"]
diff --git a/transports/quic/src/config.rs b/transports/quic/src/config.rs
index c5189ce36cd..2456ed3e36f 100644
--- a/transports/quic/src/config.rs
+++ b/transports/quic/src/config.rs
@@ -18,7 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use quinn::{MtuDiscoveryConfig, VarInt};
+use quinn::{
+    crypto::rustls::{QuicClientConfig, QuicServerConfig},
+    MtuDiscoveryConfig, VarInt,
+};
 use std::{sync::Arc, time::Duration};
 
 /// Config for the transport.
@@ -58,9 +61,9 @@ pub struct Config {
     pub support_draft_29: bool,
 
     /// TLS client config for the inner [`quinn::ClientConfig`].
-    client_tls_config: Arc<rustls::ClientConfig>,
+    client_tls_config: Arc<QuicClientConfig>,
     /// TLS server config for the inner [`quinn::ServerConfig`].
-    server_tls_config: Arc<rustls::ServerConfig>,
+    server_tls_config: Arc<QuicServerConfig>,
     /// Libp2p identity of the node.
     keypair: libp2p_identity::Keypair,
 
@@ -71,8 +74,13 @@ pub struct Config {
 impl Config {
     /// Creates a new configuration object with default values.
     pub fn new(keypair: &libp2p_identity::Keypair) -> Self {
-        let client_tls_config = Arc::new(libp2p_tls::make_client_config(keypair, None).unwrap());
-        let server_tls_config = Arc::new(libp2p_tls::make_server_config(keypair).unwrap());
+        let client_tls_config = Arc::new(
+            QuicClientConfig::try_from(libp2p_tls::make_client_config(keypair, None).unwrap())
+                .unwrap(),
+        );
+        let server_tls_config = Arc::new(
+            QuicServerConfig::try_from(libp2p_tls::make_server_config(keypair).unwrap()).unwrap(),
+        );
         Self {
             client_tls_config,
             server_tls_config,
diff --git a/transports/quic/src/connection/connecting.rs b/transports/quic/src/connection/connecting.rs
index 141f0b5542e..f6e397b4d1e 100644
--- a/transports/quic/src/connection/connecting.rs
+++ b/transports/quic/src/connection/connecting.rs
@@ -28,6 +28,7 @@ use futures::{
 };
 use futures_timer::Delay;
 use libp2p_identity::PeerId;
+use quinn::rustls::pki_types::CertificateDer;
 use std::{
     pin::Pin,
     task::{Context, Poll},
@@ -55,7 +56,7 @@ impl Connecting {
         let identity = connection
             .peer_identity()
             .expect("connection got identity because it passed TLS handshake; qed");
-        let certificates: Box<Vec<rustls::Certificate>> =
+        let certificates: Box<Vec<CertificateDer>> =
             identity.downcast().expect("we rely on rustls feature; qed");
         let end_entity = certificates
             .first()
diff --git a/transports/quic/src/connection/stream.rs b/transports/quic/src/connection/stream.rs
index b0c505bf856..ed3a71ea496 100644
--- a/transports/quic/src/connection/stream.rs
+++ b/transports/quic/src/connection/stream.rs
@@ -67,7 +67,9 @@ impl AsyncWrite for Stream {
         cx: &mut Context,
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut self.send).poll_write(cx, buf)
+        Pin::new(&mut self.send)
+            .poll_write(cx, buf)
+            .map_err(Into::into)
     }
 
     fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
diff --git a/transports/quic/src/transport.rs b/transports/quic/src/transport.rs
index c33931fc798..9bd4c035cec 100644
--- a/transports/quic/src/transport.rs
+++ b/transports/quic/src/transport.rs
@@ -425,7 +425,7 @@ struct Listener<P: Provider> {
     socket: UdpSocket,
 
     /// A future to poll new incoming connections.
-    accept: BoxFuture<'static, Option<quinn::Connecting>>,
+    accept: BoxFuture<'static, Option<quinn::Incoming>>,
     /// Timeout for connection establishment on inbound connections.
     handshake_timeout: Duration,
 
@@ -583,10 +583,20 @@ impl<P: Provider> Stream for Listener<P> {
             }
 
             match self.accept.poll_unpin(cx) {
-                Poll::Ready(Some(connecting)) => {
+                Poll::Ready(Some(incoming)) => {
                     let endpoint = self.endpoint.clone();
                     self.accept = async move { endpoint.accept().await }.boxed();
 
+                    let connecting = match incoming.accept() {
+                        Ok(connecting) => connecting,
+                        Err(error) => {
+                            return Poll::Ready(Some(TransportEvent::ListenerError {
+                                listener_id: self.listener_id,
+                                error: Error::Connection(crate::ConnectionError(error)),
+                            }))
+                        }
+                    };
+
                     let local_addr = socketaddr_to_multiaddr(&self.socket_addr(), self.version);
                     let remote_addr = connecting.remote_address();
                     let send_back_addr = socketaddr_to_multiaddr(&remote_addr, self.version);
diff --git a/transports/quic/tests/smoke.rs b/transports/quic/tests/smoke.rs
index 36fb72a5ee7..74423076780 100644
--- a/transports/quic/tests/smoke.rs
+++ b/transports/quic/tests/smoke.rs
@@ -408,7 +408,7 @@ async fn write_after_peer_dropped_stream() {
         .try_init();
     let (stream_a, mut stream_b) = build_streams::<quic::async_std::Provider>().await;
     drop(stream_a);
-    futures_timer::Delay::new(Duration::from_millis(1)).await;
+    futures_timer::Delay::new(Duration::from_millis(10)).await;
 
     let data = vec![0; 10];
     stream_b.write_all(&data).await.expect("Write failed.");

From b83d3ce762caa70d473de5b4b03349b089fa513e Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Sun, 26 May 2024 19:45:50 +0300
Subject: [PATCH 267/455] chore(webtransport-websys): Change logs to debug
 level

When you enable Kademlia in a large network that uses multiple type of transports, then this log creates a very noisy console and makes meaningful logs hard to see.

We can also remove the log entirely if you prefer. Check: https://github.com/libp2p/rust-libp2p/pull/4015#discussion_r1229951440, https://github.com/libp2p/rust-libp2p/issues/4072, https://github.com/libp2p/rust-libp2p/pull/4133

Pull-Request: #5396.
---
 Cargo.lock                                      | 2 +-
 Cargo.toml                                      | 2 +-
 transports/webtransport-websys/CHANGELOG.md     | 7 +++++--
 transports/webtransport-websys/Cargo.toml       | 2 +-
 transports/webtransport-websys/src/transport.rs | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 05742c9a961..87a27d282fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3592,7 +3592,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webtransport-websys"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "futures",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 805661b26d7..aa82f5fa12d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -114,7 +114,7 @@ libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.43.0", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.2.1", path = "transports/webtransport-websys" }
+libp2p-webtransport-websys = { version = "0.3.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.45.1", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
index 91749001010..0409819a63f 100644
--- a/transports/webtransport-websys/CHANGELOG.md
+++ b/transports/webtransport-websys/CHANGELOG.md
@@ -1,7 +1,10 @@
-## 0.2.1 
+## 0.3.0
 
 * Fix unhandled exceptions thrown when calling `Webtransport::close`.
-  See [PR 5390](https://github.com/libp2p/rust-libp2p/pull/5390)
+  See [PR 5390](https://github.com/libp2p/rust-libp2p/pull/5390).
+* Change logs to debug level.
+  See [PR 5396](https://github.com/libp2p/rust-libp2p/pull/5396).
+
 
 ## 0.2.0
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index b039bedb182..3defdce5203 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-webtransport-websys"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebTransport for libp2p under WASM environment"
-version = "0.2.1"
+version = "0.3.0"
 authors = [
     "Yiannis Marangos <yiannis@eiger.co>",
     "oblique <psyberbits@gmail.com>",
diff --git a/transports/webtransport-websys/src/transport.rs b/transports/webtransport-websys/src/transport.rs
index cb556ffef99..3f14f3e476b 100644
--- a/transports/webtransport-websys/src/transport.rs
+++ b/transports/webtransport-websys/src/transport.rs
@@ -65,7 +65,7 @@ impl libp2p_core::Transport for Transport {
     fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
         let endpoint = Endpoint::from_multiaddr(&addr).map_err(|e| match e {
             e @ Error::InvalidMultiaddr(_) => {
-                tracing::warn!("{}", e);
+                tracing::debug!("{}", e);
                 TransportError::MultiaddrNotSupported(addr)
             }
             e => TransportError::Other(e),

From bf3e2682ee41d0428b8b04977e0e799fcb870e2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 08:52:41 +0000
Subject: [PATCH 268/455] deps: bump getrandom from 0.2.14 to 0.2.15

Pull-Request: #5420.
---
 Cargo.lock                               | 22 +++++++++++-----------
 protocols/gossipsub/Cargo.toml           |  2 +-
 swarm/Cargo.toml                         |  2 +-
 transports/webrtc-websys/Cargo.toml      |  2 +-
 wasm-tests/webtransport-tests/Cargo.toml |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 87a27d282fe..8cf90dcb6e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1827,9 +1827,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2615,7 +2615,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-autonat",
@@ -2853,7 +2853,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-ticker",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "hex",
  "hex_fmt",
  "instant",
@@ -3341,7 +3341,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-timer",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "instant",
  "libp2p-core 0.41.2",
  "libp2p-identify",
@@ -3535,7 +3535,7 @@ version = "0.3.0-alpha"
 dependencies = [
  "bytes",
  "futures",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "hex",
  "js-sys",
  "libp2p-core 0.41.2",
@@ -4779,7 +4779,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -4869,7 +4869,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "redox_syscall 0.2.16",
  "thiserror",
 ]
@@ -5034,7 +5034,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -6505,7 +6505,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -6931,7 +6931,7 @@ name = "webtransport-tests"
 version = "0.1.0"
 dependencies = [
  "futures",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "libp2p-core 0.41.2",
  "libp2p-identity",
  "libp2p-noise",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 39a838dc8bd..9439c0b2e8a 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -22,7 +22,7 @@ either = "1.12"
 fnv = "1.0.7"
 futures = { workspace = true }
 futures-ticker = "0.0.3"
-getrandom = "0.2.14"
+getrandom = "0.2.15"
 hex_fmt = "0.3.0"
 instant = "0.1.13"
 libp2p-core = { workspace = true }
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 15797716603..b841246aef5 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.12.0"
 fnv = "1.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
-getrandom = { version = "0.2.14", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
+getrandom = { version = "0.2.15", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.13"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index e1590404fda..4a8b8dfcdf0 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -14,7 +14,7 @@ publish = true
 [dependencies]
 bytes = "1"
 futures = { workspace = true }
-getrandom = { version = "0.2.14", features = ["js"] }
+getrandom = { version = "0.2.15", features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
 libp2p-core = { workspace = true }
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index 2ea3745ee80..cf51a510a3f 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 futures = { workspace = true }
-getrandom = { version = "0.2.14", features = ["js"] }
+getrandom = { version = "0.2.15", features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-noise = { workspace = true }

From 5b419a873708f9a7d6e9609641b7e15faa11b865 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 09:11:20 +0000
Subject: [PATCH 269/455] deps: bump syn from 2.0.65 to 2.0.66

Pull-Request: #5421.
---
 Cargo.lock              | 58 ++++++++++++++++++++---------------------
 swarm-derive/Cargo.toml |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8cf90dcb6e5..5bc842af42f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,7 +224,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
  "synstructure 0.13.1",
 ]
 
@@ -247,7 +247,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -469,7 +469,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -486,7 +486,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1254,7 +1254,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1385,7 +1385,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1490,7 +1490,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1726,7 +1726,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3373,7 +3373,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4179,7 +4179,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4390,7 +4390,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4587,7 +4587,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4610,7 +4610,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5133,7 +5133,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.65",
+ "syn 2.0.66",
  "walkdir",
 ]
 
@@ -5451,7 +5451,7 @@ checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5484,7 +5484,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5769,7 +5769,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5819,9 +5819,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.65"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5860,7 +5860,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5975,7 +5975,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6077,7 +6077,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6264,7 +6264,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6605,7 +6605,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
@@ -6639,7 +6639,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6672,7 +6672,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -7280,7 +7280,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -7300,5 +7300,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 215c5fc0311..d4b596a12cf 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.5"
 quote = "1.0"
-syn = { version = "2.0.65", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.66", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.

From b57c85cab0a77cc2b1b9195793530b5cc7d16425 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 09:47:51 +0000
Subject: [PATCH 270/455] deps: bump quinn from 0.11.0 to 0.11.1

Pull-Request: #5426.
---
 Cargo.lock                 | 8 ++++----
 transports/quic/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5bc842af42f..e78e8227836 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4663,9 +4663,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb80dc034523335a9fcc34271931dd97e9132d1fb078695db500339eb72e712"
+checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73"
 dependencies = [
  "async-io 2.3.2",
  "async-std",
@@ -4683,9 +4683,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a063a47a1aaee4b3b1c2dd44edb7867c10107a2ef171f3543ac40ec5e9092002"
+checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08"
 dependencies = [
  "bytes",
  "rand 0.8.5",
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 4a935de585b..bc8f8ffe67a 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 libp2p-tls = "0.4.0"
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.2"
-quinn = { version = "0.11.0", default-features = false, features = ["rustls", "futures-io"] }
+quinn = { version = "0.11.1", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.5", default-features = false }
 thiserror = "1.0.61"

From a8888a7978f08ec9b8762207bf166193bf312b94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 10:01:09 +0000
Subject: [PATCH 271/455] deps: bump proc-macro2 from 1.0.83 to 1.0.84

Pull-Request: #5427.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e78e8227836..d2d04cf19aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4560,9 +4560,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.83"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
 dependencies = [
  "unicode-ident",
 ]

From 75288cac5e3a4c52736d56da9071177f872f3a0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 14:40:36 +0000
Subject: [PATCH 272/455] deps: bump rustls from 0.23.5 to 0.23.8

Pull-Request: #5423.
---
 Cargo.lock                 | 28 ++++++++++++++--------------
 transports/quic/Cargo.toml |  2 +-
 transports/tls/Cargo.toml  |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d2d04cf19aa..9e6fc36f8d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1736,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.5",
+ "rustls 0.23.8",
  "rustls-pki-types",
 ]
 
@@ -3200,7 +3200,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustls 0.23.5",
+ "rustls 0.23.8",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -3425,7 +3425,7 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.23.5",
+ "rustls 0.23.8",
  "rustls-webpki 0.101.7",
  "thiserror",
  "tokio",
@@ -3445,7 +3445,7 @@ dependencies = [
  "libp2p-identity",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.23.5",
+ "rustls 0.23.8",
  "rustls-webpki 0.101.7",
  "thiserror",
  "x509-parser 0.16.0",
@@ -4675,7 +4675,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.5",
+ "rustls 0.23.8",
  "thiserror",
  "tokio",
  "tracing",
@@ -4691,7 +4691,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash",
- "rustls 0.23.5",
+ "rustls 0.23.8",
  "slab",
  "thiserror",
  "tinyvec",
@@ -5226,21 +5226,21 @@ dependencies = [
  "log",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.2",
+ "rustls-webpki 0.102.4",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.5"
+version = "0.23.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e"
+checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740"
 dependencies = [
  "once_cell",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.2",
+ "rustls-webpki 0.102.4",
  "subtle",
  "zeroize",
 ]
@@ -5257,9 +5257,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.4.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
@@ -5273,9 +5273,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.2"
+version = "0.102.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
 dependencies = [
  "ring 0.17.8",
  "rustls-pki-types",
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index bc8f8ffe67a..40af89b65c8 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-identity = { workspace = true }
 parking_lot = "0.12.2"
 quinn = { version = "0.11.1", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
-rustls = { version = "0.23.5", default-features = false }
+rustls = { version = "0.23.8", default-features = false }
 thiserror = "1.0.61"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 6fa9c426bad..cca7faf829f 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -22,7 +22,7 @@ yasna = "0.5.2"
 
 # Exposed dependencies. Breaking changes to these are breaking changes to us.
 [dependencies.rustls]
-version = "0.23.4"
+version = "0.23.8"
 default-features = false
 features = ["ring", "std"] # Must enable this to allow for custom verification code.
 

From 38f8f21451be8bce45f14a05a048b53fd4481111 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Fri, 31 May 2024 01:28:38 +0300
Subject: [PATCH 273/455] fix(interop-tests): Update chrome container

Pull-Request: #5431.
---
 interop-tests/Dockerfile.chromium  | 2 +-
 interop-tests/src/bin/wasm_ping.rs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/interop-tests/Dockerfile.chromium b/interop-tests/Dockerfile.chromium
index 04af84fdc46..a6b0fc89e82 100644
--- a/interop-tests/Dockerfile.chromium
+++ b/interop-tests/Dockerfile.chromium
@@ -20,7 +20,7 @@ COPY . .
 RUN wasm-pack build --target web interop-tests
 RUN RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --package interop-tests --target x86_64-unknown-linux-gnu --bin wasm_ping
 
-FROM selenium/standalone-chrome:115.0
+FROM selenium/standalone-chrome:125.0
 COPY --from=builder /app/target/x86_64-unknown-linux-gnu/release/wasm_ping /usr/local/bin/testplan
 ENV RUST_BACKTRACE=1
 ENTRYPOINT ["testplan"]
diff --git a/interop-tests/src/bin/wasm_ping.rs b/interop-tests/src/bin/wasm_ping.rs
index e1bb2ea49fb..706fad21039 100644
--- a/interop-tests/src/bin/wasm_ping.rs
+++ b/interop-tests/src/bin/wasm_ping.rs
@@ -130,6 +130,8 @@ async fn open_in_browser() -> Result<(Child, WebDriver)> {
     // run a webdriver client
     let mut caps = DesiredCapabilities::chrome();
     caps.set_headless()?;
+    caps.set_disable_dev_shm_usage()?;
+    caps.set_no_sandbox()?;
     let driver = WebDriver::new("http://localhost:45782", caps).await?;
     // go to the wasm test service
     driver.goto(format!("http://{BIND_ADDR}")).await?;

From 8c291fe891dd50610e5dc01353f0e2fd194b086f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 10:46:23 +0000
Subject: [PATCH 274/455] deps: bump tj-actions/glob from 21 to 22

Pull-Request: #5358.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c489d3f5771..87987489450 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -370,7 +370,7 @@ jobs:
       - run: cargo install --version 0.10.0 pb-rs --locked
 
       - name: Glob match
-        uses: tj-actions/glob@v21
+        uses: tj-actions/glob@v22
         id: glob
         with:
           files: |

From 796705cdadee5f996b13f8fe15a4366019fcc12f Mon Sep 17 00:00:00 2001
From: NinaLua <168073229+NinaLua@users.noreply.github.com>
Date: Sun, 2 Jun 2024 00:05:08 +0800
Subject: [PATCH 275/455] chore: fix some typos in comment

fix some typos in comment

Pull-Request: #5348.
---
 protocols/gossipsub/src/behaviour/tests.rs | 2 +-
 transports/websocket/src/framed.rs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 3cf61f9bb41..6cad719b5ab 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -4546,7 +4546,7 @@ fn test_limit_number_of_message_ids_inside_ihave() {
     //emit gossip
     gs.emit_gossip();
 
-    // both peers should have gotten 100 random ihave messages, to asser the randomness, we
+    // both peers should have gotten 100 random ihave messages, to assert the randomness, we
     // assert that both have not gotten the same set of messages, but have an intersection
     // (which is the case with very high probability, the probabiltity of failure is < 10^-58).
 
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 26634df9830..f6f99d18580 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -511,7 +511,7 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
             Some(Protocol::Ws(path)) => break (false, path.into_owned()),
             Some(Protocol::Wss(path)) => {
                 if dns_name.is_none() {
-                    tracing::debug!(addrress=%addr, "Missing DNS name in WSS address");
+                    tracing::debug!(address=%addr, "Missing DNS name in WSS address");
                     return Err(Error::InvalidMultiaddr(addr));
                 }
                 break (true, path.into_owned());

From 914e9c811aaca5924640328c884123ed039bd18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20=C3=96zkan?= <work@onurozkan.dev>
Date: Sat, 1 Jun 2024 19:25:18 +0300
Subject: [PATCH 276/455] deps: deduplicate dependencies

Helps to reduce number of dependencies by removing duplicated ones.

Pull-Request: #5318.
---
 Cargo.lock | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9e6fc36f8d7..820c602f822 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -64,15 +64,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.0.2"
@@ -1862,11 +1853,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "bstr",
  "fnv",
  "log",
@@ -4880,7 +4871,7 @@ version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
  "regex-automata 0.4.4",
  "regex-syntax 0.8.2",
@@ -4901,7 +4892,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
  "regex-syntax 0.8.2",
 ]

From d8a3e45bd48596948583ce734ac55c4acfea1944 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 18:08:05 +0000
Subject: [PATCH 277/455] deps: bump parking_lot from 0.12.2 to 0.12.3

Pull-Request: #5425.
---
 Cargo.lock                             | 4 ++--
 core/Cargo.toml                        | 2 +-
 transports/dns/Cargo.toml              | 2 +-
 transports/quic/Cargo.toml             | 2 +-
 transports/websocket-websys/Cargo.toml | 2 +-
 transports/websocket/Cargo.toml        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 820c602f822..62437579082 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4312,9 +4312,9 @@ checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 011b9e96c21..5b3fbe32d0b 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -21,7 +21,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 multistream-select = { workspace = true }
 once_cell = "1.19.0"
-parking_lot = "0.12.2"
+parking_lot = "0.12.3"
 pin-project = "1.1.5"
 quick-protobuf = "0.8"
 rand = "0.8"
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 78adccc6069..f7014994587 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -16,7 +16,7 @@ async-trait = "0.1.80"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.2"
+parking_lot = "0.12.3"
 hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
 smallvec = "1.13.2"
 tracing = { workspace = true }
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 40af89b65c8..20533629404 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -17,7 +17,7 @@ if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-tls = "0.4.0"
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.2"
+parking_lot = "0.12.3"
 quinn = { version = "0.11.1", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.8", default-features = false }
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index f2f9a6300d0..48bf8d9818a 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -16,7 +16,7 @@ futures = { workspace = true }
 js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 tracing = { workspace = true }
-parking_lot = "0.12.2"
+parking_lot = "0.12.3"
 send_wrapper = "0.6.0"
 thiserror = "1.0.61"
 wasm-bindgen = "0.2.90"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index de748131b81..7b83d8284bd 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -16,7 +16,7 @@ either = "1.12.0"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.2"
+parking_lot = "0.12.3"
 pin-project-lite = "0.2.14"
 rw-stream-sink = { workspace = true }
 soketto = "0.8.0"

From fe4f55e4921f64e71dd6a5e673613d8baea20399 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:11:04 +0000
Subject: [PATCH 278/455] deps: bump proc-macro2 from 1.0.84 to 1.0.85

Pull-Request: #5434.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62437579082..a9ea5787a7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4551,9 +4551,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.84"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]

From 83facf344c173fa6afee10665689e518c955c489 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:25:28 +0000
Subject: [PATCH 279/455] deps: bump serde from 1.0.202 to 1.0.203

Pull-Request: #5422.
---
 Cargo.lock                     | 8 ++++----
 hole-punching-tests/Cargo.toml | 2 +-
 misc/keygen/Cargo.toml         | 2 +-
 misc/server/Cargo.toml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a9ea5787a7a..0fd87a2c2c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5427,18 +5427,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 627813e9d54..22edd8e95ca 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -13,6 +13,6 @@ libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros
 tracing = { workspace = true }
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
-serde = { version = "1.0.202", features = ["derive"] }
+serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 either = "1.12.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index cfe5c161cf4..22b546aff10 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.202", features = ["derive"] }
+serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 libp2p-core = { workspace = true }
 base64 = "0.22.1"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 0538e7d3b6d..072b99bf788 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
 prometheus-client = { workspace = true }
-serde = "1.0.202"
+serde = "1.0.203"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

From 8607888c617c711fd9b2e9b5ed22a4f6bc03361b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:39:57 +0000
Subject: [PATCH 280/455] deps: bump async-io from 2.3.2 to 2.3.3

Pull-Request: #5436.
---
 Cargo.lock                | 12 ++++++------
 protocols/mdns/Cargo.toml |  2 +-
 transports/tcp/Cargo.toml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0fd87a2c2c3..0e7faca0b3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -331,9 +331,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
 dependencies = [
  "async-lock 3.1.0",
  "cfg-if",
@@ -2332,7 +2332,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io 2.3.2",
+ "async-io 2.3.3",
  "core-foundation",
  "fnv",
  "futures",
@@ -2960,7 +2960,7 @@ dependencies = [
 name = "libp2p-mdns"
 version = "0.45.1"
 dependencies = [
- "async-io 2.3.2",
+ "async-io 2.3.3",
  "async-std",
  "data-encoding",
  "futures",
@@ -3388,7 +3388,7 @@ dependencies = [
 name = "libp2p-tcp"
 version = "0.41.1"
 dependencies = [
- "async-io 2.3.2",
+ "async-io 2.3.3",
  "async-std",
  "futures",
  "futures-timer",
@@ -4658,7 +4658,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73"
 dependencies = [
- "async-io 2.3.2",
+ "async-io 2.3.3",
  "async-std",
  "bytes",
  "futures-io",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index fb96acc7dc0..c939a828d61 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
-async-io  = { version = "2.3.2", optional = true }
+async-io  = { version = "2.3.3", optional = true }
 data-encoding = "2.6.0"
 futures = { workspace = true }
 if-watch = "3.2.0"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index cb19bdede3d..648a88d6fed 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-io = { version = "2.3.2", optional = true }
+async-io = { version = "2.3.3", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0"
 if-watch = "3.2.0"

From 1987d96d4b203ffc56e136281f5d2bc51bbf130e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:54:15 +0000
Subject: [PATCH 281/455] deps: bump tokio from 1.37.0 to 1.38.0

Pull-Request: #5437.
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0e7faca0b3c..1984b4fdf67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6033,9 +6033,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6062,9 +6062,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index aa82f5fa12d..8ef9a500820 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -124,7 +124,7 @@ quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 unsigned-varint = { version = "0.8.0" }
-tokio = { version = "1.37", default-features = false }
+tokio = { version = "1.38", default-features = false }
 tracing = "0.1.37"
 futures = "0.3.30"
 ring = "0.17.8"

From 3185fb991e2163fcde185d63f97bd85ab2d57234 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:49:35 +0000
Subject: [PATCH 282/455] deps: bump zeroize from 1.7.0 to 1.8.1

Pull-Request: #5424.
---
 Cargo.lock          | 4 ++--
 identity/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1984b4fdf67..980d9553830 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7276,9 +7276,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 2e3a75475a1..e7d464a520a 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -27,7 +27,7 @@ serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = { version = "0.10.8", optional = true }
 thiserror = { version = "1.0", optional = true }
 void = { version = "1.0", optional = true }
-zeroize = { version = "1.7", optional = true }
+zeroize = { version = "1.8", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 ring = { workspace = true, features = ["alloc", "std"], optional = true }

From 2c5a979a96b3c077a296646b7668bba4a84de5ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:27:02 +0000
Subject: [PATCH 283/455] deps: bump the opentelemetry group across 1 directory
 with 4 updates

Pull-Request: #5435.
---
 Cargo.lock                  | 36 +++++++++++-------------------------
 examples/metrics/Cargo.toml |  8 ++++----
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 980d9553830..df310ead72e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4193,9 +4193,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
+checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -4203,21 +4203,19 @@ dependencies = [
  "once_cell",
  "pin-project-lite",
  "thiserror",
- "urlencoding",
 ]
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb"
+checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54"
 dependencies = [
  "async-trait",
  "futures-core",
  "http 0.2.9",
  "opentelemetry",
  "opentelemetry-proto",
- "opentelemetry-semantic-conventions",
  "opentelemetry_sdk",
  "prost",
  "thiserror",
@@ -4227,9 +4225,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4"
+checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
@@ -4237,24 +4235,18 @@ dependencies = [
  "tonic",
 ]
 
-[[package]]
-name = "opentelemetry-semantic-conventions"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910"
-
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e"
+checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd"
 dependencies = [
  "async-trait",
- "crossbeam-channel",
  "futures-channel",
  "futures-executor",
  "futures-util",
  "glob",
+ "lazy_static",
  "once_cell",
  "opentelemetry",
  "ordered-float",
@@ -6281,9 +6273,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284"
+checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4"
 dependencies = [
  "js-sys",
  "once_cell",
@@ -6478,12 +6470,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 214b4450de7..f75e6c0a564 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -12,13 +12,13 @@ release = false
 futures = { workspace = true }
 axum = "0.7"
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
-opentelemetry = { version = "0.22.0", features = ["metrics"] }
-opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
-opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "metrics"] }
+opentelemetry = { version = "0.23.0", features = ["metrics"] }
+opentelemetry-otlp = { version = "0.16.0", features = ["metrics"] }
+opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
-tracing-opentelemetry = "0.23.0"
+tracing-opentelemetry = "0.24.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints]

From 68301b8db54816a616900d088342010fd0493a29 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Tue, 4 Jun 2024 13:02:16 +0300
Subject: [PATCH 284/455] fix(request-response): Report dial IO errors to the
 user

This fixes a potential infinite retrying when dialing bad peers. The error is now reported to the user and they should handle it as they see fit for their case.

Pull-Request: #5429.
---
 Cargo.lock                                | 2 +-
 Cargo.toml                                | 2 +-
 protocols/request-response/CHANGELOG.md   | 5 +++++
 protocols/request-response/Cargo.toml     | 2 +-
 protocols/request-response/src/handler.rs | 9 ++++-----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df310ead72e..f526b1983bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3260,7 +3260,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "anyhow",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 8ef9a500820..18b09e388c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,7 +99,7 @@ libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.3", path = "transports/quic" }
 libp2p-relay = { version = "0.17.2", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
+libp2p-request-response = { version = "0.26.3", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.44.2", path = "swarm" }
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index 92417508786..4d2a29ac92c 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.26.3
+
+- Report dial IO errors to the user.
+  See [PR 5429](https://github.com/libp2p/rust-libp2p/pull/5429).
+
 ## 0.26.2
 
 - Deprecate `Behaviour::add_address` in favor of `Swarm::add_peer_address`.
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 1eb8c1ae95f..d621e477bfb 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-request-response"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Generic Request/Response Protocols"
-version = "0.26.2"
+version = "0.26.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/request-response/src/handler.rs b/protocols/request-response/src/handler.rs
index 2d45e0d7dc3..96b6217b12a 100644
--- a/protocols/request-response/src/handler.rs
+++ b/protocols/request-response/src/handler.rs
@@ -236,11 +236,10 @@ where
             }
             StreamUpgradeError::Apply(e) => void::unreachable(e),
             StreamUpgradeError::Io(e) => {
-                tracing::debug!(
-                    "outbound stream for request {} failed: {e}, retrying",
-                    message.request_id
-                );
-                self.requested_outbound.push_back(message);
+                self.pending_events.push_back(Event::OutboundStreamFailed {
+                    request_id: message.request_id,
+                    error: e,
+                });
             }
         }
     }

From af42122f61d0d7be9e4b0ccdadbde0cc1e0f5c9c Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Tue, 4 Jun 2024 17:18:55 +0300
Subject: [PATCH 285/455] fix(request-response): Report failure when streams
 are at capacity

Fixes potential hanging issue if use relies on response or failures to make progress

Pull-Request: #5417.
---
 protocols/request-response/CHANGELOG.md       |  3 +
 protocols/request-response/src/handler.rs     |  8 ++-
 .../request-response/tests/error_reporting.rs | 67 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index 4d2a29ac92c..e9d92b08857 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 0.26.3
 
+- Report failure when streams are at capacity.
+  See [PR 5417](https://github.com/libp2p/rust-libp2p/pull/5417).
+
 - Report dial IO errors to the user.
   See [PR 5429](https://github.com/libp2p/rust-libp2p/pull/5429).
 
diff --git a/protocols/request-response/src/handler.rs b/protocols/request-response/src/handler.rs
index 96b6217b12a..f0467593f85 100644
--- a/protocols/request-response/src/handler.rs
+++ b/protocols/request-response/src/handler.rs
@@ -159,6 +159,9 @@ where
             }
         };
 
+        // Inbound connections are reported to the upper layer from within the above task,
+        // so by failing to schedule it, it means the upper layer will never know about the
+        // inbound request. Because of that we do not report any inbound failure.
         if self
             .worker_streams
             .try_push(RequestId::Inbound(request_id), recv.boxed())
@@ -204,7 +207,10 @@ where
             .try_push(RequestId::Outbound(request_id), send.boxed())
             .is_err()
         {
-            tracing::warn!("Dropping outbound stream because we are at capacity")
+            self.pending_events.push_back(Event::OutboundStreamFailed {
+                request_id: message.request_id,
+                error: io::Error::new(io::ErrorKind::Other, "max sub-streams reached"),
+            });
         }
     }
 
diff --git a/protocols/request-response/tests/error_reporting.rs b/protocols/request-response/tests/error_reporting.rs
index 2dc82b2e0c5..e78bba926e2 100644
--- a/protocols/request-response/tests/error_reporting.rs
+++ b/protocols/request-response/tests/error_reporting.rs
@@ -161,6 +161,58 @@ async fn report_outbound_timeout_on_read_response() {
     futures::future::select(server_task, client_task).await;
 }
 
+#[async_std::test]
+async fn report_outbound_failure_on_max_streams() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    // `swarm2` will be able to handle only 1 stream per time.
+    let swarm2_config = request_response::Config::default()
+        .with_request_timeout(Duration::from_millis(100))
+        .with_max_concurrent_streams(1);
+
+    let (peer1_id, mut swarm1) = new_swarm();
+    let (peer2_id, mut swarm2) = new_swarm_with_config(swarm2_config);
+
+    swarm1.listen().with_memory_addr_external().await;
+    swarm2.connect(&mut swarm1).await;
+
+    let swarm1_task = async move {
+        let _req_id = swarm1
+            .behaviour_mut()
+            .send_request(&peer2_id, Action::FailOnMaxStreams);
+
+        // Keep the connection alive, otherwise swarm2 may receive `ConnectionClosed` instead.
+        wait_no_events(&mut swarm1).await;
+    };
+
+    // Expects OutboundFailure::Io failure.
+    let swarm2_task = async move {
+        let (peer, _inbound_req_id, action, _resp_channel) =
+            wait_request(&mut swarm2).await.unwrap();
+        assert_eq!(peer, peer1_id);
+        assert_eq!(action, Action::FailOnMaxStreams);
+
+        // A task for sending back a response is already scheduled so max concurrent
+        // streams is reached and no new tasks can be sheduled.
+        //
+        // We produce the failure by creating new request before we response.
+        let outbound_req_id = swarm2
+            .behaviour_mut()
+            .send_request(&peer1_id, Action::FailOnMaxStreams);
+
+        let (peer, req_id_done, error) = wait_outbound_failure(&mut swarm2).await.unwrap();
+        assert_eq!(peer, peer1_id);
+        assert_eq!(req_id_done, outbound_req_id);
+        assert!(matches!(error, OutboundFailure::Io(_)));
+    };
+
+    let swarm1_task = pin!(swarm1_task);
+    let swarm2_task = pin!(swarm2_task);
+    futures::future::select(swarm1_task, swarm2_task).await;
+}
+
 #[async_std::test]
 async fn report_inbound_failure_on_read_request() {
     let _ = tracing_subscriber::fmt()
@@ -332,6 +384,7 @@ enum Action {
     FailOnWriteRequest,
     FailOnWriteResponse,
     TimeoutOnWriteResponse,
+    FailOnMaxStreams,
 }
 
 impl From<Action> for u8 {
@@ -343,6 +396,7 @@ impl From<Action> for u8 {
             Action::FailOnWriteRequest => 3,
             Action::FailOnWriteResponse => 4,
             Action::TimeoutOnWriteResponse => 5,
+            Action::FailOnMaxStreams => 6,
         }
     }
 }
@@ -358,6 +412,7 @@ impl TryFrom<u8> for Action {
             3 => Ok(Action::FailOnWriteRequest),
             4 => Ok(Action::FailOnWriteResponse),
             5 => Ok(Action::TimeoutOnWriteResponse),
+            6 => Ok(Action::FailOnMaxStreams),
             _ => Err(io::Error::new(io::ErrorKind::Other, "invalid action")),
         }
     }
@@ -468,11 +523,10 @@ impl Codec for TestCodec {
     }
 }
 
-fn new_swarm_with_timeout(
-    timeout: Duration,
+fn new_swarm_with_config(
+    cfg: request_response::Config,
 ) -> (PeerId, Swarm<request_response::Behaviour<TestCodec>>) {
     let protocols = iter::once((StreamProtocol::new("/test/1"), ProtocolSupport::Full));
-    let cfg = request_response::Config::default().with_request_timeout(timeout);
 
     let swarm =
         Swarm::new_ephemeral(|_| request_response::Behaviour::<TestCodec>::new(protocols, cfg));
@@ -481,6 +535,13 @@ fn new_swarm_with_timeout(
     (peed_id, swarm)
 }
 
+fn new_swarm_with_timeout(
+    timeout: Duration,
+) -> (PeerId, Swarm<request_response::Behaviour<TestCodec>>) {
+    let cfg = request_response::Config::default().with_request_timeout(timeout);
+    new_swarm_with_config(cfg)
+}
+
 fn new_swarm() -> (PeerId, Swarm<request_response::Behaviour<TestCodec>>) {
     new_swarm_with_timeout(Duration::from_millis(100))
 }

From 9dcc172fd30384407616d1ccb8648c528dd8bede Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Tue, 4 Jun 2024 23:07:43 +0800
Subject: [PATCH 286/455] deps: promote tracing-subscriber to workspace level

Promote `tracing-subscriber` to workspace-level dependency.
Related issue: #5230

Pull-Request: #5441.
---
 Cargo.toml                                      | 1 +
 examples/autonat/Cargo.toml                     | 2 +-
 examples/browser-webrtc/Cargo.toml              | 2 +-
 examples/chat/Cargo.toml                        | 2 +-
 examples/dcutr/Cargo.toml                       | 2 +-
 examples/distributed-key-value-store/Cargo.toml | 2 +-
 examples/file-sharing/Cargo.toml                | 2 +-
 examples/identify/Cargo.toml                    | 2 +-
 examples/ipfs-kad/Cargo.toml                    | 2 +-
 examples/ipfs-private/Cargo.toml                | 2 +-
 examples/metrics/Cargo.toml                     | 2 +-
 examples/ping/Cargo.toml                        | 2 +-
 examples/relay-server/Cargo.toml                | 2 +-
 examples/rendezvous/Cargo.toml                  | 2 +-
 examples/stream/Cargo.toml                      | 2 +-
 examples/upnp/Cargo.toml                        | 2 +-
 interop-tests/Cargo.toml                        | 4 ++--
 libp2p/Cargo.toml                               | 2 +-
 misc/multistream-select/Cargo.toml              | 2 +-
 misc/server/Cargo.toml                          | 2 +-
 muxers/mplex/Cargo.toml                         | 2 +-
 protocols/autonat/Cargo.toml                    | 2 +-
 protocols/dcutr/Cargo.toml                      | 2 +-
 protocols/gossipsub/Cargo.toml                  | 2 +-
 protocols/identify/Cargo.toml                   | 2 +-
 protocols/kad/Cargo.toml                        | 2 +-
 protocols/mdns/Cargo.toml                       | 2 +-
 protocols/perf/Cargo.toml                       | 2 +-
 protocols/ping/Cargo.toml                       | 2 +-
 protocols/relay/Cargo.toml                      | 2 +-
 protocols/rendezvous/Cargo.toml                 | 2 +-
 protocols/request-response/Cargo.toml           | 2 +-
 protocols/stream/Cargo.toml                     | 2 +-
 swarm/Cargo.toml                                | 2 +-
 transports/dns/Cargo.toml                       | 2 +-
 transports/noise/Cargo.toml                     | 2 +-
 transports/plaintext/Cargo.toml                 | 2 +-
 transports/quic/Cargo.toml                      | 2 +-
 transports/tcp/Cargo.toml                       | 2 +-
 transports/webrtc/Cargo.toml                    | 2 +-
 40 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 18b09e388c8..eca9c381b5d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,6 +126,7 @@ rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 unsigned-varint = { version = "0.8.0" }
 tokio = { version = "1.38", default-features = false }
 tracing = "0.1.37"
+tracing-subscriber = "0.3"
 futures = "0.3.30"
 ring = "0.17.8"
 
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 80ee30db72b..ce703ca742e 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -14,7 +14,7 @@ clap = { version = "4.5.4", features = ["derive"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
index 731ac289e66..c3630d805fb 100644
--- a/examples/browser-webrtc/Cargo.toml
+++ b/examples/browser-webrtc/Cargo.toml
@@ -20,7 +20,7 @@ anyhow = "1.0.86"
 futures = { workspace = true }
 rand = "0.8"
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 axum = "0.7.5"
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index b276791d39b..a1d32956825 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index ce027a65ed8..97fabbbd006 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -16,7 +16,7 @@ libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macr
 log = "0.4"
 tokio = { workspace = true, features = ["macros", "net", "rt", "signal"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
index 4755b499709..9c2e2bce5c9 100644
--- a/examples/distributed-key-value-store/Cargo.toml
+++ b/examples/distributed-key-value-store/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index b53c8732a33..b13c30885cb 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -15,7 +15,7 @@ clap = { version = "4.5.4", features = ["derive"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 void = "1.0.2"
 
 [lints]
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
index 8ed26ba5fc2..cbe569b9d07 100644
--- a/examples/identify/Cargo.toml
+++ b/examples/identify/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 61a1413edf5..f492fac7fb3 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -17,7 +17,7 @@ futures = { workspace = true }
 anyhow = "1.0.86"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index da68256ce59..0813dba56e0 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.12"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index f75e6c0a564..2b82668f52a 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -19,7 +19,7 @@ prometheus-client = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-opentelemetry = "0.24.0"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index e92b5392c7a..633f043de56 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -13,7 +13,7 @@ futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 49b58c9b6bf..e792ca48dd5 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -15,7 +15,7 @@ async-trait = "0.1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index 0a6229e4f07..5a0672dcec8 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -15,7 +15,7 @@ futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index 2c1f5ad1e9d..de46d204c77 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -16,7 +16,7 @@ libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
 rand = "0.8"
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/examples/upnp/Cargo.toml b/examples/upnp/Cargo.toml
index 6abe3f8354b..ae292e0a48d 100644
--- a/examples/upnp/Cargo.toml
+++ b/examples/upnp/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "dns", "macros", "noise", "ping", "tcp", "yamux", "upnp"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 278ac1b75a5..3a9fea3c0df 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -18,7 +18,7 @@ futures = { workspace = true }
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 axum = "0.7"
@@ -37,7 +37,7 @@ thirtyfour = "=0.32.0" # https://github.com/stevepryde/thirtyfour/issues/169
 tokio = { workspace = true, features = ["full"] }
 tower-http = { version = "0.5", features = ["cors", "fs", "trace"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 libp2p = { path = "../libp2p", features = [ "ping", "macros", "webtransport-websys", "wasm-bindgen", "identify", "websocket-websys", "yamux", "noise"] }
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 01419445b8b..4304f4e557a 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -145,7 +145,7 @@ tokio = { workspace = true, features = [ "io-util", "io-std", "macros", "rt", "r
 libp2p-mplex = { workspace = true }
 libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 3d40f50d967..77d8de54332 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -24,7 +24,7 @@ futures_ringbuf = "0.4.0"
 quickcheck = { workspace = true }
 rand = "0.8"
 rw-stream-sink = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 072b99bf788..2c146c0c6e3 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -23,7 +23,7 @@ serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 zeroize = "1"
 
 [lints]
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 52920479158..fb55e03b614 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -32,7 +32,7 @@ libp2p-muxer-test-harness = { path = "../test-harness" }
 libp2p-plaintext = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 quickcheck = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [[bench]]
 name = "split_send_size"
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 3dd11be4366..ba7a21b4da7 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -28,7 +28,7 @@ asynchronous-codec = { workspace = true }
 [dev-dependencies]
 async-std = { version = "1.10", features = ["attributes"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 97823acbbc0..819c7a6e56b 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -41,7 +41,7 @@ libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 9439c0b2e8a..aa11a8a8309 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -49,7 +49,7 @@ libp2p-yamux = { workspace = true }
 libp2p-noise = { workspace = true }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 2717aefeced..e75a2c4c4bc 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -31,7 +31,7 @@ either = "1.12.0"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-swarm = { workspace = true, features = ["macros"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index e9067609502..7d3e3caa047 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -43,7 +43,7 @@ libp2p-swarm = { path = "../../swarm", features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [features]
 serde = ["dep:serde", "bytes/serde"]
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index c939a828d61..0d58c9467c4 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -39,7 +39,7 @@ libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] }
 libp2p-yamux = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [[test]]
 name = "use-async-std"
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 2f1446f197c..6ed6baa0714 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -30,7 +30,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
 void = "1"
 
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index f959e2d5436..c436478668c 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -27,7 +27,7 @@ async-std = "1.6.2"
 libp2p-swarm = { workspace = true, features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 6c9210d6b3d..aa185a42af0 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -37,7 +37,7 @@ libp2p-swarm = { workspace = true, features = ["macros", "async-std"] }
 libp2p-swarm-test = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 83b1e40af69..2d344e5e250 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -38,7 +38,7 @@ libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
 tokio = { workspace = true, features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index d621e477bfb..794a3e74956 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -41,7 +41,7 @@ rand = "0.8"
 libp2p-swarm-test = { path = "../../swarm-test" }
 futures_ringbuf = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index b90f9958173..a8d88399c0b 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -21,7 +21,7 @@ rand = "0.8"
 [dev-dependencies]
 libp2p-swarm-test = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
 workspace = true
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index b841246aef5..17a66abba0a 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -56,7 +56,7 @@ void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.96"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [[test]]
 name = "swarm_derive"
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index f7014994587..105fe0a62d0 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -25,7 +25,7 @@ tracing = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["rt", "time"] }
 async-std-crate = { package = "async-std", version = "1.6" }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [features]
 async-std = ["async-std-resolver"]
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 36013f077f2..7333d4cddda 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -36,7 +36,7 @@ snow = { version = "0.9.5", features = ["default-resolver"], default-features =
 [dev-dependencies]
 futures_ringbuf = "0.4.0"
 quickcheck = { workspace = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index 33e7ae1ab5c..db6fe75b505 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -25,7 +25,7 @@ libp2p-identity = { workspace = true, features = ["ed25519", "rand"] }
 quickcheck = { workspace = true }
 rand = "0.8"
 futures_ringbuf = "0.4.0"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's. 
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 20533629404..42296d0c0a7 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -47,7 +47,7 @@ libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [[test]]
 name = "stream_compliance"
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 648a88d6fed..7f0cf5ca943 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -30,7 +30,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 async-std = { version = "1.6.5", features = ["attributes"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["full"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index a1de95a1993..0450616261e 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -41,7 +41,7 @@ pem = ["webrtc?/pem"]
 libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["full"] }
 quickcheck = "1.0.3"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 
 [[test]]

From 3da7d918d0d3c443f20d1813772af1ac152b68c7 Mon Sep 17 00:00:00 2001
From: Doug A <douganderson444@gmail.com>
Date: Wed, 5 Jun 2024 13:09:46 -0300
Subject: [PATCH 287/455] fix(webrtc-utils): read buffer only if empty message

This PR adds a return of `Poll::Ready(Ok(0))` when the `message` vector is empty or not present.

This missing return was causing the stream not to finish, then to be dropped, causing the request response protocol to fail over WebRTC.

Now that empty or non existent message vectors get returned as `Ok(0)` the stream can be read and request response works now over WebRTC.

Pull-Request: #5439.
---
 Cargo.lock                      |  2 +-
 Cargo.toml                      |  2 +-
 misc/webrtc-utils/CHANGELOG.md  |  5 +++++
 misc/webrtc-utils/Cargo.toml    |  2 +-
 misc/webrtc-utils/src/stream.rs | 10 ++++++++--
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f526b1983bd..a3e98555eca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3500,7 +3500,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc-utils"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "asynchronous-codec",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index eca9c381b5d..8c8c0a70fd8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,7 +110,7 @@ libp2p-tls = { version = "0.4.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
-libp2p-webrtc-utils = { version = "0.2.0", path = "misc/webrtc-utils" }
+libp2p-webrtc-utils = { version = "0.2.1", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.43.0", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
diff --git a/misc/webrtc-utils/CHANGELOG.md b/misc/webrtc-utils/CHANGELOG.md
index 6949113a377..b69bf74bfc8 100644
--- a/misc/webrtc-utils/CHANGELOG.md
+++ b/misc/webrtc-utils/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.1
+
+- Fix end of stream handling when buffer is empty or not present.
+  See [PR 5439](https://github.com/libp2p/rust-libp2p/pull/5439).
+
 ## 0.2.0
 
 - Update to latest version of `libp2p-noise`.
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
index f548773b8dd..d870e43781e 100644
--- a/misc/webrtc-utils/Cargo.toml
+++ b/misc/webrtc-utils/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 name = "libp2p-webrtc-utils"
 repository = "https://github.com/libp2p/rust-libp2p"
 rust-version = { workspace = true }
-version = "0.2.0"
+version = "0.2.1"
 publish = true
 
 [dependencies]
diff --git a/misc/webrtc-utils/src/stream.rs b/misc/webrtc-utils/src/stream.rs
index 0e1496eb640..17f746a92a1 100644
--- a/misc/webrtc-utils/src/stream.rs
+++ b/misc/webrtc-utils/src/stream.rs
@@ -146,8 +146,14 @@ where
                     }
 
                     debug_assert!(read_buffer.is_empty());
-                    if let Some(message) = message {
-                        *read_buffer = message.into();
+                    match message {
+                        Some(msg) if !msg.is_empty() => {
+                            *read_buffer = msg.into();
+                        }
+                        _ => {
+                            tracing::debug!("poll_read buffer is empty, received None");
+                            return Poll::Ready(Ok(0));
+                        }
                     }
                 }
                 None => {

From 01f7b4006ef42ed35547b44b96c69fa3a27e7583 Mon Sep 17 00:00:00 2001
From: EB <deveb1479@gmail.com>
Date: Thu, 6 Jun 2024 08:37:29 +0900
Subject: [PATCH 288/455] fix: add example metrics's `tracing::info`

Adding a Minimal `println!()` Syntax for Metrics Example

Pull-Request: #5440.
---
 examples/metrics/src/main.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/examples/metrics/src/main.rs b/examples/metrics/src/main.rs
index 6b7ad9cedfb..99a9ca66aaf 100644
--- a/examples/metrics/src/main.rs
+++ b/examples/metrics/src/main.rs
@@ -66,6 +66,13 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     loop {
         match swarm.select_next_some().await {
+            SwarmEvent::NewListenAddr { address, .. } => {
+                tracing::info!(
+                    "Local node is listening on\n {}/p2p/{}",
+                    address,
+                    swarm.local_peer_id()
+                );
+            }
             SwarmEvent::Behaviour(BehaviourEvent::Ping(ping_event)) => {
                 tracing::info!(?ping_event);
                 metrics.record(&ping_event);

From 8f42576e1a58a716eae1040a988f99d5b44ce710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 6 Jun 2024 12:12:40 +0100
Subject: [PATCH 289/455] chore: move rcgen to workspace dependency

Pull-Request: #5446.
---
 Cargo.toml                      | 1 +
 transports/tls/Cargo.toml       | 2 +-
 transports/webrtc/Cargo.toml    | 2 +-
 transports/websocket/Cargo.toml | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8c8c0a70fd8..6c6dc114983 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -129,6 +129,7 @@ tracing = "0.1.37"
 tracing-subscriber = "0.3"
 futures = "0.3.30"
 ring = "0.17.8"
+rcgen = "0.11.3"
 
 [patch.crates-io]
 
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index cca7faf829f..9bcff3bc88b 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -13,7 +13,7 @@ futures = { workspace = true }
 futures-rustls = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
-rcgen = "0.11.3"
+rcgen = { workspace = true }
 ring = { workspace = true }
 thiserror = "1.0.61"
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 0450616261e..909f78479d9 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -23,7 +23,7 @@ libp2p-identity = { workspace = true }
 libp2p-webrtc-utils = { workspace = true }
 multihash = { workspace = true }
 rand = "0.8"
-rcgen = "0.11.3"
+rcgen = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 stun = "0.5"
 thiserror = "1"
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 7b83d8284bd..bcffe49a561 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -29,7 +29,7 @@ libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
 async-std = { version = "1.6.5", features = ["attributes"] }
-rcgen = "0.11.3"
+rcgen = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling

From b1d94c236e23234637a4379a6058a91a5bc1c42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 7 Jun 2024 22:43:52 +0100
Subject: [PATCH 290/455] chore: update deny.toml

Pull-Request: #5454.
---
 deny.toml | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/deny.toml b/deny.toml
index dedcb7a3a95..5be86107edf 100644
--- a/deny.toml
+++ b/deny.toml
@@ -2,20 +2,14 @@
 # More documentation for the advisories section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
 [advisories]
+# Version of the advisory config. See https://github.com/EmbarkStudios/cargo-deny/pull/611
+version = 2
 # The path where the advisory database is cloned/fetched into
 db-path = "~/cargo/advisory-db"
 # The url of the advisory database to use
-db-urls = [ "https://github.com/rustsec/advisory-db" ]
-# The lint level for security vulnerabilities
-vulnerability = "deny"
-# The lint level for unmaintained crates
-unmaintained = "warn"
+db-urls = ["https://github.com/rustsec/advisory-db"]
 # The lint level for crates that have been yanked from their source registry
 yanked = "warn"
-# The lint level for crates with security notices. Note that as of
-# 2019-12-17 there are no security notice advisories in
-# https://github.com/rustsec/advisory-db
-notice = "warn"
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
@@ -35,35 +29,21 @@ ignore = [
 # More documentation for the licenses section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
 [licenses]
-# The lint level for crates which do not have a detectable license
-unlicensed = "deny"
+# Version of the license config. See https://github.com/EmbarkStudios/cargo-deny/pull/611
+version = 2
 # List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
-# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
 allow = [
+    "Apache-2.0 WITH LLVM-exception",
     "Apache-2.0",
     "BSD-2-Clause",
+    "BSD-3-Clause",
+    "ISC",
     "MIT",
+    "MPL-2.0",
     "Unlicense",
 ]
-# List of explicitly disallowed licenses
-# See https://spdx.org/licenses/ for list of possible licenses
-# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
-deny = []
-# Lint level for licenses considered copyleft
-copyleft = "allow"
-# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
-# * both - The license will be approved if it is both OSI-approved *AND* FSF
-# * either - The license will be approved if it is either OSI-approved *OR* FSF
-# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
-# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
-# * neither - This predicate is ignored and the default lint level is used
-allow-osi-fsf-free = "both"
-# Lint level used when no other predicates are matched
-# 1. License isn't in the allow or deny lists
-# 2. License isn't copyleft
-# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
-default = "deny"
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
 # canonical license text of a valid SPDX license file.
@@ -76,7 +56,7 @@ exceptions = [
     # https://www.openssl.org/blog/blog/2017/03/22/license/
     # ring crate is ISC & MIT
     { allow = ["ISC", "MIT", "OpenSSL"], name = "ring" },
-    # libp2p is not re-distributing unicode tables data by itself 
+    # libp2p is not re-distributing unicode tables data by itself
     { allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"], name = "unicode-ident" },
 ]
 

From 88635ea51574821c38db0ed0881227c42a05a1e4 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Sat, 8 Jun 2024 03:39:03 +0300
Subject: [PATCH 291/455] chore: Use `libp2p-tls` from workspace

Pull-Request: #5452.
---
 Cargo.lock                 | 172 +++++++++++--------------------------
 transports/quic/Cargo.toml |   2 +-
 2 files changed, 51 insertions(+), 123 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3e98555eca..13b29b0dc0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2440,7 +2440,7 @@ dependencies = [
  "libp2p",
  "libp2p-mplex",
  "libp2p-noise",
- "libp2p-tls 0.4.0",
+ "libp2p-tls",
  "libp2p-webrtc",
  "libp2p-webrtc-websys",
  "mime_guess",
@@ -2567,7 +2567,7 @@ version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "clap",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "serde",
  "serde_json",
@@ -2611,7 +2611,7 @@ dependencies = [
  "libp2p-allow-block-list",
  "libp2p-autonat",
  "libp2p-connection-limits",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-dcutr",
  "libp2p-dns",
  "libp2p-floodsub",
@@ -2633,7 +2633,7 @@ dependencies = [
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-tcp",
- "libp2p-tls 0.4.0",
+ "libp2p-tls",
  "libp2p-uds",
  "libp2p-upnp",
  "libp2p-websocket",
@@ -2642,7 +2642,7 @@ dependencies = [
  "libp2p-yamux",
  "multiaddr",
  "pin-project",
- "rw-stream-sink 0.4.0",
+ "rw-stream-sink",
  "thiserror",
  "tokio",
  "tracing-subscriber",
@@ -2653,7 +2653,7 @@ name = "libp2p-allow-block-list"
 version = "0.3.0"
 dependencies = [
  "async-std",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-derive",
@@ -2671,7 +2671,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-request-response",
  "libp2p-swarm",
@@ -2688,7 +2688,7 @@ name = "libp2p-connection-limits"
 version = "0.3.1"
 dependencies = [
  "async-std",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-ping",
@@ -2715,14 +2715,14 @@ dependencies = [
  "libp2p-noise",
  "multiaddr",
  "multihash",
- "multistream-select 0.13.0",
+ "multistream-select",
  "once_cell",
  "parking_lot",
  "pin-project",
  "quick-protobuf",
  "quickcheck-ext",
  "rand 0.8.5",
- "rw-stream-sink 0.4.0",
+ "rw-stream-sink",
  "serde",
  "smallvec",
  "thiserror",
@@ -2731,34 +2731,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "libp2p-core"
-version = "0.41.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-identity",
- "multiaddr",
- "multihash",
- "multistream-select 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "once_cell",
- "parking_lot",
- "pin-project",
- "quick-protobuf",
- "rand 0.8.5",
- "rw-stream-sink 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec",
- "thiserror",
- "tracing",
- "unsigned-varint 0.8.0",
- "void",
-]
-
 [[package]]
 name = "libp2p-dcutr"
 version = "0.11.0"
@@ -2771,7 +2743,7 @@ dependencies = [
  "futures-bounded",
  "futures-timer",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-dns",
  "libp2p-identify",
  "libp2p-identity",
@@ -2802,7 +2774,7 @@ dependencies = [
  "async-trait",
  "futures",
  "hickory-resolver",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "parking_lot",
  "smallvec",
@@ -2820,7 +2792,7 @@ dependencies = [
  "cuckoofilter",
  "fnv",
  "futures",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "quick-protobuf",
@@ -2848,7 +2820,7 @@ dependencies = [
  "hex",
  "hex_fmt",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -2878,7 +2850,7 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
@@ -2935,7 +2907,7 @@ dependencies = [
  "futures-bounded",
  "futures-timer",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-noise",
@@ -2966,7 +2938,7 @@ dependencies = [
  "futures",
  "hickory-proto",
  "if-watch",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -2987,7 +2959,7 @@ name = "libp2p-memory-connection-limits"
 version = "0.2.0"
 dependencies = [
  "async-std",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-swarm",
@@ -3006,7 +2978,7 @@ version = "0.14.1"
 dependencies = [
  "futures",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-dcutr",
  "libp2p-gossipsub",
  "libp2p-identify",
@@ -3028,7 +3000,7 @@ dependencies = [
  "bytes",
  "criterion",
  "futures",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-muxer-test-harness",
  "libp2p-plaintext",
@@ -3050,7 +3022,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "futures_ringbuf",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "tracing",
 ]
 
@@ -3063,7 +3035,7 @@ dependencies = [
  "curve25519-dalek",
  "futures",
  "futures_ringbuf",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "multiaddr",
  "multihash",
@@ -3092,14 +3064,14 @@ dependencies = [
  "futures-timer",
  "instant",
  "libp2p",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-dns",
  "libp2p-identity",
  "libp2p-quic",
  "libp2p-swarm",
  "libp2p-swarm-test",
  "libp2p-tcp",
- "libp2p-tls 0.4.0",
+ "libp2p-tls",
  "libp2p-yamux",
  "rand 0.8.5",
  "serde",
@@ -3120,7 +3092,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
@@ -3139,7 +3111,7 @@ dependencies = [
  "bytes",
  "futures",
  "futures_ringbuf",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "quick-protobuf",
  "quick-protobuf-codec",
@@ -3154,7 +3126,7 @@ name = "libp2p-pnet"
 version = "0.24.0"
 dependencies = [
  "futures",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -3179,12 +3151,12 @@ dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-muxer-test-harness",
  "libp2p-noise",
  "libp2p-tcp",
- "libp2p-tls 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-tls",
  "libp2p-yamux",
  "parking_lot",
  "quickcheck",
@@ -3209,7 +3181,7 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-ping",
  "libp2p-plaintext",
@@ -3238,7 +3210,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-noise",
@@ -3271,7 +3243,7 @@ dependencies = [
  "futures-timer",
  "futures_ringbuf",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-swarm",
@@ -3312,7 +3284,7 @@ name = "libp2p-stream"
 version = "0.1.0-alpha.1"
 dependencies = [
  "futures",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
@@ -3334,7 +3306,7 @@ dependencies = [
  "futures-timer",
  "getrandom 0.2.15",
  "instant",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-kad",
@@ -3344,7 +3316,7 @@ dependencies = [
  "libp2p-swarm-test",
  "libp2p-yamux",
  "lru",
- "multistream-select 0.13.0",
+ "multistream-select",
  "once_cell",
  "quickcheck-ext",
  "rand 0.8.5",
@@ -3374,7 +3346,7 @@ dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-plaintext",
  "libp2p-swarm",
@@ -3394,7 +3366,7 @@ dependencies = [
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "socket2 0.5.7",
  "tokio",
@@ -3410,7 +3382,7 @@ dependencies = [
  "futures-rustls",
  "hex",
  "hex-literal",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-yamux",
@@ -3424,32 +3396,13 @@ dependencies = [
  "yasna",
 ]
 
-[[package]]
-name = "libp2p-tls"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "251b17aebdd29df7e8f80e4d94b782fae42e934c49086e1a81ba23b60a8314f2"
-dependencies = [
- "futures",
- "futures-rustls",
- "libp2p-core 0.41.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-identity",
- "rcgen",
- "ring 0.17.8",
- "rustls 0.23.8",
- "rustls-webpki 0.101.7",
- "thiserror",
- "x509-parser 0.16.0",
- "yasna",
-]
-
 [[package]]
 name = "libp2p-uds"
 version = "0.40.0"
 dependencies = [
  "async-std",
  "futures",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "tempfile",
  "tokio",
  "tracing",
@@ -3462,7 +3415,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "igd-next",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-swarm",
  "tokio",
  "tracing",
@@ -3479,7 +3432,7 @@ dependencies = [
  "futures-timer",
  "hex",
  "if-watch",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-webrtc-utils",
@@ -3507,7 +3460,7 @@ dependencies = [
  "futures",
  "hex",
  "hex-literal",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "quick-protobuf",
@@ -3529,7 +3482,7 @@ dependencies = [
  "getrandom 0.2.15",
  "hex",
  "js-sys",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-webrtc-utils",
  "send_wrapper 0.6.0",
@@ -3548,14 +3501,14 @@ dependencies = [
  "either",
  "futures",
  "futures-rustls",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-dns",
  "libp2p-identity",
  "libp2p-tcp",
  "parking_lot",
  "pin-project-lite",
  "rcgen",
- "rw-stream-sink 0.4.0",
+ "rw-stream-sink",
  "soketto",
  "tracing",
  "url",
@@ -3569,7 +3522,7 @@ dependencies = [
  "bytes",
  "futures",
  "js-sys",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-yamux",
@@ -3587,7 +3540,7 @@ version = "0.3.0"
 dependencies = [
  "futures",
  "js-sys",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "multiaddr",
@@ -3608,7 +3561,7 @@ dependencies = [
  "async-std",
  "either",
  "futures",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-muxer-test-harness",
  "thiserror",
  "tracing",
@@ -3897,27 +3850,13 @@ dependencies = [
  "pin-project",
  "quickcheck-ext",
  "rand 0.8.5",
- "rw-stream-sink 0.4.0",
+ "rw-stream-sink",
  "smallvec",
  "tracing",
  "tracing-subscriber",
  "unsigned-varint 0.8.0",
 ]
 
-[[package]]
-name = "multistream-select"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19"
-dependencies = [
- "bytes",
- "futures",
- "log",
- "pin-project",
- "smallvec",
- "unsigned-varint 0.7.2",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@@ -5281,17 +5220,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "rw-stream-sink"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1"
-dependencies = [
- "futures",
- "pin-project",
- "static_assertions",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -6909,7 +6837,7 @@ version = "0.1.0"
 dependencies = [
  "futures",
  "getrandom 0.2.15",
- "libp2p-core 0.41.2",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-webtransport-websys",
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 42296d0c0a7..11eee04e199 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -15,7 +15,7 @@ futures = { workspace = true }
 futures-timer = "3.0.3"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
-libp2p-tls = "0.4.0"
+libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.3"
 quinn = { version = "0.11.1", default-features = false, features = ["rustls", "futures-io"] }

From f54423a221104cb1967f6a88e8d04fb10b15416b Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Fri, 7 Jun 2024 21:36:24 -0400
Subject: [PATCH 292/455] deps: use `web-time` instead of `instant`

See https://github.com/sebcrozet/instant/issues/52

Pull-Request: #5347.
---
 Cargo.lock                                   | 52 +++++++++-----------
 Cargo.toml                                   | 17 ++++---
 core/CHANGELOG.md                            |  4 ++
 core/Cargo.toml                              |  6 +--
 core/src/peer_record.rs                      |  2 +-
 interop-tests/Cargo.toml                     |  4 +-
 interop-tests/src/arch.rs                    |  2 +-
 libp2p/CHANGELOG.md                          |  3 ++
 libp2p/Cargo.toml                            |  3 +-
 misc/metrics/CHANGELOG.md                    |  4 ++
 misc/metrics/Cargo.toml                      |  4 +-
 misc/metrics/src/swarm.rs                    |  2 +-
 muxers/yamux/Cargo.toml                      |  2 +-
 protocols/autonat/CHANGELOG.md               |  4 ++
 protocols/autonat/Cargo.toml                 |  4 +-
 protocols/autonat/src/behaviour.rs           |  2 +-
 protocols/autonat/src/behaviour/as_client.rs |  2 +-
 protocols/autonat/src/behaviour/as_server.rs |  2 +-
 protocols/dcutr/CHANGELOG.md                 |  4 ++
 protocols/dcutr/Cargo.toml                   |  6 +--
 protocols/dcutr/src/protocol/outbound.rs     |  2 +-
 protocols/gossipsub/CHANGELOG.md             |  4 ++
 protocols/gossipsub/Cargo.toml               |  8 +--
 protocols/gossipsub/src/backoff.rs           |  2 +-
 protocols/gossipsub/src/behaviour.rs         |  3 +-
 protocols/gossipsub/src/gossip_promises.rs   |  2 +-
 protocols/gossipsub/src/handler.rs           |  2 +-
 protocols/gossipsub/src/peer_score.rs        |  2 +-
 protocols/gossipsub/src/time_cache.rs        |  2 +-
 protocols/kad/CHANGELOG.md                   |  2 +
 protocols/kad/Cargo.toml                     |  4 +-
 protocols/kad/src/behaviour.rs               |  2 +-
 protocols/kad/src/bootstrap.rs               |  2 +-
 protocols/kad/src/jobs.rs                    |  2 +-
 protocols/kad/src/kbucket.rs                 |  3 +-
 protocols/kad/src/protocol.rs                |  2 +-
 protocols/kad/src/query.rs                   |  2 +-
 protocols/kad/src/query/peers/closest.rs     |  2 +-
 protocols/kad/src/record.rs                  |  2 +-
 protocols/perf/CHANGELOG.md                  |  4 ++
 protocols/perf/Cargo.toml                    |  4 +-
 protocols/perf/src/bin/perf.rs               |  2 +-
 protocols/perf/src/lib.rs                    |  2 +-
 protocols/perf/src/protocol.rs               |  2 +-
 protocols/ping/CHANGELOG.md                  |  3 ++
 protocols/ping/Cargo.toml                    |  4 +-
 protocols/ping/src/protocol.rs               |  2 +-
 protocols/relay/CHANGELOG.md                 |  4 ++
 protocols/relay/Cargo.toml                   |  4 +-
 protocols/rendezvous/CHANGELOG.md            |  4 ++
 protocols/rendezvous/Cargo.toml              |  4 +-
 protocols/rendezvous/src/server.rs           |  2 +-
 protocols/request-response/CHANGELOG.md      |  2 +
 protocols/request-response/Cargo.toml        |  2 +-
 swarm/CHANGELOG.md                           |  2 +
 swarm/Cargo.toml                             |  8 +--
 swarm/src/connection.rs                      |  2 +-
 swarm/src/connection/pool.rs                 |  2 +-
 58 files changed, 139 insertions(+), 99 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 13b29b0dc0b..8ad67903c93 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2402,9 +2402,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
@@ -2436,7 +2433,6 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "instant",
  "libp2p",
  "libp2p-mplex",
  "libp2p-noise",
@@ -2458,6 +2454,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-logger",
+ "web-time",
 ]
 
 [[package]]
@@ -2607,7 +2604,6 @@ dependencies = [
  "futures",
  "futures-timer",
  "getrandom 0.2.15",
- "instant",
  "libp2p-allow-block-list",
  "libp2p-autonat",
  "libp2p-connection-limits",
@@ -2663,14 +2659,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-autonat"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
  "async-std",
  "async-trait",
  "asynchronous-codec",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-request-response",
@@ -2681,6 +2676,7 @@ dependencies = [
  "rand 0.8.5",
  "tracing",
  "tracing-subscriber",
+ "web-time",
 ]
 
 [[package]]
@@ -2702,14 +2698,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.41.2"
+version = "0.41.3"
 dependencies = [
  "async-std",
  "either",
  "fnv",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-identity",
  "libp2p-mplex",
  "libp2p-noise",
@@ -2729,11 +2724,12 @@ dependencies = [
  "tracing",
  "unsigned-varint 0.8.0",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-dcutr"
-version = "0.11.0"
+version = "0.11.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -2742,7 +2738,6 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-dns",
  "libp2p-identify",
@@ -2763,6 +2758,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -2805,7 +2801,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.46.1"
+version = "0.46.2"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -2819,7 +2815,6 @@ dependencies = [
  "getrandom 0.2.15",
  "hex",
  "hex_fmt",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
@@ -2838,6 +2833,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -2906,7 +2902,6 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
@@ -2926,6 +2921,7 @@ dependencies = [
  "tracing-subscriber",
  "uint",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -2974,10 +2970,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.14.1"
+version = "0.14.2"
 dependencies = [
  "futures",
- "instant",
  "libp2p-core",
  "libp2p-dcutr",
  "libp2p-gossipsub",
@@ -2989,6 +2984,7 @@ dependencies = [
  "libp2p-swarm",
  "pin-project",
  "prometheus-client",
+ "web-time",
 ]
 
 [[package]]
@@ -3055,14 +3051,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-perf"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "anyhow",
  "clap",
  "futures",
  "futures-bounded",
  "futures-timer",
- "instant",
  "libp2p",
  "libp2p-core",
  "libp2p-dns",
@@ -3081,6 +3076,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -3091,7 +3087,6 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
@@ -3101,6 +3096,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -3173,7 +3169,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-relay"
-version = "0.17.2"
+version = "0.17.3"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3202,14 +3198,13 @@ dependencies = [
 
 [[package]]
 name = "libp2p-rendezvous"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
  "bimap",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
@@ -3228,6 +3223,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -3242,7 +3238,6 @@ dependencies = [
  "futures-bounded",
  "futures-timer",
  "futures_ringbuf",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
@@ -3257,6 +3252,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
+ "web-time",
 ]
 
 [[package]]
@@ -3305,7 +3301,6 @@ dependencies = [
  "futures",
  "futures-timer",
  "getrandom 0.2.15",
- "instant",
  "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
@@ -3327,6 +3322,7 @@ dependencies = [
  "trybuild",
  "void",
  "wasm-bindgen-futures",
+ "web-time",
 ]
 
 [[package]]
@@ -3566,7 +3562,7 @@ dependencies = [
  "thiserror",
  "tracing",
  "yamux 0.12.1",
- "yamux 0.13.1",
+ "yamux 0.13.3",
 ]
 
 [[package]]
@@ -7145,18 +7141,18 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1d0148b89300047e72994bee99ecdabd15a9166a7b70c8b8c37c314dcc9002"
+checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028"
 dependencies = [
  "futures",
- "instant",
  "log",
  "nohash-hasher",
  "parking_lot",
  "pin-project",
  "rand 0.8.5",
  "static_assertions",
+ "web-time",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 6c6dc114983..995951a01d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,29 +76,29 @@ futures-bounded = { version = "0.2.3" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.12.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
-libp2p-core = { version = "0.41.2", path = "core" }
-libp2p-dcutr = { version = "0.11.0", path = "protocols/dcutr" }
+libp2p-core = { version = "0.41.3", path = "core" }
+libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
-libp2p-gossipsub = { version = "0.46.1", path = "protocols/gossipsub" }
+libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.8" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
-libp2p-metrics = { version = "0.14.1", path = "misc/metrics" }
+libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
 libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.44.0", path = "transports/noise" }
-libp2p-perf = { version = "0.3.0", path = "protocols/perf" }
+libp2p-perf = { version = "0.3.1", path = "protocols/perf" }
 libp2p-ping = { version = "0.44.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.3", path = "transports/quic" }
-libp2p-relay = { version = "0.17.2", path = "protocols/relay" }
-libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
+libp2p-relay = { version = "0.17.3", path = "protocols/relay" }
+libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.3", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
@@ -128,6 +128,7 @@ tokio = { version = "1.38", default-features = false }
 tracing = "0.1.37"
 tracing-subscriber = "0.3"
 futures = "0.3.30"
+web-time = "1.1.0"
 ring = "0.17.8"
 rcgen = "0.11.3"
 
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 73f377a8aa5..633b627d41d 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.41.3 
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.41.2
 
 - Implement `std::fmt::Display` on `ListenerId`.
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 5b3fbe32d0b..6831eb54c94 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-core"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.41.2"
+version = "0.41.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -11,11 +11,11 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.12"
+either = "1.11"
 fnv = "1.0"
 futures = { workspace = true, features = ["executor", "thread-pool"] }
 futures-timer = "3"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
diff --git a/core/src/peer_record.rs b/core/src/peer_record.rs
index d5fc86c391e..ac488338cc6 100644
--- a/core/src/peer_record.rs
+++ b/core/src/peer_record.rs
@@ -1,10 +1,10 @@
 use crate::signed_envelope::SignedEnvelope;
 use crate::{proto, signed_envelope, DecodeError, Multiaddr};
-use instant::SystemTime;
 use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
 use libp2p_identity::SigningError;
 use quick_protobuf::{BytesReader, Writer};
+use web_time::SystemTime;
 
 const PAYLOAD_TYPE: &str = "/libp2p/routing-state-record";
 const DOMAIN_SEP: &str = "libp2p-routing-state";
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 3a9fea3c0df..5dbdafa34b1 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 anyhow = "1"
-either = "1.12.0"
+either = "1.11.0"
 futures = { workspace = true }
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
@@ -46,7 +46,7 @@ libp2p-webrtc-websys = { workspace = true }
 wasm-bindgen = { version = "0.2" }
 wasm-bindgen-futures = { version = "0.4" }
 wasm-logger = { version = "0.2.0" }
-instant = "0.1.13"
+web-time = { workspace = true }
 reqwest = { version = "0.12", features = ["json"] }
 console_error_panic_hook = { version = "0.1.7" }
 futures-timer = "3.0.3"
diff --git a/interop-tests/src/arch.rs b/interop-tests/src/arch.rs
index 52000f90a86..06d630d68d5 100644
--- a/interop-tests/src/arch.rs
+++ b/interop-tests/src/arch.rs
@@ -199,7 +199,7 @@ pub(crate) mod wasm {
 
     use crate::{BlpopRequest, Muxer, SecProtocol, Transport};
 
-    pub(crate) type Instant = instant::Instant;
+    pub(crate) type Instant = web_time::Instant;
 
     pub(crate) fn init_logger() {
         console_error_panic_hook::set_once();
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 7acd4ab602d..8b1a332769f 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -6,6 +6,9 @@
 - Raise MSRV to 1.73.
   See [PR 5266](https://github.com/libp2p/rust-libp2p/pull/5266).
 
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.53.2
 
 - Allow `SwarmBuilder::with_bandwidth_metrics` after `SwarmBuilder::with_websocket`.
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 4304f4e557a..59a075b777e 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -82,7 +82,7 @@ tcp = ["dep:libp2p-tcp"]
 tls = ["dep:libp2p-tls"]
 tokio = [ "libp2p-swarm/tokio", "libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio", "libp2p-upnp?/tokio"]
 uds = ["dep:libp2p-uds"]
-wasm-bindgen = [ "futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js", "libp2p-swarm/wasm-bindgen", "libp2p-gossipsub?/wasm-bindgen",]
+wasm-bindgen = [ "futures-timer/wasm-bindgen", "getrandom/js", "libp2p-swarm/wasm-bindgen", "libp2p-gossipsub?/wasm-bindgen"]
 websocket-websys = ["dep:libp2p-websocket-websys"]
 websocket = ["dep:libp2p-websocket"]
 webtransport-websys = ["dep:libp2p-webtransport-websys"]
@@ -95,7 +95,6 @@ either = "1.9.0"
 futures = { workspace = true }
 futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature
 getrandom = "0.2.3"     # Explicit dependency to be used in `wasm-bindgen` feature
-instant = "0.1.12"      # Explicit dependency to be used in `wasm-bindgen` feature
 # TODO feature flag?
 rw-stream-sink = { workspace = true }
 
diff --git a/misc/metrics/CHANGELOG.md b/misc/metrics/CHANGELOG.md
index 67c304680db..c36d7f95ebc 100644
--- a/misc/metrics/CHANGELOG.md
+++ b/misc/metrics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.14.2
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.14.1
 
 - Add `BandwidthTransport`, wrapping an existing `Transport`, exposing Prometheus bandwidth metrics.
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index 51da56db29f..5fb927bee84 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-metrics"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Metrics for libp2p"
-version = "0.14.1"
+version = "0.14.2"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,7 +20,7 @@ relay = ["libp2p-relay"]
 
 [dependencies]
 futures = { workspace = true }
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }
 libp2p-gossipsub =  { workspace = true, optional = true }
diff --git a/misc/metrics/src/swarm.rs b/misc/metrics/src/swarm.rs
index ad83401f316..51c0a0af253 100644
--- a/misc/metrics/src/swarm.rs
+++ b/misc/metrics/src/swarm.rs
@@ -22,13 +22,13 @@ use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
 use crate::protocol_stack;
-use instant::Instant;
 use libp2p_swarm::{ConnectionId, DialError, SwarmEvent};
 use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
 use prometheus_client::metrics::counter::Counter;
 use prometheus_client::metrics::family::Family;
 use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
 use prometheus_client::registry::{Registry, Unit};
+use web_time::Instant;
 
 pub(crate) struct Metrics {
     connections_incoming: Family<AddressLabels, Counter>,
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index ddb9424895b..4d6d655e330 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -16,7 +16,7 @@ futures = { workspace = true }
 libp2p-core = { workspace = true }
 thiserror = "1.0"
 yamux012 = { version = "0.12.1", package = "yamux" }
-yamux013 = { version = "0.13.1", package = "yamux" }
+yamux013 = { version = "0.13.3", package = "yamux" }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index 1259dd01fd4..6a25dc173dd 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.1
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.12.0
 
 - Remove `Clone`, `PartialEq` and `Eq` implementations on `Event` and its sub-structs.
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index ba7a21b4da7..970dd27bc53 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
 authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>"]
-version = "0.12.0"
+version = "0.12.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-trait = "0.1"
 futures = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-request-response = { workspace = true }
diff --git a/protocols/autonat/src/behaviour.rs b/protocols/autonat/src/behaviour.rs
index a770e61e88a..a47852e5206 100644
--- a/protocols/autonat/src/behaviour.rs
+++ b/protocols/autonat/src/behaviour.rs
@@ -28,7 +28,6 @@ pub use as_client::{OutboundProbeError, OutboundProbeEvent};
 use as_server::AsServer;
 pub use as_server::{InboundProbeError, InboundProbeEvent};
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
@@ -45,6 +44,7 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
+use web_time::Instant;
 
 /// Config for the [`Behaviour`].
 #[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/protocols/autonat/src/behaviour/as_client.rs b/protocols/autonat/src/behaviour/as_client.rs
index 668f3b93719..8960163ccb3 100644
--- a/protocols/autonat/src/behaviour/as_client.rs
+++ b/protocols/autonat/src/behaviour/as_client.rs
@@ -26,7 +26,6 @@ use super::{
 };
 use futures::FutureExt;
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_request_response::{self as request_response, OutboundFailure, OutboundRequestId};
@@ -37,6 +36,7 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
+use web_time::Instant;
 
 /// Outbound probe failed or was aborted.
 #[derive(Debug)]
diff --git a/protocols/autonat/src/behaviour/as_server.rs b/protocols/autonat/src/behaviour/as_server.rs
index 878fd713dda..af6be799e21 100644
--- a/protocols/autonat/src/behaviour/as_server.rs
+++ b/protocols/autonat/src/behaviour/as_server.rs
@@ -22,7 +22,6 @@ use super::{
     Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, ProbeId,
     ResponseError,
 };
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
@@ -36,6 +35,7 @@ use std::{
     collections::{HashMap, HashSet, VecDeque},
     num::NonZeroU8,
 };
+use web_time::Instant;
 
 /// Inbound probe failed.
 #[derive(Debug)]
diff --git a/protocols/dcutr/CHANGELOG.md b/protocols/dcutr/CHANGELOG.md
index d3857373658..4865a0540bb 100644
--- a/protocols/dcutr/CHANGELOG.md
+++ b/protocols/dcutr/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.11.1
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.11.0
 
 - Add `ConnectionId` to `Event::DirectConnectionUpgradeSucceeded` and `Event::DirectConnectionUpgradeFailed`.
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 819c7a6e56b..daf4846a2ae 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-dcutr"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Direct connection upgrade through relay"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -12,10 +12,10 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-either = "1.12.0"
+either = "1.11.0"
 futures = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/dcutr/src/protocol/outbound.rs b/protocols/dcutr/src/protocol/outbound.rs
index dc46442fae5..8639ff4f053 100644
--- a/protocols/dcutr/src/protocol/outbound.rs
+++ b/protocols/dcutr/src/protocol/outbound.rs
@@ -23,11 +23,11 @@ use crate::PROTOCOL_NAME;
 use asynchronous_codec::Framed;
 use futures::prelude::*;
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_swarm::Stream;
 use std::io;
 use thiserror::Error;
+use web_time::Instant;
 
 pub(crate) async fn handshake(
     stream: Stream,
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 5ff4cfa27d6..970db3f1ec3 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.46.2
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.46.1
 
 - Deprecate `Rpc` in preparation for removing it from the public API because it is an internal type.
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index aa11a8a8309..35bc3eef9bd 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Gossipsub protocol for libp2p"
-version = "0.46.1"
+version = "0.46.2"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -11,20 +11,20 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [features]
-wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
+wasm-bindgen = ["getrandom/js"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
 base64 = "0.22.1"
 byteorder = "1.5.0"
 bytes = "1.6"
-either = "1.12"
+either = "1.11"
 fnv = "1.0.7"
 futures = { workspace = true }
 futures-ticker = "0.0.3"
 getrandom = "0.2.15"
 hex_fmt = "0.3.0"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-swarm = { workspace = true }
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
index b4a40b91a74..b24da318582 100644
--- a/protocols/gossipsub/src/backoff.rs
+++ b/protocols/gossipsub/src/backoff.rs
@@ -20,13 +20,13 @@
 
 //! Data structure for efficiently storing known back-off's when pruning peers.
 use crate::topic::TopicHash;
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::collections::{
     hash_map::{Entry, HashMap},
     HashSet,
 };
 use std::time::Duration;
+use web_time::Instant;
 
 #[derive(Copy, Clone)]
 struct HeartbeatIndex(usize);
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 6da2aceaa08..b508959317b 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -34,7 +34,6 @@ use futures_ticker::Ticker;
 use prometheus_client::registry::Registry;
 use rand::{seq::SliceRandom, thread_rng};
 
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol::Ip4, multiaddr::Protocol::Ip6, Endpoint, Multiaddr};
 use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
@@ -44,6 +43,7 @@ use libp2p_swarm::{
     ConnectionDenied, ConnectionId, NetworkBehaviour, NotifyHandler, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
+use web_time::{Instant, SystemTime};
 
 use crate::backoff::BackoffStorage;
 use crate::config::{Config, ValidationMode};
@@ -64,7 +64,6 @@ use crate::types::{
 use crate::types::{PeerConnections, PeerKind, RpcOut};
 use crate::{rpc_proto::proto, TopicScoreParams};
 use crate::{PublishError, SubscriptionError, ValidationError};
-use instant::SystemTime;
 use quick_protobuf::{MessageWrite, Writer};
 use std::{cmp::Ordering::Equal, fmt::Debug};
 
diff --git a/protocols/gossipsub/src/gossip_promises.rs b/protocols/gossipsub/src/gossip_promises.rs
index 9538622c0dc..bdf58b74fc2 100644
--- a/protocols/gossipsub/src/gossip_promises.rs
+++ b/protocols/gossipsub/src/gossip_promises.rs
@@ -21,9 +21,9 @@
 use crate::peer_score::RejectReason;
 use crate::MessageId;
 use crate::ValidationError;
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::collections::HashMap;
+use web_time::Instant;
 
 /// Tracks recently sent `IWANT` messages and checks if peers respond to them.
 #[derive(Default)]
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
index e91f81776e7..88def13a521 100644
--- a/protocols/gossipsub/src/handler.rs
+++ b/protocols/gossipsub/src/handler.rs
@@ -26,7 +26,6 @@ use asynchronous_codec::Framed;
 use futures::future::Either;
 use futures::prelude::*;
 use futures::StreamExt;
-use instant::Instant;
 use libp2p_core::upgrade::DeniedUpgrade;
 use libp2p_swarm::handler::{
     ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
@@ -38,6 +37,7 @@ use std::{
     pin::Pin,
     task::{Context, Poll},
 };
+use web_time::Instant;
 
 /// The event emitted by the Handler. This informs the behaviour of various events created
 /// by the handler.
diff --git a/protocols/gossipsub/src/peer_score.rs b/protocols/gossipsub/src/peer_score.rs
index 386cc85bd3c..ac24fc91970 100644
--- a/protocols/gossipsub/src/peer_score.rs
+++ b/protocols/gossipsub/src/peer_score.rs
@@ -24,11 +24,11 @@
 use crate::metrics::{Metrics, Penalty};
 use crate::time_cache::TimeCache;
 use crate::{MessageId, TopicHash};
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::collections::{hash_map, HashMap, HashSet};
 use std::net::IpAddr;
 use std::time::Duration;
+use web_time::Instant;
 
 mod params;
 use crate::ValidationError;
diff --git a/protocols/gossipsub/src/time_cache.rs b/protocols/gossipsub/src/time_cache.rs
index 89fd4afee09..a3e5c01ac4c 100644
--- a/protocols/gossipsub/src/time_cache.rs
+++ b/protocols/gossipsub/src/time_cache.rs
@@ -21,13 +21,13 @@
 //! This implements a time-based LRU cache for checking gossipsub message duplicates.
 
 use fnv::FnvHashMap;
-use instant::Instant;
 use std::collections::hash_map::{
     self,
     Entry::{Occupied, Vacant},
 };
 use std::collections::VecDeque;
 use std::time::Duration;
+use web_time::Instant;
 
 struct ExpiringElement<Element> {
     /// The element that expires
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index bd0c9857cb5..57ac92d2f6f 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -17,6 +17,8 @@
   See [PR 5148](https://github.com/libp2p/rust-libp2p/pull/5148).
 - Derive `Copy` for `kbucket::key::Key<T>`.
   See [PR 5317](https://github.com/libp2p/rust-libp2p/pull/5317).
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 ## 0.45.3
 
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 7d3e3caa047..494d812c6ec 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 arrayvec = "0.7.4"
 bytes = "1"
-either = "1.12"
+either = "1.11"
 fnv = "1.0"
 asynchronous-codec = { workspace = true }
 futures = { workspace = true }
@@ -29,7 +29,7 @@ smallvec = "1.13.2"
 uint = "0.9"
 void = "1.0"
 futures-timer = "3.0.3"
-instant = "0.1.13"
+web-time = { workspace = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 thiserror = "1"
 tracing = { workspace = true }
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index fb77f3c0e0f..302433a8d70 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -36,7 +36,6 @@ use crate::record::{
 use crate::K_VALUE;
 use crate::{jobs::*, protocol};
 use fnv::{FnvHashMap, FnvHashSet};
-use instant::Instant;
 use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{
@@ -57,6 +56,7 @@ use std::time::Duration;
 use std::vec;
 use thiserror::Error;
 use tracing::Level;
+use web_time::Instant;
 
 pub use crate::query::QueryStats;
 
diff --git a/protocols/kad/src/bootstrap.rs b/protocols/kad/src/bootstrap.rs
index 58fa662d414..bcb9d0cccf3 100644
--- a/protocols/kad/src/bootstrap.rs
+++ b/protocols/kad/src/bootstrap.rs
@@ -171,7 +171,7 @@ impl futures::Future for ThrottleTimer {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use instant::Instant;
+    use web_time::Instant;
 
     const MS_5: Duration = Duration::from_millis(5);
     const MS_100: Duration = Duration::from_millis(100);
diff --git a/protocols/kad/src/jobs.rs b/protocols/kad/src/jobs.rs
index f1631ed6ad1..537f652b7a4 100644
--- a/protocols/kad/src/jobs.rs
+++ b/protocols/kad/src/jobs.rs
@@ -64,13 +64,13 @@
 use crate::record::{self, store::RecordStore, ProviderRecord, Record};
 use futures::prelude::*;
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::collections::HashSet;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Duration;
 use std::vec;
+use web_time::Instant;
 
 /// The maximum number of queries towards which background jobs
 /// are allowed to start new queries on an invocation of
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 6eb2e42909a..7ed10f7f853 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -78,7 +78,8 @@ pub use entry::*;
 use arrayvec::ArrayVec;
 use bucket::KBucket;
 use std::collections::VecDeque;
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use web_time::Instant;
 
 /// Maximum number of k-buckets.
 const NUM_BUCKETS: usize = 256;
diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs
index 9803af00579..9d2ef56f5d8 100644
--- a/protocols/kad/src/protocol.rs
+++ b/protocols/kad/src/protocol.rs
@@ -31,7 +31,6 @@ use crate::record::{self, Record};
 use asynchronous_codec::{Decoder, Encoder, Framed};
 use bytes::BytesMut;
 use futures::prelude::*;
-use instant::Instant;
 use libp2p_core::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
@@ -40,6 +39,7 @@ use std::marker::PhantomData;
 use std::time::Duration;
 use std::{io, iter};
 use tracing::debug;
+use web_time::Instant;
 
 /// The protocol name used for negotiating with multistream-select.
 pub(crate) const DEFAULT_PROTO_NAME: StreamProtocol = StreamProtocol::new("/ipfs/kad/1.0.0");
diff --git a/protocols/kad/src/query.rs b/protocols/kad/src/query.rs
index bb240d5864a..cf102040a7a 100644
--- a/protocols/kad/src/query.rs
+++ b/protocols/kad/src/query.rs
@@ -30,9 +30,9 @@ use crate::kbucket::{Key, KeyBytes};
 use crate::{ALPHA_VALUE, K_VALUE};
 use either::Either;
 use fnv::FnvHashMap;
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::{num::NonZeroUsize, time::Duration};
+use web_time::Instant;
 
 /// A `QueryPool` provides an aggregate state machine for driving `Query`s to completion.
 ///
diff --git a/protocols/kad/src/query/peers/closest.rs b/protocols/kad/src/query/peers/closest.rs
index a0b5a96708a..2505ee2e9b2 100644
--- a/protocols/kad/src/query/peers/closest.rs
+++ b/protocols/kad/src/query/peers/closest.rs
@@ -22,9 +22,9 @@ use super::*;
 
 use crate::kbucket::{Distance, Key, KeyBytes};
 use crate::{ALPHA_VALUE, K_VALUE};
-use instant::Instant;
 use std::collections::btree_map::{BTreeMap, Entry};
 use std::{num::NonZeroUsize, time::Duration};
+use web_time::Instant;
 
 pub(crate) mod disjoint;
 /// A peer iterator for a dynamically changing list of peers, sorted by increasing
diff --git a/protocols/kad/src/record.rs b/protocols/kad/src/record.rs
index 4eb8e861c6f..cb7c4b866fc 100644
--- a/protocols/kad/src/record.rs
+++ b/protocols/kad/src/record.rs
@@ -23,13 +23,13 @@
 pub mod store;
 
 use bytes::Bytes;
-use instant::Instant;
 use libp2p_core::{multihash::Multihash, Multiaddr};
 use libp2p_identity::PeerId;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::hash::{Hash, Hasher};
+use web_time::Instant;
 
 /// The (opaque) key of a record.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
diff --git a/protocols/perf/CHANGELOG.md b/protocols/perf/CHANGELOG.md
index 4e448d7f44a..d83e8b48472 100644
--- a/protocols/perf/CHANGELOG.md
+++ b/protocols/perf/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.3.0
 
 - Continuously measure on single connection (iperf-style).
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 6ed6baa0714..0d379f77353 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-perf"
 edition = "2021"
 rust-version = { workspace = true }
 description = "libp2p perf protocol implementation"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -16,7 +16,7 @@ clap = { version = "4.5.4", features = ["derive"] }
 futures = { workspace = true }
 futures-bounded = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p = { workspace = true, features = ["tokio", "tcp", "quic", "tls", "yamux", "dns"] }
 libp2p-core = { workspace = true }
 libp2p-dns = { workspace = true, features = ["tokio"] }
diff --git a/protocols/perf/src/bin/perf.rs b/protocols/perf/src/bin/perf.rs
index 9ac8f0a6cde..9a4cfb8bcac 100644
--- a/protocols/perf/src/bin/perf.rs
+++ b/protocols/perf/src/bin/perf.rs
@@ -23,7 +23,6 @@ use std::{net::SocketAddr, str::FromStr};
 use anyhow::{bail, Result};
 use clap::Parser;
 use futures::StreamExt;
-use instant::{Duration, Instant};
 use libp2p::core::{multiaddr::Protocol, upgrade, Multiaddr};
 use libp2p::identity::PeerId;
 use libp2p::swarm::{NetworkBehaviour, Swarm, SwarmEvent};
@@ -32,6 +31,7 @@ use libp2p_perf::{client, server};
 use libp2p_perf::{Final, Intermediate, Run, RunParams, RunUpdate};
 use serde::{Deserialize, Serialize};
 use tracing_subscriber::EnvFilter;
+use web_time::{Duration, Instant};
 
 #[derive(Debug, Parser)]
 #[clap(name = "libp2p perf client")]
diff --git a/protocols/perf/src/lib.rs b/protocols/perf/src/lib.rs
index f9db96aa9d9..be950ac87a2 100644
--- a/protocols/perf/src/lib.rs
+++ b/protocols/perf/src/lib.rs
@@ -26,8 +26,8 @@
 
 use std::fmt::Display;
 
-use instant::Duration;
 use libp2p_swarm::StreamProtocol;
+use web_time::Duration;
 
 pub mod client;
 mod protocol;
diff --git a/protocols/perf/src/protocol.rs b/protocols/perf/src/protocol.rs
index d2d65b42303..f995bbe2d3b 100644
--- a/protocols/perf/src/protocol.rs
+++ b/protocols/perf/src/protocol.rs
@@ -19,8 +19,8 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures_timer::Delay;
-use instant::Instant;
 use std::time::Duration;
+use web_time::Instant;
 
 use futures::{
     future::{select, Either},
diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md
index 17338a4ba9a..65d45a69f23 100644
--- a/protocols/ping/CHANGELOG.md
+++ b/protocols/ping/CHANGELOG.md
@@ -4,6 +4,9 @@
   `ping::Event` can now be shared between threads.
   See [PR 5250]
 
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 [PR 5250]: https://github.com/libp2p/rust-libp2p/pull/5250
 
 ## 0.44.0
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index c436478668c..99597fd5fe8 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -11,10 +11,10 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.12.0"
+either = "1.11.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index fe84cb4ea59..9b4d7da98db 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -19,10 +19,10 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures::prelude::*;
-use instant::Instant;
 use libp2p_swarm::StreamProtocol;
 use rand::{distributions, prelude::*};
 use std::{io, time::Duration};
+use web_time::Instant;
 
 pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0");
 
diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index 83dbf4739ac..125f51e4961 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.17.3
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.17.2
 
 - Fix support for unlimited relay connection according to spec.
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index aa185a42af0..4981c94d9c8 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-relay"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Communications relaying for libp2p"
-version = "0.17.2"
+version = "0.17.3"
 authors = ["Parity Technologies <admin@parity.io>", "Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -17,6 +17,7 @@ either = "1.12.0"
 futures = { workspace = true }
 futures-timer = "3"
 futures-bounded = { workspace = true }
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
@@ -27,7 +28,6 @@ static_assertions = "1"
 thiserror = "1.0"
 tracing = { workspace = true }
 void = "1"
-web-time = "1"
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
diff --git a/protocols/rendezvous/CHANGELOG.md b/protocols/rendezvous/CHANGELOG.md
index e60699da734..4aa18985f1e 100644
--- a/protocols/rendezvous/CHANGELOG.md
+++ b/protocols/rendezvous/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.14.1
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.14.0
 
 
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 2d344e5e250..6879a4093ce 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-rendezvous"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Rendezvous protocol for libp2p"
-version = "0.14.0"
+version = "0.14.1"
 authors = ["The COMIT guys <hello@comit.network>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -16,7 +16,7 @@ async-trait = "0.1"
 bimap = "0.6.3"
 futures = { workspace = true, features = ["std"] }
 futures-timer = "3.0.3"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index a6e523302d7..bee91f28e88 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -527,7 +527,7 @@ pub struct CookieNamespaceMismatch;
 
 #[cfg(test)]
 mod tests {
-    use instant::SystemTime;
+    use web_time::SystemTime;
 
     use libp2p_core::PeerRecord;
     use libp2p_identity as identity;
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index e9d92b08857..a181adc8c52 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 - Deprecate `Behaviour::add_address` in favor of `Swarm::add_peer_address`.
   See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 ## 0.26.1
 
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 794a3e74956..900efd70d8b 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-trait = "0.1"
 cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
 futures = { workspace = true }
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 75e18a6a5af..b669bb0091a 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -5,6 +5,8 @@
   The address is broadcast to all behaviours via `FromSwarm::NewExternalAddrOfPeer`.
   Protocols that want to collect these addresses can use the new `PeerAddresses` utility.
   See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 ## 0.44.1
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 17a66abba0a..714e8a8f349 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -11,12 +11,12 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.12.0"
+either = "1.11.0"
 fnv = "1.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
 getrandom = { version = "0.2.15", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }
@@ -41,7 +41,7 @@ wasm-bindgen = ["dep:wasm-bindgen-futures", "dep:getrandom"]
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
-either = "1.12.0"
+either = "1.11.0"
 futures = { workspace = true }
 libp2p-identify = { path = "../protocols/identify" }                # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-identity = { workspace = true, features = ["ed25519"] }
@@ -54,7 +54,7 @@ libp2p-yamux = { path = "../muxers/yamux" }                         # Using `pat
 quickcheck = { workspace = true }
 void = "1"
 once_cell = "1.19.0"
-trybuild = "1.0.96"
+trybuild = "1.0.95"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index c701f1773e6..69f95bca1d3 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -44,7 +44,6 @@ use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use futures::{stream, FutureExt};
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::connection::ConnectedPoint;
 use libp2p_core::multiaddr::Multiaddr;
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerEvent, StreamMuxerExt, SubstreamBox};
@@ -59,6 +58,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::task::Waker;
 use std::time::Duration;
 use std::{fmt, io, mem, pin::Pin, task::Context, task::Poll};
+use web_time::Instant;
 
 static NEXT_CONNECTION_ID: AtomicUsize = AtomicUsize::new(1);
 
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index f876c39f12c..236f76e2fcc 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -37,7 +37,6 @@ use futures::{
     ready,
     stream::FuturesUnordered,
 };
-use instant::{Duration, Instant};
 use libp2p_core::connection::Endpoint;
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
 use std::task::Waker;
@@ -51,6 +50,7 @@ use std::{
 };
 use tracing::Instrument;
 use void::Void;
+use web_time::{Duration, Instant};
 
 mod concurrent_dial;
 mod task;

From 3b61e57d0e72d371ccdfc134bd71cb3aa20addee Mon Sep 17 00:00:00 2001
From: EB <deveb1479@gmail.com>
Date: Sat, 8 Jun 2024 19:35:18 +0900
Subject: [PATCH 293/455] chore: remove one `std::`

chore: remove one `std::`

Pull-Request: #5450.
---
 core/src/transport.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/transport.rs b/core/src/transport.rs
index db8c083bd0a..2246f3db747 100644
--- a/core/src/transport.rs
+++ b/core/src/transport.rs
@@ -256,7 +256,7 @@ impl ListenerId {
     }
 }
 
-impl std::fmt::Display for ListenerId {
+impl fmt::Display for ListenerId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.0)
     }

From 927428fb0cbd27e3da8871df09af0650156719b2 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Sun, 9 Jun 2024 03:36:51 +0300
Subject: [PATCH 294/455] chore: Fixes versions and changelogs

Pull-Request: #5455.
---
 Cargo.lock                              | 10 +++++-----
 Cargo.toml                              | 10 +++++-----
 libp2p/CHANGELOG.md                     |  2 +-
 muxers/yamux/CHANGELOG.md               |  4 ++++
 muxers/yamux/Cargo.toml                 |  2 +-
 protocols/kad/CHANGELOG.md              |  2 +-
 protocols/ping/CHANGELOG.md             |  9 ++++++---
 protocols/ping/Cargo.toml               |  2 +-
 protocols/request-response/CHANGELOG.md |  7 +++++--
 protocols/request-response/Cargo.toml   |  2 +-
 swarm/CHANGELOG.md                      |  7 +++++--
 swarm/Cargo.toml                        |  2 +-
 transports/websocket/CHANGELOG.md       |  2 ++
 transports/websocket/Cargo.toml         |  2 +-
 14 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8ad67903c93..7366606fe15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.44.1"
+version = "0.44.2"
 dependencies = [
  "async-std",
  "either",
@@ -3228,7 +3228,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.26.3"
+version = "0.26.4"
 dependencies = [
  "anyhow",
  "async-std",
@@ -3293,7 +3293,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.44.2"
+version = "0.44.3"
 dependencies = [
  "async-std",
  "either",
@@ -3491,7 +3491,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.43.0"
+version = "0.43.1"
 dependencies = [
  "async-std",
  "either",
@@ -3552,7 +3552,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "async-std",
  "either",
diff --git a/Cargo.toml b/Cargo.toml
index 995951a01d6..00628ca23b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -93,16 +93,16 @@ libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.44.0", path = "transports/noise" }
 libp2p-perf = { version = "0.3.1", path = "protocols/perf" }
-libp2p-ping = { version = "0.44.1", path = "protocols/ping" }
+libp2p-ping = { version = "0.44.2", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.3", path = "transports/quic" }
 libp2p-relay = { version = "0.17.3", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.26.3", path = "protocols/request-response" }
+libp2p-request-response = { version = "0.26.4", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
-libp2p-swarm = { version = "0.44.2", path = "swarm" }
+libp2p-swarm = { version = "0.44.3", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.1", path = "transports/tcp" }
@@ -112,10 +112,10 @@ libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.1", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
-libp2p-websocket = { version = "0.43.0", path = "transports/websocket" }
+libp2p-websocket = { version = "0.43.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.3.0", path = "transports/webtransport-websys" }
-libp2p-yamux = { version = "0.45.1", path = "muxers/yamux" }
+libp2p-yamux = { version = "0.45.2", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 8b1a332769f..ed3ecbe2f20 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.54.0 -- unreleased
+## 0.54.0
 
 - Update individual crates.
     - Update to [`libp2p-kad` `v0.46.0`](protocols/kad/CHANGELOG.md#0460).
diff --git a/muxers/yamux/CHANGELOG.md b/muxers/yamux/CHANGELOG.md
index de608b195f8..295ee251f65 100644
--- a/muxers/yamux/CHANGELOG.md
+++ b/muxers/yamux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.45.2
+
+- Update `yamux` to version `v0.13.3`.`
+
 ## 0.45.1
 
 - Deprecate `WindowUpdateMode::on_receive`.
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 4d6d655e330..f56cd485b9b 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-yamux"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Yamux multiplexing protocol for libp2p"
-version = "0.45.1"
+version = "0.45.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 57ac92d2f6f..1d124fb37a2 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.46.0 -- unreleased
+## 0.46.0
 
 - Changed `FIND_NODE` response: now includes a list of closest peers when querying the recipient peer ID. Previously, this request yielded an empty response.
   See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md
index 65d45a69f23..507bf7532ba 100644
--- a/protocols/ping/CHANGELOG.md
+++ b/protocols/ping/CHANGELOG.md
@@ -1,11 +1,14 @@
-## 0.44.1 - unreleased
+## 0.44.2
+
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
+## 0.44.1
 
 - Impose `Sync` on `ping::Failure::Other`.
   `ping::Event` can now be shared between threads.
   See [PR 5250]
 
-- Use `web-time` instead of `instant`.
-  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 [PR 5250]: https://github.com/libp2p/rust-libp2p/pull/5250
 
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 99597fd5fe8..79c0a43aa69 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-ping"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Ping protocol for libp2p"
-version = "0.44.1"
+version = "0.44.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index a181adc8c52..beee817f024 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.26.4
+
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.26.3
 
 - Report failure when streams are at capacity.
@@ -10,8 +15,6 @@
 
 - Deprecate `Behaviour::add_address` in favor of `Swarm::add_peer_address`.
   See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
-- Use `web-time` instead of `instant`.
-  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 ## 0.26.1
 
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 900efd70d8b..4bc2378ae54 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-request-response"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Generic Request/Response Protocols"
-version = "0.26.3"
+version = "0.26.4"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index b669bb0091a..8cded416628 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.44.3
+
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.44.2
 
 - Allow `NetworkBehaviour`s to share addresses of peers.
@@ -5,8 +10,6 @@
   The address is broadcast to all behaviours via `FromSwarm::NewExternalAddrOfPeer`.
   Protocols that want to collect these addresses can use the new `PeerAddresses` utility.
   See [PR 4371](https://github.com/libp2p/rust-libp2p/pull/4371).
-- Use `web-time` instead of `instant`.
-  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 ## 0.44.1
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 714e8a8f349..338cbf91641 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.44.2"
+version = "0.44.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
index 192b1fa094e..d206cbac6a1 100644
--- a/transports/websocket/CHANGELOG.md
+++ b/transports/websocket/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.43.1
+
 ## 0.43.0
 
 
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index bcffe49a561..b022d95ca47 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebSocket transport for libp2p"
-version = "0.43.0"
+version = "0.43.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From 78fac65b3dc15d62a165945dacfb6fc5265cfcba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 08:50:28 +0000
Subject: [PATCH 295/455] deps: bump clap from 4.5.4 to 4.5.6

Pull-Request: #5458.
---
 Cargo.lock                       | 12 ++++++------
 examples/autonat/Cargo.toml      |  2 +-
 examples/dcutr/Cargo.toml        |  2 +-
 examples/file-sharing/Cargo.toml |  2 +-
 examples/ipfs-kad/Cargo.toml     |  2 +-
 examples/relay-server/Cargo.toml |  2 +-
 misc/keygen/Cargo.toml           |  2 +-
 misc/server/Cargo.toml           |  2 +-
 protocols/dcutr/Cargo.toml       |  2 +-
 protocols/perf/Cargo.toml        |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7366606fe15..40d46b5c754 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -950,9 +950,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -960,9 +960,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"
 dependencies = [
  "anstream",
  "anstyle",
@@ -972,9 +972,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index ce703ca742e..9bdf0be393d 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = { workspace = true }
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index 97fabbbd006..c1b4bbc6e7e 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index b13c30885cb..7cbb96cc7ed 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index f492fac7fb3..115c604269f 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 env_logger = "0.10"
 futures = { workspace = true }
 anyhow = "1.0.86"
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index e792ca48dd5..12d3e2467ce 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
 futures = { workspace = true }
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 22b546aff10..003993a512c 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 release = false
 
 [dependencies]
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 2c146c0c6e3..798ecfa07a9 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 
 [dependencies]
 base64 = "0.22"
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 futures-timer = "3"
 axum = "0.7"
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index daf4846a2ae..24a5560f5b5 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -29,7 +29,7 @@ futures-bounded = { workspace = true }
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
 libp2p-noise = { workspace = true }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 0d379f77353..4f154ab1b08 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 futures-bounded = { workspace = true }
 futures-timer = "3.0"

From cc1f777009c389506056909c04bd56e12a13c532 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 09:03:49 +0000
Subject: [PATCH 296/455] deps: bump regex from 1.10.4 to 1.10.5

Pull-Request: #5459.
---
 Cargo.lock                     | 4 ++--
 protocols/gossipsub/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 40d46b5c754..717d872ed30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4794,9 +4794,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 35bc3eef9bd..f556443477f 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -31,7 +31,7 @@ libp2p-swarm = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-regex = "1.10.4"
+regex = "1.10.5"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 smallvec = "1.13.2"

From 75483e8dbe9beceacebe4ab19467400ea490d0b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 09:17:25 +0000
Subject: [PATCH 297/455] deps: bump rustls from 0.23.8 to 0.23.9

Pull-Request: #5460.
---
 Cargo.lock                 | 14 +++++++-------
 transports/quic/Cargo.toml |  2 +-
 transports/tls/Cargo.toml  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 717d872ed30..774e02e2506 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1727,7 +1727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.8",
+ "rustls 0.23.9",
  "rustls-pki-types",
 ]
 
@@ -3159,7 +3159,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustls 0.23.8",
+ "rustls 0.23.9",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -3384,7 +3384,7 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.23.8",
+ "rustls 0.23.9",
  "rustls-webpki 0.101.7",
  "thiserror",
  "tokio",
@@ -4593,7 +4593,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.8",
+ "rustls 0.23.9",
  "thiserror",
  "tokio",
  "tracing",
@@ -4609,7 +4609,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash",
- "rustls 0.23.8",
+ "rustls 0.23.9",
  "slab",
  "thiserror",
  "tinyvec",
@@ -5151,9 +5151,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.8"
+version = "0.23.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740"
+checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b"
 dependencies = [
  "once_cell",
  "ring 0.17.8",
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 11eee04e199..3f99abf52e7 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -20,7 +20,7 @@ libp2p-identity = { workspace = true }
 parking_lot = "0.12.3"
 quinn = { version = "0.11.1", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
-rustls = { version = "0.23.8", default-features = false }
+rustls = { version = "0.23.9", default-features = false }
 thiserror = "1.0.61"
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 9bcff3bc88b..a4817f20336 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -22,7 +22,7 @@ yasna = "0.5.2"
 
 # Exposed dependencies. Breaking changes to these are breaking changes to us.
 [dependencies.rustls]
-version = "0.23.8"
+version = "0.23.9"
 default-features = false
 features = ["ring", "std"] # Must enable this to allow for custom verification code.
 

From 60e32c9d3b4bee42ac698791e917e1587eaa1388 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Tue, 11 Jun 2024 01:17:16 +0300
Subject: [PATCH 298/455] fix(ping): Fix panic in WASM caused by retrying on
 dial upgrade errors

This PR workarounds async-rs/futures-timer#74 issue.

Fixes #5442

Pull-Request: #5447.
---
 protocols/ping/CHANGELOG.md   |  3 +++
 protocols/ping/src/handler.rs | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md
index 507bf7532ba..7c7d7f3a54f 100644
--- a/protocols/ping/CHANGELOG.md
+++ b/protocols/ping/CHANGELOG.md
@@ -3,6 +3,9 @@
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
+- Fix panic in WASM caused by retrying on dial upgrade errors.
+  See [PR 5447](https://github.com/libp2p/rust-libp2p/pull/5447).
+
 ## 0.44.1
 
 - Impose `Sync` on `ping::Failure::Other`.
diff --git a/protocols/ping/src/handler.rs b/protocols/ping/src/handler.rs
index b9bd25c52ea..2816cdc4048 100644
--- a/protocols/ping/src/handler.rs
+++ b/protocols/ping/src/handler.rs
@@ -184,6 +184,18 @@ impl Handler {
     ) {
         self.outbound = None; // Request a new substream on the next `poll`.
 
+        // Timer is already polled and expired before substream request is initiated
+        // and will be polled again later on in our `poll` because we reset `self.outbound`.
+        //
+        // `futures-timer` allows an expired timer to be polled again and returns
+        // immediately `Poll::Ready`. However in its WASM implementation there is
+        // a bug that causes the expired timer to panic.
+        // This is a workaround until a proper fix is merged and released.
+        // See libp2p/rust-libp2p#5447 for more info.
+        //
+        // TODO: remove when async-rs/futures-timer#74 gets merged.
+        self.interval.reset(Duration::new(0, 0));
+
         let error = match error {
             StreamUpgradeError::NegotiationFailed => {
                 debug_assert_eq!(self.state, State::Active);

From 65658f5c81c601f8ed558bc688c9bce6365011cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 09:56:11 +0000
Subject: [PATCH 299/455] deps: bump quinn from 0.11.1 to 0.11.2

Pull-Request: #5462.
---
 Cargo.lock                 | 4 ++--
 transports/quic/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 774e02e2506..300c64f48ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4581,9 +4581,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73"
+checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
 dependencies = [
  "async-io 2.3.3",
  "async-std",
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 3f99abf52e7..c7e031b1cfd 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.3"
-quinn = { version = "0.11.1", default-features = false, features = ["rustls", "futures-io"] }
+quinn = { version = "0.11.2", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.9", default-features = false }
 thiserror = "1.0.61"

From 28dd3b21571e3de374ea373deb731f2f7abc7a74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 10:25:03 +0000
Subject: [PATCH 300/455] deps: bump futures-bounded from 0.2.3 to 0.2.4

Pull-Request: #5461.
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 300c64f48ef..7b1f9685b24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1642,9 +1642,9 @@ dependencies = [
 
 [[package]]
 name = "futures-bounded"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173"
+checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e"
 dependencies = [
  "futures-timer",
  "futures-util",
diff --git a/Cargo.toml b/Cargo.toml
index 00628ca23b8..0dd5b9075cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,7 +72,7 @@ rust-version = "1.75.0"
 
 [workspace.dependencies]
 asynchronous-codec = { version = "0.7.0" }
-futures-bounded = { version = "0.2.3" }
+futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }

From c44ed01a2636dd433c1a2563bb79b63472a5c66e Mon Sep 17 00:00:00 2001
From: todaymoon <csgcgl@foxmail.com>
Date: Wed, 12 Jun 2024 19:37:45 +0900
Subject: [PATCH 301/455] chore: fix some comments

fix some comments

Pull-Request: #5456.
---
 protocols/identify/Cargo.toml                       | 2 +-
 protocols/request-response/tests/error_reporting.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index e75a2c4c4bc..86425d580e9 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
-description = "Nodes identifcation protocol for libp2p"
+description = "Nodes identification protocol for libp2p"
 version = "0.44.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
diff --git a/protocols/request-response/tests/error_reporting.rs b/protocols/request-response/tests/error_reporting.rs
index e78bba926e2..19f323e169f 100644
--- a/protocols/request-response/tests/error_reporting.rs
+++ b/protocols/request-response/tests/error_reporting.rs
@@ -195,7 +195,7 @@ async fn report_outbound_failure_on_max_streams() {
         assert_eq!(action, Action::FailOnMaxStreams);
 
         // A task for sending back a response is already scheduled so max concurrent
-        // streams is reached and no new tasks can be sheduled.
+        // streams is reached and no new tasks can be scheduled.
         //
         // We produce the failure by creating new request before we response.
         let outbound_req_id = swarm2

From 9708b6377233fbb11ebd1e518b8b63c6f67cbb58 Mon Sep 17 00:00:00 2001
From: Rikard Hjort <8545447+hjorthjort@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:56:46 +0200
Subject: [PATCH 302/455] chore(tutorials): fix typo

Fixes typo: "dailing" -> "dialing"

Pull-Request: #5428.
---
 libp2p/src/tutorials/hole_punching.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libp2p/src/tutorials/hole_punching.rs b/libp2p/src/tutorials/hole_punching.rs
index f9f42432ba4..0963c0ca59e 100644
--- a/libp2p/src/tutorials/hole_punching.rs
+++ b/libp2p/src/tutorials/hole_punching.rs
@@ -69,7 +69,7 @@
 //! Now let's make sure that the server is public, in other words let's make sure one can reach it
 //! through the Internet. First, either manually replace `$RELAY_SERVER_IP` in the following
 //! commands or `export RELAY_SERVER_IP=ipaddr` with the appropriate relay server `ipaddr` in
-//! the dailing client and listening client.
+//! the dialing client and listening client.
 //!
 //! Now, from the dialing client:
 //!

From fc9b1ad51655b79561e3c552859554e99e2b0040 Mon Sep 17 00:00:00 2001
From: taikoon <taikoonwang@proton.me>
Date: Wed, 12 Jun 2024 20:03:41 +0800
Subject: [PATCH 303/455] chore(transports): remove duplicate word

Pull-Request: #5449.
---
 transports/webrtc-websys/src/stream/poll_data_channel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transports/webrtc-websys/src/stream/poll_data_channel.rs b/transports/webrtc-websys/src/stream/poll_data_channel.rs
index f323d542eaf..dfd861de9df 100644
--- a/transports/webrtc-websys/src/stream/poll_data_channel.rs
+++ b/transports/webrtc-websys/src/stream/poll_data_channel.rs
@@ -13,7 +13,7 @@ use libp2p_webrtc_utils::MAX_MSG_LEN;
 use wasm_bindgen::prelude::*;
 use web_sys::{Event, MessageEvent, RtcDataChannel, RtcDataChannelEvent, RtcDataChannelState};
 
-/// [`PollDataChannel`] is a wrapper around around [`RtcDataChannel`] which implements [`AsyncRead`] and [`AsyncWrite`].
+/// [`PollDataChannel`] is a wrapper around [`RtcDataChannel`] which implements [`AsyncRead`] and [`AsyncWrite`].
 #[derive(Debug, Clone)]
 pub(crate) struct PollDataChannel {
     /// The [`RtcDataChannel`] being wrapped.

From 5089299ff96fd8ee68d8ee45b9889a0ca40c9453 Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Wed, 12 Jun 2024 11:26:33 -0400
Subject: [PATCH 304/455] fix: require rand feature when generating ecdsa key

Using `libp2p-identity` as a crate did not work if `default-features` is `false` and `ecdsa` is included.

The following command also fails:
```
cargo check --no-default-features --features "ecdsa,ed25519,peerid,secp256k1"
```

Now, this command works

Pull-Request: #5212.
---
 Cargo.lock            | 2 +-
 Cargo.toml            | 2 +-
 identity/CHANGELOG.md | 5 +++++
 identity/Cargo.toml   | 2 +-
 identity/src/ecdsa.rs | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7b1f9685b24..9e7e03bc7ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2862,7 +2862,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identity"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "asn1_der",
  "base64 0.22.1",
diff --git a/Cargo.toml b/Cargo.toml
index 0dd5b9075cb..29c0664735f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
-libp2p-identity = { version = "0.2.8" }
+libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md
index 004943ce195..9670a843130 100644
--- a/identity/CHANGELOG.md
+++ b/identity/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.9
+
+- Add `rand` feature gate to ecdsa methods requiring a random number generator.
+  See [PR 5212](https://github.com/libp2p/rust-libp2p/pull/5212).
+
 ## 0.2.8
 
 - Bump `ring` to `0.17.5.
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index e7d464a520a..ea49a1adbb4 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-identity"
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
 description = "Data structures and algorithms for identifying peers in libp2p."
 rust-version = "1.73.0" # MUST NOT inherit from workspace because we don't want to publish breaking changes to `libp2p-identity`.
diff --git a/identity/src/ecdsa.rs b/identity/src/ecdsa.rs
index 2f1a286d46d..65cbe885b86 100644
--- a/identity/src/ecdsa.rs
+++ b/identity/src/ecdsa.rs
@@ -94,6 +94,7 @@ pub struct SecretKey(SigningKey);
 
 impl SecretKey {
     /// Generate a new random ECDSA secret key.
+    #[cfg(feature = "rand")]
     pub fn generate() -> SecretKey {
         SecretKey(SigningKey::random(&mut rand::thread_rng()))
     }

From 7fa6684444dc68318ce6d7e0f71cc2ff52a73768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 12 Jun 2024 19:11:34 +0100
Subject: [PATCH 305/455] chore: address clippy beta lints

Pull-Request: #5467.
---
 Cargo.lock                                    | 37 ++++++++++++++++---
 Cargo.toml                                    |  2 +-
 core/src/upgrade.rs                           |  6 +--
 examples/chat/README.md                       |  2 +-
 .../distributed-key-value-store/README.md     | 10 ++---
 examples/file-sharing/README.md               | 20 +++++-----
 examples/ipfs-private/README.md               |  6 +--
 examples/relay-server/README.md               |  2 +-
 libp2p/src/builder.rs                         |  4 +-
 misc/multistream-select/src/protocol.rs       | 12 ++----
 protocols/gossipsub/src/behaviour.rs          |  2 +
 protocols/gossipsub/src/lib.rs                | 16 ++++----
 protocols/gossipsub/src/protocol.rs           | 14 -------
 protocols/identify/src/lib.rs                 |  6 +--
 protocols/kad/src/behaviour.rs                | 10 ++---
 protocols/kad/src/lib.rs                      | 18 ++++-----
 swarm/src/handler.rs                          |  1 +
 transports/dns/src/lib.rs                     | 14 +++----
 transports/noise/src/io/framed.rs             | 10 ++---
 transports/webrtc/src/tokio/certificate.rs    |  1 +
 20 files changed, 99 insertions(+), 94 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9e7e03bc7ec..7fab00010fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1327,6 +1327,15 @@ dependencies = [
  "rusticata-macros",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -4008,6 +4017,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -4437,6 +4452,12 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -5897,11 +5918,14 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.23"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
+ "deranged",
  "itoa",
+ "num-conv",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -5909,16 +5933,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.10"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 29c0664735f..822c1692960 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -144,7 +144,7 @@ libp2p-identity = { path = "identity" }
 [workspace.lints]
 rust.unreachable_pub = "warn"
 clippy.used_underscore_binding = "warn"
-clippy.pedantic = "allow"
+clippy.pedantic = { level = "allow", priority = -1 }
 clippy.type_complexity = "allow"
 clippy.unnecessary_wraps = "warn"
 clippy.manual_let_else = "warn"
diff --git a/core/src/upgrade.rs b/core/src/upgrade.rs
index 69561fbebd8..7a1fd3724d0 100644
--- a/core/src/upgrade.rs
+++ b/core/src/upgrade.rs
@@ -52,9 +52,9 @@
 //! can be used by the user to control the behaviour of the protocol.
 //!
 //! > **Note**: You can use the `apply_inbound` or `apply_outbound` methods to try upgrade a
-//!             connection or substream. However if you use the recommended `Swarm` or
-//!             `ConnectionHandler` APIs, the upgrade is automatically handled for you and you don't
-//!             need to use these methods.
+//! > connection or substream. However if you use the recommended `Swarm` or
+//! > `ConnectionHandler` APIs, the upgrade is automatically handled for you and you don't
+//! > need to use these methods.
 //!
 
 mod apply;
diff --git a/examples/chat/README.md b/examples/chat/README.md
index 96bad137b07..2dbf585100b 100644
--- a/examples/chat/README.md
+++ b/examples/chat/README.md
@@ -11,7 +11,7 @@ It showcases how peers can connect, discover each other using mDNS, and engage i
 	```
 
 2. Mutual mDNS discovery may take a few seconds. When each peer does discover the other
-it will print a message like:
+   it will print a message like:
 	```sh
 	mDNS discovered a new peer: {peerId}
 	```
diff --git a/examples/distributed-key-value-store/README.md b/examples/distributed-key-value-store/README.md
index 6065609cfdf..4a44e0c5427 100644
--- a/examples/distributed-key-value-store/README.md
+++ b/examples/distributed-key-value-store/README.md
@@ -9,10 +9,10 @@ This example showcases a basic distributed key-value store implemented using **l
 1.  Open two terminal windows, type `cargo run` and press Enter.
 
 2.  In terminal one, type `PUT my-key my-value` and press Enter.
-This command will store the value `my-value` with the key `my-key` in the distributed key-value store.
+    This command will store the value `my-value` with the key `my-key` in the distributed key-value store.
 
 3.  In terminal two, type `GET my-key` and press Enter.
-This command will retrieve the value associated with the key `my-key` from the key-value store.
+    This command will retrieve the value associated with the key `my-key` from the key-value store.
 
 4.  To exit, press `Ctrl-c` in each terminal window to gracefully close the instances.
 
@@ -22,13 +22,13 @@ This command will retrieve the value associated with the key `my-key` from the k
 You can also use provider records instead of key-value records in the distributed store.
 
 1.  Open two terminal windows and start two instances of the key-value store.
-If your local network supports mDNS, the instances will automatically connect.
+    If your local network supports mDNS, the instances will automatically connect.
 
 2.  In terminal one, type `PUT_PROVIDER my-key` and press Enter.
-This command will register the peer as a provider for the key `my-key` in the distributed key-value store.
+    This command will register the peer as a provider for the key `my-key` in the distributed key-value store.
 
 3.  In terminal two, type `GET_PROVIDERS my-key` and press Enter.
-This command will retrieve the list of providers for the key `my-key` from the key-value store.
+    This command will retrieve the list of providers for the key `my-key` from the key-value store.
 
 4.  To exit, press `Ctrl-c` in each terminal window to gracefully close the instances.
 
diff --git a/examples/file-sharing/README.md b/examples/file-sharing/README.md
index 2a2b3ec5317..5424026bb12 100644
--- a/examples/file-sharing/README.md
+++ b/examples/file-sharing/README.md
@@ -12,28 +12,28 @@ Retrievers can locate and retrieve files by their names from any node in the net
 Let's understand the flow of the file sharing process:
 
 - **File Providers**: Nodes A and B serve as file providers.
-Each node offers a specific file: file FA for node A and file FB for node B.
-To make their files available, they advertise themselves as providers on the DHT using `libp2p-kad`.
-This enables other nodes in the network to discover and retrieve their files.
+  Each node offers a specific file: file FA for node A and file FB for node B.
+  To make their files available, they advertise themselves as providers on the DHT using `libp2p-kad`.
+  This enables other nodes in the network to discover and retrieve their files.
 
 - **File Retrievers**: Node C acts as a file retriever.
-It wants to retrieve either file FA or FB.
-Using `libp2p-kad`, it can locate the providers for these files on the DHT without being directly connected to them.
-Node C connects to the corresponding provider node and requests the file content using `libp2p-request-response`.
+  It wants to retrieve either file FA or FB.
+  Using `libp2p-kad`, it can locate the providers for these files on the DHT without being directly connected to them.
+  Node C connects to the corresponding provider node and requests the file content using `libp2p-request-response`.
 
 - **DHT and Network Connectivity**: The DHT (Distributed Hash Table) plays a crucial role in the file sharing process.
-It allows nodes to store and discover information about file providers.
-Nodes in the network are interconnected via the DHT, enabling efficient file discovery and retrieval.
+  It allows nodes to store and discover information about file providers.
+  Nodes in the network are interconnected via the DHT, enabling efficient file discovery and retrieval.
 
 ## Architectural Properties
 
 The File Sharing application has the following architectural properties:
 
 - **Clean and Clonable Interface**: The application provides a clean and clonable async/await interface, allowing users to interact with the network layer seamlessly.
-The `Client` module encapsulates the necessary functionality for network communication.
+  The `Client` module encapsulates the necessary functionality for network communication.
 
 - **Efficient Network Handling**: The application operates with a single task that drives the network layer.
-This design choice ensures efficient network communication without the need for locks or complex synchronization mechanisms.
+  This design choice ensures efficient network communication without the need for locks or complex synchronization mechanisms.
 
 ## Usage
 
diff --git a/examples/ipfs-private/README.md b/examples/ipfs-private/README.md
index bc3b12a7ac8..ae7fc42c9c4 100644
--- a/examples/ipfs-private/README.md
+++ b/examples/ipfs-private/README.md
@@ -24,11 +24,11 @@ To run the example, follow these steps:
 2.  Once the example is running, you can interact with the IPFS node using the following commands:
 
     -   **Pubsub (Gossipsub):** You can use the gossipsub protocol to send and receive messages on the "chat" topic.
-    To send a message, type it in the console and press Enter.
-    The message will be broadcasted to other connected nodes using gossipsub.
+        To send a message, type it in the console and press Enter.
+        The message will be broadcasted to other connected nodes using gossipsub.
 
     -   **Ping:** You can ping other connected nodes to test network connectivity.
-    The example will display the round-trip time (RTT) for successful pings or indicate if a timeout occurs.
+        The example will display the round-trip time (RTT) for successful pings or indicate if a timeout occurs.
 
 
 ## Conclusion
diff --git a/examples/relay-server/README.md b/examples/relay-server/README.md
index ae2ab3fdfd8..cd8f0340a5a 100644
--- a/examples/relay-server/README.md
+++ b/examples/relay-server/README.md
@@ -16,7 +16,7 @@ To run the example, follow these steps:
    Replace `<seed>` with a seed value used to generate a deterministic peer ID for the relay node.
 
 2. The relay node will start listening for incoming connections.
-It will print the listening address once it is ready.
+   It will print the listening address once it is ready.
 
 3. Connect other **libp2p** nodes to the relay node by specifying the relay's listening address as one of the bootstrap nodes in their configuration.
 
diff --git a/libp2p/src/builder.rs b/libp2p/src/builder.rs
index c96c20d470a..de003314cca 100644
--- a/libp2p/src/builder.rs
+++ b/libp2p/src/builder.rs
@@ -575,7 +575,7 @@ mod tests {
 
     #[test]
     #[cfg(all(feature = "tokio", feature = "quic"))]
-    fn quic_bandwidth_metrics() -> Result<(), Box<dyn std::error::Error>> {
+    fn quic_bandwidth_metrics() {
         let _ = SwarmBuilder::with_new_identity()
             .with_tokio()
             .with_quic()
@@ -583,8 +583,6 @@ mod tests {
             .with_behaviour(|_| libp2p_swarm::dummy::Behaviour)
             .unwrap()
             .build();
-
-        Ok(())
     }
 
     #[test]
diff --git a/misc/multistream-select/src/protocol.rs b/misc/multistream-select/src/protocol.rs
index 2189c50e697..92b6acedaeb 100644
--- a/misc/multistream-select/src/protocol.rs
+++ b/misc/multistream-select/src/protocol.rs
@@ -136,24 +136,21 @@ pub(crate) enum Message {
 
 impl Message {
     /// Encodes a `Message` into its byte representation.
-    fn encode(&self, dest: &mut BytesMut) -> Result<(), ProtocolError> {
+    fn encode(&self, dest: &mut BytesMut) {
         match self {
             Message::Header(HeaderLine::V1) => {
                 dest.reserve(MSG_MULTISTREAM_1_0.len());
                 dest.put(MSG_MULTISTREAM_1_0);
-                Ok(())
             }
             Message::Protocol(p) => {
                 let len = p.as_ref().len() + 1; // + 1 for \n
                 dest.reserve(len);
                 dest.put(p.0.as_ref());
                 dest.put_u8(b'\n');
-                Ok(())
             }
             Message::ListProtocols => {
                 dest.reserve(MSG_LS.len());
                 dest.put(MSG_LS);
-                Ok(())
             }
             Message::Protocols(ps) => {
                 let mut buf = uvi::encode::usize_buffer();
@@ -166,12 +163,10 @@ impl Message {
                 encoded.push(b'\n');
                 dest.reserve(encoded.len());
                 dest.put(encoded.as_ref());
-                Ok(())
             }
             Message::NotAvailable => {
                 dest.reserve(MSG_PROTOCOL_NA.len());
                 dest.put(MSG_PROTOCOL_NA);
-                Ok(())
             }
         }
     }
@@ -288,7 +283,7 @@ where
 
     fn start_send(self: Pin<&mut Self>, item: Message) -> Result<(), Self::Error> {
         let mut buf = BytesMut::new();
-        item.encode(&mut buf)?;
+        item.encode(&mut buf);
         self.project()
             .inner
             .start_send(buf.freeze())
@@ -499,8 +494,7 @@ mod tests {
     fn encode_decode_message() {
         fn prop(msg: Message) {
             let mut buf = BytesMut::new();
-            msg.encode(&mut buf)
-                .unwrap_or_else(|_| panic!("Encoding message failed: {msg:?}"));
+            msg.encode(&mut buf);
             match Message::decode(buf.freeze()) {
                 Ok(m) => assert_eq!(m, msg),
                 Err(e) => panic!("Decoding failed: {e:?}"),
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index b508959317b..7980f362acf 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -549,6 +549,7 @@ where
     /// Unsubscribes from a topic.
     ///
     /// Returns [`Ok(true)`] if we were subscribed to this topic.
+    #[allow(clippy::unnecessary_wraps)]
     pub fn unsubscribe<H: Hasher>(&mut self, topic: &Topic<H>) -> Result<bool, PublishError> {
         tracing::debug!(%topic, "Unsubscribing from topic");
         let topic_hash = topic.hash();
@@ -2551,6 +2552,7 @@ where
     /// Helper function which forwards a message to mesh\[topic\] peers.
     ///
     /// Returns true if at least one peer was messaged.
+    #[allow(clippy::unnecessary_wraps)]
     fn forward_msg(
         &mut self,
         msg_id: &MessageId,
diff --git a/protocols/gossipsub/src/lib.rs b/protocols/gossipsub/src/lib.rs
index 15db5eba21d..3db2fa7ce51 100644
--- a/protocols/gossipsub/src/lib.rs
+++ b/protocols/gossipsub/src/lib.rs
@@ -43,16 +43,16 @@
 //! implementations, due to undefined elements in the current specification.
 //!
 //! - **Topics** -  In gossipsub, topics configurable by the `hash_topics` configuration parameter.
-//! Topics are of type [`TopicHash`]. The current go implementation uses raw utf-8 strings, and this
-//! is default configuration in rust-libp2p. Topics can be hashed (SHA256 hashed then base64
-//! encoded) by setting the `hash_topics` configuration parameter to true.
+//!   Topics are of type [`TopicHash`]. The current go implementation uses raw utf-8 strings, and this
+//!   is default configuration in rust-libp2p. Topics can be hashed (SHA256 hashed then base64
+//!   encoded) by setting the `hash_topics` configuration parameter to true.
 //!
 //! - **Sequence Numbers** - A message on the gossipsub network is identified by the source
-//! [`PeerId`](libp2p_identity::PeerId) and a nonce (sequence number) of the message. The sequence numbers in
-//! this implementation are sent as raw bytes across the wire. They are 64-bit big-endian unsigned
-//! integers. When messages are signed, they are monotonically increasing integers starting from a
-//! random value and wrapping around u64::MAX. When messages are unsigned, they are chosen at random.
-//! NOTE: These numbers are sequential in the current go implementation.
+//!   [`PeerId`](libp2p_identity::PeerId) and a nonce (sequence number) of the message. The sequence numbers in
+//!   this implementation are sent as raw bytes across the wire. They are 64-bit big-endian unsigned
+//!   integers. When messages are signed, they are monotonically increasing integers starting from a
+//!   random value and wrapping around u64::MAX. When messages are unsigned, they are chosen at random.
+//!   NOTE: These numbers are sequential in the current go implementation.
 //!
 //! # Peer Discovery
 //!
diff --git a/protocols/gossipsub/src/protocol.rs b/protocols/gossipsub/src/protocol.rs
index 01a38562c02..c13caae58b6 100644
--- a/protocols/gossipsub/src/protocol.rs
+++ b/protocols/gossipsub/src/protocol.rs
@@ -541,20 +541,6 @@ mod tests {
     struct TestKeypair(Keypair);
 
     impl Arbitrary for TestKeypair {
-        #[cfg(feature = "rsa")]
-        fn arbitrary(g: &mut Gen) -> Self {
-            let keypair = if bool::arbitrary(g) {
-                // Small enough to be inlined.
-                Keypair::generate_ed25519()
-            } else {
-                // Too large to be inlined.
-                let mut rsa_key = hex::decode("308204bd020100300d06092a864886f70d0101010500048204a7308204a30201000282010100ef930f41a71288b643c1cbecbf5f72ab53992249e2b00835bf07390b6745419f3848cbcc5b030faa127bc88cdcda1c1d6f3ff699f0524c15ab9d2c9d8015f5d4bd09881069aad4e9f91b8b0d2964d215cdbbae83ddd31a7622a8228acee07079f6e501aea95508fa26c6122816ef7b00ac526d422bd12aed347c37fff6c1c307f3ba57bb28a7f28609e0bdcc839da4eedca39f5d2fa855ba4b0f9c763e9764937db929a1839054642175312a3de2d3405c9d27bdf6505ef471ce85c5e015eee85bf7874b3d512f715de58d0794fd8afe021c197fbd385bb88a930342fac8da31c27166e2edab00fa55dc1c3814448ba38363077f4e8fe2bdea1c081f85f1aa6f02030100010282010028ff427a1aac1a470e7b4879601a6656193d3857ea79f33db74df61e14730e92bf9ffd78200efb0c40937c3356cbe049cd32e5f15be5c96d5febcaa9bd3484d7fded76a25062d282a3856a1b3b7d2c525cdd8434beae147628e21adf241dd64198d5819f310d033743915ba40ea0b6acdbd0533022ad6daa1ff42de51885f9e8bab2306c6ef1181902d1cd7709006eba1ab0587842b724e0519f295c24f6d848907f772ae9a0953fc931f4af16a07df450fb8bfa94572562437056613647818c238a6ff3f606cffa0533e4b8755da33418dfbc64a85110b1a036623c947400a536bb8df65e5ebe46f2dfd0cfc86e7aeeddd7574c253e8fbf755562b3669525d902818100f9fff30c6677b78dd31ec7a634361438457e80be7a7faf390903067ea8355faa78a1204a82b6e99cb7d9058d23c1ecf6cfe4a900137a00cecc0113fd68c5931602980267ea9a95d182d48ba0a6b4d5dd32fdac685cb2e5d8b42509b2eb59c9579ea6a67ccc7547427e2bd1fb1f23b0ccb4dd6ba7d206c8dd93253d70a451701302818100f5530dfef678d73ce6a401ae47043af10a2e3f224c71ae933035ecd68ccbc4df52d72bc6ca2b17e8faf3e548b483a2506c0369ab80df3b137b54d53fac98f95547c2bc245b416e650ce617e0d29db36066f1335a9ba02ad3e0edf9dc3d58fd835835042663edebce81803972696c789012847cb1f854ab2ac0a1bd3867ac7fb502818029c53010d456105f2bf52a9a8482bca2224a5eac74bf3cc1a4d5d291fafcdffd15a6a6448cce8efdd661f6617ca5fc37c8c885cc3374e109ac6049bcbf72b37eabf44602a2da2d4a1237fd145c863e6d75059976de762d9d258c42b0984e2a2befa01c95217c3ee9c736ff209c355466ff99375194eff943bc402ea1d172a1ed02818027175bf493bbbfb8719c12b47d967bf9eac061c90a5b5711172e9095c38bb8cc493c063abffe4bea110b0a2f22ac9311b3947ba31b7ef6bfecf8209eebd6d86c316a2366bbafda7279b2b47d5bb24b6202254f249205dcad347b574433f6593733b806f84316276c1990a016ce1bbdbe5f650325acc7791aefe515ecc60063bd02818100b6a2077f4adcf15a17092d9c4a346d6022ac48f3861b73cf714f84c440a07419a7ce75a73b9cbff4597c53c128bf81e87b272d70428a272d99f90cd9b9ea1033298e108f919c6477400145a102df3fb5601ffc4588203cf710002517bfa24e6ad32f4d09c6b1a995fa28a3104131bedd9072f3b4fb4a5c2056232643d310453f").unwrap();
-                Keypair::rsa_from_pkcs8(&mut rsa_key).unwrap()
-            };
-            TestKeypair(keypair)
-        }
-
-        #[cfg(not(feature = "rsa"))]
         fn arbitrary(_g: &mut Gen) -> Self {
             // Small enough to be inlined.
             TestKeypair(Keypair::generate_ed25519())
diff --git a/protocols/identify/src/lib.rs b/protocols/identify/src/lib.rs
index 34928d5d7df..7d28e5b5cc7 100644
--- a/protocols/identify/src/lib.rs
+++ b/protocols/identify/src/lib.rs
@@ -29,9 +29,9 @@
 //! # Important Discrepancies
 //!
 //! - **Using Identify with other protocols** Unlike some other libp2p implementations,
-//! rust-libp2p does not treat Identify as a core protocol. This means that other protocols cannot
-//! rely upon the existence of Identify, and need to be manually hooked up to Identify in order to
-//! make use of its capabilities.
+//!   rust-libp2p does not treat Identify as a core protocol. This means that other protocols cannot
+//!   rely upon the existence of Identify, and need to be manually hooked up to Identify in order to
+//!   make use of its capabilities.
 //!
 //! # Usage
 //!
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 302433a8d70..5d8a8bb0fd8 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -925,11 +925,11 @@ where
     /// > See [`Behaviour::add_address`].
     ///
     /// > **Note**: Bootstrap does not require to be called manually. It is periodically
-    /// invoked at regular intervals based on the configured `periodic_bootstrap_interval` (see
-    /// [`Config::set_periodic_bootstrap_interval`] for details) and it is also automatically invoked
-    /// when a new peer is inserted in the routing table.
-    /// This parameter is used to call [`Behaviour::bootstrap`] periodically and automatically
-    /// to ensure a healthy routing table.
+    /// > invoked at regular intervals based on the configured `periodic_bootstrap_interval` (see
+    /// > [`Config::set_periodic_bootstrap_interval`] for details) and it is also automatically invoked
+    /// > when a new peer is inserted in the routing table.
+    /// > This parameter is used to call [`Behaviour::bootstrap`] periodically and automatically
+    /// > to ensure a healthy routing table.
     pub fn bootstrap(&mut self) -> Result<QueryId, NoKnownPeers> {
         let local_key = *self.kbuckets.local_key();
         let info = QueryInfo::Bootstrap {
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index bc01b9fd3ce..bb7c2ace663 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -23,15 +23,15 @@
 //! # Important Discrepancies
 //!
 //! - **Peer Discovery with Identify** In other libp2p implementations, the
-//! [Identify](https://github.com/libp2p/specs/tree/master/identify) protocol might be seen as a core protocol. Rust-libp2p
-//! tries to stay as generic as possible, and does not make this assumption.
-//! This means that the Identify protocol must be manually hooked up to Kademlia through calls
-//! to [`Behaviour::add_address`].
-//! If you choose not to use the Identify protocol, and do not provide an alternative peer
-//! discovery mechanism, a Kademlia node will not discover nodes beyond the network's
-//! [boot nodes](https://docs.libp2p.io/concepts/glossary/#boot-node). Without the Identify protocol,
-//! existing nodes in the kademlia network cannot obtain the listen addresses
-//! of nodes querying them, and thus will not be able to add them to their routing table.
+//!   [Identify](https://github.com/libp2p/specs/tree/master/identify) protocol might be seen as a core protocol. Rust-libp2p
+//!   tries to stay as generic as possible, and does not make this assumption.
+//!   This means that the Identify protocol must be manually hooked up to Kademlia through calls
+//!   to [`Behaviour::add_address`].
+//!   If you choose not to use the Identify protocol, and do not provide an alternative peer
+//!   discovery mechanism, a Kademlia node will not discover nodes beyond the network's
+//!   [boot nodes](https://docs.libp2p.io/concepts/glossary/#boot-node). Without the Identify protocol,
+//!   existing nodes in the kademlia network cannot obtain the listen addresses
+//!   of nodes querying them, and thus will not be able to add them to their routing table.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
diff --git a/swarm/src/handler.rs b/swarm/src/handler.rs
index 31d2c91e391..20980aff8bd 100644
--- a/swarm/src/handler.rs
+++ b/swarm/src/handler.rs
@@ -137,6 +137,7 @@ pub trait ConnectionHandler: Send + 'static {
     ///
     /// - Protocols like [circuit-relay v2](https://github.com/libp2p/specs/blob/master/relay/circuit-v2.md) need to keep a connection alive beyond these circumstances and can thus override this method.
     /// - Protocols like [ping](https://github.com/libp2p/specs/blob/master/ping/ping.md) **don't** want to keep a connection alive despite an active streams.
+    ///
     /// In that case, protocol authors can use [`Stream::ignore_for_keep_alive`](crate::Stream::ignore_for_keep_alive) to opt-out a particular stream from the keep-alive algorithm.
     fn connection_keep_alive(&self) -> bool {
         false
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index 505a91f0791..63bd9bbad26 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -48,6 +48,7 @@
 //!      any system APIs (like libc's `gethostbyname`). Again this is
 //!      problematic on platforms like Android, where there's a lot of
 //!      complexity hidden behind the system APIs.
+//!
 //! If the implementation requires different characteristics, one should
 //! consider providing their own implementation of [`Transport`] or use
 //! platform specific APIs to extract the host's DNS configuration (if possible)
@@ -231,14 +232,14 @@ where
     }
 
     fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.do_dial(addr, Endpoint::Dialer)
+        Ok(self.do_dial(addr, Endpoint::Dialer))
     }
 
     fn dial_as_listener(
         &mut self,
         addr: Multiaddr,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.do_dial(addr, Endpoint::Listener)
+        Ok(self.do_dial(addr, Endpoint::Listener))
     }
 
     fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
@@ -269,16 +270,13 @@ where
         &mut self,
         addr: Multiaddr,
         role_override: Endpoint,
-    ) -> Result<
-        <Self as libp2p_core::Transport>::Dial,
-        TransportError<<Self as libp2p_core::Transport>::Error>,
-    > {
+    ) -> <Self as libp2p_core::Transport>::Dial {
         let resolver = self.resolver.clone();
         let inner = self.inner.clone();
 
         // Asynchronously resolve all DNS names in the address before proceeding
         // with dialing on the underlying transport.
-        Ok(async move {
+        async move {
             let mut last_err = None;
             let mut dns_lookups = 0;
             let mut dial_attempts = 0;
@@ -404,7 +402,7 @@ where
             }))
         }
         .boxed()
-        .right_future())
+        .right_future()
     }
 }
 
diff --git a/transports/noise/src/io/framed.rs b/transports/noise/src/io/framed.rs
index 9ed6045cf38..17254efb0a9 100644
--- a/transports/noise/src/io/framed.rs
+++ b/transports/noise/src/io/framed.rs
@@ -197,7 +197,7 @@ fn decrypt(
     ciphertext: &mut BytesMut,
     decrypt_fn: impl FnOnce(&[u8], &mut [u8]) -> Result<usize, snow::Error>,
 ) -> io::Result<Option<Bytes>> {
-    let Some(ciphertext) = decode_length_prefixed(ciphertext)? else {
+    let Some(ciphertext) = decode_length_prefixed(ciphertext) else {
         return Ok(None);
     };
 
@@ -223,9 +223,9 @@ fn encode_length_prefixed(src: &[u8], dst: &mut BytesMut) {
     dst.extend_from_slice(src);
 }
 
-fn decode_length_prefixed(src: &mut BytesMut) -> Result<Option<Bytes>, io::Error> {
+fn decode_length_prefixed(src: &mut BytesMut) -> Option<Bytes> {
     if src.len() < size_of::<u16>() {
-        return Ok(None);
+        return None;
     }
 
     let mut len_bytes = [0u8; U16_LENGTH];
@@ -235,8 +235,8 @@ fn decode_length_prefixed(src: &mut BytesMut) -> Result<Option<Bytes>, io::Error
     if src.len() - U16_LENGTH >= len {
         // Skip the length header we already read.
         src.advance(U16_LENGTH);
-        Ok(Some(src.split_to(len).freeze()))
+        Some(src.split_to(len).freeze())
     } else {
-        Ok(None)
+        None
     }
 }
diff --git a/transports/webrtc/src/tokio/certificate.rs b/transports/webrtc/src/tokio/certificate.rs
index 7c7c65f0447..81197af4132 100644
--- a/transports/webrtc/src/tokio/certificate.rs
+++ b/transports/webrtc/src/tokio/certificate.rs
@@ -32,6 +32,7 @@ impl Certificate {
     /// Generate new certificate.
     ///
     /// `_rng` argument is ignored for now. See <https://github.com/melekes/rust-libp2p/pull/12>.
+    #[allow(clippy::unnecessary_wraps)]
     pub fn generate<R>(_rng: &mut R) -> Result<Self, Error>
     where
         R: CryptoRng + Rng,

From af5f0d33138437c53da9639964265d901b78bf65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 21:35:07 +0000
Subject: [PATCH 306/455] deps: bump taiki-e/cache-cargo-install-action from 1
 to 2

Pull-Request: #5343.
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87987489450..a19cdce6558 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
           cargo metadata --format-version=1 --no-deps | \
           jq -e -r '.packages[] | select(.name == "'"$CRATE"'") | .dependencies | all(.name != "libp2p")'
 
-      - uses: taiki-e/cache-cargo-install-action@924d49e0af41f449f0ad549559bc608ee4653562 # v1
+      - uses: taiki-e/cache-cargo-install-action@5b024fe3a0a2c7f2aaff0e47871acf0d14b07207 # v1
         with:
           tool: tomlq
 
@@ -114,7 +114,7 @@ jobs:
         with:
           target: wasm32-unknown-unknown
 
-      - uses: taiki-e/cache-cargo-install-action@v1
+      - uses: taiki-e/cache-cargo-install-action@v2
         with:
           tool: wasm-pack@0.12.0
 
@@ -286,7 +286,7 @@ jobs:
             cargo check --manifest-path "$toml";
           done
 
-      - uses: taiki-e/cache-cargo-install-action@v1
+      - uses: taiki-e/cache-cargo-install-action@v2
         with:
           tool: wasm-pack@0.12.0
 

From fb6bd36ca1f89a34ce98f4948f76734c52768c46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 23:33:02 +0000
Subject: [PATCH 307/455] deps: bump stun from 0.5.1 to 0.6.0

Pull-Request: #5366.
---
 Cargo.lock                   | 78 ++++++++++++++++++++++++++++--------
 transports/webrtc/Cargo.toml |  2 +-
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7fab00010fb..195fc1d37fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2429,7 +2429,7 @@ dependencies = [
  "tokio",
  "waitgroup",
  "webrtc-srtp",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -3446,7 +3446,7 @@ dependencies = [
  "rand 0.8.5",
  "rcgen",
  "serde",
- "stun",
+ "stun 0.6.0",
  "thiserror",
  "tinytemplate",
  "tokio",
@@ -4452,6 +4452,12 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -5019,7 +5025,7 @@ checksum = "3677908cadfbecb4cc1da9a56a32524fae4ebdfa7c2ea93886e1b1e846488cb9"
 dependencies = [
  "bytes",
  "thiserror",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -5048,7 +5054,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "thiserror",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -5716,7 +5722,26 @@ dependencies = [
  "thiserror",
  "tokio",
  "url",
- "webrtc-util",
+ "webrtc-util 0.8.1",
+]
+
+[[package]]
+name = "stun"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b"
+dependencies = [
+ "base64 0.21.7",
+ "crc",
+ "lazy_static",
+ "md-5",
+ "rand 0.8.5",
+ "ring 0.17.8",
+ "subtle",
+ "thiserror",
+ "tokio",
+ "url",
+ "webrtc-util 0.9.0",
 ]
 
 [[package]]
@@ -6300,10 +6325,10 @@ dependencies = [
  "md-5",
  "rand 0.8.5",
  "ring 0.16.20",
- "stun",
+ "stun 0.5.1",
  "thiserror",
  "tokio",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6674,7 +6699,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "smol_str",
- "stun",
+ "stun 0.5.1",
  "thiserror",
  "time",
  "tokio",
@@ -6688,7 +6713,7 @@ dependencies = [
  "webrtc-media",
  "webrtc-sctp",
  "webrtc-srtp",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6702,7 +6727,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "webrtc-sctp",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6737,7 +6762,7 @@ dependencies = [
  "subtle",
  "thiserror",
  "tokio",
- "webrtc-util",
+ "webrtc-util 0.8.1",
  "x25519-dalek",
  "x509-parser 0.15.1",
 ]
@@ -6755,7 +6780,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "stun",
+ "stun 0.5.1",
  "thiserror",
  "tokio",
  "turn",
@@ -6763,7 +6788,7 @@ dependencies = [
  "uuid",
  "waitgroup",
  "webrtc-mdns",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6776,7 +6801,7 @@ dependencies = [
  "socket2 0.5.7",
  "thiserror",
  "tokio",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6806,7 +6831,7 @@ dependencies = [
  "rand 0.8.5",
  "thiserror",
  "tokio",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6829,7 +6854,7 @@ dependencies = [
  "subtle",
  "thiserror",
  "tokio",
- "webrtc-util",
+ "webrtc-util 0.8.1",
 ]
 
 [[package]]
@@ -6852,6 +6877,27 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "webrtc-util"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e"
+dependencies = [
+ "async-trait",
+ "bitflags 1.3.2",
+ "bytes",
+ "ipnet",
+ "lazy_static",
+ "libc",
+ "log",
+ "nix 0.26.4",
+ "portable-atomic",
+ "rand 0.8.5",
+ "thiserror",
+ "tokio",
+ "winapi",
+]
+
 [[package]]
 name = "webtransport-tests"
 version = "0.1.0"
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 909f78479d9..4fb4a2f8a45 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -25,7 +25,7 @@ multihash = { workspace = true }
 rand = "0.8"
 rcgen = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
-stun = "0.5"
+stun = "0.6"
 thiserror = "1"
 tinytemplate = "1.2"
 tokio = { workspace = true, features = ["net"], optional = true }

From b3aa10d1a93b01b6c2e8c3a7b423ddeb78093a4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 23:45:16 +0000
Subject: [PATCH 308/455] deps: bump redis from 0.23.3 to 0.24.0

Pull-Request: #4999.
---
 Cargo.lock                         | 4 ++--
 hole-punching-tests/Cargo.toml     | 2 +-
 hole-punching-tests/src/main.rs    | 2 +-
 interop-tests/Cargo.toml           | 2 +-
 interop-tests/src/arch.rs          | 2 +-
 interop-tests/src/bin/wasm_ping.rs | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 195fc1d37fd..5ac52d0059d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4773,9 +4773,9 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.23.3"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
+checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd"
 dependencies = [
  "async-trait",
  "bytes",
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 22edd8e95ca..79728f9535c 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -11,7 +11,7 @@ env_logger = "0.10.2"
 futures = { workspace = true }
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = { workspace = true }
-redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
+redis = { version = "0.24.0", default-features = false, features = ["tokio-comp"] }
 tokio = { workspace = true, features = ["full"] }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
diff --git a/hole-punching-tests/src/main.rs b/hole-punching-tests/src/main.rs
index 4f81cd65480..f09fbb1e6a0 100644
--- a/hole-punching-tests/src/main.rs
+++ b/hole-punching-tests/src/main.rs
@@ -308,7 +308,7 @@ impl RedisClient {
 
         let value = self
             .inner
-            .blpop::<_, HashMap<String, String>>(key, 0)
+            .blpop::<_, HashMap<String, String>>(key, 0.0)
             .await?
             .remove(key)
             .with_context(|| format!("Failed to get value for {key} from redis"))?
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 5dbdafa34b1..0eb32bb4975 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -28,7 +28,7 @@ libp2p-noise = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 mime_guess = "2.0"
-redis = { version = "0.23.3", default-features = false, features = [
+redis = { version = "0.24.0", default-features = false, features = [
     "tokio-comp",
 ] }
 rust-embed = "8.4"
diff --git a/interop-tests/src/arch.rs b/interop-tests/src/arch.rs
index 06d630d68d5..fb229434981 100644
--- a/interop-tests/src/arch.rs
+++ b/interop-tests/src/arch.rs
@@ -174,7 +174,7 @@ pub(crate) mod native {
 
         pub(crate) async fn blpop(&self, key: &str, timeout: u64) -> Result<Vec<String>> {
             let mut conn = self.0.get_async_connection().await?;
-            Ok(conn.blpop(key, timeout as usize).await?)
+            Ok(conn.blpop(key, timeout as f64).await?)
         }
 
         pub(crate) async fn rpush(&self, key: &str, value: String) -> Result<()> {
diff --git a/interop-tests/src/bin/wasm_ping.rs b/interop-tests/src/bin/wasm_ping.rs
index 706fad21039..0d697a0e2a3 100644
--- a/interop-tests/src/bin/wasm_ping.rs
+++ b/interop-tests/src/bin/wasm_ping.rs
@@ -151,7 +151,7 @@ async fn redis_blpop(
         StatusCode::INTERNAL_SERVER_ERROR
     })?;
     let res = conn
-        .blpop(&request.key, request.timeout as usize)
+        .blpop(&request.key, request.timeout as f64)
         .await
         .map_err(|e| {
             tracing::warn!(

From 362c3d334901ff81efc11b120272c1df2d657766 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 00:15:12 +0000
Subject: [PATCH 309/455] deps: bump sysinfo from 0.29.11 to 0.30.5

Pull-Request: #5061.
---
 Cargo.lock                                    | 49 +++++++++++--------
 misc/memory-connection-limits/Cargo.toml      |  2 +-
 misc/memory-connection-limits/src/lib.rs      |  9 ++--
 .../tests/max_percentage.rs                   |  6 ++-
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ac52d0059d..d875724764a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1118,16 +1118,6 @@ dependencies = [
  "itertools",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.3"
@@ -2352,7 +2342,7 @@ dependencies = [
  "smol",
  "system-configuration",
  "tokio",
- "windows",
+ "windows 0.51.1",
 ]
 
 [[package]]
@@ -4738,9 +4728,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -4748,14 +4738,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
@@ -5818,9 +5806,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -5828,7 +5816,7 @@ dependencies = [
  "ntapi",
  "once_cell",
  "rayon",
- "winapi",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -6959,10 +6947,20 @@ version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
 dependencies = [
- "windows-core",
+ "windows-core 0.51.1",
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+dependencies = [
+ "windows-core 0.52.0",
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.51.1"
@@ -6972,6 +6970,15 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index 5f8d9b91613..9f7406599e7 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -14,7 +14,7 @@ memory-stats = { version = "1", features = ["always_use_statm"] }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
-sysinfo = "0.29"
+sysinfo = "0.30"
 tracing = { workspace = true }
 void = "1"
 
diff --git a/misc/memory-connection-limits/src/lib.rs b/misc/memory-connection-limits/src/lib.rs
index ac911654979..08c45154221 100644
--- a/misc/memory-connection-limits/src/lib.rs
+++ b/misc/memory-connection-limits/src/lib.rs
@@ -31,6 +31,7 @@ use std::{
     task::{Context, Poll},
     time::{Duration, Instant},
 };
+use sysinfo::MemoryRefreshKind;
 
 /// A [`NetworkBehaviour`] that enforces a set of memory usage based limits.
 ///
@@ -90,10 +91,12 @@ impl Behaviour {
     ///
     /// New inbound and outbound connections will be denied when the threshold is reached.
     pub fn with_max_percentage(percentage: f64) -> Self {
-        use sysinfo::{RefreshKind, SystemExt};
+        use sysinfo::{RefreshKind, System};
 
-        let system_memory_bytes =
-            sysinfo::System::new_with_specifics(RefreshKind::new().with_memory()).total_memory();
+        let system_memory_bytes = System::new_with_specifics(
+            RefreshKind::new().with_memory(MemoryRefreshKind::new().with_ram()),
+        )
+        .total_memory();
 
         Self::with_max_bytes((system_memory_bytes as f64 * percentage).round() as usize)
     }
diff --git a/misc/memory-connection-limits/tests/max_percentage.rs b/misc/memory-connection-limits/tests/max_percentage.rs
index daee20703ee..bfb1b504af5 100644
--- a/misc/memory-connection-limits/tests/max_percentage.rs
+++ b/misc/memory-connection-limits/tests/max_percentage.rs
@@ -24,7 +24,7 @@ use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_memory_connection_limits::*;
 use std::time::Duration;
-use sysinfo::{RefreshKind, SystemExt};
+use sysinfo::{MemoryRefreshKind, RefreshKind};
 use util::*;
 
 use libp2p_swarm::{
@@ -36,7 +36,9 @@ use libp2p_swarm_test::SwarmExt;
 #[test]
 fn max_percentage() {
     const CONNECTION_LIMIT: usize = 20;
-    let system_info = sysinfo::System::new_with_specifics(RefreshKind::new().with_memory());
+    let system_info = sysinfo::System::new_with_specifics(
+        RefreshKind::new().with_memory(MemoryRefreshKind::new().with_ram()),
+    );
 
     let mut network = Swarm::new_ephemeral(|_| TestBehaviour {
         connection_limits: Behaviour::with_max_percentage(0.1),

From 87b939402cfc893572918d65ffa88736620bd209 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 00:39:10 +0000
Subject: [PATCH 310/455] deps: bump the hickory-dns group with 3 updates

Pull-Request: #5330.
---
 Cargo.lock                | 12 ++++++------
 protocols/mdns/Cargo.toml |  2 +-
 transports/dns/Cargo.toml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d875724764a..d680af5ea42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -428,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "async-std-resolver"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0ed2b6671c13d2c28756c5a64e04759c1e0b5d3d7ac031f521c3561e21fbcb"
+checksum = "bc3b454643291f9a4a3bbdb35fa62efa4ba7be5ea13fe243e3be4352182ff4b8"
 dependencies = [
  "async-std",
  "async-trait",
@@ -1984,9 +1984,9 @@ checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
 
 [[package]]
 name = "hickory-proto"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf"
+checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
 dependencies = [
  "async-trait",
  "cfg-if",
@@ -2009,9 +2009,9 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8"
+checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
 dependencies = [
  "cfg-if",
  "futures-util",
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 0d58c9467c4..56741463d6b 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -24,7 +24,7 @@ smallvec = "1.13.2"
 socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { workspace = true, default-features = false, features = ["net", "time"], optional = true}
 tracing = { workspace = true }
-hickory-proto = { version = "0.24.0", default-features = false, features = ["mdns"] }
+hickory-proto = { version = "0.24.1", default-features = false, features = ["mdns"] }
 void = "1.0.2"
 
 [features]
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 105fe0a62d0..1e50ad444b8 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -17,7 +17,7 @@ futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.3"
-hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
+hickory-resolver = { version = "0.24.1", default-features = false, features = ["system-config"] }
 smallvec = "1.13.2"
 tracing = { workspace = true }
 

From 43524e7bf04c27ace76d128fa48407a61eb690d2 Mon Sep 17 00:00:00 2001
From: Nathaniel Cook <nvcook42@gmail.com>
Date: Thu, 13 Jun 2024 04:37:03 -0600
Subject: [PATCH 311/455] feat(swarm): add `peer_id` to `ListenFailure`

It's possible in certain failure modes to know the peer_id of a failed incoming connection. For example when an inbound connection has been negotiated/upgraded but then rejected locally for a connection limit or similar reason. In these cases it makes sense to communicate the peer_id to behaviours in case they have created any internal state about the peer.

Related https://github.com/libp2p/rust-libp2p/pull/4777

Pull-Request: #4818.
---
 Cargo.lock             | 2 +-
 Cargo.toml             | 2 +-
 swarm/CHANGELOG.md     | 5 ++++-
 swarm/Cargo.toml       | 2 +-
 swarm/src/behaviour.rs | 9 ++++++++-
 swarm/src/lib.rs       | 3 +++
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d680af5ea42..367d37b0ec2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3292,7 +3292,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.44.3"
+version = "0.45.0"
 dependencies = [
  "async-std",
  "either",
diff --git a/Cargo.toml b/Cargo.toml
index 822c1692960..bf57480bbbe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.4", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
-libp2p-swarm = { version = "0.44.3", path = "swarm" }
+libp2p-swarm = { version = "0.45.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.41.1", path = "transports/tcp" }
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 8cded416628..1b53ee9b937 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,4 +1,7 @@
-## 0.44.3
+## 0.45.0
+
+- Add peer_id to `FromSwarm::ListenFailure`.
+  See [PR 4818](https://github.com/libp2p/rust-libp2p/pull/4818).
 
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 338cbf91641..60cf58cb495 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.44.3"
+version = "0.45.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
index 5070871a4c1..fc9045dfc3f 100644
--- a/swarm/src/behaviour.rs
+++ b/swarm/src/behaviour.rs
@@ -148,6 +148,9 @@ pub trait NetworkBehaviour: 'static {
     /// At this point, we have verified their [`PeerId`] and we know, which particular [`Multiaddr`] succeeded in the dial.
     /// In order to actually use this connection, this function must return a [`ConnectionHandler`].
     /// Returning an error will immediately close the connection.
+    ///
+    /// Note when any composed behaviour returns an error the connection will be closed and a
+    /// [`FromSwarm::ListenFailure`] event will be emitted.
     fn handle_established_inbound_connection(
         &mut self,
         _connection_id: ConnectionId,
@@ -184,6 +187,9 @@ pub trait NetworkBehaviour: 'static {
     /// At this point, we have verified their [`PeerId`] and we know, which particular [`Multiaddr`] succeeded in the dial.
     /// In order to actually use this connection, this function must return a [`ConnectionHandler`].
     /// Returning an error will immediately close the connection.
+    ///
+    /// Note when any composed behaviour returns an error the connection will be closed and a
+    /// [`FromSwarm::DialFailure`] event will be emitted.
     fn handle_established_outbound_connection(
         &mut self,
         _connection_id: ConnectionId,
@@ -269,7 +275,7 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
     /// The emphasis on a **new** candidate is important.
     /// Protocols MUST take care to only emit a candidate once per "source".
     /// For example, the observed address of a TCP connection does not change throughout its lifetime.
-    /// Thus, only one candidate should be emitted per connection.    
+    /// Thus, only one candidate should be emitted per connection.
     ///
     /// This makes the report frequency of an address a meaningful data-point for consumers of this event.
     /// This address will be shared with all [`NetworkBehaviour`]s via [`FromSwarm::NewExternalAddrCandidate`].
@@ -508,6 +514,7 @@ pub struct ListenFailure<'a> {
     pub send_back_addr: &'a Multiaddr,
     pub error: &'a ListenError,
     pub connection_id: ConnectionId,
+    pub peer_id: Option<PeerId>,
 }
 
 /// [`FromSwarm`] variant that informs the behaviour that a new listener was created.
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index cf2961cef6d..ec5b7a109cc 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -754,6 +754,7 @@ where
                                         send_back_addr: &send_back_addr,
                                         error: &listen_error,
                                         connection_id: id,
+                                        peer_id: Some(peer_id),
                                     },
                                 ));
 
@@ -867,6 +868,7 @@ where
                         send_back_addr: &send_back_addr,
                         error: &error,
                         connection_id: id,
+                        peer_id: None,
                     }));
                 self.pending_swarm_events
                     .push_back(SwarmEvent::IncomingConnectionError {
@@ -970,6 +972,7 @@ where
                                 send_back_addr: &send_back_addr,
                                 error: &listen_error,
                                 connection_id,
+                                peer_id: None,
                             }));
 
                         self.pending_swarm_events

From a35e269645f9d5f618b2817adff4c82f255804ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 13 Jun 2024 13:51:59 +0100
Subject: [PATCH 312/455] feat(tcp): make TCP_NODELAY the default

Superseeds #4916.
Fixes: #4890.

Pull-Request: #5469.
---
 Cargo.lock                  | 18 +++++++++---------
 Cargo.toml                  |  2 +-
 transports/tcp/CHANGELOG.md |  4 +++-
 transports/tcp/Cargo.toml   |  2 +-
 transports/tcp/src/lib.rs   |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 367d37b0ec2..efa620c9f41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -428,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "async-std-resolver"
-version = "0.24.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc3b454643291f9a4a3bbdb35fa62efa4ba7be5ea13fe243e3be4352182ff4b8"
+checksum = "3c0ed2b6671c13d2c28756c5a64e04759c1e0b5d3d7ac031f521c3561e21fbcb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3353,7 +3353,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.41.1"
+version = "0.42.0"
 dependencies = [
  "async-io 2.3.3",
  "async-std",
@@ -4728,9 +4728,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -4738,9 +4738,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -5806,9 +5806,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.30.5"
+version = "0.30.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
+checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
diff --git a/Cargo.toml b/Cargo.toml
index bf57480bbbe..3f7d8ab7c0d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -105,7 +105,7 @@ libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
-libp2p-tcp = { version = "0.41.1", path = "transports/tcp" }
+libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.4.0", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md
index 36ed93a0f5b..f0204f1ba85 100644
--- a/transports/tcp/CHANGELOG.md
+++ b/transports/tcp/CHANGELOG.md
@@ -1,5 +1,7 @@
-## 0.41.1
+## 0.42.0
 
+- Disable Nagle's algorithm (i.e. `TCP_NODELAY`) by default.
+  See [PR 4916](https://github.com/libp2p/rust-libp2p/pull/4916)
 
 ## 0.41.0
 
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 7f0cf5ca943..b17d7f3b58e 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-tcp"
 edition = "2021"
 rust-version = { workspace = true }
 description = "TCP/IP transport protocol for libp2p"
-version = "0.41.1"
+version = "0.42.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
index c8f0410d9e5..3d881a6421c 100644
--- a/transports/tcp/src/lib.rs
+++ b/transports/tcp/src/lib.rs
@@ -161,7 +161,7 @@ impl Config {
     pub fn new() -> Self {
         Self {
             ttl: None,
-            nodelay: None,
+            nodelay: Some(false), // Disable Nagle's algorithm by default
             backlog: 1024,
             enable_port_reuse: false,
         }

From a8a49570ba296b0c01088424893cb3143856c1d6 Mon Sep 17 00:00:00 2001
From: Hannes <55623006+umgefahren@users.noreply.github.com>
Date: Mon, 17 Jun 2024 20:39:20 +0900
Subject: [PATCH 313/455] chore: Update cargo semver

I updated the semver version so it makes the CI run again

Pull-Request: #5470.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a19cdce6558..3e6d8c7fdaf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -308,7 +308,7 @@ jobs:
       RUSTFLAGS: ''
     steps:
       - uses: actions/checkout@v4
-      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.27.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
+      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.31.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
       - uses: obi1kenobi/cargo-semver-checks-action@c7306483f698c511eaf7416d1bf2e1958c90140f # v2
 

From 0b1733d4db065e0236a28f8628d9b401b9645001 Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:43:24 -0400
Subject: [PATCH 314/455] refactor: remove redundant async signature

Resolves #4832

Pull-Request: #5468.
---
 libp2p/CHANGELOG.md                         | 3 +++
 libp2p/src/builder/phase/dns.rs             | 3 +--
 libp2p/src/builder/phase/other_transport.rs | 4 ++--
 libp2p/src/builder/phase/quic.rs            | 3 +--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index ed3ecbe2f20..23efbc21fd9 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -9,6 +9,9 @@
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
+- Remove redundant async signature from builder methods.
+  See [PR 5468](https://github.com/libp2p/rust-libp2p/pull/5468).
+
 ## 0.53.2
 
 - Allow `SwarmBuilder::with_bandwidth_metrics` after `SwarmBuilder::with_websocket`.
diff --git a/libp2p/src/builder/phase/dns.rs b/libp2p/src/builder/phase/dns.rs
index 135f6c57b19..638064d58bb 100644
--- a/libp2p/src/builder/phase/dns.rs
+++ b/libp2p/src/builder/phase/dns.rs
@@ -8,8 +8,7 @@ pub struct DnsPhase<T> {
 
 #[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncStd, DnsPhase<T>> {
-    // TODO: Remove `async`
-    pub async fn with_dns(
+    pub fn with_dns(
         self,
     ) -> Result<
         SwarmBuilder<
diff --git a/libp2p/src/builder/phase/other_transport.rs b/libp2p/src/builder/phase/other_transport.rs
index b0d56cd92d2..e04621b2e3f 100644
--- a/libp2p/src/builder/phase/other_transport.rs
+++ b/libp2p/src/builder/phase/other_transport.rs
@@ -73,7 +73,7 @@ impl<Provider, T: AuthenticatedMultiplexedTransport>
 impl<T: AuthenticatedMultiplexedTransport>
     SwarmBuilder<super::provider::AsyncStd, OtherTransportPhase<T>>
 {
-    pub async fn with_dns(
+    pub fn with_dns(
         self,
     ) -> Result<
         SwarmBuilder<
@@ -82,7 +82,7 @@ impl<T: AuthenticatedMultiplexedTransport>
         >,
         std::io::Error,
     > {
-        self.without_any_other_transports().with_dns().await
+        self.without_any_other_transports().with_dns()
     }
 }
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
diff --git a/libp2p/src/builder/phase/quic.rs b/libp2p/src/builder/phase/quic.rs
index 885b16e2e03..e030e9493bb 100644
--- a/libp2p/src/builder/phase/quic.rs
+++ b/libp2p/src/builder/phase/quic.rs
@@ -150,7 +150,7 @@ impl<Provider, T: AuthenticatedMultiplexedTransport> SwarmBuilder<Provider, Quic
 }
 #[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncStd, QuicPhase<T>> {
-    pub async fn with_dns(
+    pub fn with_dns(
         self,
     ) -> Result<
         SwarmBuilder<
@@ -162,7 +162,6 @@ impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncSt
         self.without_quic()
             .without_any_other_transports()
             .with_dns()
-            .await
     }
 }
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]

From 32e917ffb26a5c176691602b8e315b570be37211 Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:59:44 +0200
Subject: [PATCH 315/455] fix(kad): correctly handle `NoKnownPeers` error when
 bootstrap

After testing `master`, we encountered a bug due to #4838 when doing automatic or periodic bootstrap if the node has no known peers.

Since it failed immediately, I though there was no need to call the `bootstrap_status.on_started` method. But not doing so never resets the periodic timer inside `bootstrap_status` resulting in getting stuck to try to bootstrap every time `poll` is called on `kad::Behaviour`.

Pull-Request: #5349.
---
 protocols/kad/CHANGELOG.md     |  2 ++
 protocols/kad/src/behaviour.rs |  1 +
 protocols/kad/src/bootstrap.rs | 18 +++++++++++-------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 1d124fb37a2..5cd537cae9e 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -19,6 +19,8 @@
   See [PR 5317](https://github.com/libp2p/rust-libp2p/pull/5317).
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+- Correctly handle the `NoKnownPeers` error on automatic bootstrap.
+  See [PR 5349](https://github.com/libp2p/rust-libp2p/pull/5349).
 
 ## 0.45.3
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 5d8a8bb0fd8..c9690d2c873 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -939,6 +939,7 @@ where
         };
         let peers = self.kbuckets.closest_keys(&local_key).collect::<Vec<_>>();
         if peers.is_empty() {
+            self.bootstrap_status.reset_timers();
             Err(NoKnownPeers())
         } else {
             self.bootstrap_status.on_started();
diff --git a/protocols/kad/src/bootstrap.rs b/protocols/kad/src/bootstrap.rs
index bcb9d0cccf3..fd9e3d41be6 100644
--- a/protocols/kad/src/bootstrap.rs
+++ b/protocols/kad/src/bootstrap.rs
@@ -61,19 +61,23 @@ impl Status {
         }
     }
 
+    pub(crate) fn reset_timers(&mut self) {
+        // Canceling the `throttle_timer` if any and resetting the `delay` if any.
+        self.throttle_timer = None;
+
+        if let Some((interval, delay)) = self.interval_and_delay.as_mut() {
+            delay.reset(*interval);
+        }
+    }
+
     pub(crate) fn on_started(&mut self) {
         // No periodic or automatic bootstrap will be triggered as long as
         // `self.current_bootstrap_requests > 0` but the user could still manually
         // trigger a bootstrap.
         self.current_bootstrap_requests += 1;
 
-        // Canceling the `throttle_timer` if any since a bootstrap request is being triggered right now.
-        self.throttle_timer = None;
-
-        // Resetting the `delay` if any since a bootstrap request is being triggered right now.
-        if let Some((interval, delay)) = self.interval_and_delay.as_mut() {
-            delay.reset(*interval);
-        }
+        // Resetting the Status timers since a bootstrap request is being triggered right now.
+        self.reset_timers();
     }
 
     pub(crate) fn on_finish(&mut self) {

From 605f20846280679e26e72e34efabfb3603aed678 Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:41:19 +0200
Subject: [PATCH 316/455] feat(identify): add connection_id in event

Fixes: #4980.

Pull-Request: #4981.
---
 Cargo.lock                          |  2 +-
 Cargo.toml                          |  2 +-
 libp2p/CHANGELOG.md                 |  1 +
 misc/server/CHANGELOG.md            |  2 ++
 misc/server/src/main.rs             |  1 +
 protocols/identify/CHANGELOG.md     |  5 ++++
 protocols/identify/Cargo.toml       |  2 +-
 protocols/identify/src/behaviour.rs | 46 +++++++++++++++++++++++------
 8 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index efa620c9f41..67d0c3fb59b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2837,7 +2837,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.44.2"
+version = "0.45.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 3f7d8ab7c0d..76bb4f18b3d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
-libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
+libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 23efbc21fd9..977d9f91924 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Update individual crates.
     - Update to [`libp2p-kad` `v0.46.0`](protocols/kad/CHANGELOG.md#0460).
+    - Update to [`libp2p-identify` `v0.45.0`](protocols/identify/CHANGELOG.md#0450).
 
 - Raise MSRV to 1.73.
   See [PR 5266](https://github.com/libp2p/rust-libp2p/pull/5266).
diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
index 254ab1d92be..5369163460c 100644
--- a/misc/server/CHANGELOG.md
+++ b/misc/server/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Use periodic and automatic bootstrap of Kademlia.
   See [PR 4838](https://github.com/libp2p/rust-libp2p/pull/4838).
+- Update to [`libp2p-identify` `v0.45.0`](protocols/identify/CHANGELOG.md#0450).
+  See [PR 4981](https://github.com/libp2p/rust-libp2p/pull/4981).
 
 ## 0.12.6
 
diff --git a/misc/server/src/main.rs b/misc/server/src/main.rs
index 6dfa035f3b1..eb28b9ad5c2 100644
--- a/misc/server/src/main.rs
+++ b/misc/server/src/main.rs
@@ -138,6 +138,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                             protocols,
                             ..
                         },
+                    ..
                 } = e
                 {
                     if protocols.iter().any(|p| *p == kad::PROTOCOL_NAME) {
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index 83984448d07..b8ab3f8df50 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.0
+
+- Add `ConnectionId` in `Event`.
+  See [PR 4981](https://github.com/libp2p/rust-libp2p/pull/4981).
+
 ## 0.44.2
 
 - Emit `ToSwarm::NewExternalAddrOfPeer` for all external addresses of remote peers.
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 86425d580e9..320c8465650 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Nodes identification protocol for libp2p"
-version = "0.44.2"
+version = "0.45.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index 43bddb52fe7..92a0dc46103 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -258,7 +258,7 @@ impl NetworkBehaviour for Behaviour {
     fn on_connection_handler_event(
         &mut self,
         peer_id: PeerId,
-        id: ConnectionId,
+        connection_id: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
         match event {
@@ -270,6 +270,7 @@ impl NetworkBehaviour for Behaviour {
                 let observed = info.observed_addr.clone();
                 self.events
                     .push_back(ToSwarm::GenerateEvent(Event::Received {
+                        connection_id,
                         peer_id,
                         info: info.clone(),
                     }));
@@ -285,7 +286,7 @@ impl NetworkBehaviour for Behaviour {
                     }
                 }
 
-                match self.our_observed_addresses.entry(id) {
+                match self.our_observed_addresses.entry(connection_id) {
                     Entry::Vacant(not_yet_observed) => {
                         not_yet_observed.insert(observed.clone());
                         self.events
@@ -298,7 +299,7 @@ impl NetworkBehaviour for Behaviour {
                         tracing::info!(
                             old_address=%already_observed.get(),
                             new_address=%observed,
-                            "Our observed address on connection {id} changed",
+                            "Our observed address on connection {connection_id} changed",
                         );
 
                         *already_observed.get_mut() = observed.clone();
@@ -308,16 +309,24 @@ impl NetworkBehaviour for Behaviour {
                 }
             }
             handler::Event::Identification => {
-                self.events
-                    .push_back(ToSwarm::GenerateEvent(Event::Sent { peer_id }));
+                self.events.push_back(ToSwarm::GenerateEvent(Event::Sent {
+                    connection_id,
+                    peer_id,
+                }));
             }
             handler::Event::IdentificationPushed(info) => {
-                self.events
-                    .push_back(ToSwarm::GenerateEvent(Event::Pushed { peer_id, info }));
+                self.events.push_back(ToSwarm::GenerateEvent(Event::Pushed {
+                    connection_id,
+                    peer_id,
+                    info,
+                }));
             }
             handler::Event::IdentificationError(error) => {
-                self.events
-                    .push_back(ToSwarm::GenerateEvent(Event::Error { peer_id, error }));
+                self.events.push_back(ToSwarm::GenerateEvent(Event::Error {
+                    connection_id,
+                    peer_id,
+                    error,
+                }));
             }
         }
     }
@@ -415,6 +424,8 @@ impl NetworkBehaviour for Behaviour {
 pub enum Event {
     /// Identification information has been received from a peer.
     Received {
+        /// Identifier of the connection.
+        connection_id: ConnectionId,
         /// The peer that has been identified.
         peer_id: PeerId,
         /// The information provided by the peer.
@@ -423,12 +434,16 @@ pub enum Event {
     /// Identification information of the local node has been sent to a peer in
     /// response to an identification request.
     Sent {
+        /// Identifier of the connection.
+        connection_id: ConnectionId,
         /// The peer that the information has been sent to.
         peer_id: PeerId,
     },
     /// Identification information of the local node has been actively pushed to
     /// a peer.
     Pushed {
+        /// Identifier of the connection.
+        connection_id: ConnectionId,
         /// The peer that the information has been sent to.
         peer_id: PeerId,
         /// The full Info struct we pushed to the remote peer. Clients must
@@ -437,6 +452,8 @@ pub enum Event {
     },
     /// Error while attempting to identify the remote.
     Error {
+        /// Identifier of the connection.
+        connection_id: ConnectionId,
         /// The peer with whom the error originated.
         peer_id: PeerId,
         /// The error that occurred.
@@ -444,6 +461,17 @@ pub enum Event {
     },
 }
 
+impl Event {
+    pub fn connection_id(&self) -> ConnectionId {
+        match self {
+            Event::Received { connection_id, .. }
+            | Event::Sent { connection_id, .. }
+            | Event::Pushed { connection_id, .. }
+            | Event::Error { connection_id, .. } => *connection_id,
+        }
+    }
+}
+
 /// If there is a given peer_id in the multiaddr, make sure it is the same as
 /// the given peer_id. If there is no peer_id for the peer in the mutiaddr, this returns true.
 fn multiaddr_matches_peer_id(addr: &Multiaddr, peer_id: &PeerId) -> bool {

From e28de77f32b2c550c6b627e2d1006290bb74657d Mon Sep 17 00:00:00 2001
From: Adam Wierzbicki <a.wierzbicki@subsquid.io>
Date: Fri, 21 Jun 2024 13:03:41 +0200
Subject: [PATCH 317/455] feat(kad): Return multiaddrs alognside peer IDs

Pull-Request: #5475.
---
 Cargo.lock                          |  4 +--
 Cargo.toml                          |  4 +--
 core/CHANGELOG.md                   |  4 +++
 core/Cargo.toml                     |  2 +-
 core/src/lib.rs                     |  8 ++++++
 protocols/kad/CHANGELOG.md          |  4 +++
 protocols/kad/Cargo.toml            |  2 +-
 protocols/kad/src/behaviour.rs      | 41 ++++++++++++++++++++++-------
 protocols/kad/src/behaviour/test.rs |  8 +++---
 9 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 67d0c3fb59b..c71837e0e94 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2697,7 +2697,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.41.3"
+version = "0.41.4"
 dependencies = [
  "async-std",
  "either",
@@ -2890,7 +2890,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 76bb4f18b3d..88f09be43b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,14 +78,14 @@ libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.12.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
-libp2p-core = { version = "0.41.3", path = "core" }
+libp2p-core = { version = "0.41.4", path = "core" }
 libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
-libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
+libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 633b627d41d..0c3b81cd3e5 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.41.4
+- Add `PeerInfo` struct.
+  See [PR 5475](https://github.com/libp2p/rust-libp2p/pull/5475)
+
 ## 0.41.3 
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 6831eb54c94..048988c75b0 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-core"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.41.3"
+version = "0.41.4"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/core/src/lib.rs b/core/src/lib.rs
index abb83481d6c..73a4382c315 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -56,6 +56,7 @@ pub mod transport;
 pub mod upgrade;
 
 pub use connection::{ConnectedPoint, Endpoint};
+pub use libp2p_identity::PeerId;
 pub use multiaddr::Multiaddr;
 pub use multihash;
 pub use muxing::StreamMuxer;
@@ -68,3 +69,10 @@ pub use upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 #[derive(Debug, thiserror::Error)]
 #[error(transparent)]
 pub struct DecodeError(quick_protobuf::Error);
+
+/// Peer Info combines a Peer ID with a set of multiaddrs that the peer is listening on.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PeerInfo {
+    pub peer_id: PeerId,
+    pub addrs: Vec<Multiaddr>,
+}
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 5cd537cae9e..d26a58715b3 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.47.0
+- Included multiaddresses of found peers alongside peer IDs in `GetClosestPeers` query results.
+  See [PR 5475](https://github.com/libp2p/rust-libp2p/pull/5475)
+
 ## 0.46.0
 
 - Changed `FIND_NODE` response: now includes a list of closest peers when querying the recipient peer ID. Previously, this request yielded an empty response.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 494d812c6ec..04d78a9947d 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.46.0"
+version = "0.47.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index c9690d2c873..ce81c2e8dca 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -36,7 +36,7 @@ use crate::record::{
 use crate::K_VALUE;
 use crate::{jobs::*, protocol};
 use fnv::{FnvHashMap, FnvHashSet};
-use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr, PeerInfo};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{
     AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm,
@@ -1390,7 +1390,7 @@ where
     fn query_finished(&mut self, q: Query<QueryInner>) -> Option<Event> {
         let query_id = q.id();
         tracing::trace!(query=?query_id, "Query finished");
-        let result = q.into_result();
+        let mut result = q.into_result();
         match result.inner.info {
             QueryInfo::Bootstrap {
                 peer,
@@ -1466,14 +1466,23 @@ where
 
             QueryInfo::GetClosestPeers { key, mut step } => {
                 step.last = true;
+                let peers = result
+                    .peers
+                    .map(|peer_id| {
+                        let addrs = result
+                            .inner
+                            .addresses
+                            .remove(&peer_id)
+                            .unwrap_or_default()
+                            .to_vec();
+                        PeerInfo { peer_id, addrs }
+                    })
+                    .collect();
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
                     stats: result.stats,
-                    result: QueryResult::GetClosestPeers(Ok(GetClosestPeersOk {
-                        key,
-                        peers: result.peers.collect(),
-                    })),
+                    result: QueryResult::GetClosestPeers(Ok(GetClosestPeersOk { key, peers })),
                     step,
                 })
             }
@@ -1629,7 +1638,7 @@ where
     fn query_timeout(&mut self, query: Query<QueryInner>) -> Option<Event> {
         let query_id = query.id();
         tracing::trace!(query=?query_id, "Query timed out");
-        let result = query.into_result();
+        let mut result = query.into_result();
         match result.inner.info {
             QueryInfo::Bootstrap {
                 peer,
@@ -1684,13 +1693,25 @@ where
 
             QueryInfo::GetClosestPeers { key, mut step } => {
                 step.last = true;
+                let peers = result
+                    .peers
+                    .map(|peer_id| {
+                        let addrs = result
+                            .inner
+                            .addresses
+                            .remove(&peer_id)
+                            .unwrap_or_default()
+                            .to_vec();
+                        PeerInfo { peer_id, addrs }
+                    })
+                    .collect();
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
                     stats: result.stats,
                     result: QueryResult::GetClosestPeers(Err(GetClosestPeersError::Timeout {
                         key,
-                        peers: result.peers.collect(),
+                        peers,
                     })),
                     step,
                 })
@@ -2978,14 +2999,14 @@ pub type GetClosestPeersResult = Result<GetClosestPeersOk, GetClosestPeersError>
 #[derive(Debug, Clone)]
 pub struct GetClosestPeersOk {
     pub key: Vec<u8>,
-    pub peers: Vec<PeerId>,
+    pub peers: Vec<PeerInfo>,
 }
 
 /// The error result of [`Behaviour::get_closest_peers`].
 #[derive(Debug, Clone, Error)]
 pub enum GetClosestPeersError {
     #[error("the request timed out")]
-    Timeout { key: Vec<u8>, peers: Vec<PeerId> },
+    Timeout { key: Vec<u8>, peers: Vec<PeerInfo> },
 }
 
 impl GetClosestPeersError {
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 7005f39e5e6..a3ff43ded6e 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -294,9 +294,11 @@ fn query_iter() {
                             assert_eq!(&ok.key[..], search_target.to_bytes().as_slice());
                             assert_eq!(swarm_ids[i], expected_swarm_id);
                             assert_eq!(swarm.behaviour_mut().queries.size(), 0);
-                            assert!(expected_peer_ids.iter().all(|p| ok.peers.contains(p)));
+                            let peer_ids =
+                                ok.peers.into_iter().map(|p| p.peer_id).collect::<Vec<_>>();
+                            assert!(expected_peer_ids.iter().all(|p| peer_ids.contains(p)));
                             let key = kbucket::Key::new(ok.key);
-                            assert_eq!(expected_distances, distances(&key, ok.peers));
+                            assert_eq!(expected_distances, distances(&key, peer_ids));
                             return Poll::Ready(());
                         }
                         // Ignore any other event.
@@ -408,7 +410,7 @@ fn unresponsive_not_returned_indirect() {
                     }))) => {
                         assert_eq!(&ok.key[..], search_target.to_bytes().as_slice());
                         assert_eq!(ok.peers.len(), 1);
-                        assert_eq!(ok.peers[0], first_peer_id);
+                        assert_eq!(ok.peers[0].peer_id, first_peer_id);
                         return Poll::Ready(());
                     }
                     // Ignore any other event.

From 3759e190d1e2e83f87d4be191ea7d6f747d31b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 25 Jun 2024 12:56:17 +0100
Subject: [PATCH 318/455] fix: update Cargo.lock

To address [RUSTSEC-2024-0344](https://rustsec.org/advisories/RUSTSEC-2024-0344)

Pull-Request: #5477.
---
 Cargo.lock | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c71837e0e94..2bf774b1fd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1212,16 +1212,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "subtle",
  "zeroize",
@@ -4355,12 +4354,6 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
-[[package]]
-name = "platforms"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
-
 [[package]]
 name = "plotters"
 version = "0.3.5"

From d1025d258727ef76bc888af5cafa49aab9a1e935 Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Tue, 25 Jun 2024 17:00:22 +0200
Subject: [PATCH 319/455] fix(kad): changelog

Correct `kad` changelog after https://github.com/libp2p/rust-libp2p/pull/5475

`kad` `0.46.0` isn't released yet, hence changelog entry from https://github.com/libp2p/rust-libp2p/pull/5475 will be published with `0.46.0`.

Pull-Request: #5478.
---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 protocols/kad/CHANGELOG.md | 6 ++----
 protocols/kad/Cargo.toml   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2bf774b1fd9..3521b7e4535 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2889,7 +2889,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.47.0"
+version = "0.46.0"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 88f09be43b1..ca85cb1ae5d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,7 +85,7 @@ libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
-libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
+libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index d26a58715b3..b31797b196d 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,9 +1,7 @@
-## 0.47.0
-- Included multiaddresses of found peers alongside peer IDs in `GetClosestPeers` query results.
-  See [PR 5475](https://github.com/libp2p/rust-libp2p/pull/5475)
-
 ## 0.46.0
 
+- Included multiaddresses of found peers alongside peer IDs in `GetClosestPeers` query results.
+  See [PR 5475](https://github.com/libp2p/rust-libp2p/pull/5475)
 - Changed `FIND_NODE` response: now includes a list of closest peers when querying the recipient peer ID. Previously, this request yielded an empty response.
   See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
 - Update to DHT republish interval and expiration time defaults to 22h and 48h respectively, rationale in [libp2p/specs#451](https://github.com/libp2p/specs/pull/451)
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 04d78a9947d..494d812c6ec 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.47.0"
+version = "0.46.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From df59f4f590b5d171e07cd7435f17bc7c1087ee5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 17:16:51 +0000
Subject: [PATCH 320/455] deps: bump docker/build-push-action from 5 to 6

Pull-Request: #5473.
---
 .github/workflows/docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index b9cd82897c2..21863d0ed39 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -30,7 +30,7 @@ jobs:
           images: ghcr.io/${{ github.repository }}-server
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./misc/server/Dockerfile

From 63313f44f02e266488bd473a2c97691dbfe30236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 27 Jun 2024 09:05:49 +0100
Subject: [PATCH 321/455] chore(kad): remove unrequired generics

Remove the unrequired generics in `kad` and refactor the code for less duplication.
Please review by commit order as it will be easier to understand each commit's rational and logic

Pull-Request: #5476.
---
 Cargo.lock                          |   2 +-
 Cargo.toml                          |   2 +-
 core/CHANGELOG.md                   |   6 +-
 core/Cargo.toml                     |   6 +-
 core/src/lib.rs                     |   7 -
 protocols/kad/src/behaviour.rs      | 209 ++++++++++------------------
 protocols/kad/src/behaviour/test.rs |   4 +-
 protocols/kad/src/lib.rs            |   6 +-
 protocols/kad/src/query.rs          | 142 +++++++++++--------
 9 files changed, 170 insertions(+), 214 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3521b7e4535..9b25b574a46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2696,7 +2696,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.41.4"
+version = "0.41.3"
 dependencies = [
  "async-std",
  "either",
diff --git a/Cargo.toml b/Cargo.toml
index ca85cb1ae5d..76bb4f18b3d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,7 +78,7 @@ libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.12.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
-libp2p-core = { version = "0.41.4", path = "core" }
+libp2p-core = { version = "0.41.3", path = "core" }
 libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 0c3b81cd3e5..b7f3c3c4640 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,8 +1,4 @@
-## 0.41.4
-- Add `PeerInfo` struct.
-  See [PR 5475](https://github.com/libp2p/rust-libp2p/pull/5475)
-
-## 0.41.3 
+## 0.41.3
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 048988c75b0..76021c15186 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-core"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.41.4"
+version = "0.41.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -35,8 +35,8 @@ void = "1"
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
-libp2p-mplex = { path = "../muxers/mplex" }                    # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
-libp2p-noise = { path = "../transports/noise" }                # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
+libp2p-mplex = { path = "../muxers/mplex" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
+libp2p-noise = { path = "../transports/noise" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 multihash = { workspace = true, features = ["arb"] }
 quickcheck = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rand"] }
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 73a4382c315..3ba153e1927 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -69,10 +69,3 @@ pub use upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 #[derive(Debug, thiserror::Error)]
 #[error(transparent)]
 pub struct DecodeError(quick_protobuf::Error);
-
-/// Peer Info combines a Peer ID with a set of multiaddrs that the peer is listening on.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct PeerInfo {
-    pub peer_id: PeerId,
-    pub addrs: Vec<Multiaddr>,
-}
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index ce81c2e8dca..09f4e93fe4e 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -33,10 +33,9 @@ use crate::record::{
     store::{self, RecordStore},
     ProviderRecord, Record,
 };
-use crate::K_VALUE;
 use crate::{jobs::*, protocol};
-use fnv::{FnvHashMap, FnvHashSet};
-use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr, PeerInfo};
+use fnv::FnvHashSet;
+use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{
     AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm,
@@ -47,7 +46,6 @@ use libp2p_swarm::{
     ListenAddresses, NetworkBehaviour, NotifyHandler, StreamProtocol, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use smallvec::SmallVec;
 use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
 use std::fmt;
 use std::num::NonZeroUsize;
@@ -76,7 +74,7 @@ pub struct Behaviour<TStore> {
     record_filtering: StoreInserts,
 
     /// The currently active (i.e. in-progress) queries.
-    queries: QueryPool<QueryInner>,
+    queries: QueryPool,
 
     /// The currently connected peers.
     ///
@@ -270,7 +268,7 @@ impl Config {
     /// Sets the replication factor to use.
     ///
     /// The replication factor determines to how many closest peers
-    /// a record is replicated. The default is [`K_VALUE`].
+    /// a record is replicated. The default is [`crate::K_VALUE`].
     pub fn set_replication_factor(&mut self, replication_factor: NonZeroUsize) -> &mut Self {
         self.query_config.replication_factor = replication_factor;
         self
@@ -429,7 +427,7 @@ impl Config {
     /// Sets the time to wait before calling [`Behaviour::bootstrap`] after a new peer is inserted in the routing table.
     /// This prevent cascading bootstrap requests when multiple peers are inserted into the routing table "at the same time".
     /// This also allows to wait a little bit for other potential peers to be inserted into the routing table before
-    /// triggering a bootstrap, giving more context to the future bootstrap request.  
+    /// triggering a bootstrap, giving more context to the future bootstrap request.
     ///
     /// * Default to `500` ms.
     /// * Set to `Some(Duration::ZERO)` to never wait before triggering a bootstrap request when a new peer
@@ -725,8 +723,7 @@ where
             step: ProgressStep::first(),
         };
         let peer_keys: Vec<kbucket::Key<PeerId>> = self.kbuckets.closest_keys(&target).collect();
-        let inner = QueryInner::new(info);
-        self.queries.add_iter_closest(target, peer_keys, inner)
+        self.queries.add_iter_closest(target, peer_keys, info)
     }
 
     /// Returns closest peers to the given key; takes peers from local routing table only.
@@ -775,8 +772,7 @@ where
             }
         };
         let peers = self.kbuckets.closest_keys(&target);
-        let inner = QueryInner::new(info);
-        let id = self.queries.add_iter_closest(target.clone(), peers, inner);
+        let id = self.queries.add_iter_closest(target.clone(), peers, info);
 
         // No queries were actually done for the results yet.
         let stats = QueryStats::empty();
@@ -832,8 +828,7 @@ where
             quorum,
             phase: PutRecordPhase::GetClosestPeers,
         };
-        let inner = QueryInner::new(info);
-        Ok(self.queries.add_iter_closest(target.clone(), peers, inner))
+        Ok(self.queries.add_iter_closest(target.clone(), peers, info))
     }
 
     /// Stores a record at specific peers, without storing it locally.
@@ -878,8 +873,7 @@ where
                 get_closest_peers_stats: QueryStats::empty(),
             },
         };
-        let inner = QueryInner::new(info);
-        self.queries.add_fixed(peers, inner)
+        self.queries.add_fixed(peers, info)
     }
 
     /// Removes the record with the given key from _local_ storage,
@@ -943,8 +937,7 @@ where
             Err(NoKnownPeers())
         } else {
             self.bootstrap_status.on_started();
-            let inner = QueryInner::new(info);
-            Ok(self.queries.add_iter_closest(local_key, peers, inner))
+            Ok(self.queries.add_iter_closest(local_key, peers, info))
         }
     }
 
@@ -989,8 +982,7 @@ where
             key,
             phase: AddProviderPhase::GetClosestPeers,
         };
-        let inner = QueryInner::new(info);
-        let id = self.queries.add_iter_closest(target.clone(), peers, inner);
+        let id = self.queries.add_iter_closest(target.clone(), peers, info);
         Ok(id)
     }
 
@@ -1030,8 +1022,7 @@ where
 
         let target = kbucket::Key::new(key.clone());
         let peers = self.kbuckets.closest_keys(&target);
-        let inner = QueryInner::new(info);
-        let id = self.queries.add_iter_closest(target.clone(), peers, inner);
+        let id = self.queries.add_iter_closest(target.clone(), peers, info);
 
         // No queries were actually done for the results yet.
         let stats = QueryStats::empty();
@@ -1165,7 +1156,7 @@ where
                     "Peer reported by source in query"
                 );
                 let addrs = peer.multiaddrs.iter().cloned().collect();
-                query.inner.addresses.insert(peer.node_id, addrs);
+                query.peers.addresses.insert(peer.node_id, addrs);
             }
             query.on_success(source, others_iter.cloned().map(|kp| kp.node_id))
         }
@@ -1254,8 +1245,7 @@ where
         };
         let target = kbucket::Key::new(key);
         let peers = self.kbuckets.closest_keys(&target);
-        let inner = QueryInner::new(info);
-        self.queries.add_iter_closest(target.clone(), peers, inner);
+        self.queries.add_iter_closest(target.clone(), peers, info);
     }
 
     /// Starts an iterative `PUT_VALUE` query for the given record.
@@ -1269,8 +1259,7 @@ where
             context,
             phase: PutRecordPhase::GetClosestPeers,
         };
-        let inner = QueryInner::new(info);
-        self.queries.add_iter_closest(target.clone(), peers, inner);
+        self.queries.add_iter_closest(target.clone(), peers, info);
     }
 
     /// Updates the routing table with a new connection status and address of a peer.
@@ -1387,11 +1376,10 @@ where
     }
 
     /// Handles a finished (i.e. successful) query.
-    fn query_finished(&mut self, q: Query<QueryInner>) -> Option<Event> {
+    fn query_finished(&mut self, q: Query) -> Option<Event> {
         let query_id = q.id();
         tracing::trace!(query=?query_id, "Query finished");
-        let mut result = q.into_result();
-        match result.inner.info {
+        match q.info {
             QueryInfo::Bootstrap {
                 peer,
                 remaining,
@@ -1445,9 +1433,8 @@ where
                         step: step.next(),
                     };
                     let peers = self.kbuckets.closest_keys(&target);
-                    let inner = QueryInner::new(info);
                     self.queries
-                        .continue_iter_closest(query_id, target, peers, inner);
+                        .continue_iter_closest(query_id, target, peers, info);
                 } else {
                     step.last = true;
                     self.bootstrap_status.on_finish();
@@ -1455,7 +1442,7 @@ where
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: q.stats,
                     result: QueryResult::Bootstrap(Ok(BootstrapOk {
                         peer,
                         num_remaining,
@@ -1466,23 +1453,14 @@ where
 
             QueryInfo::GetClosestPeers { key, mut step } => {
                 step.last = true;
-                let peers = result
-                    .peers
-                    .map(|peer_id| {
-                        let addrs = result
-                            .inner
-                            .addresses
-                            .remove(&peer_id)
-                            .unwrap_or_default()
-                            .to_vec();
-                        PeerInfo { peer_id, addrs }
-                    })
-                    .collect();
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
-                    result: QueryResult::GetClosestPeers(Ok(GetClosestPeersOk { key, peers })),
+                    stats: q.stats,
+                    result: QueryResult::GetClosestPeers(Ok(GetClosestPeersOk {
+                        key,
+                        peers: q.peers.into_peerinfos_iter().collect(),
+                    })),
                     step,
                 })
             }
@@ -1492,10 +1470,10 @@ where
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: q.stats,
                     result: QueryResult::GetProviders(Ok(
                         GetProvidersOk::FinishedWithNoAdditionalRecord {
-                            closest_peers: result.peers.collect(),
+                            closest_peers: q.peers.into_peerids_iter().collect(),
                         },
                     )),
                     step,
@@ -1509,16 +1487,17 @@ where
             } => {
                 let provider_id = self.local_peer_id;
                 let external_addresses = self.external_addresses.iter().cloned().collect();
-                let inner = QueryInner::new(QueryInfo::AddProvider {
+                let info = QueryInfo::AddProvider {
                     context,
                     key,
                     phase: AddProviderPhase::AddProvider {
                         provider_id,
                         external_addresses,
-                        get_closest_peers_stats: result.stats,
+                        get_closest_peers_stats: q.stats,
                     },
-                });
-                self.queries.continue_fixed(query_id, result.peers, inner);
+                };
+                self.queries
+                    .continue_fixed(query_id, q.peers.into_peerids_iter(), info);
                 None
             }
 
@@ -1533,13 +1512,13 @@ where
             } => match context {
                 AddProviderContext::Publish => Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: get_closest_peers_stats.merge(result.stats),
+                    stats: get_closest_peers_stats.merge(q.stats),
                     result: QueryResult::StartProviding(Ok(AddProviderOk { key })),
                     step: ProgressStep::first_and_last(),
                 }),
                 AddProviderContext::Republish => Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: get_closest_peers_stats.merge(result.stats),
+                    stats: get_closest_peers_stats.merge(q.stats),
                     result: QueryResult::RepublishProvider(Ok(AddProviderOk { key })),
                     step: ProgressStep::first_and_last(),
                 }),
@@ -1558,12 +1537,12 @@ where
                 } else {
                     Err(GetRecordError::NotFound {
                         key,
-                        closest_peers: result.peers.collect(),
+                        closest_peers: q.peers.into_peerids_iter().collect(),
                     })
                 };
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: q.stats,
                     result: QueryResult::GetRecord(results),
                     step,
                 })
@@ -1581,11 +1560,11 @@ where
                     quorum,
                     phase: PutRecordPhase::PutRecord {
                         success: vec![],
-                        get_closest_peers_stats: result.stats,
+                        get_closest_peers_stats: q.stats,
                     },
                 };
-                let inner = QueryInner::new(info);
-                self.queries.continue_fixed(query_id, result.peers, inner);
+                self.queries
+                    .continue_fixed(query_id, q.peers.into_peerids_iter(), info);
                 None
             }
 
@@ -1614,14 +1593,14 @@ where
                     PutRecordContext::Publish | PutRecordContext::Custom => {
                         Some(Event::OutboundQueryProgressed {
                             id: query_id,
-                            stats: get_closest_peers_stats.merge(result.stats),
+                            stats: get_closest_peers_stats.merge(q.stats),
                             result: QueryResult::PutRecord(mk_result(record.key)),
                             step: ProgressStep::first_and_last(),
                         })
                     }
                     PutRecordContext::Republish => Some(Event::OutboundQueryProgressed {
                         id: query_id,
-                        stats: get_closest_peers_stats.merge(result.stats),
+                        stats: get_closest_peers_stats.merge(q.stats),
                         result: QueryResult::RepublishRecord(mk_result(record.key)),
                         step: ProgressStep::first_and_last(),
                     }),
@@ -1635,11 +1614,10 @@ where
     }
 
     /// Handles a query that timed out.
-    fn query_timeout(&mut self, query: Query<QueryInner>) -> Option<Event> {
+    fn query_timeout(&mut self, query: Query) -> Option<Event> {
         let query_id = query.id();
         tracing::trace!(query=?query_id, "Query timed out");
-        let mut result = query.into_result();
-        match result.inner.info {
+        match query.info {
             QueryInfo::Bootstrap {
                 peer,
                 mut remaining,
@@ -1657,9 +1635,8 @@ where
                         step: step.next(),
                     };
                     let peers = self.kbuckets.closest_keys(&target);
-                    let inner = QueryInner::new(info);
                     self.queries
-                        .continue_iter_closest(query_id, target, peers, inner);
+                        .continue_iter_closest(query_id, target, peers, info);
                 } else {
                     step.last = true;
                     self.bootstrap_status.on_finish();
@@ -1667,7 +1644,7 @@ where
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: query.stats,
                     result: QueryResult::Bootstrap(Err(BootstrapError::Timeout {
                         peer,
                         num_remaining,
@@ -1679,13 +1656,13 @@ where
             QueryInfo::AddProvider { context, key, .. } => Some(match context {
                 AddProviderContext::Publish => Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: query.stats,
                     result: QueryResult::StartProviding(Err(AddProviderError::Timeout { key })),
                     step: ProgressStep::first_and_last(),
                 },
                 AddProviderContext::Republish => Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: query.stats,
                     result: QueryResult::RepublishProvider(Err(AddProviderError::Timeout { key })),
                     step: ProgressStep::first_and_last(),
                 },
@@ -1693,25 +1670,12 @@ where
 
             QueryInfo::GetClosestPeers { key, mut step } => {
                 step.last = true;
-                let peers = result
-                    .peers
-                    .map(|peer_id| {
-                        let addrs = result
-                            .inner
-                            .addresses
-                            .remove(&peer_id)
-                            .unwrap_or_default()
-                            .to_vec();
-                        PeerInfo { peer_id, addrs }
-                    })
-                    .collect();
-
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: query.stats,
                     result: QueryResult::GetClosestPeers(Err(GetClosestPeersError::Timeout {
                         key,
-                        peers,
+                        peers: query.peers.into_peerinfos_iter().collect(),
                     })),
                     step,
                 })
@@ -1735,14 +1699,14 @@ where
                     PutRecordContext::Publish | PutRecordContext::Custom => {
                         Some(Event::OutboundQueryProgressed {
                             id: query_id,
-                            stats: result.stats,
+                            stats: query.stats,
                             result: QueryResult::PutRecord(err),
                             step: ProgressStep::first_and_last(),
                         })
                     }
                     PutRecordContext::Republish => Some(Event::OutboundQueryProgressed {
                         id: query_id,
-                        stats: result.stats,
+                        stats: query.stats,
                         result: QueryResult::RepublishRecord(err),
                         step: ProgressStep::first_and_last(),
                     }),
@@ -1767,7 +1731,7 @@ where
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: query.stats,
                     result: QueryResult::GetRecord(Err(GetRecordError::Timeout { key })),
                     step,
                 })
@@ -1778,10 +1742,10 @@ where
 
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
-                    stats: result.stats,
+                    stats: query.stats,
                     result: QueryResult::GetProviders(Err(GetProvidersError::Timeout {
                         key,
-                        closest_peers: result.peers.collect(),
+                        closest_peers: query.peers.into_peerids_iter().collect(),
                     })),
                     step,
                 })
@@ -1979,7 +1943,7 @@ where
         }
 
         for query in self.queries.iter_mut() {
-            if let Some(addrs) = query.inner.addresses.get_mut(&peer_id) {
+            if let Some(addrs) = query.peers.addresses.get_mut(&peer_id) {
                 addrs.retain(|a| a != address);
             }
         }
@@ -2051,10 +2015,10 @@ where
         //
         // Given two connected nodes: local node A and remote node B. Say node B
         // is not in node A's routing table. Additionally node B is part of the
-        // `QueryInner::addresses` list of an ongoing query on node A. Say Node
+        // `Query::addresses` list of an ongoing query on node A. Say Node
         // B triggers an address change and then disconnects. Later on the
         // earlier mentioned query on node A would like to connect to node B.
-        // Without replacing the address in the `QueryInner::addresses` set node
+        // Without replacing the address in the `Query::addresses` set node
         // A would attempt to dial the old and not the new address.
         //
         // While upholding correctness, iterating through all discovered
@@ -2062,7 +2026,7 @@ where
         // large performance impact. If so, the code below might be worth
         // revisiting.
         for query in self.queries.iter_mut() {
-            if let Some(addrs) = query.inner.addresses.get_mut(&peer) {
+            if let Some(addrs) = query.peers.addresses.get_mut(&peer) {
                 for addr in addrs.iter_mut() {
                     if addr == old {
                         *addr = new.clone();
@@ -2137,11 +2101,10 @@ where
         // Queue events for sending pending RPCs to the connected peer.
         // There can be only one pending RPC for a particular peer and query per definition.
         for (_peer_id, event) in self.queries.iter_mut().filter_map(|q| {
-            q.inner
-                .pending_rpcs
+            q.pending_rpcs
                 .iter()
                 .position(|(p, _)| p == &peer)
-                .map(|p| q.inner.pending_rpcs.remove(p))
+                .map(|p| q.pending_rpcs.remove(p))
         }) {
             handler.on_behaviour_event(event)
         }
@@ -2232,7 +2195,7 @@ where
 
         // We add to that a temporary list of addresses from the ongoing queries.
         for query in self.queries.iter() {
-            if let Some(addrs) = query.inner.addresses.get(&peer_id) {
+            if let Some(addrs) = query.peers.addresses.get(&peer_id) {
                 peer_addrs.extend(addrs.iter().cloned())
             }
         }
@@ -2333,7 +2296,7 @@ where
                         ref mut providers_found,
                         ref mut step,
                         ..
-                    } = query.inner.info
+                    } = query.info
                     {
                         *providers_found += provider_peers.len();
                         let providers = provider_peers.iter().map(|p| p.node_id).collect();
@@ -2425,7 +2388,7 @@ where
                         ref mut step,
                         ref mut found_a_record,
                         cache_candidates,
-                    } = &mut query.inner.info
+                    } = &mut query.info
                     {
                         if let Some(record) = record {
                             *found_a_record = true;
@@ -2479,7 +2442,7 @@ where
                         phase: PutRecordPhase::PutRecord { success, .. },
                         quorum,
                         ..
-                    } = &mut query.inner.info
+                    } = &mut query.info
                     {
                         success.push(source);
 
@@ -2591,7 +2554,7 @@ where
                         }
                     }
                     QueryPoolState::Waiting(Some((query, peer_id))) => {
-                        let event = query.inner.info.to_request(query.id());
+                        let event = query.info.to_request(query.id());
                         // TODO: AddProvider requests yield no response, so the query completes
                         // as soon as all requests have been sent. However, the handler should
                         // better emit an event when the request has been sent (and report
@@ -2600,7 +2563,7 @@ where
                         if let QueryInfo::AddProvider {
                             phase: AddProviderPhase::AddProvider { .. },
                             ..
-                        } = &query.inner.info
+                        } = &query.info
                         {
                             query.on_success(&peer_id, vec![])
                         }
@@ -2612,7 +2575,7 @@ where
                                 handler: NotifyHandler::Any,
                             });
                         } else if &peer_id != self.kbuckets.local_key().preimage() {
-                            query.inner.pending_rpcs.push((peer_id, event));
+                            query.pending_rpcs.push((peer_id, event));
                             self.queued_events.push_back(ToSwarm::Dial {
                                 opts: DialOpts::peer_id(peer_id).build(),
                             });
@@ -2655,6 +2618,13 @@ where
     }
 }
 
+/// Peer Info combines a Peer ID with a set of multiaddrs that the peer is listening on.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PeerInfo {
+    pub peer_id: PeerId,
+    pub addrs: Vec<Multiaddr>,
+}
+
 /// A quorum w.r.t. the configured replication factor specifies the minimum
 /// number of distinct nodes that must be successfully contacted in order
 /// for a query to succeed.
@@ -3114,31 +3084,6 @@ impl From<kbucket::EntryView<kbucket::Key<PeerId>, Addresses>> for KadPeer {
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Internal query state
-
-struct QueryInner {
-    /// The query-specific state.
-    info: QueryInfo,
-    /// Addresses of peers discovered during a query.
-    addresses: FnvHashMap<PeerId, SmallVec<[Multiaddr; 8]>>,
-    /// A map of pending requests to peers.
-    ///
-    /// A request is pending if the targeted peer is not currently connected
-    /// and these requests are sent as soon as a connection to the peer is established.
-    pending_rpcs: SmallVec<[(PeerId, HandlerIn); K_VALUE.get()]>,
-}
-
-impl QueryInner {
-    fn new(info: QueryInfo) -> Self {
-        QueryInner {
-            info,
-            addresses: Default::default(),
-            pending_rpcs: SmallVec::default(),
-        }
-    }
-}
-
 /// The context of a [`QueryInfo::AddProvider`] query.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum AddProviderContext {
@@ -3324,7 +3269,7 @@ pub enum PutRecordPhase {
 
 /// A mutable reference to a running query.
 pub struct QueryMut<'a> {
-    query: &'a mut Query<QueryInner>,
+    query: &'a mut Query,
 }
 
 impl<'a> QueryMut<'a> {
@@ -3334,7 +3279,7 @@ impl<'a> QueryMut<'a> {
 
     /// Gets information about the type and state of the query.
     pub fn info(&self) -> &QueryInfo {
-        &self.query.inner.info
+        &self.query.info
     }
 
     /// Gets execution statistics about the query.
@@ -3354,7 +3299,7 @@ impl<'a> QueryMut<'a> {
 
 /// An immutable reference to a running query.
 pub struct QueryRef<'a> {
-    query: &'a Query<QueryInner>,
+    query: &'a Query,
 }
 
 impl<'a> QueryRef<'a> {
@@ -3364,7 +3309,7 @@ impl<'a> QueryRef<'a> {
 
     /// Gets information about the type and state of the query.
     pub fn info(&self) -> &QueryInfo {
-        &self.query.inner.info
+        &self.query.info
     }
 
     /// Gets execution statistics about the query.
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index a3ff43ded6e..b82ec966f89 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -23,7 +23,7 @@
 use super::*;
 
 use crate::record::{store::MemoryStore, Key};
-use crate::{PROTOCOL_NAME, SHA_256_MH};
+use crate::{K_VALUE, PROTOCOL_NAME, SHA_256_MH};
 use futures::{executor::block_on, future::poll_fn, prelude::*};
 use futures_timer::Delay;
 use libp2p_core::{
@@ -1187,7 +1187,7 @@ fn disjoint_query_does_not_finish_before_all_paths_did() {
         .behaviour()
         .queries
         .iter()
-        .for_each(|q| match &q.inner.info {
+        .for_each(|q| match &q.info {
             QueryInfo::GetRecord { step, .. } => {
                 assert_eq!(usize::from(step.count), 2);
             }
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index bb7c2ace663..681d135f79b 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -59,9 +59,9 @@ pub use behaviour::{
     AddProviderContext, AddProviderError, AddProviderOk, AddProviderPhase, AddProviderResult,
     BootstrapError, BootstrapOk, BootstrapResult, GetClosestPeersError, GetClosestPeersOk,
     GetClosestPeersResult, GetProvidersError, GetProvidersOk, GetProvidersResult, GetRecordError,
-    GetRecordOk, GetRecordResult, InboundRequest, Mode, NoKnownPeers, PeerRecord, PutRecordContext,
-    PutRecordError, PutRecordOk, PutRecordPhase, PutRecordResult, QueryInfo, QueryMut, QueryRef,
-    QueryResult, QueryStats, RoutingUpdate,
+    GetRecordOk, GetRecordResult, InboundRequest, Mode, NoKnownPeers, PeerInfo, PeerRecord,
+    PutRecordContext, PutRecordError, PutRecordOk, PutRecordPhase, PutRecordResult, QueryInfo,
+    QueryMut, QueryRef, QueryResult, QueryStats, RoutingUpdate,
 };
 pub use behaviour::{
     Behaviour, BucketInserts, Caching, Config, Event, ProgressStep, Quorum, StoreInserts,
diff --git a/protocols/kad/src/query.rs b/protocols/kad/src/query.rs
index cf102040a7a..c598bac012e 100644
--- a/protocols/kad/src/query.rs
+++ b/protocols/kad/src/query.rs
@@ -20,14 +20,18 @@
 
 mod peers;
 
+use libp2p_core::Multiaddr;
 use peers::closest::{
     disjoint::ClosestDisjointPeersIter, ClosestPeersIter, ClosestPeersIterConfig,
 };
 use peers::fixed::FixedPeersIter;
 use peers::PeersIterState;
+use smallvec::SmallVec;
 
+use crate::behaviour::PeerInfo;
+use crate::handler::HandlerIn;
 use crate::kbucket::{Key, KeyBytes};
-use crate::{ALPHA_VALUE, K_VALUE};
+use crate::{QueryInfo, ALPHA_VALUE, K_VALUE};
 use either::Either;
 use fnv::FnvHashMap;
 use libp2p_identity::PeerId;
@@ -39,26 +43,26 @@ use web_time::Instant;
 /// Internally, a `Query` is in turn driven by an underlying `QueryPeerIter`
 /// that determines the peer selection strategy, i.e. the order in which the
 /// peers involved in the query should be contacted.
-pub(crate) struct QueryPool<TInner> {
+pub(crate) struct QueryPool {
     next_id: usize,
     config: QueryConfig,
-    queries: FnvHashMap<QueryId, Query<TInner>>,
+    queries: FnvHashMap<QueryId, Query>,
 }
 
 /// The observable states emitted by [`QueryPool::poll`].
-pub(crate) enum QueryPoolState<'a, TInner> {
+pub(crate) enum QueryPoolState<'a> {
     /// The pool is idle, i.e. there are no queries to process.
     Idle,
     /// At least one query is waiting for results. `Some(request)` indicates
     /// that a new request is now being waited on.
-    Waiting(Option<(&'a mut Query<TInner>, PeerId)>),
+    Waiting(Option<(&'a mut Query, PeerId)>),
     /// A query has finished.
-    Finished(Query<TInner>),
+    Finished(Query),
     /// A query has timed out.
-    Timeout(Query<TInner>),
+    Timeout(Query),
 }
 
-impl<TInner> QueryPool<TInner> {
+impl QueryPool {
     /// Creates a new `QueryPool` with the given configuration.
     pub(crate) fn new(config: QueryConfig) -> Self {
         QueryPool {
@@ -74,7 +78,7 @@ impl<TInner> QueryPool<TInner> {
     }
 
     /// Returns an iterator over the queries in the pool.
-    pub(crate) fn iter(&self) -> impl Iterator<Item = &Query<TInner>> {
+    pub(crate) fn iter(&self) -> impl Iterator<Item = &Query> {
         self.queries.values()
     }
 
@@ -84,42 +88,42 @@ impl<TInner> QueryPool<TInner> {
     }
 
     /// Returns an iterator that allows modifying each query in the pool.
-    pub(crate) fn iter_mut(&mut self) -> impl Iterator<Item = &mut Query<TInner>> {
+    pub(crate) fn iter_mut(&mut self) -> impl Iterator<Item = &mut Query> {
         self.queries.values_mut()
     }
 
     /// Adds a query to the pool that contacts a fixed set of peers.
-    pub(crate) fn add_fixed<I>(&mut self, peers: I, inner: TInner) -> QueryId
+    pub(crate) fn add_fixed<I>(&mut self, peers: I, info: QueryInfo) -> QueryId
     where
         I: IntoIterator<Item = PeerId>,
     {
         let id = self.next_query_id();
-        self.continue_fixed(id, peers, inner);
+        self.continue_fixed(id, peers, info);
         id
     }
 
     /// Continues an earlier query with a fixed set of peers, reusing
     /// the given query ID, which must be from a query that finished
     /// earlier.
-    pub(crate) fn continue_fixed<I>(&mut self, id: QueryId, peers: I, inner: TInner)
+    pub(crate) fn continue_fixed<I>(&mut self, id: QueryId, peers: I, info: QueryInfo)
     where
         I: IntoIterator<Item = PeerId>,
     {
         assert!(!self.queries.contains_key(&id));
         let parallelism = self.config.replication_factor;
         let peer_iter = QueryPeerIter::Fixed(FixedPeersIter::new(peers, parallelism));
-        let query = Query::new(id, peer_iter, inner);
+        let query = Query::new(id, peer_iter, info);
         self.queries.insert(id, query);
     }
 
     /// Adds a query to the pool that iterates towards the closest peers to the target.
-    pub(crate) fn add_iter_closest<T, I>(&mut self, target: T, peers: I, inner: TInner) -> QueryId
+    pub(crate) fn add_iter_closest<T, I>(&mut self, target: T, peers: I, info: QueryInfo) -> QueryId
     where
         T: Into<KeyBytes> + Clone,
         I: IntoIterator<Item = Key<PeerId>>,
     {
         let id = self.next_query_id();
-        self.continue_iter_closest(id, target, peers, inner);
+        self.continue_iter_closest(id, target, peers, info);
         id
     }
 
@@ -129,7 +133,7 @@ impl<TInner> QueryPool<TInner> {
         id: QueryId,
         target: T,
         peers: I,
-        inner: TInner,
+        info: QueryInfo,
     ) where
         T: Into<KeyBytes> + Clone,
         I: IntoIterator<Item = Key<PeerId>>,
@@ -148,7 +152,7 @@ impl<TInner> QueryPool<TInner> {
             QueryPeerIter::Closest(ClosestPeersIter::with_config(cfg, target, peers))
         };
 
-        let query = Query::new(id, peer_iter, inner);
+        let query = Query::new(id, peer_iter, info);
         self.queries.insert(id, query);
     }
 
@@ -159,17 +163,17 @@ impl<TInner> QueryPool<TInner> {
     }
 
     /// Returns a reference to a query with the given ID, if it is in the pool.
-    pub(crate) fn get(&self, id: &QueryId) -> Option<&Query<TInner>> {
+    pub(crate) fn get(&self, id: &QueryId) -> Option<&Query> {
         self.queries.get(id)
     }
 
     /// Returns a mutablereference to a query with the given ID, if it is in the pool.
-    pub(crate) fn get_mut(&mut self, id: &QueryId) -> Option<&mut Query<TInner>> {
+    pub(crate) fn get_mut(&mut self, id: &QueryId) -> Option<&mut Query> {
         self.queries.get_mut(id)
     }
 
     /// Polls the pool to advance the queries.
-    pub(crate) fn poll(&mut self, now: Instant) -> QueryPoolState<'_, TInner> {
+    pub(crate) fn poll(&mut self, now: Instant) -> QueryPoolState<'_> {
         let mut finished = None;
         let mut timeout = None;
         let mut waiting = None;
@@ -264,15 +268,53 @@ impl Default for QueryConfig {
 }
 
 /// A query in a `QueryPool`.
-pub(crate) struct Query<TInner> {
+pub(crate) struct Query {
     /// The unique ID of the query.
     id: QueryId,
     /// The peer iterator that drives the query state.
-    peer_iter: QueryPeerIter,
+    pub(crate) peers: QueryPeers,
     /// Execution statistics of the query.
-    stats: QueryStats,
-    /// The opaque inner query state.
-    pub(crate) inner: TInner,
+    pub(crate) stats: QueryStats,
+    /// The query-specific state.
+    pub(crate) info: QueryInfo,
+    /// A map of pending requests to peers.
+    ///
+    /// A request is pending if the targeted peer is not currently connected
+    /// and these requests are sent as soon as a connection to the peer is established.
+    pub(crate) pending_rpcs: SmallVec<[(PeerId, HandlerIn); K_VALUE.get()]>,
+}
+
+/// The peer iterator that drives the query state,
+pub(crate) struct QueryPeers {
+    /// Addresses of peers discovered during a query.
+    pub(crate) addresses: FnvHashMap<PeerId, SmallVec<[Multiaddr; 8]>>,
+    /// The peer iterator that drives the query state.
+    peer_iter: QueryPeerIter,
+}
+
+impl QueryPeers {
+    /// Consumes the peers iterator, producing a final `Iterator` over the discovered `PeerId`s.
+    pub(crate) fn into_peerids_iter(self) -> impl Iterator<Item = PeerId> {
+        match self.peer_iter {
+            QueryPeerIter::Closest(iter) => Either::Left(Either::Left(iter.into_result())),
+            QueryPeerIter::ClosestDisjoint(iter) => Either::Left(Either::Right(iter.into_result())),
+            QueryPeerIter::Fixed(iter) => Either::Right(iter.into_result()),
+        }
+    }
+
+    /// Consumes the peers iterator, producing a final `Iterator` over the discovered `PeerId`s
+    /// with their matching `Multiaddr`s.
+    pub(crate) fn into_peerinfos_iter(mut self) -> impl Iterator<Item = PeerInfo> {
+        match self.peer_iter {
+            QueryPeerIter::Closest(iter) => Either::Left(Either::Left(iter.into_result())),
+            QueryPeerIter::ClosestDisjoint(iter) => Either::Left(Either::Right(iter.into_result())),
+            QueryPeerIter::Fixed(iter) => Either::Right(iter.into_result()),
+        }
+        .map(move |peer_id| {
+            let addrs = self.addresses.remove(&peer_id).unwrap_or_default().to_vec();
+            PeerInfo { peer_id, addrs }
+        })
+    }
 }
 
 /// The peer selection strategies that can be used by queries.
@@ -282,13 +324,17 @@ enum QueryPeerIter {
     Fixed(FixedPeersIter),
 }
 
-impl<TInner> Query<TInner> {
+impl Query {
     /// Creates a new query without starting it.
-    fn new(id: QueryId, peer_iter: QueryPeerIter, inner: TInner) -> Self {
+    fn new(id: QueryId, peer_iter: QueryPeerIter, info: QueryInfo) -> Self {
         Query {
             id,
-            inner,
-            peer_iter,
+            info,
+            peers: QueryPeers {
+                addresses: Default::default(),
+                peer_iter,
+            },
+            pending_rpcs: SmallVec::default(),
             stats: QueryStats::empty(),
         }
     }
@@ -305,7 +351,7 @@ impl<TInner> Query<TInner> {
 
     /// Informs the query that the attempt to contact `peer` failed.
     pub(crate) fn on_failure(&mut self, peer: &PeerId) {
-        let updated = match &mut self.peer_iter {
+        let updated = match &mut self.peers.peer_iter {
             QueryPeerIter::Closest(iter) => iter.on_failure(peer),
             QueryPeerIter::ClosestDisjoint(iter) => iter.on_failure(peer),
             QueryPeerIter::Fixed(iter) => iter.on_failure(peer),
@@ -322,7 +368,7 @@ impl<TInner> Query<TInner> {
     where
         I: IntoIterator<Item = PeerId>,
     {
-        let updated = match &mut self.peer_iter {
+        let updated = match &mut self.peers.peer_iter {
             QueryPeerIter::Closest(iter) => iter.on_success(peer, new_peers),
             QueryPeerIter::ClosestDisjoint(iter) => iter.on_success(peer, new_peers),
             QueryPeerIter::Fixed(iter) => iter.on_success(peer),
@@ -334,7 +380,7 @@ impl<TInner> Query<TInner> {
 
     /// Advances the state of the underlying peer iterator.
     fn next(&mut self, now: Instant) -> PeersIterState<'_> {
-        let state = match &mut self.peer_iter {
+        let state = match &mut self.peers.peer_iter {
             QueryPeerIter::Closest(iter) => iter.next(now),
             QueryPeerIter::ClosestDisjoint(iter) => iter.next(now),
             QueryPeerIter::Fixed(iter) => iter.next(),
@@ -368,7 +414,7 @@ impl<TInner> Query<TInner> {
     where
         I: IntoIterator<Item = &'a PeerId>,
     {
-        match &mut self.peer_iter {
+        match &mut self.peers.peer_iter {
             QueryPeerIter::Closest(iter) => {
                 iter.finish();
                 true
@@ -386,7 +432,7 @@ impl<TInner> Query<TInner> {
     /// A finished query immediately stops yielding new peers to contact and will be
     /// reported by [`QueryPool::poll`] via [`QueryPoolState::Finished`].
     pub(crate) fn finish(&mut self) {
-        match &mut self.peer_iter {
+        match &mut self.peers.peer_iter {
             QueryPeerIter::Closest(iter) => iter.finish(),
             QueryPeerIter::ClosestDisjoint(iter) => iter.finish(),
             QueryPeerIter::Fixed(iter) => iter.finish(),
@@ -398,36 +444,12 @@ impl<TInner> Query<TInner> {
     /// A finished query is eventually reported by `QueryPool::next()` and
     /// removed from the pool.
     pub(crate) fn is_finished(&self) -> bool {
-        match &self.peer_iter {
+        match &self.peers.peer_iter {
             QueryPeerIter::Closest(iter) => iter.is_finished(),
             QueryPeerIter::ClosestDisjoint(iter) => iter.is_finished(),
             QueryPeerIter::Fixed(iter) => iter.is_finished(),
         }
     }
-
-    /// Consumes the query, producing the final `QueryResult`.
-    pub(crate) fn into_result(self) -> QueryResult<TInner, impl Iterator<Item = PeerId>> {
-        let peers = match self.peer_iter {
-            QueryPeerIter::Closest(iter) => Either::Left(Either::Left(iter.into_result())),
-            QueryPeerIter::ClosestDisjoint(iter) => Either::Left(Either::Right(iter.into_result())),
-            QueryPeerIter::Fixed(iter) => Either::Right(iter.into_result()),
-        };
-        QueryResult {
-            peers,
-            inner: self.inner,
-            stats: self.stats,
-        }
-    }
-}
-
-/// The result of a `Query`.
-pub(crate) struct QueryResult<TInner, TPeers> {
-    /// The opaque inner query state.
-    pub(crate) inner: TInner,
-    /// The successfully contacted peers.
-    pub(crate) peers: TPeers,
-    /// The collected query statistics.
-    pub(crate) stats: QueryStats,
 }
 
 /// Execution statistics of a query.

From 23eb4f8e30bd5ca6cc55ed3ac6fdefe2131c9830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 4 Jul 2024 11:49:23 +0100
Subject: [PATCH 322/455] deps(ci): update cache-cargo-install-action

and fix ci, by using `tomlq` new binary name, `tq`

Pull-Request: #5481.
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e6d8c7fdaf..8f1fe263a2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
           cargo metadata --format-version=1 --no-deps | \
           jq -e -r '.packages[] | select(.name == "'"$CRATE"'") | .dependencies | all(.name != "libp2p")'
 
-      - uses: taiki-e/cache-cargo-install-action@5b024fe3a0a2c7f2aaff0e47871acf0d14b07207 # v1
+      - uses: taiki-e/cache-cargo-install-action@v2
         with:
           tool: tomlq
 
@@ -70,7 +70,7 @@ jobs:
       - name: Enforce version in `workspace.dependencies` matches latest version
         if: env.CRATE != 'libp2p'
         run: |
-          SPECIFIED_VERSION=$(tomlq "workspace.dependencies.$CRATE.version" --file ./Cargo.toml)
+          SPECIFIED_VERSION=$(tq "workspace.dependencies.$CRATE.version" --file ./Cargo.toml)
 
           echo "Package version: $CRATE_VERSION";
           echo "Specified version: $SPECIFIED_VERSION";

From 36c2f94affce4edff303f8dcfa882737451da13c Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Thu, 4 Jul 2024 13:17:28 +0200
Subject: [PATCH 323/455] feat(kad): improve automatic bootstrap

As discussed in the last maintainer call, some improvements are probably necessary for the automatic bootstrap feature (introduced by https://github.com/libp2p/rust-libp2p/pull/4838). Indeed, like @drHuangMHT mentioned in https://github.com/libp2p/rust-libp2p/issues/5341 and like @guillaumemichel has agreed, triggering a bootstrap every time an update happens inside the routing table consumes a lot more resources.

The idea behind the automatic bootstrap feature it that, when a peer is starting, if a routing table update happens we probably don't want to wait for the periodic bootstrap to trigger and we want to trigger it right now. However, like @guillaumemichel said, this is something we want to do at startup or when a network connectivity problem happens, we don't want to do that all the time.

This PR is a proposal to trigger automatically a bootstrap on routing table update but only when we have less that `K_VALUE` peers in it (meaning that we are starting up or something went wrong and the fact that a new peer is inserted is probably a sign that the network connectivity issue is resolved).

I have also added a new triggering condition like mentioned in the maintainer call. When discovering a new listen address and if we have no connected peers, we trigger a bootstrap. This condition is based on our own experience at Stormshield : some peers were starting before the network interfaces were up, doing so, the automatic and periodic bootstrap failed, but when the network interfaces were finally up, we were waiting X minutes for the periodic bootstrap to actually trigger a bootstrap and join the p2p network.

Pull-Request: #5474.
---
 protocols/kad/CHANGELOG.md     |  4 ++++
 protocols/kad/src/behaviour.rs | 28 +++++++++++++++++++++++++---
 protocols/kad/src/bootstrap.rs | 17 +++++++++--------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index b31797b196d..f88484bafa1 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -23,6 +23,10 @@
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 - Correctly handle the `NoKnownPeers` error on automatic bootstrap.
   See [PR 5349](https://github.com/libp2p/rust-libp2p/pull/5349).
+- Improve automatic bootstrap triggering conditions:
+  trigger when the routing table is updated and we have less that `K_VALUE` peers in it,
+  trigger when a new listen address is discovered and we have no connected peers.
+  See [PR 5474](https://github.com/libp2p/rust-libp2p/pull/5474).
 
 ## 0.45.3
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 09f4e93fe4e..069eec1a5b4 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -23,7 +23,6 @@
 mod test;
 
 use crate::addresses::Addresses;
-use crate::bootstrap;
 use crate::handler::{Handler, HandlerEvent, HandlerIn, RequestId};
 use crate::kbucket::{self, Distance, KBucketsTable, NodeStatus};
 use crate::protocol::{ConnectionType, KadPeer, ProtocolConfig};
@@ -33,6 +32,7 @@ use crate::record::{
     store::{self, RecordStore},
     ProviderRecord, Record,
 };
+use crate::{bootstrap, K_VALUE};
 use crate::{jobs::*, protocol};
 use fnv::FnvHashSet;
 use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
@@ -604,7 +604,8 @@ where
                 };
                 match entry.insert(addresses.clone(), status) {
                     kbucket::InsertResult::Inserted => {
-                        self.bootstrap_status.on_new_peer_in_routing_table();
+                        self.bootstrap_on_low_peers();
+
                         self.queued_events.push_back(ToSwarm::GenerateEvent(
                             Event::RoutingUpdated {
                                 peer: *peer,
@@ -1324,7 +1325,8 @@ where
                         let addresses = Addresses::new(a);
                         match entry.insert(addresses.clone(), new_status) {
                             kbucket::InsertResult::Inserted => {
-                                self.bootstrap_status.on_new_peer_in_routing_table();
+                                self.bootstrap_on_low_peers();
+
                                 let event = Event::RoutingUpdated {
                                     peer,
                                     is_new_peer: true,
@@ -1375,6 +1377,20 @@ where
         }
     }
 
+    /// A new peer has been inserted in the routing table but we check if the routing
+    /// table is currently small (less that `K_VALUE` peers are present) and only
+    /// trigger a bootstrap in that case
+    fn bootstrap_on_low_peers(&mut self) {
+        if self
+            .kbuckets()
+            .map(|kbucket| kbucket.num_entries())
+            .sum::<usize>()
+            < K_VALUE.get()
+        {
+            self.bootstrap_status.trigger();
+        }
+    }
+
     /// Handles a finished (i.e. successful) query.
     fn query_finished(&mut self, q: Query) -> Option<Event> {
         let query_id = q.id();
@@ -2613,6 +2629,12 @@ where
             }
             FromSwarm::DialFailure(dial_failure) => self.on_dial_failure(dial_failure),
             FromSwarm::AddressChange(address_change) => self.on_address_change(address_change),
+            FromSwarm::NewListenAddr(_) if self.connected_peers.is_empty() => {
+                // A new listen addr was just discovered and we have no connected peers,
+                // it can mean that our network interfaces were not up but they are now
+                // so it might be a good idea to trigger a bootstrap.
+                self.bootstrap_status.trigger();
+            }
             _ => {}
         }
     }
diff --git a/protocols/kad/src/bootstrap.rs b/protocols/kad/src/bootstrap.rs
index fd9e3d41be6..40acdfd88ee 100644
--- a/protocols/kad/src/bootstrap.rs
+++ b/protocols/kad/src/bootstrap.rs
@@ -44,7 +44,8 @@ impl Status {
         }
     }
 
-    pub(crate) fn on_new_peer_in_routing_table(&mut self) {
+    /// Trigger a bootstrap now or after the configured `automatic_throttle` if configured.
+    pub(crate) fn trigger(&mut self) {
         // Registering `self.throttle_timer` means scheduling a bootstrap.
         // A bootstrap will be triggered when `self.throttle_timer` finishes.
         // A `throttle_timer` is useful to not trigger a batch of bootstraps when a
@@ -201,7 +202,7 @@ mod tests {
             "bootstrap to not be triggered immediately because periodic bootstrap is in ~1s"
         );
 
-        status.on_new_peer_in_routing_table(); // Connected to a new peer though!
+        status.trigger(); // Connected to a new peer though!
         assert!(
             status.next().now_or_never().is_some(),
             "bootstrap to be triggered immediately because we connected to a new peer"
@@ -226,7 +227,7 @@ mod tests {
             "bootstrap to not be triggered immediately because periodic bootstrap is in ~1s"
         );
 
-        status.on_new_peer_in_routing_table(); // Connected to a new peer though!
+        status.trigger(); // Connected to a new peer though!
         assert!(
             status.next().now_or_never().is_none(),
             "bootstrap to not be triggered immediately because throttle is 5ms"
@@ -247,7 +248,7 @@ mod tests {
         // User manually triggered a bootstrap
         do_bootstrap(&mut status);
 
-        status.on_new_peer_in_routing_table(); // Connected to a new peer though!
+        status.trigger(); // Connected to a new peer though!
 
         assert!(
             status.next().now_or_never().is_some(),
@@ -260,7 +261,7 @@ mod tests {
     ) {
         let mut status = Status::new(Some(MS_100), Some(MS_5));
 
-        status.on_new_peer_in_routing_table();
+        status.trigger();
 
         let start = Instant::now();
         await_and_do_bootstrap(&mut status).await;
@@ -280,7 +281,7 @@ mod tests {
     ) {
         let mut status = Status::new(None, Some(Duration::ZERO));
 
-        status.on_new_peer_in_routing_table();
+        status.trigger();
 
         status.next().await;
     }
@@ -304,10 +305,10 @@ mod tests {
     ) {
         let mut status = Status::new(None, Some(MS_100));
 
-        status.on_new_peer_in_routing_table();
+        status.trigger();
         for _ in 0..10 {
             Delay::new(MS_100 / 2).await;
-            status.on_new_peer_in_routing_table(); // should reset throttle_timer
+            status.trigger(); // should reset throttle_timer
         }
         assert!(
             status.next().now_or_never().is_none(),

From 693d7b7df75ce02095c3e5d6acb2315882445f52 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Thu, 4 Jul 2024 18:02:49 +0300
Subject: [PATCH 324/455] feat(swarm): Show task `spawn` paths in tokio-console

This PR adds `#[track_caller]` on all `spawn` wrappers.

Pull-Request: #5465.
---
 Cargo.lock                      | 2 +-
 Cargo.toml                      | 2 +-
 protocols/mdns/CHANGELOG.md     | 5 +++++
 protocols/mdns/Cargo.toml       | 2 +-
 protocols/mdns/src/behaviour.rs | 1 +
 swarm/CHANGELOG.md              | 2 ++
 swarm/src/connection/pool.rs    | 1 +
 swarm/src/executor.rs           | 1 +
 8 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b25b574a46..5d45d51ac4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2924,7 +2924,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "async-io 2.3.3",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 76bb4f18b3d..ab660cc90e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
-libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
+libp2p-mdns = { version = "0.45.2", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
 libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md
index cfd02232b07..18fe0e76e6f 100644
--- a/protocols/mdns/CHANGELOG.md
+++ b/protocols/mdns/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.2
+
+- Add `#[track_caller]` on all `spawn` wrappers.
+  See [PR 5465](https://github.com/libp2p/rust-libp2p/pull/5465).
+
 ## 0.45.1
 
 - Ensure `Multiaddr` handled and returned by `Behaviour` are `/p2p` terminated.
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 56741463d6b..724c8818621 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-mdns"
 edition = "2021"
 rust-version = { workspace = true }
-version = "0.45.1"
+version = "0.45.2"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
diff --git a/protocols/mdns/src/behaviour.rs b/protocols/mdns/src/behaviour.rs
index 4e3533f26ab..d4a0a707a01 100644
--- a/protocols/mdns/src/behaviour.rs
+++ b/protocols/mdns/src/behaviour.rs
@@ -55,6 +55,7 @@ pub trait Provider: 'static {
     /// Create a new instance of the `IfWatcher` type.
     fn new_watcher() -> Result<Self::Watcher, std::io::Error>;
 
+    #[track_caller]
     fn spawn(task: impl Future<Output = ()> + Send + 'static) -> Self::TaskHandle;
 }
 
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 1b53ee9b937..1139c40021f 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -5,6 +5,8 @@
 
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+- Add `#[track_caller]` on all `spawn` wrappers.
+  See [PR 5465](https://github.com/libp2p/rust-libp2p/pull/5465).
 
 ## 0.44.2
 
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index 236f76e2fcc..48ba92f1020 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -70,6 +70,7 @@ impl ExecSwitch {
         }
     }
 
+    #[track_caller]
     fn spawn(&mut self, task: impl Future<Output = ()> + Send + 'static) {
         let task = task.boxed();
 
diff --git a/swarm/src/executor.rs b/swarm/src/executor.rs
index e949bf3cbde..a2abbbde6ef 100644
--- a/swarm/src/executor.rs
+++ b/swarm/src/executor.rs
@@ -11,6 +11,7 @@ use std::{future::Future, pin::Pin};
 /// >           about running `Future`s on a separate task.
 pub trait Executor {
     /// Run the given future in the background until it ends.
+    #[track_caller]
     fn exec(&self, future: Pin<Box<dyn Future<Output = ()> + Send>>);
 }
 

From 02fc0278f675ba33d0e749b7dbe0d0b5d289d88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20D=C3=B3ka?=
 <60517552+jakubDoka@users.noreply.github.com>
Date: Sat, 6 Jul 2024 01:30:18 +0200
Subject: [PATCH 325/455] fix(swarm): eliminating protocol cloning when nothing
 is happening
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Code keeps the API while eliminating repetitive protocol cloning when protocols did not change, If protocol changes occur, only then the protocols are cloned to a reused buffer from which they are borrowed for iteration. Following are benchmark results:

|behaviour count|iterations|protocols|timings|change*|
|-|-|-|-|-|
|1|1000|10|27.798 µs 28.134 µs 28.493 µs|-15.771% -14.523% -13.269%|
|1|1000|100|55.171 µs 55.578 µs 56.009 µs|-51.831% -50.162% -48.437%|
|1|1000|1000|289.24 µs 290.99 µs 293.00 µs|-61.748% -60.895% -60.054%|
|5|1000|2|34.000 µs 34.216 µs 34.457 µs|-18.538% -16.231% -14.011%|
|5|1000|20|70.962 µs 71.428 µs 72.005 µs|-40.501% -38.944% -37.309%|
|5|1000|200|426.17 µs 433.27 µs 442.60 µs|-44.824% -42.663% -40.262%|
|10|1000|1|42.993 µs 44.382 µs 45.655 µs|-18.839% -16.292% -13.584%|
|10|1000|10|94.022 µs 96.787 µs 99.321 µs|-25.469% -23.572% -21.562%|
|10|1000|100|543.13 µs 554.91 µs 569.06 µs|-43.781% -42.189% -40.568%|
|20|500|1|63.150 µs 64.846 µs 66.860 µs|-9.5693% -6.1722% -2.6400%|
|20|500|10|212.21 µs 217.48 µs 222.64 µs|-16.525% -14.234% -11.925%|
|20|500|100|1.6651 ms 1.7083 ms 1.7490 ms|-27.704% -25.683% -23.618%|

change*: 3da7d918d0d3c443f20d1813772af1ac152b68c7 is the baseline

Pull-Request: #5026.
---
 Cargo.lock                                  |   5 +-
 Cargo.toml                                  |   2 +-
 swarm/CHANGELOG.md                          |   7 +
 swarm/Cargo.toml                            |   7 +-
 swarm/benches/connection_handler.rs         | 359 ++++++++++++++++++++
 swarm/src/connection.rs                     |  70 ++--
 swarm/src/connection/supported_protocols.rs |  20 +-
 swarm/src/handler.rs                        | 320 +++++++++++++----
 swarm/src/lib.rs                            |   8 +
 9 files changed, 707 insertions(+), 91 deletions(-)
 create mode 100644 swarm/benches/connection_handler.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5d45d51ac4b..5ee39cb1786 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1093,6 +1093,7 @@ dependencies = [
  "ciborium",
  "clap",
  "criterion-plot",
+ "futures",
  "is-terminal",
  "itertools",
  "num-traits",
@@ -1105,6 +1106,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "tinytemplate",
+ "tokio",
  "walkdir",
 ]
 
@@ -3291,9 +3293,10 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "async-std",
+ "criterion",
  "either",
  "fnv",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index ab660cc90e9..1444b469c31 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.4", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
-libp2p-swarm = { version = "0.45.0", path = "swarm" }
+libp2p-swarm = { version = "0.45.1", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 1139c40021f..8cf8852dd76 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,3 +1,10 @@
+
+## 0.45.1
+
+- Optimize internal connection `fn poll`. New implementation now scales much better with number of listen protocols active.
+  No changes to public API introduced.
+  See [PR 5026](https://github.com/libp2p/rust-libp2p/pull/5026)
+
 ## 0.45.0
 
 - Add peer_id to `FromSwarm::ListenFailure`.
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 60cf58cb495..6ce99aa33c5 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -52,6 +52,7 @@ libp2p-swarm-derive = { path = "../swarm-derive" }                  # Using `pat
 libp2p-swarm-test = { path = "../swarm-test" }                      # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-yamux = { path = "../muxers/yamux" }                         # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 quickcheck = { workspace = true }
+criterion = { version = "0.5", features = ["async_tokio"] }
 void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.95"
@@ -69,5 +70,9 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 rustc-args = ["--cfg", "docsrs"]
 
+[[bench]]
+name = "connection_handler"
+harness = false
+
 [lints]
 workspace = true
diff --git a/swarm/benches/connection_handler.rs b/swarm/benches/connection_handler.rs
new file mode 100644
index 00000000000..b9986d9649f
--- /dev/null
+++ b/swarm/benches/connection_handler.rs
@@ -0,0 +1,359 @@
+use async_std::stream::StreamExt;
+use criterion::{criterion_group, criterion_main, Criterion};
+use libp2p_core::{
+    transport::MemoryTransport, InboundUpgrade, Multiaddr, OutboundUpgrade, Transport, UpgradeInfo,
+};
+use libp2p_identity::PeerId;
+use libp2p_swarm::{ConnectionHandler, NetworkBehaviour, StreamProtocol};
+use std::{convert::Infallible, sync::atomic::AtomicUsize};
+use web_time::Duration;
+
+macro_rules! gen_behaviour {
+    ($($name:ident {$($field:ident),*};)*) => {$(
+        #[derive(libp2p_swarm::NetworkBehaviour, Default)]
+        #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
+        struct $name {
+            $($field: SpinningBehaviour,)*
+        }
+
+        impl BigBehaviour for $name {
+            fn behaviours(&mut self) -> &mut [SpinningBehaviour] {
+                unsafe {
+                    std::slice::from_raw_parts_mut(
+                        self as *mut Self as *mut SpinningBehaviour,
+                        std::mem::size_of::<Self>() / std::mem::size_of::<SpinningBehaviour>(),
+                    )
+                }
+            }
+        }
+    )*};
+}
+
+macro_rules! benchmarks {
+    ($(
+        $group:ident::[$(
+            $beh:ident::bench()
+                .name($name:ident)
+                .poll_count($count:expr)
+                .protocols_per_behaviour($protocols:expr),
+        )+];
+    )*) => {
+
+        $(
+            $(
+                fn $name(c: &mut Criterion) {
+                    <$beh>::run_bench(c, $protocols, $count, true);
+                }
+            )+
+
+            criterion_group!($group, $($name),*);
+        )*
+
+        criterion_main!($($group),*);
+    };
+}
+
+// fans go brrr
+gen_behaviour! {
+    SpinningBehaviour5 { a, b, c, d, e };
+    SpinningBehaviour10 { a, b, c, d, e, f, g, h, i, j };
+    SpinningBehaviour20 { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u };
+}
+
+benchmarks! {
+    singles::[
+        SpinningBehaviour::bench().name(b).poll_count(1000).protocols_per_behaviour(10),
+        SpinningBehaviour::bench().name(c).poll_count(1000).protocols_per_behaviour(100),
+        SpinningBehaviour::bench().name(d).poll_count(1000).protocols_per_behaviour(1000),
+    ];
+    big_5::[
+        SpinningBehaviour5::bench().name(e).poll_count(1000).protocols_per_behaviour(2),
+        SpinningBehaviour5::bench().name(f).poll_count(1000).protocols_per_behaviour(20),
+        SpinningBehaviour5::bench().name(g).poll_count(1000).protocols_per_behaviour(200),
+    ];
+    top_10::[
+        SpinningBehaviour10::bench().name(h).poll_count(1000).protocols_per_behaviour(1),
+        SpinningBehaviour10::bench().name(i).poll_count(1000).protocols_per_behaviour(10),
+        SpinningBehaviour10::bench().name(j).poll_count(1000).protocols_per_behaviour(100),
+    ];
+    lucky_20::[
+        SpinningBehaviour20::bench().name(k).poll_count(500).protocols_per_behaviour(1),
+        SpinningBehaviour20::bench().name(l).poll_count(500).protocols_per_behaviour(10),
+        SpinningBehaviour20::bench().name(m).poll_count(500).protocols_per_behaviour(100),
+    ];
+}
+//fn main() {}
+
+trait BigBehaviour: Sized {
+    fn behaviours(&mut self) -> &mut [SpinningBehaviour];
+
+    fn for_each_beh(&mut self, f: impl FnMut(&mut SpinningBehaviour)) {
+        self.behaviours().iter_mut().for_each(f);
+    }
+
+    fn any_beh(&mut self, f: impl FnMut(&mut SpinningBehaviour) -> bool) -> bool {
+        self.behaviours().iter_mut().any(f)
+    }
+
+    fn run_bench(
+        c: &mut Criterion,
+        protocols_per_behaviour: usize,
+        spam_count: usize,
+        static_protocols: bool,
+    ) where
+        Self: Default + NetworkBehaviour,
+    {
+        let name = format!(
+            "{}::bench().poll_count({}).protocols_per_behaviour({})",
+            std::any::type_name::<Self>(),
+            spam_count,
+            protocols_per_behaviour
+        );
+
+        let init = || {
+            let mut swarm_a = new_swarm(Self::default());
+            let mut swarm_b = new_swarm(Self::default());
+
+            let behaviour_count = swarm_a.behaviours().len();
+            let protocol_count = behaviour_count * protocols_per_behaviour;
+            let protocols = (0..protocol_count)
+                .map(|i| {
+                    if static_protocols {
+                        StreamProtocol::new(format!("/protocol/{i}").leak())
+                    } else {
+                        StreamProtocol::try_from_owned(format!("/protocol/{i}")).unwrap()
+                    }
+                })
+                .collect::<Vec<_>>()
+                .leak();
+
+            let mut protocol_chunks = protocols.chunks(protocols_per_behaviour);
+            swarm_a.for_each_beh(|b| b.protocols = protocol_chunks.next().unwrap());
+            let mut protocol_chunks = protocols.chunks(protocols_per_behaviour);
+            swarm_b.for_each_beh(|b| b.protocols = protocol_chunks.next().unwrap());
+
+            swarm_a.for_each_beh(|b| b.iter_count = spam_count);
+            swarm_b.for_each_beh(|b| b.iter_count = 0);
+
+            swarm_a.for_each_beh(|b| b.other_peer = Some(*swarm_b.local_peer_id()));
+            swarm_b.for_each_beh(|b| b.other_peer = Some(*swarm_a.local_peer_id()));
+
+            static OFFSET: AtomicUsize = AtomicUsize::new(8000);
+            let offset = OFFSET.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+
+            swarm_a
+                .listen_on(format!("/memory/{offset}").parse().unwrap())
+                .unwrap();
+            swarm_b
+                .dial(format!("/memory/{offset}").parse::<Multiaddr>().unwrap())
+                .unwrap();
+
+            (swarm_a, swarm_b)
+        };
+
+        c.bench_function(&name, |b| {
+            b.to_async(tokio::runtime::Builder::new_multi_thread().build().unwrap())
+                .iter_batched(
+                    init,
+                    |(mut swarm_a, mut swarm_b)| async move {
+                        while swarm_a.any_beh(|b| !b.finished) || swarm_b.any_beh(|b| !b.finished) {
+                            futures::future::select(swarm_b.next(), swarm_a.next()).await;
+                        }
+                    },
+                    criterion::BatchSize::LargeInput,
+                );
+        });
+    }
+}
+
+impl<T: BigBehaviour + NetworkBehaviour> BigBehaviour for libp2p_swarm::Swarm<T> {
+    fn behaviours(&mut self) -> &mut [SpinningBehaviour] {
+        self.behaviour_mut().behaviours()
+    }
+}
+
+fn new_swarm<T: NetworkBehaviour>(beh: T) -> libp2p_swarm::Swarm<T> {
+    let keypair = libp2p_identity::Keypair::generate_ed25519();
+    libp2p_swarm::Swarm::new(
+        MemoryTransport::default()
+            .upgrade(multistream_select::Version::V1)
+            .authenticate(libp2p_plaintext::Config::new(&keypair))
+            .multiplex(libp2p_yamux::Config::default())
+            .boxed(),
+        beh,
+        keypair.public().to_peer_id(),
+        libp2p_swarm::Config::without_executor().with_idle_connection_timeout(Duration::MAX),
+    )
+}
+
+/// Whole purpose of the behaviour is to rapidly call `poll` on the handler
+/// configured amount of times and then emit event when finished.
+#[derive(Default)]
+struct SpinningBehaviour {
+    iter_count: usize,
+    protocols: &'static [StreamProtocol],
+    finished: bool,
+    emitted: bool,
+    other_peer: Option<PeerId>,
+}
+
+#[derive(Debug)]
+struct FinishedSpinning;
+
+impl NetworkBehaviour for SpinningBehaviour {
+    type ConnectionHandler = SpinningHandler;
+    type ToSwarm = FinishedSpinning;
+
+    fn handle_established_inbound_connection(
+        &mut self,
+        _connection_id: libp2p_swarm::ConnectionId,
+        _peer: libp2p_identity::PeerId,
+        _local_addr: &libp2p_core::Multiaddr,
+        _remote_addr: &libp2p_core::Multiaddr,
+    ) -> Result<libp2p_swarm::THandler<Self>, libp2p_swarm::ConnectionDenied> {
+        Ok(SpinningHandler {
+            iter_count: 0,
+            protocols: self.protocols,
+        })
+    }
+
+    fn handle_established_outbound_connection(
+        &mut self,
+        _connection_id: libp2p_swarm::ConnectionId,
+        _peer: libp2p_identity::PeerId,
+        _addr: &libp2p_core::Multiaddr,
+        _role_override: libp2p_core::Endpoint,
+    ) -> Result<libp2p_swarm::THandler<Self>, libp2p_swarm::ConnectionDenied> {
+        Ok(SpinningHandler {
+            iter_count: self.iter_count,
+            protocols: self.protocols,
+        })
+    }
+
+    fn on_swarm_event(&mut self, _: libp2p_swarm::FromSwarm) {}
+
+    fn on_connection_handler_event(
+        &mut self,
+        _peer_id: libp2p_identity::PeerId,
+        _connection_id: libp2p_swarm::ConnectionId,
+        _event: libp2p_swarm::THandlerOutEvent<Self>,
+    ) {
+        self.finished = true;
+    }
+
+    fn poll(
+        &mut self,
+        _: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<libp2p_swarm::ToSwarm<Self::ToSwarm, libp2p_swarm::THandlerInEvent<Self>>>
+    {
+        if self.finished && !self.emitted {
+            self.emitted = true;
+            std::task::Poll::Ready(libp2p_swarm::ToSwarm::GenerateEvent(FinishedSpinning))
+        } else {
+            std::task::Poll::Pending
+        }
+    }
+}
+
+impl BigBehaviour for SpinningBehaviour {
+    fn behaviours(&mut self) -> &mut [SpinningBehaviour] {
+        std::slice::from_mut(self)
+    }
+}
+
+struct SpinningHandler {
+    iter_count: usize,
+    protocols: &'static [StreamProtocol],
+}
+
+impl ConnectionHandler for SpinningHandler {
+    type FromBehaviour = Infallible;
+
+    type ToBehaviour = FinishedSpinning;
+
+    type InboundProtocol = Upgrade;
+
+    type OutboundProtocol = Upgrade;
+
+    type InboundOpenInfo = ();
+
+    type OutboundOpenInfo = ();
+
+    fn listen_protocol(
+        &self,
+    ) -> libp2p_swarm::SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
+        libp2p_swarm::SubstreamProtocol::new(Upgrade(self.protocols), ())
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<
+        libp2p_swarm::ConnectionHandlerEvent<
+            Self::OutboundProtocol,
+            Self::OutboundOpenInfo,
+            Self::ToBehaviour,
+        >,
+    > {
+        if self.iter_count == usize::MAX {
+            return std::task::Poll::Pending;
+        }
+
+        if self.iter_count != 0 {
+            self.iter_count -= 1;
+            cx.waker().wake_by_ref();
+            return std::task::Poll::Pending;
+        }
+
+        self.iter_count = usize::MAX;
+        std::task::Poll::Ready(libp2p_swarm::ConnectionHandlerEvent::NotifyBehaviour(
+            FinishedSpinning,
+        ))
+    }
+
+    fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+        match event {}
+    }
+
+    fn on_connection_event(
+        &mut self,
+        _event: libp2p_swarm::handler::ConnectionEvent<
+            Self::InboundProtocol,
+            Self::OutboundProtocol,
+            Self::InboundOpenInfo,
+            Self::OutboundOpenInfo,
+        >,
+    ) {
+    }
+}
+
+pub struct Upgrade(&'static [StreamProtocol]);
+
+impl UpgradeInfo for Upgrade {
+    type Info = &'static StreamProtocol;
+    type InfoIter = std::slice::Iter<'static, StreamProtocol>;
+
+    fn protocol_info(&self) -> Self::InfoIter {
+        self.0.iter()
+    }
+}
+
+impl OutboundUpgrade<libp2p_swarm::Stream> for Upgrade {
+    type Output = libp2p_swarm::Stream;
+    type Error = Infallible;
+    type Future = futures::future::Ready<Result<Self::Output, Self::Error>>;
+
+    fn upgrade_outbound(self, s: libp2p_swarm::Stream, _: Self::Info) -> Self::Future {
+        futures::future::ready(Ok(s))
+    }
+}
+
+impl InboundUpgrade<libp2p_swarm::Stream> for Upgrade {
+    type Output = libp2p_swarm::Stream;
+    type Error = Infallible;
+    type Future = futures::future::Ready<Result<Self::Output, Self::Error>>;
+
+    fn upgrade_inbound(self, s: libp2p_swarm::Stream, _: Self::Info) -> Self::Future {
+        futures::future::ready(Ok(s))
+    }
+}
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 69f95bca1d3..9c5e39830ed 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -31,8 +31,7 @@ pub use supported_protocols::SupportedProtocols;
 
 use crate::handler::{
     AddressChange, ConnectionEvent, ConnectionHandler, DialUpgradeError, FullyNegotiatedInbound,
-    FullyNegotiatedOutbound, ListenUpgradeError, ProtocolSupport, ProtocolsAdded, ProtocolsChange,
-    UpgradeInfoSend,
+    FullyNegotiatedOutbound, ListenUpgradeError, ProtocolSupport, ProtocolsChange, UpgradeInfoSend,
 };
 use crate::stream::ActiveStreamCounter;
 use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend};
@@ -51,7 +50,7 @@ use libp2p_core::upgrade;
 use libp2p_core::upgrade::{NegotiationError, ProtocolError};
 use libp2p_core::Endpoint;
 use libp2p_identity::PeerId;
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
 use std::fmt::{Display, Formatter};
 use std::future::Future;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -153,8 +152,11 @@ where
         SubstreamRequested<THandler::OutboundOpenInfo, THandler::OutboundProtocol>,
     >,
 
-    local_supported_protocols: HashSet<StreamProtocol>,
+    local_supported_protocols:
+        HashMap<AsStrHashEq<<THandler::InboundProtocol as UpgradeInfoSend>::Info>, bool>,
     remote_supported_protocols: HashSet<StreamProtocol>,
+    protocol_buffer: Vec<StreamProtocol>,
+
     idle_timeout: Duration,
     stream_counter: ActiveStreamCounter,
 }
@@ -187,11 +189,17 @@ where
         idle_timeout: Duration,
     ) -> Self {
         let initial_protocols = gather_supported_protocols(&handler);
+        let mut buffer = Vec::new();
+
         if !initial_protocols.is_empty() {
             handler.on_connection_event(ConnectionEvent::LocalProtocolsChange(
-                ProtocolsChange::Added(ProtocolsAdded::from_set(&initial_protocols)),
+                ProtocolsChange::from_initial_protocols(
+                    initial_protocols.keys().map(|e| &e.0),
+                    &mut buffer,
+                ),
             ));
         }
+
         Connection {
             muxing: muxer,
             handler,
@@ -203,6 +211,7 @@ where
             requested_substreams: Default::default(),
             local_supported_protocols: initial_protocols,
             remote_supported_protocols: Default::default(),
+            protocol_buffer: buffer,
             idle_timeout,
             stream_counter: ActiveStreamCounter::default(),
         }
@@ -250,6 +259,7 @@ where
             substream_upgrade_protocol_override,
             local_supported_protocols: supported_protocols,
             remote_supported_protocols,
+            protocol_buffer,
             idle_timeout,
             stream_counter,
             ..
@@ -287,25 +297,24 @@ where
                     ProtocolSupport::Added(protocols),
                 )) => {
                     if let Some(added) =
-                        ProtocolsChange::add(remote_supported_protocols, &protocols)
+                        ProtocolsChange::add(remote_supported_protocols, protocols, protocol_buffer)
                     {
                         handler.on_connection_event(ConnectionEvent::RemoteProtocolsChange(added));
-                        remote_supported_protocols.extend(protocols);
+                        remote_supported_protocols.extend(protocol_buffer.drain(..));
                     }
-
                     continue;
                 }
                 Poll::Ready(ConnectionHandlerEvent::ReportRemoteProtocols(
                     ProtocolSupport::Removed(protocols),
                 )) => {
-                    if let Some(removed) =
-                        ProtocolsChange::remove(remote_supported_protocols, &protocols)
-                    {
+                    if let Some(removed) = ProtocolsChange::remove(
+                        remote_supported_protocols,
+                        protocols,
+                        protocol_buffer,
+                    ) {
                         handler
                             .on_connection_event(ConnectionEvent::RemoteProtocolsChange(removed));
-                        remote_supported_protocols.retain(|p| !protocols.contains(p));
                     }
-
                     continue;
                 }
             }
@@ -431,16 +440,16 @@ where
                 }
             }
 
-            let new_protocols = gather_supported_protocols(handler);
-            let changes = ProtocolsChange::from_full_sets(supported_protocols, &new_protocols);
+            let changes = ProtocolsChange::from_full_sets(
+                supported_protocols,
+                handler.listen_protocol().upgrade().protocol_info(),
+                protocol_buffer,
+            );
 
             if !changes.is_empty() {
                 for change in changes {
                     handler.on_connection_event(ConnectionEvent::LocalProtocolsChange(change));
                 }
-
-                *supported_protocols = new_protocols;
-
                 continue; // Go back to the top, handler can potentially make progress again.
             }
 
@@ -454,12 +463,14 @@ where
     }
 }
 
-fn gather_supported_protocols(handler: &impl ConnectionHandler) -> HashSet<StreamProtocol> {
+fn gather_supported_protocols<C: ConnectionHandler>(
+    handler: &C,
+) -> HashMap<AsStrHashEq<<C::InboundProtocol as UpgradeInfoSend>::Info>, bool> {
     handler
         .listen_protocol()
         .upgrade()
         .protocol_info()
-        .filter_map(|i| StreamProtocol::try_from_owned(i.as_ref().to_owned()).ok())
+        .map(|info| (AsStrHashEq(info), true))
         .collect()
 }
 
@@ -734,6 +745,25 @@ enum Shutdown {
     Later(Delay),
 }
 
+// Structure used to avoid allocations when storing the protocols in the `HashMap.
+// Instead of allocating a new `String` for the key,
+// we use `T::as_ref()` in `Hash`, `Eq` and `PartialEq` requirements.
+pub(crate) struct AsStrHashEq<T>(pub(crate) T);
+
+impl<T: AsRef<str>> Eq for AsStrHashEq<T> {}
+
+impl<T: AsRef<str>> PartialEq for AsStrHashEq<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.as_ref() == other.0.as_ref()
+    }
+}
+
+impl<T: AsRef<str>> std::hash::Hash for AsStrHashEq<T> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.0.as_ref().hash(state)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/swarm/src/connection/supported_protocols.rs b/swarm/src/connection/supported_protocols.rs
index 0575046bb44..124ec93d669 100644
--- a/swarm/src/connection/supported_protocols.rs
+++ b/swarm/src/connection/supported_protocols.rs
@@ -40,7 +40,6 @@ impl SupportedProtocols {
 mod tests {
     use super::*;
     use crate::handler::{ProtocolsAdded, ProtocolsRemoved};
-    use once_cell::sync::Lazy;
 
     #[test]
     fn protocols_change_added_returns_correct_changed_value() {
@@ -70,19 +69,24 @@ mod tests {
     }
 
     fn add_foo() -> ProtocolsChange<'static> {
-        ProtocolsChange::Added(ProtocolsAdded::from_set(&FOO_PROTOCOLS))
+        ProtocolsChange::Added(ProtocolsAdded {
+            protocols: FOO_PROTOCOLS.iter(),
+        })
     }
 
     fn add_foo_bar() -> ProtocolsChange<'static> {
-        ProtocolsChange::Added(ProtocolsAdded::from_set(&FOO_BAR_PROTOCOLS))
+        ProtocolsChange::Added(ProtocolsAdded {
+            protocols: FOO_BAR_PROTOCOLS.iter(),
+        })
     }
 
     fn remove_foo() -> ProtocolsChange<'static> {
-        ProtocolsChange::Removed(ProtocolsRemoved::from_set(&FOO_PROTOCOLS))
+        ProtocolsChange::Removed(ProtocolsRemoved {
+            protocols: FOO_PROTOCOLS.iter(),
+        })
     }
 
-    static FOO_PROTOCOLS: Lazy<HashSet<StreamProtocol>> =
-        Lazy::new(|| HashSet::from([StreamProtocol::new("/foo")]));
-    static FOO_BAR_PROTOCOLS: Lazy<HashSet<StreamProtocol>> =
-        Lazy::new(|| HashSet::from([StreamProtocol::new("/foo"), StreamProtocol::new("/bar")]));
+    static FOO_PROTOCOLS: &[StreamProtocol] = &[StreamProtocol::new("/foo")];
+    static FOO_BAR_PROTOCOLS: &[StreamProtocol] =
+        &[StreamProtocol::new("/foo"), StreamProtocol::new("/bar")];
 }
diff --git a/swarm/src/handler.rs b/swarm/src/handler.rs
index 20980aff8bd..610b95b8cf1 100644
--- a/swarm/src/handler.rs
+++ b/swarm/src/handler.rs
@@ -46,22 +46,19 @@ mod one_shot;
 mod pending;
 mod select;
 
+use crate::connection::AsStrHashEq;
 pub use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend, SendWrapper, UpgradeInfoSend};
 pub use map_in::MapInEvent;
 pub use map_out::MapOutEvent;
 pub use one_shot::{OneShotHandler, OneShotHandlerConfig};
 pub use pending::PendingConnectionHandler;
 pub use select::ConnectionHandlerSelect;
+use smallvec::SmallVec;
 
 use crate::StreamProtocol;
-use ::either::Either;
+use core::slice;
 use libp2p_core::Multiaddr;
-use once_cell::sync::Lazy;
-use smallvec::SmallVec;
-use std::collections::hash_map::RandomState;
-use std::collections::hash_set::{Difference, Intersection};
-use std::collections::HashSet;
-use std::iter::Peekable;
+use std::collections::{HashMap, HashSet};
 use std::{error, fmt, io, task::Context, task::Poll, time::Duration};
 
 /// A handler for a set of protocols used on a connection with a remote.
@@ -335,64 +332,124 @@ pub enum ProtocolsChange<'a> {
 }
 
 impl<'a> ProtocolsChange<'a> {
+    /// Compute the protocol change for the initial set of protocols.
+    pub(crate) fn from_initial_protocols<'b, T: AsRef<str> + 'b>(
+        new_protocols: impl IntoIterator<Item = &'b T>,
+        buffer: &'a mut Vec<StreamProtocol>,
+    ) -> Self {
+        buffer.clear();
+        buffer.extend(
+            new_protocols
+                .into_iter()
+                .filter_map(|i| StreamProtocol::try_from_owned(i.as_ref().to_owned()).ok()),
+        );
+
+        ProtocolsChange::Added(ProtocolsAdded {
+            protocols: buffer.iter(),
+        })
+    }
+
     /// Compute the [`ProtocolsChange`] that results from adding `to_add` to `existing_protocols`.
     ///
     /// Returns `None` if the change is a no-op, i.e. `to_add` is a subset of `existing_protocols`.
     pub(crate) fn add(
-        existing_protocols: &'a HashSet<StreamProtocol>,
-        to_add: &'a HashSet<StreamProtocol>,
+        existing_protocols: &HashSet<StreamProtocol>,
+        to_add: HashSet<StreamProtocol>,
+        buffer: &'a mut Vec<StreamProtocol>,
     ) -> Option<Self> {
-        let mut actually_added_protocols = to_add.difference(existing_protocols).peekable();
-
-        actually_added_protocols.peek()?;
+        buffer.clear();
+        buffer.extend(
+            to_add
+                .into_iter()
+                .filter(|i| !existing_protocols.contains(i)),
+        );
+
+        if buffer.is_empty() {
+            return None;
+        }
 
-        Some(ProtocolsChange::Added(ProtocolsAdded {
-            protocols: actually_added_protocols,
+        Some(Self::Added(ProtocolsAdded {
+            protocols: buffer.iter(),
         }))
     }
 
-    /// Compute the [`ProtocolsChange`] that results from removing `to_remove` from `existing_protocols`.
+    /// Compute the [`ProtocolsChange`] that results from removing `to_remove` from `existing_protocols`. Removes the protocols from `existing_protocols`.
     ///
     /// Returns `None` if the change is a no-op, i.e. none of the protocols in `to_remove` are in `existing_protocols`.
     pub(crate) fn remove(
-        existing_protocols: &'a HashSet<StreamProtocol>,
-        to_remove: &'a HashSet<StreamProtocol>,
+        existing_protocols: &mut HashSet<StreamProtocol>,
+        to_remove: HashSet<StreamProtocol>,
+        buffer: &'a mut Vec<StreamProtocol>,
     ) -> Option<Self> {
-        let mut actually_removed_protocols = existing_protocols.intersection(to_remove).peekable();
-
-        actually_removed_protocols.peek()?;
+        buffer.clear();
+        buffer.extend(
+            to_remove
+                .into_iter()
+                .filter_map(|i| existing_protocols.take(&i)),
+        );
+
+        if buffer.is_empty() {
+            return None;
+        }
 
-        Some(ProtocolsChange::Removed(ProtocolsRemoved {
-            protocols: Either::Right(actually_removed_protocols),
+        Some(Self::Removed(ProtocolsRemoved {
+            protocols: buffer.iter(),
         }))
     }
 
     /// Compute the [`ProtocolsChange`]s required to go from `existing_protocols` to `new_protocols`.
-    pub(crate) fn from_full_sets(
-        existing_protocols: &'a HashSet<StreamProtocol>,
-        new_protocols: &'a HashSet<StreamProtocol>,
+    pub(crate) fn from_full_sets<T: AsRef<str>>(
+        existing_protocols: &mut HashMap<AsStrHashEq<T>, bool>,
+        new_protocols: impl IntoIterator<Item = T>,
+        buffer: &'a mut Vec<StreamProtocol>,
     ) -> SmallVec<[Self; 2]> {
-        if existing_protocols == new_protocols {
+        buffer.clear();
+
+        // Initially, set the boolean for all protocols to `false`, meaning "not visited".
+        for v in existing_protocols.values_mut() {
+            *v = false;
+        }
+
+        let mut new_protocol_count = 0; // We can only iterate `new_protocols` once, so keep track of its length separately.
+        for new_protocol in new_protocols {
+            existing_protocols
+                .entry(AsStrHashEq(new_protocol))
+                .and_modify(|v| *v = true) // Mark protocol as visited (i.e. we still support it)
+                .or_insert_with_key(|k| {
+                    // Encountered a previously unsupported protocol, remember it in `buffer`.
+                    buffer.extend(StreamProtocol::try_from_owned(k.0.as_ref().to_owned()).ok());
+                    true
+                });
+            new_protocol_count += 1;
+        }
+
+        if new_protocol_count == existing_protocols.len() && buffer.is_empty() {
             return SmallVec::new();
         }
 
-        let mut changes = SmallVec::new();
+        let num_new_protocols = buffer.len();
+        // Drain all protocols that we haven't visited.
+        // For existing protocols that are not in `new_protocols`, the boolean will be false, meaning we need to remove it.
+        existing_protocols.retain(|p, &mut is_supported| {
+            if !is_supported {
+                buffer.extend(StreamProtocol::try_from_owned(p.0.as_ref().to_owned()).ok());
+            }
 
-        let mut added_protocols = new_protocols.difference(existing_protocols).peekable();
-        let mut removed_protocols = existing_protocols.difference(new_protocols).peekable();
+            is_supported
+        });
 
-        if added_protocols.peek().is_some() {
+        let (added, removed) = buffer.split_at(num_new_protocols);
+        let mut changes = SmallVec::new();
+        if !added.is_empty() {
             changes.push(ProtocolsChange::Added(ProtocolsAdded {
-                protocols: added_protocols,
+                protocols: added.iter(),
             }));
         }
-
-        if removed_protocols.peek().is_some() {
+        if !removed.is_empty() {
             changes.push(ProtocolsChange::Removed(ProtocolsRemoved {
-                protocols: Either::Left(removed_protocols),
+                protocols: removed.iter(),
             }));
         }
-
         changes
     }
 }
@@ -400,33 +457,13 @@ impl<'a> ProtocolsChange<'a> {
 /// An [`Iterator`] over all protocols that have been added.
 #[derive(Debug, Clone)]
 pub struct ProtocolsAdded<'a> {
-    protocols: Peekable<Difference<'a, StreamProtocol, RandomState>>,
-}
-
-impl<'a> ProtocolsAdded<'a> {
-    pub(crate) fn from_set(protocols: &'a HashSet<StreamProtocol, RandomState>) -> Self {
-        ProtocolsAdded {
-            protocols: protocols.difference(&EMPTY_HASHSET).peekable(),
-        }
-    }
+    pub(crate) protocols: slice::Iter<'a, StreamProtocol>,
 }
 
 /// An [`Iterator`] over all protocols that have been removed.
 #[derive(Debug, Clone)]
 pub struct ProtocolsRemoved<'a> {
-    protocols: Either<
-        Peekable<Difference<'a, StreamProtocol, RandomState>>,
-        Peekable<Intersection<'a, StreamProtocol, RandomState>>,
-    >,
-}
-
-impl<'a> ProtocolsRemoved<'a> {
-    #[cfg(test)]
-    pub(crate) fn from_set(protocols: &'a HashSet<StreamProtocol, RandomState>) -> Self {
-        ProtocolsRemoved {
-            protocols: Either::Left(protocols.difference(&EMPTY_HASHSET).peekable()),
-        }
-    }
+    pub(crate) protocols: slice::Iter<'a, StreamProtocol>,
 }
 
 impl<'a> Iterator for ProtocolsAdded<'a> {
@@ -691,6 +728,169 @@ where
     }
 }
 
-/// A statically declared, empty [`HashSet`] allows us to work around borrow-checker rules for
-/// [`ProtocolsAdded::from_set`]. The lifetimes don't work unless we have a [`HashSet`] with a `'static' lifetime.
-static EMPTY_HASHSET: Lazy<HashSet<StreamProtocol>> = Lazy::new(HashSet::new);
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    fn protocol_set_of(s: &'static str) -> HashSet<StreamProtocol> {
+        s.split_whitespace()
+            .map(|p| StreamProtocol::try_from_owned(format!("/{p}")).unwrap())
+            .collect()
+    }
+
+    fn test_remove(
+        existing: &mut HashSet<StreamProtocol>,
+        to_remove: HashSet<StreamProtocol>,
+    ) -> HashSet<StreamProtocol> {
+        ProtocolsChange::remove(existing, to_remove, &mut Vec::new())
+            .into_iter()
+            .flat_map(|c| match c {
+                ProtocolsChange::Added(_) => panic!("unexpected added"),
+                ProtocolsChange::Removed(r) => r.cloned(),
+            })
+            .collect::<HashSet<_>>()
+    }
+
+    #[test]
+    fn test_protocol_remove_subset() {
+        let mut existing = protocol_set_of("a b c");
+        let to_remove = protocol_set_of("a b");
+
+        let change = test_remove(&mut existing, to_remove);
+
+        assert_eq!(existing, protocol_set_of("c"));
+        assert_eq!(change, protocol_set_of("a b"));
+    }
+
+    #[test]
+    fn test_protocol_remove_all() {
+        let mut existing = protocol_set_of("a b c");
+        let to_remove = protocol_set_of("a b c");
+
+        let change = test_remove(&mut existing, to_remove);
+
+        assert_eq!(existing, protocol_set_of(""));
+        assert_eq!(change, protocol_set_of("a b c"));
+    }
+
+    #[test]
+    fn test_protocol_remove_superset() {
+        let mut existing = protocol_set_of("a b c");
+        let to_remove = protocol_set_of("a b c d");
+
+        let change = test_remove(&mut existing, to_remove);
+
+        assert_eq!(existing, protocol_set_of(""));
+        assert_eq!(change, protocol_set_of("a b c"));
+    }
+
+    #[test]
+    fn test_protocol_remove_none() {
+        let mut existing = protocol_set_of("a b c");
+        let to_remove = protocol_set_of("d");
+
+        let change = test_remove(&mut existing, to_remove);
+
+        assert_eq!(existing, protocol_set_of("a b c"));
+        assert_eq!(change, protocol_set_of(""));
+    }
+
+    #[test]
+    fn test_protocol_remove_none_from_empty() {
+        let mut existing = protocol_set_of("");
+        let to_remove = protocol_set_of("d");
+
+        let change = test_remove(&mut existing, to_remove);
+
+        assert_eq!(existing, protocol_set_of(""));
+        assert_eq!(change, protocol_set_of(""));
+    }
+
+    fn test_from_full_sets(
+        existing: HashSet<StreamProtocol>,
+        new: HashSet<StreamProtocol>,
+    ) -> [HashSet<StreamProtocol>; 2] {
+        let mut buffer = Vec::new();
+        let mut existing = existing
+            .iter()
+            .map(|p| (AsStrHashEq(p.as_ref()), true))
+            .collect::<HashMap<_, _>>();
+
+        let changes = ProtocolsChange::from_full_sets(
+            &mut existing,
+            new.iter().map(AsRef::as_ref),
+            &mut buffer,
+        );
+
+        let mut added_changes = HashSet::new();
+        let mut removed_changes = HashSet::new();
+
+        for change in changes {
+            match change {
+                ProtocolsChange::Added(a) => {
+                    added_changes.extend(a.cloned());
+                }
+                ProtocolsChange::Removed(r) => {
+                    removed_changes.extend(r.cloned());
+                }
+            }
+        }
+
+        [removed_changes, added_changes]
+    }
+
+    #[test]
+    fn test_from_full_stes_subset() {
+        let existing = protocol_set_of("a b c");
+        let new = protocol_set_of("a b");
+
+        let [removed_changes, added_changes] = test_from_full_sets(existing, new);
+
+        assert_eq!(added_changes, protocol_set_of(""));
+        assert_eq!(removed_changes, protocol_set_of("c"));
+    }
+
+    #[test]
+    fn test_from_full_sets_superset() {
+        let existing = protocol_set_of("a b");
+        let new = protocol_set_of("a b c");
+
+        let [removed_changes, added_changes] = test_from_full_sets(existing, new);
+
+        assert_eq!(added_changes, protocol_set_of("c"));
+        assert_eq!(removed_changes, protocol_set_of(""));
+    }
+
+    #[test]
+    fn test_from_full_sets_intersection() {
+        let existing = protocol_set_of("a b c");
+        let new = protocol_set_of("b c d");
+
+        let [removed_changes, added_changes] = test_from_full_sets(existing, new);
+
+        assert_eq!(added_changes, protocol_set_of("d"));
+        assert_eq!(removed_changes, protocol_set_of("a"));
+    }
+
+    #[test]
+    fn test_from_full_sets_disjoint() {
+        let existing = protocol_set_of("a b c");
+        let new = protocol_set_of("d e f");
+
+        let [removed_changes, added_changes] = test_from_full_sets(existing, new);
+
+        assert_eq!(added_changes, protocol_set_of("d e f"));
+        assert_eq!(removed_changes, protocol_set_of("a b c"));
+    }
+
+    #[test]
+    fn test_from_full_sets_empty() {
+        let existing = protocol_set_of("");
+        let new = protocol_set_of("");
+
+        let [removed_changes, added_changes] = test_from_full_sets(existing, new);
+
+        assert_eq!(added_changes, protocol_set_of(""));
+        assert_eq!(removed_changes, protocol_set_of(""));
+    }
+}
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index ec5b7a109cc..fb02cdce392 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -1416,6 +1416,14 @@ impl Config {
         }
     }
 
+    #[doc(hidden)]
+    /// Used on connection benchmarks.
+    pub fn without_executor() -> Self {
+        Self {
+            pool_config: PoolConfig::new(None),
+        }
+    }
+
     /// Sets executor to the `wasm` executor.
     /// Background tasks will be executed by the browser on the next micro-tick.
     ///

From 4e4b5949288de9f4ab0fe0e48507c5a5e534a813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sat, 6 Jul 2024 01:53:56 +0100
Subject: [PATCH 326/455] chore(swarm): reword CHANGELOG.md

`libp2p-swarm` `0.45.0` hasn't been released.

Pull-Request: #5483.
---
 Cargo.lock         | 2 +-
 Cargo.toml         | 2 +-
 swarm/CHANGELOG.md | 6 +-----
 swarm/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ee39cb1786..6c64ea3fea7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3293,7 +3293,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.45.1"
+version = "0.45.0"
 dependencies = [
  "async-std",
  "criterion",
diff --git a/Cargo.toml b/Cargo.toml
index 1444b469c31..ab660cc90e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.4", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
-libp2p-swarm = { version = "0.45.1", path = "swarm" }
+libp2p-swarm = { version = "0.45.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 8cf8852dd76..bdb0b1cd5d0 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,15 +1,11 @@
 
-## 0.45.1
+## 0.45.0
 
 - Optimize internal connection `fn poll`. New implementation now scales much better with number of listen protocols active.
   No changes to public API introduced.
   See [PR 5026](https://github.com/libp2p/rust-libp2p/pull/5026)
-
-## 0.45.0
-
 - Add peer_id to `FromSwarm::ListenFailure`.
   See [PR 4818](https://github.com/libp2p/rust-libp2p/pull/4818).
-
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 - Add `#[track_caller]` on all `spawn` wrappers.
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 6ce99aa33c5..1e2842998a3 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.45.1"
+version = "0.45.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From 02fa7c8bb329d0a10411280bc01b039c52a2944d Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:41:21 -0400
Subject: [PATCH 327/455] feat: Add `ConnectionError` to
 `FromSwarm::ConnectionClosed`

Resolves #5484.

Pull-Request: #5485.
---
 Cargo.lock                                 | 4 ++--
 Cargo.toml                                 | 4 ++--
 protocols/gossipsub/CHANGELOG.md           | 4 ++++
 protocols/gossipsub/Cargo.toml             | 2 +-
 protocols/gossipsub/src/behaviour/tests.rs | 1 +
 protocols/perf/CHANGELOG.md                | 4 ++++
 protocols/perf/Cargo.toml                  | 2 +-
 protocols/perf/src/client/behaviour.rs     | 1 +
 swarm/CHANGELOG.md                         | 2 ++
 swarm/src/behaviour.rs                     | 5 +++--
 swarm/src/lib.rs                           | 1 +
 swarm/src/test.rs                          | 2 ++
 12 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c64ea3fea7..ec114491e48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2801,7 +2801,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.46.2"
+version = "0.47.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -3051,7 +3051,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-perf"
-version = "0.3.1"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index ab660cc90e9..7fa6856c26b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -82,7 +82,7 @@ libp2p-core = { version = "0.41.3", path = "core" }
 libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
-libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
+libp2p-gossipsub = { version = "0.47.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
@@ -92,7 +92,7 @@ libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
 libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.44.0", path = "transports/noise" }
-libp2p-perf = { version = "0.3.1", path = "protocols/perf" }
+libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.44.2", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 970db3f1ec3..7c43b98f0a7 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.47.0
+- Add ConnectionError to FromSwarm::ConnectionClosed.
+  See [PR 5485](https://github.com/libp2p/rust-libp2p/pull/5485).
+
 ## 0.46.2
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index f556443477f..f989e997bfb 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Gossipsub protocol for libp2p"
-version = "0.46.2"
+version = "0.47.0"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 6cad719b5ab..fe861a674dd 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -268,6 +268,7 @@ where
                 connection_id,
                 endpoint: &fake_endpoint,
                 remaining_established: active_connections,
+                cause: None,
             }));
         }
     }
diff --git a/protocols/perf/CHANGELOG.md b/protocols/perf/CHANGELOG.md
index d83e8b48472..b347f21e9e0 100644
--- a/protocols/perf/CHANGELOG.md
+++ b/protocols/perf/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+- Add ConnectionError to FromSwarm::ConnectionClosed.
+  See [PR 5485](https://github.com/libp2p/rust-libp2p/pull/5485).
+
 ## 0.3.1
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 4f154ab1b08..abe58088caa 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-perf"
 edition = "2021"
 rust-version = { workspace = true }
 description = "libp2p perf protocol implementation"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/perf/src/client/behaviour.rs b/protocols/perf/src/client/behaviour.rs
index 880bcdd9c83..5e430f8f0c1 100644
--- a/protocols/perf/src/client/behaviour.rs
+++ b/protocols/perf/src/client/behaviour.rs
@@ -116,6 +116,7 @@ impl NetworkBehaviour for Behaviour {
                 connection_id: _,
                 endpoint: _,
                 remaining_established,
+                ..
             }) => {
                 if remaining_established == 0 {
                     assert!(self.connected.remove(&peer_id));
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index bdb0b1cd5d0..f4901947b8b 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -10,6 +10,8 @@
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 - Add `#[track_caller]` on all `spawn` wrappers.
   See [PR 5465](https://github.com/libp2p/rust-libp2p/pull/5465).
+- Add ConnectionError to FromSwarm::ConnectionClosed.
+  See [PR 5485](https://github.com/libp2p/rust-libp2p/pull/5485).
 
 ## 0.44.2
 
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
index fc9045dfc3f..8a8418739c8 100644
--- a/swarm/src/behaviour.rs
+++ b/swarm/src/behaviour.rs
@@ -32,8 +32,8 @@ use crate::connection::ConnectionId;
 use crate::dial_opts::DialOpts;
 use crate::listen_opts::ListenOpts;
 use crate::{
-    ConnectionDenied, ConnectionHandler, DialError, ListenError, THandler, THandlerInEvent,
-    THandlerOutEvent,
+    ConnectionDenied, ConnectionError, ConnectionHandler, DialError, ListenError, THandler,
+    THandlerInEvent, THandlerOutEvent,
 };
 use libp2p_core::{transport::ListenerId, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
@@ -481,6 +481,7 @@ pub struct ConnectionClosed<'a> {
     pub peer_id: PeerId,
     pub connection_id: ConnectionId,
     pub endpoint: &'a ConnectedPoint,
+    pub cause: Option<&'a ConnectionError>,
     pub remaining_established: usize,
 }
 
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index fb02cdce392..31eb2aa28f5 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -909,6 +909,7 @@ where
                         peer_id,
                         connection_id: id,
                         endpoint: &endpoint,
+                        cause: error.as_ref(),
                         remaining_established: num_established as usize,
                     }));
                 self.pending_swarm_events
diff --git a/swarm/src/test.rs b/swarm/src/test.rs
index 547277550bb..d49b504392a 100644
--- a/swarm/src/test.rs
+++ b/swarm/src/test.rs
@@ -301,6 +301,7 @@ where
             connection_id,
             endpoint,
             remaining_established,
+            cause,
         }: ConnectionClosed,
     ) {
         let mut other_closed_connections = self
@@ -350,6 +351,7 @@ where
                 connection_id,
                 endpoint,
                 remaining_established,
+                cause,
             }));
     }
 }

From c19c1409824a68586c3779729329040a554f12db Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <60601340+lexnv@users.noreply.github.com>
Date: Wed, 10 Jul 2024 02:44:38 +0300
Subject: [PATCH 328/455] fix(webocket): Avoid panic when polling quicksink
 after errors

Pull-Request: #5482.
---
 Cargo.lock                            |  3 +-
 Cargo.toml                            |  2 +-
 transports/websocket/CHANGELOG.md     |  6 +++
 transports/websocket/Cargo.toml       |  3 +-
 transports/websocket/src/framed.rs    |  2 +-
 transports/websocket/src/quicksink.rs | 72 ++++++++++++++++++---------
 6 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec114491e48..6a9dc56e987 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3492,7 +3492,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.43.1"
+version = "0.43.2"
 dependencies = [
  "async-std",
  "either",
@@ -3507,6 +3507,7 @@ dependencies = [
  "rcgen",
  "rw-stream-sink",
  "soketto",
+ "thiserror",
  "tracing",
  "url",
  "webpki-roots 0.25.2",
diff --git a/Cargo.toml b/Cargo.toml
index 7fa6856c26b..84767573b9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,7 +112,7 @@ libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.1", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
-libp2p-websocket = { version = "0.43.1", path = "transports/websocket" }
+libp2p-websocket = { version = "0.43.2", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.3.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.45.2", path = "muxers/yamux" }
diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
index d206cbac6a1..419ff41c6fc 100644
--- a/transports/websocket/CHANGELOG.md
+++ b/transports/websocket/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.43.2
+
+- fix: Avoid websocket panic on polling after errors. See [PR 5482].
+
+[PR 5482]: https://github.com/libp2p/rust-libp2p/pull/5482
+
 ## 0.43.1
 
 ## 0.43.0
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index b022d95ca47..f1b0a413115 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebSocket transport for libp2p"
-version = "0.43.1"
+version = "0.43.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -21,6 +21,7 @@ pin-project-lite = "0.2.14"
 rw-stream-sink = { workspace = true }
 soketto = "0.8.0"
 tracing = { workspace = true }
+thiserror = "1.0.61"
 url = "2.5"
 webpki-roots = "0.25"
 
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index f6f99d18580..69a01fdbd46 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -571,7 +571,7 @@ fn location_to_multiaddr<T>(location: &str) -> Result<Multiaddr, Error<T>> {
 /// The websocket connection.
 pub struct Connection<T> {
     receiver: BoxStream<'static, Result<Incoming, connection::Error>>,
-    sender: Pin<Box<dyn Sink<OutgoingData, Error = connection::Error> + Send>>,
+    sender: Pin<Box<dyn Sink<OutgoingData, Error = quicksink::Error<connection::Error>> + Send>>,
     _marker: std::marker::PhantomData<T>,
 }
 
diff --git a/transports/websocket/src/quicksink.rs b/transports/websocket/src/quicksink.rs
index cb2c98b078f..4f620536ea1 100644
--- a/transports/websocket/src/quicksink.rs
+++ b/transports/websocket/src/quicksink.rs
@@ -30,14 +30,6 @@
 //     Ok::<_, io::Error>(stdout)
 // });
 // ```
-//
-// # Panics
-//
-// - If any of the [`Sink`] methods produce an error, the sink transitions
-// to a failure state and none of its methods must be called afterwards or
-// else a panic will occur.
-// - If [`Sink::poll_close`] has been called, no other sink method must be
-// called afterwards or else a panic will be caused.
 
 use futures::{ready, sink::Sink};
 use pin_project_lite::pin_project;
@@ -102,6 +94,15 @@ enum State {
     Failed,
 }
 
+/// Errors the `Sink` may return.
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum Error<E> {
+    #[error("Error while sending over the sink, {0}")]
+    Send(E),
+    #[error("The Sink has closed")]
+    Closed,
+}
+
 pin_project! {
     /// `SinkImpl` implements the `Sink` trait.
     #[derive(Debug)]
@@ -119,7 +120,7 @@ where
     F: FnMut(S, Action<A>) -> T,
     T: Future<Output = Result<S, E>>,
 {
-    type Error = E;
+    type Error = Error<E>;
 
     fn poll_ready(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
         let mut this = self.project();
@@ -135,7 +136,7 @@ where
                     Err(e) => {
                         this.future.set(None);
                         *this.state = State::Failed;
-                        Poll::Ready(Err(e))
+                        Poll::Ready(Err(Error::Send(e)))
                     }
                 }
             }
@@ -143,20 +144,19 @@ where
                 Ok(_) => {
                     this.future.set(None);
                     *this.state = State::Closed;
-                    panic!("SinkImpl::poll_ready called on a closing sink.")
+                    Poll::Ready(Err(Error::Closed))
                 }
                 Err(e) => {
                     this.future.set(None);
                     *this.state = State::Failed;
-                    Poll::Ready(Err(e))
+                    Poll::Ready(Err(Error::Send(e)))
                 }
             },
             State::Empty => {
                 assert!(this.param.is_some());
                 Poll::Ready(Ok(()))
             }
-            State::Closed => panic!("SinkImpl::poll_ready called on a closed sink."),
-            State::Failed => panic!("SinkImpl::poll_ready called after error."),
+            State::Closed | State::Failed => Poll::Ready(Err(Error::Closed)),
         }
     }
 
@@ -193,7 +193,7 @@ where
                     Err(e) => {
                         this.future.set(None);
                         *this.state = State::Failed;
-                        return Poll::Ready(Err(e));
+                        return Poll::Ready(Err(Error::Send(e)));
                     }
                 },
                 State::Flushing => {
@@ -207,7 +207,7 @@ where
                         Err(e) => {
                             this.future.set(None);
                             *this.state = State::Failed;
-                            return Poll::Ready(Err(e));
+                            return Poll::Ready(Err(Error::Send(e)));
                         }
                     }
                 }
@@ -221,11 +221,10 @@ where
                     Err(e) => {
                         this.future.set(None);
                         *this.state = State::Failed;
-                        return Poll::Ready(Err(e));
+                        return Poll::Ready(Err(Error::Send(e)));
                     }
                 },
-                State::Closed => return Poll::Ready(Ok(())),
-                State::Failed => panic!("SinkImpl::poll_flush called after error."),
+                State::Closed | State::Failed => return Poll::Ready(Err(Error::Closed)),
             }
         }
     }
@@ -253,7 +252,7 @@ where
                     Err(e) => {
                         this.future.set(None);
                         *this.state = State::Failed;
-                        return Poll::Ready(Err(e));
+                        return Poll::Ready(Err(Error::Send(e)));
                     }
                 },
                 State::Flushing => {
@@ -266,7 +265,7 @@ where
                         Err(e) => {
                             this.future.set(None);
                             *this.state = State::Failed;
-                            return Poll::Ready(Err(e));
+                            return Poll::Ready(Err(Error::Send(e)));
                         }
                     }
                 }
@@ -280,11 +279,11 @@ where
                     Err(e) => {
                         this.future.set(None);
                         *this.state = State::Failed;
-                        return Poll::Ready(Err(e));
+                        return Poll::Ready(Err(Error::Send(e)));
                     }
                 },
                 State::Closed => return Poll::Ready(Ok(())),
-                State::Failed => panic!("SinkImpl::poll_closed called after error."),
+                State::Failed => return Poll::Ready(Err(Error::Closed)),
             }
         }
     }
@@ -347,4 +346,31 @@ mod tests {
             assert_eq!(&expected[..], &actual[..])
         });
     }
+
+    #[test]
+    fn error_does_not_panic() {
+        task::block_on(async {
+            let sink = make_sink(io::stdout(), |mut _stdout, _action| async move {
+                Err(io::Error::new(io::ErrorKind::Other, "oh no"))
+            });
+
+            futures::pin_mut!(sink);
+
+            let result = sink.send("hello").await;
+            match result {
+                Err(crate::quicksink::Error::Send(e)) => {
+                    assert_eq!(e.kind(), io::ErrorKind::Other);
+                    assert_eq!(e.to_string(), "oh no")
+                }
+                _ => panic!("unexpected result: {:?}", result),
+            };
+
+            // Call send again, expect not to panic.
+            let result = sink.send("hello").await;
+            match result {
+                Err(crate::quicksink::Error::Closed) => {}
+                _ => panic!("unexpected result: {:?}", result),
+            };
+        })
+    }
 }

From 8e28edf69a5f25d1d919962a70fa32203b48f8dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 08:16:42 +0000
Subject: [PATCH 329/455] deps: bump obi1kenobi/cargo-semver-checks-action from
 2.4 to 2.5

Pull-Request: #5499.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f1fe263a2d..c8ff0521ce5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -310,7 +310,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.31.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
-      - uses: obi1kenobi/cargo-semver-checks-action@c7306483f698c511eaf7416d1bf2e1958c90140f # v2
+      - uses: obi1kenobi/cargo-semver-checks-action@ca26a44cfb670b2078c8f757d06e696a7c3820cf # v2
 
   rustfmt:
     runs-on: ubuntu-latest

From e2e98ad5e8f8ab2c0ae037b69a3a7149a116bf02 Mon Sep 17 00:00:00 2001
From: EdwardJES <107906898+EdwardJES@users.noreply.github.com>
Date: Wed, 17 Jul 2024 07:15:59 +1000
Subject: [PATCH 330/455] fix:  rendezvous identify example

This pr closes https://github.com/libp2p/rust-libp2p/issues/5388 by explicitly adding the local observed address, noting this is out of protocol behaviour in non-example cases

Pull-Request: #5496.
---
 examples/rendezvous/src/bin/rzv-identify.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/rendezvous/src/bin/rzv-identify.rs b/examples/rendezvous/src/bin/rzv-identify.rs
index 1d545592829..ff637aa6f49 100644
--- a/examples/rendezvous/src/bin/rzv-identify.rs
+++ b/examples/rendezvous/src/bin/rzv-identify.rs
@@ -76,8 +76,12 @@ async fn main() {
             }
             // once `/identify` did its job, we know our external address and can register
             SwarmEvent::Behaviour(MyBehaviourEvent::Identify(identify::Event::Received {
+                info,
                 ..
             })) => {
+                // Register our external address. Needs to be done explicitly
+                // for this case, as it's a local address.
+                swarm.add_external_address(info.observed_addr);
                 if let Err(error) = swarm.behaviour_mut().rendezvous.register(
                     rendezvous::Namespace::from_static("rendezvous"),
                     rendezvous_point,

From 1617abb3bfcf3e8663568e90a8fc4009aef04ba9 Mon Sep 17 00:00:00 2001
From: Arpan Kapoor <a@arpankapoor.com>
Date: Thu, 18 Jul 2024 20:30:33 +0530
Subject: [PATCH 331/455] fix(tls): fix rustls panic due to critical libp2p
 extension

Resolves #5487.

Pull-Request: #5498.
---
 Cargo.lock                        | 24 +++++++++---------
 Cargo.toml                        |  2 +-
 transports/tls/CHANGELOG.md       |  5 ++++
 transports/tls/Cargo.toml         |  2 +-
 transports/tls/src/certificate.rs | 41 +++++++++++++++++++++++++++++++
 transports/tls/src/lib.rs         | 17 ++++++++++---
 6 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a9dc56e987..80a186f0026 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1727,7 +1727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.9",
+ "rustls 0.23.11",
  "rustls-pki-types",
 ]
 
@@ -3159,7 +3159,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustls 0.23.9",
+ "rustls 0.23.11",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -3373,7 +3373,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tls"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "futures",
  "futures-rustls",
@@ -3385,7 +3385,7 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.23.9",
+ "rustls 0.23.11",
  "rustls-webpki 0.101.7",
  "thiserror",
  "tokio",
@@ -4607,7 +4607,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.9",
+ "rustls 0.23.11",
  "thiserror",
  "tokio",
  "tracing",
@@ -4623,7 +4623,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash",
- "rustls 0.23.9",
+ "rustls 0.23.11",
  "slab",
  "thiserror",
  "tinyvec",
@@ -5156,21 +5156,21 @@ dependencies = [
  "log",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.5",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.9"
+version = "0.23.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b"
+checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
 dependencies = [
  "once_cell",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.5",
  "subtle",
  "zeroize",
 ]
@@ -5203,9 +5203,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
 dependencies = [
  "ring 0.17.8",
  "rustls-pki-types",
diff --git a/Cargo.toml b/Cargo.toml
index 84767573b9e..55fc43d5b5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,7 @@ libp2p-swarm = { version = "0.45.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
-libp2p-tls = { version = "0.4.0", path = "transports/tls" }
+libp2p-tls = { version = "0.4.1", path = "transports/tls" }
 libp2p-uds = { version = "0.40.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
diff --git a/transports/tls/CHANGELOG.md b/transports/tls/CHANGELOG.md
index 3c6d0a2a1f5..0343c690834 100644
--- a/transports/tls/CHANGELOG.md
+++ b/transports/tls/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1
+
+- Fix a panic caused by `rustls` parsing the libp2p TLS extension.
+  See [PR 5498](https://github.com/libp2p/rust-libp2p/pull/5498).
+
 ## 0.4.0
 
 - Upgrade `rustls` to `0.23`. See [PR 5385](https://github.com/libp2p/rust-libp2p/pull/5385)
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index a4817f20336..c4b30951e66 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-tls"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 rust-version = { workspace = true }
 description = "TLS configuration based on libp2p TLS specs."
diff --git a/transports/tls/src/certificate.rs b/transports/tls/src/certificate.rs
index bbd353e32bd..65b373bcf9b 100644
--- a/transports/tls/src/certificate.rs
+++ b/transports/tls/src/certificate.rs
@@ -26,6 +26,8 @@ use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use x509_parser::{prelude::*, signature_algorithm::SignatureAlgorithm};
 
+use std::sync::Arc;
+
 /// The libp2p Public Key Extension is a X.509 extension
 /// with the Object Identifier 1.3.6.1.4.1.53594.1.1,
 /// allocated by IANA to the libp2p project at Protocol Labs.
@@ -42,6 +44,45 @@ const P2P_SIGNING_PREFIX: [u8; 21] = *b"libp2p-tls-handshake:";
 // Similarly, hash functions with an output length less than 256 bits MUST NOT be used.
 static P2P_SIGNATURE_ALGORITHM: &rcgen::SignatureAlgorithm = &rcgen::PKCS_ECDSA_P256_SHA256;
 
+#[derive(Debug)]
+pub(crate) struct AlwaysResolvesCert(Arc<rustls::sign::CertifiedKey>);
+
+impl AlwaysResolvesCert {
+    pub(crate) fn new(
+        cert: rustls::pki_types::CertificateDer<'static>,
+        key: &rustls::pki_types::PrivateKeyDer<'_>,
+    ) -> Result<Self, rustls::Error> {
+        let certified_key = rustls::sign::CertifiedKey::new(
+            vec![cert],
+            rustls::crypto::ring::sign::any_ecdsa_type(key)?,
+        );
+        Ok(Self(Arc::new(certified_key)))
+    }
+}
+
+impl rustls::client::ResolvesClientCert for AlwaysResolvesCert {
+    fn resolve(
+        &self,
+        _root_hint_subjects: &[&[u8]],
+        _sigschemes: &[rustls::SignatureScheme],
+    ) -> Option<Arc<rustls::sign::CertifiedKey>> {
+        Some(Arc::clone(&self.0))
+    }
+
+    fn has_certs(&self) -> bool {
+        true
+    }
+}
+
+impl rustls::server::ResolvesServerCert for AlwaysResolvesCert {
+    fn resolve(
+        &self,
+        _client_hello: rustls::server::ClientHello<'_>,
+    ) -> Option<Arc<rustls::sign::CertifiedKey>> {
+        Some(Arc::clone(&self.0))
+    }
+}
+
 /// Generates a self-signed TLS certificate that includes a libp2p-specific
 /// certificate extension containing the public key of the given keypair.
 pub fn generate(
diff --git a/transports/tls/src/lib.rs b/transports/tls/src/lib.rs
index 741a4b48077..3aa66db12b3 100644
--- a/transports/tls/src/lib.rs
+++ b/transports/tls/src/lib.rs
@@ -29,6 +29,7 @@ pub mod certificate;
 mod upgrade;
 mod verifier;
 
+use certificate::AlwaysResolvesCert;
 use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
 use std::sync::Arc;
@@ -49,6 +50,11 @@ pub fn make_client_config(
     let mut provider = rustls::crypto::ring::default_provider();
     provider.cipher_suites = verifier::CIPHERSUITES.to_vec();
 
+    let cert_resolver = Arc::new(
+        AlwaysResolvesCert::new(certificate, &private_key)
+            .expect("Client cert key DER is valid; qed"),
+    );
+
     let mut crypto = rustls::ClientConfig::builder_with_provider(provider.into())
         .with_protocol_versions(verifier::PROTOCOL_VERSIONS)
         .expect("Cipher suites and kx groups are configured; qed")
@@ -56,8 +62,7 @@ pub fn make_client_config(
         .with_custom_certificate_verifier(Arc::new(
             verifier::Libp2pCertificateVerifier::with_remote_peer_id(remote_peer_id),
         ))
-        .with_client_auth_cert(vec![certificate], private_key)
-        .expect("Client cert key DER is valid; qed");
+        .with_client_cert_resolver(cert_resolver);
     crypto.alpn_protocols = vec![P2P_ALPN.to_vec()];
 
     Ok(crypto)
@@ -72,12 +77,16 @@ pub fn make_server_config(
     let mut provider = rustls::crypto::ring::default_provider();
     provider.cipher_suites = verifier::CIPHERSUITES.to_vec();
 
+    let cert_resolver = Arc::new(
+        AlwaysResolvesCert::new(certificate, &private_key)
+            .expect("Server cert key DER is valid; qed"),
+    );
+
     let mut crypto = rustls::ServerConfig::builder_with_provider(provider.into())
         .with_protocol_versions(verifier::PROTOCOL_VERSIONS)
         .expect("Cipher suites and kx groups are configured; qed")
         .with_client_cert_verifier(Arc::new(verifier::Libp2pCertificateVerifier::new()))
-        .with_single_cert(vec![certificate], private_key)
-        .expect("Server cert key DER is valid; qed");
+        .with_cert_resolver(cert_resolver);
     crypto.alpn_protocols = vec![P2P_ALPN.to_vec()];
 
     Ok(crypto)

From a749a41b95441a3dc87c61c472e7a9f00ca997fc Mon Sep 17 00:00:00 2001
From: Probot <94048855+Prabhat1308@users.noreply.github.com>
Date: Fri, 19 Jul 2024 19:09:11 +0530
Subject: [PATCH 332/455] fix(relay): Add resource limits to `CircuitReq` to be
 set

Fixes #5466
Adds resource limits to `CircuitReq` to be set .

Pull-Request: #5493.
---
 protocols/relay/CHANGELOG.md                |  2 ++
 protocols/relay/src/protocol/inbound_hop.rs | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index 125f51e4961..f49e57af0f7 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 0.17.3
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+- Add resource limits to `CircuitReq` to be set
+  See [PR 5493](https://github.com/libp2p/rust-libp2p/pull/5493)  
 
 ## 0.17.2
 
diff --git a/protocols/relay/src/protocol/inbound_hop.rs b/protocols/relay/src/protocol/inbound_hop.rs
index 57b5d9ad039..401c6258176 100644
--- a/protocols/relay/src/protocol/inbound_hop.rs
+++ b/protocols/relay/src/protocol/inbound_hop.rs
@@ -115,6 +115,8 @@ impl ReservationReq {
 pub struct CircuitReq {
     dst: PeerId,
     substream: Framed<Stream, quick_protobuf_codec::Codec<proto::HopMessage>>,
+    max_circuit_duration: Duration,
+    max_circuit_bytes: u64,
 }
 
 impl CircuitReq {
@@ -127,7 +129,15 @@ impl CircuitReq {
             type_pb: proto::HopMessageType::STATUS,
             peer: None,
             reservation: None,
-            limit: None,
+            limit: Some(proto::Limit {
+                duration: Some(
+                    self.max_circuit_duration
+                        .as_secs()
+                        .try_into()
+                        .expect("`max_circuit_duration` not to exceed `u32::MAX`."),
+                ),
+                data: Some(self.max_circuit_bytes),
+            }),
             status: Some(proto::Status::OK),
         };
 
@@ -204,7 +214,12 @@ pub(crate) async fn handle_inbound_request(
 
             let dst = peer_id_res.map_err(|_| Error::ParsePeerId)?;
 
-            Either::Right(CircuitReq { dst, substream })
+            Either::Right(CircuitReq {
+                dst,
+                substream,
+                max_circuit_duration,
+                max_circuit_bytes,
+            })
         }
         Type::STATUS => return Err(Error::UnexpectedTypeStatus),
     };

From 879d5941b326126b95e2c77c73b64cc9d50ff852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 24 Jul 2024 12:03:40 +0100
Subject: [PATCH 333/455] fix: update Cargo.lock

To address [RUSTSEC-2024-0357](https://rustsec.org/advisories/RUSTSEC-2024-0357.html)

Pull-Request: #5511.
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80a186f0026..3fda6b57aa8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4092,9 +4092,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.60"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.4.1",
  "cfg-if",
@@ -4124,9 +4124,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.96"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",

From 4a16b6181d36cd703066a227deff57c6ebe91f7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:28:52 +0000
Subject: [PATCH 334/455] deps: bump obi1kenobi/cargo-semver-checks-action from
 2.5 to 2.6

Pull-Request: #5512.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8ff0521ce5..54ddcf47028 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -310,7 +310,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.31.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
-      - uses: obi1kenobi/cargo-semver-checks-action@ca26a44cfb670b2078c8f757d06e696a7c3820cf # v2
+      - uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2
 
   rustfmt:
     runs-on: ubuntu-latest

From 055b179a2354ea174dbb8beb38804719d655667c Mon Sep 17 00:00:00 2001
From: dewmal <dewmalnilanka@gmail.com>
Date: Mon, 29 Jul 2024 19:35:19 +0530
Subject: [PATCH 335/455] docs(README): Add Ceylon to the notable users
 section.

I have added Project Ceylon: A Multi-Agent System (MAS) Development Framework to the notable users list.

Pull-Request: #5513.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4d72626e413..77323a1d659 100644
--- a/README.md
+++ b/README.md
@@ -102,3 +102,4 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 - [Substrate](https://github.com/paritytech/substrate) - Framework for blockchain innovation,
 used by [Polkadot](https://www.parity.io/technologies/polkadot/).
 - [Taple](https://github.com/opencanarias/taple-core) - Sustainable DLT for asset and process traceability by [OpenCanarias](https://www.opencanarias.com/en/).
+- [Ceylon](https://github.com/ceylonai/ceylon) - A Multi-Agent System (MAS) Development Framwork.

From 41e2d5dc4ad37af4b3256dc7c089188d1589e6e5 Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:43:39 +0200
Subject: [PATCH 336/455] fix(relay): wake the relay Listener on close

When closing a relayed `Listener` manually, the `TransportEvent::ListenerClosed` generated by the `relay::priv_client::Transport` is never forwarded back up to the `Swarm`, causing the `Swarm` to never remove the corresponding listener and never emitting the `SwarmEvent::ListenerClosed` event.

This happens  because, when stopping a relayed listener manually, the call to the [`close()` function](https://github.com/libp2p/rust-libp2p/blob/master/protocols/relay/src/priv_client/transport.rs#L324), is done outside the `poll` function, which mean nothing is triggering a wake up call to wake up the polling.

Unfortunately, even if the [`listeners` (`SelectAll`) is always polled](https://github.com/libp2p/rust-libp2p/blob/master/protocols/relay/src/priv_client/transport.rs#L241) after a call to the `close` method, since `SelectAll` uses a `FuturesUnordered` internally, the poll does nothing. Indeed, the `FuturesUnordered` states that:
```rust
/// This structure is optimized to manage a large number of futures.
/// Futures managed by [`FuturesUnordered`] will only be polled when they
/// generate wake-up notifications. This reduces the required amount of work
/// needed to poll large numbers of futures.
```

Since means that when closing a relayed listener manually (calling `swarm.remove_listener`), it is never removed.

This PR fixes that by triggering a `waker` when calling the `close` function.

Pull-Request: #5491.
---
 protocols/relay/CHANGELOG.md                 |  3 +++
 protocols/relay/src/priv_client/transport.rs | 26 +++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index f49e57af0f7..97638d1ae6a 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -1,9 +1,12 @@
 ## 0.17.3
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+- Fix manual closure of relayed listener.
+  See [PR 5491](https://github.com/libp2p/rust-libp2p/pull/5491)
 - Add resource limits to `CircuitReq` to be set
   See [PR 5493](https://github.com/libp2p/rust-libp2p/pull/5493)  
 
+
 ## 0.17.2
 
 - Fix support for unlimited relay connection according to spec.
diff --git a/protocols/relay/src/priv_client/transport.rs b/protocols/relay/src/priv_client/transport.rs
index 7147f0b5e55..b4374aa4672 100644
--- a/protocols/relay/src/priv_client/transport.rs
+++ b/protocols/relay/src/priv_client/transport.rs
@@ -27,7 +27,6 @@ use crate::RequestId;
 use futures::channel::mpsc;
 use futures::channel::oneshot;
 use futures::future::{ready, BoxFuture, FutureExt, Ready};
-use futures::ready;
 use futures::sink::SinkExt;
 use futures::stream::SelectAll;
 use futures::stream::{Stream, StreamExt};
@@ -36,7 +35,7 @@ use libp2p_core::transport::{ListenerId, TransportError, TransportEvent};
 use libp2p_identity::PeerId;
 use std::collections::VecDeque;
 use std::pin::Pin;
-use std::task::{Context, Poll};
+use std::task::{Context, Poll, Waker};
 use thiserror::Error;
 
 /// A [`Transport`] enabling client relay capabilities.
@@ -151,6 +150,7 @@ impl libp2p_core::Transport for Transport {
             queued_events: Default::default(),
             from_behaviour,
             is_closed: false,
+            waker: None,
         };
         self.listeners.push(listener);
         Ok(())
@@ -313,6 +313,7 @@ pub(crate) struct Listener {
     /// The listener can be closed either manually with [`Transport::remove_listener`](libp2p_core::Transport) or if
     /// the sender side of the `from_behaviour` channel is dropped.
     is_closed: bool,
+    waker: Option<Waker>,
 }
 
 impl Listener {
@@ -328,6 +329,10 @@ impl Listener {
                 reason,
             });
         self.is_closed = true;
+
+        if let Some(waker) = self.waker.take() {
+            waker.wake();
+        }
     }
 }
 
@@ -337,18 +342,27 @@ impl Stream for Listener {
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         loop {
             if let Some(event) = self.queued_events.pop_front() {
+                self.waker = None;
                 return Poll::Ready(Some(event));
             }
 
             if self.is_closed {
                 // Terminate the stream if the listener closed and all remaining events have been reported.
+                self.waker = None;
                 return Poll::Ready(None);
             }
 
-            let Some(msg) = ready!(self.from_behaviour.poll_next_unpin(cx)) else {
-                // Sender of `from_behaviour` has been dropped, signaling listener to close.
-                self.close(Ok(()));
-                continue;
+            let msg = match self.from_behaviour.poll_next_unpin(cx) {
+                Poll::Ready(Some(msg)) => msg,
+                Poll::Ready(None) => {
+                    // Sender of `from_behaviour` has been dropped, signaling listener to close.
+                    self.close(Ok(()));
+                    continue;
+                }
+                Poll::Pending => {
+                    self.waker = Some(cx.waker().clone());
+                    return Poll::Pending;
+                }
             };
 
             match msg {

From 06b5847a89bfea8b95c443e088eba08a66a04418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 30 Jul 2024 17:03:00 +0100
Subject: [PATCH 337/455] chore: address clippy beta lints

Pull-Request: #5515.
---
 hole-punching-tests/src/main.rs | 4 +---
 interop-tests/src/arch.rs       | 3 +--
 protocols/ping/src/protocol.rs  | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/hole-punching-tests/src/main.rs b/hole-punching-tests/src/main.rs
index f09fbb1e6a0..bbecc948e08 100644
--- a/hole-punching-tests/src/main.rs
+++ b/hole-punching-tests/src/main.rs
@@ -294,9 +294,7 @@ impl RedisClient {
 
         tracing::debug!("Pushing {key}={value} to redis");
 
-        self.inner.rpush(key, value).await?;
-
-        Ok(())
+        self.inner.rpush(key, value).await.map_err(Into::into)
     }
 
     async fn pop<V>(&mut self, key: &str) -> Result<V>
diff --git a/interop-tests/src/arch.rs b/interop-tests/src/arch.rs
index fb229434981..a7755b95977 100644
--- a/interop-tests/src/arch.rs
+++ b/interop-tests/src/arch.rs
@@ -179,8 +179,7 @@ pub(crate) mod native {
 
         pub(crate) async fn rpush(&self, key: &str, value: String) -> Result<()> {
             let mut conn = self.0.get_async_connection().await?;
-            conn.rpush(key, value).await?;
-            Ok(())
+            conn.rpush(key, value).await.map_err(Into::into)
         }
     }
 }
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index 9b4d7da98db..8fc18505d35 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -44,8 +44,7 @@ pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0"
 /// >           Nagle's algorithm, delayed acks and similar configuration options
 /// >           which can affect latencies especially on otherwise low-volume
 /// >           connections.
-#[derive(Default, Debug, Copy, Clone)]
-pub(crate) struct Ping;
+
 const PING_SIZE: usize = 32;
 
 /// Sends a ping and waits for the pong.

From 5b4c43cc4361bfdd1a0f7d06ce4d700796717d2f Mon Sep 17 00:00:00 2001
From: Hannes <55623006+umgefahren@users.noreply.github.com>
Date: Fri, 2 Aug 2024 00:21:21 +0200
Subject: [PATCH 338/455] chore: Update cargo semver binary

I updated the semver binary to the new version, this should make the CI run again.

Pull-Request: #5520.
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54ddcf47028..648945820fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -308,9 +308,9 @@ jobs:
       RUSTFLAGS: ''
     steps:
       - uses: actions/checkout@v4
-      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.31.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
+      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.33.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
-      - uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2
+      - uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6
 
   rustfmt:
     runs-on: ubuntu-latest

From 5c11f4a9e42f7675c58c1604ed7039a7740e582d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 2 Aug 2024 12:05:54 +0100
Subject: [PATCH 339/455] docs(swarm): doc DialError::Denied

Pull-Request: #5510.
---
 swarm/src/lib.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 31eb2aa28f5..03e30240771 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -1538,9 +1538,7 @@ impl Config {
 #[derive(Debug)]
 pub enum DialError {
     /// The peer identity obtained on the connection matches the local peer.
-    LocalPeerId {
-        endpoint: ConnectedPoint,
-    },
+    LocalPeerId { endpoint: ConnectedPoint },
     /// No addresses have been provided by [`NetworkBehaviour::handle_pending_outbound_connection`] and [`DialOpts`].
     NoAddresses,
     /// The provided [`dial_opts::PeerCondition`] evaluated to false and thus
@@ -1553,9 +1551,10 @@ pub enum DialError {
         obtained: PeerId,
         endpoint: ConnectedPoint,
     },
-    Denied {
-        cause: ConnectionDenied,
-    },
+    /// One of the [`NetworkBehaviour`]s rejected the outbound connection
+    /// via [`NetworkBehaviour::handle_pending_outbound_connection`] or
+    /// [`NetworkBehaviour::handle_established_outbound_connection`].
+    Denied { cause: ConnectionDenied },
     /// An error occurred while negotiating the transport protocol(s) on a connection.
     Transport(Vec<(Multiaddr, TransportError<io::Error>)>),
 }

From d733dfe10dc576ce8e408846103e98241d341df7 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Fri, 2 Aug 2024 16:29:14 +0300
Subject: [PATCH 340/455] fix(websocket-websys): Unsubscribe from websocket
 events on drop

Avoid use-after-free handler invocation from JS side.

Fixes #5490

Pull-Request: #5521.
---
 Cargo.lock                               | 2 +-
 Cargo.toml                               | 2 +-
 transports/websocket-websys/CHANGELOG.md | 5 +++++
 transports/websocket-websys/Cargo.toml   | 2 +-
 transports/websocket-websys/src/lib.rs   | 6 ++++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3fda6b57aa8..b4d877e49d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3515,7 +3515,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket-websys"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "bytes",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index 55fc43d5b5a..52226f6c6e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -113,7 +113,7 @@ libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.1", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.43.2", path = "transports/websocket" }
-libp2p-websocket-websys = { version = "0.3.2", path = "transports/websocket-websys" }
+libp2p-websocket-websys = { version = "0.3.3", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.3.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.45.2", path = "muxers/yamux" }
 multiaddr = "0.18.1"
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
index f92b76ebeaa..c16ad6cc406 100644
--- a/transports/websocket-websys/CHANGELOG.md
+++ b/transports/websocket-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.3
+
+- Fix use-after-free handler invocation from JS side.
+  See [PR 5521](https://github.com/libp2p/rust-libp2p/pull/5521).
+
 ## 0.3.2
 
 - Change close code in drop implementation to `1000` given that in browsers only
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 48bf8d9818a..a2127986ddc 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket-websys"
 edition = "2021"
 rust-version = "1.60.0"
 description = "WebSocket for libp2p under WASM environment"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Vince Vasta <vince.vasta@gmail.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index ca56d5727a5..c96d1d6aa3a 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -434,6 +434,12 @@ impl AsyncWrite for Connection {
 
 impl Drop for Connection {
     fn drop(&mut self) {
+        // Unset event listeners, as otherwise they will be called by JS after the handlers have already been dropped.
+        self.inner.socket.set_onclose(None);
+        self.inner.socket.set_onerror(None);
+        self.inner.socket.set_onopen(None);
+        self.inner.socket.set_onmessage(None);
+
         // In browsers, userland code is not allowed to use any other status code than 1000: https://websockets.spec.whatwg.org/#dom-websocket-close
         const REGULAR_CLOSE: u16 = 1000; // See https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1.
 

From 53eb339a01245a8d017ae0f11f88ba9496cfc31b Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 2 Aug 2024 15:01:13 +0100
Subject: [PATCH 341/455] docs: remove myself as a maintainer

This reflects the current state of things.

Pull-Request: #5514.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 77323a1d659..f43cf044ef3 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,6 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 (In alphabetical order.)
 
 - João Oliveira ([@jxs](https://github.com/jxs))
-- Thomas Eizinger ([@thomaseizinger](https://github.com/thomaseizinger))
 
 ## Notable users
 

From 079b2d6b99262f4f0ca42994571614787a5c98f7 Mon Sep 17 00:00:00 2001
From: Hannes <55623006+umgefahren@users.noreply.github.com>
Date: Sat, 3 Aug 2024 16:05:59 +0200
Subject: [PATCH 342/455] refactor(*): Transport redesign

Resolves: #4226.
Resolves: #3953.
Resolves: #3889.

Pull-Request: #4568.
---
 Cargo.lock                                    |  38 +-
 Cargo.toml                                    |  39 +-
 core/CHANGELOG.md                             |  11 +
 core/Cargo.toml                               |   2 +-
 core/src/connection.rs                        |  13 +-
 core/src/either.rs                            |  36 +-
 core/src/lib.rs                               |   3 -
 core/src/transport.rs                         |  54 +--
 core/src/transport/and_then.rs                |  35 +-
 core/src/transport/boxed.rs                   |  42 +-
 core/src/transport/choice.rs                  |  55 +--
 core/src/transport/dummy.rs                   |  13 +-
 core/src/transport/global_only.rs             |  40 +-
 core/src/transport/map.rs                     |  27 +-
 core/src/transport/map_err.rs                 |  22 +-
 core/src/transport/memory.rs                  |  65 ++-
 core/src/transport/optional.rs                |  23 +-
 core/src/transport/timeout.rs                 |  21 +-
 core/src/transport/upgrade.rs                 |  46 +-
 core/src/upgrade/ready.rs                     |   2 +-
 core/tests/transport_upgrade.rs               |  15 +-
 examples/autonat/Cargo.toml                   |   2 +-
 examples/dcutr/src/main.rs                    |   2 +-
 examples/stream/Cargo.toml                    |   2 +-
 hole-punching-tests/src/main.rs               |   2 +-
 libp2p/CHANGELOG.md                           |  11 +
 misc/allow-block-list/src/lib.rs              |   2 +
 misc/connection-limits/src/lib.rs             |   4 +-
 misc/memory-connection-limits/src/lib.rs      |   3 +-
 .../tests/util/mod.rs                         |   3 +-
 misc/metrics/src/bandwidth.rs                 |  21 +-
 misc/server/src/main.rs                       |   2 +-
 muxers/mplex/benches/split_send_size.rs       |  13 +-
 protocols/autonat/CHANGELOG.md                |   8 +
 protocols/autonat/Cargo.toml                  |   2 +-
 protocols/autonat/src/behaviour.rs            |  13 +-
 protocols/autonat/src/behaviour/as_server.rs  |   1 +
 protocols/autonat/tests/test_server.rs        |   2 +
 protocols/dcutr/CHANGELOG.md                  |   4 +
 protocols/dcutr/Cargo.toml                    |   2 +-
 protocols/dcutr/src/behaviour.rs              |   3 +
 protocols/floodsub/CHANGELOG.md               |   4 +
 protocols/floodsub/Cargo.toml                 |   2 +-
 protocols/floodsub/src/layer.rs               |   2 +
 protocols/gossipsub/CHANGELOG.md              |   4 +-
 protocols/gossipsub/src/behaviour.rs          |   5 +-
 protocols/gossipsub/src/behaviour/tests.rs    |   6 +
 protocols/identify/CHANGELOG.md               |   5 +
 protocols/identify/src/behaviour.rs           | 127 ++++-
 protocols/identify/tests/smoke.rs             |   8 +-
 protocols/kad/CHANGELOG.md                    |   1 +
 protocols/kad/src/behaviour.rs                |   4 +-
 protocols/kad/src/behaviour/test.rs           |   3 +
 protocols/mdns/CHANGELOG.md                   |   3 +
 protocols/mdns/Cargo.toml                     |   2 +-
 protocols/mdns/src/behaviour.rs               |   2 +
 protocols/mdns/src/behaviour/iface/query.rs   |   9 +-
 protocols/perf/CHANGELOG.md                   |   2 +
 protocols/perf/src/client/behaviour.rs        |   3 +-
 protocols/perf/src/server/behaviour.rs        |   2 +
 protocols/ping/CHANGELOG.md                   |   5 +-
 protocols/ping/Cargo.toml                     |   2 +-
 protocols/ping/src/lib.rs                     |   2 +
 protocols/ping/src/protocol.rs                |  11 +-
 protocols/relay/CHANGELOG.md                  |   4 +
 protocols/relay/Cargo.toml                    |   2 +-
 protocols/relay/src/behaviour.rs              |   3 +
 protocols/relay/src/priv_client.rs            |   2 +
 protocols/relay/src/priv_client/transport.rs  |  41 +-
 protocols/rendezvous/CHANGELOG.md             |   4 +
 protocols/rendezvous/Cargo.toml               |   2 +-
 protocols/rendezvous/src/client.rs            |  11 +-
 protocols/rendezvous/src/server.rs            |  11 +-
 protocols/request-response/CHANGELOG.md       |   4 +
 protocols/request-response/Cargo.toml         |   2 +-
 protocols/request-response/src/lib.rs         |   3 +-
 protocols/stream/CHANGELOG.md                 |   4 +
 protocols/stream/Cargo.toml                   |   2 +-
 protocols/stream/src/behaviour.rs             |   3 +-
 protocols/upnp/CHANGELOG.md                   |   4 +
 protocols/upnp/Cargo.toml                     |   2 +-
 protocols/upnp/src/behaviour.rs               |   7 +-
 swarm-derive/src/lib.rs                       |   4 +-
 swarm/CHANGELOG.md                            |   8 +
 swarm/benches/connection_handler.rs           |   1 +
 swarm/src/behaviour.rs                        |   6 +-
 swarm/src/behaviour/either.rs                 |   4 +
 swarm/src/behaviour/toggle.rs                 |   3 +
 swarm/src/connection.rs                       |  11 +-
 swarm/src/connection/pool.rs                  |  16 +-
 swarm/src/dial_opts.rs                        |  79 ++--
 swarm/src/dummy.rs                            |   2 +
 swarm/src/lib.rs                              |  76 ++-
 swarm/src/test.rs                             |  12 +-
 {core => swarm}/src/translation.rs            |   7 +-
 swarm/tests/connection_close.rs               |   2 +
 swarm/tests/listener.rs                       |   7 +-
 swarm/tests/swarm_derive.rs                   |   4 +-
 transports/dns/CHANGELOG.md                   |   5 +
 transports/dns/Cargo.toml                     |   2 +-
 transports/dns/src/lib.rs                     |  67 ++-
 transports/quic/CHANGELOG.md                  |   5 +
 transports/quic/Cargo.toml                    |   2 +-
 transports/quic/src/transport.rs              | 251 +++++-----
 transports/quic/tests/smoke.rs                |  87 ++--
 transports/quic/tests/stream_compliance.rs    |  14 +-
 transports/tcp/CHANGELOG.md                   |   9 +
 transports/tcp/src/lib.rs                     | 447 ++++++------------
 transports/uds/CHANGELOG.md                   |   5 +
 transports/uds/Cargo.toml                     |   2 +-
 transports/uds/src/lib.rs                     |  35 +-
 transports/webrtc-websys/CHANGELOG.md         |   5 +
 transports/webrtc-websys/Cargo.toml           |   2 +-
 transports/webrtc-websys/src/transport.rs     |  22 +-
 transports/webrtc/CHANGELOG.md                |   5 +
 transports/webrtc/Cargo.toml                  |   2 +-
 transports/webrtc/src/tokio/transport.rs      |  31 +-
 transports/webrtc/tests/smoke.rs              |  16 +-
 transports/websocket-websys/CHANGELOG.md      |   4 +
 transports/websocket-websys/Cargo.toml        |   2 +-
 transports/websocket-websys/src/lib.rs        |  22 +-
 transports/websocket/CHANGELOG.md             |   4 +
 transports/websocket/Cargo.toml               |   2 +-
 transports/websocket/src/framed.rs            |  38 +-
 transports/websocket/src/lib.rs               |  29 +-
 transports/webtransport-websys/CHANGELOG.md   |   5 +
 transports/webtransport-websys/Cargo.toml     |   2 +-
 .../webtransport-websys/src/transport.rs      |  25 +-
 wasm-tests/webtransport-tests/src/lib.rs      |  51 +-
 129 files changed, 1294 insertions(+), 1175 deletions(-)
 rename {core => swarm}/src/translation.rs (95%)

diff --git a/Cargo.lock b/Cargo.lock
index b4d877e49d6..cf0cde790c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2659,7 +2659,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-autonat"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2698,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.41.3"
+version = "0.42.0"
 dependencies = [
  "async-std",
  "either",
@@ -2729,7 +2729,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dcutr"
-version = "0.11.1"
+version = "0.12.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -2763,7 +2763,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.41.1"
+version = "0.42.0"
 dependencies = [
  "async-std",
  "async-std-resolver",
@@ -2781,7 +2781,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -2926,7 +2926,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "async-io 2.3.3",
  "async-std",
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.44.2"
+version = "0.45.0"
 dependencies = [
  "async-std",
  "either",
@@ -3140,7 +3140,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.10.3"
+version = "0.11.0"
 dependencies = [
  "async-std",
  "bytes",
@@ -3169,7 +3169,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-relay"
-version = "0.17.3"
+version = "0.18.0"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3198,7 +3198,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-rendezvous"
-version = "0.14.1"
+version = "0.15.0"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -3228,7 +3228,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.26.4"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "async-std",
@@ -3277,7 +3277,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-stream"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha"
 dependencies = [
  "futures",
  "libp2p-core",
@@ -3395,7 +3395,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-uds"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "async-std",
  "futures",
@@ -3407,7 +3407,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-upnp"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "futures",
  "futures-timer",
@@ -3421,7 +3421,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc"
-version = "0.7.1-alpha"
+version = "0.8.0-alpha"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3472,7 +3472,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc-websys"
-version = "0.3.0-alpha"
+version = "0.4.0-alpha"
 dependencies = [
  "bytes",
  "futures",
@@ -3492,7 +3492,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.43.2"
+version = "0.44.0"
 dependencies = [
  "async-std",
  "either",
@@ -3515,7 +3515,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket-websys"
-version = "0.3.3"
+version = "0.4.0"
 dependencies = [
  "bytes",
  "futures",
@@ -3534,7 +3534,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webtransport-websys"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "futures",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 52226f6c6e3..7eb1517d24c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,45 +76,44 @@ futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.12.1", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.13.0", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
-libp2p-core = { version = "0.41.3", path = "core" }
-libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
-libp2p-dns = { version = "0.41.1", path = "transports/dns" }
-libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
+libp2p-core = { version = "0.42.0", path = "core" }
+libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
+libp2p-dns = { version = "0.42.0", path = "transports/dns" }
+libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.47.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
-libp2p-mdns = { version = "0.45.2", path = "protocols/mdns" }
+libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
 libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
-libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.44.0", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
-libp2p-ping = { version = "0.44.2", path = "protocols/ping" }
+libp2p-ping = { version = "0.45.0", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
-libp2p-quic = { version = "0.10.3", path = "transports/quic" }
-libp2p-relay = { version = "0.17.3", path = "protocols/relay" }
-libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.26.4", path = "protocols/request-response" }
+libp2p-quic = { version = "0.11.0", path = "transports/quic" }
+libp2p-relay = { version = "0.18.0", path = "protocols/relay" }
+libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
+libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
-libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
+libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.4.1", path = "transports/tls" }
-libp2p-uds = { version = "0.40.0", path = "transports/uds" }
-libp2p-upnp = { version = "0.2.2", path = "protocols/upnp" }
-libp2p-webrtc = { version = "0.7.1-alpha", path = "transports/webrtc" }
+libp2p-uds = { version = "0.41.0", path = "transports/uds" }
+libp2p-upnp = { version = "0.3.0", path = "protocols/upnp" }
+libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.2.1", path = "misc/webrtc-utils" }
-libp2p-webrtc-websys = { version = "0.3.0-alpha", path = "transports/webrtc-websys" }
-libp2p-websocket = { version = "0.43.2", path = "transports/websocket" }
-libp2p-websocket-websys = { version = "0.3.3", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.3.0", path = "transports/webtransport-websys" }
+libp2p-webrtc-websys = { version = "0.4.0-alpha", path = "transports/webrtc-websys" }
+libp2p-websocket = { version = "0.44.0", path = "transports/websocket" }
+libp2p-websocket-websys = { version = "0.4.0", path = "transports/websocket-websys" }
+libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.45.2", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index b7f3c3c4640..5ed4b4e181d 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.42.0
+
+- Update `Transport::dial` function signature with a `DialOpts` param and remove `Transport::dial_as_listener`:
+  - `DialOpts` struct contains `PortUse` and `Endpoint`, 
+  - `PortUse` allows controling port allocation of new connections (defaults to `PortUse::Reuse`)   - 
+  - Add `port_use` field to `ConnectedPoint`
+  - Set `endpoint` field in `DialOpts` to `Endpoint::Listener` to dial as a listener
+- Remove `Transport::address_translation` and relocate functionality to `libp2p_swarm`
+
+See [PR 4568].
+
 ## 0.41.3
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 76021c15186..3f9bd540f23 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-core"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.41.3"
+version = "0.42.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/core/src/connection.rs b/core/src/connection.rs
index ff613c5cce0..bb6639842c9 100644
--- a/core/src/connection.rs
+++ b/core/src/connection.rs
@@ -18,7 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::multiaddr::{Multiaddr, Protocol};
+use crate::{
+    multiaddr::{Multiaddr, Protocol},
+    transport::PortUse,
+};
 
 /// The endpoint roles associated with a peer-to-peer communication channel.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -80,6 +83,13 @@ pub enum ConnectedPoint {
         ///   connection as a dialer and one peer dial the other and upgrade the
         ///   connection _as a listener_ overriding its role.
         role_override: Endpoint,
+        /// Whether the port for the outgoing connection was reused from a listener
+        /// or a new port was allocated. This is useful for address translation.
+        ///
+        /// The port use is implemented on a best-effort basis. It is not guaranteed
+        /// that [`PortUse::Reuse`] actually reused a port. A good example is the case
+        /// where there is no listener available to reuse a port from.
+        port_use: PortUse,
     },
     /// We received the node.
     Listener {
@@ -133,6 +143,7 @@ impl ConnectedPoint {
             ConnectedPoint::Dialer {
                 address,
                 role_override: _,
+                port_use: _,
             } => address,
             ConnectedPoint::Listener { local_addr, .. } => local_addr,
         }
diff --git a/core/src/either.rs b/core/src/either.rs
index 3f79b2b37a9..2593174290c 100644
--- a/core/src/either.rs
+++ b/core/src/either.rs
@@ -19,6 +19,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use crate::muxing::StreamMuxerEvent;
+use crate::transport::DialOpts;
 use crate::{
     muxing::StreamMuxer,
     transport::{ListenerId, Transport, TransportError, TransportEvent},
@@ -172,48 +173,23 @@ where
         }
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        use TransportError::*;
-        match self {
-            Either::Left(a) => match a.dial(addr) {
-                Ok(connec) => Ok(EitherFuture::First(connec)),
-                Err(MultiaddrNotSupported(addr)) => Err(MultiaddrNotSupported(addr)),
-                Err(Other(err)) => Err(Other(Either::Left(err))),
-            },
-            Either::Right(b) => match b.dial(addr) {
-                Ok(connec) => Ok(EitherFuture::Second(connec)),
-                Err(MultiaddrNotSupported(addr)) => Err(MultiaddrNotSupported(addr)),
-                Err(Other(err)) => Err(Other(Either::Right(err))),
-            },
-        }
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>>
-    where
-        Self: Sized,
-    {
+        opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
         use TransportError::*;
         match self {
-            Either::Left(a) => match a.dial_as_listener(addr) {
+            Either::Left(a) => match a.dial(addr, opts) {
                 Ok(connec) => Ok(EitherFuture::First(connec)),
                 Err(MultiaddrNotSupported(addr)) => Err(MultiaddrNotSupported(addr)),
                 Err(Other(err)) => Err(Other(Either::Left(err))),
             },
-            Either::Right(b) => match b.dial_as_listener(addr) {
+            Either::Right(b) => match b.dial(addr, opts) {
                 Ok(connec) => Ok(EitherFuture::Second(connec)),
                 Err(MultiaddrNotSupported(addr)) => Err(MultiaddrNotSupported(addr)),
                 Err(Other(err)) => Err(Other(Either::Right(err))),
             },
         }
     }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        match self {
-            Either::Left(a) => a.address_translation(server, observed),
-            Either::Right(b) => b.address_translation(server, observed),
-        }
-    }
 }
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 3ba153e1927..a42f56773df 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -45,8 +45,6 @@ mod proto {
 pub use multiaddr;
 pub type Negotiated<T> = multistream_select::Negotiated<T>;
 
-mod translation;
-
 pub mod connection;
 pub mod either;
 pub mod muxing;
@@ -62,7 +60,6 @@ pub use multihash;
 pub use muxing::StreamMuxer;
 pub use peer_record::PeerRecord;
 pub use signed_envelope::SignedEnvelope;
-pub use translation::address_translation;
 pub use transport::Transport;
 pub use upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 
diff --git a/core/src/transport.rs b/core/src/transport.rs
index 2246f3db747..28ce2dbf650 100644
--- a/core/src/transport.rs
+++ b/core/src/transport.rs
@@ -48,7 +48,7 @@ pub mod upgrade;
 mod boxed;
 mod optional;
 
-use crate::ConnectedPoint;
+use crate::{ConnectedPoint, Endpoint};
 
 pub use self::boxed::Boxed;
 pub use self::choice::OrTransport;
@@ -58,6 +58,30 @@ pub use self::upgrade::Upgrade;
 
 static NEXT_LISTENER_ID: AtomicUsize = AtomicUsize::new(1);
 
+/// The port use policy for a new connection.
+#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, Hash)]
+pub enum PortUse {
+    /// Always allocate a new port for the dial.
+    New,
+    /// Best effor reusing of an existing port.
+    ///
+    /// If there is no listener present that can be used to dial, a new port is allocated.
+    #[default]
+    Reuse,
+}
+
+/// Options to customize the behaviour during dialing.
+#[derive(Debug, Copy, Clone)]
+pub struct DialOpts {
+    /// The endpoint establishing a new connection.
+    ///
+    /// When attempting a hole-punch, both parties simultaneously "dial" each other but one party has to be the "listener" on the final connection.
+    /// This option specifies the role of this node in the final connection.
+    pub role: Endpoint,
+    /// The port use policy for a new connection.
+    pub port_use: PortUse,
+}
+
 /// A transport provides connection-oriented communication between two peers
 /// through ordered streams of data (i.e. connections).
 ///
@@ -129,16 +153,10 @@ pub trait Transport {
     ///
     /// If [`TransportError::MultiaddrNotSupported`] is returned, it may be desirable to
     /// try an alternative [`Transport`], if available.
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>>;
-
-    /// As [`Transport::dial`] but has the local node act as a listener on the outgoing connection.
-    ///
-    /// This option is needed for NAT and firewall hole punching.
-    ///
-    /// See [`ConnectedPoint::Dialer`] for related option.
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>>;
 
     /// Poll for [`TransportEvent`]s.
@@ -157,24 +175,6 @@ pub trait Transport {
         cx: &mut Context<'_>,
     ) -> Poll<TransportEvent<Self::ListenerUpgrade, Self::Error>>;
 
-    /// Performs a transport-specific mapping of an address `observed` by a remote onto a
-    /// local `listen` address to yield an address for the local node that may be reachable
-    /// for other peers.
-    ///
-    /// This is relevant for transports where Network Address Translation (NAT) can occur
-    /// so that e.g. the peer is observed at a different IP than the IP of the local
-    /// listening address. See also [`address_translation`][crate::address_translation].
-    ///
-    /// Within [`libp2p::Swarm`](<https://docs.rs/libp2p/latest/libp2p/struct.Swarm.html>) this is
-    /// used when extending the listening addresses of the local peer with external addresses
-    /// observed by remote peers.
-    /// On transports where this is not relevant (i.e. no NATs are present) `None` should be
-    /// returned for the sake of de-duplication.
-    ///
-    /// Note: if the listen or observed address is not a valid address of this transport,
-    /// `None` should be returned as well.
-    fn address_translation(&self, listen: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr>;
-
     /// Boxes the transport, including custom transport errors.
     fn boxed(self) -> boxed::Boxed<Self::Output>
     where
diff --git a/core/src/transport/and_then.rs b/core/src/transport/and_then.rs
index 6e0c7e32067..e85703f77fb 100644
--- a/core/src/transport/and_then.rs
+++ b/core/src/transport/and_then.rs
@@ -19,8 +19,8 @@
 // DEALINGS IN THE SOFTWARE.
 
 use crate::{
-    connection::{ConnectedPoint, Endpoint},
-    transport::{ListenerId, Transport, TransportError, TransportEvent},
+    connection::ConnectedPoint,
+    transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent},
 };
 use either::Either;
 use futures::prelude::*;
@@ -68,32 +68,14 @@ where
         self.transport.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let dialed_fut = self
-            .transport
-            .dial(addr.clone())
-            .map_err(|err| err.map(Either::Left))?;
-        let future = AndThenFuture {
-            inner: Either::Left(Box::pin(dialed_fut)),
-            args: Some((
-                self.fun.clone(),
-                ConnectedPoint::Dialer {
-                    address: addr,
-                    role_override: Endpoint::Dialer,
-                },
-            )),
-            _marker: PhantomPinned,
-        };
-        Ok(future)
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         let dialed_fut = self
             .transport
-            .dial_as_listener(addr.clone())
+            .dial(addr.clone(), opts)
             .map_err(|err| err.map(Either::Left))?;
         let future = AndThenFuture {
             inner: Either::Left(Box::pin(dialed_fut)),
@@ -101,7 +83,8 @@ where
                 self.fun.clone(),
                 ConnectedPoint::Dialer {
                     address: addr,
-                    role_override: Endpoint::Listener,
+                    role_override: opts.role,
+                    port_use: opts.port_use,
                 },
             )),
             _marker: PhantomPinned,
@@ -109,10 +92,6 @@ where
         Ok(future)
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.transport.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/boxed.rs b/core/src/transport/boxed.rs
index 1cede676c8e..596ab262221 100644
--- a/core/src/transport/boxed.rs
+++ b/core/src/transport/boxed.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 use futures::{prelude::*, stream::FusedStream};
 use multiaddr::Multiaddr;
 use std::{
@@ -58,9 +58,11 @@ trait Abstract<O> {
         addr: Multiaddr,
     ) -> Result<(), TransportError<io::Error>>;
     fn remove_listener(&mut self, id: ListenerId) -> bool;
-    fn dial(&mut self, addr: Multiaddr) -> Result<Dial<O>, TransportError<io::Error>>;
-    fn dial_as_listener(&mut self, addr: Multiaddr) -> Result<Dial<O>, TransportError<io::Error>>;
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr>;
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        opts: DialOpts,
+    ) -> Result<Dial<O>, TransportError<io::Error>>;
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -86,24 +88,17 @@ where
         Transport::remove_listener(self, id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Dial<O>, TransportError<io::Error>> {
-        let fut = Transport::dial(self, addr)
-            .map(|r| r.map_err(box_err))
-            .map_err(|e| e.map(box_err))?;
-        Ok(Box::pin(fut) as Dial<_>)
-    }
-
-    fn dial_as_listener(&mut self, addr: Multiaddr) -> Result<Dial<O>, TransportError<io::Error>> {
-        let fut = Transport::dial_as_listener(self, addr)
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        opts: DialOpts,
+    ) -> Result<Dial<O>, TransportError<io::Error>> {
+        let fut = Transport::dial(self, addr, opts)
             .map(|r| r.map_err(box_err))
             .map_err(|e| e.map(box_err))?;
         Ok(Box::pin(fut) as Dial<_>)
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        Transport::address_translation(self, server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -143,19 +138,12 @@ impl<O> Transport for Boxed<O> {
         self.inner.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.inner.dial(addr)
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.inner.dial_as_listener(addr)
-    }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.inner.address_translation(server, observed)
+        self.inner.dial(addr, opts)
     }
 
     fn poll(
diff --git a/core/src/transport/choice.rs b/core/src/transport/choice.rs
index aa3acfc3231..4339f6bba71 100644
--- a/core/src/transport/choice.rs
+++ b/core/src/transport/choice.rs
@@ -19,7 +19,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use crate::either::EitherFuture;
-use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 use either::Either;
 use futures::future;
 use multiaddr::Multiaddr;
@@ -92,19 +92,23 @@ where
         self.0.remove_listener(id) || self.1.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
         tracing::trace!(
             address=%addr,
-            "Attempting to dial address using {}",
+            "Attempting to dial using {}",
             std::any::type_name::<A>()
         );
-        let addr = match self.0.dial(addr) {
+        let addr = match self.0.dial(addr, opts) {
             Ok(connec) => return Ok(EitherFuture::First(connec)),
             Err(TransportError::MultiaddrNotSupported(addr)) => {
                 tracing::debug!(
                     address=%addr,
-                    "Failed to dial address using {}",
-                    std::any::type_name::<A>()
+                    "Failed to dial using {}",
+                    std::any::type_name::<B>(),
                 );
                 addr
             }
@@ -115,16 +119,16 @@ where
 
         tracing::trace!(
             address=%addr,
-            "Attempting to dial address using {}",
+            "Attempting to dial {}",
             std::any::type_name::<A>()
         );
-        let addr = match self.1.dial(addr) {
+        let addr = match self.1.dial(addr, opts) {
             Ok(connec) => return Ok(EitherFuture::Second(connec)),
             Err(TransportError::MultiaddrNotSupported(addr)) => {
                 tracing::debug!(
                     address=%addr,
-                    "Failed to dial address using {}",
-                    std::any::type_name::<A>()
+                    "Failed to dial using {}",
+                    std::any::type_name::<B>(),
                 );
                 addr
             }
@@ -136,37 +140,6 @@ where
         Err(TransportError::MultiaddrNotSupported(addr))
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let addr = match self.0.dial_as_listener(addr) {
-            Ok(connec) => return Ok(EitherFuture::First(connec)),
-            Err(TransportError::MultiaddrNotSupported(addr)) => addr,
-            Err(TransportError::Other(err)) => {
-                return Err(TransportError::Other(Either::Left(err)))
-            }
-        };
-
-        let addr = match self.1.dial_as_listener(addr) {
-            Ok(connec) => return Ok(EitherFuture::Second(connec)),
-            Err(TransportError::MultiaddrNotSupported(addr)) => addr,
-            Err(TransportError::Other(err)) => {
-                return Err(TransportError::Other(Either::Right(err)))
-            }
-        };
-
-        Err(TransportError::MultiaddrNotSupported(addr))
-    }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        if let Some(addr) = self.0.address_translation(server, observed) {
-            Some(addr)
-        } else {
-            self.1.address_translation(server, observed)
-        }
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/dummy.rs b/core/src/transport/dummy.rs
index 0aab94b0396..72558d34a79 100644
--- a/core/src/transport/dummy.rs
+++ b/core/src/transport/dummy.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 use crate::Multiaddr;
 use futures::{prelude::*, task::Context, task::Poll};
 use std::{fmt, io, marker::PhantomData, pin::Pin};
@@ -71,21 +71,14 @@ impl<TOut> Transport for DummyTransport<TOut> {
         false
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        Err(TransportError::MultiaddrNotSupported(addr))
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        _opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         Err(TransportError::MultiaddrNotSupported(addr))
     }
 
-    fn address_translation(&self, _server: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
-        None
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         _: &mut Context<'_>,
diff --git a/core/src/transport/global_only.rs b/core/src/transport/global_only.rs
index 0671b0e9984..83774f37004 100644
--- a/core/src/transport/global_only.rs
+++ b/core/src/transport/global_only.rs
@@ -20,7 +20,7 @@
 
 use crate::{
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
 };
 use std::{
     pin::Pin,
@@ -287,47 +287,25 @@ impl<T: crate::Transport + Unpin> crate::Transport for Transport<T> {
         self.inner.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        match addr.iter().next() {
-            Some(Protocol::Ip4(a)) => {
-                if !ipv4_global::is_global(a) {
-                    tracing::debug!(ip=%a, "Not dialing non global IP address");
-                    return Err(TransportError::MultiaddrNotSupported(addr));
-                }
-                self.inner.dial(addr)
-            }
-            Some(Protocol::Ip6(a)) => {
-                if !ipv6_global::is_global(a) {
-                    tracing::debug!(ip=%a, "Not dialing non global IP address");
-                    return Err(TransportError::MultiaddrNotSupported(addr));
-                }
-                self.inner.dial(addr)
-            }
-            _ => {
-                tracing::debug!(address=%addr, "Not dialing unsupported Multiaddress");
-                Err(TransportError::MultiaddrNotSupported(addr))
-            }
-        }
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         match addr.iter().next() {
             Some(Protocol::Ip4(a)) => {
                 if !ipv4_global::is_global(a) {
-                    tracing::debug!(ip=?a, "Not dialing non global IP address");
+                    tracing::debug!(ip=%a, "Not dialing non global IP address");
                     return Err(TransportError::MultiaddrNotSupported(addr));
                 }
-                self.inner.dial_as_listener(addr)
+                self.inner.dial(addr, opts)
             }
             Some(Protocol::Ip6(a)) => {
                 if !ipv6_global::is_global(a) {
-                    tracing::debug!(ip=?a, "Not dialing non global IP address");
+                    tracing::debug!(ip=%a, "Not dialing non global IP address");
                     return Err(TransportError::MultiaddrNotSupported(addr));
                 }
-                self.inner.dial_as_listener(addr)
+                self.inner.dial(addr, opts)
             }
             _ => {
                 tracing::debug!(address=%addr, "Not dialing unsupported Multiaddress");
@@ -336,10 +314,6 @@ impl<T: crate::Transport + Unpin> crate::Transport for Transport<T> {
         }
     }
 
-    fn address_translation(&self, listen: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.inner.address_translation(listen, observed)
-    }
-
     fn poll(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/map.rs b/core/src/transport/map.rs
index 553f3e6338d..9aab84ba8b1 100644
--- a/core/src/transport/map.rs
+++ b/core/src/transport/map.rs
@@ -18,8 +18,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use crate::transport::DialOpts;
 use crate::{
-    connection::{ConnectedPoint, Endpoint},
+    connection::ConnectedPoint,
     transport::{Transport, TransportError, TransportEvent},
 };
 use futures::prelude::*;
@@ -73,26 +74,16 @@ where
         self.transport.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let future = self.transport.dial(addr.clone())?;
-        let p = ConnectedPoint::Dialer {
-            address: addr,
-            role_override: Endpoint::Dialer,
-        };
-        Ok(MapFuture {
-            inner: future,
-            args: Some((self.fun.clone(), p)),
-        })
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let future = self.transport.dial_as_listener(addr.clone())?;
+        let future = self.transport.dial(addr.clone(), opts)?;
         let p = ConnectedPoint::Dialer {
             address: addr,
-            role_override: Endpoint::Listener,
+            role_override: opts.role,
+            port_use: opts.port_use,
         };
         Ok(MapFuture {
             inner: future,
@@ -100,10 +91,6 @@ where
         })
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.transport.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/map_err.rs b/core/src/transport/map_err.rs
index 56e1ebf2929..5d44af9af2e 100644
--- a/core/src/transport/map_err.rs
+++ b/core/src/transport/map_err.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 use futures::prelude::*;
 use multiaddr::Multiaddr;
 use std::{error, pin::Pin, task::Context, task::Poll};
@@ -65,23 +65,13 @@ where
         self.transport.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let map = self.map.clone();
-        match self.transport.dial(addr) {
-            Ok(future) => Ok(MapErrDial {
-                inner: future,
-                map: Some(map),
-            }),
-            Err(err) => Err(err.map(map)),
-        }
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         let map = self.map.clone();
-        match self.transport.dial_as_listener(addr) {
+        match self.transport.dial(addr, opts) {
             Ok(future) => Ok(MapErrDial {
                 inner: future,
                 map: Some(map),
@@ -90,10 +80,6 @@ where
         }
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.transport.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/memory.rs b/core/src/transport/memory.rs
index 6e4b9322ee5..85680265e8b 100644
--- a/core/src/transport/memory.rs
+++ b/core/src/transport/memory.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 use fnv::FnvHashMap;
 use futures::{channel::mpsc, future::Ready, prelude::*, task::Context, task::Poll};
 use multiaddr::{Multiaddr, Protocol};
@@ -208,7 +208,11 @@ impl Transport for MemoryTransport {
         }
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<DialFuture, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        _opts: DialOpts,
+    ) -> Result<DialFuture, TransportError<Self::Error>> {
         let port = if let Ok(port) = parse_memory_addr(&addr) {
             if let Some(port) = NonZeroU64::new(port) {
                 port
@@ -222,17 +226,6 @@ impl Transport for MemoryTransport {
         DialFuture::new(port).ok_or(TransportError::Other(MemoryTransportError::Unreachable))
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<DialFuture, TransportError<Self::Error>> {
-        self.dial(addr)
-    }
-
-    fn address_translation(&self, _server: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
-        None
-    }
-
     fn poll(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -405,6 +398,8 @@ impl<T> Drop for Chan<T> {
 
 #[cfg(test)]
 mod tests {
+    use crate::{transport::PortUse, Endpoint};
+
     use super::*;
 
     #[test]
@@ -489,7 +484,13 @@ mod tests {
     fn port_not_in_use() {
         let mut transport = MemoryTransport::default();
         assert!(transport
-            .dial("/memory/810172461024613".parse().unwrap())
+            .dial(
+                "/memory/810172461024613".parse().unwrap(),
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::New
+                }
+            )
             .is_err());
         transport
             .listen_on(
@@ -498,7 +499,13 @@ mod tests {
             )
             .unwrap();
         assert!(transport
-            .dial("/memory/810172461024613".parse().unwrap())
+            .dial(
+                "/memory/810172461024613".parse().unwrap(),
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::New
+                }
+            )
             .is_ok());
     }
 
@@ -565,7 +572,17 @@ mod tests {
 
         let mut t2 = MemoryTransport::default();
         let dialer = async move {
-            let mut socket = t2.dial(cloned_t1_addr).unwrap().await.unwrap();
+            let mut socket = t2
+                .dial(
+                    cloned_t1_addr,
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::New,
+                    },
+                )
+                .unwrap()
+                .await
+                .unwrap();
             socket.write_all(&msg).await.unwrap();
         };
 
@@ -601,7 +618,13 @@ mod tests {
 
         let dialer = async move {
             MemoryTransport::default()
-                .dial(listener_addr_cloned)
+                .dial(
+                    listener_addr_cloned,
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::New,
+                    },
+                )
                 .unwrap()
                 .await
                 .unwrap();
@@ -652,7 +675,13 @@ mod tests {
 
         let dialer = async move {
             let chan = MemoryTransport::default()
-                .dial(listener_addr_cloned)
+                .dial(
+                    listener_addr_cloned,
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::New,
+                    },
+                )
                 .unwrap()
                 .await
                 .unwrap();
diff --git a/core/src/transport/optional.rs b/core/src/transport/optional.rs
index 839f55a4000..f18bfa441b0 100644
--- a/core/src/transport/optional.rs
+++ b/core/src/transport/optional.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 use multiaddr::Multiaddr;
 use std::{pin::Pin, task::Context, task::Poll};
 
@@ -80,33 +80,18 @@ where
         }
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        if let Some(inner) = self.0.as_mut() {
-            inner.dial(addr)
-        } else {
-            Err(TransportError::MultiaddrNotSupported(addr))
-        }
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         if let Some(inner) = self.0.as_mut() {
-            inner.dial_as_listener(addr)
+            inner.dial(addr, opts)
         } else {
             Err(TransportError::MultiaddrNotSupported(addr))
         }
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        if let Some(inner) = &self.0 {
-            inner.address_translation(server, observed)
-        } else {
-            None
-        }
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/timeout.rs b/core/src/transport/timeout.rs
index 0e8ab3f5201..830ed099629 100644
--- a/core/src/transport/timeout.rs
+++ b/core/src/transport/timeout.rs
@@ -24,6 +24,7 @@
 //! underlying `Transport`.
 // TODO: add example
 
+use crate::transport::DialOpts;
 use crate::{
     transport::{ListenerId, TransportError, TransportEvent},
     Multiaddr, Transport,
@@ -99,24 +100,14 @@ where
         self.inner.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let dial = self
-            .inner
-            .dial(addr)
-            .map_err(|err| err.map(TransportTimeoutError::Other))?;
-        Ok(Timeout {
-            inner: dial,
-            timer: Delay::new(self.outgoing_timeout),
-        })
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         let dial = self
             .inner
-            .dial_as_listener(addr)
+            .dial(addr, opts)
             .map_err(|err| err.map(TransportTimeoutError::Other))?;
         Ok(Timeout {
             inner: dial,
@@ -124,10 +115,6 @@ where
         })
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.inner.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/transport/upgrade.rs b/core/src/transport/upgrade.rs
index 9626312b5fb..66b9e7509af 100644
--- a/core/src/transport/upgrade.rs
+++ b/core/src/transport/upgrade.rs
@@ -22,6 +22,7 @@
 
 pub use crate::upgrade::Version;
 
+use crate::transport::DialOpts;
 use crate::{
     connection::ConnectedPoint,
     muxing::{StreamMuxer, StreamMuxerBox},
@@ -335,21 +336,18 @@ where
     type ListenerUpgrade = T::ListenerUpgrade;
     type Dial = T::Dial;
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.0.dial(addr)
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
+        self.0.dial(addr, opts)
     }
 
     fn remove_listener(&mut self, id: ListenerId) -> bool {
         self.0.remove_listener(id)
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.0.dial_as_listener(addr)
-    }
-
     fn listen_on(
         &mut self,
         id: ListenerId,
@@ -358,10 +356,6 @@ where
         self.0.listen_on(id, addr)
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.0.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -404,10 +398,14 @@ where
     type ListenerUpgrade = ListenerUpgradeFuture<T::ListenerUpgrade, U, C>;
     type Dial = DialUpgradeFuture<T::Dial, U, C>;
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
         let future = self
             .inner
-            .dial(addr)
+            .dial(addr, opts)
             .map_err(|err| err.map(TransportUpgradeError::Transport))?;
         Ok(DialUpgradeFuture {
             future: Box::pin(future),
@@ -419,20 +417,6 @@ where
         self.inner.remove_listener(id)
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let future = self
-            .inner
-            .dial_as_listener(addr)
-            .map_err(|err| err.map(TransportUpgradeError::Transport))?;
-        Ok(DialUpgradeFuture {
-            future: Box::pin(future),
-            upgrade: future::Either::Left(Some(self.upgrade.clone())),
-        })
-    }
-
     fn listen_on(
         &mut self,
         id: ListenerId,
@@ -443,10 +427,6 @@ where
             .map_err(|err| err.map(TransportUpgradeError::Transport))
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.inner.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/core/src/upgrade/ready.rs b/core/src/upgrade/ready.rs
index 323f1f73f32..7e235902651 100644
--- a/core/src/upgrade/ready.rs
+++ b/core/src/upgrade/ready.rs
@@ -31,7 +31,7 @@ pub struct ReadyUpgrade<P> {
 }
 
 impl<P> ReadyUpgrade<P> {
-    pub fn new(protocol_name: P) -> Self {
+    pub const fn new(protocol_name: P) -> Self {
         Self { protocol_name }
     }
 }
diff --git a/core/tests/transport_upgrade.rs b/core/tests/transport_upgrade.rs
index a8872051618..d8bec6f2b59 100644
--- a/core/tests/transport_upgrade.rs
+++ b/core/tests/transport_upgrade.rs
@@ -19,10 +19,11 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures::prelude::*;
-use libp2p_core::transport::{ListenerId, MemoryTransport, Transport};
+use libp2p_core::transport::{DialOpts, ListenerId, MemoryTransport, PortUse, Transport};
 use libp2p_core::upgrade::{
     self, InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo,
 };
+use libp2p_core::Endpoint;
 use libp2p_identity as identity;
 use libp2p_mplex::MplexConfig;
 use libp2p_noise as noise;
@@ -121,7 +122,17 @@ fn upgrade_pipeline() {
     };
 
     let client = async move {
-        let (peer, _mplex) = dialer_transport.dial(listen_addr2).unwrap().await.unwrap();
+        let (peer, _mplex) = dialer_transport
+            .dial(
+                listen_addr2,
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::New,
+                },
+            )
+            .unwrap()
+            .await
+            .unwrap();
         assert_eq!(peer, listener_id);
     };
 
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 9bdf0be393d..010b76623e0 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -3,7 +3,7 @@ name = "autonat-example"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = "MIT"
+license = "MIT or Apache-2.0"
 
 [package.metadata.release]
 release = false
diff --git a/examples/dcutr/src/main.rs b/examples/dcutr/src/main.rs
index 51df670f8a7..630d4b2b1f3 100644
--- a/examples/dcutr/src/main.rs
+++ b/examples/dcutr/src/main.rs
@@ -89,7 +89,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         libp2p::SwarmBuilder::with_existing_identity(generate_ed25519(opts.secret_key_seed))
             .with_tokio()
             .with_tcp(
-                tcp::Config::default().port_reuse(true).nodelay(true),
+                tcp::Config::default().nodelay(true),
                 noise::Config::new,
                 yamux::Config::default,
             )?
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
index de46d204c77..ba31d4d9e13 100644
--- a/examples/stream/Cargo.toml
+++ b/examples/stream/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 anyhow = "1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
-libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
+libp2p-stream = { path = "../../protocols/stream", version = "0.2.0-alpha" }
 rand = "0.8"
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
diff --git a/hole-punching-tests/src/main.rs b/hole-punching-tests/src/main.rs
index bbecc948e08..02229e16262 100644
--- a/hole-punching-tests/src/main.rs
+++ b/hole-punching-tests/src/main.rs
@@ -64,7 +64,7 @@ async fn main() -> Result<()> {
     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
         .with_tokio()
         .with_tcp(
-            tcp::Config::new().port_reuse(true).nodelay(true),
+            tcp::Config::new().nodelay(true),
             noise::Config::new,
             yamux::Config::default,
         )?
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 977d9f91924..7e1b95c6e75 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -7,12 +7,23 @@
 - Raise MSRV to 1.73.
   See [PR 5266](https://github.com/libp2p/rust-libp2p/pull/5266).
 
+- Implement refactored `Transport`.
+  See [PR 4568].
+
+- Move `address_translation` from `libp2p-core` to `libp2p-swarm` and `libp2p-identify`. To now get
+  address translation behaviour, i.e. discovery of extern address (candidates) based on connecting
+  to other peers, one needs to use `libp2p-identify` now. This pertains to you if your nodes can be
+  behind NATs and they aren't aware of their true external address.
+  See [PR 4568].
+
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
 - Remove redundant async signature from builder methods.
   See [PR 5468](https://github.com/libp2p/rust-libp2p/pull/5468).
 
+[PR 4568]: https://github.com/libp2p/rust-libp2p/pull/4568
+
 ## 0.53.2
 
 - Allow `SwarmBuilder::with_bandwidth_metrics` after `SwarmBuilder::with_websocket`.
diff --git a/misc/allow-block-list/src/lib.rs b/misc/allow-block-list/src/lib.rs
index c1d31433db1..c877ab09c9b 100644
--- a/misc/allow-block-list/src/lib.rs
+++ b/misc/allow-block-list/src/lib.rs
@@ -61,6 +61,7 @@
 //! # }
 //! ```
 
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
@@ -225,6 +226,7 @@ where
         peer: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         self.state.enforce(&peer)?;
 
diff --git a/misc/connection-limits/src/lib.rs b/misc/connection-limits/src/lib.rs
index dbe68a8ad11..b02e52f25a1 100644
--- a/misc/connection-limits/src/lib.rs
+++ b/misc/connection-limits/src/lib.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     behaviour::{ConnectionEstablished, DialFailure, ListenFailure},
@@ -278,6 +278,7 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         self.pending_outbound_connections.remove(&connection_id);
 
@@ -569,6 +570,7 @@ mod tests {
             _peer: PeerId,
             _addr: &Multiaddr,
             _role_override: Endpoint,
+            _port_use: PortUse,
         ) -> Result<THandler<Self>, ConnectionDenied> {
             Err(ConnectionDenied::new(std::io::Error::new(
                 std::io::ErrorKind::Other,
diff --git a/misc/memory-connection-limits/src/lib.rs b/misc/memory-connection-limits/src/lib.rs
index 08c45154221..7b5803a61aa 100644
--- a/misc/memory-connection-limits/src/lib.rs
+++ b/misc/memory-connection-limits/src/lib.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     dummy, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler, THandlerInEvent,
@@ -177,6 +177,7 @@ impl NetworkBehaviour for Behaviour {
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(dummy::ConnectionHandler)
     }
diff --git a/misc/memory-connection-limits/tests/util/mod.rs b/misc/memory-connection-limits/tests/util/mod.rs
index f40ce319929..d18aa78fd22 100644
--- a/misc/memory-connection-limits/tests/util/mod.rs
+++ b/misc/memory-connection-limits/tests/util/mod.rs
@@ -20,7 +20,7 @@
 
 use std::task::{Context, Poll};
 
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     dummy, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler, THandlerInEvent,
@@ -102,6 +102,7 @@ impl<const MEM_PENDING: usize, const MEM_ESTABLISHED: usize> NetworkBehaviour
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         self.handle_established();
         Ok(dummy::ConnectionHandler)
diff --git a/misc/metrics/src/bandwidth.rs b/misc/metrics/src/bandwidth.rs
index ac6a4178ce9..8a0f54e5b65 100644
--- a/misc/metrics/src/bandwidth.rs
+++ b/misc/metrics/src/bandwidth.rs
@@ -7,7 +7,7 @@ use futures::{
 };
 use libp2p_core::{
     muxing::{StreamMuxer, StreamMuxerEvent},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
     Multiaddr,
 };
 use libp2p_identity::PeerId;
@@ -84,33 +84,20 @@ where
         self.transport.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let metrics = ConnectionMetrics::from_family_and_addr(&self.metrics, &addr);
-        Ok(self
-            .transport
-            .dial(addr.clone())?
-            .map_ok(Box::new(|(peer_id, stream_muxer)| {
-                (peer_id, Muxer::new(stream_muxer, metrics))
-            })))
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        dial_opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         let metrics = ConnectionMetrics::from_family_and_addr(&self.metrics, &addr);
         Ok(self
             .transport
-            .dial_as_listener(addr.clone())?
+            .dial(addr.clone(), dial_opts)?
             .map_ok(Box::new(|(peer_id, stream_muxer)| {
                 (peer_id, Muxer::new(stream_muxer, metrics))
             })))
     }
 
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.transport.address_translation(server, observed)
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/misc/server/src/main.rs b/misc/server/src/main.rs
index eb28b9ad5c2..820921beaed 100644
--- a/misc/server/src/main.rs
+++ b/misc/server/src/main.rs
@@ -71,7 +71,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let mut swarm = libp2p::SwarmBuilder::with_existing_identity(local_keypair)
         .with_tokio()
         .with_tcp(
-            tcp::Config::default().port_reuse(true).nodelay(true),
+            tcp::Config::default().nodelay(true),
             noise::Config::new,
             yamux::Config::default,
         )?
diff --git a/muxers/mplex/benches/split_send_size.rs b/muxers/mplex/benches/split_send_size.rs
index 0125d49dcef..44eafa884ac 100644
--- a/muxers/mplex/benches/split_send_size.rs
+++ b/muxers/mplex/benches/split_send_size.rs
@@ -28,6 +28,7 @@ use futures::prelude::*;
 use futures::{channel::oneshot, future::join};
 use libp2p_core::muxing::StreamMuxerExt;
 use libp2p_core::transport::ListenerId;
+use libp2p_core::Endpoint;
 use libp2p_core::{multiaddr::multiaddr, muxing, transport, upgrade, Multiaddr, Transport};
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
@@ -146,7 +147,17 @@ fn run(
     // Spawn and block on the sender, i.e. until all data is sent.
     let sender = async move {
         let addr = addr_receiver.await.unwrap();
-        let (_peer, mut conn) = sender_trans.dial(addr).unwrap().await.unwrap();
+        let (_peer, mut conn) = sender_trans
+            .dial(
+                addr,
+                transport::DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: transport::PortUse::Reuse,
+                },
+            )
+            .unwrap()
+            .await
+            .unwrap();
         // Just calling `poll_outbound` without `poll` is fine here because mplex makes progress through all `poll_` functions. It is hacky though.
         let mut stream = poll_fn(|cx| conn.poll_outbound_unpin(cx)).await.unwrap();
         let mut off = 0;
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index 6a25dc173dd..2a799221f7c 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.13.0
+
+- Due to the refactor of `Transport` it's no longer required to create a seperate transport for
+AutoNAT where port reuse is disabled. This information is now passed by the behaviour.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568).
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.12.1
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 970dd27bc53..f047cb7d5ba 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
 authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>"]
-version = "0.12.1"
+version = "0.13.0"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/protocols/autonat/src/behaviour.rs b/protocols/autonat/src/behaviour.rs
index a47852e5206..64bebfb6233 100644
--- a/protocols/autonat/src/behaviour.rs
+++ b/protocols/autonat/src/behaviour.rs
@@ -28,6 +28,7 @@ pub use as_client::{OutboundProbeError, OutboundProbeEvent};
 use as_server::AsServer;
 pub use as_server::{InboundProbeError, InboundProbeEvent};
 use futures_timer::Delay;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
@@ -338,6 +339,7 @@ impl Behaviour {
             ConnectedPoint::Dialer {
                 address,
                 role_override: Endpoint::Dialer,
+                ..
             } => {
                 if let Some(event) = self.as_server().on_outbound_connection(&peer, address) {
                     self.pending_actions
@@ -347,6 +349,7 @@ impl Behaviour {
             ConnectedPoint::Dialer {
                 address: _,
                 role_override: Endpoint::Listener,
+                ..
             } => {
                 // Outgoing connection was dialed as a listener. In other words outgoing connection
                 // was dialed as part of a hole punch. `libp2p-autonat` never attempts to hole
@@ -512,9 +515,15 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
-        self.inner
-            .handle_established_outbound_connection(connection_id, peer, addr, role_override)
+        self.inner.handle_established_outbound_connection(
+            connection_id,
+            peer,
+            addr,
+            role_override,
+            port_use,
+        )
     }
 
     fn on_swarm_event(&mut self, event: FromSwarm) {
diff --git a/protocols/autonat/src/behaviour/as_server.rs b/protocols/autonat/src/behaviour/as_server.rs
index af6be799e21..8f1d6642de5 100644
--- a/protocols/autonat/src/behaviour/as_server.rs
+++ b/protocols/autonat/src/behaviour/as_server.rs
@@ -135,6 +135,7 @@ impl<'a> HandleInnerEvent for AsServer<'a> {
                                         NonZeroU8::new(1).expect("1 > 0"),
                                     )
                                     .addresses(addrs)
+                                    .allocate_new_port()
                                     .build(),
                             },
                         ])
diff --git a/protocols/autonat/tests/test_server.rs b/protocols/autonat/tests/test_server.rs
index b0610ef59a4..fd97b1a9132 100644
--- a/protocols/autonat/tests/test_server.rs
+++ b/protocols/autonat/tests/test_server.rs
@@ -92,6 +92,7 @@ async fn test_dial_back() {
                     ConnectedPoint::Dialer {
                         address,
                         role_override: Endpoint::Dialer,
+                        ..
                     },
                 num_established,
                 concurrent_dial_errors,
@@ -300,6 +301,7 @@ async fn test_dial_multiple_addr() {
                     ConnectedPoint::Dialer {
                         address,
                         role_override: Endpoint::Dialer,
+                        ..
                     },
                 concurrent_dial_errors,
                 ..
diff --git a/protocols/dcutr/CHANGELOG.md b/protocols/dcutr/CHANGELOG.md
index 4865a0540bb..0ddc4aa1148 100644
--- a/protocols/dcutr/CHANGELOG.md
+++ b/protocols/dcutr/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.11.1
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 24a5560f5b5..cd46840caf3 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-dcutr"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Direct connection upgrade through relay"
-version = "0.11.1"
+version = "0.12.0"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/dcutr/src/behaviour.rs b/protocols/dcutr/src/behaviour.rs
index 4409b5f6a64..574c96205fa 100644
--- a/protocols/dcutr/src/behaviour.rs
+++ b/protocols/dcutr/src/behaviour.rs
@@ -24,6 +24,7 @@ use crate::{handler, protocol};
 use either::Either;
 use libp2p_core::connection::ConnectedPoint;
 use libp2p_core::multiaddr::Protocol;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{ConnectionClosed, DialFailure, FromSwarm};
@@ -206,12 +207,14 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         if is_relayed(addr) {
             return Ok(Either::Left(handler::relayed::Handler::new(
                 ConnectedPoint::Dialer {
                     address: addr.clone(),
                     role_override,
+                    port_use,
                 },
                 self.observed_addresses(),
             ))); // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
diff --git a/protocols/floodsub/CHANGELOG.md b/protocols/floodsub/CHANGELOG.md
index 8e3cb70ddf1..4192e0ea58d 100644
--- a/protocols/floodsub/CHANGELOG.md
+++ b/protocols/floodsub/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.45.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.44.0
 
 - Change publish to require `data: impl Into<Bytes>` to internally avoid any costly cloning / allocation.
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 8bcbc4a3557..9f0557c6d01 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-floodsub"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Floodsub protocol for libp2p"
-version = "0.44.0"
+version = "0.45.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/floodsub/src/layer.rs b/protocols/floodsub/src/layer.rs
index 35711408a8d..1a70d2213b2 100644
--- a/protocols/floodsub/src/layer.rs
+++ b/protocols/floodsub/src/layer.rs
@@ -27,6 +27,7 @@ use crate::FloodsubConfig;
 use bytes::Bytes;
 use cuckoofilter::{CuckooError, CuckooFilter};
 use fnv::FnvHashSet;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm};
@@ -346,6 +347,7 @@ impl NetworkBehaviour for Floodsub {
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(Default::default())
     }
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 7c43b98f0a7..8e115052d31 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## 0.47.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
 - Add ConnectionError to FromSwarm::ConnectionClosed.
   See [PR 5485](https://github.com/libp2p/rust-libp2p/pull/5485).
 
@@ -9,7 +11,7 @@
 ## 0.46.1
 
 - Deprecate `Rpc` in preparation for removing it from the public API because it is an internal type.
-  See [PR 4833](https://github.com/libp2p/rust-libp2p/pull/4833). 
+  See [PR 4833](https://github.com/libp2p/rust-libp2p/pull/4833).
 
 ## 0.46.0
 
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 7980f362acf..0d1af1ada0c 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -34,7 +34,9 @@ use futures_ticker::Ticker;
 use prometheus_client::registry::Registry;
 use rand::{seq::SliceRandom, thread_rng};
 
-use libp2p_core::{multiaddr::Protocol::Ip4, multiaddr::Protocol::Ip6, Endpoint, Multiaddr};
+use libp2p_core::{
+    multiaddr::Protocol::Ip4, multiaddr::Protocol::Ip6, transport::PortUse, Endpoint, Multiaddr,
+};
 use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
@@ -3012,6 +3014,7 @@ where
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(Handler::new(self.config.protocol_config()))
     }
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index fe861a674dd..c44152ed2f9 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -206,6 +206,7 @@ where
         ConnectedPoint::Dialer {
             address,
             role_override: Endpoint::Dialer,
+            port_use: PortUse::Reuse,
         }
     } else {
         ConnectedPoint::Listener {
@@ -256,6 +257,7 @@ where
         let fake_endpoint = ConnectedPoint::Dialer {
             address: Multiaddr::empty(),
             role_override: Endpoint::Dialer,
+            port_use: PortUse::Reuse,
         }; // this is not relevant
            // peer_connections.connections should never be empty.
 
@@ -562,6 +564,7 @@ fn test_join() {
             endpoint: &ConnectedPoint::Dialer {
                 address: "/ip4/127.0.0.1".parse::<Multiaddr>().unwrap(),
                 role_override: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
             },
             failed_addresses: &[],
             other_established: 0,
@@ -4052,6 +4055,7 @@ fn test_scoring_p6() {
             endpoint: &ConnectedPoint::Dialer {
                 address: addr.clone(),
                 role_override: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
             },
             failed_addresses: &[],
             other_established: 0,
@@ -4073,6 +4077,7 @@ fn test_scoring_p6() {
             endpoint: &ConnectedPoint::Dialer {
                 address: addr2.clone(),
                 role_override: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
             },
             failed_addresses: &[],
             other_established: 1,
@@ -4103,6 +4108,7 @@ fn test_scoring_p6() {
         endpoint: &ConnectedPoint::Dialer {
             address: addr,
             role_override: Endpoint::Dialer,
+            port_use: PortUse::Reuse,
         },
         failed_addresses: &[],
         other_established: 2,
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index b8ab3f8df50..275f7114b28 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## 0.45.0
 
+- Address translation is moved here from `libp2p-core`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 - Add `ConnectionId` in `Event`.
   See [PR 4981](https://github.com/libp2p/rust-libp2p/pull/4981).
 
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index 92a0dc46103..6590ccd6588 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -20,6 +20,8 @@
 
 use crate::handler::{self, Handler, InEvent};
 use crate::protocol::{Info, UpgradeError};
+use libp2p_core::multiaddr::Protocol;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{multiaddr, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_identity::PublicKey;
@@ -27,6 +29,7 @@ use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, DialFailu
 use libp2p_swarm::{
     ConnectionDenied, DialError, ExternalAddresses, ListenAddresses, NetworkBehaviour,
     NotifyHandler, PeerAddresses, StreamUpgradeError, THandlerInEvent, ToSwarm,
+    _address_translation,
 };
 use libp2p_swarm::{ConnectionId, THandler, THandlerOutEvent};
 
@@ -39,6 +42,50 @@ use std::{
     time::Duration,
 };
 
+/// Whether an [`Multiaddr`] is a valid for the QUIC transport.
+fn is_quic_addr(addr: &Multiaddr, v1: bool) -> bool {
+    use Protocol::*;
+    let mut iter = addr.iter();
+    let Some(first) = iter.next() else {
+        return false;
+    };
+    let Some(second) = iter.next() else {
+        return false;
+    };
+    let Some(third) = iter.next() else {
+        return false;
+    };
+    let fourth = iter.next();
+    let fifth = iter.next();
+
+    matches!(first, Ip4(_) | Ip6(_) | Dns(_) | Dns4(_) | Dns6(_))
+        && matches!(second, Udp(_))
+        && if v1 {
+            matches!(third, QuicV1)
+        } else {
+            matches!(third, Quic)
+        }
+        && matches!(fourth, Some(P2p(_)) | None)
+        && fifth.is_none()
+}
+
+fn is_tcp_addr(addr: &Multiaddr) -> bool {
+    use Protocol::*;
+
+    let mut iter = addr.iter();
+
+    let first = match iter.next() {
+        None => return false,
+        Some(p) => p,
+    };
+    let second = match iter.next() {
+        None => return false,
+        Some(p) => p,
+    };
+
+    matches!(first, Ip4(_) | Ip6(_) | Dns(_) | Dns4(_) | Dns6(_)) && matches!(second, Tcp(_))
+}
+
 /// Network behaviour that automatically identifies nodes periodically, returns information
 /// about them, and answers identify queries from other nodes.
 ///
@@ -52,6 +99,9 @@ pub struct Behaviour {
     /// The address a remote observed for us.
     our_observed_addresses: HashMap<ConnectionId, Multiaddr>,
 
+    /// The outbound connections established without port reuse (require translation)
+    outbound_connections_with_ephemeral_port: HashSet<ConnectionId>,
+
     /// Pending events to be emitted when polled.
     events: VecDeque<ToSwarm<Event, InEvent>>,
     /// The addresses of all peers that we have discovered.
@@ -153,6 +203,7 @@ impl Behaviour {
             config,
             connected: HashMap::new(),
             our_observed_addresses: Default::default(),
+            outbound_connections_with_ephemeral_port: Default::default(),
             events: VecDeque::new(),
             discovered_peers,
             listen_addresses: Default::default(),
@@ -213,6 +264,58 @@ impl Behaviour {
             .cloned()
             .collect()
     }
+
+    fn emit_new_external_addr_candidate_event(
+        &mut self,
+        connection_id: ConnectionId,
+        observed: &Multiaddr,
+    ) {
+        if self
+            .outbound_connections_with_ephemeral_port
+            .contains(&connection_id)
+        {
+            // Apply address translation to the candidate address.
+            // For TCP without port-reuse, the observed address contains an ephemeral port which needs to be replaced by the port of a listen address.
+            let translated_addresses = {
+                let mut addrs: Vec<_> = self
+                    .listen_addresses
+                    .iter()
+                    .filter_map(|server| {
+                        if (is_tcp_addr(server) && is_tcp_addr(observed))
+                            || (is_quic_addr(server, true) && is_quic_addr(observed, true))
+                            || (is_quic_addr(server, false) && is_quic_addr(observed, false))
+                        {
+                            _address_translation(server, observed)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+
+                // remove duplicates
+                addrs.sort_unstable();
+                addrs.dedup();
+                addrs
+            };
+
+            // If address translation yielded nothing, broadcast the original candidate address.
+            if translated_addresses.is_empty() {
+                self.events
+                    .push_back(ToSwarm::NewExternalAddrCandidate(observed.clone()));
+            } else {
+                for addr in translated_addresses {
+                    self.events
+                        .push_back(ToSwarm::NewExternalAddrCandidate(addr));
+                }
+            }
+            return;
+        }
+
+        // outgoing connection dialed with port reuse
+        // incomming connection
+        self.events
+            .push_back(ToSwarm::NewExternalAddrCandidate(observed.clone()));
+    }
 }
 
 impl NetworkBehaviour for Behaviour {
@@ -239,11 +342,25 @@ impl NetworkBehaviour for Behaviour {
 
     fn handle_established_outbound_connection(
         &mut self,
-        _: ConnectionId,
+        connection_id: ConnectionId,
         peer: PeerId,
         addr: &Multiaddr,
         _: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
+        // Contrary to inbound events, outbound events are full-p2p qualified
+        // so we remove /p2p/ in order to be homogeneous
+        // this will avoid Autonatv2 to probe twice the same address (fully-p2p-qualified + not fully-p2p-qualified)
+        let mut addr = addr.clone();
+        if matches!(addr.iter().last(), Some(multiaddr::Protocol::P2p(_))) {
+            addr.pop();
+        }
+
+        if port_use == PortUse::New {
+            self.outbound_connections_with_ephemeral_port
+                .insert(connection_id);
+        }
+
         Ok(Handler::new(
             self.config.interval,
             peer,
@@ -289,8 +406,7 @@ impl NetworkBehaviour for Behaviour {
                 match self.our_observed_addresses.entry(connection_id) {
                     Entry::Vacant(not_yet_observed) => {
                         not_yet_observed.insert(observed.clone());
-                        self.events
-                            .push_back(ToSwarm::NewExternalAddrCandidate(observed));
+                        self.emit_new_external_addr_candidate_event(connection_id, &observed);
                     }
                     Entry::Occupied(already_observed) if already_observed.get() == &observed => {
                         // No-op, we already observed this address.
@@ -303,8 +419,7 @@ impl NetworkBehaviour for Behaviour {
                         );
 
                         *already_observed.get_mut() = observed.clone();
-                        self.events
-                            .push_back(ToSwarm::NewExternalAddrCandidate(observed));
+                        self.emit_new_external_addr_candidate_event(connection_id, &observed);
                     }
                 }
             }
@@ -403,6 +518,8 @@ impl NetworkBehaviour for Behaviour {
                 }
 
                 self.our_observed_addresses.remove(&connection_id);
+                self.outbound_connections_with_ephemeral_port
+                    .remove(&connection_id);
             }
             FromSwarm::DialFailure(DialFailure { peer_id, error, .. }) => {
                 if let (Some(peer_id), Some(cache), DialError::Transport(errors)) =
diff --git a/protocols/identify/tests/smoke.rs b/protocols/identify/tests/smoke.rs
index dd92d10979a..49ae9f0726f 100644
--- a/protocols/identify/tests/smoke.rs
+++ b/protocols/identify/tests/smoke.rs
@@ -1,5 +1,4 @@
 use futures::StreamExt;
-use libp2p_core::multiaddr::Protocol;
 use libp2p_identify as identify;
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
@@ -59,12 +58,7 @@ async fn periodic_identify() {
             assert_eq!(s1_info.protocol_version, "c");
             assert_eq!(s1_info.agent_version, "d");
             assert!(!s1_info.protocols.is_empty());
-            assert_eq!(
-                s1_info.observed_addr,
-                swarm1_memory_listen
-                    .clone()
-                    .with(Protocol::P2p(swarm1_peer_id))
-            );
+            assert_eq!(s1_info.observed_addr, swarm1_memory_listen);
             assert!(s1_info.listen_addrs.contains(&swarm2_tcp_listen_addr));
             assert!(s1_info.listen_addrs.contains(&swarm2_memory_listen));
 
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index f88484bafa1..a5b404ae6bd 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -21,6 +21,7 @@
   See [PR 5317](https://github.com/libp2p/rust-libp2p/pull/5317).
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+<!-- Update to libp2p-swarm v0.45.0 -->
 - Correctly handle the `NoKnownPeers` error on automatic bootstrap.
   See [PR 5349](https://github.com/libp2p/rust-libp2p/pull/5349).
 - Improve automatic bootstrap triggering conditions:
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 069eec1a5b4..8d6f86d7e0f 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -35,7 +35,7 @@ use crate::record::{
 use crate::{bootstrap, K_VALUE};
 use crate::{jobs::*, protocol};
 use fnv::FnvHashSet;
-use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{
     AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm,
@@ -2168,10 +2168,12 @@ where
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         let connected_point = ConnectedPoint::Dialer {
             address: addr.clone(),
             role_override,
+            port_use,
         };
 
         let mut handler = Handler::new(
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index b82ec966f89..c4859f2f138 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -1310,6 +1310,7 @@ fn network_behaviour_on_address_change() {
     let endpoint = ConnectedPoint::Dialer {
         address: old_address.clone(),
         role_override: Endpoint::Dialer,
+        port_use: PortUse::Reuse,
     };
 
     // Mimick a connection being established.
@@ -1360,10 +1361,12 @@ fn network_behaviour_on_address_change() {
         old: &ConnectedPoint::Dialer {
             address: old_address,
             role_override: Endpoint::Dialer,
+            port_use: PortUse::Reuse,
         },
         new: &ConnectedPoint::Dialer {
             address: new_address.clone(),
             role_override: Endpoint::Dialer,
+            port_use: PortUse::Reuse,
         },
     }));
 
diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md
index 18fe0e76e6f..67b1d669f60 100644
--- a/protocols/mdns/CHANGELOG.md
+++ b/protocols/mdns/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.46.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
 ## 0.45.2
 
 - Add `#[track_caller]` on all `spawn` wrappers.
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 724c8818621..0c8229465d6 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-mdns"
 edition = "2021"
 rust-version = { workspace = true }
-version = "0.45.2"
+version = "0.46.0"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
diff --git a/protocols/mdns/src/behaviour.rs b/protocols/mdns/src/behaviour.rs
index d4a0a707a01..6355fbf4943 100644
--- a/protocols/mdns/src/behaviour.rs
+++ b/protocols/mdns/src/behaviour.rs
@@ -28,6 +28,7 @@ use crate::Config;
 use futures::channel::mpsc;
 use futures::{Stream, StreamExt};
 use if_watch::IfEvent;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::FromSwarm;
@@ -263,6 +264,7 @@ where
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(dummy::ConnectionHandler)
     }
diff --git a/protocols/mdns/src/behaviour/iface/query.rs b/protocols/mdns/src/behaviour/iface/query.rs
index eeb699fca6b..70b84816d0f 100644
--- a/protocols/mdns/src/behaviour/iface/query.rs
+++ b/protocols/mdns/src/behaviour/iface/query.rs
@@ -24,10 +24,9 @@ use hickory_proto::{
     op::Message,
     rr::{Name, RData},
 };
-use libp2p_core::{
-    address_translation,
-    multiaddr::{Multiaddr, Protocol},
-};
+use libp2p_core::multiaddr::{Multiaddr, Protocol};
+use libp2p_swarm::_address_translation;
+
 use libp2p_identity::PeerId;
 use std::time::Instant;
 use std::{fmt, net::SocketAddr, str, time::Duration};
@@ -179,7 +178,7 @@ impl MdnsResponse {
                 let new_expiration = now + peer.ttl();
 
                 peer.addresses().iter().filter_map(move |address| {
-                    let new_addr = address_translation(address, &observed)?;
+                    let new_addr = _address_translation(address, &observed)?;
                     let new_addr = new_addr.with_p2p(*peer.id()).ok()?;
 
                     Some((*peer.id(), new_addr, new_expiration))
diff --git a/protocols/perf/CHANGELOG.md b/protocols/perf/CHANGELOG.md
index b347f21e9e0..abeca9fad25 100644
--- a/protocols/perf/CHANGELOG.md
+++ b/protocols/perf/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## 0.4.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
 - Add ConnectionError to FromSwarm::ConnectionClosed.
   See [PR 5485](https://github.com/libp2p/rust-libp2p/pull/5485).
 
diff --git a/protocols/perf/src/client/behaviour.rs b/protocols/perf/src/client/behaviour.rs
index 5e430f8f0c1..1b181557acc 100644
--- a/protocols/perf/src/client/behaviour.rs
+++ b/protocols/perf/src/client/behaviour.rs
@@ -25,7 +25,7 @@ use std::{
     task::{Context, Poll},
 };
 
-use libp2p_core::Multiaddr;
+use libp2p_core::{transport::PortUse, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     derive_prelude::ConnectionEstablished, ConnectionClosed, ConnectionId, FromSwarm,
@@ -92,6 +92,7 @@ impl NetworkBehaviour for Behaviour {
         _peer: PeerId,
         _addr: &Multiaddr,
         _role_override: libp2p_core::Endpoint,
+        _port_use: PortUse,
     ) -> Result<libp2p_swarm::THandler<Self>, libp2p_swarm::ConnectionDenied> {
         Ok(Handler::default())
     }
diff --git a/protocols/perf/src/server/behaviour.rs b/protocols/perf/src/server/behaviour.rs
index da24d763606..5408029e85d 100644
--- a/protocols/perf/src/server/behaviour.rs
+++ b/protocols/perf/src/server/behaviour.rs
@@ -25,6 +25,7 @@ use std::{
     task::{Context, Poll},
 };
 
+use libp2p_core::transport::PortUse;
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     ConnectionId, FromSwarm, NetworkBehaviour, THandlerInEvent, THandlerOutEvent, ToSwarm,
@@ -71,6 +72,7 @@ impl NetworkBehaviour for Behaviour {
         _peer: PeerId,
         _addr: &libp2p_core::Multiaddr,
         _role_override: libp2p_core::Endpoint,
+        _port_use: PortUse,
     ) -> Result<libp2p_swarm::THandler<Self>, libp2p_swarm::ConnectionDenied> {
         Ok(Handler::default())
     }
diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md
index 7c7d7f3a54f..c0a124333e9 100644
--- a/protocols/ping/CHANGELOG.md
+++ b/protocols/ping/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.45.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.44.2
 
 - Use `web-time` instead of `instant`.
@@ -12,7 +16,6 @@
   `ping::Event` can now be shared between threads.
   See [PR 5250]
 
-
 [PR 5250]: https://github.com/libp2p/rust-libp2p/pull/5250
 
 ## 0.44.0
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 79c0a43aa69..2c347adb2c4 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-ping"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Ping protocol for libp2p"
-version = "0.44.2"
+version = "0.45.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/ping/src/lib.rs b/protocols/ping/src/lib.rs
index 5eaa6d4952a..82f240cab6b 100644
--- a/protocols/ping/src/lib.rs
+++ b/protocols/ping/src/lib.rs
@@ -51,6 +51,7 @@ mod handler;
 mod protocol;
 
 use handler::Handler;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
@@ -124,6 +125,7 @@ impl NetworkBehaviour for Behaviour {
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(Handler::new(self.config.clone()))
     }
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index 8fc18505d35..566e5e258e2 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -86,7 +86,8 @@ mod tests {
     use futures::StreamExt;
     use libp2p_core::{
         multiaddr::multiaddr,
-        transport::{memory::MemoryTransport, ListenerId, Transport},
+        transport::{memory::MemoryTransport, DialOpts, ListenerId, PortUse, Transport},
+        Endpoint,
     };
 
     #[test]
@@ -110,7 +111,13 @@ mod tests {
 
         async_std::task::block_on(async move {
             let c = MemoryTransport::new()
-                .dial(listener_addr)
+                .dial(
+                    listener_addr,
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::Reuse,
+                    },
+                )
                 .unwrap()
                 .await
                 .unwrap();
diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index 97638d1ae6a..fc71ccedad5 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.18.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.17.3
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 4981c94d9c8..1a0e7836158 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-relay"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Communications relaying for libp2p"
-version = "0.17.3"
+version = "0.18.0"
 authors = ["Parity Technologies <admin@parity.io>", "Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/relay/src/behaviour.rs b/protocols/relay/src/behaviour.rs
index cf0e76e3662..463febf9f2f 100644
--- a/protocols/relay/src/behaviour.rs
+++ b/protocols/relay/src/behaviour.rs
@@ -28,6 +28,7 @@ use crate::proto;
 use crate::protocol::{inbound_hop, outbound_stop};
 use either::Either;
 use libp2p_core::multiaddr::Protocol;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{ConnectionClosed, FromSwarm};
@@ -328,6 +329,7 @@ impl NetworkBehaviour for Behaviour {
         _: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         if addr.is_relayed() {
             // Deny all substreams on relayed connection.
@@ -343,6 +345,7 @@ impl NetworkBehaviour for Behaviour {
             ConnectedPoint::Dialer {
                 address: addr.clone(),
                 role_override,
+                port_use,
             },
         )))
     }
diff --git a/protocols/relay/src/priv_client.rs b/protocols/relay/src/priv_client.rs
index e414852ef81..f8d1d9c9eb2 100644
--- a/protocols/relay/src/priv_client.rs
+++ b/protocols/relay/src/priv_client.rs
@@ -34,6 +34,7 @@ use futures::io::{AsyncRead, AsyncWrite};
 use futures::ready;
 use futures::stream::StreamExt;
 use libp2p_core::multiaddr::Protocol;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm};
@@ -178,6 +179,7 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         addr: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         if addr.is_relayed() {
             return Ok(Either::Right(dummy::ConnectionHandler));
diff --git a/protocols/relay/src/priv_client/transport.rs b/protocols/relay/src/priv_client/transport.rs
index b4374aa4672..ec1e8ca5fb8 100644
--- a/protocols/relay/src/priv_client/transport.rs
+++ b/protocols/relay/src/priv_client/transport.rs
@@ -31,7 +31,7 @@ use futures::sink::SinkExt;
 use futures::stream::SelectAll;
 use futures::stream::{Stream, StreamExt};
 use libp2p_core::multiaddr::{Multiaddr, Protocol};
-use libp2p_core::transport::{ListenerId, TransportError, TransportEvent};
+use libp2p_core::transport::{DialOpts, ListenerId, TransportError, TransportEvent};
 use libp2p_identity::PeerId;
 use std::collections::VecDeque;
 use std::pin::Pin;
@@ -49,7 +49,7 @@ use thiserror::Error;
 /// 1. Establish relayed connections by dialing `/p2p-circuit` addresses.
 ///
 ///    ```
-///    # use libp2p_core::{Multiaddr, multiaddr::{Protocol}, Transport};
+///    # use libp2p_core::{Multiaddr, multiaddr::{Protocol}, Transport, transport::{DialOpts, PortUse}, connection::Endpoint};
 ///    # use libp2p_core::transport::memory::MemoryTransport;
 ///    # use libp2p_core::transport::choice::OrTransport;
 ///    # use libp2p_relay as relay;
@@ -66,7 +66,10 @@ use thiserror::Error;
 ///        .with(Protocol::P2p(relay_id.into())) // Relay peer id.
 ///        .with(Protocol::P2pCircuit) // Signal to connect via relay and not directly.
 ///        .with(Protocol::P2p(destination_id.into())); // Destination peer id.
-///    transport.dial(dst_addr_via_relay).unwrap();
+///    transport.dial(dst_addr_via_relay, DialOpts {
+///         port_use: PortUse::Reuse,
+///         role: Endpoint::Dialer,
+///    }).unwrap();
 ///    ```
 ///
 /// 3. Listen for incoming relayed connections via specific relay.
@@ -165,7 +168,19 @@ impl libp2p_core::Transport for Transport {
         }
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        dial_opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
+        if dial_opts.role.is_listener() {
+            // [`Endpoint::Listener`] is used for NAT and firewall
+            // traversal. One would coordinate such traversal via a previously
+            // established relayed connection, but never using a relayed connection
+            // itself.
+            return Err(TransportError::MultiaddrNotSupported(addr));
+        }
+
         let RelayedMultiaddr {
             relay_peer_id,
             relay_addr,
@@ -198,24 +213,6 @@ impl libp2p_core::Transport for Transport {
         .boxed())
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>>
-    where
-        Self: Sized,
-    {
-        // [`Transport::dial_as_listener`] is used for NAT and firewall
-        // traversal. One would coordinate such traversal via a previously
-        // established relayed connection, but never using a relayed connection
-        // itself.
-        Err(TransportError::MultiaddrNotSupported(addr))
-    }
-
-    fn address_translation(&self, _server: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
-        None
-    }
-
     fn poll(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
diff --git a/protocols/rendezvous/CHANGELOG.md b/protocols/rendezvous/CHANGELOG.md
index 4aa18985f1e..1ed9e5bc3b0 100644
--- a/protocols/rendezvous/CHANGELOG.md
+++ b/protocols/rendezvous/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.15.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.14.1
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 6879a4093ce..32b233813e3 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-rendezvous"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Rendezvous protocol for libp2p"
-version = "0.14.1"
+version = "0.15.0"
 authors = ["The COMIT guys <hello@comit.network>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/rendezvous/src/client.rs b/protocols/rendezvous/src/client.rs
index 92d7884758b..a794252ff0b 100644
--- a/protocols/rendezvous/src/client.rs
+++ b/protocols/rendezvous/src/client.rs
@@ -24,6 +24,7 @@ use futures::future::BoxFuture;
 use futures::future::FutureExt;
 use futures::stream::FuturesUnordered;
 use futures::stream::StreamExt;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr, PeerRecord};
 use libp2p_identity::{Keypair, PeerId, SigningError};
 use libp2p_request_response::{OutboundRequestId, ProtocolSupport};
@@ -208,9 +209,15 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
-        self.inner
-            .handle_established_outbound_connection(connection_id, peer, addr, role_override)
+        self.inner.handle_established_outbound_connection(
+            connection_id,
+            peer,
+            addr,
+            role_override,
+            port_use,
+        )
     }
 
     fn on_connection_handler_event(
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index bee91f28e88..45a525d9573 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -24,6 +24,7 @@ use bimap::BiMap;
 use futures::future::BoxFuture;
 use futures::stream::FuturesUnordered;
 use futures::{FutureExt, StreamExt};
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::ProtocolSupport;
@@ -139,9 +140,15 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
-        self.inner
-            .handle_established_outbound_connection(connection_id, peer, addr, role_override)
+        self.inner.handle_established_outbound_connection(
+            connection_id,
+            peer,
+            addr,
+            role_override,
+            port_use,
+        )
     }
 
     fn on_connection_handler_event(
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index beee817f024..db0d9126516 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.27.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.26.4
 
 - Use `web-time` instead of `instant`.
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 4bc2378ae54..af70fd9a83e 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-request-response"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Generic Request/Response Protocols"
-version = "0.26.4"
+version = "0.27.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/request-response/src/lib.rs b/protocols/request-response/src/lib.rs
index 4362b3255ad..e627f5668ff 100644
--- a/protocols/request-response/src/lib.rs
+++ b/protocols/request-response/src/lib.rs
@@ -79,7 +79,7 @@ pub use handler::ProtocolSupport;
 use crate::handler::OutboundMessage;
 use futures::channel::oneshot;
 use handler::Handler;
-use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     behaviour::{AddressChange, ConnectionClosed, DialFailure, FromSwarm},
@@ -772,6 +772,7 @@ where
         peer: PeerId,
         remote_address: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         let mut handler = Handler::new(
             self.inbound_protocols.clone(),
diff --git a/protocols/stream/CHANGELOG.md b/protocols/stream/CHANGELOG.md
index 1e3b85da0b9..2532970d3c6 100644
--- a/protocols/stream/CHANGELOG.md
+++ b/protocols/stream/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0-alpha
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.1.0-alpha.1
 - Implement Error for `OpenStreamError`.
   See [PR 5169](https://github.com/libp2p/rust-libp2p/pull/5169).
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index a8d88399c0b..9aa9559a2d6 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-stream"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha"
 edition = "2021"
 rust-version.workspace = true
 description = "Generic stream protocols for libp2p"
diff --git a/protocols/stream/src/behaviour.rs b/protocols/stream/src/behaviour.rs
index e02aca884b7..07549ccef54 100644
--- a/protocols/stream/src/behaviour.rs
+++ b/protocols/stream/src/behaviour.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use futures::{channel::mpsc, StreamExt};
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     self as swarm, dial_opts::DialOpts, ConnectionDenied, ConnectionId, FromSwarm,
@@ -82,6 +82,7 @@ impl NetworkBehaviour for Behaviour {
         peer: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(Handler::new(
             peer,
diff --git a/protocols/upnp/CHANGELOG.md b/protocols/upnp/CHANGELOG.md
index 9472c7153c6..21e90f9534b 100644
--- a/protocols/upnp/CHANGELOG.md
+++ b/protocols/upnp/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.2.2
 - Fix a panic caused when `upnp::Gateway` is dropped and its events queue receiver is no longer
 available.
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 944b3323842..50ed9db0f6f 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-upnp"
 edition = "2021"
 rust-version = "1.60.0"
 description = "UPnP support for libp2p transports"
-version = "0.2.2"
+version = "0.3.0"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/protocols/upnp/src/behaviour.rs b/protocols/upnp/src/behaviour.rs
index a94ef9526dd..29a7fbf84a4 100644
--- a/protocols/upnp/src/behaviour.rs
+++ b/protocols/upnp/src/behaviour.rs
@@ -36,7 +36,11 @@ use crate::tokio::{is_addr_global, Gateway};
 use futures::{channel::oneshot, Future, StreamExt};
 use futures_timer::Delay;
 use igd_next::PortMappingProtocol;
-use libp2p_core::{multiaddr, transport::ListenerId, Endpoint, Multiaddr};
+use libp2p_core::{
+    multiaddr,
+    transport::{ListenerId, PortUse},
+    Endpoint, Multiaddr,
+};
 use libp2p_swarm::{
     derive_prelude::PeerId, dummy, ConnectionDenied, ConnectionId, ExpiredListenAddr, FromSwarm,
     NetworkBehaviour, NewListenAddr, ToSwarm,
@@ -248,6 +252,7 @@ impl NetworkBehaviour for Behaviour {
         _peer: PeerId,
         _addr: &Multiaddr,
         _role_override: Endpoint,
+        _port_use: PortUse,
     ) -> Result<libp2p_swarm::THandler<Self>, libp2p_swarm::ConnectionDenied> {
         Ok(dummy::ConnectionHandler)
     }
diff --git a/swarm-derive/src/lib.rs b/swarm-derive/src/lib.rs
index 2e7daf7acc4..258c0b976c8 100644
--- a/swarm-derive/src/lib.rs
+++ b/swarm-derive/src/lib.rs
@@ -76,6 +76,7 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
     let t_handler_out_event = quote! { #prelude_path::THandlerOutEvent };
     let endpoint = quote! { #prelude_path::Endpoint };
     let connection_denied = quote! { #prelude_path::ConnectionDenied };
+    let port_use = quote! { #prelude_path::PortUse };
 
     // Build the generics.
     let impl_generics = {
@@ -346,7 +347,7 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
             };
 
             let builder = quote! {
-                #field_name.handle_established_outbound_connection(connection_id, peer, addr, role_override)?
+                #field_name.handle_established_outbound_connection(connection_id, peer, addr, role_override, port_use)?
             };
 
             match out_handler {
@@ -460,6 +461,7 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> syn::Result<Toke
                 peer: #peer_id,
                 addr: &#multiaddr,
                 role_override: #endpoint,
+                port_use: #port_use,
             ) -> Result<#t_handler<Self>, #connection_denied> {
                 Ok(#handle_established_outbound_connection)
             }
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index f4901947b8b..9aeaa5a1ccc 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,6 +1,14 @@
 
 ## 0.45.0
 
+- Implement refactored `Transport`.
+  See [PR 4568]
+- Move `address_translation` into swarm and into `libp2p-identify`.
+  See [PR 4568]
+
+[PR 4568]: https://github.com/libp2p/rust-libp2p/pull/4568
+
+## 0.44.3
 - Optimize internal connection `fn poll`. New implementation now scales much better with number of listen protocols active.
   No changes to public API introduced.
   See [PR 5026](https://github.com/libp2p/rust-libp2p/pull/5026)
diff --git a/swarm/benches/connection_handler.rs b/swarm/benches/connection_handler.rs
index b9986d9649f..09340421f83 100644
--- a/swarm/benches/connection_handler.rs
+++ b/swarm/benches/connection_handler.rs
@@ -223,6 +223,7 @@ impl NetworkBehaviour for SpinningBehaviour {
         _peer: libp2p_identity::PeerId,
         _addr: &libp2p_core::Multiaddr,
         _role_override: libp2p_core::Endpoint,
+        _port_use: libp2p_core::transport::PortUse,
     ) -> Result<libp2p_swarm::THandler<Self>, libp2p_swarm::ConnectionDenied> {
         Ok(SpinningHandler {
             iter_count: self.iter_count,
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
index 8a8418739c8..35aed12fba5 100644
--- a/swarm/src/behaviour.rs
+++ b/swarm/src/behaviour.rs
@@ -35,7 +35,10 @@ use crate::{
     ConnectionDenied, ConnectionError, ConnectionHandler, DialError, ListenError, THandler,
     THandlerInEvent, THandlerOutEvent,
 };
-use libp2p_core::{transport::ListenerId, ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{
+    transport::{ListenerId, PortUse},
+    ConnectedPoint, Endpoint, Multiaddr,
+};
 use libp2p_identity::PeerId;
 use std::{task::Context, task::Poll};
 
@@ -196,6 +199,7 @@ pub trait NetworkBehaviour: 'static {
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied>;
 
     /// Informs the behaviour about an event from the [`Swarm`](crate::Swarm).
diff --git a/swarm/src/behaviour/either.rs b/swarm/src/behaviour/either.rs
index 25da83fa11f..7a51303e74d 100644
--- a/swarm/src/behaviour/either.rs
+++ b/swarm/src/behaviour/either.rs
@@ -22,6 +22,7 @@ use crate::behaviour::{self, NetworkBehaviour, ToSwarm};
 use crate::connection::ConnectionId;
 use crate::{ConnectionDenied, THandler, THandlerInEvent, THandlerOutEvent};
 use either::Either;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use std::{task::Context, task::Poll};
@@ -103,6 +104,7 @@ where
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         let handler = match self {
             Either::Left(inner) => Either::Left(inner.handle_established_outbound_connection(
@@ -110,12 +112,14 @@ where
                 peer,
                 addr,
                 role_override,
+                port_use,
             )?),
             Either::Right(inner) => Either::Right(inner.handle_established_outbound_connection(
                 connection_id,
                 peer,
                 addr,
                 role_override,
+                port_use,
             )?),
         };
 
diff --git a/swarm/src/behaviour/toggle.rs b/swarm/src/behaviour/toggle.rs
index e81c5343701..398c919ae86 100644
--- a/swarm/src/behaviour/toggle.rs
+++ b/swarm/src/behaviour/toggle.rs
@@ -30,6 +30,7 @@ use crate::{
 };
 use either::Either;
 use futures::future;
+use libp2p_core::transport::PortUse;
 use libp2p_core::{upgrade::DeniedUpgrade, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use std::{task::Context, task::Poll};
@@ -139,6 +140,7 @@ where
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         let inner = match self.inner.as_mut() {
             None => return Ok(ToggleConnectionHandler { inner: None }),
@@ -150,6 +152,7 @@ where
             peer,
             addr,
             role_override,
+            port_use,
         )?;
 
         Ok(ToggleConnectionHandler {
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 9c5e39830ed..603a5b0d7c4 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -27,6 +27,7 @@ pub use error::ConnectionError;
 pub(crate) use error::{
     PendingConnectionError, PendingInboundConnectionError, PendingOutboundConnectionError,
 };
+use libp2p_core::transport::PortUse;
 pub use supported_protocols::SupportedProtocols;
 
 use crate::handler::{
@@ -1352,6 +1353,7 @@ enum PendingPoint {
     Dialer {
         /// Same as [`ConnectedPoint::Dialer`] `role_override`.
         role_override: Endpoint,
+        port_use: PortUse,
     },
     /// The socket comes from a listener.
     Listener {
@@ -1365,7 +1367,14 @@ enum PendingPoint {
 impl From<ConnectedPoint> for PendingPoint {
     fn from(endpoint: ConnectedPoint) -> Self {
         match endpoint {
-            ConnectedPoint::Dialer { role_override, .. } => PendingPoint::Dialer { role_override },
+            ConnectedPoint::Dialer {
+                role_override,
+                port_use,
+                ..
+            } => PendingPoint::Dialer {
+                role_override,
+                port_use,
+            },
             ConnectedPoint::Listener {
                 local_addr,
                 send_back_addr,
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index 48ba92f1020..07f6968dec9 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -39,6 +39,7 @@ use futures::{
 };
 use libp2p_core::connection::Endpoint;
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
+use libp2p_core::transport::PortUse;
 use std::task::Waker;
 use std::{
     collections::HashMap,
@@ -424,6 +425,7 @@ where
         >,
         peer: Option<PeerId>,
         role_override: Endpoint,
+        port_use: PortUse,
         dial_concurrency_factor_override: Option<NonZeroU8>,
         connection_id: ConnectionId,
     ) {
@@ -444,7 +446,10 @@ where
             .instrument(span),
         );
 
-        let endpoint = PendingPoint::Dialer { role_override };
+        let endpoint = PendingPoint::Dialer {
+            role_override,
+            port_use,
+        };
 
         self.counters.inc_pending(&endpoint);
         self.pending.insert(
@@ -650,10 +655,17 @@ where
                     self.counters.dec_pending(&endpoint);
 
                     let (endpoint, concurrent_dial_errors) = match (endpoint, outgoing) {
-                        (PendingPoint::Dialer { role_override }, Some((address, errors))) => (
+                        (
+                            PendingPoint::Dialer {
+                                role_override,
+                                port_use,
+                            },
+                            Some((address, errors)),
+                        ) => (
                             ConnectedPoint::Dialer {
                                 address,
                                 role_override,
+                                port_use,
                             },
                             Some(errors),
                         ),
diff --git a/swarm/src/dial_opts.rs b/swarm/src/dial_opts.rs
index 4442d913847..4f5b621327c 100644
--- a/swarm/src/dial_opts.rs
+++ b/swarm/src/dial_opts.rs
@@ -22,10 +22,38 @@
 use crate::ConnectionId;
 use libp2p_core::connection::Endpoint;
 use libp2p_core::multiaddr::Protocol;
+use libp2p_core::transport::PortUse;
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use std::num::NonZeroU8;
 
+macro_rules! fn_override_role {
+    () => {
+        /// Override role of local node on connection. I.e. execute the dial _as a
+        /// listener_.
+        ///
+        /// See
+        /// [`ConnectedPoint::Dialer`](libp2p_core::connection::ConnectedPoint::Dialer)
+        /// for details.
+        pub fn override_role(mut self) -> Self {
+            self.role_override = Endpoint::Listener;
+            self
+        }
+    };
+}
+
+macro_rules! fn_allocate_new_port {
+    () => {
+        /// Enforce the allocation of a new port.
+        /// Default behaviour is best effort reuse of existing ports. If there is no existing
+        /// fitting listener, a new port is allocated.
+        pub fn allocate_new_port(mut self) -> Self {
+            self.port_use = PortUse::New;
+            self
+        }
+    };
+}
+
 /// Options to configure a dial to a known or unknown peer.
 ///
 /// Used in [`Swarm::dial`](crate::Swarm::dial) and
@@ -45,6 +73,7 @@ pub struct DialOpts {
     role_override: Endpoint,
     dial_concurrency_factor_override: Option<NonZeroU8>,
     connection_id: ConnectionId,
+    port_use: PortUse,
 }
 
 impl DialOpts {
@@ -65,6 +94,7 @@ impl DialOpts {
             condition: Default::default(),
             role_override: Endpoint::Dialer,
             dial_concurrency_factor_override: Default::default(),
+            port_use: PortUse::Reuse,
         }
     }
 
@@ -124,6 +154,10 @@ impl DialOpts {
     pub(crate) fn role_override(&self) -> Endpoint {
         self.role_override
     }
+
+    pub(crate) fn port_use(&self) -> PortUse {
+        self.port_use
+    }
 }
 
 impl From<Multiaddr> for DialOpts {
@@ -144,6 +178,7 @@ pub struct WithPeerId {
     condition: PeerCondition,
     role_override: Endpoint,
     dial_concurrency_factor_override: Option<NonZeroU8>,
+    port_use: PortUse,
 }
 
 impl WithPeerId {
@@ -169,19 +204,12 @@ impl WithPeerId {
             extend_addresses_through_behaviour: false,
             role_override: self.role_override,
             dial_concurrency_factor_override: self.dial_concurrency_factor_override,
+            port_use: self.port_use,
         }
     }
 
-    /// Override role of local node on connection. I.e. execute the dial _as a
-    /// listener_.
-    ///
-    /// See
-    /// [`ConnectedPoint::Dialer`](libp2p_core::connection::ConnectedPoint::Dialer)
-    /// for details.
-    pub fn override_role(mut self) -> Self {
-        self.role_override = Endpoint::Listener;
-        self
-    }
+    fn_override_role!();
+    fn_allocate_new_port!();
 
     /// Build the final [`DialOpts`].
     pub fn build(self) -> DialOpts {
@@ -193,6 +221,7 @@ impl WithPeerId {
             role_override: self.role_override,
             dial_concurrency_factor_override: self.dial_concurrency_factor_override,
             connection_id: ConnectionId::next(),
+            port_use: self.port_use,
         }
     }
 }
@@ -205,6 +234,7 @@ pub struct WithPeerIdWithAddresses {
     extend_addresses_through_behaviour: bool,
     role_override: Endpoint,
     dial_concurrency_factor_override: Option<NonZeroU8>,
+    port_use: PortUse,
 }
 
 impl WithPeerIdWithAddresses {
@@ -221,16 +251,8 @@ impl WithPeerIdWithAddresses {
         self
     }
 
-    /// Override role of local node on connection. I.e. execute the dial _as a
-    /// listener_.
-    ///
-    /// See
-    /// [`ConnectedPoint::Dialer`](libp2p_core::connection::ConnectedPoint::Dialer)
-    /// for details.
-    pub fn override_role(mut self) -> Self {
-        self.role_override = Endpoint::Listener;
-        self
-    }
+    fn_override_role!();
+    fn_allocate_new_port!();
 
     /// Override
     /// Number of addresses concurrently dialed for a single outbound connection attempt.
@@ -249,6 +271,7 @@ impl WithPeerIdWithAddresses {
             role_override: self.role_override,
             dial_concurrency_factor_override: self.dial_concurrency_factor_override,
             connection_id: ConnectionId::next(),
+            port_use: self.port_use,
         }
     }
 }
@@ -262,6 +285,7 @@ impl WithoutPeerId {
         WithoutPeerIdWithAddress {
             address,
             role_override: Endpoint::Dialer,
+            port_use: PortUse::Reuse,
         }
     }
 }
@@ -270,19 +294,13 @@ impl WithoutPeerId {
 pub struct WithoutPeerIdWithAddress {
     address: Multiaddr,
     role_override: Endpoint,
+    port_use: PortUse,
 }
 
 impl WithoutPeerIdWithAddress {
-    /// Override role of local node on connection. I.e. execute the dial _as a
-    /// listener_.
-    ///
-    /// See
-    /// [`ConnectedPoint::Dialer`](libp2p_core::connection::ConnectedPoint::Dialer)
-    /// for details.
-    pub fn override_role(mut self) -> Self {
-        self.role_override = Endpoint::Listener;
-        self
-    }
+    fn_override_role!();
+    fn_allocate_new_port!();
+
     /// Build the final [`DialOpts`].
     pub fn build(self) -> DialOpts {
         DialOpts {
@@ -293,6 +311,7 @@ impl WithoutPeerIdWithAddress {
             role_override: self.role_override,
             dial_concurrency_factor_override: None,
             connection_id: ConnectionId::next(),
+            port_use: self.port_use,
         }
     }
 }
diff --git a/swarm/src/dummy.rs b/swarm/src/dummy.rs
index 86df676443b..6e1b4d56eb9 100644
--- a/swarm/src/dummy.rs
+++ b/swarm/src/dummy.rs
@@ -7,6 +7,7 @@ use crate::{
     ConnectionDenied, ConnectionHandlerEvent, StreamUpgradeError, SubstreamProtocol, THandler,
     THandlerInEvent, THandlerOutEvent,
 };
+use libp2p_core::transport::PortUse;
 use libp2p_core::upgrade::DeniedUpgrade;
 use libp2p_core::Endpoint;
 use libp2p_core::Multiaddr;
@@ -37,6 +38,7 @@ impl NetworkBehaviour for Behaviour {
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(ConnectionHandler)
     }
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 03e30240771..81b1ca1a68d 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -68,6 +68,7 @@ pub mod dial_opts;
 pub mod dummy;
 pub mod handler;
 mod listen_opts;
+mod translation;
 
 /// Bundles all symbols required for the [`libp2p_swarm_derive::NetworkBehaviour`] macro.
 #[doc(hidden)]
@@ -99,7 +100,7 @@ pub mod derive_prelude {
     pub use crate::ToSwarm;
     pub use either::Either;
     pub use futures::prelude as futures;
-    pub use libp2p_core::transport::ListenerId;
+    pub use libp2p_core::transport::{ListenerId, PortUse};
     pub use libp2p_core::ConnectedPoint;
     pub use libp2p_core::Endpoint;
     pub use libp2p_core::Multiaddr;
@@ -134,13 +135,15 @@ use connection::{
 };
 use dial_opts::{DialOpts, PeerCondition};
 use futures::{prelude::*, stream::FusedStream};
+
 use libp2p_core::{
     connection::ConnectedPoint,
     muxing::StreamMuxerBox,
     transport::{self, ListenerId, TransportError, TransportEvent},
-    Endpoint, Multiaddr, Transport,
+    Multiaddr, Transport,
 };
 use libp2p_identity::PeerId;
+
 use smallvec::SmallVec;
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::num::{NonZeroU32, NonZeroU8, NonZeroUsize};
@@ -151,6 +154,8 @@ use std::{
     task::{Context, Poll},
 };
 use tracing::Instrument;
+#[doc(hidden)]
+pub use translation::_address_translation;
 
 /// Event generated by the [`NetworkBehaviour`] that the swarm will report back.
 type TBehaviourOutEvent<TBehaviour> = <TBehaviour as NetworkBehaviour>::ToSwarm;
@@ -528,18 +533,15 @@ where
             .into_iter()
             .map(|a| match peer_id.map_or(Ok(a.clone()), |p| a.with_p2p(p)) {
                 Ok(address) => {
-                    let (dial, span) = match dial_opts.role_override() {
-                        Endpoint::Dialer => (
-                            self.transport.dial(address.clone()),
-                            tracing::debug_span!(parent: tracing::Span::none(), "Transport::dial", %address),
-                        ),
-                        Endpoint::Listener => (
-                            self.transport.dial_as_listener(address.clone()),
-                            tracing::debug_span!(parent: tracing::Span::none(), "Transport::dial_as_listener", %address),
-                        ),
-                    };
+                    let dial = self.transport.dial(
+                        address.clone(),
+                        transport::DialOpts {
+                            role: dial_opts.role_override(),
+                            port_use: dial_opts.port_use(),
+                        },
+                    );
+                    let span = tracing::debug_span!(parent: tracing::Span::none(), "Transport::dial", %address);
                     span.follows_from(tracing::Span::current());
-
                     match dial {
                         Ok(fut) => fut
                             .map(|r| (address, r.map_err(TransportError::Other)))
@@ -560,6 +562,7 @@ where
             dials,
             peer_id,
             dial_opts.role_override(),
+            dial_opts.port_use(),
             dial_opts.dial_concurrency_override(),
             connection_id,
         );
@@ -706,12 +709,14 @@ where
                     ConnectedPoint::Dialer {
                         address,
                         role_override,
+                        port_use,
                     } => {
                         match self.behaviour.handle_established_outbound_connection(
                             id,
                             peer_id,
                             &address,
                             role_override,
+                            port_use,
                         ) {
                             Ok(handler) => handler,
                             Err(cause) => {
@@ -1135,40 +1140,12 @@ where
                 self.pending_handler_event = Some((peer_id, handler, event));
             }
             ToSwarm::NewExternalAddrCandidate(addr) => {
-                // Apply address translation to the candidate address.
-                // For TCP without port-reuse, the observed address contains an ephemeral port which needs to be replaced by the port of a listen address.
-                let translated_addresses = {
-                    let mut addrs: Vec<_> = self
-                        .listened_addrs
-                        .values()
-                        .flatten()
-                        .filter_map(|server| self.transport.address_translation(server, &addr))
-                        .collect();
-
-                    // remove duplicates
-                    addrs.sort_unstable();
-                    addrs.dedup();
-                    addrs
-                };
-
-                // If address translation yielded nothing, broadcast the original candidate address.
-                if translated_addresses.is_empty() {
-                    self.behaviour
-                        .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
-                            NewExternalAddrCandidate { addr: &addr },
-                        ));
-                    self.pending_swarm_events
-                        .push_back(SwarmEvent::NewExternalAddrCandidate { address: addr });
-                } else {
-                    for addr in translated_addresses {
-                        self.behaviour
-                            .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
-                                NewExternalAddrCandidate { addr: &addr },
-                            ));
-                        self.pending_swarm_events
-                            .push_back(SwarmEvent::NewExternalAddrCandidate { address: addr });
-                    }
-                }
+                self.behaviour
+                    .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
+                        NewExternalAddrCandidate { addr: &addr },
+                    ));
+                self.pending_swarm_events
+                    .push_back(SwarmEvent::NewExternalAddrCandidate { address: addr });
             }
             ToSwarm::ExternalAddrConfirmed(addr) => {
                 self.add_external_address(addr.clone());
@@ -1784,7 +1761,9 @@ mod tests {
     use crate::test::{CallTraceBehaviour, MockBehaviour};
     use libp2p_core::multiaddr::multiaddr;
     use libp2p_core::transport::memory::MemoryTransportError;
-    use libp2p_core::{multiaddr, upgrade};
+    use libp2p_core::transport::{PortUse, TransportEvent};
+    use libp2p_core::Endpoint;
+    use libp2p_core::{multiaddr, transport, upgrade};
     use libp2p_identity as identity;
     use libp2p_plaintext as plaintext;
     use libp2p_yamux as yamux;
@@ -2179,6 +2158,7 @@ mod tests {
                     ConnectedPoint::Dialer {
                         address: other_addr,
                         role_override: Endpoint::Dialer,
+                        port_use: PortUse::Reuse,
                     }
                 );
             }
diff --git a/swarm/src/test.rs b/swarm/src/test.rs
index d49b504392a..a6cb7c4d4eb 100644
--- a/swarm/src/test.rs
+++ b/swarm/src/test.rs
@@ -26,6 +26,7 @@ use crate::{
     ConnectionDenied, ConnectionHandler, ConnectionId, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
+use libp2p_core::transport::PortUse;
 use libp2p_core::{multiaddr::Multiaddr, transport::ListenerId, ConnectedPoint, Endpoint};
 use libp2p_identity::PeerId;
 use std::collections::HashMap;
@@ -91,6 +92,7 @@ where
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler, ConnectionDenied> {
         Ok(self.handler_proto.clone())
     }
@@ -427,6 +429,7 @@ where
         peer: PeerId,
         addr: &Multiaddr,
         role_override: Endpoint,
+        port_use: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         self.handle_established_outbound_connection.push((
             peer,
@@ -434,8 +437,13 @@ where
             role_override,
             connection_id,
         ));
-        self.inner
-            .handle_established_outbound_connection(connection_id, peer, addr, role_override)
+        self.inner.handle_established_outbound_connection(
+            connection_id,
+            peer,
+            addr,
+            role_override,
+            port_use,
+        )
     }
 
     fn on_swarm_event(&mut self, event: FromSwarm) {
diff --git a/core/src/translation.rs b/swarm/src/translation.rs
similarity index 95%
rename from core/src/translation.rs
rename to swarm/src/translation.rs
index efddae31052..baa80c907b5 100644
--- a/core/src/translation.rs
+++ b/swarm/src/translation.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use multiaddr::{Multiaddr, Protocol};
+use libp2p_core::{multiaddr::Protocol, Multiaddr};
 
 /// Perform IP address translation.
 ///
@@ -35,7 +35,8 @@ use multiaddr::{Multiaddr, Protocol};
 /// address and vice versa.
 ///
 /// If the first [`Protocol`]s are not IP addresses, `None` is returned instead.
-pub fn address_translation(original: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
+#[doc(hidden)]
+pub fn _address_translation(original: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
     original.replace(0, move |proto| match proto {
         Protocol::Ip4(_)
         | Protocol::Ip6(_)
@@ -106,7 +107,7 @@ mod tests {
 
         for test in tests.iter() {
             assert_eq!(
-                address_translation(&test.original, &test.observed),
+                _address_translation(&test.original, &test.observed),
                 Some(test.expected.clone())
             );
         }
diff --git a/swarm/tests/connection_close.rs b/swarm/tests/connection_close.rs
index 4efe8d17e49..4d530f47684 100644
--- a/swarm/tests/connection_close.rs
+++ b/swarm/tests/connection_close.rs
@@ -1,3 +1,4 @@
+use libp2p_core::transport::PortUse;
 use libp2p_core::upgrade::DeniedUpgrade;
 use libp2p_core::{Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
@@ -66,6 +67,7 @@ impl NetworkBehaviour for Behaviour {
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(HandlerWithState {
             precious_state: self.state,
diff --git a/swarm/tests/listener.rs b/swarm/tests/listener.rs
index 8d22acc90e2..160b1f5b064 100644
--- a/swarm/tests/listener.rs
+++ b/swarm/tests/listener.rs
@@ -3,7 +3,11 @@ use std::{
     task::{Context, Poll},
 };
 
-use libp2p_core::{multiaddr::Protocol, transport::ListenerId, Endpoint, Multiaddr};
+use libp2p_core::{
+    multiaddr::Protocol,
+    transport::{ListenerId, PortUse},
+    Endpoint, Multiaddr,
+};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     derive_prelude::NewListener, dummy, ConnectionDenied, ConnectionId, FromSwarm, ListenOpts,
@@ -93,6 +97,7 @@ impl NetworkBehaviour for Behaviour {
         _: PeerId,
         _: &Multiaddr,
         _: Endpoint,
+        _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
         Ok(dummy::ConnectionHandler)
     }
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 12f0d0a5ba8..919ed0cab7f 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -19,7 +19,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures::StreamExt;
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identify as identify;
 use libp2p_ping as ping;
 use libp2p_swarm::{
@@ -404,6 +404,7 @@ fn with_generics_constrained() {
             _: libp2p_identity::PeerId,
             _: &Multiaddr,
             _: Endpoint,
+            _: PortUse,
         ) -> Result<THandler<Self>, ConnectionDenied> {
             Ok(dummy::ConnectionHandler)
         }
@@ -565,6 +566,7 @@ fn custom_out_event_no_type_parameters() {
             _: PeerId,
             _: &Multiaddr,
             _: Endpoint,
+            _: PortUse,
         ) -> Result<THandler<Self>, ConnectionDenied> {
             Ok(dummy::ConnectionHandler)
         }
diff --git a/transports/dns/CHANGELOG.md b/transports/dns/CHANGELOG.md
index 91cfbc00883..e4f951f157f 100644
--- a/transports/dns/CHANGELOG.md
+++ b/transports/dns/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.42.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.41.1
 
 - Add hidden API that removes unnecessary async for `async-std`.
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 1e50ad444b8..b728509364a 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-dns"
 edition = "2021"
 rust-version = { workspace = true }
 description = "DNS transport implementation for libp2p"
-version = "0.41.1"
+version = "0.42.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index 63bd9bbad26..7d92cc8ecfc 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -149,9 +149,8 @@ pub mod tokio {
 use async_trait::async_trait;
 use futures::{future::BoxFuture, prelude::*};
 use libp2p_core::{
-    connection::Endpoint,
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
 };
 use parking_lot::Mutex;
 use smallvec::SmallVec;
@@ -231,19 +230,12 @@ where
         self.inner.lock().remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        Ok(self.do_dial(addr, Endpoint::Dialer))
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        dial_opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        Ok(self.do_dial(addr, Endpoint::Listener))
-    }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.inner.lock().address_translation(server, observed)
+        Ok(self.do_dial(addr, dial_opts))
     }
 
     fn poll(
@@ -269,7 +261,7 @@ where
     fn do_dial(
         &mut self,
         addr: Multiaddr,
-        role_override: Endpoint,
+        dial_opts: DialOpts,
     ) -> <Self as libp2p_core::Transport>::Dial {
         let resolver = self.resolver.clone();
         let inner = self.inner.clone();
@@ -355,10 +347,7 @@ where
                     tracing::debug!(address=%addr, "Dialing address");
 
                     let transport = inner.clone();
-                    let dial = match role_override {
-                        Endpoint::Dialer => transport.lock().dial(addr),
-                        Endpoint::Listener => transport.lock().dial_as_listener(addr),
-                    };
+                    let dial = transport.lock().dial(addr, dial_opts);
                     let result = match dial {
                         Ok(out) => {
                             // We only count attempts that the inner transport
@@ -625,7 +614,12 @@ where
 #[cfg(all(test, any(feature = "tokio", feature = "async-std")))]
 mod tests {
     use super::*;
-    use libp2p_core::Transport;
+    use futures::future::BoxFuture;
+    use libp2p_core::{
+        multiaddr::{Multiaddr, Protocol},
+        transport::{PortUse, TransportError, TransportEvent},
+        Endpoint, Transport,
+    };
     use libp2p_identity::PeerId;
 
     #[test]
@@ -655,7 +649,11 @@ mod tests {
                 false
             }
 
-            fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+            fn dial(
+                &mut self,
+                addr: Multiaddr,
+                _: DialOpts,
+            ) -> Result<Self::Dial, TransportError<Self::Error>> {
                 // Check that all DNS components have been resolved, i.e. replaced.
                 assert!(!addr.iter().any(|p| matches!(
                     p,
@@ -664,17 +662,6 @@ mod tests {
                 Ok(Box::pin(future::ready(Ok(()))))
             }
 
-            fn dial_as_listener(
-                &mut self,
-                addr: Multiaddr,
-            ) -> Result<Self::Dial, TransportError<Self::Error>> {
-                self.dial(addr)
-            }
-
-            fn address_translation(&self, _: &Multiaddr, _: &Multiaddr) -> Option<Multiaddr> {
-                None
-            }
-
             fn poll(
                 self: Pin<&mut Self>,
                 _: &mut Context<'_>,
@@ -690,30 +677,34 @@ mod tests {
             T::Dial: Send,
             R: Clone + Send + Sync + Resolver + 'static,
         {
+            let dial_opts = DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            };
             // Success due to existing A record for example.com.
             let _ = transport
-                .dial("/dns4/example.com/tcp/20000".parse().unwrap())
+                .dial("/dns4/example.com/tcp/20000".parse().unwrap(), dial_opts)
                 .unwrap()
                 .await
                 .unwrap();
 
             // Success due to existing AAAA record for example.com.
             let _ = transport
-                .dial("/dns6/example.com/tcp/20000".parse().unwrap())
+                .dial("/dns6/example.com/tcp/20000".parse().unwrap(), dial_opts)
                 .unwrap()
                 .await
                 .unwrap();
 
             // Success due to pass-through, i.e. nothing to resolve.
             let _ = transport
-                .dial("/ip4/1.2.3.4/tcp/20000".parse().unwrap())
+                .dial("/ip4/1.2.3.4/tcp/20000".parse().unwrap(), dial_opts)
                 .unwrap()
                 .await
                 .unwrap();
 
             // Success due to the DNS TXT records at _dnsaddr.bootstrap.libp2p.io.
             let _ = transport
-                .dial("/dnsaddr/bootstrap.libp2p.io".parse().unwrap())
+                .dial("/dnsaddr/bootstrap.libp2p.io".parse().unwrap(), dial_opts)
                 .unwrap()
                 .await
                 .unwrap();
@@ -722,7 +713,7 @@ mod tests {
             // an entry with suffix `/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`,
             // i.e. a bootnode with such a peer ID.
             let _ = transport
-                .dial("/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN".parse().unwrap())
+                .dial("/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN".parse().unwrap(), dial_opts)
                 .unwrap()
                 .await
                 .unwrap();
@@ -734,6 +725,7 @@ mod tests {
                     format!("/dnsaddr/bootstrap.libp2p.io/p2p/{}", PeerId::random())
                         .parse()
                         .unwrap(),
+                    dial_opts,
                 )
                 .unwrap()
                 .await
@@ -745,7 +737,10 @@ mod tests {
 
             // Failure due to no records.
             match transport
-                .dial("/dns4/example.invalid/tcp/20000".parse().unwrap())
+                .dial(
+                    "/dns4/example.invalid/tcp/20000".parse().unwrap(),
+                    dial_opts,
+                )
                 .unwrap()
                 .await
             {
diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md
index 3ec52ec0ddb..2593af605df 100644
--- a/transports/quic/CHANGELOG.md
+++ b/transports/quic/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.11.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.10.3
 
 - Update `quinn` to 0.11 and `libp2p-tls` to 0.4.0.
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index c7e031b1cfd..d2d8c6fc2b0 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-quic"
-version = "0.10.3"
+version = "0.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 rust-version = { workspace = true }
diff --git a/transports/quic/src/transport.rs b/transports/quic/src/transport.rs
index 9bd4c035cec..057d0f978d7 100644
--- a/transports/quic/src/transport.rs
+++ b/transports/quic/src/transport.rs
@@ -31,6 +31,8 @@ use futures::{prelude::*, stream::SelectAll};
 
 use if_watch::IfEvent;
 
+use libp2p_core::transport::{DialOpts, PortUse};
+use libp2p_core::Endpoint;
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
     transport::{ListenerId, TransportError, TransportEvent},
@@ -195,6 +197,21 @@ impl<P: Provider> GenTransport<P> {
 
         Ok(socket.into())
     }
+
+    fn bound_socket(&mut self, socket_addr: SocketAddr) -> Result<quinn::Endpoint, Error> {
+        let socket_family = socket_addr.ip().into();
+        if let Some(waker) = self.waker.take() {
+            waker.wake();
+        }
+        let listen_socket_addr = match socket_family {
+            SocketFamily::Ipv4 => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
+            SocketFamily::Ipv6 => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
+        };
+        let socket = UdpSocket::bind(listen_socket_addr)?;
+        let endpoint_config = self.quinn_config.endpoint_config.clone();
+        let endpoint = Self::new_endpoint(endpoint_config, None, socket)?;
+        Ok(endpoint)
+    }
 }
 
 impl<P: Provider> Transport for GenTransport<P> {
@@ -247,119 +264,110 @@ impl<P: Provider> Transport for GenTransport<P> {
         }
     }
 
-    fn address_translation(&self, listen: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        if !is_quic_addr(listen, self.support_draft_29)
-            || !is_quic_addr(observed, self.support_draft_29)
-        {
-            return None;
-        }
-        Some(observed.clone())
-    }
-
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let (socket_addr, version, _peer_id) = self.remote_multiaddr_to_socketaddr(addr, true)?;
-
-        let endpoint = match self.eligible_listener(&socket_addr) {
-            None => {
-                // No listener. Get or create an explicit dialer.
-                let socket_family = socket_addr.ip().into();
-                let dialer = match self.dialer.entry(socket_family) {
-                    Entry::Occupied(occupied) => occupied.get().clone(),
-                    Entry::Vacant(vacant) => {
-                        if let Some(waker) = self.waker.take() {
-                            waker.wake();
-                        }
-                        let listen_socket_addr = match socket_family {
-                            SocketFamily::Ipv4 => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
-                            SocketFamily::Ipv6 => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
-                        };
-                        let socket =
-                            UdpSocket::bind(listen_socket_addr).map_err(Self::Error::from)?;
-                        let endpoint_config = self.quinn_config.endpoint_config.clone();
-                        let endpoint = Self::new_endpoint(endpoint_config, None, socket)?;
-
-                        vacant.insert(endpoint.clone());
-                        endpoint
-                    }
-                };
-                dialer
-            }
-            Some(listener) => listener.endpoint.clone(),
-        };
-        let handshake_timeout = self.handshake_timeout;
-        let mut client_config = self.quinn_config.client_config.clone();
-        if version == ProtocolVersion::Draft29 {
-            client_config.version(0xff00_001d);
-        }
-        Ok(Box::pin(async move {
-            // This `"l"` seems necessary because an empty string is an invalid domain
-            // name. While we don't use domain names, the underlying rustls library
-            // is based upon the assumption that we do.
-            let connecting = endpoint
-                .connect_with(client_config, socket_addr, "l")
-                .map_err(ConnectError)?;
-            Connecting::new(connecting, handshake_timeout).await
-        }))
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        dial_opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        let (socket_addr, _version, peer_id) =
+        let (socket_addr, version, peer_id) =
             self.remote_multiaddr_to_socketaddr(addr.clone(), true)?;
-        let peer_id = peer_id.ok_or(TransportError::MultiaddrNotSupported(addr.clone()))?;
-
-        let socket = self
-            .eligible_listener(&socket_addr)
-            .ok_or(TransportError::Other(
-                Error::NoActiveListenerForDialAsListener,
-            ))?
-            .try_clone_socket()
-            .map_err(Self::Error::from)?;
-
-        tracing::debug!("Preparing for hole-punch from {addr}");
-
-        let hole_puncher = hole_puncher::<P>(socket, socket_addr, self.handshake_timeout);
-
-        let (sender, receiver) = oneshot::channel();
-
-        match self.hole_punch_attempts.entry(socket_addr) {
-            Entry::Occupied(mut sender_entry) => {
-                // Stale senders, i.e. from failed hole punches are not removed.
-                // Thus, we can just overwrite a stale sender.
-                if !sender_entry.get().is_canceled() {
-                    return Err(TransportError::Other(Error::HolePunchInProgress(
-                        socket_addr,
-                    )));
+
+        match (dial_opts.role, dial_opts.port_use) {
+            (Endpoint::Dialer, _) | (Endpoint::Listener, PortUse::Reuse) => {
+                let endpoint = if let Some(listener) = dial_opts
+                    .port_use
+                    .eq(&PortUse::Reuse)
+                    .then(|| self.eligible_listener(&socket_addr))
+                    .flatten()
+                {
+                    listener.endpoint.clone()
+                } else {
+                    let socket_family = socket_addr.ip().into();
+                    let dialer = if dial_opts.port_use == PortUse::Reuse {
+                        if let Some(occupied) = self.dialer.get(&socket_family) {
+                            occupied.clone()
+                        } else {
+                            let endpoint = self.bound_socket(socket_addr)?;
+                            self.dialer.insert(socket_family, endpoint.clone());
+                            endpoint
+                        }
+                    } else {
+                        self.bound_socket(socket_addr)?
+                    };
+                    dialer
+                };
+                let handshake_timeout = self.handshake_timeout;
+                let mut client_config = self.quinn_config.client_config.clone();
+                if version == ProtocolVersion::Draft29 {
+                    client_config.version(0xff00_001d);
                 }
-                sender_entry.insert(sender);
-            }
-            Entry::Vacant(entry) => {
-                entry.insert(sender);
+                Ok(Box::pin(async move {
+                    // This `"l"` seems necessary because an empty string is an invalid domain
+                    // name. While we don't use domain names, the underlying rustls library
+                    // is based upon the assumption that we do.
+                    let connecting = endpoint
+                        .connect_with(client_config, socket_addr, "l")
+                        .map_err(ConnectError)?;
+                    Connecting::new(connecting, handshake_timeout).await
+                }))
             }
-        };
+            (Endpoint::Listener, _) => {
+                let peer_id = peer_id.ok_or(TransportError::MultiaddrNotSupported(addr.clone()))?;
+
+                let socket = self
+                    .eligible_listener(&socket_addr)
+                    .ok_or(TransportError::Other(
+                        Error::NoActiveListenerForDialAsListener,
+                    ))?
+                    .try_clone_socket()
+                    .map_err(Self::Error::from)?;
+
+                tracing::debug!("Preparing for hole-punch from {addr}");
+
+                let hole_puncher = hole_puncher::<P>(socket, socket_addr, self.handshake_timeout);
+
+                let (sender, receiver) = oneshot::channel();
+
+                match self.hole_punch_attempts.entry(socket_addr) {
+                    Entry::Occupied(mut sender_entry) => {
+                        // Stale senders, i.e. from failed hole punches are not removed.
+                        // Thus, we can just overwrite a stale sender.
+                        if !sender_entry.get().is_canceled() {
+                            return Err(TransportError::Other(Error::HolePunchInProgress(
+                                socket_addr,
+                            )));
+                        }
+                        sender_entry.insert(sender);
+                    }
+                    Entry::Vacant(entry) => {
+                        entry.insert(sender);
+                    }
+                };
 
-        Ok(Box::pin(async move {
-            futures::pin_mut!(hole_puncher);
-            match futures::future::select(receiver, hole_puncher).await {
-                Either::Left((message, _)) => {
-                    let (inbound_peer_id, connection) = message
-                        .expect("hole punch connection sender is never dropped before receiver")
-                        .await?;
-                    if inbound_peer_id != peer_id {
-                        tracing::warn!(
-                            peer=%peer_id,
-                            inbound_peer=%inbound_peer_id,
-                            socket_address=%socket_addr,
-                            "expected inbound connection from socket_address to resolve to peer but got inbound peer"
-                        );
+                Ok(Box::pin(async move {
+                    futures::pin_mut!(hole_puncher);
+                    match futures::future::select(receiver, hole_puncher).await {
+                        Either::Left((message, _)) => {
+                            let (inbound_peer_id, connection) = message
+                                .expect(
+                                    "hole punch connection sender is never dropped before receiver",
+                                )
+                                .await?;
+                            if inbound_peer_id != peer_id {
+                                tracing::warn!(
+                                    peer=%peer_id,
+                                    inbound_peer=%inbound_peer_id,
+                                    socket_address=%socket_addr,
+                                    "expected inbound connection from socket_address to resolve to peer but got inbound peer"
+                                );
+                            }
+                            Ok((inbound_peer_id, connection))
+                        }
+                        Either::Right((hole_punch_err, _)) => Err(hole_punch_err),
                     }
-                    Ok((inbound_peer_id, connection))
-                }
-                Either::Right((hole_punch_err, _)) => Err(hole_punch_err),
+                }))
             }
-        }))
+        }
     }
 
     fn poll(
@@ -722,33 +730,6 @@ fn multiaddr_to_socketaddr(
     }
 }
 
-/// Whether an [`Multiaddr`] is a valid for the QUIC transport.
-fn is_quic_addr(addr: &Multiaddr, support_draft_29: bool) -> bool {
-    use Protocol::*;
-    let mut iter = addr.iter();
-    let Some(first) = iter.next() else {
-        return false;
-    };
-    let Some(second) = iter.next() else {
-        return false;
-    };
-    let Some(third) = iter.next() else {
-        return false;
-    };
-    let fourth = iter.next();
-    let fifth = iter.next();
-
-    matches!(first, Ip4(_) | Ip6(_) | Dns(_) | Dns4(_) | Dns6(_))
-        && matches!(second, Udp(_))
-        && if support_draft_29 {
-            matches!(third, QuicV1 | Quic)
-        } else {
-            matches!(third, QuicV1)
-        }
-        && matches!(fourth, Some(P2p(_)) | None)
-        && fifth.is_none()
-}
-
 /// Turns an IP address and port into the corresponding QUIC multiaddr.
 fn socketaddr_to_multiaddr(socket_addr: &SocketAddr, version: ProtocolVersion) -> Multiaddr {
     let quic_proto = match version {
@@ -921,7 +902,13 @@ mod tests {
         let mut transport = crate::tokio::Transport::new(config);
 
         let _dial = transport
-            .dial("/ip4/123.45.67.8/udp/1234/quic-v1".parse().unwrap())
+            .dial(
+                "/ip4/123.45.67.8/udp/1234/quic-v1".parse().unwrap(),
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::Reuse,
+                },
+            )
             .unwrap();
 
         assert!(transport.dialer.contains_key(&SocketFamily::Ipv4));
diff --git a/transports/quic/tests/smoke.rs b/transports/quic/tests/smoke.rs
index 74423076780..6a760f9997c 100644
--- a/transports/quic/tests/smoke.rs
+++ b/transports/quic/tests/smoke.rs
@@ -7,8 +7,9 @@ use futures::stream::StreamExt;
 use futures::{future, AsyncReadExt, AsyncWriteExt, FutureExt, SinkExt};
 use futures_timer::Delay;
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt, SubstreamBox};
-use libp2p_core::transport::{Boxed, OrTransport, TransportEvent};
+use libp2p_core::transport::{Boxed, DialOpts, OrTransport, PortUse, TransportEvent};
 use libp2p_core::transport::{ListenerId, TransportError};
+use libp2p_core::Endpoint;
 use libp2p_core::{multiaddr::Protocol, upgrade, Multiaddr, Transport};
 use libp2p_identity::PeerId;
 use libp2p_noise as noise;
@@ -90,6 +91,8 @@ async fn ipv4_dial_ipv6() {
 #[cfg(feature = "async-std")]
 #[async_std::test]
 async fn wrapped_with_delay() {
+    use libp2p_core::transport::DialOpts;
+
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
         .try_init();
@@ -114,18 +117,14 @@ async fn wrapped_with_delay() {
             self.0.lock().unwrap().remove_listener(id)
         }
 
-        fn address_translation(
-            &self,
-            listen: &Multiaddr,
-            observed: &Multiaddr,
-        ) -> Option<Multiaddr> {
-            self.0.lock().unwrap().address_translation(listen, observed)
-        }
-
         /// Delayed dial, i.e. calling [`Transport::dial`] on the inner [`Transport`] not within the
         /// synchronous [`Transport::dial`] method, but within the [`Future`] returned by the outer
         /// [`Transport::dial`].
-        fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+        fn dial(
+            &mut self,
+            addr: Multiaddr,
+            dial_opts: DialOpts,
+        ) -> Result<Self::Dial, TransportError<Self::Error>> {
             let t = self.0.clone();
             Ok(async move {
                 // Simulate DNS lookup. Giving the `Transport::poll` the chance to return
@@ -133,24 +132,21 @@ async fn wrapped_with_delay() {
                 // on the inner transport below.
                 Delay::new(Duration::from_millis(100)).await;
 
-                let dial = t.lock().unwrap().dial(addr).map_err(|e| match e {
-                    TransportError::MultiaddrNotSupported(_) => {
-                        panic!()
-                    }
-                    TransportError::Other(e) => e,
-                })?;
+                let dial = t
+                    .lock()
+                    .unwrap()
+                    .dial(addr, dial_opts)
+                    .map_err(|e| match e {
+                        TransportError::MultiaddrNotSupported(_) => {
+                            panic!()
+                        }
+                        TransportError::Other(e) => e,
+                    })?;
                 dial.await
             }
             .boxed())
         }
 
-        fn dial_as_listener(
-            &mut self,
-            addr: Multiaddr,
-        ) -> Result<Self::Dial, TransportError<Self::Error>> {
-            self.0.lock().unwrap().dial_as_listener(addr)
-        }
-
         fn poll(
             self: Pin<&mut Self>,
             cx: &mut std::task::Context<'_>,
@@ -183,7 +179,15 @@ async fn wrapped_with_delay() {
     // Note that the dial is spawned on a different task than the transport allowing the transport
     // task to poll the transport once and then suspend, waiting for the wakeup from the dial.
     let dial = async_std::task::spawn({
-        let dial = b_transport.dial(a_addr).unwrap();
+        let dial = b_transport
+            .dial(
+                a_addr,
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::Reuse,
+                },
+            )
+            .unwrap();
         async { dial.await.unwrap().0 }
     });
     async_std::task::spawn(async move { b_transport.next().await });
@@ -315,7 +319,13 @@ async fn draft_29_support() {
     let (_, mut c_transport) =
         create_transport::<quic::tokio::Provider>(|cfg| cfg.support_draft_29 = false);
     assert!(matches!(
-        c_transport.dial(a_quic_addr),
+        c_transport.dial(
+            a_quic_addr,
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::New
+            }
+        ),
         Err(TransportError::MultiaddrNotSupported(_))
     ));
 
@@ -331,7 +341,15 @@ async fn draft_29_support() {
     ));
     let d_quic_v1_addr = start_listening(&mut d_transport, "/ip4/127.0.0.1/udp/0/quic-v1").await;
     let d_quic_addr_mapped = swap_protocol!(d_quic_v1_addr, QuicV1 => Quic);
-    let dial = b_transport.dial(d_quic_addr_mapped).unwrap();
+    let dial = b_transport
+        .dial(
+            d_quic_addr_mapped,
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            },
+        )
+        .unwrap();
     let drive_transports = poll_fn::<(), _>(|cx| {
         let _ = b_transport.poll_next_unpin(cx);
         let _ = d_transport.poll_next_unpin(cx);
@@ -408,7 +426,7 @@ async fn write_after_peer_dropped_stream() {
         .try_init();
     let (stream_a, mut stream_b) = build_streams::<quic::async_std::Provider>().await;
     drop(stream_a);
-    futures_timer::Delay::new(Duration::from_millis(10)).await;
+    futures_timer::Delay::new(Duration::from_millis(100)).await;
 
     let data = vec![0; 10];
     stream_b.write_all(&data).await.expect("Write failed.");
@@ -765,7 +783,20 @@ async fn dial(
     transport: &mut Boxed<(PeerId, StreamMuxerBox)>,
     addr: Multiaddr,
 ) -> io::Result<(PeerId, StreamMuxerBox)> {
-    match future::select(transport.dial(addr).unwrap(), transport.next()).await {
+    match future::select(
+        transport
+            .dial(
+                addr,
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::Reuse,
+                },
+            )
+            .unwrap(),
+        transport.next(),
+    )
+    .await
+    {
         Either::Left((conn, _)) => conn,
         Either::Right((event, _)) => {
             panic!("Unexpected event: {event:?}")
diff --git a/transports/quic/tests/stream_compliance.rs b/transports/quic/tests/stream_compliance.rs
index 0eff0584588..b0536473215 100644
--- a/transports/quic/tests/stream_compliance.rs
+++ b/transports/quic/tests/stream_compliance.rs
@@ -1,7 +1,7 @@
 use futures::channel::oneshot;
 use futures::StreamExt;
-use libp2p_core::transport::ListenerId;
-use libp2p_core::Transport;
+use libp2p_core::transport::{DialOpts, ListenerId, PortUse};
+use libp2p_core::{Endpoint, Transport};
 use libp2p_quic as quic;
 use std::time::Duration;
 
@@ -47,7 +47,15 @@ async fn connected_peers() -> (quic::Connection, quic::Connection) {
             listener.next().await;
         }
     });
-    let dial_fut = dialer.dial(listen_address).unwrap();
+    let dial_fut = dialer
+        .dial(
+            listen_address,
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            },
+        )
+        .unwrap();
     async_std::task::spawn(async move {
         let connection = dial_fut.await.unwrap().1;
 
diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md
index f0204f1ba85..107d0d13ece 100644
--- a/transports/tcp/CHANGELOG.md
+++ b/transports/tcp/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## 0.42.0
 
+- Implement refactored `Transport`.
+  See [PR 4568]
+- Deprecate `port_reuse` setting, as this is now decided by the behaviour, not the transport.
+  See [PR 4568]
+
+[PR 4568]: https://github.com/libp2p/rust-libp2p/pull/4568
+
+## 0.41.1
+
 - Disable Nagle's algorithm (i.e. `TCP_NODELAY`) by default.
   See [PR 4916](https://github.com/libp2p/rust-libp2p/pull/4916)
 
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
index 3d881a6421c..386caa78b0f 100644
--- a/transports/tcp/src/lib.rs
+++ b/transports/tcp/src/lib.rs
@@ -40,9 +40,8 @@ use futures::{future::Ready, prelude::*, stream::SelectAll};
 use futures_timer::Delay;
 use if_watch::IfEvent;
 use libp2p_core::{
-    address_translation,
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, PortUse, TransportError, TransportEvent},
 };
 use provider::{Incoming, Provider};
 use socket2::{Domain, Socket, Type};
@@ -65,27 +64,16 @@ pub struct Config {
     nodelay: Option<bool>,
     /// Size of the listen backlog for listen sockets.
     backlog: u32,
-    /// Whether port reuse should be enabled.
-    enable_port_reuse: bool,
 }
 
 type Port = u16;
 
 /// The configuration for port reuse of listening sockets.
-#[derive(Debug, Clone)]
-enum PortReuse {
-    /// Port reuse is disabled, i.e. ephemeral local ports are
-    /// used for outgoing TCP connections.
-    Disabled,
-    /// Port reuse when dialing is enabled, i.e. the local
-    /// address and port that a new socket for an outgoing
-    /// connection is bound to are chosen from an existing
-    /// listening socket, if available.
-    Enabled {
-        /// The addresses and ports of the listening sockets
-        /// registered as eligible for port reuse when dialing.
-        listen_addrs: Arc<RwLock<HashSet<(IpAddr, Port)>>>,
-    },
+#[derive(Debug, Clone, Default)]
+struct PortReuse {
+    /// The addresses and ports of the listening sockets
+    /// registered as eligible for port reuse when dialing
+    listen_addrs: Arc<RwLock<HashSet<(IpAddr, Port)>>>,
 }
 
 impl PortReuse {
@@ -93,26 +81,22 @@ impl PortReuse {
     ///
     /// Has no effect if port reuse is disabled.
     fn register(&mut self, ip: IpAddr, port: Port) {
-        if let PortReuse::Enabled { listen_addrs } = self {
-            tracing::trace!(%ip, %port, "Registering for port reuse");
-            listen_addrs
-                .write()
-                .expect("`register()` and `unregister()` never panic while holding the lock")
-                .insert((ip, port));
-        }
+        tracing::trace!(%ip, %port, "Registering for port reuse");
+        self.listen_addrs
+            .write()
+            .expect("`register()` and `unregister()` never panic while holding the lock")
+            .insert((ip, port));
     }
 
     /// Unregisters a socket address for port reuse.
     ///
     /// Has no effect if port reuse is disabled.
     fn unregister(&mut self, ip: IpAddr, port: Port) {
-        if let PortReuse::Enabled { listen_addrs } = self {
-            tracing::trace!(%ip, %port, "Unregistering for port reuse");
-            listen_addrs
-                .write()
-                .expect("`register()` and `unregister()` never panic while holding the lock")
-                .remove(&(ip, port));
-        }
+        tracing::trace!(%ip, %port, "Unregistering for port reuse");
+        self.listen_addrs
+            .write()
+            .expect("`register()` and `unregister()` never panic while holding the lock")
+            .remove(&(ip, port));
     }
 
     /// Selects a listening socket address suitable for use
@@ -125,20 +109,17 @@ impl PortReuse {
     /// Returns `None` if port reuse is disabled or no suitable
     /// listening socket address is found.
     fn local_dial_addr(&self, remote_ip: &IpAddr) -> Option<SocketAddr> {
-        if let PortReuse::Enabled { listen_addrs } = self {
-            for (ip, port) in listen_addrs
-                .read()
-                .expect("`local_dial_addr` never panic while holding the lock")
-                .iter()
-            {
-                if ip.is_ipv4() == remote_ip.is_ipv4()
-                    && ip.is_loopback() == remote_ip.is_loopback()
-                {
-                    if remote_ip.is_ipv4() {
-                        return Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), *port));
-                    } else {
-                        return Some(SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), *port));
-                    }
+        for (ip, port) in self
+            .listen_addrs
+            .read()
+            .expect("`local_dial_addr` never panic while holding the lock")
+            .iter()
+        {
+            if ip.is_ipv4() == remote_ip.is_ipv4() && ip.is_loopback() == remote_ip.is_loopback() {
+                if remote_ip.is_ipv4() {
+                    return Some(SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), *port));
+                } else {
+                    return Some(SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), *port));
                 }
             }
         }
@@ -163,7 +144,6 @@ impl Config {
             ttl: None,
             nodelay: Some(false), // Disable Nagle's algorithm by default
             backlog: 1024,
-            enable_port_reuse: false,
         }
     }
 
@@ -189,101 +169,55 @@ impl Config {
     /// reuse of listening ports for outgoing connections to
     /// enhance NAT traversal capabilities.
     ///
-    /// Please refer to e.g. [RFC 4787](https://tools.ietf.org/html/rfc4787)
-    /// section 4 and 5 for some of the NAT terminology used here.
-    ///
-    /// There are two main use-cases for port reuse among local
-    /// sockets:
-    ///
-    ///   1. Creating multiple listening sockets for the same address
-    ///      and port to allow accepting connections on multiple threads
-    ///      without having to synchronise access to a single listen socket.
-    ///
-    ///   2. Creating outgoing connections whose local socket is bound to
-    ///      the same address and port as a listening socket. In the rare
-    ///      case of simple NATs with both endpoint-independent mapping and
-    ///      endpoint-independent filtering, this can on its own already
-    ///      permit NAT traversal by other nodes sharing the observed
-    ///      external address of the local node. For the common case of
-    ///      NATs with address-dependent or address and port-dependent
-    ///      filtering, port reuse for outgoing connections can facilitate
-    ///      further TCP hole punching techniques for NATs that perform
-    ///      endpoint-independent mapping. Port reuse cannot facilitate
-    ///      NAT traversal in the presence of "symmetric" NATs that employ
-    ///      both address/port-dependent mapping and filtering, unless
-    ///      there is some means of port prediction.
-    ///
-    /// Both use-cases are enabled when port reuse is enabled, with port reuse
-    /// for outgoing connections (`2.` above) always being implied.
-    ///
-    /// > **Note**: Due to the identification of a TCP socket by a 4-tuple
-    /// > of source IP address, source port, destination IP address and
-    /// > destination port, with port reuse enabled there can be only
-    /// > a single outgoing connection to a particular address and port
-    /// > of a peer per local listening socket address.
-    ///
-    /// [`Transport`] keeps track of the listen socket addresses as they
-    /// are reported by polling it. It is possible to listen on multiple
-    /// addresses, enabling port reuse for each, knowing exactly which listen
-    /// address is reused when dialing with a specific [`Transport`], as in the
-    /// following example:
-    ///
-    /// ```no_run
-    /// # use futures::StreamExt;
-    /// # use libp2p_core::transport::{ListenerId, TransportEvent};
-    /// # use libp2p_core::{Multiaddr, Transport};
-    /// # use std::pin::Pin;
-    /// # #[cfg(not(feature = "async-io"))]
-    /// # fn main() {}
-    /// #
-    /// #[cfg(feature = "async-io")]
-    /// #[async_std::main]
-    /// async fn main() -> std::io::Result<()> {
-    ///
-    /// let listen_addr1: Multiaddr = "/ip4/127.0.0.1/tcp/9001".parse().unwrap();
-    /// let listen_addr2: Multiaddr = "/ip4/127.0.0.1/tcp/9002".parse().unwrap();
-    ///
-    /// let mut tcp1 = libp2p_tcp::async_io::Transport::new(libp2p_tcp::Config::new().port_reuse(true)).boxed();
-    /// tcp1.listen_on(ListenerId::next(), listen_addr1.clone()).expect("listener");
-    /// match tcp1.select_next_some().await {
-    ///     TransportEvent::NewAddress { listen_addr, .. } => {
-    ///         println!("Listening on {:?}", listen_addr);
-    ///         let mut stream = tcp1.dial(listen_addr2.clone()).unwrap().await?;
-    ///         // `stream` has `listen_addr1` as its local socket address.
-    ///     }
-    ///     _ => {}
-    /// }
+    /// # Deprecation Notice
     ///
-    /// let mut tcp2 = libp2p_tcp::async_io::Transport::new(libp2p_tcp::Config::new().port_reuse(true)).boxed();
-    /// tcp2.listen_on(ListenerId::next(), listen_addr2).expect("listener");
-    /// match tcp2.select_next_some().await {
-    ///     TransportEvent::NewAddress { listen_addr, .. } => {
-    ///         println!("Listening on {:?}", listen_addr);
-    ///         let mut socket = tcp2.dial(listen_addr1).unwrap().await?;
-    ///         // `stream` has `listen_addr2` as its local socket address.
-    ///     }
-    ///     _ => {}
-    /// }
-    /// Ok(())
-    /// }
-    /// ```
+    /// The new implementation works on a per-connaction basis, defined by the behaviour. This
+    /// removes the necessaity to configure the transport for port reuse, instead the behaviour
+    /// requiring this behaviour can decide wether to use port reuse or not.
     ///
-    /// If a wildcard listen socket address is used to listen on any interface,
-    /// there can be multiple such addresses registered for port reuse. In this
-    /// case, one is chosen whose IP protocol version and loopback status is the
-    /// same as that of the remote address. Consequently, for maximum control of
-    /// the local listening addresses and ports that are used for outgoing
-    /// connections, a new [`Transport`] should be created for each listening
-    /// socket, avoiding the use of wildcard addresses which bind a socket to
-    /// all network interfaces.
+    /// The API to configure port reuse is part of [`Transport`] and the option can be found in
+    /// [`libp2p_core::transport::DialOpts`].
     ///
-    /// When this option is enabled on a unix system, the socket
-    /// option `SO_REUSEPORT` is set, if available, to permit
-    /// reuse of listening ports for multiple sockets.
-    pub fn port_reuse(mut self, port_reuse: bool) -> Self {
-        self.enable_port_reuse = port_reuse;
+    /// If [`PortUse::Reuse`] is enabled, the transport will try to reuse the local port of the
+    /// listener. If that's not possible, i.e. there is no listener or the transport doesn't allow
+    /// a direct control over ports, a new port (or the default behaviour) is used. If port reuse
+    /// is enabled for a connection, this option will be treated on a best-effor basis.
+    #[deprecated(
+        since = "0.42.0",
+        note = "This option does nothing now, since the port reuse policy is now decided on a per-connection basis by the behaviour. The function will be removed in a future release."
+    )]
+    pub fn port_reuse(self, _port_reuse: bool) -> Self {
         self
     }
+
+    fn create_socket(&self, socket_addr: SocketAddr, port_use: PortUse) -> io::Result<Socket> {
+        let socket = Socket::new(
+            Domain::for_address(socket_addr),
+            Type::STREAM,
+            Some(socket2::Protocol::TCP),
+        )?;
+        if socket_addr.is_ipv6() {
+            socket.set_only_v6(true)?;
+        }
+        if let Some(ttl) = self.ttl {
+            socket.set_ttl(ttl)?;
+        }
+        if let Some(nodelay) = self.nodelay {
+            socket.set_nodelay(nodelay)?;
+        }
+        socket.set_reuse_address(true)?;
+        #[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
+        if port_use == PortUse::Reuse {
+            socket.set_reuse_port(true)?;
+        }
+
+        #[cfg(not(all(unix, not(any(target_os = "solaris", target_os = "illumos")))))]
+        let _ = port_use; // silence the unused warning on non-unix platforms (i.e. Windows)
+
+        socket.set_nonblocking(true)?;
+
+        Ok(socket)
+    }
 }
 
 impl Default for Config {
@@ -328,49 +262,18 @@ where
     /// - [`tokio::Transport::new`]
     /// - [`async_io::Transport::new`]
     pub fn new(config: Config) -> Self {
-        let port_reuse = if config.enable_port_reuse {
-            PortReuse::Enabled {
-                listen_addrs: Arc::new(RwLock::new(HashSet::new())),
-            }
-        } else {
-            PortReuse::Disabled
-        };
         Transport {
             config,
-            port_reuse,
             ..Default::default()
         }
     }
 
-    fn create_socket(&self, socket_addr: SocketAddr) -> io::Result<Socket> {
-        let socket = Socket::new(
-            Domain::for_address(socket_addr),
-            Type::STREAM,
-            Some(socket2::Protocol::TCP),
-        )?;
-        if socket_addr.is_ipv6() {
-            socket.set_only_v6(true)?;
-        }
-        if let Some(ttl) = self.config.ttl {
-            socket.set_ttl(ttl)?;
-        }
-        if let Some(nodelay) = self.config.nodelay {
-            socket.set_nodelay(nodelay)?;
-        }
-        socket.set_reuse_address(true)?;
-        #[cfg(unix)]
-        if let PortReuse::Enabled { .. } = &self.port_reuse {
-            socket.set_reuse_port(true)?;
-        }
-        Ok(socket)
-    }
-
     fn do_listen(
         &mut self,
         id: ListenerId,
         socket_addr: SocketAddr,
     ) -> io::Result<ListenStream<T>> {
-        let socket = self.create_socket(socket_addr)?;
+        let socket = self.config.create_socket(socket_addr, PortUse::Reuse)?;
         socket.bind(&socket_addr.into())?;
         socket.listen(self.config.backlog as _)?;
         socket.set_nonblocking(true)?;
@@ -404,17 +307,9 @@ where
     ///
     /// This transport will have port-reuse disabled.
     fn default() -> Self {
-        let config = Config::default();
-        let port_reuse = if config.enable_port_reuse {
-            PortReuse::Enabled {
-                listen_addrs: Arc::new(RwLock::new(HashSet::new())),
-            }
-        } else {
-            PortReuse::Disabled
-        };
         Transport {
-            port_reuse,
-            config,
+            port_reuse: PortReuse::default(),
+            config: Config::default(),
             listeners: SelectAll::new(),
             pending_events: VecDeque::new(),
         }
@@ -456,7 +351,11 @@ where
         }
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
         let socket_addr = if let Ok(socket_addr) = multiaddr_to_socketaddr(addr.clone()) {
             if socket_addr.port() == 0 || socket_addr.ip().is_unspecified() {
                 return Err(TransportError::MultiaddrNotSupported(addr));
@@ -468,26 +367,45 @@ where
         tracing::debug!(address=%socket_addr, "dialing address");
 
         let socket = self
-            .create_socket(socket_addr)
+            .config
+            .create_socket(socket_addr, opts.port_use)
             .map_err(TransportError::Other)?;
 
-        if let Some(addr) = self.port_reuse.local_dial_addr(&socket_addr.ip()) {
-            tracing::trace!(address=%addr, "Binding dial socket to listen socket address");
-            socket.bind(&addr.into()).map_err(TransportError::Other)?;
-        }
+        let bind_addr = match self.port_reuse.local_dial_addr(&socket_addr.ip()) {
+            Some(socket_addr) if opts.port_use == PortUse::Reuse => {
+                tracing::trace!(address=%addr, "Binding dial socket to listen socket address");
+                Some(socket_addr)
+            }
+            _ => None,
+        };
 
-        socket
-            .set_nonblocking(true)
-            .map_err(TransportError::Other)?;
+        let local_config = self.config.clone();
 
         Ok(async move {
+            if let Some(bind_addr) = bind_addr {
+                socket.bind(&bind_addr.into())?;
+            }
+
             // [`Transport::dial`] should do no work unless the returned [`Future`] is polled. Thus
             // do the `connect` call within the [`Future`].
-            match socket.connect(&socket_addr.into()) {
-                Ok(()) => {}
-                Err(err) if err.raw_os_error() == Some(libc::EINPROGRESS) => {}
-                Err(err) if err.kind() == io::ErrorKind::WouldBlock => {}
-                Err(err) => return Err(err),
+            let socket = match (socket.connect(&socket_addr.into()), bind_addr) {
+                (Ok(()), _) => socket,
+                (Err(err), _) if err.raw_os_error() == Some(libc::EINPROGRESS) => socket,
+                (Err(err), _) if err.kind() == io::ErrorKind::WouldBlock => socket,
+                (Err(err), Some(bind_addr)) if err.kind() == io::ErrorKind::AddrNotAvailable  => {
+                    // The socket was bound to a local address that is no longer available.
+                    // Retry without binding.
+                    tracing::debug!(connect_addr = %socket_addr, ?bind_addr, "Failed to connect using existing socket because we already have a connection, re-dialing with new port");
+                    std::mem::drop(socket);
+                    let socket = local_config.create_socket(socket_addr, PortUse::New)?;
+                    match socket.connect(&socket_addr.into()) {
+                        Ok(()) => socket,
+                        Err(err) if err.raw_os_error() == Some(libc::EINPROGRESS) => socket,
+                        Err(err) if err.kind() == io::ErrorKind::WouldBlock => socket,
+                        Err(err) => return Err(err),
+                    }
+                }
+                (Err(err), _) => return Err(err),
             };
 
             let stream = T::new_stream(socket.into()).await?;
@@ -496,40 +414,6 @@ where
         .boxed())
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.dial(addr)
-    }
-
-    /// When port reuse is disabled and hence ephemeral local ports are
-    /// used for outgoing connections, the returned address is the
-    /// `observed` address with the port replaced by the port of the
-    /// `listen` address.
-    ///
-    /// If port reuse is enabled, `Some(observed)` is returned, as there
-    /// is a chance that the `observed` address _and_ port are reachable
-    /// for other peers if there is a NAT in the way that does endpoint-
-    /// independent filtering. Furthermore, even if that is not the case
-    /// and TCP hole punching techniques must be used for NAT traversal,
-    /// the `observed` address is still the one that a remote should connect
-    /// to for the purpose of the hole punching procedure, as it represents
-    /// the mapped IP and port of the NAT device in front of the local
-    /// node.
-    ///
-    /// `None` is returned if one of the given addresses is not a TCP/IP
-    /// address.
-    fn address_translation(&self, listen: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        if !is_tcp_addr(listen) || !is_tcp_addr(observed) {
-            return None;
-        }
-        match &self.port_reuse {
-            PortReuse::Disabled => address_translation(listen, observed),
-            PortReuse::Enabled { .. } => Some(observed.clone()),
-        }
-    }
-
     /// Poll all listeners.
     #[tracing::instrument(level = "trace", name = "Transport::poll", skip(self, cx))]
     fn poll(
@@ -819,23 +703,6 @@ fn ip_to_multiaddr(ip: IpAddr, port: u16) -> Multiaddr {
     Multiaddr::empty().with(ip.into()).with(Protocol::Tcp(port))
 }
 
-fn is_tcp_addr(addr: &Multiaddr) -> bool {
-    use Protocol::*;
-
-    let mut iter = addr.iter();
-
-    let first = match iter.next() {
-        None => return false,
-        Some(p) => p,
-    };
-    let second = match iter.next() {
-        None => return false,
-        Some(p) => p,
-    };
-
-    matches!(first, Ip4(_) | Ip6(_) | Dns(_) | Dns4(_) | Dns6(_)) && matches!(second, Tcp(_))
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -843,8 +710,8 @@ mod tests {
         channel::{mpsc, oneshot},
         future::poll_fn,
     };
+    use libp2p_core::Endpoint;
     use libp2p_core::Transport as _;
-    use libp2p_identity::PeerId;
 
     #[test]
     fn multiaddr_to_tcp_conversion() {
@@ -927,7 +794,17 @@ mod tests {
             let mut tcp = Transport::<T>::default();
 
             // Obtain a future socket through dialing
-            let mut socket = tcp.dial(addr.clone()).unwrap().await.unwrap();
+            let mut socket = tcp
+                .dial(
+                    addr.clone(),
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::Reuse,
+                    },
+                )
+                .unwrap()
+                .await
+                .unwrap();
             socket.write_all(&[0x1, 0x2, 0x3]).await.unwrap();
 
             let mut buf = [0u8; 3];
@@ -1003,7 +880,16 @@ mod tests {
         async fn dialer<T: Provider>(mut ready_rx: mpsc::Receiver<Multiaddr>) {
             let dest_addr = ready_rx.next().await.unwrap();
             let mut tcp = Transport::<T>::default();
-            tcp.dial(dest_addr).unwrap().await.unwrap();
+            tcp.dial(
+                dest_addr,
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::New,
+                },
+            )
+            .unwrap()
+            .await
+            .unwrap();
         }
 
         fn test(addr: Multiaddr) {
@@ -1083,7 +969,7 @@ mod tests {
             port_reuse_tx: oneshot::Sender<Protocol<'_>>,
         ) {
             let dest_addr = ready_rx.next().await.unwrap();
-            let mut tcp = Transport::<T>::new(Config::new().port_reuse(true));
+            let mut tcp = Transport::<T>::new(Config::new());
             tcp.listen_on(ListenerId::next(), addr).unwrap();
             match poll_fn(|cx| Pin::new(&mut tcp).poll(cx)).await {
                 TransportEvent::NewAddress { .. } => {
@@ -1102,7 +988,17 @@ mod tests {
                         .ok();
 
                     // Obtain a future socket through dialing
-                    let mut socket = tcp.dial(dest_addr).unwrap().await.unwrap();
+                    let mut socket = tcp
+                        .dial(
+                            dest_addr,
+                            DialOpts {
+                                role: Endpoint::Dialer,
+                                port_use: PortUse::Reuse,
+                            },
+                        )
+                        .unwrap()
+                        .await
+                        .unwrap();
                     socket.write_all(&[0x1, 0x2, 0x3]).await.unwrap();
                     // socket.flush().await;
                     let mut buf = [0u8; 3];
@@ -1153,7 +1049,7 @@ mod tests {
             .try_init();
 
         async fn listen_twice<T: Provider>(addr: Multiaddr) {
-            let mut tcp = Transport::<T>::new(Config::new().port_reuse(true));
+            let mut tcp = Transport::<T>::new(Config::new());
             tcp.listen_on(ListenerId::next(), addr).unwrap();
             match poll_fn(|cx| Pin::new(&mut tcp).poll(cx)).await {
                 TransportEvent::NewAddress {
@@ -1262,55 +1158,6 @@ mod tests {
         test("/ip4/127.0.0.1/tcp/12345/tcp/12345".parse().unwrap());
     }
 
-    #[cfg(feature = "async-io")]
-    #[test]
-    fn test_address_translation_async_io() {
-        test_address_translation::<async_io::Transport>()
-    }
-
-    #[cfg(feature = "tokio")]
-    #[test]
-    fn test_address_translation_tokio() {
-        test_address_translation::<tokio::Transport>()
-    }
-
-    fn test_address_translation<T>()
-    where
-        T: Default + libp2p_core::Transport,
-    {
-        let transport = T::default();
-
-        let port = 42;
-        let tcp_listen_addr = Multiaddr::empty()
-            .with(Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
-            .with(Protocol::Tcp(port));
-        let observed_ip = Ipv4Addr::new(123, 45, 67, 8);
-        let tcp_observed_addr = Multiaddr::empty()
-            .with(Protocol::Ip4(observed_ip))
-            .with(Protocol::Tcp(1))
-            .with(Protocol::P2p(PeerId::random()));
-
-        let translated = transport
-            .address_translation(&tcp_listen_addr, &tcp_observed_addr)
-            .unwrap();
-        let mut iter = translated.iter();
-        assert_eq!(iter.next(), Some(Protocol::Ip4(observed_ip)));
-        assert_eq!(iter.next(), Some(Protocol::Tcp(port)));
-        assert_eq!(iter.next(), None);
-
-        let quic_addr = Multiaddr::empty()
-            .with(Protocol::Ip4(Ipv4Addr::new(87, 65, 43, 21)))
-            .with(Protocol::Udp(1))
-            .with(Protocol::QuicV1);
-
-        assert!(transport
-            .address_translation(&tcp_listen_addr, &quic_addr)
-            .is_none());
-        assert!(transport
-            .address_translation(&quic_addr, &tcp_observed_addr)
-            .is_none());
-    }
-
     #[test]
     fn test_remove_listener() {
         let _ = tracing_subscriber::fmt()
@@ -1373,7 +1220,7 @@ mod tests {
                 .build()
                 .unwrap();
             rt.block_on(async {
-                test::<async_io::Tcp>();
+                test::<tokio::Tcp>();
             });
         }
     }
diff --git a/transports/uds/CHANGELOG.md b/transports/uds/CHANGELOG.md
index aad61d21547..aa068fe3877 100644
--- a/transports/uds/CHANGELOG.md
+++ b/transports/uds/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.41.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.40.0
 
 
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index 13642a38a48..df5159f3c02 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-uds"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Unix domain sockets transport for libp2p"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/uds/src/lib.rs b/transports/uds/src/lib.rs
index 4b1c7a1670d..5c57e255b4d 100644
--- a/transports/uds/src/lib.rs
+++ b/transports/uds/src/lib.rs
@@ -46,7 +46,7 @@ use futures::{
 use libp2p_core::transport::ListenerId;
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
-    transport::{TransportError, TransportEvent},
+    transport::{DialOpts, TransportError, TransportEvent},
     Transport,
 };
 use std::collections::VecDeque;
@@ -159,7 +159,7 @@ macro_rules! codegen {
                 }
             }
 
-            fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+            fn dial(&mut self, addr: Multiaddr, _dial_opts: DialOpts) -> Result<Self::Dial, TransportError<Self::Error>> {
                 // TODO: Should we dial at all?
                 if let Ok(path) = multiaddr_to_path(&addr) {
                     tracing::debug!(address=%addr, "Dialing address");
@@ -169,21 +169,6 @@ macro_rules! codegen {
                 }
             }
 
-            fn dial_as_listener(
-                &mut self,
-                addr: Multiaddr,
-            ) -> Result<Self::Dial, TransportError<Self::Error>> {
-                self.dial(addr)
-            }
-
-            fn address_translation(
-                &self,
-                _server: &Multiaddr,
-                _observed: &Multiaddr,
-            ) -> Option<Multiaddr> {
-                None
-            }
-
             fn poll(
                 mut self: Pin<&mut Self>,
                 cx: &mut Context<'_>,
@@ -260,8 +245,8 @@ mod tests {
     use futures::{channel::oneshot, prelude::*};
     use libp2p_core::{
         multiaddr::{Multiaddr, Protocol},
-        transport::ListenerId,
-        Transport,
+        transport::{DialOpts, ListenerId, PortUse},
+        Endpoint, Transport,
     };
     use std::{borrow::Cow, path::Path};
 
@@ -318,7 +303,17 @@ mod tests {
         async_std::task::block_on(async move {
             let mut uds = UdsConfig::new();
             let addr = rx.await.unwrap();
-            let mut socket = uds.dial(addr).unwrap().await.unwrap();
+            let mut socket = uds
+                .dial(
+                    addr,
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::Reuse,
+                    },
+                )
+                .unwrap()
+                .await
+                .unwrap();
             let _ = socket.write(&[1, 2, 3]).await.unwrap();
         });
     }
diff --git a/transports/webrtc-websys/CHANGELOG.md b/transports/webrtc-websys/CHANGELOG.md
index 634120c53c3..475b13727e6 100644
--- a/transports/webrtc-websys/CHANGELOG.md
+++ b/transports/webrtc-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0-alpha
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.3.0-alpha
 
 - Bump version in order to publish a new version dependent on latest `libp2p-core`.
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 4a8b8dfcdf0..c874b33bfc7 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 name = "libp2p-webrtc-websys"
 repository = "https://github.com/libp2p/rust-libp2p"
 rust-version = { workspace = true }
-version = "0.3.0-alpha"
+version = "0.4.0-alpha"
 publish = true
 
 [dependencies]
diff --git a/transports/webrtc-websys/src/transport.rs b/transports/webrtc-websys/src/transport.rs
index ecf137eab8a..836acb0b9f6 100644
--- a/transports/webrtc-websys/src/transport.rs
+++ b/transports/webrtc-websys/src/transport.rs
@@ -4,6 +4,7 @@ use super::Error;
 use futures::future::FutureExt;
 use libp2p_core::multiaddr::Multiaddr;
 use libp2p_core::muxing::StreamMuxerBox;
+use libp2p_core::transport::DialOpts;
 use libp2p_core::transport::{Boxed, ListenerId, Transport as _, TransportError, TransportEvent};
 use libp2p_identity::{Keypair, PeerId};
 use std::future::Future;
@@ -62,7 +63,15 @@ impl libp2p_core::Transport for Transport {
         false
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        dial_opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
+        if dial_opts.role.is_listener() {
+            return Err(TransportError::MultiaddrNotSupported(addr));
+        }
+
         if maybe_local_firefox() {
             return Err(TransportError::Other(
                 "Firefox does not support WebRTC over localhost or 127.0.0.1"
@@ -89,23 +98,12 @@ impl libp2p_core::Transport for Transport {
         .boxed())
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        Err(TransportError::MultiaddrNotSupported(addr))
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
     ) -> Poll<TransportEvent<Self::ListenerUpgrade, Self::Error>> {
         Poll::Pending
     }
-
-    fn address_translation(&self, _listen: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
-        None
-    }
 }
 
 /// Checks if local Firefox.
diff --git a/transports/webrtc/CHANGELOG.md b/transports/webrtc/CHANGELOG.md
index 930526d58d5..90d4ce83df3 100644
--- a/transports/webrtc/CHANGELOG.md
+++ b/transports/webrtc/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.0-alpha
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.7.1-alpha
 
 - Bump `libp2p-webrtc-utils` dependency to `0.2.0`.
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 4fb4a2f8a45..a205810e7c4 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-webrtc"
-version = "0.7.1-alpha"
+version = "0.8.0-alpha"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "WebRTC transport for libp2p"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/webrtc/src/tokio/transport.rs b/transports/webrtc/src/tokio/transport.rs
index 2e73ac9c459..62049c8f59b 100644
--- a/transports/webrtc/src/tokio/transport.rs
+++ b/transports/webrtc/src/tokio/transport.rs
@@ -22,7 +22,7 @@ use futures::{future::BoxFuture, prelude::*, stream::SelectAll};
 use if_watch::{tokio::IfWatcher, IfEvent};
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
 };
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
@@ -118,7 +118,19 @@ impl libp2p_core::Transport for Transport {
         }
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        dial_opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
+        if dial_opts.role.is_listener() {
+            // TODO: As the listener of a WebRTC hole punch, we need to send a random UDP packet to the
+            // `addr`. See DCUtR specification below.
+            //
+            // https://github.com/libp2p/specs/blob/master/relay/DCUtR.md#the-protocol
+            tracing::warn!("WebRTC hole punch is not yet supported");
+        }
+
         let (sock_addr, server_fingerprint) = libp2p_webrtc_utils::parse_webrtc_dial_addr(&addr)
             .ok_or_else(|| TransportError::MultiaddrNotSupported(addr.clone()))?;
         if sock_addr.port() == 0 || sock_addr.ip().is_unspecified() {
@@ -150,21 +162,6 @@ impl libp2p_core::Transport for Transport {
         }
         .boxed())
     }
-
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        // TODO: As the listener of a WebRTC hole punch, we need to send a random UDP packet to the
-        // `addr`. See DCUtR specification below.
-        //
-        // https://github.com/libp2p/specs/blob/master/relay/DCUtR.md#the-protocol
-        self.dial(addr)
-    }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        libp2p_core::address_translation(server, observed)
-    }
 }
 
 /// A stream of incoming connections on one or more interfaces.
diff --git a/transports/webrtc/tests/smoke.rs b/transports/webrtc/tests/smoke.rs
index 76e168edfd6..d606d66c41f 100644
--- a/transports/webrtc/tests/smoke.rs
+++ b/transports/webrtc/tests/smoke.rs
@@ -23,8 +23,8 @@ use futures::future::{BoxFuture, Either};
 use futures::stream::StreamExt;
 use futures::{future, ready, AsyncReadExt, AsyncWriteExt, FutureExt, SinkExt};
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
-use libp2p_core::transport::{Boxed, ListenerId, TransportEvent};
-use libp2p_core::{Multiaddr, Transport};
+use libp2p_core::transport::{Boxed, DialOpts, ListenerId, PortUse, TransportEvent};
+use libp2p_core::{Endpoint, Multiaddr, Transport};
 use libp2p_identity::PeerId;
 use libp2p_webrtc as webrtc;
 use rand::{thread_rng, RngCore};
@@ -322,7 +322,17 @@ struct Dial<'a> {
 impl<'a> Dial<'a> {
     fn new(dialer: &'a mut Boxed<(PeerId, StreamMuxerBox)>, addr: Multiaddr) -> Self {
         Self {
-            dial_task: dialer.dial(addr).unwrap().map(|r| r.unwrap()).boxed(),
+            dial_task: dialer
+                .dial(
+                    addr,
+                    DialOpts {
+                        role: Endpoint::Dialer,
+                        port_use: PortUse::Reuse,
+                    },
+                )
+                .unwrap()
+                .map(|r| r.unwrap())
+                .boxed(),
             dialer,
         }
     }
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
index c16ad6cc406..70d866e6141 100644
--- a/transports/websocket-websys/CHANGELOG.md
+++ b/transports/websocket-websys/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
 ## 0.3.3
 
 - Fix use-after-free handler invocation from JS side.
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index a2127986ddc..0b3148a8b92 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket-websys"
 edition = "2021"
 rust-version = "1.60.0"
 description = "WebSocket for libp2p under WASM environment"
-version = "0.3.3"
+version = "0.4.0"
 authors = ["Vince Vasta <vince.vasta@gmail.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index c96d1d6aa3a..d2589715bbb 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -26,6 +26,7 @@ use bytes::BytesMut;
 use futures::task::AtomicWaker;
 use futures::{future::Ready, io, prelude::*};
 use js_sys::Array;
+use libp2p_core::transport::DialOpts;
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
     transport::{ListenerId, TransportError, TransportEvent},
@@ -86,7 +87,15 @@ impl libp2p_core::Transport for Transport {
         false
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        dial_opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
+        if dial_opts.role.is_listener() {
+            return Err(TransportError::MultiaddrNotSupported(addr));
+        }
+
         let url = extract_websocket_url(&addr)
             .ok_or_else(|| TransportError::MultiaddrNotSupported(addr))?;
 
@@ -101,23 +110,12 @@ impl libp2p_core::Transport for Transport {
         .boxed())
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        Err(TransportError::MultiaddrNotSupported(addr))
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
     ) -> std::task::Poll<TransportEvent<Self::ListenerUpgrade, Self::Error>> {
         Poll::Pending
     }
-
-    fn address_translation(&self, _listen: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
-        None
-    }
 }
 
 // Try to convert Multiaddr to a Websocket url.
diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
index 419ff41c6fc..50b1c42d3e1 100644
--- a/transports/websocket/CHANGELOG.md
+++ b/transports/websocket/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.44.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
 ## 0.43.2
 
 - fix: Avoid websocket panic on polling after errors. See [PR 5482].
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index f1b0a413115..271631b4021 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebSocket transport for libp2p"
-version = "0.43.2"
+version = "0.44.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 69a01fdbd46..fc6a3f0e90e 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -23,9 +23,8 @@ use either::Either;
 use futures::{future::BoxFuture, prelude::*, ready, stream::BoxStream};
 use futures_rustls::{client, rustls, server};
 use libp2p_core::{
-    connection::Endpoint,
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
     Transport,
 };
 use parking_lot::Mutex;
@@ -149,19 +148,12 @@ where
         self.transport.lock().remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.do_dial(addr, Endpoint::Dialer)
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        dial_opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.do_dial(addr, Endpoint::Listener)
-    }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.transport.lock().address_translation(server, observed)
+        self.do_dial(addr, dial_opts)
     }
 
     fn poll(
@@ -263,7 +255,7 @@ where
     fn do_dial(
         &mut self,
         addr: Multiaddr,
-        role_override: Endpoint,
+        dial_opts: DialOpts,
     ) -> Result<<Self as Transport>::Dial, TransportError<<Self as Transport>::Error>> {
         let mut addr = match parse_ws_dial_addr(addr) {
             Ok(addr) => addr,
@@ -282,8 +274,7 @@ where
 
         let future = async move {
             loop {
-                match Self::dial_once(transport.clone(), addr, tls_config.clone(), role_override)
-                    .await
+                match Self::dial_once(transport.clone(), addr, tls_config.clone(), dial_opts).await
                 {
                     Ok(Either::Left(redirect)) => {
                         if remaining_redirects == 0 {
@@ -307,18 +298,17 @@ where
         transport: Arc<Mutex<T>>,
         addr: WsAddress,
         tls_config: tls::Config,
-        role_override: Endpoint,
+        dial_opts: DialOpts,
     ) -> Result<Either<String, Connection<T::Output>>, Error<T::Error>> {
         tracing::trace!(address=?addr, "Dialing websocket address");
 
-        let dial = match role_override {
-            Endpoint::Dialer => transport.lock().dial(addr.tcp_addr),
-            Endpoint::Listener => transport.lock().dial_as_listener(addr.tcp_addr),
-        }
-        .map_err(|e| match e {
-            TransportError::MultiaddrNotSupported(a) => Error::InvalidMultiaddr(a),
-            TransportError::Other(e) => Error::Transport(e),
-        })?;
+        let dial = transport
+            .lock()
+            .dial(addr.tcp_addr, dial_opts)
+            .map_err(|e| match e {
+                TransportError::MultiaddrNotSupported(a) => Error::InvalidMultiaddr(a),
+                TransportError::Other(e) => Error::Transport(e),
+            })?;
 
         let stream = dial.map_err(Error::Transport).await?;
         tracing::trace!(port=%addr.host_port, "TCP connection established");
diff --git a/transports/websocket/src/lib.rs b/transports/websocket/src/lib.rs
index e0b3d09ca25..40d6db44471 100644
--- a/transports/websocket/src/lib.rs
+++ b/transports/websocket/src/lib.rs
@@ -33,7 +33,7 @@ use futures::{future::BoxFuture, prelude::*, ready};
 use libp2p_core::{
     connection::ConnectedPoint,
     multiaddr::Multiaddr,
-    transport::{map::MapFuture, ListenerId, TransportError, TransportEvent},
+    transport::{map::MapFuture, DialOpts, ListenerId, TransportError, TransportEvent},
     Transport,
 };
 use rw_stream_sink::RwStreamSink;
@@ -202,19 +202,12 @@ where
         self.transport.remove_listener(id)
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.transport.dial(addr)
-    }
-
-    fn dial_as_listener(
+    fn dial(
         &mut self,
         addr: Multiaddr,
+        opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        self.transport.dial_as_listener(addr)
-    }
-
-    fn address_translation(&self, server: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
-        self.transport.address_translation(server, observed)
+        self.transport.dial(addr, opts)
     }
 
     fn poll(
@@ -292,7 +285,11 @@ where
 mod tests {
     use super::WsConfig;
     use futures::prelude::*;
-    use libp2p_core::{multiaddr::Protocol, transport::ListenerId, Multiaddr, Transport};
+    use libp2p_core::{
+        multiaddr::Protocol,
+        transport::{DialOpts, ListenerId, PortUse},
+        Endpoint, Multiaddr, Transport,
+    };
     use libp2p_identity::PeerId;
     use libp2p_tcp as tcp;
 
@@ -339,7 +336,13 @@ mod tests {
 
         let outbound = new_ws_config()
             .boxed()
-            .dial(addr.with(Protocol::P2p(PeerId::random())))
+            .dial(
+                addr.with(Protocol::P2p(PeerId::random())),
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::New,
+                },
+            )
             .unwrap();
 
         let (a, b) = futures::join!(inbound, outbound);
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
index 0409819a63f..2aab226ab12 100644
--- a/transports/webtransport-websys/CHANGELOG.md
+++ b/transports/webtransport-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.3.0
 
 * Fix unhandled exceptions thrown when calling `Webtransport::close`.
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 3defdce5203..68ba7091794 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-webtransport-websys"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebTransport for libp2p under WASM environment"
-version = "0.3.0"
+version = "0.4.0"
 authors = [
     "Yiannis Marangos <yiannis@eiger.co>",
     "oblique <psyberbits@gmail.com>",
diff --git a/transports/webtransport-websys/src/transport.rs b/transports/webtransport-websys/src/transport.rs
index 3f14f3e476b..6a9a9dad954 100644
--- a/transports/webtransport-websys/src/transport.rs
+++ b/transports/webtransport-websys/src/transport.rs
@@ -1,6 +1,8 @@
 use futures::future::FutureExt;
 use libp2p_core::muxing::StreamMuxerBox;
-use libp2p_core::transport::{Boxed, ListenerId, Transport as _, TransportError, TransportEvent};
+use libp2p_core::transport::{
+    Boxed, DialOpts, ListenerId, Transport as _, TransportError, TransportEvent,
+};
 use libp2p_identity::{Keypair, PeerId};
 use multiaddr::Multiaddr;
 use std::future::Future;
@@ -62,7 +64,15 @@ impl libp2p_core::Transport for Transport {
         false
     }
 
-    fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+    fn dial(
+        &mut self,
+        addr: Multiaddr,
+        dial_opts: DialOpts,
+    ) -> Result<Self::Dial, TransportError<Self::Error>> {
+        if dial_opts.role.is_listener() {
+            return Err(TransportError::MultiaddrNotSupported(addr));
+        }
+
         let endpoint = Endpoint::from_multiaddr(&addr).map_err(|e| match e {
             e @ Error::InvalidMultiaddr(_) => {
                 tracing::debug!("{}", e);
@@ -83,21 +93,10 @@ impl libp2p_core::Transport for Transport {
         .boxed())
     }
 
-    fn dial_as_listener(
-        &mut self,
-        addr: Multiaddr,
-    ) -> Result<Self::Dial, TransportError<Self::Error>> {
-        Err(TransportError::MultiaddrNotSupported(addr))
-    }
-
     fn poll(
         self: Pin<&mut Self>,
         _cx: &mut Context<'_>,
     ) -> Poll<TransportEvent<Self::ListenerUpgrade, Self::Error>> {
         Poll::Pending
     }
-
-    fn address_translation(&self, _listen: &Multiaddr, _observed: &Multiaddr) -> Option<Multiaddr> {
-        None
-    }
 }
diff --git a/wasm-tests/webtransport-tests/src/lib.rs b/wasm-tests/webtransport-tests/src/lib.rs
index 1f420cd6671..938cdf0b3e1 100644
--- a/wasm-tests/webtransport-tests/src/lib.rs
+++ b/wasm-tests/webtransport-tests/src/lib.rs
@@ -1,7 +1,8 @@
 use futures::channel::oneshot;
 use futures::{AsyncReadExt, AsyncWriteExt};
 use getrandom::getrandom;
-use libp2p_core::{StreamMuxer, Transport as _};
+use libp2p_core::transport::{DialOpts, PortUse};
+use libp2p_core::{Endpoint, StreamMuxer, Transport as _};
 use libp2p_identity::{Keypair, PeerId};
 use libp2p_noise as noise;
 use libp2p_webtransport_websys::{Config, Connection, Error, Stream, Transport};
@@ -263,7 +264,17 @@ async fn connect_without_peer_id() {
     addr.pop();
 
     let mut transport = Transport::new(Config::new(&keypair));
-    transport.dial(addr).unwrap().await.unwrap();
+    transport
+        .dial(
+            addr,
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            },
+        )
+        .unwrap()
+        .await
+        .unwrap();
 }
 
 #[wasm_bindgen_test]
@@ -278,7 +289,17 @@ async fn error_on_unknown_peer_id() {
     addr.push(Protocol::P2p(PeerId::random()));
 
     let mut transport = Transport::new(Config::new(&keypair));
-    let e = transport.dial(addr.clone()).unwrap().await.unwrap_err();
+    let e = transport
+        .dial(
+            addr.clone(),
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            },
+        )
+        .unwrap()
+        .await
+        .unwrap_err();
     assert!(matches!(e, Error::UnknownRemotePeerId));
 }
 
@@ -297,7 +318,17 @@ async fn error_on_unknown_certhash() {
     addr.push(peer_id);
 
     let mut transport = Transport::new(Config::new(&keypair));
-    let e = transport.dial(addr.clone()).unwrap().await.unwrap_err();
+    let e = transport
+        .dial(
+            addr.clone(),
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            },
+        )
+        .unwrap()
+        .await
+        .unwrap_err();
     assert!(matches!(
         e,
         Error::Noise(noise::Error::UnknownWebTransportCerthashes(..))
@@ -310,7 +341,17 @@ async fn new_connection_to_echo_server() -> Connection {
 
     let mut transport = Transport::new(Config::new(&keypair));
 
-    let (_peer_id, conn) = transport.dial(addr).unwrap().await.unwrap();
+    let (_peer_id, conn) = transport
+        .dial(
+            addr,
+            DialOpts {
+                role: Endpoint::Dialer,
+                port_use: PortUse::Reuse,
+            },
+        )
+        .unwrap()
+        .await
+        .unwrap();
 
     conn
 }

From 4de8b839855d2452a09c7a8936c8575e79ebd12a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 10:12:12 +0000
Subject: [PATCH 343/455] deps: bump EmbarkStudios/cargo-deny-action from 1 to
 2

Pull-Request: #5530.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 648945820fa..d0465540d47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -398,6 +398,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: EmbarkStudios/cargo-deny-action@v1
+    - uses: EmbarkStudios/cargo-deny-action@v2
       with:
         command: check advisories bans licenses sources

From 732ade698303a8346c44d8638143ca502458b670 Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 17:47:39 +0200
Subject: [PATCH 344/455] chore: remove RUSTFLAG from docs workflow

`"--cfg docsrs"` shouldn't be part of `RUSTFLAGS` but only of `RUSTDOCFLAGS`.

This should fix failing docs Actions.

Pull-Request: #5517.
---
 .github/workflows/docs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b2a761fd8c1..e2bac78c006 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,6 @@ jobs:
       run: cargo +nightly doc --no-deps --workspace -F full
       env:
         RUSTDOCFLAGS: "--cfg docsrs"
-        RUSTFLAGS: "--cfg docsrs"
     - name: Add index file
       run: |
         mkdir host-docs

From 823acd6f6991b1b6b0f6d09959d89599d6abc730 Mon Sep 17 00:00:00 2001
From: Hannes <55623006+umgefahren@users.noreply.github.com>
Date: Tue, 6 Aug 2024 17:14:49 +0200
Subject: [PATCH 345/455] docs: As implied by #5517 make sure everything still
 builds on docs.rs

As @guillaumemichel already found out, passing the `docsrs` cfg to rustc now breaks the documentation build. Although I couldn't exactly reproduce the docs.rs build env (everyone is welcome to try; it's explained [here](https://github.com/rust-lang/docs.rs/blob/master/README.md#build-subcommand)) it's safe to assume that the same problem will occur when we push to docs.rs.

Passing the docsrs flag is also no longer required since it's now automatically passed to rustdoc when building on docs.rs. Explanation: https://docs.rs/about/builds#detecting-docsrs

Pull-Request: #5535.
---
 core/Cargo.toml                           | 2 --
 identity/Cargo.toml                       | 2 --
 libp2p/Cargo.toml                         | 2 --
 misc/metrics/Cargo.toml                   | 2 --
 misc/multistream-select/Cargo.toml        | 2 --
 misc/quick-protobuf-codec/Cargo.toml      | 2 --
 misc/rw-stream-sink/Cargo.toml            | 2 --
 muxers/mplex/Cargo.toml                   | 2 --
 muxers/yamux/Cargo.toml                   | 2 --
 protocols/autonat/Cargo.toml              | 2 --
 protocols/dcutr/Cargo.toml                | 2 --
 protocols/floodsub/Cargo.toml             | 2 --
 protocols/gossipsub/Cargo.toml            | 2 --
 protocols/identify/Cargo.toml             | 2 --
 protocols/kad/Cargo.toml                  | 2 --
 protocols/mdns/Cargo.toml                 | 2 --
 protocols/perf/Cargo.toml                 | 2 --
 protocols/ping/Cargo.toml                 | 2 --
 protocols/relay/Cargo.toml                | 2 --
 protocols/rendezvous/Cargo.toml           | 2 --
 protocols/request-response/Cargo.toml     | 2 --
 protocols/upnp/Cargo.toml                 | 2 --
 swarm-derive/Cargo.toml                   | 2 --
 swarm/Cargo.toml                          | 2 --
 transports/dns/Cargo.toml                 | 2 --
 transports/noise/Cargo.toml               | 2 --
 transports/plaintext/Cargo.toml           | 2 --
 transports/pnet/Cargo.toml                | 2 --
 transports/quic/Cargo.toml                | 2 --
 transports/tcp/Cargo.toml                 | 2 --
 transports/tls/Cargo.toml                 | 2 --
 transports/uds/Cargo.toml                 | 2 --
 transports/webrtc/Cargo.toml              | 2 --
 transports/websocket-websys/Cargo.toml    | 2 --
 transports/websocket/Cargo.toml           | 2 --
 transports/webtransport-websys/Cargo.toml | 2 --
 36 files changed, 72 deletions(-)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 3f9bd540f23..8a083276e7f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -48,8 +48,6 @@ serde = ["multihash/serde-codec", "dep:serde", "libp2p-identity/serde"]
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index ea49a1adbb4..cb0b8cb000e 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -56,8 +56,6 @@ harness = false
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 59a075b777e..68a76e52b58 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -150,8 +150,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index 5fb927bee84..b75ea5ed0de 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -40,8 +40,6 @@ libp2p-identity = { workspace = true, features = ["rand"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 77d8de54332..1bbe3642477 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -30,8 +30,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
index a98ffa5308f..985479059a2 100644
--- a/misc/quick-protobuf-codec/Cargo.toml
+++ b/misc/quick-protobuf-codec/Cargo.toml
@@ -30,8 +30,6 @@ harness = false
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
index 557163c438a..20fa2fa23fa 100644
--- a/misc/rw-stream-sink/Cargo.toml
+++ b/misc/rw-stream-sink/Cargo.toml
@@ -22,8 +22,6 @@ async-std = "1.0"
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index fb55e03b614..4fdb4dabedd 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -42,8 +42,6 @@ harness = false
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index f56cd485b9b..289f84fe1dd 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -27,8 +27,6 @@ libp2p-muxer-test-harness = { path = "../test-harness" }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index f047cb7d5ba..7e31a7f3895 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -34,8 +34,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index cd46840caf3..6b1d04f82f5 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -47,8 +47,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 9f0557c6d01..18d77e99e9c 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -30,8 +30,6 @@ tracing = { workspace = true }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index f989e997bfb..4cb590bed0c 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -55,8 +55,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 320c8465650..cdc5ce587de 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -37,8 +37,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 494d812c6ec..72b29d00ef7 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -52,8 +52,6 @@ serde = ["dep:serde", "bytes/serde"]
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 0c8229465d6..19ae5ce9f36 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -54,8 +54,6 @@ required-features = ["tokio"]
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index abe58088caa..398bdce65ec 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -42,8 +42,6 @@ libp2p-swarm-test = { path = "../../swarm-test" }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 2c347adb2c4..66775d3ba8d 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -33,8 +33,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 1a0e7836158..084fec07efd 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -44,8 +44,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 32b233813e3..78a6a1a0a4c 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -44,8 +44,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index af70fd9a83e..c6b2eda348b 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -47,8 +47,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 50ed9db0f6f..e9c7414236d 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -30,5 +30,3 @@ workspace = true
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index d4b596a12cf..b31ea188962 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -23,8 +23,6 @@ proc-macro2 = "1.0"
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 1e2842998a3..375f51490a8 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -67,8 +67,6 @@ required-features = ["macros"]
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [[bench]]
 name = "connection_handler"
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index b728509364a..707b67fc935 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -35,8 +35,6 @@ tokio = ["hickory-resolver/tokio-runtime"]
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 7333d4cddda..76cf9475cc4 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -43,8 +43,6 @@ libp2p-identity = { workspace = true, features = ["rand"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index db6fe75b505..4f07c5fee6e 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -31,8 +31,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index 76964ce3152..e7b3bfc30ac 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -33,8 +33,6 @@ tokio = { workspace = true, features = ["full"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index d2d8c6fc2b0..1f540c9542a 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -35,8 +35,6 @@ async-std = ["dep:async-std", "if-watch/smol", "quinn/runtime-async-std"]
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index b17d7f3b58e..03e7fac491c 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -37,8 +37,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 [package.metadata.docs.rs]
 all-features = true
 
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index c4b30951e66..41b4c215dd9 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -40,8 +40,6 @@ tokio = { workspace = true, features = ["full"] }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
index df5159f3c02..f70ac388fa8 100644
--- a/transports/uds/Cargo.toml
+++ b/transports/uds/Cargo.toml
@@ -24,8 +24,6 @@ tempfile = "3.10"
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index a205810e7c4..fc2748d93c3 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -55,5 +55,3 @@ workspace = true
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 0b3148a8b92..32483f28c57 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -26,8 +26,6 @@ web-sys = { version = "0.3.69", features = ["BinaryType", "CloseEvent", "Message
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [dev-dependencies]
 libp2p-yamux = { workspace = true }
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 271631b4021..e08346da5ca 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -36,8 +36,6 @@ rcgen = { workspace = true }
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 68ba7091794..370158190b1 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -44,8 +44,6 @@ multibase = "0.9.1"
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "docsrs"]
 
 [lints]
 workspace = true

From 98da34a7dc216b5e022ff5400356c73a23dfac96 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Wed, 7 Aug 2024 12:19:54 +0300
Subject: [PATCH 346/455] feat(websocket): Allow wss connections on IP
 addresses

Pull-Request: #5525.
---
 transports/websocket/CHANGELOG.md  |   3 +
 transports/websocket/src/framed.rs | 141 +++++++++++++++++++++++++----
 2 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
index 50b1c42d3e1..df51e2c807d 100644
--- a/transports/websocket/CHANGELOG.md
+++ b/transports/websocket/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 - Implement refactored `Transport`.
   See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+- Allow wss connections on IP addresses.
+  See [PR 5525](https://github.com/libp2p/rust-libp2p/pull/5525).
+
 ## 0.43.2
 
 - fix: Avoid websocket panic on polling after errors. See [PR 5482].
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index fc6a3f0e90e..074271e672f 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -21,7 +21,8 @@
 use crate::{error::Error, quicksink, tls};
 use either::Either;
 use futures::{future::BoxFuture, prelude::*, ready, stream::BoxStream};
-use futures_rustls::{client, rustls, server};
+use futures_rustls::rustls::pki_types::ServerName;
+use futures_rustls::{client, server};
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
     transport::{DialOpts, ListenerId, TransportError, TransportEvent},
@@ -32,6 +33,7 @@ use soketto::{
     connection::{self, CloseReason},
     handshake,
 };
+use std::net::IpAddr;
 use std::{collections::HashMap, ops::DerefMut, sync::Arc};
 use std::{fmt, io, mem, pin::Pin, task::Context, task::Poll};
 use url::Url;
@@ -315,15 +317,12 @@ where
 
         let stream = if addr.use_tls {
             // begin TLS session
-            let dns_name = addr
-                .dns_name
-                .expect("for use_tls we have checked that dns_name is some");
-            tracing::trace!(?dns_name, "Starting TLS handshake");
+            tracing::trace!(?addr.server_name, "Starting TLS handshake");
             let stream = tls_config
                 .client
-                .connect(dns_name.clone(), stream)
+                .connect(addr.server_name.clone(), stream)
                 .map_err(|e| {
-                    tracing::debug!(?dns_name, "TLS handshake failed: {}", e);
+                    tracing::debug!(?addr.server_name, "TLS handshake failed: {}", e);
                     Error::Tls(tls::Error::from(e))
                 })
                 .await?;
@@ -451,7 +450,7 @@ where
 struct WsAddress {
     host_port: String,
     path: String,
-    dns_name: Option<rustls::pki_types::ServerName<'static>>,
+    server_name: ServerName<'static>,
     use_tls: bool,
     tcp_addr: Multiaddr,
 }
@@ -468,19 +467,21 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
     let mut protocols = addr.iter();
     let mut ip = protocols.next();
     let mut tcp = protocols.next();
-    let (host_port, dns_name) = loop {
+    let (host_port, server_name) = loop {
         match (ip, tcp) {
             (Some(Protocol::Ip4(ip)), Some(Protocol::Tcp(port))) => {
-                break (format!("{ip}:{port}"), None)
+                let server_name = ServerName::IpAddress(IpAddr::V4(ip).into());
+                break (format!("{ip}:{port}"), server_name);
             }
             (Some(Protocol::Ip6(ip)), Some(Protocol::Tcp(port))) => {
-                break (format!("{ip}:{port}"), None)
+                let server_name = ServerName::IpAddress(IpAddr::V6(ip).into());
+                break (format!("[{ip}]:{port}"), server_name);
             }
             (Some(Protocol::Dns(h)), Some(Protocol::Tcp(port)))
             | (Some(Protocol::Dns4(h)), Some(Protocol::Tcp(port)))
             | (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port)))
             | (Some(Protocol::Dnsaddr(h)), Some(Protocol::Tcp(port))) => {
-                break (format!("{}:{}", &h, port), Some(tls::dns_name_ref(&h)?))
+                break (format!("{h}:{port}"), tls::dns_name_ref(&h)?)
             }
             (Some(_), Some(p)) => {
                 ip = Some(p);
@@ -499,13 +500,7 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
         match protocols.pop() {
             p @ Some(Protocol::P2p(_)) => p2p = p,
             Some(Protocol::Ws(path)) => break (false, path.into_owned()),
-            Some(Protocol::Wss(path)) => {
-                if dns_name.is_none() {
-                    tracing::debug!(address=%addr, "Missing DNS name in WSS address");
-                    return Err(Error::InvalidMultiaddr(addr));
-                }
-                break (true, path.into_owned());
-            }
+            Some(Protocol::Wss(path)) => break (true, path.into_owned()),
             _ => return Err(Error::InvalidMultiaddr(addr)),
         }
     };
@@ -519,7 +514,7 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
 
     Ok(WsAddress {
         host_port,
-        dns_name,
+        server_name,
         path,
         use_tls,
         tcp_addr,
@@ -757,3 +752,109 @@ where
             .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use libp2p_identity::PeerId;
+    use std::io;
+
+    #[test]
+    fn dial_addr() {
+        let peer_id = PeerId::random();
+
+        // Check `/wss`
+        let addr = "/dns4/example.com/tcp/2222/wss"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "example.com:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "example.com".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/dns4/example.com/tcp/2222".parse().unwrap());
+
+        // Check `/wss` with `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/wss/p2p/{peer_id}")
+            .parse()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "example.com:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "example.com".try_into().unwrap());
+        assert_eq!(
+            info.tcp_addr,
+            format!("/dns4/example.com/tcp/2222/p2p/{peer_id}")
+                .parse()
+                .unwrap()
+        );
+
+        // Check `/wss` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/wss".parse::<Multiaddr>().unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "127.0.0.1:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "127.0.0.1".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip4/127.0.0.1/tcp/2222".parse().unwrap());
+
+        // Check `/wss` with `/ip6`
+        let addr = "/ip6/::1/tcp/2222/wss".parse::<Multiaddr>().unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "[::1]:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "::1".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip6/::1/tcp/2222".parse().unwrap());
+
+        // Check `/ws`
+        let addr = "/dns4/example.com/tcp/2222/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "example.com:2222");
+        assert_eq!(info.path, "/");
+        assert!(!info.use_tls);
+        assert_eq!(info.server_name, "example.com".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/dns4/example.com/tcp/2222".parse().unwrap());
+
+        // Check `/ws` with `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/ws/p2p/{peer_id}")
+            .parse()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "example.com:2222");
+        assert_eq!(info.path, "/");
+        assert!(!info.use_tls);
+        assert_eq!(info.server_name, "example.com".try_into().unwrap());
+        assert_eq!(
+            info.tcp_addr,
+            format!("/dns4/example.com/tcp/2222/p2p/{peer_id}")
+                .parse()
+                .unwrap()
+        );
+
+        // Check `/ws` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/ws".parse::<Multiaddr>().unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "127.0.0.1:2222");
+        assert_eq!(info.path, "/");
+        assert!(!info.use_tls);
+        assert_eq!(info.server_name, "127.0.0.1".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip4/127.0.0.1/tcp/2222".parse().unwrap());
+
+        // Check `/ws` with `/ip6`
+        let addr = "/ip6/::1/tcp/2222/ws".parse::<Multiaddr>().unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "[::1]:2222");
+        assert_eq!(info.path, "/");
+        assert!(!info.use_tls);
+        assert_eq!(info.server_name, "::1".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip6/::1/tcp/2222".parse().unwrap());
+
+        // Check non-ws address
+        let addr = "/ip4/127.0.0.1/tcp/2222".parse::<Multiaddr>().unwrap();
+        parse_ws_dial_addr::<io::Error>(addr).unwrap_err();
+    }
+}

From 417968e07cfb79163a541ee2e5871a9bb6fe9534 Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:16:43 +0200
Subject: [PATCH 347/455] feat(kad): configurable bucket size

Making bucket size configurable. Currently `K_VALUE` is used by default, and the only way to change the bucket size is to edit the const.

Resolves https://github.com/libp2p/rust-libp2p/issues/5389

Pull-Request: #5414.
---
 protocols/kad/CHANGELOG.md          |  8 ++-
 protocols/kad/src/behaviour.rs      | 26 +++++++--
 protocols/kad/src/kbucket.rs        | 91 +++++++++++++++++++++--------
 protocols/kad/src/kbucket/bucket.rs | 78 ++++++++++++++++++-------
 4 files changed, 151 insertions(+), 52 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index a5b404ae6bd..cbb5a4decf2 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -3,9 +3,9 @@
 - Included multiaddresses of found peers alongside peer IDs in `GetClosestPeers` query results.
   See [PR 5475](https://github.com/libp2p/rust-libp2p/pull/5475)
 - Changed `FIND_NODE` response: now includes a list of closest peers when querying the recipient peer ID. Previously, this request yielded an empty response.
-  See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270)
-- Update to DHT republish interval and expiration time defaults to 22h and 48h respectively, rationale in [libp2p/specs#451](https://github.com/libp2p/specs/pull/451)
-  See [PR 3230](https://github.com/libp2p/rust-libp2p/pull/3230)
+  See [PR 5270](https://github.com/libp2p/rust-libp2p/pull/5270).
+- Update to DHT republish interval and expiration time defaults to 22h and 48h respectively, rationale in [libp2p/specs#451](https://github.com/libp2p/specs/pull/451).
+  See [PR 3230](https://github.com/libp2p/rust-libp2p/pull/3230).
 - Use default dial conditions more consistently.
   See [PR 4957](https://github.com/libp2p/rust-libp2p/pull/4957)
 - QueryClose progress whenever closer in range, instead of having to be the closest.
@@ -19,6 +19,8 @@
   See [PR 5148](https://github.com/libp2p/rust-libp2p/pull/5148).
 - Derive `Copy` for `kbucket::key::Key<T>`.
   See [PR 5317](https://github.com/libp2p/rust-libp2p/pull/5317).
+⁻ `KBucket` size can now be modified without changing the `K_VALUE`.
+  See [PR 5414](https://github.com/libp2p/rust-libp2p/pull/5414).
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 8d6f86d7e0f..fc3d8a1adaa 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -24,7 +24,7 @@ mod test;
 
 use crate::addresses::Addresses;
 use crate::handler::{Handler, HandlerEvent, HandlerIn, RequestId};
-use crate::kbucket::{self, Distance, KBucketsTable, NodeStatus};
+use crate::kbucket::{self, Distance, KBucketConfig, KBucketsTable, NodeStatus};
 use crate::protocol::{ConnectionType, KadPeer, ProtocolConfig};
 use crate::query::{Query, QueryConfig, QueryId, QueryPool, QueryPoolState};
 use crate::record::{
@@ -172,7 +172,7 @@ pub enum StoreInserts {
 /// The configuration is consumed by [`Behaviour::new`].
 #[derive(Debug, Clone)]
 pub struct Config {
-    kbucket_pending_timeout: Duration,
+    kbucket_config: KBucketConfig,
     query_config: QueryConfig,
     protocol_config: ProtocolConfig,
     record_ttl: Option<Duration>,
@@ -215,7 +215,7 @@ impl Config {
     /// Builds a new `Config` with the given protocol name.
     pub fn new(protocol_name: StreamProtocol) -> Self {
         Config {
-            kbucket_pending_timeout: Duration::from_secs(60),
+            kbucket_config: KBucketConfig::default(),
             query_config: QueryConfig::default(),
             protocol_config: ProtocolConfig::new(protocol_name),
             record_ttl: Some(Duration::from_secs(48 * 60 * 60)),
@@ -424,6 +424,24 @@ impl Config {
         self
     }
 
+    /// Sets the configuration for the k-buckets.
+    ///
+    /// * Default to K_VALUE.
+    pub fn set_kbucket_size(&mut self, size: NonZeroUsize) -> &mut Self {
+        self.kbucket_config.set_bucket_size(size);
+        self
+    }
+
+    /// Sets the timeout duration after creation of a pending entry after which
+    /// it becomes eligible for insertion into a full bucket, replacing the
+    /// least-recently (dis)connected node.
+    ///
+    /// * Default to `60` s.
+    pub fn set_kbucket_pending_timeout(&mut self, timeout: Duration) -> &mut Self {
+        self.kbucket_config.set_pending_timeout(timeout);
+        self
+    }
+
     /// Sets the time to wait before calling [`Behaviour::bootstrap`] after a new peer is inserted in the routing table.
     /// This prevent cascading bootstrap requests when multiple peers are inserted into the routing table "at the same time".
     /// This also allows to wait a little bit for other potential peers to be inserted into the routing table before
@@ -481,7 +499,7 @@ where
         Behaviour {
             store,
             caching: config.caching,
-            kbuckets: KBucketsTable::new(local_key, config.kbucket_pending_timeout),
+            kbuckets: KBucketsTable::new(local_key, config.kbucket_config),
             kbucket_inserts: config.kbucket_inserts,
             protocol_config: config.protocol_config,
             record_filtering: config.record_filtering,
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 7ed10f7f853..28d7df03917 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -75,15 +75,49 @@ mod key;
 pub use bucket::NodeStatus;
 pub use entry::*;
 
-use arrayvec::ArrayVec;
 use bucket::KBucket;
 use std::collections::VecDeque;
+use std::num::NonZeroUsize;
 use std::time::Duration;
 use web_time::Instant;
 
 /// Maximum number of k-buckets.
 const NUM_BUCKETS: usize = 256;
 
+/// The configuration for `KBucketsTable`.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct KBucketConfig {
+    /// Maximal number of nodes that a bucket can contain.
+    bucket_size: usize,
+    /// Specifies the duration after creation of a [`PendingEntry`] after which
+    /// it becomes eligible for insertion into a full bucket, replacing the
+    /// least-recently (dis)connected node.
+    pending_timeout: Duration,
+}
+
+impl Default for KBucketConfig {
+    fn default() -> Self {
+        KBucketConfig {
+            bucket_size: K_VALUE.get(),
+            pending_timeout: Duration::from_secs(60),
+        }
+    }
+}
+
+impl KBucketConfig {
+    /// Modifies the maximal number of nodes that a bucket can contain.
+    pub(crate) fn set_bucket_size(&mut self, bucket_size: NonZeroUsize) {
+        self.bucket_size = bucket_size.get();
+    }
+
+    /// Modifies the duration after creation of a [`PendingEntry`] after which
+    /// it becomes eligible for insertion into a full bucket, replacing the
+    /// least-recently (dis)connected node.
+    pub(crate) fn set_pending_timeout(&mut self, pending_timeout: Duration) {
+        self.pending_timeout = pending_timeout;
+    }
+}
+
 /// A `KBucketsTable` represents a Kademlia routing table.
 #[derive(Debug, Clone)]
 pub(crate) struct KBucketsTable<TKey, TVal> {
@@ -91,6 +125,8 @@ pub(crate) struct KBucketsTable<TKey, TVal> {
     local_key: TKey,
     /// The buckets comprising the routing table.
     buckets: Vec<KBucket<TKey, TVal>>,
+    /// The maximal number of nodes that a bucket can contain.
+    bucket_size: usize,
     /// The list of evicted entries that have been replaced with pending
     /// entries since the last call to [`KBucketsTable::take_applied_pending`].
     applied_pending: VecDeque<AppliedPending<TKey, TVal>>,
@@ -151,17 +187,12 @@ where
     TVal: Clone,
 {
     /// Creates a new, empty Kademlia routing table with entries partitioned
-    /// into buckets as per the Kademlia protocol.
-    ///
-    /// The given `pending_timeout` specifies the duration after creation of
-    /// a [`PendingEntry`] after which it becomes eligible for insertion into
-    /// a full bucket, replacing the least-recently (dis)connected node.
-    pub(crate) fn new(local_key: TKey, pending_timeout: Duration) -> Self {
+    /// into buckets as per the Kademlia protocol using the provided config.
+    pub(crate) fn new(local_key: TKey, config: KBucketConfig) -> Self {
         KBucketsTable {
             local_key,
-            buckets: (0..NUM_BUCKETS)
-                .map(|_| KBucket::new(pending_timeout))
-                .collect(),
+            buckets: (0..NUM_BUCKETS).map(|_| KBucket::new(config)).collect(),
+            bucket_size: config.bucket_size,
             applied_pending: VecDeque::new(),
         }
     }
@@ -247,13 +278,16 @@ where
         T: AsRef<KeyBytes>,
     {
         let distance = self.local_key.as_ref().distance(target);
+        let bucket_size = self.bucket_size;
         ClosestIter {
             target,
             iter: None,
             table: self,
             buckets_iter: ClosestBucketsIter::new(distance),
-            fmap: |b: &KBucket<TKey, _>| -> ArrayVec<_, { K_VALUE.get() }> {
-                b.iter().map(|(n, _)| n.key.clone()).collect()
+            fmap: move |b: &KBucket<TKey, _>| -> Vec<_> {
+                let mut vec = Vec::with_capacity(bucket_size);
+                vec.extend(b.iter().map(|(n, _)| n.key.clone()));
+                vec
             },
         }
     }
@@ -269,13 +303,15 @@ where
         TVal: Clone,
     {
         let distance = self.local_key.as_ref().distance(target);
+        let bucket_size = self.bucket_size;
         ClosestIter {
             target,
             iter: None,
             table: self,
             buckets_iter: ClosestBucketsIter::new(distance),
-            fmap: |b: &KBucket<_, TVal>| -> ArrayVec<_, { K_VALUE.get() }> {
+            fmap: move |b: &KBucket<_, TVal>| -> Vec<_> {
                 b.iter()
+                    .take(bucket_size)
                     .map(|(n, status)| EntryView {
                         node: n.clone(),
                         status,
@@ -324,7 +360,7 @@ struct ClosestIter<'a, TTarget, TKey, TVal, TMap, TOut> {
     /// distance of the local key to the target.
     buckets_iter: ClosestBucketsIter,
     /// The iterator over the entries in the currently traversed bucket.
-    iter: Option<arrayvec::IntoIter<TOut, { K_VALUE.get() }>>,
+    iter: Option<std::vec::IntoIter<TOut>>,
     /// The projection function / mapping applied on each bucket as
     /// it is encountered, producing the next `iter`ator.
     fmap: TMap,
@@ -429,7 +465,7 @@ where
     TTarget: AsRef<KeyBytes>,
     TKey: Clone + AsRef<KeyBytes>,
     TVal: Clone,
-    TMap: Fn(&KBucket<TKey, TVal>) -> ArrayVec<TOut, { K_VALUE.get() }>,
+    TMap: Fn(&KBucket<TKey, TVal>) -> Vec<TOut>,
     TOut: AsRef<KeyBytes>,
 {
     type Item = TOut;
@@ -535,11 +571,14 @@ mod tests {
         fn arbitrary(g: &mut Gen) -> TestTable {
             let local_key = Key::from(PeerId::random());
             let timeout = Duration::from_secs(g.gen_range(1..360));
-            let mut table = TestTable::new(local_key.into(), timeout);
+            let mut config = KBucketConfig::default();
+            config.set_pending_timeout(timeout);
+            let bucket_size = config.bucket_size;
+            let mut table = TestTable::new(local_key.into(), config);
             let mut num_total = g.gen_range(0..100);
             for (i, b) in &mut table.buckets.iter_mut().enumerate().rev() {
                 let ix = BucketIndex(i);
-                let num = g.gen_range(0..usize::min(K_VALUE.get(), num_total) + 1);
+                let num = g.gen_range(0..usize::min(bucket_size, num_total) + 1);
                 num_total -= num;
                 for _ in 0..num {
                     let distance = ix.rand_distance(&mut rand::thread_rng());
@@ -560,7 +599,9 @@ mod tests {
     fn buckets_are_non_overlapping_and_exhaustive() {
         let local_key = Key::from(PeerId::random());
         let timeout = Duration::from_secs(0);
-        let mut table = KBucketsTable::<KeyBytes, ()>::new(local_key.into(), timeout);
+        let mut config = KBucketConfig::default();
+        config.set_pending_timeout(timeout);
+        let mut table = KBucketsTable::<KeyBytes, ()>::new(local_key.into(), config);
 
         let mut prev_max = U256::from(0);
 
@@ -577,7 +618,9 @@ mod tests {
     fn bucket_contains_range() {
         fn prop(ix: u8) {
             let index = BucketIndex(ix as usize);
-            let mut bucket = KBucket::<Key<PeerId>, ()>::new(Duration::from_secs(0));
+            let mut config = KBucketConfig::default();
+            config.set_pending_timeout(Duration::from_secs(0));
+            let mut bucket = KBucket::<Key<PeerId>, ()>::new(config);
             let bucket_ref = KBucketRef {
                 index,
                 bucket: &mut bucket,
@@ -623,7 +666,7 @@ mod tests {
         let local_key = Key::from(PeerId::random());
         let other_id = Key::from(PeerId::random());
 
-        let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_secs(5));
+        let mut table = KBucketsTable::<_, ()>::new(local_key, KBucketConfig::default());
         if let Some(Entry::Absent(entry)) = table.entry(&other_id) {
             match entry.insert((), NodeStatus::Connected) {
                 InsertResult::Inserted => (),
@@ -641,7 +684,7 @@ mod tests {
     #[test]
     fn entry_self() {
         let local_key = Key::from(PeerId::random());
-        let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_secs(5));
+        let mut table = KBucketsTable::<_, ()>::new(local_key, KBucketConfig::default());
 
         assert!(table.entry(&local_key).is_none())
     }
@@ -649,7 +692,7 @@ mod tests {
     #[test]
     fn closest() {
         let local_key = Key::from(PeerId::random());
-        let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_secs(5));
+        let mut table = KBucketsTable::<_, ()>::new(local_key, KBucketConfig::default());
         let mut count = 0;
         loop {
             if count == 100 {
@@ -684,7 +727,9 @@ mod tests {
     #[test]
     fn applied_pending() {
         let local_key = Key::from(PeerId::random());
-        let mut table = KBucketsTable::<_, ()>::new(local_key, Duration::from_millis(1));
+        let mut config = KBucketConfig::default();
+        config.set_pending_timeout(Duration::from_millis(1));
+        let mut table = KBucketsTable::<_, ()>::new(local_key, config);
         let expected_applied;
         let full_bucket_index;
         loop {
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
index 1bd4389eb3d..1426017aa7a 100644
--- a/protocols/kad/src/kbucket/bucket.rs
+++ b/protocols/kad/src/kbucket/bucket.rs
@@ -88,15 +88,17 @@ pub struct Node<TKey, TVal> {
 }
 
 /// The position of a node in a `KBucket`, i.e. a non-negative integer
-/// in the range `[0, K_VALUE)`.
+/// in the range `[0, bucket_size)`.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct Position(usize);
-/// A `KBucket` is a list of up to `K_VALUE` keys and associated values,
+/// A `KBucket` is a list of up to `capacity` keys and associated values,
 /// ordered from least-recently connected to most-recently connected.
 #[derive(Debug, Clone)]
 pub(crate) struct KBucket<TKey, TVal> {
     /// The nodes contained in the bucket.
-    nodes: ArrayVec<Node<TKey, TVal>, { K_VALUE.get() }>,
+    nodes: Vec<Node<TKey, TVal>>,
+    /// The maximal number of nodes that a bucket can contain.
+    capacity: usize,
 
     /// The position (index) in `nodes` that marks the first connected node.
     ///
@@ -104,7 +106,7 @@ pub(crate) struct KBucket<TKey, TVal> {
     /// most-recently connected, all entries above this index are also considered
     /// connected, i.e. the range `[0, first_connected_pos)` marks the sub-list of entries
     /// that are considered disconnected and the range
-    /// `[first_connected_pos, K_VALUE)` marks sub-list of entries that are
+    /// `[first_connected_pos, capacity)` marks sub-list of entries that are
     /// considered connected.
     ///
     /// `None` indicates that there are no connected entries in the bucket, i.e.
@@ -156,18 +158,31 @@ pub(crate) struct AppliedPending<TKey, TVal> {
     pub(crate) evicted: Option<Node<TKey, TVal>>,
 }
 
+impl<TKey, TVal> Default for KBucket<TKey, TVal> {
+    fn default() -> Self {
+        KBucket {
+            nodes: Vec::with_capacity(K_VALUE.get()),
+            capacity: K_VALUE.get(),
+            first_connected_pos: None,
+            pending: None,
+            pending_timeout: Duration::from_secs(60),
+        }
+    }
+}
+
 impl<TKey, TVal> KBucket<TKey, TVal>
 where
     TKey: Clone + AsRef<KeyBytes>,
     TVal: Clone,
 {
-    /// Creates a new `KBucket` with the given timeout for pending entries.
-    pub(crate) fn new(pending_timeout: Duration) -> Self {
+    /// Creates a new `KBucket` with the given configuration.
+    pub(crate) fn new(config: KBucketConfig) -> Self {
         KBucket {
-            nodes: ArrayVec::new(),
+            nodes: Vec::with_capacity(config.bucket_size),
+            capacity: config.bucket_size,
             first_connected_pos: None,
             pending: None,
-            pending_timeout,
+            pending_timeout: config.pending_timeout,
         }
     }
 
@@ -205,7 +220,7 @@ where
     pub(crate) fn apply_pending(&mut self) -> Option<AppliedPending<TKey, TVal>> {
         if let Some(pending) = self.pending.take() {
             if pending.replace <= Instant::now() {
-                if self.nodes.is_full() {
+                if self.nodes.len() >= self.capacity {
                     if self.status(Position(0)) == NodeStatus::Connected {
                         // The bucket is full with connected nodes. Drop the pending node.
                         return None;
@@ -316,7 +331,7 @@ where
     ) -> InsertResult<TKey> {
         match status {
             NodeStatus::Connected => {
-                if self.nodes.is_full() {
+                if self.nodes.len() >= self.capacity {
                     if self.first_connected_pos == Some(0) || self.pending.is_some() {
                         return InsertResult::Full;
                     } else {
@@ -336,7 +351,7 @@ where
                 InsertResult::Inserted
             }
             NodeStatus::Disconnected => {
-                if self.nodes.is_full() {
+                if self.nodes.len() >= self.capacity {
                     return InsertResult::Full;
                 }
                 if let Some(ref mut p) = self.first_connected_pos {
@@ -435,8 +450,10 @@ mod tests {
     impl Arbitrary for KBucket<Key<PeerId>, ()> {
         fn arbitrary(g: &mut Gen) -> KBucket<Key<PeerId>, ()> {
             let timeout = Duration::from_secs(g.gen_range(1..g.size()) as u64);
-            let mut bucket = KBucket::<Key<PeerId>, ()>::new(timeout);
-            let num_nodes = g.gen_range(1..K_VALUE.get() + 1);
+            let mut config = KBucketConfig::default();
+            config.set_pending_timeout(timeout);
+            let mut bucket = KBucket::<Key<PeerId>, ()>::new(config);
+            let num_nodes = g.gen_range(1..bucket.capacity + 1);
             for _ in 0..num_nodes {
                 let key = Key::from(PeerId::random());
                 let node = Node { key, value: () };
@@ -469,7 +486,7 @@ mod tests {
     // Fill a bucket with random nodes with the given status.
     fn fill_bucket(bucket: &mut KBucket<Key<PeerId>, ()>, status: NodeStatus) {
         let num_entries_start = bucket.num_entries();
-        for i in 0..K_VALUE.get() - num_entries_start {
+        for i in 0..bucket.capacity - num_entries_start {
             let key = Key::from(PeerId::random());
             let node = Node { key, value: () };
             assert_eq!(InsertResult::Inserted, bucket.insert(node, status));
@@ -480,7 +497,7 @@ mod tests {
     #[test]
     fn ordering() {
         fn prop(status: Vec<NodeStatus>) -> bool {
-            let mut bucket = KBucket::<Key<PeerId>, ()>::new(Duration::from_secs(1));
+            let mut bucket = KBucket::<Key<PeerId>, ()>::default();
 
             // The expected lists of connected and disconnected nodes.
             let mut connected = VecDeque::new();
@@ -490,7 +507,7 @@ mod tests {
             for status in status {
                 let key = Key::from(PeerId::random());
                 let node = Node { key, value: () };
-                let full = bucket.num_entries() == K_VALUE.get();
+                let full = bucket.num_entries() == bucket.capacity;
                 if let InsertResult::Inserted = bucket.insert(node, status) {
                     let vec = match status {
                         NodeStatus::Connected => &mut connected,
@@ -522,7 +539,7 @@ mod tests {
 
     #[test]
     fn full_bucket() {
-        let mut bucket = KBucket::<Key<PeerId>, ()>::new(Duration::from_secs(1));
+        let mut bucket = KBucket::<Key<PeerId>, ()>::default();
 
         // Fill the bucket with disconnected nodes.
         fill_bucket(&mut bucket, NodeStatus::Disconnected);
@@ -536,7 +553,7 @@ mod tests {
         }
 
         // One-by-one fill the bucket with connected nodes, replacing the disconnected ones.
-        for i in 0..K_VALUE.get() {
+        for i in 0..bucket.capacity {
             let (first, first_status) = bucket.iter().next().unwrap();
             let first_disconnected = first.clone();
             assert_eq!(first_status, NodeStatus::Disconnected);
@@ -573,11 +590,11 @@ mod tests {
             );
             assert_eq!(Some((&node, NodeStatus::Connected)), bucket.iter().last());
             assert!(bucket.pending().is_none());
-            assert_eq!(Some(K_VALUE.get() - (i + 1)), bucket.first_connected_pos);
+            assert_eq!(Some(bucket.capacity - (i + 1)), bucket.first_connected_pos);
         }
 
         assert!(bucket.pending().is_none());
-        assert_eq!(K_VALUE.get(), bucket.num_entries());
+        assert_eq!(bucket.capacity, bucket.num_entries());
 
         // Trying to insert another connected node fails.
         let key = Key::from(PeerId::random());
@@ -590,7 +607,7 @@ mod tests {
 
     #[test]
     fn full_bucket_discard_pending() {
-        let mut bucket = KBucket::<Key<PeerId>, ()>::new(Duration::from_secs(1));
+        let mut bucket = KBucket::<Key<PeerId>, ()>::default();
         fill_bucket(&mut bucket, NodeStatus::Disconnected);
         let (first, _) = bucket.iter().next().unwrap();
         let first_disconnected = first.clone();
@@ -622,7 +639,7 @@ mod tests {
             bucket.first_connected_pos
         );
         assert_eq!(1, bucket.num_connected());
-        assert_eq!(K_VALUE.get() - 1, bucket.num_disconnected());
+        assert_eq!(bucket.capacity - 1, bucket.num_disconnected());
     }
 
     #[test]
@@ -654,4 +671,21 @@ mod tests {
 
         quickcheck(prop as fn(_, _, _) -> _);
     }
+
+    #[test]
+    fn test_custom_bucket_size() {
+        let bucket_sizes: [NonZeroUsize; 4] = [
+            NonZeroUsize::new(2).unwrap(),
+            NonZeroUsize::new(20).unwrap(),
+            NonZeroUsize::new(200).unwrap(),
+            NonZeroUsize::new(2000).unwrap(),
+        ];
+        for &size in &bucket_sizes {
+            let mut config = KBucketConfig::default();
+            config.set_bucket_size(size);
+            let mut bucket = KBucket::<Key<PeerId>, ()>::new(config);
+            fill_bucket(&mut bucket, NodeStatus::Disconnected);
+            assert_eq!(size.get(), bucket.num_entries());
+        }
+    }
 }

From ddda3be64468af360419daf92f824375247f40e3 Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Thu, 8 Aug 2024 15:05:11 +0200
Subject: [PATCH 348/455] chore: add Gui as a maintainer

Pull-Request: #5538.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f43cf044ef3..eeab866768d 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 
 (In alphabetical order.)
 
+- Guillaume Michel ([@guillaumemichel](https://github.com/guillaumemichel))
 - João Oliveira ([@jxs](https://github.com/jxs))
 
 ## Notable users

From 848e2e9e103af75f7b1d868839e971d2cc5dc706 Mon Sep 17 00:00:00 2001
From: Hannes <55623006+umgefahren@users.noreply.github.com>
Date: Thu, 8 Aug 2024 15:35:29 +0200
Subject: [PATCH 349/455] feat(autonat): Implement AutoNATv2

Closes: #4524

This is the implementation of the evolved AutoNAT protocol, named AutonatV2 as defined in the [spec](https://github.com/libp2p/specs/blob/03718ef0f2dea4a756a85ba716ee33f97e4a6d6c/autonat/autonat-v2.md).
The stabilization PR for the spec can be found under libp2p/specs#538.

The work on the Rust implementation can be found in the PR to my fork: umgefahren/rust-libp2p#1.

The implementation has been smoke-tested with the Go implementation (PR: libp2p/go-libp2p#2469).

The new protocol addresses shortcomings of the original AutoNAT protocol:

- Since the server now always dials back over a newly allocated port, this made #4568 necessary; the client can be sure of the reachability state for other peers, even if the connection to the server was made through a hole punch.
- The server can now test addresses different from the observed address (i.e., the connection to the server was made through a `p2p-circuit`). To mitigate against DDoS attacks, the client has to send more data to the server than the dial-back costs.

Pull-Request: #5526.
---
 Cargo.lock                                    | 227 ++++++-
 Cargo.toml                                    |   1 +
 examples/autonatv2/Cargo.toml                 |  38 ++
 examples/autonatv2/Dockerfile                 |  20 +
 examples/autonatv2/docker-compose.yml         |  16 +
 .../autonatv2/src/bin/autonatv2_client.rs     | 111 ++++
 .../autonatv2/src/bin/autonatv2_server.rs     |  87 +++
 protocols/autonat/CHANGELOG.md                |   7 +
 protocols/autonat/Cargo.toml                  |  31 +-
 protocols/autonat/src/lib.rs                  |  45 +-
 protocols/autonat/src/v1.rs                   |  45 ++
 protocols/autonat/src/{ => v1}/behaviour.rs   |   4 +-
 .../src/{ => v1}/behaviour/as_client.rs       |   0
 .../src/{ => v1}/behaviour/as_server.rs       |   1 -
 .../autonat/src/{ => v1}/generated/mod.rs     |   0
 .../src/{ => v1}/generated/structs.proto      |   0
 .../autonat/src/{ => v1}/generated/structs.rs |   0
 protocols/autonat/src/{ => v1}/protocol.rs    |   0
 protocols/autonat/src/v2.rs                   |  37 ++
 protocols/autonat/src/v2/client.rs            |   5 +
 protocols/autonat/src/v2/client/behaviour.rs  | 439 ++++++++++++++
 protocols/autonat/src/v2/client/handler.rs    |   2 +
 .../src/v2/client/handler/dial_back.rs        | 141 +++++
 .../src/v2/client/handler/dial_request.rs     | 343 +++++++++++
 protocols/autonat/src/v2/generated/mod.rs     |   2 +
 .../autonat/src/v2/generated/structs.proto    |  54 ++
 protocols/autonat/src/v2/generated/structs.rs | 403 +++++++++++++
 protocols/autonat/src/v2/protocol.rs          | 337 +++++++++++
 protocols/autonat/src/v2/server.rs            |   5 +
 protocols/autonat/src/v2/server/behaviour.rs  | 156 +++++
 protocols/autonat/src/v2/server/handler.rs    |   8 +
 .../src/v2/server/handler/dial_back.rs        | 140 +++++
 .../src/v2/server/handler/dial_request.rs     | 332 ++++++++++
 protocols/autonat/tests/autonatv2.rs          | 568 ++++++++++++++++++
 34 files changed, 3525 insertions(+), 80 deletions(-)
 create mode 100644 examples/autonatv2/Cargo.toml
 create mode 100644 examples/autonatv2/Dockerfile
 create mode 100644 examples/autonatv2/docker-compose.yml
 create mode 100644 examples/autonatv2/src/bin/autonatv2_client.rs
 create mode 100644 examples/autonatv2/src/bin/autonatv2_server.rs
 create mode 100644 protocols/autonat/src/v1.rs
 rename protocols/autonat/src/{ => v1}/behaviour.rs (99%)
 rename protocols/autonat/src/{ => v1}/behaviour/as_client.rs (100%)
 rename protocols/autonat/src/{ => v1}/behaviour/as_server.rs (99%)
 rename protocols/autonat/src/{ => v1}/generated/mod.rs (100%)
 rename protocols/autonat/src/{ => v1}/generated/structs.proto (100%)
 rename protocols/autonat/src/{ => v1}/generated/structs.rs (100%)
 rename protocols/autonat/src/{ => v1}/protocol.rs (100%)
 create mode 100644 protocols/autonat/src/v2.rs
 create mode 100644 protocols/autonat/src/v2/client.rs
 create mode 100644 protocols/autonat/src/v2/client/behaviour.rs
 create mode 100644 protocols/autonat/src/v2/client/handler.rs
 create mode 100644 protocols/autonat/src/v2/client/handler/dial_back.rs
 create mode 100644 protocols/autonat/src/v2/client/handler/dial_request.rs
 create mode 100644 protocols/autonat/src/v2/generated/mod.rs
 create mode 100644 protocols/autonat/src/v2/generated/structs.proto
 create mode 100644 protocols/autonat/src/v2/generated/structs.rs
 create mode 100644 protocols/autonat/src/v2/protocol.rs
 create mode 100644 protocols/autonat/src/v2/server.rs
 create mode 100644 protocols/autonat/src/v2/server/behaviour.rs
 create mode 100644 protocols/autonat/src/v2/server/handler.rs
 create mode 100644 protocols/autonat/src/v2/server/handler/dial_back.rs
 create mode 100644 protocols/autonat/src/v2/server/handler/dial_request.rs
 create mode 100644 protocols/autonat/tests/autonatv2.rs

diff --git a/Cargo.lock b/Cargo.lock
index cf0cde790c3..af3ceb9eb0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -528,6 +528,23 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "autonatv2"
+version = "0.1.0"
+dependencies = [
+ "cfg-if",
+ "clap",
+ "libp2p",
+ "opentelemetry 0.21.0",
+ "opentelemetry-jaeger",
+ "opentelemetry_sdk 0.21.2",
+ "rand 0.8.5",
+ "tokio",
+ "tracing",
+ "tracing-opentelemetry 0.22.0",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "axum"
 version = "0.6.20"
@@ -1120,6 +1137,15 @@ dependencies = [
  "itertools",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.3"
@@ -1146,12 +1172,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -2404,6 +2427,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "integer-encoding"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
+
 [[package]]
 name = "interceptor"
 version = "0.10.0"
@@ -2454,7 +2483,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-logger",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -2664,9 +2693,13 @@ dependencies = [
  "async-std",
  "async-trait",
  "asynchronous-codec",
+ "bytes",
+ "either",
  "futures",
+ "futures-bounded",
  "futures-timer",
  "libp2p-core",
+ "libp2p-identify",
  "libp2p-identity",
  "libp2p-request-response",
  "libp2p-swarm",
@@ -2674,9 +2707,13 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
+ "rand_core 0.6.4",
+ "thiserror",
+ "tokio",
  "tracing",
  "tracing-subscriber",
- "web-time",
+ "void",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -2724,7 +2761,7 @@ dependencies = [
  "tracing",
  "unsigned-varint 0.8.0",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -2758,7 +2795,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -2833,7 +2870,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -2921,7 +2958,7 @@ dependencies = [
  "tracing-subscriber",
  "uint",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -2984,7 +3021,7 @@ dependencies = [
  "libp2p-swarm",
  "pin-project",
  "prometheus-client",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3076,7 +3113,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3096,7 +3133,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3193,7 +3230,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3223,7 +3260,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3252,7 +3289,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "void",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3323,7 +3360,7 @@ dependencies = [
  "trybuild",
  "void",
  "wasm-bindgen-futures",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3741,13 +3778,13 @@ dependencies = [
  "axum 0.7.5",
  "futures",
  "libp2p",
- "opentelemetry",
+ "opentelemetry 0.23.0",
  "opentelemetry-otlp",
- "opentelemetry_sdk",
+ "opentelemetry_sdk 0.23.0",
  "prometheus-client",
  "tokio",
  "tracing",
- "tracing-opentelemetry",
+ "tracing-opentelemetry 0.24.0",
  "tracing-subscriber",
 ]
 
@@ -4134,6 +4171,22 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "opentelemetry"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "indexmap 2.2.1",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite",
+ "thiserror",
+ "urlencoding",
+]
+
 [[package]]
 name = "opentelemetry"
 version = "0.23.0"
@@ -4148,6 +4201,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "opentelemetry-jaeger"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1"
+dependencies = [
+ "async-trait",
+ "futures-core",
+ "futures-util",
+ "opentelemetry 0.21.0",
+ "opentelemetry-semantic-conventions",
+ "opentelemetry_sdk 0.21.2",
+ "thrift",
+ "tokio",
+]
+
 [[package]]
 name = "opentelemetry-otlp"
 version = "0.16.0"
@@ -4157,9 +4226,9 @@ dependencies = [
  "async-trait",
  "futures-core",
  "http 0.2.9",
- "opentelemetry",
+ "opentelemetry 0.23.0",
  "opentelemetry-proto",
- "opentelemetry_sdk",
+ "opentelemetry_sdk 0.23.0",
  "prost",
  "thiserror",
  "tokio",
@@ -4172,12 +4241,43 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162"
 dependencies = [
- "opentelemetry",
- "opentelemetry_sdk",
+ "opentelemetry 0.23.0",
+ "opentelemetry_sdk 0.23.0",
  "prost",
  "tonic",
 ]
 
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84"
+dependencies = [
+ "opentelemetry 0.21.0",
+]
+
+[[package]]
+name = "opentelemetry_sdk"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4"
+dependencies = [
+ "async-trait",
+ "crossbeam-channel",
+ "futures-channel",
+ "futures-executor",
+ "futures-util",
+ "glob",
+ "once_cell",
+ "opentelemetry 0.21.0",
+ "ordered-float 4.2.0",
+ "percent-encoding",
+ "rand 0.8.5",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "opentelemetry_sdk"
 version = "0.23.0"
@@ -4191,8 +4291,8 @@ dependencies = [
  "glob",
  "lazy_static",
  "once_cell",
- "opentelemetry",
- "ordered-float",
+ "opentelemetry 0.23.0",
+ "ordered-float 4.2.0",
  "percent-encoding",
  "rand 0.8.5",
  "thiserror",
@@ -4200,6 +4300,15 @@ dependencies = [
  "tokio-stream",
 ]
 
+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "ordered-float"
 version = "4.2.0"
@@ -5926,6 +6035,28 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "thrift"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09"
+dependencies = [
+ "byteorder",
+ "integer-encoding",
+ "log",
+ "ordered-float 2.10.1",
+ "threadpool",
+]
+
 [[package]]
 name = "time"
 version = "0.3.36"
@@ -6230,6 +6361,24 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-opentelemetry"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596"
+dependencies = [
+ "js-sys",
+ "once_cell",
+ "opentelemetry 0.21.0",
+ "opentelemetry_sdk 0.21.2",
+ "smallvec",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+ "web-time 0.2.4",
+]
+
 [[package]]
 name = "tracing-opentelemetry"
 version = "0.24.0"
@@ -6238,14 +6387,14 @@ checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4"
 dependencies = [
  "js-sys",
  "once_cell",
- "opentelemetry",
- "opentelemetry_sdk",
+ "opentelemetry 0.23.0",
+ "opentelemetry_sdk 0.23.0",
  "smallvec",
  "tracing",
  "tracing-core",
  "tracing-log",
  "tracing-subscriber",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
@@ -6429,6 +6578,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -6632,6 +6787,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "web-time"
 version = "1.1.0"
@@ -7227,7 +7392,7 @@ dependencies = [
  "pin-project",
  "rand 0.8.5",
  "static_assertions",
- "web-time",
+ "web-time 1.1.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7eb1517d24c..3f00734ae3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 members = [
     "core",
     "examples/autonat",
+    "examples/autonatv2",
     "examples/browser-webrtc",
     "examples/chat",
     "examples/dcutr",
diff --git a/examples/autonatv2/Cargo.toml b/examples/autonatv2/Cargo.toml
new file mode 100644
index 00000000000..6c862ee22e4
--- /dev/null
+++ b/examples/autonatv2/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "autonatv2"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "MIT or Apache-2.0"
+
+[package.metadata.release]
+release = false
+
+[[bin]]
+name = "autonatv2_client"
+
+[[bin]]
+name = "autonatv2_server"
+
+[dependencies]
+libp2p = { workspace = true, features = ["macros", "tokio", "tcp", "noise", "yamux", "autonat", "identify", "dns", "quic"] }
+clap = { version = "4.4.18", features = ["derive"] }
+tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+rand = "0.8.5"
+opentelemetry = { version = "0.21.0", optional = true }
+opentelemetry_sdk = { version = "0.21.1", optional = true, features = ["rt-tokio"] }
+tracing-opentelemetry = { version = "0.22.0", optional = true }
+opentelemetry-jaeger = { version = "0.20.0", optional = true, features = ["rt-tokio"] }
+cfg-if = "1.0.0"
+
+[features]
+jaeger = ["opentelemetry", "opentelemetry_sdk", "tracing-opentelemetry", "opentelemetry-jaeger"]
+opentelemetry = ["dep:opentelemetry"]
+opentelemetry_sdk = ["dep:opentelemetry_sdk"]
+tracing-opentelemetry = ["dep:tracing-opentelemetry"]
+opentelemetry-jaeger = ["dep:opentelemetry-jaeger"]
+
+[lints]
+workspace = true
diff --git a/examples/autonatv2/Dockerfile b/examples/autonatv2/Dockerfile
new file mode 100644
index 00000000000..5a523649d80
--- /dev/null
+++ b/examples/autonatv2/Dockerfile
@@ -0,0 +1,20 @@
+FROM rust:1.75-alpine as builder
+
+RUN apk add musl-dev
+
+WORKDIR /workspace
+COPY . .
+RUN --mount=type=cache,target=./target \
+    --mount=type=cache,target=/usr/local/cargo/registry \
+    cargo build --release --package autonatv2 --bin autonatv2_server -F jaeger
+
+RUN --mount=type=cache,target=./target \
+    mv ./target/release/autonatv2_server /usr/local/bin/autonatv2_server
+
+FROM alpine:latest
+
+COPY --from=builder /usr/local/bin/autonatv2_server /app/autonatv2_server
+
+EXPOSE 4884
+
+ENTRYPOINT [ "/app/autonatv2_server", "-l", "4884" ]
diff --git a/examples/autonatv2/docker-compose.yml b/examples/autonatv2/docker-compose.yml
new file mode 100644
index 00000000000..75f44e7e6f9
--- /dev/null
+++ b/examples/autonatv2/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+    autonatv2:
+        build:
+            context: ../..
+            dockerfile: examples/autonatv2/Dockerfile
+        ports:
+            - 4884:4884
+    jaeger:
+        image: jaegertracing/all-in-one
+        ports:
+            - 6831:6831/udp
+            - 6832:6832/udp
+            - 16686:16686
+            - 14268:14268
diff --git a/examples/autonatv2/src/bin/autonatv2_client.rs b/examples/autonatv2/src/bin/autonatv2_client.rs
new file mode 100644
index 00000000000..de902514dd8
--- /dev/null
+++ b/examples/autonatv2/src/bin/autonatv2_client.rs
@@ -0,0 +1,111 @@
+use std::{error::Error, net::Ipv4Addr, time::Duration};
+
+use clap::Parser;
+use libp2p::{
+    autonat,
+    futures::StreamExt,
+    identify, identity,
+    multiaddr::Protocol,
+    noise,
+    swarm::{dial_opts::DialOpts, NetworkBehaviour, SwarmEvent},
+    tcp, yamux, Multiaddr, SwarmBuilder,
+};
+use rand::rngs::OsRng;
+use tracing_subscriber::EnvFilter;
+
+#[derive(Debug, Parser)]
+#[clap(name = "libp2p autonatv2 client")]
+struct Opt {
+    /// Port where the client will listen for incoming connections.
+    #[clap(short = 'p', long, default_value_t = 0)]
+    listen_port: u16,
+
+    /// Address of the server where want to connect to.
+    #[clap(short = 'a', long)]
+    server_address: Multiaddr,
+
+    /// Probe interval in seconds.
+    #[clap(short = 't', long, default_value = "2")]
+    probe_interval: u64,
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    let opt = Opt::parse();
+
+    let mut swarm = SwarmBuilder::with_new_identity()
+        .with_tokio()
+        .with_tcp(
+            tcp::Config::default(),
+            noise::Config::new,
+            yamux::Config::default,
+        )?
+        .with_quic()
+        .with_dns()?
+        .with_behaviour(|key| Behaviour::new(key.public(), opt.probe_interval))?
+        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(10)))
+        .build();
+
+    swarm.listen_on(
+        Multiaddr::empty()
+            .with(Protocol::Ip4(Ipv4Addr::UNSPECIFIED))
+            .with(Protocol::Tcp(opt.listen_port)),
+    )?;
+
+    swarm.dial(
+        DialOpts::unknown_peer_id()
+            .address(opt.server_address)
+            .build(),
+    )?;
+
+    loop {
+        match swarm.select_next_some().await {
+            SwarmEvent::NewListenAddr { address, .. } => {
+                println!("Listening on {address:?}");
+            }
+            SwarmEvent::Behaviour(BehaviourEvent::Autonat(autonat::v2::client::Event {
+                server,
+                tested_addr,
+                bytes_sent,
+                result: Ok(()),
+            })) => {
+                println!("Tested {tested_addr} with {server}. Sent {bytes_sent} bytes for verification. Everything Ok and verified.");
+            }
+            SwarmEvent::Behaviour(BehaviourEvent::Autonat(autonat::v2::client::Event {
+                server,
+                tested_addr,
+                bytes_sent,
+                result: Err(e),
+            })) => {
+                println!("Tested {tested_addr} with {server}. Sent {bytes_sent} bytes for verification. Failed with {e:?}.");
+            }
+            SwarmEvent::ExternalAddrConfirmed { address } => {
+                println!("External address confirmed: {address}");
+            }
+            _ => {}
+        }
+    }
+}
+
+#[derive(NetworkBehaviour)]
+pub struct Behaviour {
+    autonat: autonat::v2::client::Behaviour,
+    identify: identify::Behaviour,
+}
+
+impl Behaviour {
+    pub fn new(key: identity::PublicKey, probe_interval: u64) -> Self {
+        Self {
+            autonat: autonat::v2::client::Behaviour::new(
+                OsRng,
+                autonat::v2::client::Config::default()
+                    .with_probe_interval(Duration::from_secs(probe_interval)),
+            ),
+            identify: identify::Behaviour::new(identify::Config::new("/ipfs/0.1.0".into(), key)),
+        }
+    }
+}
diff --git a/examples/autonatv2/src/bin/autonatv2_server.rs b/examples/autonatv2/src/bin/autonatv2_server.rs
new file mode 100644
index 00000000000..849ed3b3b0a
--- /dev/null
+++ b/examples/autonatv2/src/bin/autonatv2_server.rs
@@ -0,0 +1,87 @@
+use std::{error::Error, net::Ipv4Addr, time::Duration};
+
+use cfg_if::cfg_if;
+use clap::Parser;
+use libp2p::{
+    autonat,
+    futures::StreamExt,
+    identify, identity,
+    multiaddr::Protocol,
+    noise,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    tcp, yamux, Multiaddr, SwarmBuilder,
+};
+use rand::rngs::OsRng;
+
+#[derive(Debug, Parser)]
+#[clap(name = "libp2p autonatv2 server")]
+struct Opt {
+    #[clap(short, long, default_value_t = 0)]
+    listen_port: u16,
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    cfg_if! {
+        if #[cfg(feature = "jaeger")] {
+            use tracing_subscriber::layer::SubscriberExt;
+            use opentelemetry_sdk::runtime::Tokio;
+            let tracer = opentelemetry_jaeger::new_agent_pipeline()
+                .with_endpoint("jaeger:6831")
+                .with_service_name("autonatv2")
+                .install_batch(Tokio)?;
+            let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
+            let subscriber = tracing_subscriber::Registry::default()
+                .with(telemetry);
+        } else {
+            let subscriber = tracing_subscriber::fmt()
+                .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+                .finish();
+        }
+    }
+    tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");
+
+    let opt = Opt::parse();
+
+    let mut swarm = SwarmBuilder::with_new_identity()
+        .with_tokio()
+        .with_tcp(
+            tcp::Config::default(),
+            noise::Config::new,
+            yamux::Config::default,
+        )?
+        .with_quic()
+        .with_dns()?
+        .with_behaviour(|key| Behaviour::new(key.public()))?
+        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
+        .build();
+
+    swarm.listen_on(
+        Multiaddr::empty()
+            .with(Protocol::Ip4(Ipv4Addr::UNSPECIFIED))
+            .with(Protocol::Tcp(opt.listen_port)),
+    )?;
+
+    loop {
+        match swarm.select_next_some().await {
+            SwarmEvent::NewListenAddr { address, .. } => println!("Listening on {address:?}"),
+            SwarmEvent::Behaviour(event) => println!("{event:?}"),
+            e => println!("{e:?}"),
+        }
+    }
+}
+
+#[derive(NetworkBehaviour)]
+pub struct Behaviour {
+    autonat: autonat::v2::server::Behaviour,
+    identify: identify::Behaviour,
+}
+
+impl Behaviour {
+    pub fn new(key: identity::PublicKey) -> Self {
+        Self {
+            autonat: autonat::v2::server::Behaviour::new(OsRng),
+            identify: identify::Behaviour::new(identify::Config::new("/ipfs/0.1.0".into(), key)),
+        }
+    }
+}
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index 2a799221f7c..e171412aa58 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -3,6 +3,13 @@
 - Due to the refactor of `Transport` it's no longer required to create a seperate transport for
 AutoNAT where port reuse is disabled. This information is now passed by the behaviour.
   See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568).
+- Introduce the new AutoNATv2 protocol.
+  It's split into a client and a server part, represented in their respective modules
+  Features:
+    - The server now always dials back over a newly allocated port.
+      This more accurately reflects the reachability state for other peers and avoids accidental hole punching.
+    - The server can now test addresses different from the observed address (i.e., the connection to the server was made through a `p2p-circuit`). To mitigate against DDoS attacks, the client has to send more data to the server than the dial-back costs.
+  See [PR 5526](https://github.com/libp2p/rust-libp2p/pull/5526).
 
 <!-- Update to libp2p-swarm v0.45.0 -->
 
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 7e31a7f3895..2c01d18dceb 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -3,32 +3,47 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
-authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>"]
 version = "0.13.0"
+authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>", "Hannes Furmans <hannes@umgefahren.xyz>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
+
 [dependencies]
-async-trait = "0.1"
+async-trait = { version = "0.1", optional = true }
+asynchronous-codec = { workspace = true }
+bytes = { version = "1", optional = true }
+either = { version = "1.9.0", optional = true }
 futures = { workspace = true }
+futures-bounded = { workspace = true, optional = true }
 futures-timer = "3.0"
-web-time = { workspace = true }
+web-time = { workspace = true, optional = true }
 libp2p-core = { workspace = true }
-libp2p-swarm = { workspace = true }
-libp2p-request-response = { workspace = true }
 libp2p-identity = { workspace = true }
+libp2p-request-response = { workspace = true, optional = true }
+libp2p-swarm = { workspace = true }
 quick-protobuf = "0.8"
-rand = "0.8"
 tracing = { workspace = true }
 quick-protobuf-codec = { workspace = true }
-asynchronous-codec = { workspace = true }
+rand = "0.8"
+rand_core = { version = "0.6", optional = true }
+thiserror = { version = "1.0.52", optional = true }
+void = { version = "1", optional = true }
 
 [dev-dependencies]
+tokio = { version = "1", features = ["macros", "rt", "sync"]}
 async-std = { version = "1.10", features = ["attributes"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+libp2p-identify = { workspace = true }
+libp2p-swarm = { workspace = true, features = ["macros"]}
+
+[features]
+default = ["v1", "v2"]
+v1 = ["dep:libp2p-request-response", "dep:web-time", "dep:async-trait"]
+v2 = ["dep:bytes", "dep:either", "dep:futures-bounded", "dep:thiserror", "dep:void", "dep:rand_core"]
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/autonat/src/lib.rs b/protocols/autonat/src/lib.rs
index 10c87b1e984..e49eaadcb83 100644
--- a/protocols/autonat/src/lib.rs
+++ b/protocols/autonat/src/lib.rs
@@ -1,41 +1,10 @@
-// Copyright 2021 Protocol Labs.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
-//! Implementation of the [AutoNAT](https://github.com/libp2p/specs/blob/master/autonat/README.md) protocol.
+#[cfg(feature = "v1")]
+pub mod v1;
 
-#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#[cfg(feature = "v2")]
+pub mod v2;
 
-mod behaviour;
-mod protocol;
-
-pub use self::{
-    behaviour::{
-        Behaviour, Config, Event, InboundProbeError, InboundProbeEvent, NatStatus,
-        OutboundProbeError, OutboundProbeEvent, ProbeId,
-    },
-    protocol::{ResponseError, DEFAULT_PROTOCOL_NAME},
-};
-pub use libp2p_request_response::{InboundFailure, OutboundFailure};
-
-mod proto {
-    #![allow(unreachable_pub)]
-    include!("generated/mod.rs");
-    pub(crate) use self::structs::{mod_Message::*, Message};
-}
+#[cfg(feature = "v1")]
+pub use v1::*;
diff --git a/protocols/autonat/src/v1.rs b/protocols/autonat/src/v1.rs
new file mode 100644
index 00000000000..c60e4805f40
--- /dev/null
+++ b/protocols/autonat/src/v1.rs
@@ -0,0 +1,45 @@
+// Copyright 2021 Protocol Labs.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+//! Implementation of the [AutoNAT](https://github.com/libp2p/specs/blob/master/autonat/README.md) protocol.
+//!
+//! ## Eventual Deprecation
+//! This version of the protocol will eventually be deprecated in favor of [v2](crate::v2).
+//! We recommend using v2 for new projects.
+
+#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+
+pub(crate) mod behaviour;
+pub(crate) mod protocol;
+
+pub use self::{
+    behaviour::{
+        Behaviour, Config, Event, InboundProbeError, InboundProbeEvent, NatStatus,
+        OutboundProbeError, OutboundProbeEvent, ProbeId,
+    },
+    protocol::{ResponseError, DEFAULT_PROTOCOL_NAME},
+};
+pub use libp2p_request_response::{InboundFailure, OutboundFailure};
+
+pub(crate) mod proto {
+    #![allow(unreachable_pub)]
+    include!("v1/generated/mod.rs");
+    pub(crate) use self::structs::{mod_Message::*, Message};
+}
diff --git a/protocols/autonat/src/behaviour.rs b/protocols/autonat/src/v1/behaviour.rs
similarity index 99%
rename from protocols/autonat/src/behaviour.rs
rename to protocols/autonat/src/v1/behaviour.rs
index 64bebfb6233..7a717baed8d 100644
--- a/protocols/autonat/src/behaviour.rs
+++ b/protocols/autonat/src/v1/behaviour.rs
@@ -339,7 +339,7 @@ impl Behaviour {
             ConnectedPoint::Dialer {
                 address,
                 role_override: Endpoint::Dialer,
-                ..
+                port_use: _,
             } => {
                 if let Some(event) = self.as_server().on_outbound_connection(&peer, address) {
                     self.pending_actions
@@ -349,7 +349,7 @@ impl Behaviour {
             ConnectedPoint::Dialer {
                 address: _,
                 role_override: Endpoint::Listener,
-                ..
+                port_use: _,
             } => {
                 // Outgoing connection was dialed as a listener. In other words outgoing connection
                 // was dialed as part of a hole punch. `libp2p-autonat` never attempts to hole
diff --git a/protocols/autonat/src/behaviour/as_client.rs b/protocols/autonat/src/v1/behaviour/as_client.rs
similarity index 100%
rename from protocols/autonat/src/behaviour/as_client.rs
rename to protocols/autonat/src/v1/behaviour/as_client.rs
diff --git a/protocols/autonat/src/behaviour/as_server.rs b/protocols/autonat/src/v1/behaviour/as_server.rs
similarity index 99%
rename from protocols/autonat/src/behaviour/as_server.rs
rename to protocols/autonat/src/v1/behaviour/as_server.rs
index 8f1d6642de5..3ecdd3ac26e 100644
--- a/protocols/autonat/src/behaviour/as_server.rs
+++ b/protocols/autonat/src/v1/behaviour/as_server.rs
@@ -17,7 +17,6 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-
 use super::{
     Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, ProbeId,
     ResponseError,
diff --git a/protocols/autonat/src/generated/mod.rs b/protocols/autonat/src/v1/generated/mod.rs
similarity index 100%
rename from protocols/autonat/src/generated/mod.rs
rename to protocols/autonat/src/v1/generated/mod.rs
diff --git a/protocols/autonat/src/generated/structs.proto b/protocols/autonat/src/v1/generated/structs.proto
similarity index 100%
rename from protocols/autonat/src/generated/structs.proto
rename to protocols/autonat/src/v1/generated/structs.proto
diff --git a/protocols/autonat/src/generated/structs.rs b/protocols/autonat/src/v1/generated/structs.rs
similarity index 100%
rename from protocols/autonat/src/generated/structs.rs
rename to protocols/autonat/src/v1/generated/structs.rs
diff --git a/protocols/autonat/src/protocol.rs b/protocols/autonat/src/v1/protocol.rs
similarity index 100%
rename from protocols/autonat/src/protocol.rs
rename to protocols/autonat/src/v1/protocol.rs
diff --git a/protocols/autonat/src/v2.rs b/protocols/autonat/src/v2.rs
new file mode 100644
index 00000000000..994497cb1a0
--- /dev/null
+++ b/protocols/autonat/src/v2.rs
@@ -0,0 +1,37 @@
+//! The second version of the autonat protocol.
+//!
+//! The implementation follows the [libp2p spec](https://github.com/libp2p/specs/blob/03718ef0f2dea4a756a85ba716ee33f97e4a6d6c/autonat/autonat-v2.md).
+//!
+//! The new version fixes the issues of the first version:
+//! - The server now always dials back over a newly allocated port. This greatly reduces the risk of
+//!     false positives that often occured in the first version, when the clinet-server connection
+//!     occured over a hole-punched port.
+//! - The server protects against DoS attacks by requiring the client to send more data to the
+//!     server then the dial back puts on the client, thus making the protocol unatractive for an
+//!     attacker.
+//!
+//! The protocol is seperated into two parts:
+//! - The client part, which is implemented in the `client` module. (The client is the party that
+//!     wants to check if it is reachable from the outside.)
+//! - The server part, which is implemented in the `server` module. (The server is the party
+//!     performing reachability checks on behalf of the client.)
+//!
+//! The two can be used together.
+
+use libp2p_swarm::StreamProtocol;
+
+pub mod client;
+pub(crate) mod protocol;
+pub mod server;
+
+pub(crate) mod generated {
+    #![allow(unreachable_pub)]
+    include!("v2/generated/mod.rs");
+}
+
+pub(crate) const DIAL_REQUEST_PROTOCOL: StreamProtocol =
+    StreamProtocol::new("/libp2p/autonat/2/dial-request");
+pub(crate) const DIAL_BACK_PROTOCOL: StreamProtocol =
+    StreamProtocol::new("/libp2p/autonat/2/dial-back");
+
+type Nonce = u64;
diff --git a/protocols/autonat/src/v2/client.rs b/protocols/autonat/src/v2/client.rs
new file mode 100644
index 00000000000..d3272512f35
--- /dev/null
+++ b/protocols/autonat/src/v2/client.rs
@@ -0,0 +1,5 @@
+mod behaviour;
+mod handler;
+
+pub use behaviour::Event;
+pub use behaviour::{Behaviour, Config};
diff --git a/protocols/autonat/src/v2/client/behaviour.rs b/protocols/autonat/src/v2/client/behaviour.rs
new file mode 100644
index 00000000000..97509c05443
--- /dev/null
+++ b/protocols/autonat/src/v2/client/behaviour.rs
@@ -0,0 +1,439 @@
+use std::{
+    collections::{HashMap, VecDeque},
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use either::Either;
+use futures::FutureExt;
+use futures_timer::Delay;
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
+use libp2p_identity::PeerId;
+use libp2p_swarm::{
+    behaviour::ConnectionEstablished, ConnectionClosed, ConnectionDenied, ConnectionHandler,
+    ConnectionId, FromSwarm, NetworkBehaviour, NewExternalAddrCandidate, NotifyHandler, ToSwarm,
+};
+use rand::prelude::*;
+use rand_core::OsRng;
+use std::fmt::{Debug, Display, Formatter};
+
+use crate::v2::{protocol::DialRequest, Nonce};
+
+use super::handler::{
+    dial_back::{self, IncomingNonce},
+    dial_request,
+};
+
+#[derive(Debug, Clone, Copy)]
+pub struct Config {
+    /// How many candidates we will test at most.
+    pub(crate) max_candidates: usize,
+
+    /// The interval at which we will attempt to confirm candidates as external addresses.
+    pub(crate) probe_interval: Duration,
+}
+
+impl Config {
+    pub fn with_max_candidates(self, max_candidates: usize) -> Self {
+        Self {
+            max_candidates,
+            ..self
+        }
+    }
+
+    pub fn with_probe_interval(self, probe_interval: Duration) -> Self {
+        Self {
+            probe_interval,
+            ..self
+        }
+    }
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            max_candidates: 10,
+            probe_interval: Duration::from_secs(5),
+        }
+    }
+}
+
+pub struct Behaviour<R = OsRng>
+where
+    R: RngCore + 'static,
+{
+    rng: R,
+    config: Config,
+    pending_events: VecDeque<
+        ToSwarm<
+            <Self as NetworkBehaviour>::ToSwarm,
+            <<Self as NetworkBehaviour>::ConnectionHandler as ConnectionHandler>::FromBehaviour,
+        >,
+    >,
+    address_candidates: HashMap<Multiaddr, AddressInfo>,
+    next_tick: Delay,
+    peer_info: HashMap<ConnectionId, ConnectionInfo>,
+}
+
+impl<R> NetworkBehaviour for Behaviour<R>
+where
+    R: RngCore + 'static,
+{
+    type ConnectionHandler = Either<dial_request::Handler, dial_back::Handler>;
+
+    type ToSwarm = Event;
+
+    fn handle_established_inbound_connection(
+        &mut self,
+        _: ConnectionId,
+        _: PeerId,
+        _: &Multiaddr,
+        _: &Multiaddr,
+    ) -> Result<<Self as NetworkBehaviour>::ConnectionHandler, ConnectionDenied> {
+        Ok(Either::Right(dial_back::Handler::new()))
+    }
+
+    fn handle_established_outbound_connection(
+        &mut self,
+        _: ConnectionId,
+        _: PeerId,
+        _: &Multiaddr,
+        _: Endpoint,
+        _: PortUse,
+    ) -> Result<<Self as NetworkBehaviour>::ConnectionHandler, ConnectionDenied> {
+        Ok(Either::Left(dial_request::Handler::new()))
+    }
+
+    fn on_swarm_event(&mut self, event: FromSwarm) {
+        match event {
+            FromSwarm::NewExternalAddrCandidate(NewExternalAddrCandidate { addr }) => {
+                self.address_candidates
+                    .entry(addr.clone())
+                    .or_default()
+                    .score += 1;
+            }
+            FromSwarm::ConnectionEstablished(ConnectionEstablished {
+                peer_id,
+                connection_id,
+                endpoint: _,
+                ..
+            }) => {
+                self.peer_info.insert(
+                    connection_id,
+                    ConnectionInfo {
+                        peer_id,
+                        supports_autonat: false,
+                    },
+                );
+            }
+            FromSwarm::ConnectionClosed(ConnectionClosed {
+                peer_id,
+                connection_id,
+                ..
+            }) => {
+                let info = self
+                    .peer_info
+                    .remove(&connection_id)
+                    .expect("inconsistent state");
+
+                if info.supports_autonat {
+                    tracing::debug!(%peer_id, "Disconnected from AutoNAT server");
+                }
+            }
+            _ => {}
+        }
+    }
+
+    fn on_connection_handler_event(
+        &mut self,
+        peer_id: PeerId,
+        connection_id: ConnectionId,
+        event: <Self::ConnectionHandler as ConnectionHandler>::ToBehaviour,
+    ) {
+        let (nonce, outcome) = match event {
+            Either::Right(IncomingNonce { nonce, sender }) => {
+                let Some((_, info)) = self
+                    .address_candidates
+                    .iter_mut()
+                    .find(|(_, info)| info.is_pending_with_nonce(nonce))
+                else {
+                    let _ = sender.send(Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidData,
+                        format!("Received unexpected nonce: {nonce} from {peer_id}"),
+                    )));
+                    return;
+                };
+
+                info.status = TestStatus::Received(nonce);
+                tracing::debug!(%peer_id, %nonce, "Successful dial-back");
+
+                let _ = sender.send(Ok(()));
+
+                return;
+            }
+            Either::Left(dial_request::ToBehaviour::PeerHasServerSupport) => {
+                self.peer_info
+                    .get_mut(&connection_id)
+                    .expect("inconsistent state")
+                    .supports_autonat = true;
+                return;
+            }
+            Either::Left(dial_request::ToBehaviour::TestOutcome { nonce, outcome }) => {
+                (nonce, outcome)
+            }
+        };
+
+        let ((tested_addr, bytes_sent), result) = match outcome {
+            Ok(address) => {
+                let received_dial_back = self
+                    .address_candidates
+                    .iter_mut()
+                    .any(|(_, info)| info.is_received_with_nonce(nonce));
+
+                if !received_dial_back {
+                    tracing::warn!(
+                        %peer_id,
+                        %nonce,
+                        "Server reported reachbility but we never received a dial-back"
+                    );
+                    return;
+                }
+
+                self.pending_events
+                    .push_back(ToSwarm::ExternalAddrConfirmed(address.0.clone()));
+
+                (address, Ok(()))
+            }
+            Err(dial_request::Error::UnsupportedProtocol) => {
+                self.peer_info
+                    .get_mut(&connection_id)
+                    .expect("inconsistent state")
+                    .supports_autonat = false;
+
+                self.reset_status_to(nonce, TestStatus::Untested); // Reset so it will be tried again.
+
+                return;
+            }
+            Err(dial_request::Error::Io(e)) => {
+                tracing::debug!(
+                    %peer_id,
+                    %nonce,
+                    "Failed to complete AutoNAT probe: {e}"
+                );
+
+                self.reset_status_to(nonce, TestStatus::Untested); // Reset so it will be tried again.
+
+                return;
+            }
+            Err(dial_request::Error::AddressNotReachable {
+                address,
+                bytes_sent,
+                error,
+            }) => {
+                self.reset_status_to(nonce, TestStatus::Failed);
+
+                ((address, bytes_sent), Err(error))
+            }
+        };
+
+        self.pending_events.push_back(ToSwarm::GenerateEvent(Event {
+            tested_addr,
+            bytes_sent,
+            server: peer_id,
+            result: result.map_err(|e| Error { inner: e }),
+        }));
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<ToSwarm<Self::ToSwarm, <Self::ConnectionHandler as ConnectionHandler>::FromBehaviour>>
+    {
+        loop {
+            if let Some(event) = self.pending_events.pop_front() {
+                return Poll::Ready(event);
+            }
+
+            if self.next_tick.poll_unpin(cx).is_ready() {
+                self.next_tick.reset(self.config.probe_interval);
+
+                self.issue_dial_requests_for_untested_candidates();
+                continue;
+            }
+
+            return Poll::Pending;
+        }
+    }
+}
+
+impl<R> Behaviour<R>
+where
+    R: RngCore + 'static,
+{
+    pub fn new(rng: R, config: Config) -> Self {
+        Self {
+            rng,
+            next_tick: Delay::new(config.probe_interval),
+            config,
+            pending_events: VecDeque::new(),
+            address_candidates: HashMap::new(),
+            peer_info: HashMap::new(),
+        }
+    }
+
+    /// Issues dial requests to random AutoNAT servers for the most frequently reported, untested candidates.
+    ///
+    /// In the current implementation, we only send a single address to each AutoNAT server.
+    /// This spreads our candidates out across all servers we are connected to which should give us pretty fast feedback on all of them.
+    fn issue_dial_requests_for_untested_candidates(&mut self) {
+        for addr in self.untested_candidates() {
+            let Some((conn_id, peer_id)) = self.random_autonat_server() else {
+                tracing::debug!("Not connected to any AutoNAT servers");
+                return;
+            };
+
+            let nonce = self.rng.gen();
+            self.address_candidates
+                .get_mut(&addr)
+                .expect("only emit candidates")
+                .status = TestStatus::Pending(nonce);
+
+            self.pending_events.push_back(ToSwarm::NotifyHandler {
+                peer_id,
+                handler: NotifyHandler::One(conn_id),
+                event: Either::Left(DialRequest {
+                    nonce,
+                    addrs: vec![addr],
+                }),
+            });
+        }
+    }
+
+    /// Returns all untested candidates, sorted by the frequency they were reported at.
+    ///
+    /// More frequently reported candidates are considered to more likely be external addresses and thus tested first.
+    fn untested_candidates(&self) -> impl Iterator<Item = Multiaddr> {
+        let mut entries = self
+            .address_candidates
+            .iter()
+            .filter(|(_, info)| info.status == TestStatus::Untested)
+            .map(|(addr, count)| (addr.clone(), *count))
+            .collect::<Vec<_>>();
+
+        entries.sort_unstable_by_key(|(_, info)| info.score);
+
+        if entries.is_empty() {
+            tracing::debug!("No untested address candidates");
+        }
+
+        entries
+            .into_iter()
+            .rev() // `sort_unstable` is ascending
+            .take(self.config.max_candidates)
+            .map(|(addr, _)| addr)
+    }
+
+    /// Chooses an active connection to one of our peers that reported support for the [`DIAL_REQUEST_PROTOCOL`](crate::v2::DIAL_REQUEST_PROTOCOL) protocol.
+    fn random_autonat_server(&mut self) -> Option<(ConnectionId, PeerId)> {
+        let (conn_id, info) = self
+            .peer_info
+            .iter()
+            .filter(|(_, info)| info.supports_autonat)
+            .choose(&mut self.rng)?;
+
+        Some((*conn_id, info.peer_id))
+    }
+
+    fn reset_status_to(&mut self, nonce: Nonce, new_status: TestStatus) {
+        let Some((_, info)) = self
+            .address_candidates
+            .iter_mut()
+            .find(|(_, i)| i.is_pending_with_nonce(nonce) || i.is_received_with_nonce(nonce))
+        else {
+            return;
+        };
+
+        info.status = new_status;
+    }
+
+    // FIXME: We don't want test-only APIs in our public API.
+    #[doc(hidden)]
+    pub fn validate_addr(&mut self, addr: &Multiaddr) {
+        if let Some(info) = self.address_candidates.get_mut(addr) {
+            info.status = TestStatus::Received(self.rng.next_u64());
+        }
+    }
+}
+
+impl Default for Behaviour<OsRng> {
+    fn default() -> Self {
+        Self::new(OsRng, Config::default())
+    }
+}
+
+pub struct Error {
+    pub(crate) inner: dial_request::DialBackError,
+}
+
+impl Display for Error {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        Display::fmt(&self.inner, f)
+    }
+}
+
+impl Debug for Error {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        Debug::fmt(&self.inner, f)
+    }
+}
+
+#[derive(Debug)]
+pub struct Event {
+    /// The address that was selected for testing.
+    pub tested_addr: Multiaddr,
+    /// The amount of data that was sent to the server.
+    /// Is 0 if it wasn't necessary to send any data.
+    /// Otherwise it's a number between 30.000 and 100.000.
+    pub bytes_sent: usize,
+    /// The peer id of the server that was selected for testing.
+    pub server: PeerId,
+    /// The result of the test. If the test was successful, this is `Ok(())`.
+    /// Otherwise it's an error.
+    pub result: Result<(), Error>,
+}
+
+struct ConnectionInfo {
+    peer_id: PeerId,
+    supports_autonat: bool,
+}
+
+#[derive(Copy, Clone, Default)]
+struct AddressInfo {
+    score: usize,
+    status: TestStatus,
+}
+
+impl AddressInfo {
+    fn is_pending_with_nonce(&self, nonce: Nonce) -> bool {
+        match self.status {
+            TestStatus::Pending(c) => c == nonce,
+            _ => false,
+        }
+    }
+
+    fn is_received_with_nonce(&self, nonce: Nonce) -> bool {
+        match self.status {
+            TestStatus::Received(c) => c == nonce,
+            _ => false,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Default, PartialEq)]
+enum TestStatus {
+    #[default]
+    Untested,
+    Pending(Nonce),
+    Failed,
+    Received(Nonce),
+}
diff --git a/protocols/autonat/src/v2/client/handler.rs b/protocols/autonat/src/v2/client/handler.rs
new file mode 100644
index 00000000000..e526c2fb44c
--- /dev/null
+++ b/protocols/autonat/src/v2/client/handler.rs
@@ -0,0 +1,2 @@
+pub(crate) mod dial_back;
+pub(crate) mod dial_request;
diff --git a/protocols/autonat/src/v2/client/handler/dial_back.rs b/protocols/autonat/src/v2/client/handler/dial_back.rs
new file mode 100644
index 00000000000..b94580e69ba
--- /dev/null
+++ b/protocols/autonat/src/v2/client/handler/dial_back.rs
@@ -0,0 +1,141 @@
+use std::{
+    io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::channel::oneshot;
+use futures_bounded::StreamSet;
+use libp2p_core::upgrade::{DeniedUpgrade, ReadyUpgrade};
+use libp2p_swarm::{
+    handler::{ConnectionEvent, FullyNegotiatedInbound, ListenUpgradeError},
+    ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
+};
+use void::Void;
+
+use crate::v2::{protocol, Nonce, DIAL_BACK_PROTOCOL};
+
+pub struct Handler {
+    inbound: StreamSet<io::Result<IncomingNonce>>,
+}
+
+impl Handler {
+    pub(crate) fn new() -> Self {
+        Self {
+            inbound: StreamSet::new(Duration::from_secs(5), 2),
+        }
+    }
+}
+
+impl ConnectionHandler for Handler {
+    type FromBehaviour = Void;
+    type ToBehaviour = IncomingNonce;
+    type InboundProtocol = ReadyUpgrade<StreamProtocol>;
+    type OutboundProtocol = DeniedUpgrade;
+    type InboundOpenInfo = ();
+    type OutboundOpenInfo = ();
+
+    fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
+        SubstreamProtocol::new(ReadyUpgrade::new(DIAL_BACK_PROTOCOL), ())
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<
+        ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>,
+    > {
+        loop {
+            match self.inbound.poll_next_unpin(cx) {
+                Poll::Pending => return Poll::Pending,
+                Poll::Ready(None) => continue,
+                Poll::Ready(Some(Err(err))) => {
+                    tracing::debug!("Stream timed out: {err}");
+                    continue;
+                }
+                Poll::Ready(Some(Ok(Err(err)))) => {
+                    tracing::debug!("Dial back handler failed with: {err:?}");
+                    continue;
+                }
+                Poll::Ready(Some(Ok(Ok(incoming_nonce)))) => {
+                    return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(incoming_nonce));
+                }
+            }
+        }
+    }
+
+    fn on_behaviour_event(&mut self, _event: Self::FromBehaviour) {}
+
+    fn on_connection_event(
+        &mut self,
+        event: ConnectionEvent<
+            Self::InboundProtocol,
+            Self::OutboundProtocol,
+            Self::InboundOpenInfo,
+            Self::OutboundOpenInfo,
+        >,
+    ) {
+        match event {
+            ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
+                protocol, ..
+            }) => {
+                if self.inbound.try_push(perform_dial_back(protocol)).is_err() {
+                    tracing::warn!("Dial back request dropped, too many requests in flight");
+                }
+            }
+            ConnectionEvent::ListenUpgradeError(ListenUpgradeError { error, .. }) => {
+                void::unreachable(error);
+            }
+            _ => {}
+        }
+    }
+}
+
+struct State {
+    stream: libp2p_swarm::Stream,
+    oneshot: Option<oneshot::Receiver<io::Result<()>>>,
+}
+
+#[derive(Debug)]
+pub struct IncomingNonce {
+    pub nonce: Nonce,
+    pub sender: oneshot::Sender<io::Result<()>>,
+}
+
+fn perform_dial_back(
+    stream: libp2p_swarm::Stream,
+) -> impl futures::Stream<Item = io::Result<IncomingNonce>> {
+    let state = State {
+        stream,
+        oneshot: None,
+    };
+    futures::stream::unfold(state, |mut state| async move {
+        if let Some(ref mut receiver) = state.oneshot {
+            match receiver.await {
+                Ok(Ok(())) => {}
+                Ok(Err(e)) => return Some((Err(e), state)),
+                Err(_) => {
+                    return Some((
+                        Err(io::Error::new(io::ErrorKind::Other, "Sender got cancelled")),
+                        state,
+                    ));
+                }
+            }
+            if let Err(e) = protocol::dial_back_response(&mut state.stream).await {
+                return Some((Err(e), state));
+            }
+            return None;
+        }
+
+        let nonce = match protocol::recv_dial_back(&mut state.stream).await {
+            Ok(nonce) => nonce,
+            Err(err) => {
+                return Some((Err(err), state));
+            }
+        };
+
+        let (sender, receiver) = oneshot::channel();
+        state.oneshot = Some(receiver);
+        Some((Ok(IncomingNonce { nonce, sender }), state))
+    })
+}
diff --git a/protocols/autonat/src/v2/client/handler/dial_request.rs b/protocols/autonat/src/v2/client/handler/dial_request.rs
new file mode 100644
index 00000000000..9d2df8ee6b4
--- /dev/null
+++ b/protocols/autonat/src/v2/client/handler/dial_request.rs
@@ -0,0 +1,343 @@
+use futures::{channel::oneshot, AsyncWrite};
+use futures_bounded::FuturesMap;
+use libp2p_core::{
+    upgrade::{DeniedUpgrade, ReadyUpgrade},
+    Multiaddr,
+};
+
+use libp2p_swarm::{
+    handler::{
+        ConnectionEvent, DialUpgradeError, FullyNegotiatedOutbound, OutboundUpgradeSend,
+        ProtocolsChange,
+    },
+    ConnectionHandler, ConnectionHandlerEvent, Stream, StreamProtocol, StreamUpgradeError,
+    SubstreamProtocol,
+};
+use std::{
+    collections::VecDeque,
+    io,
+    iter::{once, repeat},
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use crate::v2::{
+    generated::structs::{mod_DialResponse::ResponseStatus, DialStatus},
+    protocol::{
+        Coder, DialDataRequest, DialDataResponse, DialRequest, Response,
+        DATA_FIELD_LEN_UPPER_BOUND, DATA_LEN_LOWER_BOUND, DATA_LEN_UPPER_BOUND,
+    },
+    Nonce, DIAL_REQUEST_PROTOCOL,
+};
+
+#[derive(Debug)]
+pub enum ToBehaviour {
+    TestOutcome {
+        nonce: Nonce,
+        outcome: Result<(Multiaddr, usize), Error>,
+    },
+    PeerHasServerSupport,
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Address is not reachable: {error}")]
+    AddressNotReachable {
+        address: Multiaddr,
+        bytes_sent: usize,
+        error: DialBackError,
+    },
+    #[error("Peer does not support AutoNAT dial-request protocol")]
+    UnsupportedProtocol,
+    #[error("IO error: {0}")]
+    Io(io::Error),
+}
+
+impl From<io::Error> for Error {
+    fn from(value: io::Error) -> Self {
+        Self::Io(value)
+    }
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum DialBackError {
+    #[error("server failed to establish a connection")]
+    NoConnection,
+    #[error("dial back stream failed")]
+    StreamFailed,
+}
+
+pub struct Handler {
+    queued_events: VecDeque<
+        ConnectionHandlerEvent<
+            <Self as ConnectionHandler>::OutboundProtocol,
+            <Self as ConnectionHandler>::OutboundOpenInfo,
+            <Self as ConnectionHandler>::ToBehaviour,
+        >,
+    >,
+    outbound: FuturesMap<Nonce, Result<(Multiaddr, usize), Error>>,
+    queued_streams: VecDeque<
+        oneshot::Sender<
+            Result<
+                Stream,
+                StreamUpgradeError<<ReadyUpgrade<StreamProtocol> as OutboundUpgradeSend>::Error>,
+            >,
+        >,
+    >,
+}
+
+impl Handler {
+    pub(crate) fn new() -> Self {
+        Self {
+            queued_events: VecDeque::new(),
+            outbound: FuturesMap::new(Duration::from_secs(10), 10),
+            queued_streams: VecDeque::default(),
+        }
+    }
+
+    fn perform_request(&mut self, req: DialRequest) {
+        let (tx, rx) = oneshot::channel();
+        self.queued_streams.push_back(tx);
+        self.queued_events
+            .push_back(ConnectionHandlerEvent::OutboundSubstreamRequest {
+                protocol: SubstreamProtocol::new(ReadyUpgrade::new(DIAL_REQUEST_PROTOCOL), ()),
+            });
+        if self
+            .outbound
+            .try_push(req.nonce, start_stream_handle(req, rx))
+            .is_err()
+        {
+            tracing::debug!("Dial request dropped, too many requests in flight");
+        }
+    }
+}
+
+impl ConnectionHandler for Handler {
+    type FromBehaviour = DialRequest;
+    type ToBehaviour = ToBehaviour;
+    type InboundProtocol = DeniedUpgrade;
+    type OutboundProtocol = ReadyUpgrade<StreamProtocol>;
+    type InboundOpenInfo = ();
+    type OutboundOpenInfo = ();
+
+    fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
+        SubstreamProtocol::new(DeniedUpgrade, ())
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<
+        ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>,
+    > {
+        if let Some(event) = self.queued_events.pop_front() {
+            return Poll::Ready(event);
+        }
+
+        match self.outbound.poll_unpin(cx) {
+            Poll::Ready((nonce, Ok(outcome))) => {
+                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                    ToBehaviour::TestOutcome { nonce, outcome },
+                ))
+            }
+            Poll::Ready((nonce, Err(_))) => {
+                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                    ToBehaviour::TestOutcome {
+                        nonce,
+                        outcome: Err(Error::Io(io::ErrorKind::TimedOut.into())),
+                    },
+                ));
+            }
+            Poll::Pending => {}
+        }
+
+        Poll::Pending
+    }
+
+    fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+        self.perform_request(event);
+    }
+
+    fn on_connection_event(
+        &mut self,
+        event: ConnectionEvent<
+            Self::InboundProtocol,
+            Self::OutboundProtocol,
+            Self::InboundOpenInfo,
+            Self::OutboundOpenInfo,
+        >,
+    ) {
+        match event {
+            ConnectionEvent::DialUpgradeError(DialUpgradeError { error, .. }) => {
+                tracing::debug!("Dial request failed: {}", error);
+                match self.queued_streams.pop_front() {
+                    Some(stream_tx) => {
+                        let _ = stream_tx.send(Err(error));
+                    }
+                    None => {
+                        tracing::warn!(
+                            "Opened unexpected substream without a pending dial request"
+                        );
+                    }
+                }
+            }
+            ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
+                protocol, ..
+            }) => match self.queued_streams.pop_front() {
+                Some(stream_tx) => {
+                    if stream_tx.send(Ok(protocol)).is_err() {
+                        tracing::debug!("Failed to send stream to dead handler");
+                    }
+                }
+                None => {
+                    tracing::warn!("Opened unexpected substream without a pending dial request");
+                }
+            },
+            ConnectionEvent::RemoteProtocolsChange(ProtocolsChange::Added(mut added)) => {
+                if added.any(|p| p.as_ref() == DIAL_REQUEST_PROTOCOL) {
+                    self.queued_events
+                        .push_back(ConnectionHandlerEvent::NotifyBehaviour(
+                            ToBehaviour::PeerHasServerSupport,
+                        ));
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+async fn start_stream_handle(
+    req: DialRequest,
+    stream_recv: oneshot::Receiver<Result<Stream, StreamUpgradeError<void::Void>>>,
+) -> Result<(Multiaddr, usize), Error> {
+    let stream = stream_recv
+        .await
+        .map_err(|_| io::Error::from(io::ErrorKind::BrokenPipe))?
+        .map_err(|e| match e {
+            StreamUpgradeError::NegotiationFailed => Error::UnsupportedProtocol,
+            StreamUpgradeError::Timeout => Error::Io(io::ErrorKind::TimedOut.into()),
+            StreamUpgradeError::Apply(v) => void::unreachable(v),
+            StreamUpgradeError::Io(e) => Error::Io(e),
+        })?;
+
+    let mut coder = Coder::new(stream);
+    coder.send(req.clone()).await?;
+
+    let (res, bytes_sent) = match coder.next().await? {
+        Response::Data(DialDataRequest {
+            addr_idx,
+            num_bytes,
+        }) => {
+            if addr_idx >= req.addrs.len() {
+                return Err(Error::Io(io::Error::new(
+                    io::ErrorKind::InvalidInput,
+                    "address index out of bounds",
+                )));
+            }
+            if !(DATA_LEN_LOWER_BOUND..=DATA_LEN_UPPER_BOUND).contains(&num_bytes) {
+                return Err(Error::Io(io::Error::new(
+                    io::ErrorKind::InvalidInput,
+                    "requested bytes out of bounds",
+                )));
+            }
+
+            send_aap_data(&mut coder, num_bytes).await?;
+
+            let Response::Dial(dial_response) = coder.next().await? else {
+                return Err(Error::Io(io::Error::new(
+                    io::ErrorKind::InvalidInput,
+                    "expected message",
+                )));
+            };
+
+            (dial_response, num_bytes)
+        }
+        Response::Dial(dial_response) => (dial_response, 0),
+    };
+    match coder.close().await {
+        Ok(_) => {}
+        Err(err) => {
+            if err.kind() == io::ErrorKind::ConnectionReset {
+                // The AutoNAT server may have already closed the stream (this is normal because the probe is finished), in this case we have this error:
+                // Err(Custom { kind: ConnectionReset, error: Stopped(0) })
+                // so we silently ignore this error
+            } else {
+                return Err(err.into());
+            }
+        }
+    }
+
+    match res.status {
+        ResponseStatus::E_REQUEST_REJECTED => {
+            return Err(Error::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "server rejected request",
+            )))
+        }
+        ResponseStatus::E_DIAL_REFUSED => {
+            return Err(Error::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "server refused dial",
+            )))
+        }
+        ResponseStatus::E_INTERNAL_ERROR => {
+            return Err(Error::Io(io::Error::new(
+                io::ErrorKind::Other,
+                "server encountered internal error",
+            )))
+        }
+        ResponseStatus::OK => {}
+    }
+
+    let tested_address = req
+        .addrs
+        .get(res.addr_idx)
+        .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "address index out of bounds"))?
+        .clone();
+
+    match res.dial_status {
+        DialStatus::UNUSED => {
+            return Err(Error::Io(io::Error::new(
+                io::ErrorKind::InvalidInput,
+                "unexpected message",
+            )))
+        }
+        DialStatus::E_DIAL_ERROR => {
+            return Err(Error::AddressNotReachable {
+                address: tested_address,
+                bytes_sent,
+                error: DialBackError::NoConnection,
+            })
+        }
+        DialStatus::E_DIAL_BACK_ERROR => {
+            return Err(Error::AddressNotReachable {
+                address: tested_address,
+                bytes_sent,
+                error: DialBackError::StreamFailed,
+            })
+        }
+        DialStatus::OK => {}
+    }
+
+    Ok((tested_address, bytes_sent))
+}
+
+async fn send_aap_data<I>(stream: &mut Coder<I>, num_bytes: usize) -> io::Result<()>
+where
+    I: AsyncWrite + Unpin,
+{
+    let count_full = num_bytes / DATA_FIELD_LEN_UPPER_BOUND;
+    let partial_len = num_bytes % DATA_FIELD_LEN_UPPER_BOUND;
+    for req in repeat(DATA_FIELD_LEN_UPPER_BOUND)
+        .take(count_full)
+        .chain(once(partial_len))
+        .filter(|e| *e > 0)
+        .map(|data_count| {
+            DialDataResponse::new(data_count).expect("data count is unexpectedly too big")
+        })
+    {
+        stream.send(req).await?;
+    }
+
+    Ok(())
+}
diff --git a/protocols/autonat/src/v2/generated/mod.rs b/protocols/autonat/src/v2/generated/mod.rs
new file mode 100644
index 00000000000..e52c5a80bc0
--- /dev/null
+++ b/protocols/autonat/src/v2/generated/mod.rs
@@ -0,0 +1,2 @@
+// Automatically generated mod.rs
+pub mod structs;
diff --git a/protocols/autonat/src/v2/generated/structs.proto b/protocols/autonat/src/v2/generated/structs.proto
new file mode 100644
index 00000000000..d298f43d047
--- /dev/null
+++ b/protocols/autonat/src/v2/generated/structs.proto
@@ -0,0 +1,54 @@
+syntax = "proto3";
+
+package structs;
+
+message Message {
+  oneof msg {
+    DialRequest dialRequest = 1;
+    DialResponse dialResponse = 2;
+    DialDataRequest dialDataRequest = 3;
+    DialDataResponse dialDataResponse = 4;
+  }
+}
+
+message DialRequest {
+  repeated bytes addrs = 1;
+  fixed64 nonce = 2;
+}
+
+message DialDataRequest {
+  uint32 addrIdx = 1;
+  uint64 numBytes = 2;
+}
+
+enum DialStatus {
+  UNUSED = 0;
+  E_DIAL_ERROR = 100;
+  E_DIAL_BACK_ERROR = 101;
+  OK = 200;
+}
+
+message DialResponse {
+  enum ResponseStatus {
+    E_INTERNAL_ERROR = 0;
+    E_REQUEST_REJECTED = 100;
+    E_DIAL_REFUSED = 101;
+    OK = 200;
+  }
+
+  ResponseStatus status = 1;
+  uint32 addrIdx = 2;
+  DialStatus dialStatus = 3;
+}
+
+message DialDataResponse { bytes data = 1; }
+
+message DialBack { fixed64 nonce = 1; }
+
+message DialBackResponse {
+  enum DialBackStatus {
+    OK = 0;
+  }
+
+  DialBackStatus status = 1;
+}
diff --git a/protocols/autonat/src/v2/generated/structs.rs b/protocols/autonat/src/v2/generated/structs.rs
new file mode 100644
index 00000000000..e188adb8a42
--- /dev/null
+++ b/protocols/autonat/src/v2/generated/structs.rs
@@ -0,0 +1,403 @@
+// Automatically generated rust module for 'structs.proto' file
+
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(unused_imports)]
+#![allow(unknown_lints)]
+#![allow(clippy::all)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
+
+
+use quick_protobuf::{MessageInfo, MessageRead, MessageWrite, BytesReader, Writer, WriterBackend, Result};
+use quick_protobuf::sizeofs::*;
+use super::*;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum DialStatus {
+    UNUSED = 0,
+    E_DIAL_ERROR = 100,
+    E_DIAL_BACK_ERROR = 101,
+    OK = 200,
+}
+
+impl Default for DialStatus {
+    fn default() -> Self {
+        DialStatus::UNUSED
+    }
+}
+
+impl From<i32> for DialStatus {
+    fn from(i: i32) -> Self {
+        match i {
+            0 => DialStatus::UNUSED,
+            100 => DialStatus::E_DIAL_ERROR,
+            101 => DialStatus::E_DIAL_BACK_ERROR,
+            200 => DialStatus::OK,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl<'a> From<&'a str> for DialStatus {
+    fn from(s: &'a str) -> Self {
+        match s {
+            "UNUSED" => DialStatus::UNUSED,
+            "E_DIAL_ERROR" => DialStatus::E_DIAL_ERROR,
+            "E_DIAL_BACK_ERROR" => DialStatus::E_DIAL_BACK_ERROR,
+            "OK" => DialStatus::OK,
+            _ => Self::default(),
+        }
+    }
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct Message {
+    pub msg: structs::mod_Message::OneOfmsg,
+}
+
+impl<'a> MessageRead<'a> for Message {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(10) => msg.msg = structs::mod_Message::OneOfmsg::dialRequest(r.read_message::<structs::DialRequest>(bytes)?),
+                Ok(18) => msg.msg = structs::mod_Message::OneOfmsg::dialResponse(r.read_message::<structs::DialResponse>(bytes)?),
+                Ok(26) => msg.msg = structs::mod_Message::OneOfmsg::dialDataRequest(r.read_message::<structs::DialDataRequest>(bytes)?),
+                Ok(34) => msg.msg = structs::mod_Message::OneOfmsg::dialDataResponse(r.read_message::<structs::DialDataResponse>(bytes)?),
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for Message {
+    fn get_size(&self) -> usize {
+        0
+        + match self.msg {
+            structs::mod_Message::OneOfmsg::dialRequest(ref m) => 1 + sizeof_len((m).get_size()),
+            structs::mod_Message::OneOfmsg::dialResponse(ref m) => 1 + sizeof_len((m).get_size()),
+            structs::mod_Message::OneOfmsg::dialDataRequest(ref m) => 1 + sizeof_len((m).get_size()),
+            structs::mod_Message::OneOfmsg::dialDataResponse(ref m) => 1 + sizeof_len((m).get_size()),
+            structs::mod_Message::OneOfmsg::None => 0,
+    }    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        match self.msg {            structs::mod_Message::OneOfmsg::dialRequest(ref m) => { w.write_with_tag(10, |w| w.write_message(m))? },
+            structs::mod_Message::OneOfmsg::dialResponse(ref m) => { w.write_with_tag(18, |w| w.write_message(m))? },
+            structs::mod_Message::OneOfmsg::dialDataRequest(ref m) => { w.write_with_tag(26, |w| w.write_message(m))? },
+            structs::mod_Message::OneOfmsg::dialDataResponse(ref m) => { w.write_with_tag(34, |w| w.write_message(m))? },
+            structs::mod_Message::OneOfmsg::None => {},
+    }        Ok(())
+    }
+}
+
+pub mod mod_Message {
+
+use super::*;
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum OneOfmsg {
+    dialRequest(structs::DialRequest),
+    dialResponse(structs::DialResponse),
+    dialDataRequest(structs::DialDataRequest),
+    dialDataResponse(structs::DialDataResponse),
+    None,
+}
+
+impl Default for OneOfmsg {
+    fn default() -> Self {
+        OneOfmsg::None
+    }
+}
+
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DialRequest {
+    pub addrs: Vec<Vec<u8>>,
+    pub nonce: u64,
+}
+
+impl<'a> MessageRead<'a> for DialRequest {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(10) => msg.addrs.push(r.read_bytes(bytes)?.to_owned()),
+                Ok(17) => msg.nonce = r.read_fixed64(bytes)?,
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for DialRequest {
+    fn get_size(&self) -> usize {
+        0
+        + self.addrs.iter().map(|s| 1 + sizeof_len((s).len())).sum::<usize>()
+        + if self.nonce == 0u64 { 0 } else { 1 + 8 }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        for s in &self.addrs { w.write_with_tag(10, |w| w.write_bytes(&**s))?; }
+        if self.nonce != 0u64 { w.write_with_tag(17, |w| w.write_fixed64(*&self.nonce))?; }
+        Ok(())
+    }
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DialDataRequest {
+    pub addrIdx: u32,
+    pub numBytes: u64,
+}
+
+impl<'a> MessageRead<'a> for DialDataRequest {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(8) => msg.addrIdx = r.read_uint32(bytes)?,
+                Ok(16) => msg.numBytes = r.read_uint64(bytes)?,
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for DialDataRequest {
+    fn get_size(&self) -> usize {
+        0
+        + if self.addrIdx == 0u32 { 0 } else { 1 + sizeof_varint(*(&self.addrIdx) as u64) }
+        + if self.numBytes == 0u64 { 0 } else { 1 + sizeof_varint(*(&self.numBytes) as u64) }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if self.addrIdx != 0u32 { w.write_with_tag(8, |w| w.write_uint32(*&self.addrIdx))?; }
+        if self.numBytes != 0u64 { w.write_with_tag(16, |w| w.write_uint64(*&self.numBytes))?; }
+        Ok(())
+    }
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DialResponse {
+    pub status: structs::mod_DialResponse::ResponseStatus,
+    pub addrIdx: u32,
+    pub dialStatus: structs::DialStatus,
+}
+
+impl<'a> MessageRead<'a> for DialResponse {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(8) => msg.status = r.read_enum(bytes)?,
+                Ok(16) => msg.addrIdx = r.read_uint32(bytes)?,
+                Ok(24) => msg.dialStatus = r.read_enum(bytes)?,
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for DialResponse {
+    fn get_size(&self) -> usize {
+        0
+        + if self.status == structs::mod_DialResponse::ResponseStatus::E_INTERNAL_ERROR { 0 } else { 1 + sizeof_varint(*(&self.status) as u64) }
+        + if self.addrIdx == 0u32 { 0 } else { 1 + sizeof_varint(*(&self.addrIdx) as u64) }
+        + if self.dialStatus == structs::DialStatus::UNUSED { 0 } else { 1 + sizeof_varint(*(&self.dialStatus) as u64) }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if self.status != structs::mod_DialResponse::ResponseStatus::E_INTERNAL_ERROR { w.write_with_tag(8, |w| w.write_enum(*&self.status as i32))?; }
+        if self.addrIdx != 0u32 { w.write_with_tag(16, |w| w.write_uint32(*&self.addrIdx))?; }
+        if self.dialStatus != structs::DialStatus::UNUSED { w.write_with_tag(24, |w| w.write_enum(*&self.dialStatus as i32))?; }
+        Ok(())
+    }
+}
+
+pub mod mod_DialResponse {
+
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum ResponseStatus {
+    E_INTERNAL_ERROR = 0,
+    E_REQUEST_REJECTED = 100,
+    E_DIAL_REFUSED = 101,
+    OK = 200,
+}
+
+impl Default for ResponseStatus {
+    fn default() -> Self {
+        ResponseStatus::E_INTERNAL_ERROR
+    }
+}
+
+impl From<i32> for ResponseStatus {
+    fn from(i: i32) -> Self {
+        match i {
+            0 => ResponseStatus::E_INTERNAL_ERROR,
+            100 => ResponseStatus::E_REQUEST_REJECTED,
+            101 => ResponseStatus::E_DIAL_REFUSED,
+            200 => ResponseStatus::OK,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl<'a> From<&'a str> for ResponseStatus {
+    fn from(s: &'a str) -> Self {
+        match s {
+            "E_INTERNAL_ERROR" => ResponseStatus::E_INTERNAL_ERROR,
+            "E_REQUEST_REJECTED" => ResponseStatus::E_REQUEST_REJECTED,
+            "E_DIAL_REFUSED" => ResponseStatus::E_DIAL_REFUSED,
+            "OK" => ResponseStatus::OK,
+            _ => Self::default(),
+        }
+    }
+}
+
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DialDataResponse {
+    pub data: Vec<u8>,
+}
+
+impl<'a> MessageRead<'a> for DialDataResponse {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(10) => msg.data = r.read_bytes(bytes)?.to_owned(),
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for DialDataResponse {
+    fn get_size(&self) -> usize {
+        0
+        + if self.data.is_empty() { 0 } else { 1 + sizeof_len((&self.data).len()) }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if !self.data.is_empty() { w.write_with_tag(10, |w| w.write_bytes(&**&self.data))?; }
+        Ok(())
+    }
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DialBack {
+    pub nonce: u64,
+}
+
+impl<'a> MessageRead<'a> for DialBack {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(9) => msg.nonce = r.read_fixed64(bytes)?,
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for DialBack {
+    fn get_size(&self) -> usize {
+        0
+        + if self.nonce == 0u64 { 0 } else { 1 + 8 }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if self.nonce != 0u64 { w.write_with_tag(9, |w| w.write_fixed64(*&self.nonce))?; }
+        Ok(())
+    }
+}
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DialBackResponse {
+    pub status: structs::mod_DialBackResponse::DialBackStatus,
+}
+
+impl<'a> MessageRead<'a> for DialBackResponse {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(8) => msg.status = r.read_enum(bytes)?,
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for DialBackResponse {
+    fn get_size(&self) -> usize {
+        0
+        + if self.status == structs::mod_DialBackResponse::DialBackStatus::OK { 0 } else { 1 + sizeof_varint(*(&self.status) as u64) }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if self.status != structs::mod_DialBackResponse::DialBackStatus::OK { w.write_with_tag(8, |w| w.write_enum(*&self.status as i32))?; }
+        Ok(())
+    }
+}
+
+pub mod mod_DialBackResponse {
+
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum DialBackStatus {
+    OK = 0,
+}
+
+impl Default for DialBackStatus {
+    fn default() -> Self {
+        DialBackStatus::OK
+    }
+}
+
+impl From<i32> for DialBackStatus {
+    fn from(i: i32) -> Self {
+        match i {
+            0 => DialBackStatus::OK,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl<'a> From<&'a str> for DialBackStatus {
+    fn from(s: &'a str) -> Self {
+        match s {
+            "OK" => DialBackStatus::OK,
+            _ => Self::default(),
+        }
+    }
+}
+
+}
+
diff --git a/protocols/autonat/src/v2/protocol.rs b/protocols/autonat/src/v2/protocol.rs
new file mode 100644
index 00000000000..4077fd65f5d
--- /dev/null
+++ b/protocols/autonat/src/v2/protocol.rs
@@ -0,0 +1,337 @@
+// change to quick-protobuf-codec
+
+use std::io;
+use std::io::ErrorKind;
+
+use asynchronous_codec::{Framed, FramedRead, FramedWrite};
+
+use futures::{AsyncRead, AsyncWrite, SinkExt, StreamExt};
+use libp2p_core::Multiaddr;
+
+use quick_protobuf_codec::Codec;
+use rand::Rng;
+
+use crate::v2::{generated::structs as proto, Nonce};
+
+const REQUEST_MAX_SIZE: usize = 4104;
+pub(super) const DATA_LEN_LOWER_BOUND: usize = 30_000u32 as usize;
+pub(super) const DATA_LEN_UPPER_BOUND: usize = 100_000u32 as usize;
+pub(super) const DATA_FIELD_LEN_UPPER_BOUND: usize = 4096;
+
+fn new_io_invalid_data_err(msg: impl Into<String>) -> io::Error {
+    io::Error::new(io::ErrorKind::InvalidData, msg.into())
+}
+
+pub(crate) struct Coder<I> {
+    inner: Framed<I, Codec<proto::Message>>,
+}
+
+impl<I> Coder<I>
+where
+    I: AsyncWrite + AsyncRead + Unpin,
+{
+    pub(crate) fn new(io: I) -> Self {
+        Self {
+            inner: Framed::new(io, Codec::new(REQUEST_MAX_SIZE)),
+        }
+    }
+    pub(crate) async fn close(mut self) -> io::Result<()> {
+        self.inner.close().await?;
+        Ok(())
+    }
+}
+
+impl<I> Coder<I>
+where
+    I: AsyncRead + Unpin,
+{
+    pub(crate) async fn next<M, E>(&mut self) -> io::Result<M>
+    where
+        proto::Message: TryInto<M, Error = E>,
+        io::Error: From<E>,
+    {
+        Ok(self.next_msg().await?.try_into()?)
+    }
+
+    async fn next_msg(&mut self) -> io::Result<proto::Message> {
+        self.inner
+            .next()
+            .await
+            .ok_or(io::Error::new(
+                ErrorKind::UnexpectedEof,
+                "no request to read",
+            ))?
+            .map_err(|e| io::Error::new(ErrorKind::InvalidData, e))
+    }
+}
+
+impl<I> Coder<I>
+where
+    I: AsyncWrite + Unpin,
+{
+    pub(crate) async fn send<M>(&mut self, msg: M) -> io::Result<()>
+    where
+        M: Into<proto::Message>,
+    {
+        self.inner.send(msg.into()).await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub(crate) enum Request {
+    Dial(DialRequest),
+    Data(DialDataResponse),
+}
+
+impl From<DialRequest> for proto::Message {
+    fn from(val: DialRequest) -> Self {
+        let addrs = val.addrs.iter().map(|e| e.to_vec()).collect();
+        let nonce = val.nonce;
+
+        proto::Message {
+            msg: proto::mod_Message::OneOfmsg::dialRequest(proto::DialRequest { addrs, nonce }),
+        }
+    }
+}
+
+impl From<DialDataResponse> for proto::Message {
+    fn from(val: DialDataResponse) -> Self {
+        debug_assert!(
+            val.data_count <= DATA_FIELD_LEN_UPPER_BOUND,
+            "data_count too large"
+        );
+        proto::Message {
+            msg: proto::mod_Message::OneOfmsg::dialDataResponse(proto::DialDataResponse {
+                data: vec![0; val.data_count], // One could use Cow::Borrowed here, but it will require a modification of the generated code and that will fail the CI
+            }),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct DialRequest {
+    pub(crate) addrs: Vec<Multiaddr>,
+    pub(crate) nonce: u64,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub(crate) struct DialDataResponse {
+    data_count: usize,
+}
+
+impl DialDataResponse {
+    pub(crate) fn new(data_count: usize) -> Option<Self> {
+        if data_count <= DATA_FIELD_LEN_UPPER_BOUND {
+            Some(Self { data_count })
+        } else {
+            None
+        }
+    }
+
+    pub(crate) fn get_data_count(&self) -> usize {
+        self.data_count
+    }
+}
+
+impl TryFrom<proto::Message> for Request {
+    type Error = io::Error;
+
+    fn try_from(msg: proto::Message) -> Result<Self, Self::Error> {
+        match msg.msg {
+            proto::mod_Message::OneOfmsg::dialRequest(proto::DialRequest { addrs, nonce }) => {
+                let addrs = addrs
+                    .into_iter()
+                    .map(|e| e.to_vec())
+                    .map(|e| {
+                        Multiaddr::try_from(e).map_err(|err| {
+                            new_io_invalid_data_err(format!("invalid multiaddr: {}", err))
+                        })
+                    })
+                    .collect::<Result<Vec<_>, io::Error>>()?;
+                Ok(Self::Dial(DialRequest { addrs, nonce }))
+            }
+            proto::mod_Message::OneOfmsg::dialDataResponse(proto::DialDataResponse { data }) => {
+                let data_count = data.len();
+                Ok(Self::Data(DialDataResponse { data_count }))
+            }
+            _ => Err(new_io_invalid_data_err(
+                "expected dialResponse or dialDataRequest",
+            )),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub(crate) enum Response {
+    Dial(DialResponse),
+    Data(DialDataRequest),
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct DialDataRequest {
+    pub(crate) addr_idx: usize,
+    pub(crate) num_bytes: usize,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct DialResponse {
+    pub(crate) status: proto::mod_DialResponse::ResponseStatus,
+    pub(crate) addr_idx: usize,
+    pub(crate) dial_status: proto::DialStatus,
+}
+
+impl TryFrom<proto::Message> for Response {
+    type Error = io::Error;
+
+    fn try_from(msg: proto::Message) -> Result<Self, Self::Error> {
+        match msg.msg {
+            proto::mod_Message::OneOfmsg::dialResponse(proto::DialResponse {
+                status,
+                addrIdx,
+                dialStatus,
+            }) => Ok(Response::Dial(DialResponse {
+                status,
+                addr_idx: addrIdx as usize,
+                dial_status: dialStatus,
+            })),
+            proto::mod_Message::OneOfmsg::dialDataRequest(proto::DialDataRequest {
+                addrIdx,
+                numBytes,
+            }) => Ok(Self::Data(DialDataRequest {
+                addr_idx: addrIdx as usize,
+                num_bytes: numBytes as usize,
+            })),
+            _ => Err(new_io_invalid_data_err(
+                "invalid message type, expected dialResponse or dialDataRequest",
+            )),
+        }
+    }
+}
+
+impl From<Response> for proto::Message {
+    fn from(val: Response) -> Self {
+        match val {
+            Response::Dial(DialResponse {
+                status,
+                addr_idx,
+                dial_status,
+            }) => proto::Message {
+                msg: proto::mod_Message::OneOfmsg::dialResponse(proto::DialResponse {
+                    status,
+                    addrIdx: addr_idx as u32,
+                    dialStatus: dial_status,
+                }),
+            },
+            Response::Data(DialDataRequest {
+                addr_idx,
+                num_bytes,
+            }) => proto::Message {
+                msg: proto::mod_Message::OneOfmsg::dialDataRequest(proto::DialDataRequest {
+                    addrIdx: addr_idx as u32,
+                    numBytes: num_bytes as u64,
+                }),
+            },
+        }
+    }
+}
+
+impl DialDataRequest {
+    pub(crate) fn from_rng<R: rand_core::RngCore>(addr_idx: usize, mut rng: R) -> Self {
+        let num_bytes = rng.gen_range(DATA_LEN_LOWER_BOUND..=DATA_LEN_UPPER_BOUND);
+        Self {
+            addr_idx,
+            num_bytes,
+        }
+    }
+}
+
+const DIAL_BACK_MAX_SIZE: usize = 10;
+
+pub(crate) async fn dial_back(stream: impl AsyncWrite + Unpin, nonce: Nonce) -> io::Result<()> {
+    let msg = proto::DialBack { nonce };
+    let mut framed = FramedWrite::new(stream, Codec::<proto::DialBack>::new(DIAL_BACK_MAX_SIZE));
+
+    framed
+        .send(msg)
+        .await
+        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+
+    Ok(())
+}
+
+pub(crate) async fn recv_dial_back(stream: impl AsyncRead + Unpin) -> io::Result<Nonce> {
+    let framed = &mut FramedRead::new(stream, Codec::<proto::DialBack>::new(DIAL_BACK_MAX_SIZE));
+    let proto::DialBack { nonce } = framed
+        .next()
+        .await
+        .ok_or(io::Error::from(io::ErrorKind::UnexpectedEof))??;
+    Ok(nonce)
+}
+
+pub(crate) async fn dial_back_response(stream: impl AsyncWrite + Unpin) -> io::Result<()> {
+    let msg = proto::DialBackResponse {
+        status: proto::mod_DialBackResponse::DialBackStatus::OK,
+    };
+    let mut framed = FramedWrite::new(
+        stream,
+        Codec::<proto::DialBackResponse>::new(DIAL_BACK_MAX_SIZE),
+    );
+    framed
+        .send(msg)
+        .await
+        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+
+    Ok(())
+}
+
+pub(crate) async fn recv_dial_back_response(
+    stream: impl AsyncRead + AsyncWrite + Unpin,
+) -> io::Result<()> {
+    let framed = &mut FramedRead::new(
+        stream,
+        Codec::<proto::DialBackResponse>::new(DIAL_BACK_MAX_SIZE),
+    );
+    let proto::DialBackResponse { status } = framed
+        .next()
+        .await
+        .ok_or(io::Error::from(io::ErrorKind::UnexpectedEof))??;
+
+    if proto::mod_DialBackResponse::DialBackStatus::OK == status {
+        Ok(())
+    } else {
+        Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "invalid dial back response",
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::v2::generated::structs::{
+        mod_Message::OneOfmsg, DialDataResponse as GenDialDataResponse, Message,
+    };
+
+    #[test]
+    fn message_correct_max_size() {
+        let message_bytes = quick_protobuf::serialize_into_vec(&Message {
+            msg: OneOfmsg::dialDataResponse(GenDialDataResponse {
+                data: vec![0; 4096],
+            }),
+        })
+        .unwrap();
+        assert_eq!(message_bytes.len(), super::REQUEST_MAX_SIZE);
+    }
+
+    #[test]
+    fn dial_back_correct_size() {
+        let dial_back = super::proto::DialBack { nonce: 0 };
+        let buf = quick_protobuf::serialize_into_vec(&dial_back).unwrap();
+        assert!(buf.len() <= super::DIAL_BACK_MAX_SIZE);
+
+        let dial_back_max_nonce = super::proto::DialBack { nonce: u64::MAX };
+        let buf = quick_protobuf::serialize_into_vec(&dial_back_max_nonce).unwrap();
+        assert!(buf.len() <= super::DIAL_BACK_MAX_SIZE);
+    }
+}
diff --git a/protocols/autonat/src/v2/server.rs b/protocols/autonat/src/v2/server.rs
new file mode 100644
index 00000000000..25819307784
--- /dev/null
+++ b/protocols/autonat/src/v2/server.rs
@@ -0,0 +1,5 @@
+mod behaviour;
+mod handler;
+
+pub use behaviour::Behaviour;
+pub use behaviour::Event;
diff --git a/protocols/autonat/src/v2/server/behaviour.rs b/protocols/autonat/src/v2/server/behaviour.rs
new file mode 100644
index 00000000000..5f7b21d165b
--- /dev/null
+++ b/protocols/autonat/src/v2/server/behaviour.rs
@@ -0,0 +1,156 @@
+use std::{
+    collections::{HashMap, VecDeque},
+    io,
+    task::{Context, Poll},
+};
+
+use crate::v2::server::handler::dial_request::DialBackStatus;
+use either::Either;
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
+use libp2p_identity::PeerId;
+use libp2p_swarm::dial_opts::PeerCondition;
+use libp2p_swarm::{
+    dial_opts::DialOpts, dummy, ConnectionDenied, ConnectionHandler, ConnectionId, DialFailure,
+    FromSwarm, NetworkBehaviour, ToSwarm,
+};
+use rand_core::{OsRng, RngCore};
+
+use crate::v2::server::handler::{
+    dial_back,
+    dial_request::{self, DialBackCommand},
+    Handler,
+};
+
+pub struct Behaviour<R = OsRng>
+where
+    R: Clone + Send + RngCore + 'static,
+{
+    dialing_dial_back: HashMap<ConnectionId, DialBackCommand>,
+    pending_events: VecDeque<
+        ToSwarm<
+            <Self as NetworkBehaviour>::ToSwarm,
+            <<Self as NetworkBehaviour>::ConnectionHandler as ConnectionHandler>::FromBehaviour,
+        >,
+    >,
+    rng: R,
+}
+
+impl Default for Behaviour<OsRng> {
+    fn default() -> Self {
+        Self::new(OsRng)
+    }
+}
+
+impl<R> Behaviour<R>
+where
+    R: RngCore + Send + Clone + 'static,
+{
+    pub fn new(rng: R) -> Self {
+        Self {
+            dialing_dial_back: HashMap::new(),
+            pending_events: VecDeque::new(),
+            rng,
+        }
+    }
+}
+
+impl<R> NetworkBehaviour for Behaviour<R>
+where
+    R: RngCore + Send + Clone + 'static,
+{
+    type ConnectionHandler = Handler<R>;
+
+    type ToSwarm = Event;
+
+    fn handle_established_inbound_connection(
+        &mut self,
+        _connection_id: ConnectionId,
+        peer: PeerId,
+        _local_addr: &Multiaddr,
+        remote_addr: &Multiaddr,
+    ) -> Result<<Self as NetworkBehaviour>::ConnectionHandler, ConnectionDenied> {
+        Ok(Either::Right(dial_request::Handler::new(
+            peer,
+            remote_addr.clone(),
+            self.rng.clone(),
+        )))
+    }
+
+    fn handle_established_outbound_connection(
+        &mut self,
+        connection_id: ConnectionId,
+        _peer: PeerId,
+        _addr: &Multiaddr,
+        _role_override: Endpoint,
+        _port_use: PortUse,
+    ) -> Result<<Self as NetworkBehaviour>::ConnectionHandler, ConnectionDenied> {
+        Ok(match self.dialing_dial_back.remove(&connection_id) {
+            Some(cmd) => Either::Left(Either::Left(dial_back::Handler::new(cmd))),
+            None => Either::Left(Either::Right(dummy::ConnectionHandler)),
+        })
+    }
+
+    fn on_swarm_event(&mut self, event: FromSwarm) {
+        if let FromSwarm::DialFailure(DialFailure { connection_id, .. }) = event {
+            if let Some(DialBackCommand { back_channel, .. }) =
+                self.dialing_dial_back.remove(&connection_id)
+            {
+                let dial_back_status = DialBackStatus::DialErr;
+                let _ = back_channel.send(Err(dial_back_status));
+            }
+        }
+    }
+
+    fn on_connection_handler_event(
+        &mut self,
+        peer_id: PeerId,
+        _connection_id: ConnectionId,
+        event: <Handler<R> as ConnectionHandler>::ToBehaviour,
+    ) {
+        match event {
+            Either::Left(Either::Left(Ok(_))) => {}
+            Either::Left(Either::Left(Err(e))) => {
+                tracing::debug!("dial back error: {e:?}");
+            }
+            Either::Left(Either::Right(v)) => void::unreachable(v),
+            Either::Right(Either::Left(cmd)) => {
+                let addr = cmd.addr.clone();
+                let opts = DialOpts::peer_id(peer_id)
+                    .addresses(Vec::from([addr]))
+                    .condition(PeerCondition::Always)
+                    .allocate_new_port()
+                    .build();
+                let conn_id = opts.connection_id();
+                self.dialing_dial_back.insert(conn_id, cmd);
+                self.pending_events.push_back(ToSwarm::Dial { opts });
+            }
+            Either::Right(Either::Right(status_update)) => self
+                .pending_events
+                .push_back(ToSwarm::GenerateEvent(status_update)),
+        }
+    }
+
+    fn poll(
+        &mut self,
+        _cx: &mut Context<'_>,
+    ) -> Poll<ToSwarm<Self::ToSwarm, <Handler<R> as ConnectionHandler>::FromBehaviour>> {
+        if let Some(event) = self.pending_events.pop_front() {
+            return Poll::Ready(event);
+        }
+        Poll::Pending
+    }
+}
+
+#[derive(Debug)]
+pub struct Event {
+    /// All address that were submitted for testing.
+    pub all_addrs: Vec<Multiaddr>,
+    /// The address that was eventually tested.
+    pub tested_addr: Multiaddr,
+    /// The peer id of the client that submitted addresses for testing.
+    pub client: PeerId,
+    /// The amount of data that was requested by the server and was transmitted.
+    pub data_amount: usize,
+    /// The result of the test.
+    pub result: Result<(), io::Error>,
+}
diff --git a/protocols/autonat/src/v2/server/handler.rs b/protocols/autonat/src/v2/server/handler.rs
new file mode 100644
index 00000000000..ffdad69c86f
--- /dev/null
+++ b/protocols/autonat/src/v2/server/handler.rs
@@ -0,0 +1,8 @@
+use either::Either;
+use libp2p_swarm::dummy;
+
+pub(crate) mod dial_back;
+pub(crate) mod dial_request;
+
+pub(crate) type Handler<R> =
+    Either<Either<dial_back::Handler, dummy::ConnectionHandler>, dial_request::Handler<R>>;
diff --git a/protocols/autonat/src/v2/server/handler/dial_back.rs b/protocols/autonat/src/v2/server/handler/dial_back.rs
new file mode 100644
index 00000000000..3cacd4ff32b
--- /dev/null
+++ b/protocols/autonat/src/v2/server/handler/dial_back.rs
@@ -0,0 +1,140 @@
+use std::{
+    convert::identity,
+    io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{AsyncRead, AsyncWrite};
+use futures_bounded::FuturesSet;
+use libp2p_core::upgrade::{DeniedUpgrade, ReadyUpgrade};
+use libp2p_swarm::{
+    handler::{ConnectionEvent, DialUpgradeError, FullyNegotiatedOutbound},
+    ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, StreamUpgradeError,
+    SubstreamProtocol,
+};
+
+use crate::v2::{
+    protocol::{dial_back, recv_dial_back_response},
+    DIAL_BACK_PROTOCOL,
+};
+
+use super::dial_request::{DialBackCommand, DialBackStatus as DialBackRes};
+
+pub(crate) type ToBehaviour = io::Result<()>;
+
+pub struct Handler {
+    pending_nonce: Option<DialBackCommand>,
+    requested_substream_nonce: Option<DialBackCommand>,
+    outbound: FuturesSet<ToBehaviour>,
+}
+
+impl Handler {
+    pub(crate) fn new(cmd: DialBackCommand) -> Self {
+        Self {
+            pending_nonce: Some(cmd),
+            requested_substream_nonce: None,
+            outbound: FuturesSet::new(Duration::from_secs(10), 5),
+        }
+    }
+}
+
+impl ConnectionHandler for Handler {
+    type FromBehaviour = ();
+    type ToBehaviour = ToBehaviour;
+    type InboundProtocol = DeniedUpgrade;
+    type OutboundProtocol = ReadyUpgrade<StreamProtocol>;
+    type InboundOpenInfo = ();
+    type OutboundOpenInfo = ();
+
+    fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
+        SubstreamProtocol::new(DeniedUpgrade, ())
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<
+        ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>,
+    > {
+        if let Poll::Ready(result) = self.outbound.poll_unpin(cx) {
+            return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                result
+                    .map_err(|timeout| io::Error::new(io::ErrorKind::TimedOut, timeout))
+                    .and_then(identity),
+            ));
+        }
+        if let Some(cmd) = self.pending_nonce.take() {
+            self.requested_substream_nonce = Some(cmd);
+            return Poll::Ready(ConnectionHandlerEvent::OutboundSubstreamRequest {
+                protocol: SubstreamProtocol::new(ReadyUpgrade::new(DIAL_BACK_PROTOCOL), ()),
+            });
+        }
+        Poll::Pending
+    }
+
+    fn on_behaviour_event(&mut self, _event: Self::FromBehaviour) {}
+
+    fn on_connection_event(
+        &mut self,
+        event: ConnectionEvent<
+            Self::InboundProtocol,
+            Self::OutboundProtocol,
+            Self::InboundOpenInfo,
+            Self::OutboundOpenInfo,
+        >,
+    ) {
+        match event {
+            ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
+                protocol, ..
+            }) => {
+                if let Some(cmd) = self.requested_substream_nonce.take() {
+                    if self
+                        .outbound
+                        .try_push(perform_dial_back(protocol, cmd))
+                        .is_err()
+                    {
+                        tracing::warn!("Dial back dropped, too many requests in flight");
+                    }
+                } else {
+                    tracing::warn!("received dial back substream without nonce");
+                }
+            }
+            ConnectionEvent::DialUpgradeError(DialUpgradeError {
+                error: StreamUpgradeError::NegotiationFailed | StreamUpgradeError::Timeout,
+                ..
+            }) => {
+                if let Some(cmd) = self.requested_substream_nonce.take() {
+                    let _ = cmd.back_channel.send(Err(DialBackRes::DialBackErr));
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+async fn perform_dial_back(
+    mut stream: impl AsyncRead + AsyncWrite + Unpin,
+    DialBackCommand {
+        nonce,
+        back_channel,
+        ..
+    }: DialBackCommand,
+) -> io::Result<()> {
+    let res = dial_back(&mut stream, nonce)
+        .await
+        .map_err(|_| DialBackRes::DialBackErr)
+        .map(|_| ());
+
+    let res = match res {
+        Ok(()) => recv_dial_back_response(stream)
+            .await
+            .map_err(|_| DialBackRes::DialBackErr)
+            .map(|_| ()),
+        Err(e) => Err(e),
+    };
+    back_channel
+        .send(res)
+        .map_err(|_| io::Error::new(io::ErrorKind::Other, "send error"))?;
+    Ok(())
+}
diff --git a/protocols/autonat/src/v2/server/handler/dial_request.rs b/protocols/autonat/src/v2/server/handler/dial_request.rs
new file mode 100644
index 00000000000..9a3729d4ccf
--- /dev/null
+++ b/protocols/autonat/src/v2/server/handler/dial_request.rs
@@ -0,0 +1,332 @@
+use std::{
+    io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use either::Either;
+use futures::{
+    channel::{mpsc, oneshot},
+    AsyncRead, AsyncWrite, SinkExt, StreamExt,
+};
+use futures_bounded::FuturesSet;
+use libp2p_core::{
+    upgrade::{DeniedUpgrade, ReadyUpgrade},
+    Multiaddr,
+};
+use libp2p_identity::PeerId;
+use libp2p_swarm::{
+    handler::{ConnectionEvent, FullyNegotiatedInbound, ListenUpgradeError},
+    ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
+};
+use rand_core::RngCore;
+
+use crate::v2::{
+    generated::structs::{mod_DialResponse::ResponseStatus, DialStatus},
+    protocol::{Coder, DialDataRequest, DialRequest, DialResponse, Request, Response},
+    server::behaviour::Event,
+    Nonce, DIAL_REQUEST_PROTOCOL,
+};
+
+#[derive(Debug, PartialEq)]
+pub(crate) enum DialBackStatus {
+    /// Failure during dial
+    DialErr,
+    /// Failure during dial back
+    DialBackErr,
+}
+
+#[derive(Debug)]
+pub struct DialBackCommand {
+    pub(crate) addr: Multiaddr,
+    pub(crate) nonce: Nonce,
+    pub(crate) back_channel: oneshot::Sender<Result<(), DialBackStatus>>,
+}
+
+pub struct Handler<R> {
+    client_id: PeerId,
+    observed_multiaddr: Multiaddr,
+    dial_back_cmd_sender: mpsc::Sender<DialBackCommand>,
+    dial_back_cmd_receiver: mpsc::Receiver<DialBackCommand>,
+    inbound: FuturesSet<Event>,
+    rng: R,
+}
+
+impl<R> Handler<R>
+where
+    R: RngCore,
+{
+    pub(crate) fn new(client_id: PeerId, observed_multiaddr: Multiaddr, rng: R) -> Self {
+        let (dial_back_cmd_sender, dial_back_cmd_receiver) = mpsc::channel(10);
+        Self {
+            client_id,
+            observed_multiaddr,
+            dial_back_cmd_sender,
+            dial_back_cmd_receiver,
+            inbound: FuturesSet::new(Duration::from_secs(10), 10),
+            rng,
+        }
+    }
+}
+
+impl<R> ConnectionHandler for Handler<R>
+where
+    R: RngCore + Send + Clone + 'static,
+{
+    type FromBehaviour = void::Void;
+    type ToBehaviour = Either<DialBackCommand, Event>;
+    type InboundProtocol = ReadyUpgrade<StreamProtocol>;
+    type OutboundProtocol = DeniedUpgrade;
+    type InboundOpenInfo = ();
+    type OutboundOpenInfo = ();
+
+    fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
+        SubstreamProtocol::new(ReadyUpgrade::new(DIAL_REQUEST_PROTOCOL), ())
+    }
+
+    fn poll(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<
+        ConnectionHandlerEvent<Self::OutboundProtocol, Self::OutboundOpenInfo, Self::ToBehaviour>,
+    > {
+        loop {
+            match self.inbound.poll_unpin(cx) {
+                Poll::Ready(Ok(event)) => {
+                    if let Err(e) = &event.result {
+                        tracing::warn!("inbound request handle failed: {:?}", e);
+                    }
+                    return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(Either::Right(
+                        event,
+                    )));
+                }
+                Poll::Ready(Err(e)) => {
+                    tracing::warn!("inbound request handle timed out {e:?}");
+                }
+                Poll::Pending => break,
+            }
+        }
+        if let Poll::Ready(Some(cmd)) = self.dial_back_cmd_receiver.poll_next_unpin(cx) {
+            return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(Either::Left(cmd)));
+        }
+        Poll::Pending
+    }
+
+    fn on_behaviour_event(&mut self, _event: Self::FromBehaviour) {}
+
+    fn on_connection_event(
+        &mut self,
+        event: ConnectionEvent<
+            Self::InboundProtocol,
+            Self::OutboundProtocol,
+            Self::InboundOpenInfo,
+            Self::OutboundOpenInfo,
+        >,
+    ) {
+        match event {
+            ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
+                protocol, ..
+            }) => {
+                if self
+                    .inbound
+                    .try_push(handle_request(
+                        protocol,
+                        self.observed_multiaddr.clone(),
+                        self.client_id,
+                        self.dial_back_cmd_sender.clone(),
+                        self.rng.clone(),
+                    ))
+                    .is_err()
+                {
+                    tracing::warn!(
+                        "failed to push inbound request handler, too many requests in flight"
+                    );
+                }
+            }
+            ConnectionEvent::ListenUpgradeError(ListenUpgradeError { error, .. }) => {
+                tracing::debug!("inbound request failed: {:?}", error);
+            }
+            _ => {}
+        }
+    }
+}
+
+enum HandleFail {
+    InternalError(usize),
+    RequestRejected,
+    DialRefused,
+    DialBack {
+        idx: usize,
+        result: Result<(), DialBackStatus>,
+    },
+}
+
+impl From<HandleFail> for DialResponse {
+    fn from(value: HandleFail) -> Self {
+        match value {
+            HandleFail::InternalError(addr_idx) => Self {
+                status: ResponseStatus::E_INTERNAL_ERROR,
+                addr_idx,
+                dial_status: DialStatus::UNUSED,
+            },
+            HandleFail::RequestRejected => Self {
+                status: ResponseStatus::E_REQUEST_REJECTED,
+                addr_idx: 0,
+                dial_status: DialStatus::UNUSED,
+            },
+            HandleFail::DialRefused => Self {
+                status: ResponseStatus::E_DIAL_REFUSED,
+                addr_idx: 0,
+                dial_status: DialStatus::UNUSED,
+            },
+            HandleFail::DialBack { idx, result } => Self {
+                status: ResponseStatus::OK,
+                addr_idx: idx,
+                dial_status: match result {
+                    Err(DialBackStatus::DialErr) => DialStatus::E_DIAL_ERROR,
+                    Err(DialBackStatus::DialBackErr) => DialStatus::E_DIAL_BACK_ERROR,
+                    Ok(()) => DialStatus::OK,
+                },
+            },
+        }
+    }
+}
+
+async fn handle_request(
+    stream: impl AsyncRead + AsyncWrite + Unpin,
+    observed_multiaddr: Multiaddr,
+    client: PeerId,
+    dial_back_cmd_sender: mpsc::Sender<DialBackCommand>,
+    rng: impl RngCore,
+) -> Event {
+    let mut coder = Coder::new(stream);
+    let mut all_addrs = Vec::new();
+    let mut tested_addr_opt = None;
+    let mut data_amount = 0;
+    let response = handle_request_internal(
+        &mut coder,
+        observed_multiaddr.clone(),
+        dial_back_cmd_sender,
+        rng,
+        &mut all_addrs,
+        &mut tested_addr_opt,
+        &mut data_amount,
+    )
+    .await
+    .unwrap_or_else(|e| e.into());
+    let Some(tested_addr) = tested_addr_opt else {
+        return Event {
+            all_addrs,
+            tested_addr: observed_multiaddr,
+            client,
+            data_amount,
+            result: Err(io::Error::new(
+                io::ErrorKind::Other,
+                "client is not conformint to protocol. the tested address is not the observed address",
+            )),
+        };
+    };
+    if let Err(e) = coder.send(Response::Dial(response)).await {
+        return Event {
+            all_addrs,
+            tested_addr,
+            client,
+            data_amount,
+            result: Err(e),
+        };
+    }
+    if let Err(e) = coder.close().await {
+        return Event {
+            all_addrs,
+            tested_addr,
+            client,
+            data_amount,
+            result: Err(e),
+        };
+    }
+    Event {
+        all_addrs,
+        tested_addr,
+        client,
+        data_amount,
+        result: Ok(()),
+    }
+}
+
+async fn handle_request_internal<I>(
+    coder: &mut Coder<I>,
+    observed_multiaddr: Multiaddr,
+    dial_back_cmd_sender: mpsc::Sender<DialBackCommand>,
+    mut rng: impl RngCore,
+    all_addrs: &mut Vec<Multiaddr>,
+    tested_addrs: &mut Option<Multiaddr>,
+    data_amount: &mut usize,
+) -> Result<DialResponse, HandleFail>
+where
+    I: AsyncRead + AsyncWrite + Unpin,
+{
+    let DialRequest { mut addrs, nonce } = match coder
+        .next()
+        .await
+        .map_err(|_| HandleFail::InternalError(0))?
+    {
+        Request::Dial(dial_request) => dial_request,
+        Request::Data(_) => {
+            return Err(HandleFail::RequestRejected);
+        }
+    };
+    all_addrs.clone_from(&addrs);
+    let idx = 0;
+    let addr = addrs.pop().ok_or(HandleFail::DialRefused)?;
+    *tested_addrs = Some(addr.clone());
+    *data_amount = 0;
+    if addr != observed_multiaddr {
+        let dial_data_request = DialDataRequest::from_rng(idx, &mut rng);
+        let mut rem_data = dial_data_request.num_bytes;
+        coder
+            .send(Response::Data(dial_data_request))
+            .await
+            .map_err(|_| HandleFail::InternalError(idx))?;
+        while rem_data > 0 {
+            let data_count = match coder
+                .next()
+                .await
+                .map_err(|_e| HandleFail::InternalError(idx))?
+            {
+                Request::Dial(_) => {
+                    return Err(HandleFail::RequestRejected);
+                }
+                Request::Data(dial_data_response) => dial_data_response.get_data_count(),
+            };
+            rem_data = rem_data.saturating_sub(data_count);
+            *data_amount += data_count;
+        }
+    }
+    let (back_channel, rx) = oneshot::channel();
+    let dial_back_cmd = DialBackCommand {
+        addr,
+        nonce,
+        back_channel,
+    };
+    dial_back_cmd_sender
+        .clone()
+        .send(dial_back_cmd)
+        .await
+        .map_err(|_| HandleFail::DialBack {
+            idx,
+            result: Err(DialBackStatus::DialErr),
+        })?;
+
+    let dial_back = rx.await.map_err(|_e| HandleFail::InternalError(idx))?;
+    if let Err(err) = dial_back {
+        return Err(HandleFail::DialBack {
+            idx,
+            result: Err(err),
+        });
+    }
+    Ok(DialResponse {
+        status: ResponseStatus::OK,
+        addr_idx: idx,
+        dial_status: DialStatus::OK,
+    })
+}
diff --git a/protocols/autonat/tests/autonatv2.rs b/protocols/autonat/tests/autonatv2.rs
new file mode 100644
index 00000000000..abd0c4bd8eb
--- /dev/null
+++ b/protocols/autonat/tests/autonatv2.rs
@@ -0,0 +1,568 @@
+use libp2p_autonat::v2::client::{self, Config};
+use libp2p_autonat::v2::server;
+use libp2p_core::transport::TransportError;
+use libp2p_core::Multiaddr;
+use libp2p_swarm::{
+    DialError, FromSwarm, NetworkBehaviour, NewExternalAddrCandidate, Swarm, SwarmEvent,
+};
+use libp2p_swarm_test::SwarmExt;
+use rand_core::OsRng;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::sync::oneshot;
+use tracing_subscriber::EnvFilter;
+
+#[tokio::test]
+async fn confirm_successful() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+    let (mut alice, mut bob) = start_and_connect().await;
+
+    let cor_server_peer = *alice.local_peer_id();
+    let cor_client_peer = *bob.local_peer_id();
+    let bob_external_addrs = Arc::new(bob.external_addresses().cloned().collect::<Vec<_>>());
+    let alice_bob_external_addrs = bob_external_addrs.clone();
+
+    let alice_task = async {
+        let _ = alice
+            .wait(|event| match event {
+                SwarmEvent::NewExternalAddrCandidate { .. } => Some(()),
+                _ => None,
+            })
+            .await;
+
+        let (dialed_peer_id, dialed_connection_id) = alice
+            .wait(|event| match event {
+                SwarmEvent::Dialing {
+                    peer_id,
+                    connection_id,
+                    ..
+                } => peer_id.map(|peer_id| (peer_id, connection_id)),
+                _ => None,
+            })
+            .await;
+
+        assert_eq!(dialed_peer_id, cor_client_peer);
+
+        let _ = alice
+            .wait(|event| match event {
+                SwarmEvent::ConnectionEstablished {
+                    peer_id,
+                    connection_id,
+                    ..
+                } if peer_id == dialed_peer_id
+                    && peer_id == cor_client_peer
+                    && connection_id == dialed_connection_id =>
+                {
+                    Some(())
+                }
+                _ => None,
+            })
+            .await;
+
+        let server::Event {
+            all_addrs,
+            tested_addr,
+            client,
+            data_amount,
+            result,
+        } = alice
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedServerEvent::Autonat(status_update)) => {
+                    Some(status_update)
+                }
+                _ => None,
+            })
+            .await;
+
+        assert_eq!(tested_addr, bob_external_addrs.first().cloned().unwrap());
+        assert_eq!(data_amount, 0);
+        assert_eq!(client, cor_client_peer);
+        assert_eq!(&all_addrs[..], &bob_external_addrs[..]);
+        assert!(result.is_ok(), "Result: {result:?}");
+    };
+
+    let bob_task = async {
+        bob.wait(|event| match event {
+            SwarmEvent::NewExternalAddrCandidate { address } => Some(address),
+            _ => None,
+        })
+        .await;
+        let incoming_conn_id = bob
+            .wait(|event| match event {
+                SwarmEvent::IncomingConnection { connection_id, .. } => Some(connection_id),
+                _ => None,
+            })
+            .await;
+
+        let _ = bob
+            .wait(|event| match event {
+                SwarmEvent::ConnectionEstablished {
+                    connection_id,
+                    peer_id,
+                    ..
+                } if incoming_conn_id == connection_id && peer_id == cor_server_peer => Some(()),
+                _ => None,
+            })
+            .await;
+
+        let client::Event {
+            tested_addr,
+            bytes_sent,
+            server,
+            result,
+        } = bob
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedClientEvent::Autonat(status_update)) => {
+                    Some(status_update)
+                }
+                _ => None,
+            })
+            .await;
+        assert_eq!(
+            tested_addr,
+            alice_bob_external_addrs.first().cloned().unwrap()
+        );
+        assert_eq!(bytes_sent, 0);
+        assert_eq!(server, cor_server_peer);
+        assert!(result.is_ok(), "Result is {result:?}");
+    };
+
+    tokio::join!(alice_task, bob_task);
+}
+
+#[tokio::test]
+async fn dial_back_to_unsupported_protocol() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+    let (mut alice, mut bob) = bootstrap().await;
+
+    let alice_peer_id = *alice.local_peer_id();
+
+    let test_addr: Multiaddr = "/ip4/127.0.0.1/udp/1234/quic/webtransport".parse().unwrap();
+    let bob_test_addr = test_addr.clone();
+    bob.behaviour_mut()
+        .autonat
+        .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
+            NewExternalAddrCandidate { addr: &test_addr },
+        ));
+
+    let (bob_done_tx, bob_done_rx) = oneshot::channel();
+
+    let alice_task = async {
+        let (alice_dialing_peer, alice_conn_id) = alice
+            .wait(|event| match event {
+                SwarmEvent::Dialing {
+                    peer_id,
+                    connection_id,
+                } => peer_id.map(|e| (e, connection_id)),
+                _ => None,
+            })
+            .await;
+        let mut outgoing_conn_error = alice
+            .wait(|event| match event {
+                SwarmEvent::OutgoingConnectionError {
+                    connection_id,
+                    peer_id: Some(peer_id),
+                    error: DialError::Transport(transport_errs),
+                } if connection_id == alice_conn_id && alice_dialing_peer == peer_id => {
+                    Some(transport_errs)
+                }
+                _ => None,
+            })
+            .await;
+        if let Some((multiaddr, TransportError::MultiaddrNotSupported(not_supported_addr))) =
+            outgoing_conn_error.pop()
+        {
+            assert_eq!(
+                multiaddr,
+                test_addr.clone().with_p2p(alice_dialing_peer).unwrap()
+            );
+            assert_eq!(not_supported_addr, multiaddr,);
+        } else {
+            panic!("Peers are empty");
+        }
+        assert_eq!(outgoing_conn_error.len(), 0);
+        let data_amount = alice
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedServerEvent::Autonat(server::Event {
+                    all_addrs,
+                    tested_addr,
+                    client,
+                    data_amount,
+                    result: Ok(()),
+                })) if all_addrs == vec![test_addr.clone()]
+                    && tested_addr == test_addr.clone()
+                    && client == alice_dialing_peer =>
+                {
+                    Some(data_amount)
+                }
+                _ => None,
+            })
+            .await;
+
+        let handler = tokio::spawn(async move {
+            alice.loop_on_next().await;
+        });
+        let _ = bob_done_rx.await;
+        handler.abort();
+        data_amount
+    };
+
+    let bob_task = async {
+        let data_amount = bob
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedClientEvent::Autonat(client::Event {
+                    tested_addr,
+                    bytes_sent,
+                    server,
+                    result: Err(_),
+                })) if server == alice_peer_id && tested_addr == bob_test_addr => Some(bytes_sent),
+                _ => None,
+            })
+            .await;
+        bob_done_tx.send(()).unwrap();
+        data_amount
+    };
+    let (alice_amount, bob_amount) = tokio::join!(alice_task, bob_task);
+    assert_eq!(alice_amount, bob_amount);
+}
+
+#[tokio::test]
+async fn dial_back_to_non_libp2p() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+    let (mut alice, mut bob) = bootstrap().await;
+    let alice_peer_id = *alice.local_peer_id();
+
+    for addr_str in ["/ip4/169.150.247.38/tcp/32", "/ip6/::1/tcp/1000"] {
+        let addr: Multiaddr = addr_str.parse().unwrap();
+        let bob_addr = addr.clone();
+        bob.behaviour_mut()
+            .autonat
+            .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
+                NewExternalAddrCandidate { addr: &addr },
+            ));
+
+        let alice_task = async {
+            let (alice_dialing_peer, alice_conn_id) = alice
+                .wait(|event| match event {
+                    SwarmEvent::Dialing {
+                        peer_id,
+                        connection_id,
+                    } => peer_id.map(|p| (p, connection_id)),
+                    _ => None,
+                })
+                .await;
+            let mut outgoing_conn_error = alice
+                .wait(|event| match event {
+                    SwarmEvent::OutgoingConnectionError {
+                        connection_id,
+                        peer_id: Some(peer_id),
+                        error: DialError::Transport(peers),
+                    } if connection_id == alice_conn_id && peer_id == alice_dialing_peer => {
+                        Some(peers)
+                    }
+                    _ => None,
+                })
+                .await;
+
+            if let Some((multiaddr, TransportError::Other(o))) = outgoing_conn_error.pop() {
+                assert_eq!(
+                    multiaddr,
+                    addr.clone().with_p2p(alice_dialing_peer).unwrap()
+                );
+                let error_string = o.to_string();
+                assert!(
+                    error_string.contains("Connection refused"),
+                    "Correct error string: {error_string} for {addr_str}"
+                );
+            } else {
+                panic!("No outgoing connection errors");
+            }
+
+            alice
+                .wait(|event| match event {
+                    SwarmEvent::Behaviour(CombinedServerEvent::Autonat(server::Event {
+                        all_addrs,
+                        tested_addr,
+                        client,
+                        data_amount,
+                        result: Ok(()),
+                    })) if all_addrs == vec![addr.clone()]
+                        && tested_addr == addr
+                        && alice_dialing_peer == client =>
+                    {
+                        Some(data_amount)
+                    }
+                    _ => None,
+                })
+                .await
+        };
+        let bob_task = async {
+            bob.wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedClientEvent::Autonat(client::Event {
+                    tested_addr,
+                    bytes_sent,
+                    server,
+                    result: Err(_),
+                })) if tested_addr == bob_addr && server == alice_peer_id => Some(bytes_sent),
+                _ => None,
+            })
+            .await
+        };
+
+        let (alice_bytes_sent, bob_bytes_sent) = tokio::join!(alice_task, bob_task);
+        assert_eq!(alice_bytes_sent, bob_bytes_sent);
+        bob.behaviour_mut().autonat.validate_addr(&addr);
+    }
+}
+
+#[tokio::test]
+async fn dial_back_to_not_supporting() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    let (mut alice, mut bob) = bootstrap().await;
+    let alice_peer_id = *alice.local_peer_id();
+
+    let (bob_done_tx, bob_done_rx) = oneshot::channel();
+
+    let hannes = new_dummy().await;
+    let hannes_peer_id = *hannes.local_peer_id();
+    let unreachable_address = hannes.external_addresses().next().unwrap().clone();
+    let bob_unreachable_address = unreachable_address.clone();
+    bob.behaviour_mut()
+        .autonat
+        .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
+            NewExternalAddrCandidate {
+                addr: &unreachable_address,
+            },
+        ));
+
+    let handler = tokio::spawn(async { hannes.loop_on_next().await });
+
+    let alice_task = async {
+        let (alice_dialing_peer, alice_conn_id) = alice
+            .wait(|event| match event {
+                SwarmEvent::Dialing {
+                    peer_id,
+                    connection_id,
+                } => peer_id.map(|p| (p, connection_id)),
+                _ => None,
+            })
+            .await;
+        alice
+            .wait(|event| match event {
+                SwarmEvent::OutgoingConnectionError {
+                    connection_id,
+                    peer_id: Some(peer_id),
+                    error: DialError::WrongPeerId { obtained, .. },
+                } if connection_id == alice_conn_id
+                    && peer_id == alice_dialing_peer
+                    && obtained == hannes_peer_id =>
+                {
+                    Some(())
+                }
+                _ => None,
+            })
+            .await;
+
+        let data_amount = alice
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedServerEvent::Autonat(server::Event {
+                    all_addrs,
+                    tested_addr,
+                    client,
+                    data_amount,
+                    result: Ok(()),
+                })) if all_addrs == vec![unreachable_address.clone()]
+                    && tested_addr == unreachable_address
+                    && alice_dialing_peer == client =>
+                {
+                    Some(data_amount)
+                }
+                _ => None,
+            })
+            .await;
+        tokio::select! {
+            _ = bob_done_rx => {
+                data_amount
+            }
+            _ = alice.loop_on_next() => {
+                unreachable!();
+            }
+        }
+    };
+
+    let bob_task = async {
+        let bytes_sent = bob
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedClientEvent::Autonat(client::Event {
+                    tested_addr,
+                    bytes_sent,
+                    server,
+                    result: Err(_),
+                })) if tested_addr == bob_unreachable_address && server == alice_peer_id => {
+                    Some(bytes_sent)
+                }
+                _ => None,
+            })
+            .await;
+        bob_done_tx.send(()).unwrap();
+        bytes_sent
+    };
+
+    let (alice_bytes_sent, bob_bytes_sent) = tokio::join!(alice_task, bob_task);
+    assert_eq!(alice_bytes_sent, bob_bytes_sent);
+    handler.abort();
+}
+
+async fn new_server() -> Swarm<CombinedServer> {
+    let mut node = Swarm::new_ephemeral(|identity| CombinedServer {
+        autonat: libp2p_autonat::v2::server::Behaviour::default(),
+        identify: libp2p_identify::Behaviour::new(libp2p_identify::Config::new(
+            "/libp2p-test/1.0.0".into(),
+            identity.public().clone(),
+        )),
+    });
+    node.listen().with_tcp_addr_external().await;
+
+    node
+}
+
+async fn new_client() -> Swarm<CombinedClient> {
+    let mut node = Swarm::new_ephemeral(|identity| CombinedClient {
+        autonat: libp2p_autonat::v2::client::Behaviour::new(
+            OsRng,
+            Config::default().with_probe_interval(Duration::from_millis(100)),
+        ),
+        identify: libp2p_identify::Behaviour::new(libp2p_identify::Config::new(
+            "/libp2p-test/1.0.0".into(),
+            identity.public().clone(),
+        )),
+    });
+    node.listen().with_tcp_addr_external().await;
+    node
+}
+
+#[derive(libp2p_swarm::NetworkBehaviour)]
+#[behaviour(prelude = "libp2p_swarm::derive_prelude")]
+struct CombinedServer {
+    autonat: libp2p_autonat::v2::server::Behaviour,
+    identify: libp2p_identify::Behaviour,
+}
+
+#[derive(libp2p_swarm::NetworkBehaviour)]
+#[behaviour(prelude = "libp2p_swarm::derive_prelude")]
+struct CombinedClient {
+    autonat: libp2p_autonat::v2::client::Behaviour,
+    identify: libp2p_identify::Behaviour,
+}
+
+async fn new_dummy() -> Swarm<libp2p_identify::Behaviour> {
+    let mut node = Swarm::new_ephemeral(|identity| {
+        libp2p_identify::Behaviour::new(libp2p_identify::Config::new(
+            "/libp2p-test/1.0.0".into(),
+            identity.public().clone(),
+        ))
+    });
+    node.listen().with_tcp_addr_external().await;
+    node
+}
+
+async fn start_and_connect() -> (Swarm<CombinedServer>, Swarm<CombinedClient>) {
+    let mut alice = new_server().await;
+    let mut bob = new_client().await;
+
+    bob.connect(&mut alice).await;
+    (alice, bob)
+}
+
+async fn bootstrap() -> (Swarm<CombinedServer>, Swarm<CombinedClient>) {
+    let (mut alice, mut bob) = start_and_connect().await;
+
+    let cor_server_peer = *alice.local_peer_id();
+    let cor_client_peer = *bob.local_peer_id();
+
+    let alice_task = async {
+        let _ = alice
+            .wait(|event| match event {
+                SwarmEvent::NewExternalAddrCandidate { .. } => Some(()),
+                _ => None,
+            })
+            .await;
+
+        let (dialed_peer_id, dialed_connection_id) = alice
+            .wait(|event| match event {
+                SwarmEvent::Dialing {
+                    peer_id,
+                    connection_id,
+                    ..
+                } => peer_id.map(|peer_id| (peer_id, connection_id)),
+                _ => None,
+            })
+            .await;
+
+        let _ = alice
+            .wait(|event| match event {
+                SwarmEvent::ConnectionEstablished {
+                    peer_id,
+                    connection_id,
+                    ..
+                } if peer_id == dialed_peer_id
+                    && peer_id == cor_client_peer
+                    && connection_id == dialed_connection_id =>
+                {
+                    Some(())
+                }
+                _ => None,
+            })
+            .await;
+
+        alice
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedServerEvent::Autonat(_)) => Some(()),
+                _ => None,
+            })
+            .await;
+    };
+
+    let bob_task = async {
+        bob.wait(|event| match event {
+            SwarmEvent::NewExternalAddrCandidate { address } => Some(address),
+            _ => None,
+        })
+        .await;
+        let incoming_conn_id = bob
+            .wait(|event| match event {
+                SwarmEvent::IncomingConnection { connection_id, .. } => Some(connection_id),
+                _ => None,
+            })
+            .await;
+
+        let _ = bob
+            .wait(|event| match event {
+                SwarmEvent::ConnectionEstablished {
+                    connection_id,
+                    peer_id,
+                    ..
+                } if incoming_conn_id == connection_id && peer_id == cor_server_peer => Some(()),
+                _ => None,
+            })
+            .await;
+
+        bob.wait(|event| match event {
+            SwarmEvent::Behaviour(CombinedClientEvent::Autonat(_)) => Some(()),
+            _ => None,
+        })
+        .await;
+    };
+
+    tokio::join!(alice_task, bob_task);
+    (alice, bob)
+}

From 7b2a77e066a39fc052178bd4362792e6b63822ef Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Thu, 8 Aug 2024 17:36:25 +0300
Subject: [PATCH 350/455] chore(metrics): Add `/tls/ws` in protocol stack tests

Pull-Request: #5540.
---
 misc/metrics/src/protocol_stack.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/misc/metrics/src/protocol_stack.rs b/misc/metrics/src/protocol_stack.rs
index 59e8c0bfa6a..57760df79a1 100644
--- a/misc/metrics/src/protocol_stack.rs
+++ b/misc/metrics/src/protocol_stack.rs
@@ -23,5 +23,11 @@ mod tests {
         let protocol_stack = as_string(&ma);
 
         assert_eq!(protocol_stack, "/ip6/tcp/wss/p2p");
+
+        let ma = Multiaddr::try_from("/ip6/2001:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/8000/tls/ws/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC").expect("testbad");
+
+        let protocol_stack = as_string(&ma);
+
+        assert_eq!(protocol_stack, "/ip6/tcp/tls/ws/p2p");
     }
 }

From 4725f46f0d0e14f3ef4e88edc085729c1312dff6 Mon Sep 17 00:00:00 2001
From: Yiannis Marangos <yiannis@eiger.co>
Date: Thu, 8 Aug 2024 18:11:33 +0300
Subject: [PATCH 351/455] feat(websocket,websocket-websys): Add support for
 `/tls/ws`

To keep backward compatibility the following rules were implemented:

* On dialing, `/tls/ws` and `/wss` are equivalent.
* On listening:
* If user listens with `/tls/ws` then `/tls/ws` will be advertised.
* If user listens with `/wss` then `/wss` will be advertised.

Closes #2449
Closes #5509

Pull-Request: #5523.
---
 interop-tests/src/arch.rs                |   4 +-
 transports/websocket-websys/CHANGELOG.md |   3 +
 transports/websocket-websys/src/lib.rs   | 107 +++++++++++-
 transports/websocket/CHANGELOG.md        |   2 +
 transports/websocket/src/framed.rs       | 214 +++++++++++++++++++----
 transports/websocket/src/lib.rs          |   2 +-
 6 files changed, 289 insertions(+), 43 deletions(-)

diff --git a/interop-tests/src/arch.rs b/interop-tests/src/arch.rs
index a7755b95977..df36f8e5baf 100644
--- a/interop-tests/src/arch.rs
+++ b/interop-tests/src/arch.rs
@@ -245,7 +245,7 @@ pub(crate) mod wasm {
                     .with_behaviour(behaviour_constructor)?
                     .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
-                format!("/ip4/{ip}/tcp/0/wss"),
+                format!("/ip4/{ip}/tcp/0/tls/ws"),
             ),
             (Transport::Ws, Some(SecProtocol::Noise), Some(Muxer::Yamux)) => (
                 libp2p::SwarmBuilder::with_new_identity()
@@ -262,7 +262,7 @@ pub(crate) mod wasm {
                     .with_behaviour(behaviour_constructor)?
                     .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
-                format!("/ip4/{ip}/tcp/0/wss"),
+                format!("/ip4/{ip}/tcp/0/tls/ws"),
             ),
             (Transport::WebRtcDirect, None, None) => (
                 libp2p::SwarmBuilder::with_new_identity()
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
index 70d866e6141..d0aeb509823 100644
--- a/transports/websocket-websys/CHANGELOG.md
+++ b/transports/websocket-websys/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 - Implement refactored `Transport`.
   See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+- Add support for `/tls/ws` and keep `/wss` backward compatible.
+  See [PR 5523](https://github.com/libp2p/rust-libp2p/pull/5523).
+
 ## 0.3.3
 
 - Fix use-after-free handler invocation from JS side.
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index d2589715bbb..f353d92b204 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -137,9 +137,10 @@ fn extract_websocket_url(addr: &Multiaddr) -> Option<String> {
         _ => return None,
     };
 
-    let (scheme, wspath) = match protocols.next() {
-        Some(Protocol::Ws(path)) => ("ws", path.into_owned()),
-        Some(Protocol::Wss(path)) => ("wss", path.into_owned()),
+    let (scheme, wspath) = match (protocols.next(), protocols.next()) {
+        (Some(Protocol::Tls), Some(Protocol::Ws(path))) => ("wss", path.into_owned()),
+        (Some(Protocol::Ws(path)), _) => ("ws", path.into_owned()),
+        (Some(Protocol::Wss(path)), _) => ("wss", path.into_owned()),
         _ => return None,
     };
 
@@ -453,3 +454,103 @@ impl Drop for Connection {
             .clear_interval_with_handle(self.inner.buffered_amount_low_interval);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use libp2p_identity::PeerId;
+
+    #[test]
+    fn extract_url() {
+        let peer_id = PeerId::random();
+
+        // Check `/tls/ws`
+        let addr = "/dns4/example.com/tcp/2222/tls/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://example.com:2222/");
+
+        // Check `/tls/ws` with `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/tls/ws/p2p/{peer_id}")
+            .parse()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://example.com:2222/");
+
+        // Check `/tls/ws` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/tls/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://127.0.0.1:2222/");
+
+        // Check `/tls/ws` with `/ip6`
+        let addr = "/ip6/::1/tcp/2222/tls/ws".parse::<Multiaddr>().unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://[::1]:2222/");
+
+        // Check `/wss`
+        let addr = "/dns4/example.com/tcp/2222/wss"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://example.com:2222/");
+
+        // Check `/wss` with `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/wss/p2p/{peer_id}")
+            .parse()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://example.com:2222/");
+
+        // Check `/wss` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/wss".parse::<Multiaddr>().unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://127.0.0.1:2222/");
+
+        // Check `/wss` with `/ip6`
+        let addr = "/ip6/::1/tcp/2222/wss".parse::<Multiaddr>().unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "wss://[::1]:2222/");
+
+        // Check `/ws`
+        let addr = "/dns4/example.com/tcp/2222/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "ws://example.com:2222/");
+
+        // Check `/ws` with `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/ws/p2p/{peer_id}")
+            .parse()
+            .unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "ws://example.com:2222/");
+
+        // Check `/ws` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/ws".parse::<Multiaddr>().unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "ws://127.0.0.1:2222/");
+
+        // Check `/ws` with `/ip6`
+        let addr = "/ip6/::1/tcp/2222/ws".parse::<Multiaddr>().unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "ws://[::1]:2222/");
+
+        // Check `/ws` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/ws".parse::<Multiaddr>().unwrap();
+        let url = extract_websocket_url(&addr).unwrap();
+        assert_eq!(url, "ws://127.0.0.1:2222/");
+
+        // Check that `/tls/wss` is invalid
+        let addr = "/ip4/127.0.0.1/tcp/2222/tls/wss"
+            .parse::<Multiaddr>()
+            .unwrap();
+        assert!(extract_websocket_url(&addr).is_none());
+
+        // Check non-ws address
+        let addr = "/ip4/127.0.0.1/tcp/2222".parse::<Multiaddr>().unwrap();
+        assert!(extract_websocket_url(&addr).is_none());
+    }
+}
diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
index df51e2c807d..cd079cfdd5a 100644
--- a/transports/websocket/CHANGELOG.md
+++ b/transports/websocket/CHANGELOG.md
@@ -4,6 +4,8 @@
   See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
 - Allow wss connections on IP addresses.
   See [PR 5525](https://github.com/libp2p/rust-libp2p/pull/5525).
+- Add support for `/tls/ws` and keep `/wss` backward compatible.
+  See [PR 5523](https://github.com/libp2p/rust-libp2p/pull/5523).
 
 ## 0.43.2
 
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 074271e672f..a547aea21ef 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -33,6 +33,7 @@ use soketto::{
     connection::{self, CloseReason},
     handshake,
 };
+use std::borrow::Cow;
 use std::net::IpAddr;
 use std::{collections::HashMap, ops::DerefMut, sync::Arc};
 use std::{fmt, io, mem, pin::Pin, task::Context, task::Poll};
@@ -51,10 +52,7 @@ pub struct WsConfig<T> {
     tls_config: tls::Config,
     max_redirects: u8,
     /// Websocket protocol of the inner listener.
-    ///
-    /// This is the suffix of the address provided in `listen_on`.
-    /// Can only be [`Protocol::Ws`] or [`Protocol::Wss`].
-    listener_protos: HashMap<ListenerId, Protocol<'static>>,
+    listener_protos: HashMap<ListenerId, WsListenProto<'static>>,
 }
 
 impl<T> WsConfig<T>
@@ -121,22 +119,19 @@ where
         id: ListenerId,
         addr: Multiaddr,
     ) -> Result<(), TransportError<Self::Error>> {
-        let mut inner_addr = addr.clone();
-        let proto = match inner_addr.pop() {
-            Some(p @ Protocol::Wss(_)) => {
-                if self.tls_config.server.is_some() {
-                    p
-                } else {
-                    tracing::debug!("/wss address but TLS server support is not configured");
-                    return Err(TransportError::MultiaddrNotSupported(addr));
-                }
-            }
-            Some(p @ Protocol::Ws(_)) => p,
-            _ => {
-                tracing::debug!(address=%addr, "Address is not a websocket multiaddr");
-                return Err(TransportError::MultiaddrNotSupported(addr));
-            }
-        };
+        let (inner_addr, proto) = parse_ws_listen_addr(&addr).ok_or_else(|| {
+            tracing::debug!(address=%addr, "Address is not a websocket multiaddr");
+            TransportError::MultiaddrNotSupported(addr.clone())
+        })?;
+
+        if proto.use_tls() && self.tls_config.server.is_none() {
+            tracing::debug!(
+                "{} address but TLS server support is not configured",
+                proto.prefix()
+            );
+            return Err(TransportError::MultiaddrNotSupported(addr));
+        }
+
         match self.transport.lock().listen_on(id, inner_addr) {
             Ok(()) => {
                 self.listener_protos.insert(id, proto);
@@ -175,11 +170,10 @@ where
                 mut listen_addr,
             } => {
                 // Append the ws / wss protocol back to the inner address.
-                let proto = self
-                    .listener_protos
+                self.listener_protos
                     .get(&listener_id)
-                    .expect("Protocol was inserted in Transport::listen_on.");
-                listen_addr.push(proto.clone());
+                    .expect("Protocol was inserted in Transport::listen_on.")
+                    .append_on_addr(&mut listen_addr);
                 tracing::debug!(address=%listen_addr, "Listening on address");
                 TransportEvent::NewAddress {
                     listener_id,
@@ -190,11 +184,10 @@ where
                 listener_id,
                 mut listen_addr,
             } => {
-                let proto = self
-                    .listener_protos
+                self.listener_protos
                     .get(&listener_id)
-                    .expect("Protocol was inserted in Transport::listen_on.");
-                listen_addr.push(proto.clone());
+                    .expect("Protocol was inserted in Transport::listen_on.")
+                    .append_on_addr(&mut listen_addr);
                 TransportEvent::AddressExpired {
                     listener_id,
                     listen_addr,
@@ -226,13 +219,9 @@ where
                     .listener_protos
                     .get(&listener_id)
                     .expect("Protocol was inserted in Transport::listen_on.");
-                let use_tls = match proto {
-                    Protocol::Wss(_) => true,
-                    Protocol::Ws(_) => false,
-                    _ => unreachable!("Map contains only ws and wss protocols."),
-                };
-                local_addr.push(proto.clone());
-                send_back_addr.push(proto.clone());
+                let use_tls = proto.use_tls();
+                proto.append_on_addr(&mut local_addr);
+                proto.append_on_addr(&mut send_back_addr);
                 let upgrade = self.map_upgrade(upgrade, send_back_addr.clone(), use_tls);
                 TransportEvent::Incoming {
                     listener_id,
@@ -446,6 +435,48 @@ where
     }
 }
 
+#[derive(Debug, PartialEq)]
+pub(crate) enum WsListenProto<'a> {
+    Ws(Cow<'a, str>),
+    Wss(Cow<'a, str>),
+    TlsWs(Cow<'a, str>),
+}
+
+impl<'a> WsListenProto<'a> {
+    pub(crate) fn append_on_addr(&self, addr: &mut Multiaddr) {
+        match self {
+            WsListenProto::Ws(path) => {
+                addr.push(Protocol::Ws(path.clone()));
+            }
+            // `/tls/ws` and `/wss` are equivalend, however we regenerate
+            // the one that user passed at `listen_on` for backward compatibility.
+            WsListenProto::Wss(path) => {
+                addr.push(Protocol::Wss(path.clone()));
+            }
+            WsListenProto::TlsWs(path) => {
+                addr.push(Protocol::Tls);
+                addr.push(Protocol::Ws(path.clone()));
+            }
+        }
+    }
+
+    pub(crate) fn use_tls(&self) -> bool {
+        match self {
+            WsListenProto::Ws(_) => false,
+            WsListenProto::Wss(_) => true,
+            WsListenProto::TlsWs(_) => true,
+        }
+    }
+
+    pub(crate) fn prefix(&self) -> &'static str {
+        match self {
+            WsListenProto::Ws(_) => "/ws",
+            WsListenProto::Wss(_) => "/wss",
+            WsListenProto::TlsWs(_) => "/tls/ws",
+        }
+    }
+}
+
 #[derive(Debug)]
 struct WsAddress {
     host_port: String,
@@ -499,7 +530,14 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
     let (use_tls, path) = loop {
         match protocols.pop() {
             p @ Some(Protocol::P2p(_)) => p2p = p,
-            Some(Protocol::Ws(path)) => break (false, path.into_owned()),
+            Some(Protocol::Ws(path)) => match protocols.pop() {
+                Some(Protocol::Tls) => break (true, path.into_owned()),
+                Some(p) => {
+                    protocols.push(p);
+                    break (false, path.into_owned());
+                }
+                None => return Err(Error::InvalidMultiaddr(addr)),
+            },
             Some(Protocol::Wss(path)) => break (true, path.into_owned()),
             _ => return Err(Error::InvalidMultiaddr(addr)),
         }
@@ -521,6 +559,22 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
     })
 }
 
+fn parse_ws_listen_addr(addr: &Multiaddr) -> Option<(Multiaddr, WsListenProto<'static>)> {
+    let mut inner_addr = addr.clone();
+
+    match inner_addr.pop()? {
+        Protocol::Wss(path) => Some((inner_addr, WsListenProto::Wss(path))),
+        Protocol::Ws(path) => match inner_addr.pop()? {
+            Protocol::Tls => Some((inner_addr, WsListenProto::TlsWs(path))),
+            p => {
+                inner_addr.push(p);
+                Some((inner_addr, WsListenProto::Ws(path)))
+            }
+        },
+        _ => None,
+    }
+}
+
 // Given a location URL, build a new websocket [`Multiaddr`].
 fn location_to_multiaddr<T>(location: &str) -> Result<Multiaddr, Error<T>> {
     match Url::parse(location) {
@@ -537,7 +591,8 @@ fn location_to_multiaddr<T>(location: &str) -> Result<Multiaddr, Error<T>> {
             }
             let s = url.scheme();
             if s.eq_ignore_ascii_case("https") | s.eq_ignore_ascii_case("wss") {
-                a.push(Protocol::Wss(url.path().into()))
+                a.push(Protocol::Tls);
+                a.push(Protocol::Ws(url.path().into()));
             } else if s.eq_ignore_ascii_case("http") | s.eq_ignore_ascii_case("ws") {
                 a.push(Protocol::Ws(url.path().into()))
             } else {
@@ -759,10 +814,95 @@ mod tests {
     use libp2p_identity::PeerId;
     use std::io;
 
+    #[test]
+    fn listen_addr() {
+        let tcp_addr = "/ip4/0.0.0.0/tcp/2222".parse::<Multiaddr>().unwrap();
+
+        // Check `/tls/ws`
+        let addr = tcp_addr
+            .clone()
+            .with(Protocol::Tls)
+            .with(Protocol::Ws("/".into()));
+        let (inner_addr, proto) = parse_ws_listen_addr(&addr).unwrap();
+        assert_eq!(&inner_addr, &tcp_addr);
+        assert_eq!(proto, WsListenProto::TlsWs("/".into()));
+
+        let mut listen_addr = tcp_addr.clone();
+        proto.append_on_addr(&mut listen_addr);
+        assert_eq!(listen_addr, addr);
+
+        // Check `/wss`
+        let addr = tcp_addr.clone().with(Protocol::Wss("/".into()));
+        let (inner_addr, proto) = parse_ws_listen_addr(&addr).unwrap();
+        assert_eq!(&inner_addr, &tcp_addr);
+        assert_eq!(proto, WsListenProto::Wss("/".into()));
+
+        let mut listen_addr = tcp_addr.clone();
+        proto.append_on_addr(&mut listen_addr);
+        assert_eq!(listen_addr, addr);
+
+        // Check `/ws`
+        let addr = tcp_addr.clone().with(Protocol::Ws("/".into()));
+        let (inner_addr, proto) = parse_ws_listen_addr(&addr).unwrap();
+        assert_eq!(&inner_addr, &tcp_addr);
+        assert_eq!(proto, WsListenProto::Ws("/".into()));
+
+        let mut listen_addr = tcp_addr.clone();
+        proto.append_on_addr(&mut listen_addr);
+        assert_eq!(listen_addr, addr);
+    }
+
     #[test]
     fn dial_addr() {
         let peer_id = PeerId::random();
 
+        // Check `/tls/ws`
+        let addr = "/dns4/example.com/tcp/2222/tls/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "example.com:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "example.com".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/dns4/example.com/tcp/2222".parse().unwrap());
+
+        // Check `/tls/ws` with `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/tls/ws/p2p/{peer_id}")
+            .parse()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "example.com:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "example.com".try_into().unwrap());
+        assert_eq!(
+            info.tcp_addr,
+            format!("/dns4/example.com/tcp/2222/p2p/{peer_id}")
+                .parse()
+                .unwrap()
+        );
+
+        // Check `/tls/ws` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/tls/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "127.0.0.1:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "127.0.0.1".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip4/127.0.0.1/tcp/2222".parse().unwrap());
+
+        // Check `/tls/ws` with `/ip6`
+        let addr = "/ip6/::1/tcp/2222/tls/ws".parse::<Multiaddr>().unwrap();
+        let info = parse_ws_dial_addr::<io::Error>(addr).unwrap();
+        assert_eq!(info.host_port, "[::1]:2222");
+        assert_eq!(info.path, "/");
+        assert!(info.use_tls);
+        assert_eq!(info.server_name, "::1".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip6/::1/tcp/2222".parse().unwrap());
+
         // Check `/wss`
         let addr = "/dns4/example.com/tcp/2222/wss"
             .parse::<Multiaddr>()
diff --git a/transports/websocket/src/lib.rs b/transports/websocket/src/lib.rs
index 40d6db44471..cbc923613dd 100644
--- a/transports/websocket/src/lib.rs
+++ b/transports/websocket/src/lib.rs
@@ -84,7 +84,7 @@ use std::{
 /// let cert = websocket::tls::Certificate::new(rcgen_cert.serialize_der().unwrap());
 /// transport.set_tls_config(websocket::tls::Config::new(priv_key, vec![cert]).unwrap());
 ///
-/// let id = transport.listen_on(ListenerId::next(), "/ip4/127.0.0.1/tcp/0/wss".parse().unwrap()).unwrap();
+/// let id = transport.listen_on(ListenerId::next(), "/ip4/127.0.0.1/tcp/0/tls/ws".parse().unwrap()).unwrap();
 ///
 /// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx)).await.into_new_address().unwrap();
 /// println!("Listening on {addr}");

From 0c143ffde97cad2c17c94033d0e2accdff37418f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 9 Aug 2024 17:31:22 +0100
Subject: [PATCH 352/455] chore: prepare libp2p 0.54 release

Pull-Request: #5542.
---
 Cargo.lock                                 | 22 +++++++++++-----------
 Cargo.toml                                 | 22 +++++++++++-----------
 misc/allow-block-list/CHANGELOG.md         |  4 ++++
 misc/allow-block-list/Cargo.toml           |  2 +-
 misc/connection-limits/CHANGELOG.md        |  4 ++++
 misc/connection-limits/Cargo.toml          |  2 +-
 misc/memory-connection-limits/CHANGELOG.md |  4 ++++
 misc/memory-connection-limits/Cargo.toml   |  2 +-
 misc/webrtc-utils/CHANGELOG.md             |  4 ++++
 misc/webrtc-utils/Cargo.toml               |  2 +-
 muxers/mplex/CHANGELOG.md                  |  4 ++++
 muxers/mplex/Cargo.toml                    |  4 ++--
 muxers/yamux/CHANGELOG.md                  |  4 ++++
 muxers/yamux/Cargo.toml                    |  2 +-
 swarm-test/CHANGELOG.md                    |  4 ++++
 swarm-test/Cargo.toml                      |  2 +-
 transports/noise/CHANGELOG.md              |  4 ++++
 transports/noise/Cargo.toml                |  2 +-
 transports/plaintext/CHANGELOG.md          |  4 ++++
 transports/plaintext/Cargo.toml            |  4 ++--
 transports/pnet/CHANGELOG.md               |  4 ++++
 transports/pnet/Cargo.toml                 |  4 ++--
 transports/tls/CHANGELOG.md                |  4 ++++
 transports/tls/Cargo.toml                  |  2 +-
 24 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index af3ceb9eb0f..e0f448810fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2675,7 +2675,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-allow-block-list"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "async-std",
  "libp2p-core",
@@ -2718,7 +2718,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-connection-limits"
-version = "0.3.1"
+version = "0.4.0"
 dependencies = [
  "async-std",
  "libp2p-core",
@@ -2989,7 +2989,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-memory-connection-limits"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "async-std",
  "libp2p-core",
@@ -3026,7 +3026,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.41.0"
+version = "0.42.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -3061,7 +3061,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.44.0"
+version = "0.45.0"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3138,7 +3138,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.41.0"
+version = "0.42.0"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3156,7 +3156,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-pnet"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "futures",
  "libp2p-core",
@@ -3375,7 +3375,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-test"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "async-trait",
  "futures",
@@ -3410,7 +3410,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tls"
-version = "0.4.1"
+version = "0.5.0"
 dependencies = [
  "futures",
  "futures-rustls",
@@ -3487,7 +3487,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc-utils"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3591,7 +3591,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "async-std",
  "either",
diff --git a/Cargo.toml b/Cargo.toml
index 3f00734ae3c..7d12e1f6318 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,9 +76,9 @@ asynchronous-codec = { version = "0.7.0" }
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.0", path = "libp2p" }
-libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
+libp2p-allow-block-list = { version = "0.4.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.0", path = "protocols/autonat" }
-libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
+libp2p-connection-limits = { version = "0.4.0", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.0", path = "core" }
 libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.0", path = "transports/dns" }
@@ -88,14 +88,14 @@ libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
-libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
+libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
-libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
-libp2p-noise = { version = "0.44.0", path = "transports/noise" }
+libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
+libp2p-noise = { version = "0.45.0", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.45.0", path = "protocols/ping" }
-libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
-libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
+libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
+libp2p-pnet = { version = "0.25.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.11.0", path = "transports/quic" }
 libp2p-relay = { version = "0.18.0", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
@@ -104,18 +104,18 @@ libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
-libp2p-swarm-test = { version = "0.3.0", path = "swarm-test" }
+libp2p-swarm-test = { version = "0.4.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
-libp2p-tls = { version = "0.4.1", path = "transports/tls" }
+libp2p-tls = { version = "0.5.0", path = "transports/tls" }
 libp2p-uds = { version = "0.41.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.3.0", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" }
-libp2p-webrtc-utils = { version = "0.2.1", path = "misc/webrtc-utils" }
+libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0-alpha", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.44.0", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.0", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
-libp2p-yamux = { version = "0.45.2", path = "muxers/yamux" }
+libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
diff --git a/misc/allow-block-list/CHANGELOG.md b/misc/allow-block-list/CHANGELOG.md
index 7778e924886..0017cbc8648 100644
--- a/misc/allow-block-list/CHANGELOG.md
+++ b/misc/allow-block-list/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.3.0
 
 
diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml
index c620e7f4a2b..4209d72ab4f 100644
--- a/misc/allow-block-list/Cargo.toml
+++ b/misc/allow-block-list/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-allow-block-list"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Allow/block list connection management for libp2p."
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/connection-limits/CHANGELOG.md b/misc/connection-limits/CHANGELOG.md
index 4654281a83e..db88e99ffa7 100644
--- a/misc/connection-limits/CHANGELOG.md
+++ b/misc/connection-limits/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.3.1
 
 - Add function to mutate `ConnectionLimits`.
diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml
index 8ecb0005cb1..56fe97f984b 100644
--- a/misc/connection-limits/Cargo.toml
+++ b/misc/connection-limits/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-connection-limits"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Connection limits for libp2p."
-version = "0.3.1"
+version = "0.4.0"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/memory-connection-limits/CHANGELOG.md b/misc/memory-connection-limits/CHANGELOG.md
index fc598872d50..9e580c5a1d2 100644
--- a/misc/memory-connection-limits/CHANGELOG.md
+++ b/misc/memory-connection-limits/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.2.0
 
 
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index 9f7406599e7..f56ed33d5ad 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-memory-connection-limits"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Memory usage based connection limits for libp2p."
-version = "0.2.0"
+version = "0.3.0"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/webrtc-utils/CHANGELOG.md b/misc/webrtc-utils/CHANGELOG.md
index b69bf74bfc8..3bb31610fa1 100644
--- a/misc/webrtc-utils/CHANGELOG.md
+++ b/misc/webrtc-utils/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.2.1
 
 - Fix end of stream handling when buffer is empty or not present.
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
index d870e43781e..88f576f12d9 100644
--- a/misc/webrtc-utils/Cargo.toml
+++ b/misc/webrtc-utils/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 name = "libp2p-webrtc-utils"
 repository = "https://github.com/libp2p/rust-libp2p"
 rust-version = { workspace = true }
-version = "0.2.1"
+version = "0.3.0"
 publish = true
 
 [dependencies]
diff --git a/muxers/mplex/CHANGELOG.md b/muxers/mplex/CHANGELOG.md
index 48ab616e131..f0c2c0353da 100644
--- a/muxers/mplex/CHANGELOG.md
+++ b/muxers/mplex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.42.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.41.0
 
 - Migrate to `{In,Out}boundConnectionUpgrade` traits.
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 4fdb4dabedd..7f887c8b3b8 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-mplex"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Mplex multiplexing protocol for libp2p"
-version = "0.41.0"
+version = "0.42.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -38,7 +38,7 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 name = "split_send_size"
 harness = false
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/muxers/yamux/CHANGELOG.md b/muxers/yamux/CHANGELOG.md
index 295ee251f65..855b3a33773 100644
--- a/muxers/yamux/CHANGELOG.md
+++ b/muxers/yamux/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.46.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.45.2
 
 - Update `yamux` to version `v0.13.3`.`
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 289f84fe1dd..0c52eca3fd4 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-yamux"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Yamux multiplexing protocol for libp2p"
-version = "0.45.2"
+version = "0.46.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm-test/CHANGELOG.md b/swarm-test/CHANGELOG.md
index 95223e60272..98027fcbea2 100644
--- a/swarm-test/CHANGELOG.md
+++ b/swarm-test/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.3.0
 
 
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index 1bd40bdace3..b285da34f87 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-swarm-test"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 rust-version = { workspace = true }
 license = "MIT"
diff --git a/transports/noise/CHANGELOG.md b/transports/noise/CHANGELOG.md
index 78effb673d2..f599ae3533f 100644
--- a/transports/noise/CHANGELOG.md
+++ b/transports/noise/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.45.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.44.0
 
 - Migrate to `{In,Out}boundConnectionUpgrade` traits.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 76cf9475cc4..7f8e9004cd0 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-noise"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Cryptographic handshake protocol using the noise framework."
-version = "0.44.0"
+version = "0.45.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/plaintext/CHANGELOG.md b/transports/plaintext/CHANGELOG.md
index 42b53d12a88..91860c76590 100644
--- a/transports/plaintext/CHANGELOG.md
+++ b/transports/plaintext/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.42.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.41.0
 
 - Migrate to `{In,Out}boundConnectionUpgrade` traits.
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index 4f07c5fee6e..47a3191baa9 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-plaintext"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Plaintext encryption dummy protocol for libp2p"
-version = "0.41.0"
+version = "0.42.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -27,7 +27,7 @@ rand = "0.8"
 futures_ringbuf = "0.4.0"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/transports/pnet/CHANGELOG.md b/transports/pnet/CHANGELOG.md
index 1fbc2d08807..86d519e8640 100644
--- a/transports/pnet/CHANGELOG.md
+++ b/transports/pnet/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.25.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.24.0
 
 
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index e7b3bfc30ac..db5c72fb7cc 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-pnet"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Private swarm support for libp2p"
-version = "0.24.0"
+version = "0.25.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -29,7 +29,7 @@ libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 
-# Passing arguments to the docsrs builder in order to properly document cfg's. 
+# Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
diff --git a/transports/tls/CHANGELOG.md b/transports/tls/CHANGELOG.md
index 0343c690834..e27b8b4cf1f 100644
--- a/transports/tls/CHANGELOG.md
+++ b/transports/tls/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0
+
+<!-- Update to libp2p-swarm v0.45.0 -->
+
 ## 0.4.1
 
 - Fix a panic caused by `rustls` parsing the libp2p TLS extension.
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index 41b4c215dd9..c27e14bb537 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-tls"
-version = "0.4.1"
+version = "0.5.0"
 edition = "2021"
 rust-version = { workspace = true }
 description = "TLS configuration based on libp2p TLS specs."

From 2357b04a250a4593dc8b9508e5e8e4cfdc46a8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 9 Aug 2024 23:51:15 +0100
Subject: [PATCH 353/455] fix(swarm): release libp2p-swarm-derive 0.35.0

Release libp2p-swarm-derive 0.35.0 and update `libp2p-swarm` to it to fix `NetworkBehaviour` derive macro generation.

Pull-Request: #5545.
---
 Cargo.lock                | 4 ++--
 Cargo.toml                | 4 ++--
 swarm-derive/CHANGELOG.md | 5 +++++
 swarm-derive/Cargo.toml   | 2 +-
 swarm/CHANGELOG.md        | 5 +++++
 swarm/Cargo.toml          | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e0f448810fa..70744c1bf40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3330,7 +3330,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "async-std",
  "criterion",
@@ -3365,7 +3365,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.34.2"
+version = "0.35.0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 7d12e1f6318..257c07c7c98 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,8 +102,8 @@ libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
-libp2p-swarm = { version = "0.45.0", path = "swarm" }
-libp2p-swarm-derive = { version = "=0.34.2", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
+libp2p-swarm = { version = "0.45.1", path = "swarm" }
+libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.4.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.5.0", path = "transports/tls" }
diff --git a/swarm-derive/CHANGELOG.md b/swarm-derive/CHANGELOG.md
index 271025aee9f..25932459ba8 100644
--- a/swarm-derive/CHANGELOG.md
+++ b/swarm-derive/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.35.0
+
+- Implement refactored `Transport`.
+  See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+
 ## 0.34.2
 
 - Generate code for `libp2p-swarm`'s `FromSwarm::NewExternalAddrOfPeer` enum variant.
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index b31ea188962..91c643a459d 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm-derive"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Procedural macros of libp2p-swarm"
-version = "0.34.2"
+version = "0.35.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 9aeaa5a1ccc..b5fb72d68ac 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.1
+
+- Update `libp2p-swarm-derive` to version `0.35.0`, see [PR XXXX]
+
+[PR XXXX]: https://github.com/libp2p/rust-libp2p/pull/XXXX
 
 ## 0.45.0
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 375f51490a8..3d0b1a84eee 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From c34668e2ca6ab6fad4e097fceeeccc1f4881b3d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sat, 10 Aug 2024 14:25:52 +0100
Subject: [PATCH 354/455] chore(swarm): add PR number to 0.45.1 release

Pull-Request: #5548.
---
 swarm/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index b5fb72d68ac..e7931a60de2 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,8 +1,8 @@
 ## 0.45.1
 
-- Update `libp2p-swarm-derive` to version `0.35.0`, see [PR XXXX]
+- Update `libp2p-swarm-derive` to version `0.35.0`, see [PR 5545]
 
-[PR XXXX]: https://github.com/libp2p/rust-libp2p/pull/XXXX
+[PR 5545]: https://github.com/libp2p/rust-libp2p/pull/5545
 
 ## 0.45.0
 

From 0ca13880bfece59ee01531d89297e62c3487980b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sat, 10 Aug 2024 15:32:44 +0100
Subject: [PATCH 355/455] fix(quic): release libp2p-quic 0.11.1

closes #5546

Pull-Request: #5547.
---
 Cargo.lock                   | 2 +-
 Cargo.toml                   | 2 +-
 transports/quic/CHANGELOG.md | 6 ++++++
 transports/quic/Cargo.toml   | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 70744c1bf40..65a3f27bbdf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3177,7 +3177,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.11.0"
+version = "0.11.1"
 dependencies = [
  "async-std",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 257c07c7c98..92562489ed5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -96,7 +96,7 @@ libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.45.0", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.25.0", path = "transports/pnet" }
-libp2p-quic = { version = "0.11.0", path = "transports/quic" }
+libp2p-quic = { version = "0.11.1", path = "transports/quic" }
 libp2p-relay = { version = "0.18.0", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" }
diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md
index 2593af605df..6fc64c5df36 100644
--- a/transports/quic/CHANGELOG.md
+++ b/transports/quic/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.11.1
+
+- Update `libp2p-tls` to version `0.5.0`, see [PR 5547]
+
+[PR 5547]: https://github.com/libp2p/rust-libp2p/pull/5547
+
 ## 0.11.0
 
 - Implement refactored `Transport`.
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 1f540c9542a..42cc8e54edb 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-quic"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 rust-version = { workspace = true }

From 8f5f2680f7af095d5810922df155aa49c7e74e12 Mon Sep 17 00:00:00 2001
From: timesince <seekseat@icloud.com>
Date: Tue, 13 Aug 2024 08:20:52 +0800
Subject: [PATCH 356/455] chore: fix some comments

fix some comments

Pull-Request: #5550.
---
 README.md                   | 2 +-
 protocols/autonat/src/v2.rs | 4 ++--
 transports/tcp/src/lib.rs   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index eeab866768d..d818c6ba7b4 100644
--- a/README.md
+++ b/README.md
@@ -102,4 +102,4 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 - [Substrate](https://github.com/paritytech/substrate) - Framework for blockchain innovation,
 used by [Polkadot](https://www.parity.io/technologies/polkadot/).
 - [Taple](https://github.com/opencanarias/taple-core) - Sustainable DLT for asset and process traceability by [OpenCanarias](https://www.opencanarias.com/en/).
-- [Ceylon](https://github.com/ceylonai/ceylon) - A Multi-Agent System (MAS) Development Framwork.
+- [Ceylon](https://github.com/ceylonai/ceylon) - A Multi-Agent System (MAS) Development Framework.
diff --git a/protocols/autonat/src/v2.rs b/protocols/autonat/src/v2.rs
index 994497cb1a0..cdc807ea303 100644
--- a/protocols/autonat/src/v2.rs
+++ b/protocols/autonat/src/v2.rs
@@ -4,8 +4,8 @@
 //!
 //! The new version fixes the issues of the first version:
 //! - The server now always dials back over a newly allocated port. This greatly reduces the risk of
-//!     false positives that often occured in the first version, when the clinet-server connection
-//!     occured over a hole-punched port.
+//!     false positives that often occurred in the first version, when the clinet-server connection
+//!     occurred over a hole-punched port.
 //! - The server protects against DoS attacks by requiring the client to send more data to the
 //!     server then the dial back puts on the client, thus making the protocol unatractive for an
 //!     attacker.
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
index 386caa78b0f..4c4fa7c6b84 100644
--- a/transports/tcp/src/lib.rs
+++ b/transports/tcp/src/lib.rs
@@ -173,7 +173,7 @@ impl Config {
     ///
     /// The new implementation works on a per-connaction basis, defined by the behaviour. This
     /// removes the necessaity to configure the transport for port reuse, instead the behaviour
-    /// requiring this behaviour can decide wether to use port reuse or not.
+    /// requiring this behaviour can decide whether to use port reuse or not.
     ///
     /// The API to configure port reuse is part of [`Transport`] and the option can be found in
     /// [`libp2p_core::transport::DialOpts`].

From 539bdd96834170a50b364ff7b1f7751157d52160 Mon Sep 17 00:00:00 2001
From: Dave Huseby <dhuseby@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:36:35 -0600
Subject: [PATCH 357/455] Create funding.json (#5553)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates
---
 funding.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 funding.json

diff --git a/funding.json b/funding.json
new file mode 100644
index 00000000000..bcf7fc2783d
--- /dev/null
+++ b/funding.json
@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0x966804cb492e1a4bde5d781a676a44a23d69aa5dd2562fa7a4f95bb606021c8b"
+  }
+}

From 0861e39e31f4bc5b8696111878569d18e33e4d3c Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Tue, 13 Aug 2024 18:08:07 +0300
Subject: [PATCH 358/455] chore: Fix identity changelog link

Noticed this when checking changelog of the last release

Pull-Request: #5556.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c3466708c9..4fccb9a489e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ## Main APIs
 
 - [`libp2p-core` CHANGELOG](core/CHANGELOG.md)
+- [`libp2p-identity` CHANGELOG](identity/CHANGELOG.md)
 - [`libp2p-swarm` CHANGELOG](swarm/CHANGELOG.md)
 - [`libp2p-swarm-derive` CHANGELOG](swarm-derive/CHANGELOG.md)
 
@@ -13,7 +14,6 @@
 - [`libp2p-floodsub` CHANGELOG](protocols/floodsub/CHANGELOG.md)
 - [`libp2p-gossipsub` CHANGELOG](protocols/gossipsub/CHANGELOG.md)
 - [`libp2p-identify` CHANGELOG](protocols/identify/CHANGELOG.md)
-- [`libp2p-identity` CHANGELOG](protocols/identity/CHANGELOG.md)
 - [`libp2p-kad` CHANGELOG](protocols/kad/CHANGELOG.md)
 - [`libp2p-mdns` CHANGELOG](protocols/mdns/CHANGELOG.md)
 - [`libp2p-ping` CHANGELOG](protocols/ping/CHANGELOG.md)

From d9ee266bc03e7159e415e406e35ffafbb1660d42 Mon Sep 17 00:00:00 2001
From: Mivik <54128043+Mivik@users.noreply.github.com>
Date: Wed, 14 Aug 2024 00:27:40 +0800
Subject: [PATCH 359/455] feat(kad): New provider record update strategy

In `MemoryStore`, the number of provider records per key is limited by `max_providers_per_key`. Former implementations keep provider records sorted by their distance to the key, and only keep those with the smallest distance. This strategy is vulnerable to Sybil attack, in which an attacker can flood the network with false identities in order to eclipse a key.

This commit change the strategy to simply keep old providers and ignore new ones. This new strategy however, can cause load imbalance, but can be mitigated by increasing `max_providers_per_key`.

In addition, old implementations failed to keep `provided` and `providers` in sync, and this commit fixes this issue.

Pull-Request: #5536.
---
 Cargo.lock                               |   4 +-
 Cargo.toml                               |   2 +-
 libp2p/CHANGELOG.md                      |   5 +
 libp2p/Cargo.toml                        |   2 +-
 protocols/kad/CHANGELOG.md               |   5 +
 protocols/kad/Cargo.toml                 |   2 +-
 protocols/kad/src/record/store/memory.rs | 122 ++++++++++++-----------
 7 files changed, 79 insertions(+), 63 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 65a3f27bbdf..c228c7e31ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2623,7 +2623,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libp2p"
-version = "0.54.0"
+version = "0.54.1"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2928,7 +2928,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 92562489ed5..802779774cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.47.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
-libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
+libp2p-kad = { version = "0.46.1", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 7e1b95c6e75..f2041399042 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.54.1
+
+- Update individual crates.
+    - Update to [`libp2p-kad` `v0.46.1`](protocols/kad/CHANGELOG.md#0461).
+
 ## 0.54.0
 
 - Update individual crates.
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 68a76e52b58..b1017f5958c 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Peer-to-peer networking library"
-version = "0.54.0"
+version = "0.54.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index cbb5a4decf2..a41d6b9a131 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.46.1
+
+- Use new provider record update strategy to prevent Sybil attack.
+  See [PR 5536](https://github.com/libp2p/rust-libp2p/pull/5536).
+
 ## 0.46.0
 
 - Included multiaddresses of found peers alongside peer IDs in `GetClosestPeers` query results.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 72b29d00ef7..a00959fced6 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.46.0"
+version = "0.46.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/record/store/memory.rs b/protocols/kad/src/record/store/memory.rs
index 3bd3c56e30c..3fb6d2be3e8 100644
--- a/protocols/kad/src/record/store/memory.rs
+++ b/protocols/kad/src/record/store/memory.rs
@@ -152,38 +152,31 @@ impl RecordStore for MemoryStore {
         }
         .or_insert_with(Default::default);
 
-        if let Some(i) = providers.iter().position(|p| p.provider == record.provider) {
-            // In-place update of an existing provider record.
-            providers.as_mut()[i] = record;
-        } else {
-            // It is a new provider record for that key.
-            let local_key = self.local_key;
-            let key = kbucket::Key::new(record.key.clone());
-            let provider = kbucket::Key::from(record.provider);
-            if let Some(i) = providers.iter().position(|p| {
-                let pk = kbucket::Key::from(p.provider);
-                provider.distance(&key) < pk.distance(&key)
-            }) {
-                // Insert the new provider.
-                if local_key.preimage() == &record.provider {
+        for p in providers.iter_mut() {
+            if p.provider == record.provider {
+                // In-place update of an existing provider record.
+                if self.local_key.preimage() == &record.provider {
+                    self.provided.remove(p);
                     self.provided.insert(record.clone());
                 }
-                providers.insert(i, record);
-                // Remove the excess provider, if any.
-                if providers.len() > self.config.max_providers_per_key {
-                    if let Some(p) = providers.pop() {
-                        self.provided.remove(&p);
-                    }
-                }
-            } else if providers.len() < self.config.max_providers_per_key {
-                // The distance of the new provider to the key is larger than
-                // the distance of any existing provider, but there is still room.
-                if local_key.preimage() == &record.provider {
-                    self.provided.insert(record.clone());
-                }
-                providers.push(record);
+                *p = record;
+                return Ok(());
             }
         }
+
+        // If the providers list is full, we ignore the new provider.
+        // This strategy can mitigate Sybil attacks, in which an attacker
+        // floods the network with fake provider records.
+        if providers.len() == self.config.max_providers_per_key {
+            return Ok(());
+        }
+
+        // Otherwise, insert the new provider record.
+        if self.local_key.preimage() == &record.provider {
+            self.provided.insert(record.clone());
+        }
+        providers.push(record);
+
         Ok(())
     }
 
@@ -202,7 +195,9 @@ impl RecordStore for MemoryStore {
             let providers = e.get_mut();
             if let Some(i) = providers.iter().position(|p| &p.provider == provider) {
                 let p = providers.remove(i);
-                self.provided.remove(&p);
+                if &p.provider == self.local_key.preimage() {
+                    self.provided.remove(&p);
+                }
             }
             if providers.is_empty() {
                 e.remove();
@@ -221,11 +216,6 @@ mod tests {
     fn random_multihash() -> Multihash<64> {
         Multihash::wrap(SHA_256_MH, &rand::thread_rng().gen::<[u8; 32]>()).unwrap()
     }
-
-    fn distance(r: &ProviderRecord) -> kbucket::Distance {
-        kbucket::Key::new(r.key.clone()).distance(&kbucket::Key::from(r.provider))
-    }
-
     #[test]
     fn put_get_remove_record() {
         fn prop(r: Record) {
@@ -250,30 +240,6 @@ mod tests {
         quickcheck(prop as fn(_))
     }
 
-    #[test]
-    fn providers_ordered_by_distance_to_key() {
-        fn prop(providers: Vec<kbucket::Key<PeerId>>) -> bool {
-            let mut store = MemoryStore::new(PeerId::random());
-            let key = Key::from(random_multihash());
-
-            let mut records = providers
-                .into_iter()
-                .map(|p| ProviderRecord::new(key.clone(), p.into_preimage(), Vec::new()))
-                .collect::<Vec<_>>();
-
-            for r in &records {
-                assert!(store.add_provider(r.clone()).is_ok());
-            }
-
-            records.sort_by_key(distance);
-            records.truncate(store.config.max_providers_per_key);
-
-            records == store.providers(&key).to_vec()
-        }
-
-        quickcheck(prop as fn(_) -> _)
-    }
-
     #[test]
     fn provided() {
         let id = PeerId::random();
@@ -302,6 +268,46 @@ mod tests {
         assert_eq!(vec![rec.clone()], store.providers(&rec.key).to_vec());
     }
 
+    #[test]
+    fn update_provided() {
+        let prv = PeerId::random();
+        let mut store = MemoryStore::new(prv);
+        let key = random_multihash();
+        let mut rec = ProviderRecord::new(key, prv, Vec::new());
+        assert!(store.add_provider(rec.clone()).is_ok());
+        assert_eq!(
+            vec![Cow::Borrowed(&rec)],
+            store.provided().collect::<Vec<_>>()
+        );
+        rec.expires = Some(Instant::now());
+        assert!(store.add_provider(rec.clone()).is_ok());
+        assert_eq!(
+            vec![Cow::Borrowed(&rec)],
+            store.provided().collect::<Vec<_>>()
+        );
+    }
+
+    #[test]
+    fn max_providers_per_key() {
+        let config = MemoryStoreConfig::default();
+        let key = kbucket::Key::new(Key::from(random_multihash()));
+
+        let mut store = MemoryStore::with_config(PeerId::random(), config.clone());
+        let peers = (0..config.max_providers_per_key)
+            .map(|_| PeerId::random())
+            .collect::<Vec<_>>();
+        for peer in peers {
+            let rec = ProviderRecord::new(key.preimage().clone(), peer, Vec::new());
+            assert!(store.add_provider(rec).is_ok());
+        }
+
+        // The new provider cannot be added because the key is already saturated.
+        let peer = PeerId::random();
+        let rec = ProviderRecord::new(key.preimage().clone(), peer, Vec::new());
+        assert!(store.add_provider(rec.clone()).is_ok());
+        assert!(!store.providers(&rec.key).contains(&rec));
+    }
+
     #[test]
     fn max_provided_keys() {
         let mut store = MemoryStore::new(PeerId::random());

From 41f67c975cbdd686738a801dfb9e3533a6c96874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 19 Aug 2024 15:31:52 +0100
Subject: [PATCH 360/455] chore(metrics): release 0.15.0

Pull-Request: #5562.
---
 Cargo.lock                | 2 +-
 Cargo.toml                | 2 +-
 misc/metrics/CHANGELOG.md | 2 +-
 misc/metrics/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c228c7e31ac..8932f40a04c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3007,7 +3007,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.14.2"
+version = "0.15.0"
 dependencies = [
  "futures",
  "libp2p-core",
diff --git a/Cargo.toml b/Cargo.toml
index 802779774cb..ebd8e39c29d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -89,7 +89,7 @@ libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.46.1", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" }
-libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
+libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
 libp2p-noise = { version = "0.45.0", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
diff --git a/misc/metrics/CHANGELOG.md b/misc/metrics/CHANGELOG.md
index c36d7f95ebc..bd109c42811 100644
--- a/misc/metrics/CHANGELOG.md
+++ b/misc/metrics/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.14.2
+## 0.15.0
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
 
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
index b75ea5ed0de..0b7a3c93b2f 100644
--- a/misc/metrics/Cargo.toml
+++ b/misc/metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-metrics"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Metrics for libp2p"
-version = "0.14.2"
+version = "0.15.0"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From d7beb55f672dce54017fa4b30f67ecb8d66b9810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 19 Aug 2024 17:17:02 +0100
Subject: [PATCH 361/455] chore(libp2p): release 0.54.1

Pull-Request: #5563.
---
 Cargo.toml          | 2 +-
 libp2p/CHANGELOG.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ebd8e39c29d..31c3a8e4b9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ rust-version = "1.75.0"
 asynchronous-codec = { version = "0.7.0" }
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
-libp2p = { version = "0.54.0", path = "libp2p" }
+libp2p = { version = "0.54.1", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.4.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.0", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.0", path = "misc/connection-limits" }
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index f2041399042..72a624786d4 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 0.54.1
 
 - Update individual crates.
-    - Update to [`libp2p-kad` `v0.46.1`](protocols/kad/CHANGELOG.md#0461).
+    - Update to [`libp2p-metrics` `0.15.0`](misc/metrics/CHANGELOG.md#0150).
 
 ## 0.54.0
 

From 4dfc45bfec008405988edca2432c27ed5b93535f Mon Sep 17 00:00:00 2001
From: P1R0 <p1r0@nethunters.xyz>
Date: Wed, 21 Aug 2024 02:18:46 -0600
Subject: [PATCH 362/455] refactor: ping tutorial using tokio

Solves issue #5554 also referenced first in #4449

Pull-Request: #5559.
---
 libp2p/src/tutorials/ping.rs | 131 +++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 60 deletions(-)

diff --git a/libp2p/src/tutorials/ping.rs b/libp2p/src/tutorials/ping.rs
index 309d5b36baa..31bf5ba3a14 100644
--- a/libp2p/src/tutorials/ping.rs
+++ b/libp2p/src/tutorials/ping.rs
@@ -44,7 +44,7 @@
 //! 3. Adding `libp2p` as well as `futures` as dependencies in the
 //!    `Cargo.toml` file. Current crate versions may be found at
 //!    [crates.io](https://crates.io/).
-//!    We will also include `async-std` with the
+//!    We will also include `tokio` with the
 //!    "attributes" feature to allow for an `async main`.
 //!    At the time of writing we have:
 //!
@@ -55,9 +55,9 @@
 //!        edition = "2021"
 //!
 //!    [dependencies]
-//!        libp2p = { version = "0.52", features = ["tcp", "tls", "dns", "async-std", "noise", "yamux", "websocket", "ping", "macros"] }
-//!        futures = "0.3.21"
-//!        async-std = { version = "1.12.0", features = ["attributes"] }
+//!        libp2p = { version = "0.54", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
+//!        futures = "0.3.30"
+//!        tokio = { version = "1.37.0", features = ["full"] }
 //!        tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 //!    ```
 //!
@@ -74,9 +74,11 @@
 //! use std::error::Error;
 //! use tracing_subscriber::EnvFilter;
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity();
 //!
@@ -89,7 +91,7 @@
 //! ## Transport
 //!
 //! Next up we need to construct a transport. Each transport in libp2p provides encrypted streams.
-//! E.g. combining TCP to establish connections, TLS to encrypt these connections and Yamux to run
+//! E.g. combining TCP to establish connections, NOISE to encrypt these connections and Yamux to run
 //! one or more streams on a connection. Another libp2p transport is QUIC, providing encrypted
 //! streams out-of-the-box. We will stick to TCP for now. Each of these implement the [`Transport`]
 //! trait.
@@ -97,17 +99,20 @@
 //! ```rust
 //! use std::error::Error;
 //! use tracing_subscriber::EnvFilter;
+//! use libp2p::{noise, tcp, yamux};
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-//!         .with_async_std()
+//!         .with_tokio()
 //!         .with_tcp(
-//!             libp2p::tcp::Config::default(),
-//!             libp2p::tls::Config::new,
-//!             libp2p::yamux::Config::default,
+//!             tcp::Config::default(),
+//!             noise::Config::new,
+//!             yamux::Config::default,
 //!         )?;
 //!
 //!     Ok(())
@@ -137,20 +142,22 @@
 //! With the above in mind, let's extend our example, creating a [`ping::Behaviour`](crate::ping::Behaviour) at the end:
 //!
 //! ```rust
-//! use libp2p::ping;
-//! use tracing_subscriber::EnvFilter;
 //! use std::error::Error;
+//! use tracing_subscriber::EnvFilter;
+//! use libp2p::{noise, ping, tcp, yamux};
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-//!         .with_async_std()
+//!         .with_tokio()
 //!         .with_tcp(
-//!             libp2p::tcp::Config::default(),
-//!             libp2p::tls::Config::new,
-//!             libp2p::yamux::Config::default,
+//!             tcp::Config::default(),
+//!             noise::Config::new,
+//!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?;
 //!
@@ -166,20 +173,22 @@
 //! to the [`Transport`] as well as events from the [`Transport`] to the [`NetworkBehaviour`].
 //!
 //! ```rust
-//! use libp2p::ping;
 //! use std::error::Error;
 //! use tracing_subscriber::EnvFilter;
+//! use libp2p::{noise, ping, tcp, yamux};
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-//!         .with_async_std()
+//!         .with_tokio()
 //!         .with_tcp(
-//!             libp2p::tcp::Config::default(),
-//!             libp2p::tls::Config::new,
-//!             libp2p::yamux::Config::default,
+//!             tcp::Config::default(),
+//!             noise::Config::new,
+//!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
 //!         .build();
@@ -199,24 +208,25 @@
 //! Thus, without any other behaviour in place, we would not be able to observe the pings.
 //!
 //! ```rust
-//! use libp2p::ping;
-//! use std::error::Error;
-//! use std::time::Duration;
+//! use std::{error::Error, time::Duration};
 //! use tracing_subscriber::EnvFilter;
+//! use libp2p::{noise, ping, tcp, yamux};
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-//!         .with_async_std()
+//!         .with_tokio()
 //!         .with_tcp(
-//!             libp2p::tcp::Config::default(),
-//!             libp2p::tls::Config::new,
-//!             libp2p::yamux::Config::default,
+//!             tcp::Config::default(),
+//!             noise::Config::new,
+//!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))) // Allows us to observe pings indefinitely.
+//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
 //!         .build();
 //!
 //!     Ok(())
@@ -250,24 +260,25 @@
 //! remote peer.
 //!
 //! ```rust
-//! use libp2p::{ping, Multiaddr};
-//! use std::error::Error;
-//! use std::time::Duration;
+//! use std::{error::Error, time::Duration};
 //! use tracing_subscriber::EnvFilter;
+//! use libp2p::{noise, ping, tcp, yamux, Multiaddr};
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-//!         .with_async_std()
+//!         .with_tokio()
 //!         .with_tcp(
-//!             libp2p::tcp::Config::default(),
-//!             libp2p::tls::Config::new,
-//!             libp2p::yamux::Config::default,
+//!             tcp::Config::default(),
+//!             noise::Config::new,
+//!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))) // Allows us to observe pings indefinitely..
+//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned
@@ -293,26 +304,26 @@
 //! outgoing connection in case we specify an address on the CLI.
 //!
 //! ```no_run
-//! use futures::prelude::*;
-//! use libp2p::swarm::SwarmEvent;
-//! use libp2p::{ping, Multiaddr};
-//! use std::error::Error;
-//! use std::time::Duration;
+//! use std::{error::Error, time::Duration};
 //! use tracing_subscriber::EnvFilter;
+//! use libp2p::{noise, ping, tcp, yamux, Multiaddr, swarm::SwarmEvent};
+//! use futures::prelude::*;
 //!
-//! #[async_std::main]
+//! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+//!     let _ = tracing_subscriber::fmt()
+//!         .with_env_filter(EnvFilter::from_default_env())
+//!         .try_init();
 //!
 //!     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-//!         .with_async_std()
+//!         .with_tokio()
 //!         .with_tcp(
-//!             libp2p::tcp::Config::default(),
-//!             libp2p::tls::Config::new,
-//!             libp2p::yamux::Config::default,
+//!             tcp::Config::default(),
+//!             noise::Config::new,
+//!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))) // Allows us to observe pings indefinitely.
+//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned

From f0cbd4fb0cef8d1ae2298901eab95acb5f104ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 22 Aug 2024 18:49:08 +0100
Subject: [PATCH 363/455] chore(ci): update Rust stable version

Pull-Request: #5568.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0465540d47..2c1dfc8aaef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-version: [
-          1.78.0, # current stable
+          1.80.0, # current stable
           beta,
         ]
     steps:

From de8cba961b16d2f418153c6ca550f39256d8c12b Mon Sep 17 00:00:00 2001
From: Panagiotis Ganelis <50522617+PanGan21@users.noreply.github.com>
Date: Tue, 27 Aug 2024 10:25:13 +0300
Subject: [PATCH 364/455] feat(kad): emit `ToSwarm::NewExternalAddrOfPeer`
 (#5549)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->
Updates `libp2p-kad` to emit new event `ToSwarm::NewExternalAddrOfPeer`
whenever it discovers a new address through the DHT.
Related: #5103

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [X] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [X] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
---
 Cargo.lock                         |  2 +-
 Cargo.toml                         |  2 +-
 protocols/kad/CHANGELOG.md         |  5 +++++
 protocols/kad/Cargo.toml           |  2 +-
 protocols/kad/src/behaviour.rs     |  8 +++++++-
 protocols/kad/tests/client_mode.rs | 18 ++++++++++++++++--
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8932f40a04c..783480bb8b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2928,7 +2928,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.46.1"
+version = "0.46.2"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 31c3a8e4b9e..8216c7a1787 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.47.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
-libp2p-kad = { version = "0.46.1", path = "protocols/kad" }
+libp2p-kad = { version = "0.46.2", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index a41d6b9a131..f4e25e0de05 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.46.2
+
+- Emit `ToSwarm::NewExternalAddrOfPeer`.
+  See [PR 5549](https://github.com/libp2p/rust-libp2p/pull/5549)
+
 ## 0.46.1
 
 - Use new provider record update strategy to prevent Sybil attack.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index a00959fced6..11a670933db 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.46.1"
+version = "0.46.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index fc3d8a1adaa..a541648707a 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -2562,13 +2562,19 @@ where
             // Drain applied pending entries from the routing table.
             if let Some(entry) = self.kbuckets.take_applied_pending() {
                 let kbucket::Node { key, value } = entry.inserted;
+                let peer_id = key.into_preimage();
+                self.queued_events
+                    .push_back(ToSwarm::NewExternalAddrOfPeer {
+                        peer_id,
+                        address: value.first().clone(),
+                    });
                 let event = Event::RoutingUpdated {
                     bucket_range: self
                         .kbuckets
                         .bucket(&key)
                         .map(|b| b.range())
                         .expect("Self to never be applied from pending."),
-                    peer: key.into_preimage(),
+                    peer: peer_id,
                     is_new_peer: true,
                     addresses: value,
                     old_peer: entry.evicted.map(|n| n.key.into_preimage()),
diff --git a/protocols/kad/tests/client_mode.rs b/protocols/kad/tests/client_mode.rs
index 6aceeb27263..2c8d11beac7 100644
--- a/protocols/kad/tests/client_mode.rs
+++ b/protocols/kad/tests/client_mode.rs
@@ -23,14 +23,21 @@ async fn server_gets_added_to_routing_table_by_client() {
     let server_peer_id = *server.local_peer_id();
     async_std::task::spawn(server.loop_on_next());
 
-    let peer = client
+    let external_event_peer = client
+        .wait(|e| match e {
+            SwarmEvent::NewExternalAddrOfPeer { peer_id, .. } => Some(peer_id),
+            _ => None,
+        })
+        .await;
+    let routing_updated_peer = client
         .wait(|e| match e {
             SwarmEvent::Behaviour(Kad(RoutingUpdated { peer, .. })) => Some(peer),
             _ => None,
         })
         .await;
 
-    assert_eq!(peer, server_peer_id);
+    assert_eq!(external_event_peer, server_peer_id);
+    assert_eq!(routing_updated_peer, server_peer_id);
 }
 
 #[async_std::test]
@@ -126,6 +133,12 @@ async fn set_client_to_server_mode() {
 
     let server_peer_id = *server.local_peer_id();
 
+    let peer_id = client
+        .wait(|e| match e {
+            SwarmEvent::NewExternalAddrOfPeer { peer_id, .. } => Some(peer_id),
+            _ => None,
+        })
+        .await;
     let client_event = client.wait(|e| match e {
         SwarmEvent::Behaviour(Kad(RoutingUpdated { peer, .. })) => Some(peer),
         _ => None,
@@ -138,6 +151,7 @@ async fn set_client_to_server_mode() {
     let (peer, info) = futures::future::join(client_event, server_event).await;
 
     assert_eq!(peer, server_peer_id);
+    assert_eq!(peer_id, server_peer_id);
     assert!(info
         .protocols
         .iter()

From aa9317fbdd88cc4c9a39ea608fa1d57e022297fc Mon Sep 17 00:00:00 2001
From: Probot <94048855+Prabhat1308@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:32:30 +0530
Subject: [PATCH 365/455] fix: Change `__Nonexhaustive` to `__Invalid` and
 update web-sys  (#5569)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
Bumps up web-sys version to `0.3.70`
fixes #5557

## Change checklist

- [X] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [X] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
Co-authored-by: João Oliveira <hello@jxs.pt>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 Cargo.lock                                    | 54 +++++++++++--------
 Cargo.toml                                    |  2 +-
 transports/webrtc-websys/CHANGELOG.md         |  5 ++
 transports/webrtc-websys/Cargo.toml           |  4 +-
 transports/webrtc-websys/src/connection.rs    |  9 ++--
 transports/webrtc-websys/src/sdp.rs           |  8 +--
 .../src/stream/poll_data_channel.rs           |  3 +-
 transports/webtransport-websys/CHANGELOG.md   |  2 +
 transports/webtransport-websys/Cargo.toml     |  8 +--
 wasm-tests/webtransport-tests/Cargo.toml      |  8 +--
 10 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 783480bb8b1..d4350c0496b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2571,9 +2571,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3509,7 +3509,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc-websys"
-version = "0.4.0-alpha"
+version = "0.4.0-alpha.2"
 dependencies = [
  "bytes",
  "futures",
@@ -3804,6 +3804,16 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "minicov"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+dependencies = [
+ "cc",
+ "walkdir",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -6677,19 +6687,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -6702,9 +6713,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6714,9 +6725,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6724,9 +6735,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6737,18 +6748,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.42"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
+ "minicov",
  "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -6757,9 +6769,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
+checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6779,9 +6791,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 8216c7a1787..bd6018b024f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,7 +111,7 @@ libp2p-uds = { version = "0.41.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.3.0", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
-libp2p-webrtc-websys = { version = "0.4.0-alpha", path = "transports/webrtc-websys" }
+libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.44.0", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.0", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
diff --git a/transports/webrtc-websys/CHANGELOG.md b/transports/webrtc-websys/CHANGELOG.md
index 475b13727e6..5b8f2efb3b0 100644
--- a/transports/webrtc-websys/CHANGELOG.md
+++ b/transports/webrtc-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0-alpha.2
+
+- Bump version of web-sys and update `__Nonexhaustive` to `__Invalid`.
+  See [PR 5569](https://github.com/libp2p/rust-libp2p/pull/5569) 
+
 ## 0.4.0-alpha
 
 - Implement refactored `Transport`.
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index c874b33bfc7..453abe57f74 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 name = "libp2p-webrtc-websys"
 repository = "https://github.com/libp2p/rust-libp2p"
 rust-version = { workspace = true }
-version = "0.4.0-alpha"
+version = "0.4.0-alpha.2"
 publish = true
 
 [dependencies]
@@ -25,7 +25,7 @@ thiserror = "1"
 tracing = { workspace = true }
 wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.42" }
-web-sys = { version = "0.3.69", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
+web-sys = { version = "0.3.70", features = ["Document", "Location", "MessageEvent", "Navigator", "RtcCertificate", "RtcConfiguration", "RtcDataChannel", "RtcDataChannelEvent", "RtcDataChannelInit", "RtcDataChannelState", "RtcDataChannelType", "RtcPeerConnection", "RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit", "Window"] }
 
 [lints]
 workspace = true
diff --git a/transports/webrtc-websys/src/connection.rs b/transports/webrtc-websys/src/connection.rs
index b858237da63..d0c6ccd2238 100644
--- a/transports/webrtc-websys/src/connection.rs
+++ b/transports/webrtc-websys/src/connection.rs
@@ -186,11 +186,11 @@ impl RtcPeerConnection {
 
         let certificate = JsFuture::from(certificate_promise).await?;
 
-        let mut config = RtcConfiguration::default();
+        let config = RtcConfiguration::default();
         // wrap certificate in a js Array first before adding it to the config object
         let certificate_arr = js_sys::Array::new();
         certificate_arr.push(&certificate);
-        config.certificates(&certificate_arr);
+        config.set_certificates(&certificate_arr);
 
         let inner = web_sys::RtcPeerConnection::new_with_configuration(&config)?;
 
@@ -214,8 +214,9 @@ impl RtcPeerConnection {
 
         let dc = match negotiated {
             true => {
-                let mut options = RtcDataChannelInit::new();
-                options.negotiated(true).id(0); // id is only ever set to zero when negotiated is true
+                let options = RtcDataChannelInit::new();
+                options.set_negotiated(true);
+                options.set_id(0); // id is only ever set to zero when negotiated is true
 
                 self.inner
                     .create_data_channel_with_data_channel_dict(LABEL, &options)
diff --git a/transports/webrtc-websys/src/sdp.rs b/transports/webrtc-websys/src/sdp.rs
index 439182ea4db..9e63fd92462 100644
--- a/transports/webrtc-websys/src/sdp.rs
+++ b/transports/webrtc-websys/src/sdp.rs
@@ -8,8 +8,8 @@ pub(crate) fn answer(
     server_fingerprint: Fingerprint,
     client_ufrag: &str,
 ) -> RtcSessionDescriptionInit {
-    let mut answer_obj = RtcSessionDescriptionInit::new(RtcSdpType::Answer);
-    answer_obj.sdp(&libp2p_webrtc_utils::sdp::answer(
+    let answer_obj = RtcSessionDescriptionInit::new(RtcSdpType::Answer);
+    answer_obj.set_sdp(&libp2p_webrtc_utils::sdp::answer(
         addr,
         server_fingerprint,
         client_ufrag,
@@ -48,8 +48,8 @@ pub(crate) fn offer(offer: String, client_ufrag: &str) -> RtcSessionDescriptionI
 
     tracing::trace!(offer=%munged_sdp_offer, "Created SDP offer");
 
-    let mut offer_obj = RtcSessionDescriptionInit::new(RtcSdpType::Offer);
-    offer_obj.sdp(&munged_sdp_offer);
+    let offer_obj = RtcSessionDescriptionInit::new(RtcSdpType::Offer);
+    offer_obj.set_sdp(&munged_sdp_offer);
 
     offer_obj
 }
diff --git a/transports/webrtc-websys/src/stream/poll_data_channel.rs b/transports/webrtc-websys/src/stream/poll_data_channel.rs
index dfd861de9df..3ec744342eb 100644
--- a/transports/webrtc-websys/src/stream/poll_data_channel.rs
+++ b/transports/webrtc-websys/src/stream/poll_data_channel.rs
@@ -143,7 +143,8 @@ impl PollDataChannel {
             RtcDataChannelState::Closing | RtcDataChannelState::Closed => {
                 return Poll::Ready(Err(io::ErrorKind::BrokenPipe.into()))
             }
-            RtcDataChannelState::Open | RtcDataChannelState::__Nonexhaustive => {}
+            RtcDataChannelState::Open | RtcDataChannelState::__Invalid => {}
+            _ => {}
         }
 
         if self.overloaded.load(Ordering::SeqCst) {
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
index 2aab226ab12..411117918bd 100644
--- a/transports/webtransport-websys/CHANGELOG.md
+++ b/transports/webtransport-websys/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Implement refactored `Transport`.
   See [PR 4568](https://github.com/libp2p/rust-libp2p/pull/4568)
+- Bump version of web-sys and wasm-bindgen.
+  See [PR 5569](https://github.com/libp2p/rust-libp2p/pull/5569) 
 
 ## 0.3.0
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 370158190b1..9541c49b737 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 futures = { workspace = true }
-js-sys = "0.3.69"
+js-sys = "0.3.70"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-noise = { workspace = true }
@@ -24,9 +24,9 @@ multihash = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.61"
 tracing = { workspace = true }
-wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.42"
-web-sys = { version = "0.3.69", features = [
+wasm-bindgen = "0.2.93"
+wasm-bindgen-futures = "0.4.43"
+web-sys = { version = "0.3.70", features = [
     "ReadableStreamDefaultReader",
     "WebTransport",
     "WebTransportBidirectionalStream",
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index cf51a510a3f..d7db378ab1a 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -17,10 +17,10 @@ libp2p-noise = { workspace = true }
 libp2p-webtransport-websys = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
-wasm-bindgen = "0.2.90"
-wasm-bindgen-futures = "0.4.42"
-wasm-bindgen-test = "0.3.42"
-web-sys = { version = "0.3.69", features = ["Response", "Window"] }
+wasm-bindgen = "0.2.93"
+wasm-bindgen-futures = "0.4.43"
+wasm-bindgen-test = "0.3.43"
+web-sys = { version = "0.3.70", features = ["Response", "Window"] }
 
 [lints]
 workspace = true

From 56b6c62f6c71e8fa217e9e772d98824ba5d79c5c Mon Sep 17 00:00:00 2001
From: maqi <qi.ma@maidsafe.net>
Date: Wed, 28 Aug 2024 00:03:31 +0800
Subject: [PATCH 366/455] feat(kad): expose a kad query facility allowing
 dynamic num_results (#5555)

## Description

This PR is to expose a kad query facility that allowing specify
num_results dynamically.
It is related to the [Sybil Defence
issue](https://github.com/libp2p/rust-libp2p/issues/4769),
that during the attempt of implementation on higher level code, it is
find will be useful if libp2p-kad can expose such facility.

The PR try not to cause any interference to the existing work flow, only
introduce an `extra exposal`.

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 Cargo.lock                          |  2 +-
 Cargo.toml                          |  2 +-
 protocols/kad/CHANGELOG.md          |  5 +++
 protocols/kad/Cargo.toml            |  2 +-
 protocols/kad/src/behaviour.rs      | 32 ++++++++++++++-
 protocols/kad/src/behaviour/test.rs | 64 ++++++++++++++++++++++++++++-
 protocols/kad/src/query.rs          | 10 ++++-
 7 files changed, 110 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d4350c0496b..41ed8883c52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2928,7 +2928,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.46.2"
+version = "0.47.0"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index bd6018b024f..c23bb8650f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.47.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
-libp2p-kad = { version = "0.46.2", path = "protocols/kad" }
+libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index f4e25e0de05..12ccca2d7f1 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.47.0
+
+- Expose a kad query facility allowing specify num_results dynamicly.
+  See [PR 5555](https://github.com/libp2p/rust-libp2p/pull/5555).
+
 ## 0.46.2
 
 - Emit `ToSwarm::NewExternalAddrOfPeer`.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 11a670933db..5b95b8ac17d 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.46.2"
+version = "0.47.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index a541648707a..50715c53c74 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -732,6 +732,31 @@ where
     /// The result of the query is delivered in a
     /// [`Event::OutboundQueryProgressed{QueryResult::GetClosestPeers}`].
     pub fn get_closest_peers<K>(&mut self, key: K) -> QueryId
+    where
+        K: Into<kbucket::Key<K>> + Into<Vec<u8>> + Clone,
+    {
+        self.get_closest_peers_inner(key, None)
+    }
+
+    /// Initiates an iterative query for the closest peers to the given key.
+    /// The expected responding peers is specified by `num_results`
+    /// Note that the result is capped after exceeds K_VALUE
+    ///
+    /// The result of the query is delivered in a
+    /// [`Event::OutboundQueryProgressed{QueryResult::GetClosestPeers}`].
+    pub fn get_n_closest_peers<K>(&mut self, key: K, num_results: NonZeroUsize) -> QueryId
+    where
+        K: Into<kbucket::Key<K>> + Into<Vec<u8>> + Clone,
+    {
+        // The inner code never expect higher than K_VALUE results to be returned.
+        // And removing such cap will be tricky,
+        // since it would involve forging a new key and additional requests.
+        // Hence bound to K_VALUE here to set clear expectation and prevent unexpected behaviour.
+        let capped_num_results = std::cmp::min(num_results, K_VALUE);
+        self.get_closest_peers_inner(key, Some(capped_num_results))
+    }
+
+    fn get_closest_peers_inner<K>(&mut self, key: K, num_results: Option<NonZeroUsize>) -> QueryId
     where
         K: Into<kbucket::Key<K>> + Into<Vec<u8>> + Clone,
     {
@@ -740,6 +765,7 @@ where
         let info = QueryInfo::GetClosestPeers {
             key,
             step: ProgressStep::first(),
+            num_results,
         };
         let peer_keys: Vec<kbucket::Key<PeerId>> = self.kbuckets.closest_keys(&target).collect();
         self.queries.add_iter_closest(target, peer_keys, info)
@@ -1485,7 +1511,7 @@ where
                 })
             }
 
-            QueryInfo::GetClosestPeers { key, mut step } => {
+            QueryInfo::GetClosestPeers { key, mut step, .. } => {
                 step.last = true;
 
                 Some(Event::OutboundQueryProgressed {
@@ -1702,7 +1728,7 @@ where
                 },
             }),
 
-            QueryInfo::GetClosestPeers { key, mut step } => {
+            QueryInfo::GetClosestPeers { key, mut step, .. } => {
                 step.last = true;
                 Some(Event::OutboundQueryProgressed {
                     id: query_id,
@@ -3181,6 +3207,8 @@ pub enum QueryInfo {
         key: Vec<u8>,
         /// Current index of events.
         step: ProgressStep,
+        /// If required, `num_results` specifies expected responding peers
+        num_results: Option<NonZeroUsize>,
     },
 
     /// A (repeated) query initiated by [`Behaviour::get_providers`].
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index c4859f2f138..7409168ac2a 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -263,7 +263,7 @@ fn query_iter() {
 
         match swarms[0].behaviour_mut().query(&qid) {
             Some(q) => match q.info() {
-                QueryInfo::GetClosestPeers { key, step } => {
+                QueryInfo::GetClosestPeers { key, step, .. } => {
                     assert_eq!(&key[..], search_target.to_bytes().as_slice());
                     assert_eq!(usize::from(step.count), 1);
                 }
@@ -425,6 +425,68 @@ fn unresponsive_not_returned_indirect() {
     }))
 }
 
+// Test the result of get_closest_peers with different num_results
+// Note that the result is capped after exceeds K_VALUE
+#[test]
+fn get_closest_with_different_num_results() {
+    let k_value = K_VALUE.get();
+    for replication_factor in [5, k_value / 2, k_value] {
+        for num_results in k_value / 2..k_value * 2 {
+            get_closest_with_different_num_results_inner(num_results, replication_factor)
+        }
+    }
+}
+
+fn get_closest_with_different_num_results_inner(num_results: usize, replication_factor: usize) {
+    let k_value = K_VALUE.get();
+    let num_of_nodes = 3 * k_value;
+    let mut cfg = Config::new(PROTOCOL_NAME);
+    cfg.set_replication_factor(NonZeroUsize::new(replication_factor).unwrap());
+    let swarms = build_connected_nodes_with_config(num_of_nodes, replication_factor - 1, cfg);
+
+    let mut swarms = swarms
+        .into_iter()
+        .map(|(_addr, swarm)| swarm)
+        .collect::<Vec<_>>();
+
+    // Ask first to search a random value.
+    let search_target = PeerId::random();
+    let Some(num_results_nonzero) = std::num::NonZeroUsize::new(num_results) else {
+        panic!("Unexpected NonZeroUsize val of {num_results}");
+    };
+    swarms[0]
+        .behaviour_mut()
+        .get_n_closest_peers(search_target, num_results_nonzero);
+
+    block_on(poll_fn(move |ctx| {
+        for swarm in &mut swarms {
+            loop {
+                match swarm.poll_next_unpin(ctx) {
+                    Poll::Ready(Some(SwarmEvent::Behaviour(Event::OutboundQueryProgressed {
+                        result: QueryResult::GetClosestPeers(Ok(ok)),
+                        ..
+                    }))) => {
+                        assert_eq!(&ok.key[..], search_target.to_bytes().as_slice());
+                        if num_results > k_value {
+                            assert_eq!(ok.peers.len(), k_value, "Failed with replication_factor: {replication_factor}, num_results: {num_results}");
+                        } else {
+                            assert_eq!(ok.peers.len(), num_results, "Failed with replication_factor: {replication_factor}, num_results: {num_results}");
+                        }
+
+                        return Poll::Ready(());
+                    }
+                    // Ignore any other event.
+                    Poll::Ready(Some(_)) => (),
+                    e @ Poll::Ready(_) => panic!("Unexpected return value: {e:?}"),
+                    Poll::Pending => break,
+                }
+            }
+        }
+
+        Poll::Pending
+    }))
+}
+
 #[test]
 fn get_record_not_found() {
     let mut swarms = build_nodes(3);
diff --git a/protocols/kad/src/query.rs b/protocols/kad/src/query.rs
index c598bac012e..1a895d9627c 100644
--- a/protocols/kad/src/query.rs
+++ b/protocols/kad/src/query.rs
@@ -138,8 +138,16 @@ impl QueryPool {
         T: Into<KeyBytes> + Clone,
         I: IntoIterator<Item = Key<PeerId>>,
     {
+        let num_results = match info {
+            QueryInfo::GetClosestPeers {
+                num_results: Some(val),
+                ..
+            } => val,
+            _ => self.config.replication_factor,
+        };
+
         let cfg = ClosestPeersIterConfig {
-            num_results: self.config.replication_factor,
+            num_results,
             parallelism: self.config.parallelism,
             ..ClosestPeersIterConfig::default()
         };

From 64c6eb299ce905b2f81fd1317ec616f56dd37986 Mon Sep 17 00:00:00 2001
From: Elias Rad <146735585+nnsW3@users.noreply.github.com>
Date: Tue, 27 Aug 2024 20:54:23 +0300
Subject: [PATCH 367/455] chore: fix spelling issues (#5522)

Hello
I found several spelling issues in your docs.
Br, Elias.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 docs/maintainer-handbook.md | 2 +-
 examples/ipfs-kad/README.md | 2 +-
 wasm-tests/README.md        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/maintainer-handbook.md b/docs/maintainer-handbook.md
index 6d36f6fe77c..0b090901216 100644
--- a/docs/maintainer-handbook.md
+++ b/docs/maintainer-handbook.md
@@ -31,7 +31,7 @@ This will have mergify approve your PR, thus fulfilling all requirements to auto
 Our CI checks that each crate which is modified gets a changelog entry.
 Whilst this is a good default safety-wise, it creates a lot of false-positives for changes that are internal and don't need a changelog entry.
 
-For PRs that in the categories `chore`, `deps`, `refactor` and `docs`, this check is disabled automatically.
+For PRs in the categories `chore`, `deps`, `refactor` and `docs`, this check is disabled automatically.
 Any other PR needs to explicitly disable this check if desired by applying the `internal-change` label.
 
 ## Dependencies
diff --git a/examples/ipfs-kad/README.md b/examples/ipfs-kad/README.md
index a46246a3920..05556c89382 100644
--- a/examples/ipfs-kad/README.md
+++ b/examples/ipfs-kad/README.md
@@ -87,5 +87,5 @@ Failed to insert the PK record
 ## Conclusion
 
 In conclusion, this example provides a practical demonstration of using the Rust P2P Library to interact with the Kademlia protocol on the IPFS network.
-By examining the code and running the example, users can gain insights into the inner workings of Kademlia and how it performs various basic actions like getting the closes peers or inserting records into the DHT.
+By examining the code and running the example, users can gain insights into the inner workings of Kademlia and how it performs various basic actions like getting the closest peers or inserting records into the DHT.
 This knowledge can be valuable when developing peer-to-peer applications or understanding decentralized networks.
diff --git a/wasm-tests/README.md b/wasm-tests/README.md
index 1d0902b106c..2538e48a145 100644
--- a/wasm-tests/README.md
+++ b/wasm-tests/README.md
@@ -8,4 +8,4 @@ Before you run the tests you need to install the following:
 
 # Run tests
 
-Just call `run-all.sh` or `run.sh` in the test directory you are interested.
+Just call `run-all.sh` or `run.sh` in the test directory if you are interested.

From e63975d7742710d4498b941e151c5177e06392ce Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:07:26 +0200
Subject: [PATCH 368/455] feat(allow-block-list): add getters and return
 results (#5572)

## Description

Small changes to improve usability of the `allow-block-list` Behaviour.
When trying to use it, we found ourselves wanting to known:
- which were the current allowed or blocked peers: hence the new methods
`allowed_peers` and `blocked_peers`
- if the peer was already present in the set when adding or removing it
from the set: that is why `allow/disallow_peer` and `block/unblock_peer`
methods now return a boolean, allowing the end user the know if there
was a change or not (in our case, we needed it in order to log
something).

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates
---
 Cargo.lock                         |  2 +-
 Cargo.toml                         |  2 +-
 misc/allow-block-list/CHANGELOG.md |  6 +++
 misc/allow-block-list/Cargo.toml   |  2 +-
 misc/allow-block-list/src/lib.rs   | 66 ++++++++++++++++++++++--------
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 41ed8883c52..7f37b652c30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2675,7 +2675,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-allow-block-list"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "async-std",
  "libp2p-core",
diff --git a/Cargo.toml b/Cargo.toml
index c23bb8650f3..8d63ac3ee1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,7 +76,7 @@ asynchronous-codec = { version = "0.7.0" }
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.1", path = "libp2p" }
-libp2p-allow-block-list = { version = "0.4.0", path = "misc/allow-block-list" }
+libp2p-allow-block-list = { version = "0.4.1", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.0", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.0", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.0", path = "core" }
diff --git a/misc/allow-block-list/CHANGELOG.md b/misc/allow-block-list/CHANGELOG.md
index 0017cbc8648..3cda0603ee4 100644
--- a/misc/allow-block-list/CHANGELOG.md
+++ b/misc/allow-block-list/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.4.1
+
+- Add getters & setters for the allowed/blocked peers.
+  Return a `bool` for every "insert/remove" function, informing if a change was performed.
+  See [PR 5572](https://github.com/libp2p/rust-libp2p/pull/5572).
+
 ## 0.4.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml
index 4209d72ab4f..1ff0ccff906 100644
--- a/misc/allow-block-list/Cargo.toml
+++ b/misc/allow-block-list/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-allow-block-list"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Allow/block list connection management for libp2p."
-version = "0.4.0"
+version = "0.4.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/allow-block-list/src/lib.rs b/misc/allow-block-list/src/lib.rs
index c877ab09c9b..7646638a651 100644
--- a/misc/allow-block-list/src/lib.rs
+++ b/misc/allow-block-list/src/lib.rs
@@ -94,44 +94,74 @@ pub struct BlockedPeers {
 }
 
 impl Behaviour<AllowedPeers> {
+    /// Peers that are currently allowed.
+    pub fn allowed_peers(&self) -> &HashSet<PeerId> {
+        &self.state.peers
+    }
+
     /// Allow connections to the given peer.
-    pub fn allow_peer(&mut self, peer: PeerId) {
-        self.state.peers.insert(peer);
-        if let Some(waker) = self.waker.take() {
-            waker.wake()
+    ///
+    /// Returns whether the peer was newly inserted. Does nothing if the peer was already present in the set.
+    pub fn allow_peer(&mut self, peer: PeerId) -> bool {
+        let inserted = self.state.peers.insert(peer);
+        if inserted {
+            if let Some(waker) = self.waker.take() {
+                waker.wake()
+            }
         }
+        inserted
     }
 
     /// Disallow connections to the given peer.
     ///
     /// All active connections to this peer will be closed immediately.
-    pub fn disallow_peer(&mut self, peer: PeerId) {
-        self.state.peers.remove(&peer);
-        self.close_connections.push_back(peer);
-        if let Some(waker) = self.waker.take() {
-            waker.wake()
+    ///
+    /// Returns whether the peer was present in the set. Does nothing if the peer was not present in the set.
+    pub fn disallow_peer(&mut self, peer: PeerId) -> bool {
+        let removed = self.state.peers.remove(&peer);
+        if removed {
+            self.close_connections.push_back(peer);
+            if let Some(waker) = self.waker.take() {
+                waker.wake()
+            }
         }
+        removed
     }
 }
 
 impl Behaviour<BlockedPeers> {
+    /// Peers that are currently blocked.
+    pub fn blocked_peers(&self) -> &HashSet<PeerId> {
+        &self.state.peers
+    }
+
     /// Block connections to a given peer.
     ///
     /// All active connections to this peer will be closed immediately.
-    pub fn block_peer(&mut self, peer: PeerId) {
-        self.state.peers.insert(peer);
-        self.close_connections.push_back(peer);
-        if let Some(waker) = self.waker.take() {
-            waker.wake()
+    ///
+    /// Returns whether the peer was newly inserted. Does nothing if the peer was already present in the set.
+    pub fn block_peer(&mut self, peer: PeerId) -> bool {
+        let inserted = self.state.peers.insert(peer);
+        if inserted {
+            self.close_connections.push_back(peer);
+            if let Some(waker) = self.waker.take() {
+                waker.wake()
+            }
         }
+        inserted
     }
 
     /// Unblock connections to a given peer.
-    pub fn unblock_peer(&mut self, peer: PeerId) {
-        self.state.peers.remove(&peer);
-        if let Some(waker) = self.waker.take() {
-            waker.wake()
+    ///
+    /// Returns whether the peer was present in the set. Does nothing if the peer was not present in the set.
+    pub fn unblock_peer(&mut self, peer: PeerId) -> bool {
+        let removed = self.state.peers.remove(&peer);
+        if removed {
+            if let Some(waker) = self.waker.take() {
+                waker.wake()
+            }
         }
+        removed
     }
 }
 

From cefd22b8846ab005b311d5a3bc3d90c7e3a67872 Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:58:41 +0200
Subject: [PATCH 369/455] feat(kad): add `mode` getter on `Behaviour` (#5573)

## Description

Small PR adding a getter for the `mode` attribute of the
`kad::Behaviour` in order to get the mode that the DHT is operating in,
at the moment.

In our project, we needed to expose an API endpoint which included the
mode that the DHT was operating. Having a getter was necessary so we are
upstreaming this change.

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates
---
 protocols/kad/CHANGELOG.md     | 3 +++
 protocols/kad/src/behaviour.rs | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 12ccca2d7f1..d0ab7986aad 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 - Expose a kad query facility allowing specify num_results dynamicly.
   See [PR 5555](https://github.com/libp2p/rust-libp2p/pull/5555).
+- Add `mode` getter on `Behaviour`.
+  See [PR 5573](https://github.com/libp2p/rust-libp2p/pull/5573).
+  
 
 ## 0.46.2
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 50715c53c74..0b15e507ba4 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -1111,6 +1111,11 @@ where
         }
     }
 
+    /// Get the [`Mode`] in which the DHT is currently operating.
+    pub fn mode(&self) -> Mode {
+        self.mode
+    }
+
     fn reconfigure_mode(&mut self) {
         if self.connections.is_empty() {
             return;

From 95f40ff87be47cf919f80d7c4d63257fecb227a3 Mon Sep 17 00:00:00 2001
From: Age Manning <Age@AgeManning.com>
Date: Fri, 30 Aug 2024 22:36:28 +1000
Subject: [PATCH 370/455] chore: add funding.json (#5581)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

This adds a FUNDING.json file to the main repo. This is required for
various projects, however the immediate case is for registering for an
optimism retropgf grant.

---------

Co-authored-by: João Oliveira <hello@jxs.pt>
---
 FUNDING.json | 5 +++++
 funding.json | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 FUNDING.json
 delete mode 100644 funding.json

diff --git a/FUNDING.json b/FUNDING.json
new file mode 100644
index 00000000000..cce3fb3fe4c
--- /dev/null
+++ b/FUNDING.json
@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0xdf1bb03d08808e2d789f5eac8462bdc560f1bb5b0877f0cf8c66ab53a0bc2f5c"
+  }
+}
diff --git a/funding.json b/funding.json
deleted file mode 100644
index bcf7fc2783d..00000000000
--- a/funding.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "opRetro": {
-    "projectId": "0x966804cb492e1a4bde5d781a676a44a23d69aa5dd2562fa7a4f95bb606021c8b"
-  }
-}

From f38fb5c334079b170d9cf8365bf5824210606f36 Mon Sep 17 00:00:00 2001
From: P1R0 <p1r0@nethunters.xyz>
Date: Fri, 30 Aug 2024 11:06:02 -0600
Subject: [PATCH 371/455] chore(examples): remove unused dependency from
 rendezvous (#5580)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->
Following on issue #4449
refactor: remove unnecesary dependencies rendezvous example (async-std)
## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->
in the rendezvous example there where unnecessary dependencies in the
Cargo.toml

## Change checklist

* Removed unnecessary dependencies on examples/rendezvous/Cargo.toml

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates

Co-authored-by: David E. Perez Negron R. <david@nethunters.xyz>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 Cargo.lock                     | 2 --
 examples/rendezvous/Cargo.toml | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f37b652c30..d0e45e9bb1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4984,8 +4984,6 @@ dependencies = [
 name = "rendezvous-example"
 version = "0.1.0"
 dependencies = [
- "async-std",
- "async-trait",
  "futures",
  "libp2p",
  "tokio",
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
index 5a0672dcec8..4eea38616f4 100644
--- a/examples/rendezvous/Cargo.toml
+++ b/examples/rendezvous/Cargo.toml
@@ -9,10 +9,8 @@ license = "MIT"
 release = false
 
 [dependencies]
-async-std = { version = "1.12", features = ["attributes"] }
-async-trait = "0.1"
 futures = { workspace = true }
-libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
+libp2p = { path = "../../libp2p", features = ["identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }

From f0589c8d47bee507cba6cb2d3c73942ef1611a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 3 Sep 2024 12:50:23 +0100
Subject: [PATCH 372/455] chore(ci): update Dockerfiles Rust version (#5587)

---
 misc/server/Dockerfile    | 2 +-
 protocols/perf/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/server/Dockerfile b/misc/server/Dockerfile
index 9d2742f97e8..1583fba6bef 100644
--- a/misc/server/Dockerfile
+++ b/misc/server/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.73.0 as chef
+FROM rust:1.75.0 as chef
 RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
 RUN cargo install --locked --root /usr/local libp2p-lookup --version 0.6.4
 WORKDIR /app
diff --git a/protocols/perf/Dockerfile b/protocols/perf/Dockerfile
index 6523e3bede1..1bd846cc228 100644
--- a/protocols/perf/Dockerfile
+++ b/protocols/perf/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.67.0 as builder
+FROM rust:1.75.0 as builder
 
 # Run with access to the target cache to speed up builds
 WORKDIR /workspace

From 93169cc6fa4a35aa0b3d5ddbd9e393118e46f412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 3 Sep 2024 18:45:33 +0100
Subject: [PATCH 373/455] fix(gossipsub): Attempt to publish to at least mesh_n
 peers (#5578)

## Description

With flood published disabled we've noticed that it can be the case that
we have connected peers on topics but these peers are not in our mesh
(perhaps due to their own mesh requirements). Currently, we fail to
publish the message if there are no peers in our mesh.

This PR adjusts this logic to always attempt to publish to at least
mesh_n peers. If we have peers that are subscribed to a topic, we will
now attempt to publish messages to them (provided they have the required
score).

This PR also simplies the peer and respective topics by moving the topic
list each peer has subscribed to `PeerConnections` and removing both
`peer_topics` and `topic_peers` from the main `Behaviour`.
Per commit review is suggested.

---------

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 Cargo.lock                                 |   2 +-
 Cargo.toml                                 |   2 +-
 protocols/gossipsub/CHANGELOG.md           |   5 +
 protocols/gossipsub/Cargo.toml             |   2 +-
 protocols/gossipsub/src/behaviour.rs       | 399 +++++++++------------
 protocols/gossipsub/src/behaviour/tests.rs | 101 +++---
 protocols/gossipsub/src/metrics.rs         |  15 +-
 protocols/gossipsub/src/types.rs           |   4 +-
 8 files changed, 242 insertions(+), 288 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0e45e9bb1a..9c8eae458fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2838,7 +2838,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 8d63ac3ee1e..587bef4480a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ libp2p-core = { version = "0.42.0", path = "core" }
 libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
-libp2p-gossipsub = { version = "0.47.0", path = "protocols/gossipsub" }
+libp2p-gossipsub = { version = "0.47.1", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 8e115052d31..c47a9f40f66 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.47.1
+
+- Attempt to publish to at least mesh_n peers when flood publish is disabled.
+  See [PR 5578](https://github.com/libp2p/rust-libp2p/pull/5578).
+
 ## 0.47.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 4cb590bed0c..665f757fcb3 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Gossipsub protocol for libp2p"
-version = "0.47.0"
+version = "0.47.1"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 0d1af1ada0c..16adb555a44 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -259,12 +259,6 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
     /// the set of [`ConnectionId`]s.
     connected_peers: HashMap<PeerId, PeerConnections>,
 
-    /// A map of all connected peers - A map of topic hash to a list of gossipsub peer Ids.
-    topic_peers: HashMap<TopicHash, BTreeSet<PeerId>>,
-
-    /// A map of all connected peers to their subscribed topics.
-    peer_topics: HashMap<PeerId, BTreeSet<TopicHash>>,
-
     /// A set of all explicit peers. These are peers that remain connected and we unconditionally
     /// forward messages to, outside of the scoring system.
     explicit_peers: HashSet<PeerId>,
@@ -443,8 +437,6 @@ where
             control_pool: HashMap::new(),
             publish_config: privacy.into(),
             duplicate_cache: DuplicateCache::new(config.duplicate_cache_time()),
-            topic_peers: HashMap::new(),
-            peer_topics: HashMap::new(),
             explicit_peers: HashSet::new(),
             blacklisted_peers: HashSet::new(),
             mesh: HashMap::new(),
@@ -501,9 +493,9 @@ where
 
     /// Lists all known peers and their associated subscribed topics.
     pub fn all_peers(&self) -> impl Iterator<Item = (&PeerId, Vec<&TopicHash>)> {
-        self.peer_topics
+        self.connected_peers
             .iter()
-            .map(|(peer_id, topic_set)| (peer_id, topic_set.iter().collect()))
+            .map(|(peer_id, peer)| (peer_id, peer.topics.iter().collect()))
     }
 
     /// Lists all known peers and their associated protocol.
@@ -535,7 +527,7 @@ where
         }
 
         // send subscription request to all peers
-        for peer in self.peer_topics.keys().copied().collect::<Vec<_>>() {
+        for peer in self.connected_peers.keys().copied().collect::<Vec<_>>() {
             tracing::debug!(%peer, "Sending SUBSCRIBE to peer");
             let event = RpcOut::Subscribe(topic_hash.clone());
             self.send_message(peer, event);
@@ -563,7 +555,7 @@ where
         }
 
         // announce to all peers
-        for peer in self.peer_topics.keys().copied().collect::<Vec<_>>() {
+        for peer in self.connected_peers.keys().copied().collect::<Vec<_>>() {
             tracing::debug!(%peer, "Sending UNSUBSCRIBE to peer");
             let event = RpcOut::Unsubscribe(topic_hash.clone());
             self.send_message(peer, event);
@@ -621,84 +613,103 @@ where
 
         let topic_hash = raw_message.topic.clone();
 
+        let mut peers_on_topic = self
+            .connected_peers
+            .iter()
+            .filter(|(_, p)| p.topics.contains(&topic_hash))
+            .map(|(peer_id, _)| peer_id)
+            .peekable();
+
+        if peers_on_topic.peek().is_none() {
+            return Err(PublishError::InsufficientPeers);
+        }
+
         let mut recipient_peers = HashSet::new();
-        if let Some(set) = self.topic_peers.get(&topic_hash) {
-            if self.config.flood_publish() {
-                // Forward to all peers above score and all explicit peers
-                recipient_peers.extend(set.iter().filter(|p| {
-                    self.explicit_peers.contains(*p)
-                        || !self.score_below_threshold(p, |ts| ts.publish_threshold).0
-                }));
-            } else {
-                match self.mesh.get(&raw_message.topic) {
-                    // Mesh peers
-                    Some(mesh_peers) => {
-                        recipient_peers.extend(mesh_peers);
+        if self.config.flood_publish() {
+            // Forward to all peers above score and all explicit peers
+            recipient_peers.extend(peers_on_topic.filter(|p| {
+                self.explicit_peers.contains(*p)
+                    || !self.score_below_threshold(p, |ts| ts.publish_threshold).0
+            }));
+        } else {
+            match self.mesh.get(&topic_hash) {
+                // Mesh peers
+                Some(mesh_peers) => {
+                    // We have a mesh set. We want to make sure to publish to at least `mesh_n`
+                    // peers (if possible).
+                    let needed_extra_peers = self.config.mesh_n().saturating_sub(mesh_peers.len());
+
+                    if needed_extra_peers > 0 {
+                        // We don't have `mesh_n` peers in our mesh, we will randomly select extras
+                        // and publish to them.
+
+                        // Get a random set of peers that are appropriate to send messages too.
+                        let peer_list = get_random_peers(
+                            &self.connected_peers,
+                            &topic_hash,
+                            needed_extra_peers,
+                            |peer| {
+                                !mesh_peers.contains(peer)
+                                    && !self.explicit_peers.contains(peer)
+                                    && !self
+                                        .score_below_threshold(peer, |pst| pst.publish_threshold)
+                                        .0
+                            },
+                        );
+                        recipient_peers.extend(peer_list);
                     }
-                    // Gossipsub peers
-                    None => {
-                        tracing::debug!(topic=%topic_hash, "Topic not in the mesh");
-                        // If we have fanout peers add them to the map.
-                        if self.fanout.contains_key(&topic_hash) {
-                            for peer in self.fanout.get(&topic_hash).expect("Topic must exist") {
-                                recipient_peers.insert(*peer);
-                            }
-                        } else {
-                            // We have no fanout peers, select mesh_n of them and add them to the fanout
-                            let mesh_n = self.config.mesh_n();
-                            let new_peers = get_random_peers(
-                                &self.topic_peers,
-                                &self.connected_peers,
-                                &topic_hash,
-                                mesh_n,
-                                {
-                                    |p| {
-                                        !self.explicit_peers.contains(p)
-                                            && !self
-                                                .score_below_threshold(p, |pst| {
-                                                    pst.publish_threshold
-                                                })
-                                                .0
-                                    }
-                                },
-                            );
-                            // Add the new peers to the fanout and recipient peers
-                            self.fanout.insert(topic_hash.clone(), new_peers.clone());
-                            for peer in new_peers {
-                                tracing::debug!(%peer, "Peer added to fanout");
-                                recipient_peers.insert(peer);
-                            }
+
+                    recipient_peers.extend(mesh_peers);
+                }
+                // Gossipsub peers
+                None => {
+                    tracing::debug!(topic=%topic_hash, "Topic not in the mesh");
+                    // If we have fanout peers add them to the map.
+                    if self.fanout.contains_key(&topic_hash) {
+                        for peer in self.fanout.get(&topic_hash).expect("Topic must exist") {
+                            recipient_peers.insert(*peer);
+                        }
+                    } else {
+                        // We have no fanout peers, select mesh_n of them and add them to the fanout
+                        let mesh_n = self.config.mesh_n();
+                        let new_peers =
+                            get_random_peers(&self.connected_peers, &topic_hash, mesh_n, {
+                                |p| {
+                                    !self.explicit_peers.contains(p)
+                                        && !self
+                                            .score_below_threshold(p, |pst| pst.publish_threshold)
+                                            .0
+                                }
+                            });
+                        // Add the new peers to the fanout and recipient peers
+                        self.fanout.insert(topic_hash.clone(), new_peers.clone());
+                        for peer in new_peers {
+                            tracing::debug!(%peer, "Peer added to fanout");
+                            recipient_peers.insert(peer);
                         }
-                        // We are publishing to fanout peers - update the time we published
-                        self.fanout_last_pub
-                            .insert(topic_hash.clone(), Instant::now());
                     }
+                    // We are publishing to fanout peers - update the time we published
+                    self.fanout_last_pub
+                        .insert(topic_hash.clone(), Instant::now());
                 }
+            }
 
-                // Explicit peers
-                for peer in &self.explicit_peers {
-                    if set.contains(peer) {
-                        recipient_peers.insert(*peer);
-                    }
-                }
+            // Explicit peers that are part of the topic
+            recipient_peers
+                .extend(peers_on_topic.filter(|peer_id| self.explicit_peers.contains(peer_id)));
 
-                // Floodsub peers
-                for (peer, connections) in &self.connected_peers {
-                    if connections.kind == PeerKind::Floodsub
-                        && !self
-                            .score_below_threshold(peer, |ts| ts.publish_threshold)
-                            .0
-                    {
-                        recipient_peers.insert(*peer);
-                    }
+            // Floodsub peers
+            for (peer, connections) in &self.connected_peers {
+                if connections.kind == PeerKind::Floodsub
+                    && !self
+                        .score_below_threshold(peer, |ts| ts.publish_threshold)
+                        .0
+                {
+                    recipient_peers.insert(*peer);
                 }
             }
         }
 
-        if recipient_peers.is_empty() {
-            return Err(PublishError::InsufficientPeers);
-        }
-
         // If the message isn't a duplicate and we have sent it to some peers add it to the
         // duplicate cache and memcache.
         self.duplicate_cache.insert(msg_id.clone());
@@ -964,7 +975,6 @@ where
         if added_peers.len() < self.config.mesh_n() {
             // get the peers
             let new_peers = get_random_peers(
-                &self.topic_peers,
                 &self.connected_peers,
                 topic_hash,
                 self.config.mesh_n() - added_peers.len(),
@@ -1009,7 +1019,6 @@ where
                 peer_id,
                 vec![topic_hash],
                 &self.mesh,
-                self.peer_topics.get(&peer_id),
                 &mut self.events,
                 &self.connected_peers,
             );
@@ -1056,7 +1065,6 @@ where
         // Select peers for peer exchange
         let peers = if do_px {
             get_random_peers(
-                &self.topic_peers,
                 &self.connected_peers,
                 topic_hash,
                 self.config.prune_peers(),
@@ -1107,7 +1115,6 @@ where
                     peer,
                     topic_hash,
                     &self.mesh,
-                    self.peer_topics.get(&peer),
                     &mut self.events,
                     &self.connected_peers,
                 );
@@ -1118,7 +1125,7 @@ where
 
     /// Checks if the given peer is still connected and if not dials the peer again.
     fn check_explicit_peer_connection(&mut self, peer_id: &PeerId) {
-        if !self.peer_topics.contains_key(peer_id) {
+        if !self.connected_peers.contains_key(peer_id) {
             // Connect to peer
             tracing::debug!(peer=%peer_id, "Connecting to explicit peer");
             self.events.push_back(ToSwarm::Dial {
@@ -1329,17 +1336,19 @@ where
 
         let mut do_px = self.config.do_px();
 
+        let Some(connected_peer) = self.connected_peers.get_mut(peer_id) else {
+            tracing::error!(peer_id = %peer_id, "Peer non-existent when handling graft");
+            return;
+        };
+
         // For each topic, if a peer has grafted us, then we necessarily must be in their mesh
         // and they must be subscribed to the topic. Ensure we have recorded the mapping.
         for topic in &topics {
-            self.peer_topics
-                .entry(*peer_id)
-                .or_default()
-                .insert(topic.clone());
-            self.topic_peers
-                .entry(topic.clone())
-                .or_default()
-                .insert(*peer_id);
+            if connected_peer.topics.insert(topic.clone()) {
+                if let Some(m) = self.metrics.as_mut() {
+                    m.inc_topic_peers(topic);
+                }
+            }
         }
 
         // we don't GRAFT to/from explicit peers; complain loudly if this happens
@@ -1441,7 +1450,6 @@ where
                         *peer_id,
                         vec![&topic_hash],
                         &self.mesh,
-                        self.peer_topics.get(peer_id),
                         &mut self.events,
                         &self.connected_peers,
                     );
@@ -1514,7 +1522,6 @@ where
                     *peer_id,
                     topic_hash,
                     &self.mesh,
-                    self.peer_topics.get(peer_id),
                     &mut self.events,
                     &self.connected_peers,
                 );
@@ -1825,7 +1832,7 @@ where
 
         let mut unsubscribed_peers = Vec::new();
 
-        let Some(subscribed_topics) = self.peer_topics.get_mut(propagation_source) else {
+        let Some(peer) = self.connected_peers.get_mut(propagation_source) else {
             tracing::error!(
                 peer=%propagation_source,
                 "Subscription by unknown peer"
@@ -1841,7 +1848,7 @@ where
 
         let filtered_topics = match self
             .subscription_filter
-            .filter_incoming_subscriptions(subscriptions, subscribed_topics)
+            .filter_incoming_subscriptions(subscriptions, &peer.topics)
         {
             Ok(topics) => topics,
             Err(s) => {
@@ -1857,29 +1864,24 @@ where
         for subscription in filtered_topics {
             // get the peers from the mapping, or insert empty lists if the topic doesn't exist
             let topic_hash = &subscription.topic_hash;
-            let peer_list = self.topic_peers.entry(topic_hash.clone()).or_default();
 
             match subscription.action {
                 SubscriptionAction::Subscribe => {
-                    if peer_list.insert(*propagation_source) {
+                    if peer.topics.insert(topic_hash.clone()) {
                         tracing::debug!(
                             peer=%propagation_source,
                             topic=%topic_hash,
                             "SUBSCRIPTION: Adding gossip peer to topic"
                         );
-                    }
 
-                    // add to the peer_topics mapping
-                    subscribed_topics.insert(topic_hash.clone());
+                        if let Some(m) = self.metrics.as_mut() {
+                            m.inc_topic_peers(topic_hash);
+                        }
+                    }
 
                     // if the mesh needs peers add the peer to the mesh
                     if !self.explicit_peers.contains(propagation_source)
-                        && matches!(
-                            self.connected_peers
-                                .get(propagation_source)
-                                .map(|v| &v.kind),
-                            Some(PeerKind::Gossipsubv1_1) | Some(PeerKind::Gossipsub)
-                        )
+                        && matches!(peer.kind, PeerKind::Gossipsubv1_1 | PeerKind::Gossipsub)
                         && !Self::score_below_threshold_from_scores(
                             &self.peer_score,
                             propagation_source,
@@ -1922,16 +1924,18 @@ where
                     }));
                 }
                 SubscriptionAction::Unsubscribe => {
-                    if peer_list.remove(propagation_source) {
+                    if peer.topics.remove(topic_hash) {
                         tracing::debug!(
                             peer=%propagation_source,
                             topic=%topic_hash,
                             "SUBSCRIPTION: Removing gossip peer from topic"
                         );
+
+                        if let Some(m) = self.metrics.as_mut() {
+                            m.dec_topic_peers(topic_hash);
+                        }
                     }
 
-                    // remove topic from the peer_topics mapping
-                    subscribed_topics.remove(topic_hash);
                     unsubscribed_peers.push((*propagation_source, topic_hash.clone()));
                     // generate an unsubscribe event to be polled
                     application_event.push(ToSwarm::GenerateEvent(Event::Unsubscribed {
@@ -1940,10 +1944,6 @@ where
                     }));
                 }
             }
-
-            if let Some(m) = self.metrics.as_mut() {
-                m.set_topic_peers(topic_hash, peer_list.len());
-            }
         }
 
         // remove unsubscribed peers from the mesh if it exists
@@ -1958,7 +1958,6 @@ where
                 *propagation_source,
                 topics_joined,
                 &self.mesh,
-                self.peer_topics.get(propagation_source),
                 &mut self.events,
                 &self.connected_peers,
             );
@@ -2039,7 +2038,6 @@ where
         for (topic_hash, peers) in self.mesh.iter_mut() {
             let explicit_peers = &self.explicit_peers;
             let backoffs = &self.backoffs;
-            let topic_peers = &self.topic_peers;
             let outbound_peers = &self.outbound_peers;
 
             // drop all peers with negative score, without PX
@@ -2087,18 +2085,13 @@ where
                 );
                 // not enough peers - get mesh_n - current_length more
                 let desired_peers = self.config.mesh_n() - peers.len();
-                let peer_list = get_random_peers(
-                    topic_peers,
-                    &self.connected_peers,
-                    topic_hash,
-                    desired_peers,
-                    |peer| {
+                let peer_list =
+                    get_random_peers(&self.connected_peers, topic_hash, desired_peers, |peer| {
                         !peers.contains(peer)
                             && !explicit_peers.contains(peer)
                             && !backoffs.is_backoff_with_slack(topic_hash, peer)
                             && *scores.get(peer).unwrap_or(&0.0) >= 0.0
-                    },
-                );
+                    });
                 for peer in &peer_list {
                     let current_topic = to_graft.entry(*peer).or_insert_with(Vec::new);
                     current_topic.push(topic_hash.clone());
@@ -2154,10 +2147,9 @@ where
                         if outbound <= self.config.mesh_outbound_min() {
                             // do not remove anymore outbound peers
                             continue;
-                        } else {
-                            // an outbound peer gets removed
-                            outbound -= 1;
                         }
+                        // an outbound peer gets removed
+                        outbound -= 1;
                     }
 
                     // remove the peer
@@ -2180,19 +2172,14 @@ where
                 // if we have not enough outbound peers, graft to some new outbound peers
                 if outbound < self.config.mesh_outbound_min() {
                     let needed = self.config.mesh_outbound_min() - outbound;
-                    let peer_list = get_random_peers(
-                        topic_peers,
-                        &self.connected_peers,
-                        topic_hash,
-                        needed,
-                        |peer| {
+                    let peer_list =
+                        get_random_peers(&self.connected_peers, topic_hash, needed, |peer| {
                             !peers.contains(peer)
                                 && !explicit_peers.contains(peer)
                                 && !backoffs.is_backoff_with_slack(topic_hash, peer)
                                 && *scores.get(peer).unwrap_or(&0.0) >= 0.0
                                 && outbound_peers.contains(peer)
-                        },
-                    );
+                        });
                     for peer in &peer_list {
                         let current_topic = to_graft.entry(*peer).or_insert_with(Vec::new);
                         current_topic.push(topic_hash.clone());
@@ -2249,7 +2236,6 @@ where
                     // GRAFT
                     if median < thresholds.opportunistic_graft_threshold {
                         let peer_list = get_random_peers(
-                            topic_peers,
                             &self.connected_peers,
                             topic_hash,
                             self.config.opportunistic_graft_peers(),
@@ -2308,22 +2294,22 @@ where
                 Some((_, thresholds, _, _)) => thresholds.publish_threshold,
                 _ => 0.0,
             };
-            for peer in peers.iter() {
+            for peer_id in peers.iter() {
                 // is the peer still subscribed to the topic?
-                let peer_score = *scores.get(peer).unwrap_or(&0.0);
-                match self.peer_topics.get(peer) {
-                    Some(topics) => {
-                        if !topics.contains(topic_hash) || peer_score < publish_threshold {
+                let peer_score = *scores.get(peer_id).unwrap_or(&0.0);
+                match self.connected_peers.get(peer_id) {
+                    Some(peer) => {
+                        if !peer.topics.contains(topic_hash) || peer_score < publish_threshold {
                             tracing::debug!(
                                 topic=%topic_hash,
                                 "HEARTBEAT: Peer removed from fanout for topic"
                             );
-                            to_remove_peers.push(*peer);
+                            to_remove_peers.push(*peer_id);
                         }
                     }
                     None => {
                         // remove if the peer has disconnected
-                        to_remove_peers.push(*peer);
+                        to_remove_peers.push(*peer_id);
                     }
                 }
             }
@@ -2340,17 +2326,12 @@ where
                 );
                 let needed_peers = self.config.mesh_n() - peers.len();
                 let explicit_peers = &self.explicit_peers;
-                let new_peers = get_random_peers(
-                    &self.topic_peers,
-                    &self.connected_peers,
-                    topic_hash,
-                    needed_peers,
-                    |peer_id| {
+                let new_peers =
+                    get_random_peers(&self.connected_peers, topic_hash, needed_peers, |peer_id| {
                         !peers.contains(peer_id)
                             && !explicit_peers.contains(peer_id)
                             && *scores.get(peer_id).unwrap_or(&0.0) < publish_threshold
-                    },
-                );
+                    });
                 peers.extend(new_peers);
             }
         }
@@ -2432,17 +2413,12 @@ where
                 )
             };
             // get gossip_lazy random peers
-            let to_msg_peers = get_random_peers_dynamic(
-                &self.topic_peers,
-                &self.connected_peers,
-                topic_hash,
-                n_map,
-                |peer| {
+            let to_msg_peers =
+                get_random_peers_dynamic(&self.connected_peers, topic_hash, n_map, |peer| {
                     !peers.contains(peer)
                         && !self.explicit_peers.contains(peer)
                         && !self.score_below_threshold(peer, |ts| ts.gossip_threshold).0
-                },
-            );
+                });
 
             tracing::debug!("Gossiping IHAVE to {} peers", to_msg_peers.len());
 
@@ -2492,7 +2468,6 @@ where
                     peer,
                     vec![topic],
                     &self.mesh,
-                    self.peer_topics.get(&peer),
                     &mut self.events,
                     &self.connected_peers,
                 );
@@ -2543,7 +2518,6 @@ where
                     *peer,
                     topic_hash,
                     &self.mesh,
-                    self.peer_topics.get(peer),
                     &mut self.events,
                     &self.connected_peers,
                 );
@@ -2577,11 +2551,11 @@ where
 
             // Add explicit peers
             for peer_id in &self.explicit_peers {
-                if let Some(topics) = self.peer_topics.get(peer_id) {
+                if let Some(peer) = self.connected_peers.get(peer_id) {
                     if Some(peer_id) != propagation_source
                         && !originating_peers.contains(peer_id)
                         && Some(peer_id) != message.source.as_ref()
-                        && topics.contains(&message.topic)
+                        && peer.topics.contains(&message.topic)
                     {
                         recipient_peers.insert(*peer_id);
                     }
@@ -2790,6 +2764,7 @@ where
             .or_insert(PeerConnections {
                 kind: PeerKind::Floodsub,
                 connections: vec![],
+                topics: Default::default(),
             })
             .connections
             .push(connection_id);
@@ -2798,9 +2773,6 @@ where
             return; // Not our first connection to this peer, hence nothing to do.
         }
 
-        // Insert an empty set of the topics of this peer until known.
-        self.peer_topics.insert(peer_id, Default::default());
-
         if let Some((peer_score, ..)) = &mut self.peer_score {
             peer_score.add_peer(peer_id);
         }
@@ -2843,28 +2815,26 @@ where
 
         if remaining_established != 0 {
             // Remove the connection from the list
-            if let Some(connections) = self.connected_peers.get_mut(&peer_id) {
-                let index = connections
+            if let Some(peer) = self.connected_peers.get_mut(&peer_id) {
+                let index = peer
                     .connections
                     .iter()
                     .position(|v| v == &connection_id)
                     .expect("Previously established connection to peer must be present");
-                connections.connections.remove(index);
+                peer.connections.remove(index);
 
                 // If there are more connections and this peer is in a mesh, inform the first connection
                 // handler.
-                if !connections.connections.is_empty() {
-                    if let Some(topics) = self.peer_topics.get(&peer_id) {
-                        for topic in topics {
-                            if let Some(mesh_peers) = self.mesh.get(topic) {
-                                if mesh_peers.contains(&peer_id) {
-                                    self.events.push_back(ToSwarm::NotifyHandler {
-                                        peer_id,
-                                        event: HandlerIn::JoinedMesh,
-                                        handler: NotifyHandler::One(connections.connections[0]),
-                                    });
-                                    break;
-                                }
+                if !peer.connections.is_empty() {
+                    for topic in &peer.topics {
+                        if let Some(mesh_peers) = self.mesh.get(topic) {
+                            if mesh_peers.contains(&peer_id) {
+                                self.events.push_back(ToSwarm::NotifyHandler {
+                                    peer_id,
+                                    event: HandlerIn::JoinedMesh,
+                                    handler: NotifyHandler::One(peer.connections[0]),
+                                });
+                                break;
                             }
                         }
                     }
@@ -2874,7 +2844,7 @@ where
             // remove from mesh, topic_peers, peer_topic and the fanout
             tracing::debug!(peer=%peer_id, "Peer disconnected");
             {
-                let Some(topics) = self.peer_topics.get(&peer_id) else {
+                let Some(peer) = self.connected_peers.get(&peer_id) else {
                     debug_assert!(
                         self.blacklisted_peers.contains(&peer_id),
                         "Disconnected node not in connected list"
@@ -2883,7 +2853,7 @@ where
                 };
 
                 // remove peer from all mappings
-                for topic in topics {
+                for topic in peer.topics.iter() {
                     // check the mesh for the topic
                     if let Some(mesh_peers) = self.mesh.get_mut(topic) {
                         // check if the peer is in the mesh and remove it
@@ -2895,24 +2865,8 @@ where
                         };
                     }
 
-                    // remove from topic_peers
-                    if let Some(peer_list) = self.topic_peers.get_mut(topic) {
-                        if !peer_list.remove(&peer_id) {
-                            // debugging purposes
-                            tracing::warn!(
-                                peer=%peer_id,
-                                "Disconnected node: peer not in topic_peers"
-                            );
-                        }
-                        if let Some(m) = self.metrics.as_mut() {
-                            m.set_topic_peers(topic, peer_list.len())
-                        }
-                    } else {
-                        tracing::warn!(
-                            peer=%peer_id,
-                            topic=%topic,
-                            "Disconnected node: peer with topic not in topic_peers"
-                        );
+                    if let Some(m) = self.metrics.as_mut() {
+                        m.dec_topic_peers(topic);
                     }
 
                     // remove from fanout
@@ -2926,11 +2880,6 @@ where
             self.px_peers.remove(&peer_id);
             self.outbound_peers.remove(&peer_id);
 
-            // Remove peer from peer_topics and connected_peers
-            // NOTE: It is possible the peer has already been removed from all mappings if it does not
-            // support the protocol.
-            self.peer_topics.remove(&peer_id);
-
             // If metrics are enabled, register the disconnection of a peer based on its protocol.
             if let Some(metrics) = self.metrics.as_mut() {
                 let peer_kind = &self
@@ -3190,7 +3139,6 @@ fn peer_added_to_mesh(
     peer_id: PeerId,
     new_topics: Vec<&TopicHash>,
     mesh: &HashMap<TopicHash, BTreeSet<PeerId>>,
-    known_topics: Option<&BTreeSet<TopicHash>>,
     events: &mut VecDeque<ToSwarm<Event, HandlerIn>>,
     connections: &HashMap<PeerId, PeerConnections>,
 ) {
@@ -3204,8 +3152,8 @@ fn peer_added_to_mesh(
         conn.connections[0]
     };
 
-    if let Some(topics) = known_topics {
-        for topic in topics {
+    if let Some(peer) = connections.get(&peer_id) {
+        for topic in &peer.topics {
             if !new_topics.contains(&topic) {
                 if let Some(mesh_peers) = mesh.get(topic) {
                     if mesh_peers.contains(&peer_id) {
@@ -3231,7 +3179,6 @@ fn peer_removed_from_mesh(
     peer_id: PeerId,
     old_topic: &TopicHash,
     mesh: &HashMap<TopicHash, BTreeSet<PeerId>>,
-    known_topics: Option<&BTreeSet<TopicHash>>,
     events: &mut VecDeque<ToSwarm<Event, HandlerIn>>,
     connections: &HashMap<PeerId, PeerConnections>,
 ) {
@@ -3243,8 +3190,8 @@ fn peer_removed_from_mesh(
         .first()
         .expect("There should be at least one connection to a peer.");
 
-    if let Some(topics) = known_topics {
-        for topic in topics {
+    if let Some(peer) = connections.get(&peer_id) {
+        for topic in &peer.topics {
             if topic != old_topic {
                 if let Some(mesh_peers) = mesh.get(topic) {
                     if mesh_peers.contains(&peer_id) {
@@ -3267,28 +3214,19 @@ fn peer_removed_from_mesh(
 /// filtered by the function `f`. The number of peers to get equals the output of `n_map`
 /// that gets as input the number of filtered peers.
 fn get_random_peers_dynamic(
-    topic_peers: &HashMap<TopicHash, BTreeSet<PeerId>>,
     connected_peers: &HashMap<PeerId, PeerConnections>,
     topic_hash: &TopicHash,
     // maps the number of total peers to the number of selected peers
     n_map: impl Fn(usize) -> usize,
     mut f: impl FnMut(&PeerId) -> bool,
 ) -> BTreeSet<PeerId> {
-    let mut gossip_peers = match topic_peers.get(topic_hash) {
-        // if they exist, filter the peers by `f`
-        Some(peer_list) => peer_list
-            .iter()
-            .copied()
-            .filter(|p| {
-                f(p) && match connected_peers.get(p) {
-                    Some(connections) if connections.kind == PeerKind::Gossipsub => true,
-                    Some(connections) if connections.kind == PeerKind::Gossipsubv1_1 => true,
-                    _ => false,
-                }
-            })
-            .collect(),
-        None => Vec::new(),
-    };
+    let mut gossip_peers = connected_peers
+        .iter()
+        .filter(|(_, p)| p.topics.contains(topic_hash))
+        .filter(|(peer_id, _)| f(peer_id))
+        .filter(|(_, p)| p.kind == PeerKind::Gossipsub || p.kind == PeerKind::Gossipsubv1_1)
+        .map(|(peer_id, _)| *peer_id)
+        .collect::<Vec<PeerId>>();
 
     // if we have less than needed, return them
     let n = n_map(gossip_peers.len());
@@ -3309,13 +3247,12 @@ fn get_random_peers_dynamic(
 /// Helper function to get a set of `n` random gossipsub peers for a `topic_hash`
 /// filtered by the function `f`.
 fn get_random_peers(
-    topic_peers: &HashMap<TopicHash, BTreeSet<PeerId>>,
     connected_peers: &HashMap<PeerId, PeerConnections>,
     topic_hash: &TopicHash,
     n: usize,
     f: impl FnMut(&PeerId) -> bool,
 ) -> BTreeSet<PeerId> {
-    get_random_peers_dynamic(topic_peers, connected_peers, topic_hash, |_| n, f)
+    get_random_peers_dynamic(connected_peers, topic_hash, |_| n, f)
 }
 
 /// Validates the combination of signing, privacy and message validation to ensure the
@@ -3355,8 +3292,6 @@ impl<C: DataTransform, F: TopicSubscriptionFilter> fmt::Debug for Behaviour<C, F
             .field("events", &self.events.len())
             .field("control_pool", &self.control_pool)
             .field("publish_config", &self.publish_config)
-            .field("topic_peers", &self.topic_peers)
-            .field("peer_topics", &self.peer_topics)
             .field("mesh", &self.mesh)
             .field("fanout", &self.fanout)
             .field("fanout_last_pub", &self.fanout_last_pub)
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index c44152ed2f9..a74566a1308 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -440,7 +440,9 @@ fn test_unsubscribe() {
 
     for topic_hash in &topic_hashes {
         assert!(
-            gs.topic_peers.contains_key(topic_hash),
+            gs.connected_peers
+                .values()
+                .any(|p| p.topics.contains(topic_hash)),
             "Topic_peers contain a topic entry"
         );
         assert!(
@@ -629,8 +631,11 @@ fn test_publish_without_flood_publishing() {
 
     // all peers should be subscribed to the topic
     assert_eq!(
-        gs.topic_peers.get(&topic_hashes[0]).map(|p| p.len()),
-        Some(20),
+        gs.connected_peers
+            .values()
+            .filter(|p| p.topics.contains(&topic_hashes[0]))
+            .count(),
+        20,
         "Peers should be subscribed to the topic"
     );
 
@@ -669,8 +674,8 @@ fn test_publish_without_flood_publishing() {
     let config: Config = Config::default();
     assert_eq!(
         publishes.len(),
-        config.mesh_n_low(),
-        "Should send a publish message to all known peers"
+        config.mesh_n(),
+        "Should send a publish message to at least mesh_n peers"
     );
 
     assert!(
@@ -809,9 +814,9 @@ fn test_inject_connected() {
 
     // should add the new peers to `peer_topics` with an empty vec as a gossipsub node
     for peer in peers {
-        let known_topics = gs.peer_topics.get(&peer).unwrap();
+        let peer = gs.connected_peers.get(&peer).unwrap();
         assert!(
-            known_topics == &topic_hashes.iter().cloned().collect(),
+            peer.topics == topic_hashes.iter().cloned().collect(),
             "The topics for each node should all topics"
         );
     }
@@ -860,24 +865,39 @@ fn test_handle_received_subscriptions() {
 
     // verify the result
 
-    let peer_topics = gs.peer_topics.get(&peers[0]).unwrap().clone();
+    let peer = gs.connected_peers.get(&peers[0]).unwrap();
     assert!(
-        peer_topics == topic_hashes.iter().take(3).cloned().collect(),
+        peer.topics
+            == topic_hashes
+                .iter()
+                .take(3)
+                .cloned()
+                .collect::<BTreeSet<_>>(),
         "First peer should be subscribed to three topics"
     );
-    let peer_topics = gs.peer_topics.get(&peers[1]).unwrap().clone();
+    let peer1 = gs.connected_peers.get(&peers[1]).unwrap();
     assert!(
-        peer_topics == topic_hashes.iter().take(3).cloned().collect(),
+        peer1.topics
+            == topic_hashes
+                .iter()
+                .take(3)
+                .cloned()
+                .collect::<BTreeSet<_>>(),
         "Second peer should be subscribed to three topics"
     );
 
     assert!(
-        !gs.peer_topics.contains_key(&unknown_peer),
+        !gs.connected_peers.contains_key(&unknown_peer),
         "Unknown peer should not have been added"
     );
 
     for topic_hash in topic_hashes[..3].iter() {
-        let topic_peers = gs.topic_peers.get(topic_hash).unwrap().clone();
+        let topic_peers = gs
+            .connected_peers
+            .iter()
+            .filter(|(_, p)| p.topics.contains(topic_hash))
+            .map(|(peer_id, _)| *peer_id)
+            .collect::<BTreeSet<PeerId>>();
         assert!(
             topic_peers == peers[..2].iter().cloned().collect(),
             "Two peers should be added to the first three topics"
@@ -894,13 +914,21 @@ fn test_handle_received_subscriptions() {
         &peers[0],
     );
 
-    let peer_topics = gs.peer_topics.get(&peers[0]).unwrap().clone();
-    assert!(
-        peer_topics == topic_hashes[1..3].iter().cloned().collect(),
+    let peer = gs.connected_peers.get(&peers[0]).unwrap().clone();
+    assert_eq!(
+        peer.topics,
+        topic_hashes[1..3].iter().cloned().collect::<BTreeSet<_>>(),
         "Peer should be subscribed to two topics"
     );
 
-    let topic_peers = gs.topic_peers.get(&topic_hashes[0]).unwrap().clone(); // only gossipsub at the moment
+    // only gossipsub at the moment
+    let topic_peers = gs
+        .connected_peers
+        .iter()
+        .filter(|(_, p)| p.topics.contains(&topic_hashes[0]))
+        .map(|(peer_id, _)| *peer_id)
+        .collect::<BTreeSet<PeerId>>();
+
     assert!(
         topic_peers == peers[1..2].iter().cloned().collect(),
         "Only the second peers should be in the first topic"
@@ -924,9 +952,8 @@ fn test_get_random_peers() {
     for _ in 0..20 {
         peers.push(PeerId::random())
     }
-
-    gs.topic_peers
-        .insert(topic_hash.clone(), peers.iter().cloned().collect());
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
 
     gs.connected_peers = peers
         .iter()
@@ -936,52 +963,32 @@ fn test_get_random_peers() {
                 PeerConnections {
                     kind: PeerKind::Gossipsubv1_1,
                     connections: vec![ConnectionId::new_unchecked(0)],
+                    topics: topics.clone(),
                 },
             )
         })
         .collect();
 
-    let random_peers =
-        get_random_peers(&gs.topic_peers, &gs.connected_peers, &topic_hash, 5, |_| {
-            true
-        });
+    let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 5, |_| true);
     assert_eq!(random_peers.len(), 5, "Expected 5 peers to be returned");
-    let random_peers = get_random_peers(
-        &gs.topic_peers,
-        &gs.connected_peers,
-        &topic_hash,
-        30,
-        |_| true,
-    );
+    let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 30, |_| true);
     assert!(random_peers.len() == 20, "Expected 20 peers to be returned");
     assert!(
         random_peers == peers.iter().cloned().collect(),
         "Expected no shuffling"
     );
-    let random_peers = get_random_peers(
-        &gs.topic_peers,
-        &gs.connected_peers,
-        &topic_hash,
-        20,
-        |_| true,
-    );
+    let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 20, |_| true);
     assert!(random_peers.len() == 20, "Expected 20 peers to be returned");
     assert!(
         random_peers == peers.iter().cloned().collect(),
         "Expected no shuffling"
     );
-    let random_peers =
-        get_random_peers(&gs.topic_peers, &gs.connected_peers, &topic_hash, 0, |_| {
-            true
-        });
+    let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 0, |_| true);
     assert!(random_peers.is_empty(), "Expected 0 peers to be returned");
     // test the filter
-    let random_peers =
-        get_random_peers(&gs.topic_peers, &gs.connected_peers, &topic_hash, 5, |_| {
-            false
-        });
+    let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 5, |_| false);
     assert!(random_peers.is_empty(), "Expected 0 peers to be returned");
-    let random_peers = get_random_peers(&gs.topic_peers, &gs.connected_peers, &topic_hash, 10, {
+    let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 10, {
         |peer| peers.contains(peer)
     });
     assert!(random_peers.len() == 10, "Expected 10 peers to be returned");
diff --git a/protocols/gossipsub/src/metrics.rs b/protocols/gossipsub/src/metrics.rs
index e044ca67e71..7d4acada3c7 100644
--- a/protocols/gossipsub/src/metrics.rs
+++ b/protocols/gossipsub/src/metrics.rs
@@ -355,12 +355,17 @@ impl Metrics {
         }
     }
 
-    /// Register how many peers do we known are subscribed to this topic.
-    pub(crate) fn set_topic_peers(&mut self, topic: &TopicHash, count: usize) {
+    /// Increase the number of peers that are subscribed to this topic.
+    pub(crate) fn inc_topic_peers(&mut self, topic: &TopicHash) {
         if self.register_topic(topic).is_ok() {
-            self.topic_peers_count
-                .get_or_create(topic)
-                .set(count as i64);
+            self.topic_peers_count.get_or_create(topic).inc();
+        }
+    }
+
+    /// Decrease the number of peers that are subscribed to this topic.
+    pub(crate) fn dec_topic_peers(&mut self, topic: &TopicHash) {
+        if self.register_topic(topic).is_ok() {
+            self.topic_peers_count.get_or_create(topic).dec();
         }
     }
 
diff --git a/protocols/gossipsub/src/types.rs b/protocols/gossipsub/src/types.rs
index d1b92ff0ba8..a88f4822ac2 100644
--- a/protocols/gossipsub/src/types.rs
+++ b/protocols/gossipsub/src/types.rs
@@ -24,8 +24,8 @@ use libp2p_identity::PeerId;
 use libp2p_swarm::ConnectionId;
 use prometheus_client::encoding::EncodeLabelValue;
 use quick_protobuf::MessageWrite;
-use std::fmt;
 use std::fmt::Debug;
+use std::{collections::BTreeSet, fmt};
 
 use crate::rpc_proto::proto;
 #[cfg(feature = "serde")]
@@ -77,6 +77,8 @@ pub(crate) struct PeerConnections {
     pub(crate) kind: PeerKind,
     /// Its current connections.
     pub(crate) connections: Vec<ConnectionId>,
+    /// Subscribed topics.
+    pub(crate) topics: BTreeSet<TopicHash>,
 }
 
 /// Describes the types of peers that can exist in the gossipsub context.

From 5137e4e4e710aaf3c38c2507a4e65b76d99a4834 Mon Sep 17 00:00:00 2001
From: P1R0 <p1r0@nethunters.xyz>
Date: Tue, 3 Sep 2024 16:58:15 -0600
Subject: [PATCH 374/455] refactor(examples): use tokio instead of async-std in
 identify example (#5579)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->
Following on issue #4449
refactor: use tokio instead of async-std in the identify example and
remove unnecesary dependencies

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

* Removed unnecessary dependencies on examples/identify/Cargo.toml

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: David E. Perez Negron R. <david@nethunters.xyz>
Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
---
 Cargo.lock                    | 3 +--
 examples/identify/Cargo.toml  | 5 ++---
 examples/identify/src/main.rs | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c8eae458fc..5c419ed0348 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2311,10 +2311,9 @@ dependencies = [
 name = "identify-example"
 version = "0.1.0"
 dependencies = [
- "async-std",
- "async-trait",
  "futures",
  "libp2p",
+ "tokio",
  "tracing",
  "tracing-subscriber",
 ]
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
index cbe569b9d07..8d12699afa7 100644
--- a/examples/identify/Cargo.toml
+++ b/examples/identify/Cargo.toml
@@ -9,10 +9,9 @@ license = "MIT"
 release = false
 
 [dependencies]
-async-std = { version = "1.12", features = ["attributes"] }
-async-trait = "0.1"
+tokio = { version = "1.37.0", features = ["full"] }
 futures = { workspace = true }
-libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
+libp2p = { path = "../../libp2p", features = ["identify", "noise", "tcp", "tokio", "yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/examples/identify/src/main.rs b/examples/identify/src/main.rs
index 916317a5a43..22474061da6 100644
--- a/examples/identify/src/main.rs
+++ b/examples/identify/src/main.rs
@@ -25,14 +25,14 @@ use libp2p::{core::multiaddr::Multiaddr, identify, noise, swarm::SwarmEvent, tcp
 use std::{error::Error, time::Duration};
 use tracing_subscriber::EnvFilter;
 
-#[async_std::main]
+#[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
         .try_init();
 
     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-        .with_async_std()
+        .with_tokio()
         .with_tcp(
             tcp::Config::default(),
             noise::Config::new,

From 3837e33cd4c40ae703138e6aed6f6c9d52928a80 Mon Sep 17 00:00:00 2001
From: Benno <bzeeman@live.nl>
Date: Thu, 5 Sep 2024 18:05:20 +0200
Subject: [PATCH 375/455] feat(identify): add hide_listen_addrs config option
 (#5507)

## Description

Implements #4010, which was closed. It was closed because it appeared
that the Identify specification doesn't dictate this feature. But, in
the discussion on the specs repo
(https://github.com/libp2p/specs/pull/597) it is mentioned that this
might very well be an implementation detail.

This PR introduces a `hide_listen_addrs` flag that will prevent our
listen addresses to be included, effectively only sharing our external
addresses.

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

## Notes & open questions

An alternative implementation would be to allow us to filter the
addresses we are sending out, by providing a closure I imagine.

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
---
 Cargo.lock                          |  2 +-
 Cargo.toml                          |  2 +-
 protocols/identify/CHANGELOG.md     |  5 ++
 protocols/identify/Cargo.toml       |  2 +-
 protocols/identify/src/behaviour.rs | 23 ++++++++--
 protocols/identify/tests/smoke.rs   | 71 +++++++++++++++++++++++++++++
 6 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c419ed0348..4c12e6fb984 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2874,7 +2874,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 587bef4480a..da8d32e1a4a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.47.1", path = "protocols/gossipsub" }
-libp2p-identify = { version = "0.45.0", path = "protocols/identify" }
+libp2p-identify = { version = "0.45.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index 275f7114b28..c5778ff92ee 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.1
+
+- Add `hide_listen_addrs` option to prevent leaking (local) listen addresses.
+  See [PR 5507](https://github.com/libp2p/rust-libp2p/pull/5507).
+
 ## 0.45.0
 
 - Address translation is moved here from `libp2p-core`.
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index cdc5ce587de..c3fb585c99c 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Nodes identification protocol for libp2p"
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index 6590ccd6588..c8672674c1a 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -147,6 +147,12 @@ pub struct Config {
     ///
     /// Disabled by default.
     pub cache_size: usize,
+
+    /// Whether to include our listen addresses in our responses. If enabled,
+    /// we will effectively only share our external addresses.
+    ///
+    /// Disabled by default.
+    pub hide_listen_addrs: bool,
 }
 
 impl Config {
@@ -160,6 +166,7 @@ impl Config {
             interval: Duration::from_secs(5 * 60),
             push_listen_addr_updates: false,
             cache_size: 100,
+            hide_listen_addrs: false,
         }
     }
 
@@ -189,6 +196,12 @@ impl Config {
         self.cache_size = cache_size;
         self
     }
+
+    /// Configures whether we prevent sending out our listen addresses.
+    pub fn with_hide_listen_addrs(mut self, b: bool) -> Self {
+        self.hide_listen_addrs = b;
+        self
+    }
 }
 
 impl Behaviour {
@@ -258,11 +271,11 @@ impl Behaviour {
     }
 
     fn all_addresses(&self) -> HashSet<Multiaddr> {
-        self.listen_addresses
-            .iter()
-            .chain(self.external_addresses.iter())
-            .cloned()
-            .collect()
+        let mut addrs = HashSet::from_iter(self.external_addresses.iter().cloned());
+        if !self.config.hide_listen_addrs {
+            addrs.extend(self.listen_addresses.iter().cloned());
+        };
+        addrs
     }
 
     fn emit_new_external_addr_candidate_event(
diff --git a/protocols/identify/tests/smoke.rs b/protocols/identify/tests/smoke.rs
index 49ae9f0726f..d624005408e 100644
--- a/protocols/identify/tests/smoke.rs
+++ b/protocols/identify/tests/smoke.rs
@@ -222,6 +222,77 @@ async fn emits_unique_listen_addresses() {
     assert!(reported_addrs.contains(&(swarm2_peer_id, swarm2_tcp_listen_addr)));
 }
 
+#[async_std::test]
+async fn hides_listen_addresses() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    let mut swarm1 = Swarm::new_ephemeral(|identity| {
+        identify::Behaviour::new(
+            identify::Config::new("a".to_string(), identity.public())
+                .with_agent_version("b".to_string())
+                .with_interval(Duration::from_secs(1))
+                .with_cache_size(10),
+        )
+    });
+    let mut swarm2 = Swarm::new_ephemeral(|identity| {
+        identify::Behaviour::new(
+            identify::Config::new("c".to_string(), identity.public())
+                .with_agent_version("d".to_string())
+                .with_hide_listen_addrs(true),
+        )
+    });
+
+    let (_swarm2_mem_listen_addr, swarm2_tcp_listen_addr) =
+        swarm2.listen().with_tcp_addr_external().await;
+    let swarm2_peer_id = *swarm2.local_peer_id();
+    swarm1.connect(&mut swarm2).await;
+
+    async_std::task::spawn(swarm2.loop_on_next());
+
+    let swarm_events = futures::stream::poll_fn(|cx| swarm1.poll_next_unpin(cx))
+        .take(8)
+        .collect::<Vec<_>>()
+        .await;
+
+    let infos = swarm_events
+        .iter()
+        .filter_map(|e| match e {
+            SwarmEvent::Behaviour(identify::Event::Received { info, .. }) => Some(info.clone()),
+            _ => None,
+        })
+        .collect::<Vec<_>>();
+
+    assert!(
+        infos.len() > 1,
+        "should exchange identify payload more than once"
+    );
+
+    let listen_addrs = infos
+        .iter()
+        .map(|i| i.listen_addrs.clone())
+        .collect::<Vec<_>>();
+
+    for addrs in listen_addrs {
+        assert_eq!(addrs.len(), 1);
+        assert!(addrs.contains(&swarm2_tcp_listen_addr));
+    }
+
+    let reported_addrs = swarm_events
+        .iter()
+        .filter_map(|e| match e {
+            SwarmEvent::NewExternalAddrOfPeer { peer_id, address } => {
+                Some((*peer_id, address.clone()))
+            }
+            _ => None,
+        })
+        .collect::<Vec<_>>();
+
+    assert_eq!(reported_addrs.len(), 1, "To have one TCP address of remote");
+    assert!(reported_addrs.contains(&(swarm2_peer_id, swarm2_tcp_listen_addr)));
+}
+
 #[async_std::test]
 async fn identify_push() {
     let _ = tracing_subscriber::fmt()

From cdc9638ac1256f8a5305adb2f50a188de8874a0f Mon Sep 17 00:00:00 2001
From: Piotr Galar <piotr.galar@gmail.com>
Date: Fri, 13 Sep 2024 19:18:30 +0200
Subject: [PATCH 376/455] chore: parameterise s3 build cache setup (#5586)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we're setting up a new cache bucket, we'd like to be able to control
its' configuration via GitHub vars/secrets fully.

FYI, the secrets are not set up yet.

---------

Co-authored-by: João Oliveira <hello@jxs.pt>
Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
---
 .github/workflows/docker-image.yml |  8 +-------
 .github/workflows/interop-test.yml | 17 +++++++++--------
 scripts/build-interop-image.sh     |  4 ++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 21863d0ed39..5cbfc20d69d 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,7 +6,6 @@ on:
       - 'master'
     tags:
       - 'libp2p-server-**'
-  pull_request:
 
 jobs:
   server:
@@ -34,11 +33,6 @@ jobs:
         with:
           context: .
           file: ./misc/server/Dockerfile
-          push: ${{ ! github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} # Only push image if we have the required permissions, i.e. not running from a fork
-          cache-from: ${{ ! github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && type=s3,mode=max,bucket=libp2p-by-tf-aws-bootstrap,region=us-east-1,prefix=buildCache,name=rust-libp2p-server }}
-          cache-to:   ${{ ! github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && type=s3,mode=max,bucket=libp2p-by-tf-aws-bootstrap,region=us-east-1,prefix=buildCache,name=rust-libp2p-server }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-        env:
-          AWS_ACCESS_KEY_ID: ${{ vars.TEST_PLANS_BUILD_CACHE_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_PLANS_BUILD_CACHE_KEY }}
diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml
index f3950897089..1d70ca2eaee 100644
--- a/.github/workflows/interop-test.yml
+++ b/.github/workflows/interop-test.yml
@@ -24,8 +24,9 @@ jobs:
       - name: Build ${{ matrix.flavour }} image
         run: ./scripts/build-interop-image.sh
         env:
-          AWS_ACCESS_KEY_ID: ${{ vars.TEST_PLANS_BUILD_CACHE_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_PLANS_BUILD_CACHE_KEY }}
+          AWS_BUCKET_NAME: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
+          AWS_ACCESS_KEY_ID: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
           FLAVOUR: ${{ matrix.flavour }}
 
       - name: Run ${{ matrix.flavour }} tests
@@ -33,9 +34,9 @@ jobs:
         with:
           test-filter: ${{ matrix.flavour }}-rust-libp2p-head
           extra-versions: ${{ github.workspace }}/interop-tests/${{ matrix.flavour }}-ping-version.json
-          s3-cache-bucket: libp2p-by-tf-aws-bootstrap
-          s3-access-key-id: ${{ vars.TEST_PLANS_BUILD_CACHE_KEY_ID }}
-          s3-secret-access-key: ${{ secrets.TEST_PLANS_BUILD_CACHE_KEY }}
+          s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
+          s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
+          s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
           worker-count: 16
   run-holepunching-interop:
     name: Run hole-punch interoperability tests
@@ -50,7 +51,7 @@ jobs:
         with:
           test-filter: rust-libp2p-head
           extra-versions: ${{ github.workspace }}/hole-punching-tests/version.json
-          s3-cache-bucket: libp2p-by-tf-aws-bootstrap
-          s3-access-key-id: ${{ vars.TEST_PLANS_BUILD_CACHE_KEY_ID }}
-          s3-secret-access-key: ${{ secrets.TEST_PLANS_BUILD_CACHE_KEY }}
+          s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
+          s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
+          s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
           worker-count: 16
diff --git a/scripts/build-interop-image.sh b/scripts/build-interop-image.sh
index 28a8db9188d..ad6ef78b153 100755
--- a/scripts/build-interop-image.sh
+++ b/scripts/build-interop-image.sh
@@ -6,13 +6,13 @@ CACHE_TO=""
 
 # If we have credentials, write to cache
 if [[ -n "${AWS_SECRET_ACCESS_KEY}" ]]; then
-  CACHE_TO="--cache-to   type=s3,mode=max,bucket=libp2p-by-tf-aws-bootstrap,region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
+  CACHE_TO="--cache-to   type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
 fi
 
 docker buildx build \
   --load \
   $CACHE_TO \
-  --cache-from type=s3,mode=max,bucket=libp2p-by-tf-aws-bootstrap,region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
+  --cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
   -t ${FLAVOUR}-rust-libp2p-head \
   . \
   -f interop-tests/Dockerfile.${FLAVOUR}

From a2a281609a0a64b211f7917aa856924983b63200 Mon Sep 17 00:00:00 2001
From: Stefan <stefan@novabytes.nl>
Date: Sat, 14 Sep 2024 00:33:14 +0200
Subject: [PATCH 377/455] fix(autonat): reject inbound dial request from peer
 if its not connected (#5597)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
As discovered and described in the issue below, there are situations
where an incoming AutoNAT dial can come from a non-connected peer.
However `resolve_inbound_request` expects that this situation cannot
occur. This PR adds a check upfront and refuses the incoming dial when
no connected peer is found.

Fixes https://github.com/libp2p/rust-libp2p/issues/5570.
## Change checklist

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

Co-authored-by: João Oliveira <hello@jxs.pt>
---
 Cargo.lock                                      |  2 +-
 Cargo.toml                                      |  2 +-
 protocols/autonat/CHANGELOG.md                  |  3 +++
 protocols/autonat/Cargo.toml                    |  2 +-
 protocols/autonat/src/v1/behaviour/as_server.rs | 15 +++++++++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c12e6fb984..b3d1cd0d76d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2687,7 +2687,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-autonat"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "async-std",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index da8d32e1a4a..c9fe928096d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,7 +77,7 @@ futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.1", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.4.1", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.13.0", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.0", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.0", path = "core" }
 libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index e171412aa58..f1aeda6ac18 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.13.1
+- Verify that an incoming AutoNAT dial comes from a connected peer. See [PR 5597](https://github.com/libp2p/rust-libp2p/pull/5597).
+
 ## 0.13.0
 
 - Due to the refactor of `Transport` it's no longer required to create a seperate transport for
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 2c01d18dceb..0c0e757641d 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>", "Hannes Furmans <hannes@umgefahren.xyz>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/autonat/src/v1/behaviour/as_server.rs b/protocols/autonat/src/v1/behaviour/as_server.rs
index 3ecdd3ac26e..1289bd53d24 100644
--- a/protocols/autonat/src/v1/behaviour/as_server.rs
+++ b/protocols/autonat/src/v1/behaviour/as_server.rs
@@ -107,6 +107,21 @@ impl<'a> HandleInnerEvent for AsServer<'a> {
                     },
             } => {
                 let probe_id = self.probe_id.next();
+                if !self.connected.contains_key(&peer) {
+                    tracing::debug!(
+                        %peer,
+                        "Reject inbound dial request from peer since it is not connected"
+                    );
+
+                    return VecDeque::from([ToSwarm::GenerateEvent(Event::InboundProbe(
+                        InboundProbeEvent::Error {
+                            probe_id,
+                            peer,
+                            error: InboundProbeError::Response(ResponseError::DialRefused),
+                        },
+                    ))]);
+                }
+
                 match self.resolve_inbound_request(peer, request) {
                     Ok(addrs) => {
                         tracing::debug!(

From fd4e1e1e89189af938460a182ad3c2374654c7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 20 Sep 2024 22:37:32 +0100
Subject: [PATCH 378/455] chore(ci): only run interop tests on commits to
 master (#5604)

## Description

This is done as temporary measure to unblock PR merging as the CI is
currently broken

Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
---
 .github/workflows/interop-test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml
index 1d70ca2eaee..558adcda66c 100644
--- a/.github/workflows/interop-test.yml
+++ b/.github/workflows/interop-test.yml
@@ -1,6 +1,5 @@
 name: Interoperability Testing
 on:
-  pull_request:
   push:
     branches:
       - "master"

From c6cf7fec6913aa590622aeea16709fce6e9c99a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 24 Sep 2024 16:00:02 +0100
Subject: [PATCH 379/455] fix(ci): address cargo-deny advisories (#5596)

## Description
by updating:
- `bytes` to 1.7.1, `1.6.0` was
[yanked](https://crates.io/crates/bytes/1.6.0)
- `quinn-proto` to 0.11.8 to address
[RUSTSEC-2024-0373](https://rustsec.org/advisories/RUSTSEC-2024-0373.html)
- thirtyfour-macros to 0.1.11 to remove `proc-macro-error` dependency
and address
[RUSTSEC-2024-0370](https://rustsec.org/advisories/RUSTSEC-2024-0370.html)
---
 Cargo.lock                        | 73 ++++++++++++-------------------
 examples/autonatv2/Dockerfile     |  2 +-
 hole-punching-tests/Dockerfile    |  2 +-
 interop-tests/Dockerfile.chromium |  2 +-
 interop-tests/Dockerfile.native   |  2 +-
 misc/server/Dockerfile            |  2 +-
 protocols/perf/Dockerfile         |  2 +-
 7 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b3d1cd0d76d..4c3498a0635 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -833,9 +833,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 dependencies = [
  "serde",
 ]
@@ -4584,30 +4584,6 @@ dependencies = [
  "elliptic-curve",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.85"
@@ -4724,7 +4700,7 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "rustls 0.23.11",
  "thiserror",
  "tokio",
@@ -4733,14 +4709,14 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.2"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
  "bytes",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "rustls 0.23.11",
  "slab",
  "thiserror",
@@ -5206,6 +5182,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -5471,18 +5453,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5513,9 +5495,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6002,30 +5984,29 @@ dependencies = [
 
 [[package]]
 name = "thirtyfour-macros"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cae91d1c7c61ec65817f1064954640ee350a50ae6548ff9a1bdd2489d6ffbb0"
+checksum = "b72d056365e368fc57a56d0cec9e41b02fb4a3474a61c8735262b1cfebe67425"
 dependencies = [
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6576,9 +6557,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna 0.5.0",
diff --git a/examples/autonatv2/Dockerfile b/examples/autonatv2/Dockerfile
index 5a523649d80..6bc92e4d11b 100644
--- a/examples/autonatv2/Dockerfile
+++ b/examples/autonatv2/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.75-alpine as builder
+FROM rust:1.81-alpine as builder
 
 RUN apk add musl-dev
 
diff --git a/hole-punching-tests/Dockerfile b/hole-punching-tests/Dockerfile
index af00ef2272f..403cc301fc6 100644
--- a/hole-punching-tests/Dockerfile
+++ b/hole-punching-tests/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.75.0 as builder
+FROM rust:1.81.0 as builder
 
 # Run with access to the target cache to speed up builds
 WORKDIR /workspace
diff --git a/interop-tests/Dockerfile.chromium b/interop-tests/Dockerfile.chromium
index a6b0fc89e82..86edbc5b9d2 100644
--- a/interop-tests/Dockerfile.chromium
+++ b/interop-tests/Dockerfile.chromium
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.75.0 as chef
+FROM rust:1.81 as chef
 RUN rustup target add wasm32-unknown-unknown
 RUN wget -q -O- https://github.com/rustwasm/wasm-pack/releases/download/v0.12.1/wasm-pack-v0.12.1-x86_64-unknown-linux-musl.tar.gz | tar -zx -C /usr/local/bin --strip-components 1 --wildcards "wasm-pack-*/wasm-pack"
 RUN wget -q -O- https://github.com/WebAssembly/binaryen/releases/download/version_115/binaryen-version_115-x86_64-linux.tar.gz | tar -zx -C /usr/local/bin --strip-components 2 --wildcards "binaryen-version_*/bin/wasm-opt"
diff --git a/interop-tests/Dockerfile.native b/interop-tests/Dockerfile.native
index b122ac72991..499c73437fc 100644
--- a/interop-tests/Dockerfile.native
+++ b/interop-tests/Dockerfile.native
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.75.0 as chef
+FROM lukemathwalker/cargo-chef:0.1.67-rust-bullseye as chef
 WORKDIR /app
 
 FROM chef AS planner
diff --git a/misc/server/Dockerfile b/misc/server/Dockerfile
index 1583fba6bef..24ae2b9fd99 100644
--- a/misc/server/Dockerfile
+++ b/misc/server/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.75.0 as chef
+FROM rust:1.81.0 as chef
 RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
 RUN cargo install --locked --root /usr/local libp2p-lookup --version 0.6.4
 WORKDIR /app
diff --git a/protocols/perf/Dockerfile b/protocols/perf/Dockerfile
index 1bd846cc228..f68ea6ef211 100644
--- a/protocols/perf/Dockerfile
+++ b/protocols/perf/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.5-labs
-FROM rust:1.75.0 as builder
+FROM rust:1.81.0 as builder
 
 # Run with access to the target cache to speed up builds
 WORKDIR /workspace

From f3e0e554821ca9233f202e80d1bae9e27cfb3ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 25 Sep 2024 10:36:01 +0100
Subject: [PATCH 380/455] chore(ci): address beta clippy lints (#5606)

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
---
 misc/allow-block-list/src/lib.rs                   |  2 ++
 misc/connection-limits/src/lib.rs                  |  4 ++++
 misc/memory-connection-limits/src/lib.rs           |  2 ++
 misc/memory-connection-limits/tests/util/mod.rs    |  2 ++
 misc/quick-protobuf-codec/src/lib.rs               |  1 +
 .../autonat/src/v2/client/handler/dial_back.rs     |  2 ++
 .../autonat/src/v2/client/handler/dial_request.rs  |  2 ++
 protocols/autonat/src/v2/server/behaviour.rs       |  2 ++
 .../autonat/src/v2/server/handler/dial_request.rs  |  2 ++
 protocols/dcutr/src/behaviour.rs                   |  2 ++
 protocols/dcutr/src/handler/relayed.rs             |  8 ++++++++
 protocols/gossipsub/src/handler.rs                 |  4 ++++
 protocols/gossipsub/src/transform.rs               |  1 +
 protocols/kad/src/handler.rs                       |  2 ++
 protocols/perf/src/client/handler.rs               |  4 ++++
 protocols/perf/src/server/handler.rs               |  8 ++++++++
 protocols/ping/src/handler.rs                      |  2 ++
 protocols/relay/src/behaviour.rs                   |  2 ++
 protocols/relay/src/behaviour/handler.rs           |  2 ++
 protocols/relay/src/priv_client.rs                 |  2 ++
 protocols/relay/src/priv_client/handler.rs         |  6 ++++++
 protocols/request-response/src/cbor.rs             |  2 ++
 protocols/request-response/src/handler.rs          |  6 ++++++
 protocols/stream/src/handler.rs                    |  4 ++++
 swarm/src/behaviour/toggle.rs                      |  4 ++++
 swarm/src/connection.rs                            | 10 ++++++++++
 swarm/src/connection/pool/task.rs                  |  4 ++++
 swarm/src/dummy.rs                                 | 14 ++++++++++++++
 swarm/src/handler/pending.rs                       |  8 ++++++++
 swarm/src/upgrade.rs                               |  1 +
 swarm/tests/swarm_derive.rs                        |  2 ++
 transports/quic/src/hole_punching.rs               |  2 ++
 32 files changed, 119 insertions(+)

diff --git a/misc/allow-block-list/src/lib.rs b/misc/allow-block-list/src/lib.rs
index 7646638a651..56de29d1985 100644
--- a/misc/allow-block-list/src/lib.rs
+++ b/misc/allow-block-list/src/lib.rs
@@ -271,6 +271,8 @@ where
         _: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
diff --git a/misc/connection-limits/src/lib.rs b/misc/connection-limits/src/lib.rs
index b02e52f25a1..05a9b639f26 100644
--- a/misc/connection-limits/src/lib.rs
+++ b/misc/connection-limits/src/lib.rs
@@ -355,6 +355,8 @@ impl NetworkBehaviour for Behaviour {
         _: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
@@ -586,6 +588,8 @@ mod tests {
             _connection_id: ConnectionId,
             event: THandlerOutEvent<Self>,
         ) {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             void::unreachable(event)
         }
 
diff --git a/misc/memory-connection-limits/src/lib.rs b/misc/memory-connection-limits/src/lib.rs
index 7b5803a61aa..757ff770487 100644
--- a/misc/memory-connection-limits/src/lib.rs
+++ b/misc/memory-connection-limits/src/lib.rs
@@ -190,6 +190,8 @@ impl NetworkBehaviour for Behaviour {
         _: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
diff --git a/misc/memory-connection-limits/tests/util/mod.rs b/misc/memory-connection-limits/tests/util/mod.rs
index d18aa78fd22..01e8cd9f655 100644
--- a/misc/memory-connection-limits/tests/util/mod.rs
+++ b/misc/memory-connection-limits/tests/util/mod.rs
@@ -116,6 +116,8 @@ impl<const MEM_PENDING: usize, const MEM_ESTABLISHED: usize> NetworkBehaviour
         _: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
diff --git a/misc/quick-protobuf-codec/src/lib.rs b/misc/quick-protobuf-codec/src/lib.rs
index 166ee82ff08..32cee8eccac 100644
--- a/misc/quick-protobuf-codec/src/lib.rs
+++ b/misc/quick-protobuf-codec/src/lib.rs
@@ -12,6 +12,7 @@ mod generated;
 pub use generated::test as proto;
 
 /// [`Codec`] implements [`Encoder`] and [`Decoder`], uses [`unsigned_varint`]
+///
 /// to prefix messages with their length and uses [`quick_protobuf`] and a provided
 /// `struct` implementing [`MessageRead`] and [`MessageWrite`] to do the encoding.
 pub struct Codec<In, Out = In> {
diff --git a/protocols/autonat/src/v2/client/handler/dial_back.rs b/protocols/autonat/src/v2/client/handler/dial_back.rs
index b94580e69ba..98a41a82504 100644
--- a/protocols/autonat/src/v2/client/handler/dial_back.rs
+++ b/protocols/autonat/src/v2/client/handler/dial_back.rs
@@ -83,6 +83,8 @@ impl ConnectionHandler for Handler {
                     tracing::warn!("Dial back request dropped, too many requests in flight");
                 }
             }
+            // TODO: remove when Rust 1.82 is MSRVprotocols/autonat/src/v2/client/handler/dial_back.rs
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { error, .. }) => {
                 void::unreachable(error);
             }
diff --git a/protocols/autonat/src/v2/client/handler/dial_request.rs b/protocols/autonat/src/v2/client/handler/dial_request.rs
index 9d2df8ee6b4..85ad176ec30 100644
--- a/protocols/autonat/src/v2/client/handler/dial_request.rs
+++ b/protocols/autonat/src/v2/client/handler/dial_request.rs
@@ -216,6 +216,8 @@ async fn start_stream_handle(
         .map_err(|e| match e {
             StreamUpgradeError::NegotiationFailed => Error::UnsupportedProtocol,
             StreamUpgradeError::Timeout => Error::Io(io::ErrorKind::TimedOut.into()),
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             StreamUpgradeError::Apply(v) => void::unreachable(v),
             StreamUpgradeError::Io(e) => Error::Io(e),
         })?;
diff --git a/protocols/autonat/src/v2/server/behaviour.rs b/protocols/autonat/src/v2/server/behaviour.rs
index 5f7b21d165b..9264c728fe4 100644
--- a/protocols/autonat/src/v2/server/behaviour.rs
+++ b/protocols/autonat/src/v2/server/behaviour.rs
@@ -112,6 +112,8 @@ where
             Either::Left(Either::Left(Err(e))) => {
                 tracing::debug!("dial back error: {e:?}");
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             Either::Left(Either::Right(v)) => void::unreachable(v),
             Either::Right(Either::Left(cmd)) => {
                 let addr = cmd.addr.clone();
diff --git a/protocols/autonat/src/v2/server/handler/dial_request.rs b/protocols/autonat/src/v2/server/handler/dial_request.rs
index 9a3729d4ccf..14ddb153416 100644
--- a/protocols/autonat/src/v2/server/handler/dial_request.rs
+++ b/protocols/autonat/src/v2/server/handler/dial_request.rs
@@ -143,6 +143,8 @@ where
                     );
                 }
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { error, .. }) => {
                 tracing::debug!("inbound request failed: {:?}", error);
             }
diff --git a/protocols/dcutr/src/behaviour.rs b/protocols/dcutr/src/behaviour.rs
index 574c96205fa..babd56bd28e 100644
--- a/protocols/dcutr/src/behaviour.rs
+++ b/protocols/dcutr/src/behaviour.rs
@@ -314,6 +314,8 @@ impl NetworkBehaviour for Behaviour {
                     .or_default() += 1;
                 self.queued_events.push_back(ToSwarm::Dial { opts });
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             Either::Right(never) => void::unreachable(never),
         };
     }
diff --git a/protocols/dcutr/src/handler/relayed.rs b/protocols/dcutr/src/handler/relayed.rs
index eba58f89313..72af9fec264 100644
--- a/protocols/dcutr/src/handler/relayed.rs
+++ b/protocols/dcutr/src/handler/relayed.rs
@@ -115,6 +115,8 @@ impl Handler {
                 self.attempts += 1;
             }
             // A connection listener denies all incoming substreams, thus none can ever be fully negotiated.
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             future::Either::Right(output) => void::unreachable(output),
         }
     }
@@ -153,6 +155,8 @@ impl Handler {
             <Self as ConnectionHandler>::InboundProtocol,
         >,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(error.into_inner());
     }
 
@@ -164,6 +168,8 @@ impl Handler {
         >,
     ) {
         let error = match error {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             StreamUpgradeError::Apply(v) => void::unreachable(v),
             StreamUpgradeError::NegotiationFailed => outbound::Error::Unsupported,
             StreamUpgradeError::Io(e) => outbound::Error::Io(e),
@@ -298,6 +304,8 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::FullyNegotiatedOutbound(fully_negotiated_outbound) => {
                 self.on_fully_negotiated_outbound(fully_negotiated_outbound)
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(listen_upgrade_error) => {
                 self.on_listen_upgrade_error(listen_upgrade_error)
             }
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
index 88def13a521..8e3b3a8b022 100644
--- a/protocols/gossipsub/src/handler.rs
+++ b/protocols/gossipsub/src/handler.rs
@@ -493,6 +493,8 @@ impl ConnectionHandler for Handler {
                         ..
                     }) => match protocol {
                         Either::Left(protocol) => handler.on_fully_negotiated_inbound(protocol),
+                        // TODO: remove when Rust 1.82 is MSRV
+                        #[allow(unreachable_patterns)]
                         Either::Right(v) => void::unreachable(v),
                     },
                     ConnectionEvent::FullyNegotiatedOutbound(fully_negotiated_outbound) => {
@@ -504,6 +506,8 @@ impl ConnectionHandler for Handler {
                     }) => {
                         tracing::debug!("Dial upgrade error: Protocol negotiation timeout");
                     }
+                    // TODO: remove when Rust 1.82 is MSRV
+                    #[allow(unreachable_patterns)]
                     ConnectionEvent::DialUpgradeError(DialUpgradeError {
                         error: StreamUpgradeError::Apply(e),
                         ..
diff --git a/protocols/gossipsub/src/transform.rs b/protocols/gossipsub/src/transform.rs
index 6f57d9fc46b..4831f9781b0 100644
--- a/protocols/gossipsub/src/transform.rs
+++ b/protocols/gossipsub/src/transform.rs
@@ -28,6 +28,7 @@
 use crate::{Message, RawMessage, TopicHash};
 
 /// A general trait of transforming a [`RawMessage`] into a [`Message`]. The
+///
 /// [`RawMessage`] is obtained from the wire and the [`Message`] is used to
 /// calculate the [`crate::MessageId`] of the message and is what is sent to the application.
 ///
diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
index 5e7c2e21b8b..17c483da709 100644
--- a/protocols/kad/src/handler.rs
+++ b/protocols/kad/src/handler.rs
@@ -501,6 +501,8 @@ impl Handler {
         // is a `Void`.
         let protocol = match protocol {
             future::Either::Left(p) => p,
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             future::Either::Right(p) => void::unreachable(p),
         };
 
diff --git a/protocols/perf/src/client/handler.rs b/protocols/perf/src/client/handler.rs
index 2a2c5499fc2..55fafad7fcc 100644
--- a/protocols/perf/src/client/handler.rs
+++ b/protocols/perf/src/client/handler.rs
@@ -112,6 +112,8 @@ impl ConnectionHandler for Handler {
         >,
     ) {
         match event {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                 protocol, ..
             }) => void::unreachable(protocol),
@@ -144,6 +146,8 @@ impl ConnectionHandler for Handler {
                         result: Err(error.into()),
                     }));
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { info: (), error }) => {
                 void::unreachable(error)
             }
diff --git a/protocols/perf/src/server/handler.rs b/protocols/perf/src/server/handler.rs
index ddfe8f881e5..4cb535a452c 100644
--- a/protocols/perf/src/server/handler.rs
+++ b/protocols/perf/src/server/handler.rs
@@ -73,6 +73,8 @@ impl ConnectionHandler for Handler {
     }
 
     fn on_behaviour_event(&mut self, v: Self::FromBehaviour) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(v)
     }
 
@@ -98,16 +100,22 @@ impl ConnectionHandler for Handler {
                     tracing::warn!("Dropping inbound stream because we are at capacity");
                 }
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound { info, .. }) => {
                 void::unreachable(info)
             }
 
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::DialUpgradeError(DialUpgradeError { info, .. }) => {
                 void::unreachable(info)
             }
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::LocalProtocolsChange(_)
             | ConnectionEvent::RemoteProtocolsChange(_) => {}
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { info: (), error }) => {
                 void::unreachable(error)
             }
diff --git a/protocols/ping/src/handler.rs b/protocols/ping/src/handler.rs
index 2816cdc4048..7b36b2d4b3d 100644
--- a/protocols/ping/src/handler.rs
+++ b/protocols/ping/src/handler.rs
@@ -210,6 +210,8 @@ impl Handler {
                     "ping protocol negotiation timed out",
                 )),
             },
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             StreamUpgradeError::Apply(e) => void::unreachable(e),
             StreamUpgradeError::Io(e) => Failure::Other { error: Box::new(e) },
         };
diff --git a/protocols/relay/src/behaviour.rs b/protocols/relay/src/behaviour.rs
index 463febf9f2f..46419ae64e3 100644
--- a/protocols/relay/src/behaviour.rs
+++ b/protocols/relay/src/behaviour.rs
@@ -366,6 +366,8 @@ impl NetworkBehaviour for Behaviour {
     ) {
         let event = match event {
             Either::Left(e) => e,
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             Either::Right(v) => void::unreachable(v),
         };
 
diff --git a/protocols/relay/src/behaviour/handler.rs b/protocols/relay/src/behaviour/handler.rs
index 92557287099..23e90f4b3f8 100644
--- a/protocols/relay/src/behaviour/handler.rs
+++ b/protocols/relay/src/behaviour/handler.rs
@@ -449,6 +449,8 @@ impl Handler {
             StreamUpgradeError::Timeout => outbound_stop::Error::Io(io::ErrorKind::TimedOut.into()),
             StreamUpgradeError::NegotiationFailed => outbound_stop::Error::Unsupported,
             StreamUpgradeError::Io(e) => outbound_stop::Error::Io(e),
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             StreamUpgradeError::Apply(v) => void::unreachable(v),
         };
 
diff --git a/protocols/relay/src/priv_client.rs b/protocols/relay/src/priv_client.rs
index f8d1d9c9eb2..8bbc813ec4c 100644
--- a/protocols/relay/src/priv_client.rs
+++ b/protocols/relay/src/priv_client.rs
@@ -236,6 +236,8 @@ impl NetworkBehaviour for Behaviour {
     ) {
         let handler_event = match handler_event {
             Either::Left(e) => e,
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             Either::Right(v) => void::unreachable(v),
         };
 
diff --git a/protocols/relay/src/priv_client/handler.rs b/protocols/relay/src/priv_client/handler.rs
index 662d63cc742..05fdd5673ae 100644
--- a/protocols/relay/src/priv_client/handler.rs
+++ b/protocols/relay/src/priv_client/handler.rs
@@ -445,6 +445,8 @@ impl ConnectionHandler for Handler {
                     let _ = next.send(Ok(ev.protocol));
                 }
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ev) => void::unreachable(ev.error),
             ConnectionEvent::DialUpgradeError(ev) => {
                 if let Some(next) = self.pending_streams.pop_front() {
@@ -583,6 +585,8 @@ fn into_reserve_error(e: StreamUpgradeError<Void>) -> outbound_hop::ReserveError
         StreamUpgradeError::Timeout => {
             outbound_hop::ReserveError::Io(io::ErrorKind::TimedOut.into())
         }
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         StreamUpgradeError::Apply(never) => void::unreachable(never),
         StreamUpgradeError::NegotiationFailed => outbound_hop::ReserveError::Unsupported,
         StreamUpgradeError::Io(e) => outbound_hop::ReserveError::Io(e),
@@ -594,6 +598,8 @@ fn into_connect_error(e: StreamUpgradeError<Void>) -> outbound_hop::ConnectError
         StreamUpgradeError::Timeout => {
             outbound_hop::ConnectError::Io(io::ErrorKind::TimedOut.into())
         }
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         StreamUpgradeError::Apply(never) => void::unreachable(never),
         StreamUpgradeError::NegotiationFailed => outbound_hop::ConnectError::Unsupported,
         StreamUpgradeError::Io(e) => outbound_hop::ConnectError::Io(e),
diff --git a/protocols/request-response/src/cbor.rs b/protocols/request-response/src/cbor.rs
index 44d82be2630..a27d069e758 100644
--- a/protocols/request-response/src/cbor.rs
+++ b/protocols/request-response/src/cbor.rs
@@ -143,6 +143,8 @@ mod codec {
 
     fn decode_into_io_error(err: cbor4ii::serde::DecodeError<Infallible>) -> io::Error {
         match err {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             cbor4ii::serde::DecodeError::Core(DecodeError::Read(e)) => {
                 io::Error::new(io::ErrorKind::Other, e)
             }
diff --git a/protocols/request-response/src/handler.rs b/protocols/request-response/src/handler.rs
index f0467593f85..0591b37dc30 100644
--- a/protocols/request-response/src/handler.rs
+++ b/protocols/request-response/src/handler.rs
@@ -240,6 +240,8 @@ where
                 self.pending_events
                     .push_back(Event::OutboundUnsupportedProtocols(message.request_id));
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             StreamUpgradeError::Apply(e) => void::unreachable(e),
             StreamUpgradeError::Io(e) => {
                 self.pending_events.push_back(Event::OutboundStreamFailed {
@@ -256,6 +258,8 @@ where
             <Self as ConnectionHandler>::InboundProtocol,
         >,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(error)
     }
 }
@@ -484,6 +488,8 @@ where
             ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(listen_upgrade_error) => {
                 self.on_listen_upgrade_error(listen_upgrade_error)
             }
diff --git a/protocols/stream/src/handler.rs b/protocols/stream/src/handler.rs
index f63b93c1761..bf80e30c3c6 100644
--- a/protocols/stream/src/handler.rs
+++ b/protocols/stream/src/handler.rs
@@ -96,6 +96,8 @@ impl ConnectionHandler for Handler {
     }
 
     fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
@@ -143,6 +145,8 @@ impl ConnectionHandler for Handler {
                     swarm::StreamUpgradeError::Timeout => {
                         OpenStreamError::Io(io::Error::from(io::ErrorKind::TimedOut))
                     }
+                    // TODO: remove when Rust 1.82 is MSRV
+                    #[allow(unreachable_patterns)]
                     swarm::StreamUpgradeError::Apply(v) => void::unreachable(v),
                     swarm::StreamUpgradeError::NegotiationFailed => {
                         OpenStreamError::UnsupportedProtocol(p)
diff --git a/swarm/src/behaviour/toggle.rs b/swarm/src/behaviour/toggle.rs
index 398c919ae86..5d72534c91e 100644
--- a/swarm/src/behaviour/toggle.rs
+++ b/swarm/src/behaviour/toggle.rs
@@ -210,6 +210,8 @@ where
     ) {
         let out = match out {
             future::Either::Left(out) => out,
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             future::Either::Right(v) => void::unreachable(v),
         };
 
@@ -251,6 +253,8 @@ where
 
         let err = match err {
             Either::Left(e) => e,
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             Either::Right(v) => void::unreachable(v),
         };
 
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 603a5b0d7c4..2f9afc38418 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -1189,10 +1189,14 @@ mod tests {
             >,
         ) {
             match event {
+                // TODO: remove when Rust 1.82 is MSRV
+                #[allow(unreachable_patterns)]
                 ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                     protocol,
                     ..
                 }) => void::unreachable(protocol),
+                // TODO: remove when Rust 1.82 is MSRV
+                #[allow(unreachable_patterns)]
                 ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                     protocol,
                     ..
@@ -1200,6 +1204,8 @@ mod tests {
                 ConnectionEvent::DialUpgradeError(DialUpgradeError { error, .. }) => {
                     self.error = Some(error)
                 }
+                // TODO: remove when Rust 1.82 is MSRV
+                #[allow(unreachable_patterns)]
                 ConnectionEvent::AddressChange(_)
                 | ConnectionEvent::ListenUpgradeError(_)
                 | ConnectionEvent::LocalProtocolsChange(_)
@@ -1208,6 +1214,8 @@ mod tests {
         }
 
         fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             void::unreachable(event)
         }
 
@@ -1283,6 +1291,8 @@ mod tests {
         }
 
         fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             void::unreachable(event)
         }
 
diff --git a/swarm/src/connection/pool/task.rs b/swarm/src/connection/pool/task.rs
index 08674fd2ee5..13977a17b85 100644
--- a/swarm/src/connection/pool/task.rs
+++ b/swarm/src/connection/pool/task.rs
@@ -105,6 +105,8 @@ pub(crate) async fn new_for_pending_outgoing_connection(
                 })
                 .await;
         }
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         Either::Left((Ok(v), _)) => void::unreachable(v),
         Either::Right((Ok((address, output, errors)), _)) => {
             let _ = events
@@ -143,6 +145,8 @@ pub(crate) async fn new_for_pending_incoming_connection<TFut>(
                 })
                 .await;
         }
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         Either::Left((Ok(v), _)) => void::unreachable(v),
         Either::Right((Ok(output), _)) => {
             let _ = events
diff --git a/swarm/src/dummy.rs b/swarm/src/dummy.rs
index 6e1b4d56eb9..0bd8c06862d 100644
--- a/swarm/src/dummy.rs
+++ b/swarm/src/dummy.rs
@@ -49,6 +49,8 @@ impl NetworkBehaviour for Behaviour {
         _: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
@@ -76,6 +78,8 @@ impl crate::handler::ConnectionHandler for ConnectionHandler {
     }
 
     fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(event)
     }
 
@@ -98,19 +102,29 @@ impl crate::handler::ConnectionHandler for ConnectionHandler {
         >,
     ) {
         match event {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                 protocol, ..
             }) => void::unreachable(protocol),
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                 protocol, ..
             }) => void::unreachable(protocol),
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::DialUpgradeError(DialUpgradeError { info: _, error }) => match error {
+                // TODO: remove when Rust 1.82 is MSRV
+                #[allow(unreachable_patterns)]
                 StreamUpgradeError::Timeout => unreachable!(),
                 StreamUpgradeError::Apply(e) => void::unreachable(e),
                 StreamUpgradeError::NegotiationFailed | StreamUpgradeError::Io(_) => {
                     unreachable!("Denied upgrade does not support any protocols")
                 }
             },
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
             | ConnectionEvent::LocalProtocolsChange(_)
diff --git a/swarm/src/handler/pending.rs b/swarm/src/handler/pending.rs
index 23b9adcfd90..9601f5cf78b 100644
--- a/swarm/src/handler/pending.rs
+++ b/swarm/src/handler/pending.rs
@@ -52,6 +52,8 @@ impl ConnectionHandler for PendingConnectionHandler {
     }
 
     fn on_behaviour_event(&mut self, v: Self::FromBehaviour) {
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         void::unreachable(v)
     }
 
@@ -74,9 +76,13 @@ impl ConnectionHandler for PendingConnectionHandler {
         >,
     ) {
         match event {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                 protocol, ..
             }) => void::unreachable(protocol),
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                 protocol,
                 info: _info,
@@ -87,6 +93,8 @@ impl ConnectionHandler for PendingConnectionHandler {
                     void::unreachable(_info);
                 }
             }
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::DialUpgradeError(_)
             | ConnectionEvent::ListenUpgradeError(_)
diff --git a/swarm/src/upgrade.rs b/swarm/src/upgrade.rs
index 53b627458c9..f6c6648a373 100644
--- a/swarm/src/upgrade.rs
+++ b/swarm/src/upgrade.rs
@@ -121,6 +121,7 @@ where
 }
 
 /// Wraps around a type that implements [`OutboundUpgradeSend`], [`InboundUpgradeSend`], or
+///
 /// both, and implements [`OutboundUpgrade`](upgrade::OutboundUpgrade) and/or
 /// [`InboundUpgrade`](upgrade::InboundUpgrade).
 ///
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 919ed0cab7f..667f68408cf 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -577,6 +577,8 @@ fn custom_out_event_no_type_parameters() {
             _connection: ConnectionId,
             message: THandlerOutEvent<Self>,
         ) {
+            // TODO: remove when Rust 1.82 is MSRV
+            #[allow(unreachable_patterns)]
             void::unreachable(message);
         }
 
diff --git a/transports/quic/src/hole_punching.rs b/transports/quic/src/hole_punching.rs
index 605799af5e1..a38d123a6a4 100644
--- a/transports/quic/src/hole_punching.rs
+++ b/transports/quic/src/hole_punching.rs
@@ -20,6 +20,8 @@ pub(crate) async fn hole_puncher<P: Provider>(
     match futures::future::select(P::sleep(timeout_duration), punch_holes_future).await {
         Either::Left(_) => Error::HandshakeTimedOut,
         Either::Right((Err(hole_punch_err), _)) => hole_punch_err,
+        // TODO: remove when Rust 1.82 is MSRV
+        #[allow(unreachable_patterns)]
         Either::Right((Ok(never), _)) => match never {},
     }
 }

From 8ceadaac5aec4b462463ef4082d6af577a3158b1 Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:17:47 +0200
Subject: [PATCH 381/455] fix(swarm): don't report `NewExternalAddrCandidate`
 if already confirmed (#5582)

## Description

Currently, `NewExternalAddrCandidate` events are emitted for every
connections. However, we continue to get this event even when `autonat`
has already confirmed that this address is external. So we should not
continue to advertise the "candidate" event.

## Notes & open questions

We have made the changes in the `swarm` instead of `identify` because it
does not make it necessary to duplicate the `ConfirmedExternalAddr`
vector in the `identify` Behaviour. Moreover, if any future Behaviour
emit `NewExternalAddrCandidate`, the same rule will also be applied.

I had to edit the `autonat_v2` tests which were always expecting a
`NewExternalAddrCandidate` but the address was already confirmed.

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
---
 Cargo.lock                           |  2 +-
 Cargo.toml                           |  2 +-
 protocols/autonat/tests/autonatv2.rs | 38 +++++++++++++---------------
 swarm/CHANGELOG.md                   |  5 ++++
 swarm/Cargo.toml                     |  2 +-
 swarm/src/lib.rs                     | 14 +++++-----
 6 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c3498a0635..79eb2eb4ad5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3329,7 +3329,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.45.1"
+version = "0.45.2"
 dependencies = [
  "async-std",
  "criterion",
diff --git a/Cargo.toml b/Cargo.toml
index c9fe928096d..32f72c5e252 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
-libp2p-swarm = { version = "0.45.1", path = "swarm" }
+libp2p-swarm = { version = "0.45.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.4.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
diff --git a/protocols/autonat/tests/autonatv2.rs b/protocols/autonat/tests/autonatv2.rs
index abd0c4bd8eb..3d792172445 100644
--- a/protocols/autonat/tests/autonatv2.rs
+++ b/protocols/autonat/tests/autonatv2.rs
@@ -1,5 +1,6 @@
 use libp2p_autonat::v2::client::{self, Config};
 use libp2p_autonat::v2::server;
+use libp2p_core::multiaddr::Protocol;
 use libp2p_core::transport::TransportError;
 use libp2p_core::Multiaddr;
 use libp2p_swarm::{
@@ -21,17 +22,10 @@ async fn confirm_successful() {
 
     let cor_server_peer = *alice.local_peer_id();
     let cor_client_peer = *bob.local_peer_id();
-    let bob_external_addrs = Arc::new(bob.external_addresses().cloned().collect::<Vec<_>>());
-    let alice_bob_external_addrs = bob_external_addrs.clone();
+    let bob_tcp_listeners = Arc::new(tcp_listeners(&bob));
+    let alice_bob_tcp_listeners = bob_tcp_listeners.clone();
 
     let alice_task = async {
-        let _ = alice
-            .wait(|event| match event {
-                SwarmEvent::NewExternalAddrCandidate { .. } => Some(()),
-                _ => None,
-            })
-            .await;
-
         let (dialed_peer_id, dialed_connection_id) = alice
             .wait(|event| match event {
                 SwarmEvent::Dialing {
@@ -76,10 +70,10 @@ async fn confirm_successful() {
             })
             .await;
 
-        assert_eq!(tested_addr, bob_external_addrs.first().cloned().unwrap());
+        assert_eq!(tested_addr, bob_tcp_listeners.first().cloned().unwrap());
         assert_eq!(data_amount, 0);
         assert_eq!(client, cor_client_peer);
-        assert_eq!(&all_addrs[..], &bob_external_addrs[..]);
+        assert_eq!(&all_addrs[..], &bob_tcp_listeners[..]);
         assert!(result.is_ok(), "Result: {result:?}");
     };
 
@@ -122,7 +116,7 @@ async fn confirm_successful() {
             .await;
         assert_eq!(
             tested_addr,
-            alice_bob_external_addrs.first().cloned().unwrap()
+            alice_bob_tcp_listeners.first().cloned().unwrap()
         );
         assert_eq!(bytes_sent, 0);
         assert_eq!(server, cor_server_peer);
@@ -446,7 +440,7 @@ async fn new_client() -> Swarm<CombinedClient> {
             identity.public().clone(),
         )),
     });
-    node.listen().with_tcp_addr_external().await;
+    node.listen().await;
     node
 }
 
@@ -490,13 +484,6 @@ async fn bootstrap() -> (Swarm<CombinedServer>, Swarm<CombinedClient>) {
     let cor_client_peer = *bob.local_peer_id();
 
     let alice_task = async {
-        let _ = alice
-            .wait(|event| match event {
-                SwarmEvent::NewExternalAddrCandidate { .. } => Some(()),
-                _ => None,
-            })
-            .await;
-
         let (dialed_peer_id, dialed_connection_id) = alice
             .wait(|event| match event {
                 SwarmEvent::Dialing {
@@ -566,3 +553,14 @@ async fn bootstrap() -> (Swarm<CombinedServer>, Swarm<CombinedClient>) {
     tokio::join!(alice_task, bob_task);
     (alice, bob)
 }
+
+fn tcp_listeners<T: NetworkBehaviour>(swarm: &Swarm<T>) -> Vec<Multiaddr> {
+    swarm
+        .listeners()
+        .filter(|addr| {
+            addr.iter()
+                .any(|protocol| matches!(protocol, Protocol::Tcp(_)))
+        })
+        .cloned()
+        .collect::<Vec<_>>()
+}
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index e7931a60de2..c5d10872d40 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.2
+
+- Don't report `NewExternalAddrCandidate` for confirmed external addresses.
+  See [PR 5582](https://github.com/libp2p/rust-libp2p/pull/5582).
+
 ## 0.45.1
 
 - Update `libp2p-swarm-derive` to version `0.35.0`, see [PR 5545]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3d0b1a84eee..cdee67f3fb3 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-swarm"
 edition = "2021"
 rust-version = { workspace = true }
 description = "The libp2p swarm"
-version = "0.45.1"
+version = "0.45.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 81b1ca1a68d..12280e99f07 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -1140,12 +1140,14 @@ where
                 self.pending_handler_event = Some((peer_id, handler, event));
             }
             ToSwarm::NewExternalAddrCandidate(addr) => {
-                self.behaviour
-                    .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
-                        NewExternalAddrCandidate { addr: &addr },
-                    ));
-                self.pending_swarm_events
-                    .push_back(SwarmEvent::NewExternalAddrCandidate { address: addr });
+                if !self.confirmed_external_addr.contains(&addr) {
+                    self.behaviour
+                        .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
+                            NewExternalAddrCandidate { addr: &addr },
+                        ));
+                    self.pending_swarm_events
+                        .push_back(SwarmEvent::NewExternalAddrCandidate { address: addr });
+                }
             }
             ToSwarm::ExternalAddrConfirmed(addr) => {
                 self.add_external_address(addr.clone());

From 89d78dda296fc3747d3760f73d4b6c558e34c8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 4 Oct 2024 14:35:08 +0100
Subject: [PATCH 382/455] chore(autonat-v2): fix dial_back_to_non_libp2p test
 (#5621)

## Description
By avoiding dialing an external address

Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
---
 protocols/autonat/tests/autonatv2.rs | 147 +++++++++++++--------------
 1 file changed, 72 insertions(+), 75 deletions(-)

diff --git a/protocols/autonat/tests/autonatv2.rs b/protocols/autonat/tests/autonatv2.rs
index 3d792172445..f22a2e51470 100644
--- a/protocols/autonat/tests/autonatv2.rs
+++ b/protocols/autonat/tests/autonatv2.rs
@@ -232,87 +232,84 @@ async fn dial_back_to_non_libp2p() {
     let (mut alice, mut bob) = bootstrap().await;
     let alice_peer_id = *alice.local_peer_id();
 
-    for addr_str in ["/ip4/169.150.247.38/tcp/32", "/ip6/::1/tcp/1000"] {
-        let addr: Multiaddr = addr_str.parse().unwrap();
-        let bob_addr = addr.clone();
-        bob.behaviour_mut()
-            .autonat
-            .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
-                NewExternalAddrCandidate { addr: &addr },
-            ));
-
-        let alice_task = async {
-            let (alice_dialing_peer, alice_conn_id) = alice
-                .wait(|event| match event {
-                    SwarmEvent::Dialing {
-                        peer_id,
-                        connection_id,
-                    } => peer_id.map(|p| (p, connection_id)),
-                    _ => None,
-                })
-                .await;
-            let mut outgoing_conn_error = alice
-                .wait(|event| match event {
-                    SwarmEvent::OutgoingConnectionError {
-                        connection_id,
-                        peer_id: Some(peer_id),
-                        error: DialError::Transport(peers),
-                    } if connection_id == alice_conn_id && peer_id == alice_dialing_peer => {
-                        Some(peers)
-                    }
-                    _ => None,
-                })
-                .await;
-
-            if let Some((multiaddr, TransportError::Other(o))) = outgoing_conn_error.pop() {
-                assert_eq!(
-                    multiaddr,
-                    addr.clone().with_p2p(alice_dialing_peer).unwrap()
-                );
-                let error_string = o.to_string();
-                assert!(
-                    error_string.contains("Connection refused"),
-                    "Correct error string: {error_string} for {addr_str}"
-                );
-            } else {
-                panic!("No outgoing connection errors");
-            }
+    let addr_str = "/ip6/::1/tcp/1000";
+    let addr: Multiaddr = addr_str.parse().unwrap();
+    let bob_addr = addr.clone();
+    bob.behaviour_mut()
+        .autonat
+        .on_swarm_event(FromSwarm::NewExternalAddrCandidate(
+            NewExternalAddrCandidate { addr: &addr },
+        ));
 
-            alice
-                .wait(|event| match event {
-                    SwarmEvent::Behaviour(CombinedServerEvent::Autonat(server::Event {
-                        all_addrs,
-                        tested_addr,
-                        client,
-                        data_amount,
-                        result: Ok(()),
-                    })) if all_addrs == vec![addr.clone()]
-                        && tested_addr == addr
-                        && alice_dialing_peer == client =>
-                    {
-                        Some(data_amount)
-                    }
-                    _ => None,
-                })
-                .await
-        };
-        let bob_task = async {
-            bob.wait(|event| match event {
-                SwarmEvent::Behaviour(CombinedClientEvent::Autonat(client::Event {
+    let alice_task = async {
+        let (alice_dialing_peer, alice_conn_id) = alice
+            .wait(|event| match event {
+                SwarmEvent::Dialing {
+                    peer_id,
+                    connection_id,
+                } => peer_id.map(|p| (p, connection_id)),
+                _ => None,
+            })
+            .await;
+        let mut outgoing_conn_error = alice
+            .wait(|event| match event {
+                SwarmEvent::OutgoingConnectionError {
+                    connection_id,
+                    peer_id: Some(peer_id),
+                    error: DialError::Transport(peers),
+                } if connection_id == alice_conn_id && peer_id == alice_dialing_peer => Some(peers),
+                _ => None,
+            })
+            .await;
+
+        if let Some((multiaddr, TransportError::Other(o))) = outgoing_conn_error.pop() {
+            assert_eq!(
+                multiaddr,
+                addr.clone().with_p2p(alice_dialing_peer).unwrap()
+            );
+            let error_string = o.to_string();
+            assert!(
+                error_string.contains("Connection refused"),
+                "Correct error string: {error_string} for {addr_str}"
+            );
+        } else {
+            panic!("No outgoing connection errors");
+        }
+
+        alice
+            .wait(|event| match event {
+                SwarmEvent::Behaviour(CombinedServerEvent::Autonat(server::Event {
+                    all_addrs,
                     tested_addr,
-                    bytes_sent,
-                    server,
-                    result: Err(_),
-                })) if tested_addr == bob_addr && server == alice_peer_id => Some(bytes_sent),
+                    client,
+                    data_amount,
+                    result: Ok(()),
+                })) if all_addrs == vec![addr.clone()]
+                    && tested_addr == addr
+                    && alice_dialing_peer == client =>
+                {
+                    Some(data_amount)
+                }
                 _ => None,
             })
             .await
-        };
+    };
+    let bob_task = async {
+        bob.wait(|event| match event {
+            SwarmEvent::Behaviour(CombinedClientEvent::Autonat(client::Event {
+                tested_addr,
+                bytes_sent,
+                server,
+                result: Err(_),
+            })) if tested_addr == bob_addr && server == alice_peer_id => Some(bytes_sent),
+            _ => None,
+        })
+        .await
+    };
 
-        let (alice_bytes_sent, bob_bytes_sent) = tokio::join!(alice_task, bob_task);
-        assert_eq!(alice_bytes_sent, bob_bytes_sent);
-        bob.behaviour_mut().autonat.validate_addr(&addr);
-    }
+    let (alice_bytes_sent, bob_bytes_sent) = tokio::join!(alice_task, bob_task);
+    assert_eq!(alice_bytes_sent, bob_bytes_sent);
+    bob.behaviour_mut().autonat.validate_addr(&addr);
 }
 
 #[tokio::test]

From b83dd95c384fefc0aca489f5ffefa74c72db0d9d Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:50:57 +0200
Subject: [PATCH 383/455] chore: update interop test run condition (#5611)

## Description

Follow up to https://github.com/libp2p/rust-libp2p/pull/5604. Interop
tests only work on the main `rust-libp2p` repo, and not on forks,
because of the S3 cache (introduced in
https://github.com/libp2p/rust-libp2p/pull/5586).

The interop tests currently don't run in the PRs, but they run after the
PRs are merged to `master`. This PR is trying to run interop tests in PR
that are branches of the main repo (not forks).
---
 .github/workflows/interop-test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml
index 558adcda66c..57d0f1a692d 100644
--- a/.github/workflows/interop-test.yml
+++ b/.github/workflows/interop-test.yml
@@ -11,6 +11,7 @@ concurrency:
 jobs:
   run-transport-interop:
     name: Run transport interoperability tests
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ${{ fromJSON(github.repository == 'libp2p/rust-libp2p' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }}
     strategy:
       matrix:
@@ -39,6 +40,7 @@ jobs:
           worker-count: 16
   run-holepunching-interop:
     name: Run hole-punch interoperability tests
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ${{ fromJSON(github.repository == 'libp2p/rust-libp2p' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }}
     steps:
       - uses: actions/checkout@v4

From 7669b1696bf62fa82e2a1da959cf537dc98959ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 4 Oct 2024 15:45:16 +0100
Subject: [PATCH 384/455] deps: update metrics example dependencies (#5617)

## Description

and address cargo-deny
[RUSTSEC-2024-0376](https://rustsec.org/advisories/RUSTSEC-2024-0376.html)
---
 Cargo.lock                   | 196 +++++++++++++----------------------
 examples/metrics/Cargo.toml  |   8 +-
 examples/metrics/src/main.rs |   8 +-
 3 files changed, 80 insertions(+), 132 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79eb2eb4ad5..38c3436237a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -545,34 +545,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "axum"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core 0.3.4",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.27",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper 0.1.2",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum"
 version = "0.7.5"
@@ -580,13 +552,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
- "axum-core 0.4.3",
+ "axum-core",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.4.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -607,23 +579,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 0.2.9",
- "http-body 0.4.5",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum-core"
 version = "0.4.3"
@@ -633,7 +588,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "mime",
@@ -779,7 +734,7 @@ name = "browser-webrtc-example"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.5",
+ "axum",
  "futures",
  "js-sys",
  "libp2p",
@@ -1940,7 +1895,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "indexmap 2.2.1",
  "slab",
  "tokio",
@@ -2131,9 +2086,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -2158,7 +2113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.0.0",
+ "http 1.1.0",
 ]
 
 [[package]]
@@ -2169,7 +2124,7 @@ checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
 ]
@@ -2224,20 +2179,21 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.1.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "h2 0.4.4",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "smallvec",
  "tokio",
  "want",
 ]
@@ -2249,8 +2205,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
- "http 1.0.0",
- "hyper 1.1.0",
+ "http 1.1.0",
+ "hyper 1.4.1",
  "hyper-util",
  "rustls 0.22.4",
  "rustls-pki-types",
@@ -2261,14 +2217,15 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
 dependencies = [
- "hyper 0.14.27",
+ "hyper 1.4.1",
+ "hyper-util",
  "pin-project-lite",
  "tokio",
- "tokio-io-timeout",
+ "tower-service",
 ]
 
 [[package]]
@@ -2279,7 +2236,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.4.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2289,20 +2246,19 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.1.0",
+ "hyper 1.4.1",
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -2456,7 +2412,7 @@ name = "interop-tests"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum 0.7.5",
+ "axum",
  "console_error_panic_hook",
  "either",
  "futures",
@@ -3295,7 +3251,7 @@ dependencies = [
 name = "libp2p-server"
 version = "0.12.7"
 dependencies = [
- "axum 0.7.5",
+ "axum",
  "base64 0.22.1",
  "clap",
  "futures",
@@ -3774,16 +3730,16 @@ dependencies = [
 name = "metrics-example"
 version = "0.1.0"
 dependencies = [
- "axum 0.7.5",
+ "axum",
  "futures",
  "libp2p",
- "opentelemetry 0.23.0",
+ "opentelemetry 0.25.0",
  "opentelemetry-otlp",
- "opentelemetry_sdk 0.23.0",
+ "opentelemetry_sdk 0.25.0",
  "prometheus-client",
  "tokio",
  "tracing",
- "tracing-opentelemetry 0.24.0",
+ "tracing-opentelemetry 0.26.0",
  "tracing-subscriber",
 ]
 
@@ -4198,9 +4154,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76"
+checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -4228,16 +4184,16 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.16.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54"
+checksum = "596b1719b3cab83addb20bcbffdf21575279d9436d9ccccfe651a3bf0ab5ab06"
 dependencies = [
  "async-trait",
  "futures-core",
- "http 0.2.9",
- "opentelemetry 0.23.0",
+ "http 1.1.0",
+ "opentelemetry 0.25.0",
  "opentelemetry-proto",
- "opentelemetry_sdk 0.23.0",
+ "opentelemetry_sdk 0.25.0",
  "prost",
  "thiserror",
  "tokio",
@@ -4246,12 +4202,12 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.6.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162"
+checksum = "2c43620e8f93359eb7e627a3b16ee92d8585774986f24f2ab010817426c5ce61"
 dependencies = [
- "opentelemetry 0.23.0",
- "opentelemetry_sdk 0.23.0",
+ "opentelemetry 0.25.0",
+ "opentelemetry_sdk 0.25.0",
  "prost",
  "tonic",
 ]
@@ -4289,21 +4245,20 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd"
+checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82"
 dependencies = [
  "async-trait",
  "futures-channel",
  "futures-executor",
  "futures-util",
  "glob",
- "lazy_static",
  "once_cell",
- "opentelemetry 0.23.0",
- "ordered-float 4.2.0",
+ "opentelemetry 0.25.0",
  "percent-encoding",
  "rand 0.8.5",
+ "serde_json",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -4618,9 +4573,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -4628,9 +4583,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
 dependencies = [
  "anyhow",
  "itertools",
@@ -4978,10 +4933,10 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.4.4",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.4.1",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -5965,7 +5920,7 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "futures",
- "http 1.0.0",
+ "http 1.1.0",
  "indexmap 2.2.1",
  "parking_lot",
  "paste",
@@ -6120,16 +6075,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "2.3.0"
@@ -6164,9 +6109,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6223,23 +6168,26 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.11.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum 0.6.20",
- "base64 0.21.7",
+ "axum",
+ "base64 0.22.1",
  "bytes",
- "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.27",
+ "h2 0.4.4",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.4.1",
  "hyper-timeout",
+ "hyper-util",
  "percent-encoding",
  "pin-project",
  "prost",
+ "socket2 0.5.7",
  "tokio",
  "tokio-stream",
  "tower",
@@ -6277,7 +6225,7 @@ dependencies = [
  "bitflags 2.4.1",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "http-range-header",
@@ -6369,14 +6317,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4"
+checksum = "5eabc56d23707ad55ba2a0750fc24767125d5a0f51993ba41ad2c441cc7b8dea"
 dependencies = [
  "js-sys",
  "once_cell",
- "opentelemetry 0.23.0",
- "opentelemetry_sdk 0.23.0",
+ "opentelemetry 0.25.0",
+ "opentelemetry_sdk 0.25.0",
  "smallvec",
  "tracing",
  "tracing-core",
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 2b82668f52a..129b1abb1f3 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -12,13 +12,13 @@ release = false
 futures = { workspace = true }
 axum = "0.7"
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
-opentelemetry = { version = "0.23.0", features = ["metrics"] }
-opentelemetry-otlp = { version = "0.16.0", features = ["metrics"] }
-opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio", "metrics"] }
+opentelemetry = { version = "0.25.0", features = ["metrics"] }
+opentelemetry-otlp = { version = "0.25.0", features = ["metrics"] }
+opentelemetry_sdk = { version = "0.25.0", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
-tracing-opentelemetry = "0.24.0"
+tracing-opentelemetry = "0.26.0"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/metrics/src/main.rs b/examples/metrics/src/main.rs
index 99a9ca66aaf..1755c769053 100644
--- a/examples/metrics/src/main.rs
+++ b/examples/metrics/src/main.rs
@@ -25,7 +25,7 @@ use libp2p::core::Multiaddr;
 use libp2p::metrics::{Metrics, Recorder};
 use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
 use libp2p::{identify, identity, noise, ping, tcp, yamux};
-use opentelemetry::KeyValue;
+use opentelemetry::{trace::TracerProvider, KeyValue};
 use prometheus_client::registry::Registry;
 use std::error::Error;
 use std::time::Duration;
@@ -90,7 +90,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 }
 
 fn setup_tracing() -> Result<(), Box<dyn Error>> {
-    let tracer = opentelemetry_otlp::new_pipeline()
+    let provider = opentelemetry_otlp::new_pipeline()
         .tracing()
         .with_exporter(opentelemetry_otlp::new_exporter().tonic())
         .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
@@ -102,10 +102,10 @@ fn setup_tracing() -> Result<(), Box<dyn Error>> {
         .with(tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()))
         .with(
             tracing_opentelemetry::layer()
-                .with_tracer(tracer)
+                .with_tracer(provider.tracer("libp2p-subscriber"))
                 .with_filter(EnvFilter::from_default_env()),
         )
-        .try_init()?;
+        .init();
 
     Ok(())
 }

From fcff3f80401895362060f8e448ec992b6db7fb9b Mon Sep 17 00:00:00 2001
From: P1R0 <p1r0@nethunters.xyz>
Date: Fri, 4 Oct 2024 16:40:47 -0600
Subject: [PATCH 385/455] refactor(examples): use tokio instead of async-std in
 relay-server (#5600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->
Following on issue #4449
refactor: use tokio instead of async-std in the relay-servert example
and remove unnecessary dependencies
## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->
Fails on testing with the [whole punch
tutorial](https://docs.rs/libp2p/0.54.1/libp2p/tutorials/hole_punching/index.html)
possibly because of my networking topology. connection established event
registered.

I will publish the logs and testing information as a comment

## Change checklist
* Removed unnecessary dependencies on examples/relay-server/Cargo.toml
* Updated tokio version  to "1.37.0"
<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: David E. Perez Negron R. <david@nethunters.xyz>
Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Co-authored-by: João Oliveira <hello@jxs.pt>
---
 Cargo.lock                        |  3 +--
 examples/relay-server/Cargo.toml  |  5 ++--
 examples/relay-server/src/main.rs | 42 +++++++++++++++----------------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38c3436237a..91767968898 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4901,11 +4901,10 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 name = "relay-server-example"
 version = "0.1.0"
 dependencies = [
- "async-std",
- "async-trait",
  "clap",
  "futures",
  "libp2p",
+ "tokio",
  "tracing",
  "tracing-subscriber",
 ]
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 12d3e2467ce..7385cf6c033 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -10,10 +10,9 @@ release = false
 
 [dependencies]
 clap = { version = "4.5.6", features = ["derive"] }
-async-std = { version = "1.12", features = ["attributes"] }
-async-trait = "0.1"
+tokio = { version = "1.37.0", features = ["full"] }
 futures = { workspace = true }
-libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
+libp2p = { path = "../../libp2p", features = ["tokio", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/examples/relay-server/src/main.rs b/examples/relay-server/src/main.rs
index bf5817454f8..46a122d0717 100644
--- a/examples/relay-server/src/main.rs
+++ b/examples/relay-server/src/main.rs
@@ -22,8 +22,7 @@
 #![doc = include_str!("../README.md")]
 
 use clap::Parser;
-use futures::executor::block_on;
-use futures::stream::StreamExt;
+use futures::StreamExt;
 use libp2p::{
     core::multiaddr::Protocol,
     core::Multiaddr,
@@ -35,7 +34,8 @@ use std::error::Error;
 use std::net::{Ipv4Addr, Ipv6Addr};
 use tracing_subscriber::EnvFilter;
 
-fn main() -> Result<(), Box<dyn Error>> {
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
         .try_init();
@@ -46,7 +46,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let local_key: identity::Keypair = generate_ed25519(opt.secret_key_seed);
 
     let mut swarm = libp2p::SwarmBuilder::with_existing_identity(local_key)
-        .with_async_std()
+        .with_tokio()
         .with_tcp(
             tcp::Config::default(),
             noise::Config::new,
@@ -81,27 +81,25 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with(Protocol::QuicV1);
     swarm.listen_on(listen_addr_quic)?;
 
-    block_on(async {
-        loop {
-            match swarm.next().await.expect("Infinite Stream.") {
-                SwarmEvent::Behaviour(event) => {
-                    if let BehaviourEvent::Identify(identify::Event::Received {
-                        info: identify::Info { observed_addr, .. },
-                        ..
-                    }) = &event
-                    {
-                        swarm.add_external_address(observed_addr.clone());
-                    }
-
-                    println!("{event:?}")
+    loop {
+        match swarm.next().await.expect("Infinite Stream.") {
+            SwarmEvent::Behaviour(event) => {
+                if let BehaviourEvent::Identify(identify::Event::Received {
+                    info: identify::Info { observed_addr, .. },
+                    ..
+                }) = &event
+                {
+                    swarm.add_external_address(observed_addr.clone());
                 }
-                SwarmEvent::NewListenAddr { address, .. } => {
-                    println!("Listening on {address:?}");
-                }
-                _ => {}
+
+                println!("{event:?}")
+            }
+            SwarmEvent::NewListenAddr { address, .. } => {
+                println!("Listening on {address:?}");
             }
+            _ => {}
         }
-    })
+    }
 }
 
 #[derive(NetworkBehaviour)]

From 93ad28c4cce236b1657241ba623ea30077565afd Mon Sep 17 00:00:00 2001
From: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 01:07:49 +0200
Subject: [PATCH 386/455] fix(server): removing dependency on libp2p-lookup
 (#5610)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

Remove dependency on
[`libp2p-lookup`](https://github.com/mxinden/libp2p-lookup) which is no
longer maintained, and [makes checks
fail](https://github.com/libp2p/rust-libp2p/actions/runs/11016492372/job/30628121728).

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: João Oliveira <hello@jxs.pt>
---
 Cargo.lock               |  2 +-
 Cargo.toml               |  8 ++++++--
 misc/server/CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 misc/server/Cargo.toml   | 20 ++++++++++++++++++--
 misc/server/Dockerfile   |  2 --
 misc/server/README.md    |  7 -------
 6 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 91767968898..28107c00ee9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3249,7 +3249,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-server"
-version = "0.12.7"
+version = "0.12.8"
 dependencies = [
  "axum",
  "base64 0.22.1",
diff --git a/Cargo.toml b/Cargo.toml
index 32f72c5e252..cc677013fa9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,7 @@ libp2p-quic = { version = "0.11.1", path = "transports/quic" }
 libp2p-relay = { version = "0.18.0", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" }
-libp2p-server = { version = "0.12.7", path = "misc/server" }
+libp2p-server = { version = "0.12.8", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
@@ -151,4 +151,8 @@ clippy.manual_let_else = "warn"
 clippy.dbg_macro = "warn"
 
 [workspace.metadata.release]
-pre-release-hook = ["/bin/sh", '-c', '/bin/sh $WORKSPACE_ROOT/scripts/add-changelog-header.sh'] # Nested use of shell to expand variables.
+pre-release-hook = [
+    "/bin/sh",
+    '-c',
+    '/bin/sh $WORKSPACE_ROOT/scripts/add-changelog-header.sh',
+] # Nested use of shell to expand variables.
diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
index 5369163460c..fe48de0f553 100644
--- a/misc/server/CHANGELOG.md
+++ b/misc/server/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.12.8
+
+### Changed
+
+- Remove deprecated [`libp2p-lookup`](https://github.com/mxinden/libp2p-lookup) from Dockerfile.
+  See [PR 5610](https://github.com/libp2p/rust-libp2p/pull/5610).
+
 ## 0.12.7
 
 ### Changed
@@ -31,6 +38,7 @@
 ## 0.12.3
 
 ### Changed
+
 - Add libp2p-lookup to Dockerfile to enable healthchecks.
 
 ### Fixed
@@ -42,14 +50,18 @@
 [PR 4467]: https://github.com/libp2p/rust-libp2p/pull/4467
 
 ## 0.12.2
+
 ### Fixed
+
 - Adhere to `--metrics-path` flag and listen on `0.0.0.0:8888` (default IPFS metrics port).
   [PR 4392]
 
 [PR 4392]: https://github.com/libp2p/rust-libp2p/pull/4392
 
 ## 0.12.1
+
 ### Changed
+
 - Move to tokio and hyper.
   See [PR 4311].
 - Move to distroless Docker base image.
@@ -58,39 +70,57 @@
 [PR 4311]: https://github.com/libp2p/rust-libp2p/pull/4311
 
 ## 0.8.0
+
 ### Changed
+
 - Remove mplex support.
 
 ## 0.7.0
+
 ### Changed
+
 - Update to libp2p v0.47.0.
 
 ## 0.6.0 - 2022-05-05
+
 ### Changed
+
 - Update to libp2p v0.44.0.
 
 ## 0.5.4 - 2022-01-11
+
 ### Changed
+
 - Pull latest autonat changes.
 
 ## 0.5.3 - 2021-12-25
+
 ### Changed
+
 - Update dependencies.
 - Pull in autonat fixes.
 
 ## 0.5.2 - 2021-12-20
+
 ### Added
+
 - Add support for libp2p autonat protocol via `--enable-autonat`.
 
 ## 0.5.1 - 2021-12-20
+
 ### Fixed
+
 - Update dependencies.
 - Fix typo in command line flag `--enable-kademlia`.
 
 ## 0.5.0 - 2021-11-18
+
 ### Changed
+
 - Disable Kademlia protocol by default.
 
 ## 0.4.0 - 2021-11-18
+
 ### Fixed
+
 - Update dependencies.
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 798ecfa07a9..0954e2f38d8 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-server"
-version = "0.12.7"
+version = "0.12.8"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -16,7 +16,23 @@ clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 futures-timer = "3"
 axum = "0.7"
-libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
+libp2p = { workspace = true, features = [
+    "autonat",
+    "dns",
+    "tokio",
+    "noise",
+    "tcp",
+    "yamux",
+    "identify",
+    "kad",
+    "ping",
+    "relay",
+    "metrics",
+    "rsa",
+    "macros",
+    "quic",
+    "websocket",
+] }
 prometheus-client = { workspace = true }
 serde = "1.0.203"
 serde_derive = "1.0.125"
diff --git a/misc/server/Dockerfile b/misc/server/Dockerfile
index 24ae2b9fd99..12a8982eb3f 100644
--- a/misc/server/Dockerfile
+++ b/misc/server/Dockerfile
@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1.5-labs
 FROM rust:1.81.0 as chef
 RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
-RUN cargo install --locked --root /usr/local libp2p-lookup --version 0.6.4
 WORKDIR /app
 
 FROM chef AS planner
@@ -17,5 +16,4 @@ COPY . .
 RUN cargo build --release --package libp2p-server
 
 FROM gcr.io/distroless/cc
-COPY --from=builder /usr/local/bin/libp2p-server /usr/local/bin/libp2p-lookup /usr/local/bin/
 CMD ["libp2p-server"]
diff --git a/misc/server/README.md b/misc/server/README.md
index 0da1bd8abd9..f9a5d65124a 100644
--- a/misc/server/README.md
+++ b/misc/server/README.md
@@ -25,7 +25,6 @@ Options:
   -h, --help                         Print help
 ```
 
-
 ```
 cargo run -- --config ~/.ipfs/config
 
@@ -33,9 +32,3 @@ Local peer id: PeerId("12D3KooWSa1YEeQVSwvoqAMhwjKQ6kqZQckhWPb3RWEGV3sZGU6Z")
 Listening on "/ip4/127.0.0.1/udp/4001/quic"
 [...]
 ```
-
-The Docker container includes [libp2-lookup](https://github.com/mxinden/libp2p-lookup/) to enable adding a proper healthcheck for container startup, e.g.
-
-``` shell
-docker run --health-cmd 'libp2p-lookup direct --address /ip4/127.0.0.1/tcp/4001/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa' /home/ipfs/.ipfs:/ipfs ghcr.io/libp2p/rust-libp2p-server --config /ipfs/config
-```

From 9a45db3f82b760c93099e66ec77a7a772d1f6cd3 Mon Sep 17 00:00:00 2001
From: Darius Clark <dariusc93@users.noreply.github.com>
Date: Tue, 8 Oct 2024 10:16:59 -0400
Subject: [PATCH 387/455] chore: update igd-next to 0.15.1 (#5625)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

Resolves #5506.

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates
---
 Cargo.lock                  | 102 +++++++++---------------------------
 Cargo.toml                  |   2 +-
 protocols/upnp/CHANGELOG.md |   4 ++
 protocols/upnp/Cargo.toml   |   4 +-
 4 files changed, 32 insertions(+), 80 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 28107c00ee9..3d77ed104dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -556,9 +556,9 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "itoa",
  "matchit",
@@ -589,7 +589,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "http-body-util",
  "mime",
  "pin-project-lite",
@@ -1865,25 +1865,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.9",
- "indexmap 2.2.1",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "h2"
 version = "0.4.4"
@@ -2095,17 +2076,6 @@ dependencies = [
  "itoa",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http 0.2.9",
- "pin-project-lite",
-]
-
 [[package]]
 name = "http-body"
 version = "1.0.0"
@@ -2125,7 +2095,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -2153,30 +2123,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
-[[package]]
-name = "hyper"
-version = "0.14.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.4.9",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
 [[package]]
 name = "hyper"
 version = "1.4.1"
@@ -2186,9 +2132,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.4",
+ "h2",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "httparse",
  "httpdate",
  "itoa",
@@ -2206,7 +2152,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "rustls 0.22.4",
  "rustls-pki-types",
@@ -2221,7 +2167,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
 dependencies = [
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -2236,7 +2182,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2254,8 +2200,8 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
- "hyper 1.4.1",
+ "http-body",
+ "hyper",
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
@@ -2326,16 +2272,18 @@ dependencies = [
 
 [[package]]
 name = "igd-next"
-version = "0.14.3"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4"
+checksum = "76b0d7d4541def58a37bf8efc559683f21edce7c82f0d866c93ac21f7e098f93"
 dependencies = [
  "async-trait",
  "attohttpc",
  "bytes",
  "futures",
- "http 0.2.9",
- "hyper 0.14.27",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
  "log",
  "rand 0.8.5",
  "tokio",
@@ -3399,7 +3347,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-upnp"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -4931,11 +4879,11 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.4",
+ "h2",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -6176,11 +6124,11 @@ dependencies = [
  "axum",
  "base64 0.22.1",
  "bytes",
- "h2 0.4.4",
+ "h2",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-timeout",
  "hyper-util",
  "percent-encoding",
@@ -6225,7 +6173,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
  "http-body-util",
  "http-range-header",
  "httpdate",
diff --git a/Cargo.toml b/Cargo.toml
index cc677013fa9..9e18af5f706 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -108,7 +108,7 @@ libp2p-swarm-test = { version = "0.4.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.5.0", path = "transports/tls" }
 libp2p-uds = { version = "0.41.0", path = "transports/uds" }
-libp2p-upnp = { version = "0.3.0", path = "protocols/upnp" }
+libp2p-upnp = { version = "0.3.1", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
diff --git a/protocols/upnp/CHANGELOG.md b/protocols/upnp/CHANGELOG.md
index 21e90f9534b..d9c24f8efcc 100644
--- a/protocols/upnp/CHANGELOG.md
+++ b/protocols/upnp/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1
+- update igd-next to 0.15.1.
+  See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/XXXX).
+
 ## 0.3.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index e9c7414236d..209733f53e6 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-upnp"
 edition = "2021"
 rust-version = "1.60.0"
 description = "UPnP support for libp2p transports"
-version = "0.3.0"
+version = "0.3.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
@@ -13,7 +13,7 @@ publish = true
 [dependencies]
 futures = { workspace = true }
 futures-timer = "3.0.3"
-igd-next = "0.14.3"
+igd-next = "0.15.1"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 tokio = { workspace = true, default-features = false, features = ["rt"], optional = true }

From d3228adf64cf68f419eeb0b18a5c0b762d29abbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 09:00:56 +0000
Subject: [PATCH 388/455] deps: bump Swatinem/rust-cache from 2.7.3 to 2.7.5
 (#5633)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [Swatinem/rust-cache](https://github.com/swatinem/rust-cache) from
2.7.3 to 2.7.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/swatinem/rust-cache/releases">Swatinem/rust-cache's
releases</a>.</em></p>
<blockquote>
<h2>v2.7.5</h2>
<h2>What's Changed</h2>
<ul>
<li>Upgrade checkout action from version 3 to 4 by <a
href="https://github.com/carsten-wenderdel"><code>@​carsten-wenderdel</code></a>
in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/190">Swatinem/rust-cache#190</a></li>
<li>fix: usage of <code>deprecated</code> version of <code>node</code>
by <a href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a>
in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/197">Swatinem/rust-cache#197</a></li>
<li>Only run macOsWorkaround() on macOS by <a
href="https://github.com/heksesang"><code>@​heksesang</code></a> in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/206">Swatinem/rust-cache#206</a></li>
<li>Support Cargo.lock format cargo-lock v4 by <a
href="https://github.com/NobodyXu"><code>@​NobodyXu</code></a> in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/211">Swatinem/rust-cache#211</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/carsten-wenderdel"><code>@​carsten-wenderdel</code></a>
made their first contribution in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/190">Swatinem/rust-cache#190</a></li>
<li><a
href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a> made
their first contribution in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/197">Swatinem/rust-cache#197</a></li>
<li><a href="https://github.com/heksesang"><code>@​heksesang</code></a>
made their first contribution in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/206">Swatinem/rust-cache#206</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/Swatinem/rust-cache/compare/v2.7.3...v2.7.5">https://github.com/Swatinem/rust-cache/compare/v2.7.3...v2.7.5</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/82a92a6e8fbeee089604da2575dc567ae9ddeaab"><code>82a92a6</code></a>
2.7.5</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/598fe25fa107b2fd526fc6471f6e48de7cd12083"><code>598fe25</code></a>
update dependencies, rebuild</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/8f842c2d455cfe3d0d5a4b28f53f5389b51b71bf"><code>8f842c2</code></a>
Support Cargo.lock format cargo-lock v4 (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/211">#211</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/96a8d65dbafbc7d145a9b2b6c3b12ee335738cd2"><code>96a8d65</code></a>
Only run macOsWorkaround() on macOS (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/206">#206</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/9bdad043e88c75890e36ad3bbc8d27f0090dd609"><code>9bdad04</code></a>
fix: usage of <code>deprecated</code> version of <code>node</code> (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/197">#197</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/f7a52f691454d93c6ce0dff6666a5cb399b8d06e"><code>f7a52f6</code></a>
&quot;add jsonpath test&quot;</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/2bceda39122b2cc71e6e26ad729b92b44d101f4b"><code>2bceda3</code></a>
&quot;update dependencies&quot;</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/640a22190e7a783d4c409684cea558f081f92012"><code>640a221</code></a>
Upgrade checkout action from version 3 to 4 (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/190">#190</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/158274163087d4d4d49dfcc6a39806493e413240"><code>1582741</code></a>
update dependencies</li>
<li>See full diff in <a
href="https://github.com/swatinem/rust-cache/compare/23bce251a8cd2ffc3c1075eaa2367cf899916d84...82a92a6e8fbeee089604da2575dc567ae9ddeaab">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Swatinem/rust-cache&package-manager=github_actions&previous-version=2.7.3&new-version=2.7.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cache-factory.yml |  2 +-
 .github/workflows/ci.yml            | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cache-factory.yml b/.github/workflows/cache-factory.yml
index 8c49b335f1b..7623b56f450 100644
--- a/.github/workflows/cache-factory.yml
+++ b/.github/workflows/cache-factory.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           shared-key: stable-cache
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c1dfc8aaef..daee569d047 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           shared-key: stable-cache
           save-if: false
@@ -149,7 +149,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           key: ${{ matrix.target }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -174,7 +174,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -195,7 +195,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           key: ${{ matrix.features }}
           save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -212,7 +212,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -238,7 +238,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -254,7 +254,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           save-if: ${{ github.ref == 'refs/heads/master' }}
 
@@ -273,7 +273,7 @@ jobs:
 
       - uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           shared-key: stable-cache
           save-if: false
@@ -365,7 +365,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
 
       - run: cargo install --version 0.10.0 pb-rs --locked
 
@@ -391,7 +391,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
       - run: cargo metadata --locked --format-version=1 > /dev/null
 
   cargo-deny:

From 812a7cdf5d229610bb8eda1f106eee5ac3f699d2 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Wed, 16 Oct 2024 01:32:02 +0800
Subject: [PATCH 389/455] feat: make runtime features optional in swarm-test
 (#5551)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

Sometimes a test uses custom swarm building logic and doesn't need `fn
new_ephemeral`, and sometimes a test uses `tokio` runtime other than
`async-std`.
This PR adds the `tokio` runtime support and makes both `async-std` and
`tokio` runtimes optional behind features to make it more flexible.

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: João Oliveira <hello@jxs.pt>
---
 Cargo.lock              |  2 +-
 Cargo.toml              |  2 +-
 swarm-test/CHANGELOG.md |  7 +++++
 swarm-test/Cargo.toml   | 12 +++++--
 swarm-test/src/lib.rs   | 69 ++++++++++++++++++++++++++++++++---------
 5 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d77ed104dc..40ff97009de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3278,7 +3278,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-test"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "async-trait",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index 9e18af5f706..7b52e4a7b42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ libp2p-server = { version = "0.12.8", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
-libp2p-swarm-test = { version = "0.4.0", path = "swarm-test" }
+libp2p-swarm-test = { version = "0.4.1", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.5.0", path = "transports/tls" }
 libp2p-uds = { version = "0.41.0", path = "transports/uds" }
diff --git a/swarm-test/CHANGELOG.md b/swarm-test/CHANGELOG.md
index 98027fcbea2..33eebb2412c 100644
--- a/swarm-test/CHANGELOG.md
+++ b/swarm-test/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.4.1
+
+- Add `tokio` runtime support and make `tokio` and `async-std` runtimes optional behind features.
+  See [PR 5551].
+
+[PR 5551]: https://github.com/libp2p/rust-libp2p/pull/5551
+
 ## 0.4.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index b285da34f87..fa51454dd58 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-swarm-test"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 rust-version = { workspace = true }
 license = "MIT"
@@ -16,13 +16,19 @@ async-trait = "0.1.80"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
-libp2p-swarm = { workspace = true, features = ["async-std"] }
-libp2p-tcp = { workspace = true, features = ["async-io"] }
+libp2p-swarm = { workspace = true }
+libp2p-tcp = { workspace = true }
 libp2p-yamux = { workspace = true }
 futures = { workspace = true }
 rand = "0.8.5"
 tracing = { workspace = true }
 futures-timer = "3.0.3"
 
+[features]
+default = ["async-std"]
+
+async-std = ["libp2p-swarm/async-std", "libp2p-tcp/async-io"]
+tokio = ["libp2p-swarm/tokio", "libp2p-tcp/tokio"]
+
 [lints]
 workspace = true
diff --git a/swarm-test/src/lib.rs b/swarm-test/src/lib.rs
index 48f5bcbf4ef..bcab6e5b700 100644
--- a/swarm-test/src/lib.rs
+++ b/swarm-test/src/lib.rs
@@ -21,14 +21,10 @@
 use async_trait::async_trait;
 use futures::future::{BoxFuture, Either};
 use futures::{FutureExt, StreamExt};
-use libp2p_core::{
-    multiaddr::Protocol, transport::MemoryTransport, upgrade::Version, Multiaddr, Transport,
-};
-use libp2p_identity::{Keypair, PeerId};
-use libp2p_plaintext as plaintext;
+use libp2p_core::{multiaddr::Protocol, Multiaddr};
+use libp2p_identity::PeerId;
 use libp2p_swarm::dial_opts::PeerCondition;
-use libp2p_swarm::{self as swarm, dial_opts::DialOpts, NetworkBehaviour, Swarm, SwarmEvent};
-use libp2p_yamux as yamux;
+use libp2p_swarm::{dial_opts::DialOpts, NetworkBehaviour, Swarm, SwarmEvent};
 use std::fmt::Debug;
 use std::future::IntoFuture;
 use std::time::Duration;
@@ -38,12 +34,23 @@ use std::time::Duration;
 pub trait SwarmExt {
     type NB: NetworkBehaviour;
 
-    /// Create a new [`Swarm`] with an ephemeral identity.
+    /// Create a new [`Swarm`] with an ephemeral identity and the `async-std` runtime.
     ///
-    /// The swarm will use a [`MemoryTransport`] together with a [`plaintext::Config`] authentication layer and
-    /// [`yamux::Config`] as the multiplexer. However, these details should not be relied upon by the test
+    /// The swarm will use a [`libp2p_core::transport::MemoryTransport`] together with a [`libp2p_plaintext::Config`] authentication layer and
+    /// [`libp2p_yamux::Config`] as the multiplexer. However, these details should not be relied upon by the test
     /// and may change at any time.
-    fn new_ephemeral(behaviour_fn: impl FnOnce(Keypair) -> Self::NB) -> Self
+    #[cfg(feature = "async-std")]
+    fn new_ephemeral(behaviour_fn: impl FnOnce(libp2p_identity::Keypair) -> Self::NB) -> Self
+    where
+        Self: Sized;
+
+    /// Create a new [`Swarm`] with an ephemeral identity and the `tokio` runtime.
+    ///
+    /// The swarm will use a [`libp2p_core::transport::MemoryTransport`] together with a [`libp2p_plaintext::Config`] authentication layer and
+    /// [`libp2p_yamux::Config`] as the multiplexer. However, these details should not be relied upon by the test
+    /// and may change at any time.
+    #[cfg(feature = "tokio")]
+    fn new_ephemeral_tokio(behaviour_fn: impl FnOnce(libp2p_identity::Keypair) -> Self::NB) -> Self
     where
         Self: Sized;
 
@@ -200,18 +207,50 @@ where
 {
     type NB = B;
 
-    fn new_ephemeral(behaviour_fn: impl FnOnce(Keypair) -> Self::NB) -> Self
+    #[cfg(feature = "async-std")]
+    fn new_ephemeral(behaviour_fn: impl FnOnce(libp2p_identity::Keypair) -> Self::NB) -> Self
     where
         Self: Sized,
     {
+        use libp2p_core::{transport::MemoryTransport, upgrade::Version, Transport as _};
+        use libp2p_identity::Keypair;
+
         let identity = Keypair::generate_ed25519();
         let peer_id = PeerId::from(identity.public());
 
         let transport = MemoryTransport::default()
             .or_transport(libp2p_tcp::async_io::Transport::default())
             .upgrade(Version::V1)
-            .authenticate(plaintext::Config::new(&identity))
-            .multiplex(yamux::Config::default())
+            .authenticate(libp2p_plaintext::Config::new(&identity))
+            .multiplex(libp2p_yamux::Config::default())
+            .timeout(Duration::from_secs(20))
+            .boxed();
+
+        Swarm::new(
+            transport,
+            behaviour_fn(identity),
+            peer_id,
+            libp2p_swarm::Config::with_async_std_executor()
+                .with_idle_connection_timeout(Duration::from_secs(5)), // Some tests need connections to be kept alive beyond what the individual behaviour configures.,
+        )
+    }
+
+    #[cfg(feature = "tokio")]
+    fn new_ephemeral_tokio(behaviour_fn: impl FnOnce(libp2p_identity::Keypair) -> Self::NB) -> Self
+    where
+        Self: Sized,
+    {
+        use libp2p_core::{transport::MemoryTransport, upgrade::Version, Transport as _};
+        use libp2p_identity::Keypair;
+
+        let identity = Keypair::generate_ed25519();
+        let peer_id = PeerId::from(identity.public());
+
+        let transport = MemoryTransport::default()
+            .or_transport(libp2p_tcp::tokio::Transport::default())
+            .upgrade(Version::V1)
+            .authenticate(libp2p_plaintext::Config::new(&identity))
+            .multiplex(libp2p_yamux::Config::default())
             .timeout(Duration::from_secs(20))
             .boxed();
 
@@ -219,7 +258,7 @@ where
             transport,
             behaviour_fn(identity),
             peer_id,
-            swarm::Config::with_async_std_executor()
+            libp2p_swarm::Config::with_tokio_executor()
                 .with_idle_connection_timeout(Duration::from_secs(5)), // Some tests need connections to be kept alive beyond what the individual behaviour configures.,
         )
     }

From 524d7f1560d084b14b0ec53563f13ec8c4b7bcf3 Mon Sep 17 00:00:00 2001
From: yanziseeker <153156292+AdventureSeeker987@users.noreply.github.com>
Date: Wed, 23 Oct 2024 07:52:20 +0800
Subject: [PATCH 390/455] chore: fix typo in comment (#5643)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates
---
 protocols/kad/src/query/peers/fixed.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protocols/kad/src/query/peers/fixed.rs b/protocols/kad/src/query/peers/fixed.rs
index b34f7516801..2d0b312454d 100644
--- a/protocols/kad/src/query/peers/fixed.rs
+++ b/protocols/kad/src/query/peers/fixed.rs
@@ -25,7 +25,7 @@ use std::{collections::hash_map::Entry, num::NonZeroUsize, vec};
 
 /// A peer iterator for a fixed set of peers.
 pub(crate) struct FixedPeersIter {
-    /// Ther permitted parallelism, i.e. number of pending results.
+    /// The permitted parallelism, i.e. number of pending results.
     parallelism: NonZeroUsize,
 
     /// The state of peers emitted by the iterator.

From 9ed181b3acc77cac1f081a98e4c7762411812e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 24 Oct 2024 16:13:15 +0100
Subject: [PATCH 391/455] deps(ci): update cargo-semver-checks (#5647)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index daee569d047..aad5b39aec7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -308,7 +308,7 @@ jobs:
       RUSTFLAGS: ''
     steps:
       - uses: actions/checkout@v4
-      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.33.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
+      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.36.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
       - uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6
 

From 6cb116e8fc49c0b54765a0178aaa4a057d290e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 24 Oct 2024 17:05:30 +0100
Subject: [PATCH 392/455] fix(swarm-test): set proper version (#5648)

## Description
To unblock  CI

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 Cargo.lock              | 2 +-
 Cargo.toml              | 2 +-
 swarm-test/CHANGELOG.md | 2 +-
 swarm-test/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 40ff97009de..54a0f8657a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3278,7 +3278,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm-test"
-version = "0.4.1"
+version = "0.5.0"
 dependencies = [
  "async-trait",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index 7b52e4a7b42..af7e47f8359 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ libp2p-server = { version = "0.12.8", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
-libp2p-swarm-test = { version = "0.4.1", path = "swarm-test" }
+libp2p-swarm-test = { version = "0.5.0", path = "swarm-test" }
 libp2p-tcp = { version = "0.42.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.5.0", path = "transports/tls" }
 libp2p-uds = { version = "0.41.0", path = "transports/uds" }
diff --git a/swarm-test/CHANGELOG.md b/swarm-test/CHANGELOG.md
index 33eebb2412c..5700460b3a6 100644
--- a/swarm-test/CHANGELOG.md
+++ b/swarm-test/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.4.1
+## 0.5.0
 
 - Add `tokio` runtime support and make `tokio` and `async-std` runtimes optional behind features.
   See [PR 5551].
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index fa51454dd58..7ac7c900deb 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-swarm-test"
-version = "0.4.1"
+version = "0.5.0"
 edition = "2021"
 rust-version = { workspace = true }
 license = "MIT"

From 84c617fd16048828dfe4cc3279e893282221bc19 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Fri, 25 Oct 2024 02:15:00 +0300
Subject: [PATCH 393/455] feat(kad): add `Behavior::find_closest_local_peers()`
 (#5645)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

Fixes https://github.com/libp2p/rust-libp2p/issues/5626

## Notes & open questions

This is the nicest way I came up with, I decided to leave
`get_closest_local_peers` as is since it does return all peers, not just
`replication_factor` peers.

Looking at https://github.com/libp2p/rust-libp2p/pull/2436 it is not
clear if @folex really needed all peers returned or it just happened
that way. I'm also happy to change proposed API to return all peers if
that is preferred by others.

It is very unfortunate that `&mut self` is needed for this, I created
https://github.com/libp2p/rust-libp2p/issues/5644 that if resolved will
allow to have `&self` instead.

## Change checklist

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

Co-authored-by: João Oliveira <hello@jxs.pt>
---
 protocols/kad/CHANGELOG.md     |  5 ++--
 protocols/kad/src/behaviour.rs | 48 ++++++++++++++++++++--------------
 protocols/kad/src/lib.rs       |  2 +-
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index d0ab7986aad..55d269bf98f 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,10 +1,11 @@
 ## 0.47.0
 
-- Expose a kad query facility allowing specify num_results dynamicly.
+- Expose a kad query facility allowing specify num_results dynamicaly.
   See [PR 5555](https://github.com/libp2p/rust-libp2p/pull/5555).
 - Add `mode` getter on `Behaviour`.
   See [PR 5573](https://github.com/libp2p/rust-libp2p/pull/5573).
-  
+- Add `Behavior::find_closest_local_peers()`.
+  See [PR 5645](https://github.com/libp2p/rust-libp2p/pull/5645).
 
 ## 0.46.2
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 0b15e507ba4..84133d31acb 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -771,7 +771,8 @@ where
         self.queries.add_iter_closest(target, peer_keys, info)
     }
 
-    /// Returns closest peers to the given key; takes peers from local routing table only.
+    /// Returns all peers ordered by distance to the given key; takes peers from local routing table
+    /// only.
     pub fn get_closest_local_peers<'a, K: Clone>(
         &'a mut self,
         key: &'a kbucket::Key<K>,
@@ -779,6 +780,23 @@ where
         self.kbuckets.closest_keys(key)
     }
 
+    /// Finds the closest peers to a `key` in the context of a request by the `source` peer, such
+    /// that the `source` peer is never included in the result.
+    ///
+    /// Takes peers from local routing table only. Only returns number of peers equal to configured
+    /// replication factor.
+    pub fn find_closest_local_peers<'a, K: Clone>(
+        &'a mut self,
+        key: &'a kbucket::Key<K>,
+        source: &'a PeerId,
+    ) -> impl Iterator<Item = KadPeer> + 'a {
+        self.kbuckets
+            .closest(key)
+            .filter(move |e| e.node.key.preimage() != source)
+            .take(self.queries.config().replication_factor.get())
+            .map(KadPeer::from)
+    }
+
     /// Performs a lookup for a record in the DHT.
     ///
     /// The result of this operation is delivered in a
@@ -1212,22 +1230,6 @@ where
         }
     }
 
-    /// Finds the closest peers to a `target` in the context of a request by
-    /// the `source` peer, such that the `source` peer is never included in the
-    /// result.
-    fn find_closest<T: Clone>(
-        &mut self,
-        target: &kbucket::Key<T>,
-        source: &PeerId,
-    ) -> Vec<KadPeer> {
-        self.kbuckets
-            .closest(target)
-            .filter(|e| e.node.key.preimage() != source)
-            .take(self.queries.config().replication_factor.get())
-            .map(KadPeer::from)
-            .collect()
-    }
-
     /// Collects all peers who are known to be providers of the value for a given `Multihash`.
     fn provider_peers(&mut self, key: &record::Key, source: &PeerId) -> Vec<KadPeer> {
         let kbuckets = &mut self.kbuckets;
@@ -2300,7 +2302,9 @@ where
             }
 
             HandlerEvent::FindNodeReq { key, request_id } => {
-                let closer_peers = self.find_closest(&kbucket::Key::new(key), &source);
+                let closer_peers = self
+                    .find_closest_local_peers(&kbucket::Key::new(key), &source)
+                    .collect::<Vec<_>>();
 
                 self.queued_events
                     .push_back(ToSwarm::GenerateEvent(Event::InboundRequest {
@@ -2328,7 +2332,9 @@ where
 
             HandlerEvent::GetProvidersReq { key, request_id } => {
                 let provider_peers = self.provider_peers(&key, &source);
-                let closer_peers = self.find_closest(&kbucket::Key::new(key), &source);
+                let closer_peers = self
+                    .find_closest_local_peers(&kbucket::Key::new(key), &source)
+                    .collect::<Vec<_>>();
 
                 self.queued_events
                     .push_back(ToSwarm::GenerateEvent(Event::InboundRequest {
@@ -2422,7 +2428,9 @@ where
                     None => None,
                 };
 
-                let closer_peers = self.find_closest(&kbucket::Key::new(key), &source);
+                let closer_peers = self
+                    .find_closest_local_peers(&kbucket::Key::new(key), &source)
+                    .collect::<Vec<_>>();
 
                 self.queued_events
                     .push_back(ToSwarm::GenerateEvent(Event::InboundRequest {
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index 681d135f79b..060bfc518e4 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -69,7 +69,7 @@ pub use behaviour::{
 pub use kbucket::{
     Distance as KBucketDistance, EntryView, KBucketRef, Key as KBucketKey, NodeStatus,
 };
-pub use protocol::ConnectionType;
+pub use protocol::{ConnectionType, KadPeer};
 pub use query::QueryId;
 pub use record::{store, Key as RecordKey, ProviderRecord, Record};
 

From c7e8129726c584e1fe41ffe3aadf686863906f9f Mon Sep 17 00:00:00 2001
From: Dzmitry Kalabuk <kalabukdima@gmail.com>
Date: Fri, 25 Oct 2024 15:30:32 +0300
Subject: [PATCH 394/455] feat(gossipsub): apply `max_transmit_size` to the
 published message (#5642)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

When trying to publish a message using gossipsub's `publish` method,
it should be possible to predict whether it will fit in the limit
defined by
the `max_transmit_size` config option.
If this limit applies to the final protobuf payload, it's not possible
to know
that in advance because the size of the added fields is not fixed.

This change makes the limit apply to the passed message size instead of
the final wire size.

## Notes & open questions

This is a minor version change because it changes the meaning of the
existing config option.
However, for the existing clients the limit will only become more
permissive, so it shouldn't break anything.

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
Co-authored-by: João Oliveira <hello@jxs.pt>
---
 Cargo.lock                           |  2 +-
 Cargo.toml                           |  2 +-
 protocols/gossipsub/CHANGELOG.md     |  5 +++++
 protocols/gossipsub/Cargo.toml       |  2 +-
 protocols/gossipsub/src/behaviour.rs | 10 +++++-----
 protocols/gossipsub/src/config.rs    |  3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54a0f8657a1..3b983a80d00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2741,7 +2741,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.47.1"
+version = "0.48.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index af7e47f8359..8869505921d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ libp2p-core = { version = "0.42.0", path = "core" }
 libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
-libp2p-gossipsub = { version = "0.47.1", path = "protocols/gossipsub" }
+libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.45.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index c47a9f40f66..cdd170c0d4b 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.48.0
+
+- Apply `max_transmit_size` to the inner message instead of the final payload.
+  See [PR 5642](https://github.com/libp2p/rust-libp2p/pull/5642).
+
 ## 0.47.1
 
 - Attempt to publish to at least mesh_n peers when flood publish is disabled.
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 665f757fcb3..734ac36a231 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Gossipsub protocol for libp2p"
-version = "0.47.1"
+version = "0.48.0"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 16adb555a44..6ddb25316e5 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -583,6 +583,11 @@ where
             .data_transform
             .outbound_transform(&topic, data.clone())?;
 
+        // check that the size doesn't exceed the max transmission size.
+        if transformed_data.len() > self.config.max_transmit_size() {
+            return Err(PublishError::MessageTooLarge);
+        }
+
         let raw_message = self.build_raw_message(topic, transformed_data)?;
 
         // calculate the message id from the un-transformed data
@@ -593,11 +598,6 @@ where
             topic: raw_message.topic.clone(),
         });
 
-        // check that the size doesn't exceed the max transmission size
-        if raw_message.raw_protobuf_len() > self.config.max_transmit_size() {
-            return Err(PublishError::MessageTooLarge);
-        }
-
         // Check the if the message has been published before
         if self.duplicate_cache.contains(&msg_id) {
             // This message has already been seen. We don't re-publish messages that have already
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index febe2514a30..1ee2e940661 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -174,7 +174,8 @@ impl Config {
 
     /// The maximum byte size for each gossipsub RPC (default is 65536 bytes).
     ///
-    /// This represents the maximum size of the entire protobuf payload. It must be at least
+    /// This represents the maximum size of the published message. It is additionally wrapped
+    /// in a protobuf struct, so the actual wire size may be a bit larger. It must be at least
     /// large enough to support basic control messages. If Peer eXchange is enabled, this
     /// must be large enough to transmit the desired peer information on pruning. It must be at
     /// least 100 bytes. Default is 65536 bytes.

From 4e7ff3ebf27336f2f014067f33437c428c81f5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Sat, 26 Oct 2024 20:10:25 +0100
Subject: [PATCH 395/455] chore(ci): address clippy beta lints (#5649)

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
---
 Cargo.lock                                    |  1 +
 identity/src/peer_id.rs                       |  2 +-
 identity/src/rsa.rs                           |  4 ++--
 misc/quick-protobuf-codec/src/lib.rs          |  2 +-
 muxers/test-harness/src/lib.rs                |  2 +-
 .../autonat/src/v1/behaviour/as_client.rs     |  4 ++--
 .../autonat/src/v1/behaviour/as_server.rs     |  4 ++--
 protocols/gossipsub/src/backoff.rs            |  3 +--
 protocols/kad/src/behaviour.rs                |  4 ++--
 protocols/ping/src/protocol.rs                |  1 -
 swarm/src/connection.rs                       |  2 +-
 swarm/src/handler.rs                          |  6 ++---
 transports/noise/src/io/handshake.rs          |  1 -
 transports/websocket-websys/src/lib.rs        |  4 ++--
 transports/websocket/src/framed.rs            |  2 +-
 transports/webtransport-websys/Cargo.toml     |  1 +
 transports/webtransport-websys/src/utils.rs   | 22 +++++++------------
 17 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b983a80d00..f0c36291839 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3484,6 +3484,7 @@ dependencies = [
  "multiaddr",
  "multibase",
  "multihash",
+ "once_cell",
  "send_wrapper 0.6.0",
  "thiserror",
  "tracing",
diff --git a/identity/src/peer_id.rs b/identity/src/peer_id.rs
index 7b3f799f612..8ae6d99ae32 100644
--- a/identity/src/peer_id.rs
+++ b/identity/src/peer_id.rs
@@ -191,7 +191,7 @@ impl<'de> Deserialize<'de> for PeerId {
 
         struct PeerIdVisitor;
 
-        impl<'de> Visitor<'de> for PeerIdVisitor {
+        impl Visitor<'_> for PeerIdVisitor {
             type Value = PeerId;
 
             fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
diff --git a/identity/src/rsa.rs b/identity/src/rsa.rs
index cbfe3c1b919..5eb78a4af75 100644
--- a/identity/src/rsa.rs
+++ b/identity/src/rsa.rs
@@ -149,7 +149,7 @@ struct Asn1RawOid<'a> {
     object: DerObject<'a>,
 }
 
-impl<'a> Asn1RawOid<'a> {
+impl Asn1RawOid<'_> {
     /// The underlying OID as byte literal.
     pub(crate) fn oid(&self) -> &[u8] {
         self.object.value()
@@ -169,7 +169,7 @@ impl<'a> DerTypeView<'a> for Asn1RawOid<'a> {
     }
 }
 
-impl<'a> DerEncodable for Asn1RawOid<'a> {
+impl DerEncodable for Asn1RawOid<'_> {
     fn encode<S: Sink>(&self, sink: &mut S) -> Result<(), Asn1DerError> {
         self.object.encode(sink)
     }
diff --git a/misc/quick-protobuf-codec/src/lib.rs b/misc/quick-protobuf-codec/src/lib.rs
index 32cee8eccac..c57b7da7db8 100644
--- a/misc/quick-protobuf-codec/src/lib.rs
+++ b/misc/quick-protobuf-codec/src/lib.rs
@@ -120,7 +120,7 @@ impl<'a> BytesMutWriterBackend<'a> {
     }
 }
 
-impl<'a> WriterBackend for BytesMutWriterBackend<'a> {
+impl WriterBackend for BytesMutWriterBackend<'_> {
     fn pb_write_u8(&mut self, x: u8) -> quick_protobuf::Result<()> {
         self.dst.put_u8(x);
 
diff --git a/muxers/test-harness/src/lib.rs b/muxers/test-harness/src/lib.rs
index 16c71f414f0..d03bdbdfed7 100644
--- a/muxers/test-harness/src/lib.rs
+++ b/muxers/test-harness/src/lib.rs
@@ -206,7 +206,7 @@ enum Event {
     ProtocolComplete,
 }
 
-impl<'m, M> Stream for Harness<'m, M>
+impl<M> Stream for Harness<'_, M>
 where
     M: StreamMuxer + Unpin,
 {
diff --git a/protocols/autonat/src/v1/behaviour/as_client.rs b/protocols/autonat/src/v1/behaviour/as_client.rs
index 8960163ccb3..385dee50ee1 100644
--- a/protocols/autonat/src/v1/behaviour/as_client.rs
+++ b/protocols/autonat/src/v1/behaviour/as_client.rs
@@ -98,7 +98,7 @@ pub(crate) struct AsClient<'a> {
     pub(crate) other_candidates: &'a HashSet<Multiaddr>,
 }
 
-impl<'a> HandleInnerEvent for AsClient<'a> {
+impl HandleInnerEvent for AsClient<'_> {
     fn handle_event(
         &mut self,
         event: request_response::Event<DialRequest, DialResponse>,
@@ -179,7 +179,7 @@ impl<'a> HandleInnerEvent for AsClient<'a> {
     }
 }
 
-impl<'a> AsClient<'a> {
+impl AsClient<'_> {
     pub(crate) fn poll_auto_probe(&mut self, cx: &mut Context<'_>) -> Poll<OutboundProbeEvent> {
         match self.schedule_probe.poll_unpin(cx) {
             Poll::Ready(()) => {
diff --git a/protocols/autonat/src/v1/behaviour/as_server.rs b/protocols/autonat/src/v1/behaviour/as_server.rs
index 1289bd53d24..01148add6e8 100644
--- a/protocols/autonat/src/v1/behaviour/as_server.rs
+++ b/protocols/autonat/src/v1/behaviour/as_server.rs
@@ -91,7 +91,7 @@ pub(crate) struct AsServer<'a> {
     >,
 }
 
-impl<'a> HandleInnerEvent for AsServer<'a> {
+impl HandleInnerEvent for AsServer<'_> {
     fn handle_event(
         &mut self,
         event: request_response::Event<DialRequest, DialResponse>,
@@ -208,7 +208,7 @@ impl<'a> HandleInnerEvent for AsServer<'a> {
     }
 }
 
-impl<'a> AsServer<'a> {
+impl AsServer<'_> {
     pub(crate) fn on_outbound_connection(
         &mut self,
         peer: &PeerId,
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
index b24da318582..4414ffb00e6 100644
--- a/protocols/gossipsub/src/backoff.rs
+++ b/protocols/gossipsub/src/backoff.rs
@@ -48,8 +48,7 @@ pub(crate) struct BackoffStorage {
 
 impl BackoffStorage {
     fn heartbeats(d: &Duration, heartbeat_interval: &Duration) -> usize {
-        ((d.as_nanos() + heartbeat_interval.as_nanos() - 1) / heartbeat_interval.as_nanos())
-            as usize
+        d.as_nanos().div_ceil(heartbeat_interval.as_nanos()) as usize
     }
 
     pub(crate) fn new(
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 84133d31acb..f577971167f 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -3361,7 +3361,7 @@ pub struct QueryMut<'a> {
     query: &'a mut Query,
 }
 
-impl<'a> QueryMut<'a> {
+impl QueryMut<'_> {
     pub fn id(&self) -> QueryId {
         self.query.id()
     }
@@ -3391,7 +3391,7 @@ pub struct QueryRef<'a> {
     query: &'a Query,
 }
 
-impl<'a> QueryRef<'a> {
+impl QueryRef<'_> {
     pub fn id(&self) -> QueryId {
         self.query.id()
     }
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index 566e5e258e2..6e3f06d0498 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -44,7 +44,6 @@ pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0"
 /// >           Nagle's algorithm, delayed acks and similar configuration options
 /// >           which can affect latencies especially on otherwise low-volume
 /// >           connections.
-
 const PING_SIZE: usize = 32;
 
 /// Sends a ping and waits for the pong.
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 2f9afc38418..859d138b83a 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -516,7 +516,7 @@ pub(crate) struct IncomingInfo<'a> {
     pub(crate) send_back_addr: &'a Multiaddr,
 }
 
-impl<'a> IncomingInfo<'a> {
+impl IncomingInfo<'_> {
     /// Builds the [`ConnectedPoint`] corresponding to the incoming connection.
     pub(crate) fn create_connected_point(&self) -> ConnectedPoint {
         ConnectedPoint::Listener {
diff --git a/swarm/src/handler.rs b/swarm/src/handler.rs
index 610b95b8cf1..9e31592d68d 100644
--- a/swarm/src/handler.rs
+++ b/swarm/src/handler.rs
@@ -226,7 +226,7 @@ pub enum ConnectionEvent<'a, IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IO
     RemoteProtocolsChange(ProtocolsChange<'a>),
 }
 
-impl<'a, IP, OP, IOI, OOI> fmt::Debug for ConnectionEvent<'a, IP, OP, IOI, OOI>
+impl<IP, OP, IOI, OOI> fmt::Debug for ConnectionEvent<'_, IP, OP, IOI, OOI>
 where
     IP: InboundUpgradeSend + fmt::Debug,
     IP::Output: fmt::Debug,
@@ -262,8 +262,8 @@ where
     }
 }
 
-impl<'a, IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IOI, OOI>
-    ConnectionEvent<'a, IP, OP, IOI, OOI>
+impl<IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IOI, OOI>
+    ConnectionEvent<'_, IP, OP, IOI, OOI>
 {
     /// Whether the event concerns an outbound stream.
     pub fn is_outbound(&self) -> bool {
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
index 5c1fa806b6d..8993a5795b6 100644
--- a/transports/noise/src/io/handshake.rs
+++ b/transports/noise/src/io/handshake.rs
@@ -73,7 +73,6 @@ where
     /// will be sent and received on the given I/O resource and using the
     /// provided session for cryptographic operations according to the chosen
     /// Noise handshake pattern.
-
     pub(crate) fn new(
         io: T,
         session: snow::HandshakeState,
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index f353d92b204..3467e802bc5 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -96,8 +96,8 @@ impl libp2p_core::Transport for Transport {
             return Err(TransportError::MultiaddrNotSupported(addr));
         }
 
-        let url = extract_websocket_url(&addr)
-            .ok_or_else(|| TransportError::MultiaddrNotSupported(addr))?;
+        let url =
+            extract_websocket_url(&addr).ok_or(TransportError::MultiaddrNotSupported(addr))?;
 
         Ok(async move {
             let socket = match WebSocket::new(&url) {
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index a547aea21ef..198443508d9 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -442,7 +442,7 @@ pub(crate) enum WsListenProto<'a> {
     TlsWs(Cow<'a, str>),
 }
 
-impl<'a> WsListenProto<'a> {
+impl WsListenProto<'_> {
     pub(crate) fn append_on_addr(&self, addr: &mut Multiaddr) {
         match self {
             WsListenProto::Ws(path) => {
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 9541c49b737..eeb474d4a63 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -21,6 +21,7 @@ libp2p-identity = { workspace = true }
 libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
+once_cell = "1.19.0"
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.61"
 tracing = { workspace = true }
diff --git a/transports/webtransport-websys/src/utils.rs b/transports/webtransport-websys/src/utils.rs
index 55bad08e00c..0b3550e5b5b 100644
--- a/transports/webtransport-websys/src/utils.rs
+++ b/transports/webtransport-websys/src/utils.rs
@@ -1,10 +1,17 @@
 use js_sys::{Promise, Reflect};
+use once_cell::sync::Lazy;
 use send_wrapper::SendWrapper;
 use std::io;
 use wasm_bindgen::{JsCast, JsValue};
 
 use crate::Error;
 
+type Closure = wasm_bindgen::closure::Closure<dyn FnMut(JsValue)>;
+static DO_NOTHING: Lazy<SendWrapper<Closure>> = Lazy::new(|| {
+    let cb = Closure::new(|_| {});
+    SendWrapper::new(cb)
+});
+
 /// Properly detach a promise.
 ///
 /// A promise always runs in the background, however if you don't await it,
@@ -13,22 +20,9 @@ use crate::Error;
 //
 // Ref: https://github.com/typescript-eslint/typescript-eslint/blob/391a6702c0a9b5b3874a7a27047f2a721f090fb6/packages/eslint-plugin/docs/rules/no-floating-promises.md
 pub(crate) fn detach_promise(promise: Promise) {
-    type Closure = wasm_bindgen::closure::Closure<dyn FnMut(JsValue)>;
-    static mut DO_NOTHING: Option<SendWrapper<Closure>> = None;
-
-    // Allocate Closure only once and reuse it
-    let do_nothing = unsafe {
-        if DO_NOTHING.is_none() {
-            let cb = Closure::new(|_| {});
-            DO_NOTHING = Some(SendWrapper::new(cb));
-        }
-
-        DO_NOTHING.as_deref().unwrap()
-    };
-
     // Avoid having "floating" promise and ignore any errors.
     // After `catch` promise is allowed to be dropped.
-    let _ = promise.catch(do_nothing);
+    let _ = promise.catch(&DO_NOTHING);
 }
 
 /// Typecasts a JavaScript type.

From 9586071e54a090a2526c8179c508b93d3cfdf4ac Mon Sep 17 00:00:00 2001
From: Krishang Shah <93703995+kamuik16@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:48:41 +0530
Subject: [PATCH 396/455] feat: refactor distributed-key-value-store example
 (#5652)

## Description

ref #4449

Refactored distributed-key-value-store example to use `tokio` instead of
`async-std`

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates
---
 Cargo.lock                                    |  2 +-
 .../distributed-key-value-store/Cargo.toml    |  4 ++--
 .../distributed-key-value-store/src/main.rs   | 21 ++++++++++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f0c36291839..d3e2fc9fa47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1361,10 +1361,10 @@ dependencies = [
 name = "distributed-key-value-store-example"
 version = "0.1.0"
 dependencies = [
- "async-std",
  "async-trait",
  "futures",
  "libp2p",
+ "tokio",
  "tracing",
  "tracing-subscriber",
 ]
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
index 9c2e2bce5c9..3846e54c8d3 100644
--- a/examples/distributed-key-value-store/Cargo.toml
+++ b/examples/distributed-key-value-store/Cargo.toml
@@ -9,10 +9,10 @@ license = "MIT"
 release = false
 
 [dependencies]
-async-std = { version = "1.12", features = ["attributes"] }
+tokio = { workspace = true, features = ["full"] }
 async-trait = "0.1"
 futures = { workspace = true }
-libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
+libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/examples/distributed-key-value-store/src/main.rs b/examples/distributed-key-value-store/src/main.rs
index 404333f3d20..6b7947b7eb3 100644
--- a/examples/distributed-key-value-store/src/main.rs
+++ b/examples/distributed-key-value-store/src/main.rs
@@ -20,8 +20,7 @@
 
 #![doc = include_str!("../README.md")]
 
-use async_std::io;
-use futures::{prelude::*, select};
+use futures::stream::StreamExt;
 use libp2p::kad;
 use libp2p::kad::store::MemoryStore;
 use libp2p::kad::Mode;
@@ -32,9 +31,13 @@ use libp2p::{
 };
 use std::error::Error;
 use std::time::Duration;
+use tokio::{
+    io::{self, AsyncBufReadExt},
+    select,
+};
 use tracing_subscriber::EnvFilter;
 
-#[async_std::main]
+#[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
@@ -44,11 +47,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
     #[derive(NetworkBehaviour)]
     struct Behaviour {
         kademlia: kad::Behaviour<MemoryStore>,
-        mdns: mdns::async_io::Behaviour,
+        mdns: mdns::tokio::Behaviour,
     }
 
     let mut swarm = libp2p::SwarmBuilder::with_new_identity()
-        .with_async_std()
+        .with_tokio()
         .with_tcp(
             tcp::Config::default(),
             noise::Config::new,
@@ -60,7 +63,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                     key.public().to_peer_id(),
                     MemoryStore::new(key.public().to_peer_id()),
                 ),
-                mdns: mdns::async_io::Behaviour::new(
+                mdns: mdns::tokio::Behaviour::new(
                     mdns::Config::default(),
                     key.public().to_peer_id(),
                 )?,
@@ -72,7 +75,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     swarm.behaviour_mut().kademlia.set_mode(Some(Mode::Server));
 
     // Read full lines from stdin
-    let mut stdin = io::BufReader::new(io::stdin()).lines().fuse();
+    let mut stdin = io::BufReader::new(io::stdin()).lines();
 
     // Listen on all interfaces and whatever port the OS assigns.
     swarm.listen_on("/ip4/0.0.0.0/tcp/0".parse()?)?;
@@ -80,7 +83,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
     // Kick it off.
     loop {
         select! {
-        line = stdin.select_next_some() => handle_input_line(&mut swarm.behaviour_mut().kademlia, line.expect("Stdin not to close")),
+        Ok(Some(line)) = stdin.next_line() => {
+            handle_input_line(&mut swarm.behaviour_mut().kademlia, line);
+        }
         event = swarm.select_next_some() => match event {
             SwarmEvent::NewListenAddr { address, .. } => {
                 println!("Listening in {address:?}");

From 8387749048f9c922dc8a30e18a709eb82ec76503 Mon Sep 17 00:00:00 2001
From: Krishang Shah <93703995+kamuik16@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:17:50 +0530
Subject: [PATCH 397/455] chore: refactor ping tests (#5655)

## Description

ref #4449

Refactored ping tests to use `tokio` instead of `async-std`.

## Change checklist

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates
---
 Cargo.lock                     |  2 +-
 protocols/ping/Cargo.toml      |  2 +-
 protocols/ping/src/protocol.rs | 34 ++++++++++++++++------------------
 protocols/ping/tests/ping.rs   | 16 ++++++++--------
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3e2fc9fa47..c0ada652504 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3023,7 +3023,6 @@ dependencies = [
 name = "libp2p-ping"
 version = "0.45.0"
 dependencies = [
- "async-std",
  "either",
  "futures",
  "futures-timer",
@@ -3033,6 +3032,7 @@ dependencies = [
  "libp2p-swarm-test",
  "quickcheck-ext",
  "rand 0.8.5",
+ "tokio",
  "tracing",
  "tracing-subscriber",
  "void",
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 66775d3ba8d..794ab54ba42 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -23,11 +23,11 @@ tracing = { workspace = true }
 void = "1.0"
 
 [dev-dependencies]
-async-std = "1.6.2"
 libp2p-swarm = { workspace = true, features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tokio = {workspace = true, features = ["rt", "macros"]}
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index 6e3f06d0498..101c219aac4 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -89,8 +89,8 @@ mod tests {
         Endpoint,
     };
 
-    #[test]
-    fn ping_pong() {
+    #[tokio::test]
+    async fn ping_pong() {
         let mem_addr = multiaddr![Memory(thread_rng().gen::<u64>())];
         let mut transport = MemoryTransport::new().boxed();
         transport.listen_on(ListenerId::next(), mem_addr).unwrap();
@@ -101,27 +101,25 @@ mod tests {
             .and_then(|ev| ev.into_new_address())
             .expect("MemoryTransport not listening on an address!");
 
-        async_std::task::spawn(async move {
+        tokio::spawn(async move {
             let transport_event = transport.next().await.unwrap();
             let (listener_upgrade, _) = transport_event.into_incoming().unwrap();
             let conn = listener_upgrade.await.unwrap();
             recv_ping(conn).await.unwrap();
         });
 
-        async_std::task::block_on(async move {
-            let c = MemoryTransport::new()
-                .dial(
-                    listener_addr,
-                    DialOpts {
-                        role: Endpoint::Dialer,
-                        port_use: PortUse::Reuse,
-                    },
-                )
-                .unwrap()
-                .await
-                .unwrap();
-            let (_, rtt) = send_ping(c).await.unwrap();
-            assert!(rtt > Duration::from_secs(0));
-        });
+        let c = MemoryTransport::new()
+            .dial(
+                listener_addr,
+                DialOpts {
+                    role: Endpoint::Dialer,
+                    port_use: PortUse::Reuse,
+                },
+            )
+            .unwrap()
+            .await
+            .unwrap();
+        let (_, rtt) = send_ping(c).await.unwrap();
+        assert!(rtt > Duration::from_secs(0));
     }
 }
diff --git a/protocols/ping/tests/ping.rs b/protocols/ping/tests/ping.rs
index 3ca469f16a8..0752b1fced9 100644
--- a/protocols/ping/tests/ping.rs
+++ b/protocols/ping/tests/ping.rs
@@ -27,15 +27,15 @@ use libp2p_swarm_test::SwarmExt;
 use quickcheck::*;
 use std::{num::NonZeroU8, time::Duration};
 
-#[test]
-fn ping_pong() {
+#[tokio::test]
+async fn ping_pong() {
     fn prop(count: NonZeroU8) {
         let cfg = ping::Config::new().with_interval(Duration::from_millis(10));
 
         let mut swarm1 = Swarm::new_ephemeral(|_| ping::Behaviour::new(cfg.clone()));
         let mut swarm2 = Swarm::new_ephemeral(|_| ping::Behaviour::new(cfg.clone()));
 
-        async_std::task::block_on(async {
+        tokio::spawn(async move {
             swarm1.listen().with_memory_addr_external().await;
             swarm2.connect(&mut swarm1).await;
 
@@ -61,16 +61,16 @@ fn assert_ping_rtt_less_than_50ms(e: ping::Event) {
     assert!(rtt < Duration::from_millis(50))
 }
 
-#[test]
-fn unsupported_doesnt_fail() {
+#[tokio::test]
+async fn unsupported_doesnt_fail() {
     let mut swarm1 = Swarm::new_ephemeral(|_| dummy::Behaviour);
     let mut swarm2 = Swarm::new_ephemeral(|_| ping::Behaviour::new(ping::Config::new()));
 
-    let result = async_std::task::block_on(async {
+    let result = {
         swarm1.listen().with_memory_addr_external().await;
         swarm2.connect(&mut swarm1).await;
         let swarm1_peer_id = *swarm1.local_peer_id();
-        async_std::task::spawn(swarm1.loop_on_next());
+        tokio::spawn(swarm1.loop_on_next());
 
         loop {
             match swarm2.next_swarm_event().await {
@@ -89,7 +89,7 @@ fn unsupported_doesnt_fail() {
                 _ => {}
             }
         }
-    });
+    };
 
     result.expect("node with ping should not fail connection due to unsupported protocol");
 }

From d021ce29c7f52833fefba845d3c11dafc0c06bba Mon Sep 17 00:00:00 2001
From: Hamza <hmzkrb@gmail.com>
Date: Tue, 5 Nov 2024 20:34:30 +0300
Subject: [PATCH 398/455] fix(websocket): don't dial `/dnsaddr` addresses
 (#5613)

## Description

Returns `Error::InvalidMultiaddr` when `parse_ws_dial_addr` is called
with `/dnsaddr`.

As per its specification, `/dnsaddr` domains are not meant to be
directly dialed, instead it should be appended with `_dnsaddr.` and used
for DNS lookups afterwards

Related: #5529
Fixes: #5601

## Notes & open questions

* Is it okay to return an error, or should I perform a DNS lookup and
resolve that DNS afterwards if address has `/dnsaddr`?
* If so, how should I handle that case where DNS lookup returns multiple
multiaddrs?

## Change checklist

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
---
 Cargo.lock                               | 4 ++--
 Cargo.toml                               | 4 ++--
 transports/websocket-websys/CHANGELOG.md | 5 +++++
 transports/websocket-websys/Cargo.toml   | 2 +-
 transports/websocket-websys/src/lib.rs   | 9 +++++++--
 transports/websocket/CHANGELOG.md        | 5 +++++
 transports/websocket/Cargo.toml          | 2 +-
 transports/websocket/src/framed.rs       | 9 +++++++--
 8 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0ada652504..8a6278717f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3432,7 +3432,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.44.0"
+version = "0.44.1"
 dependencies = [
  "async-std",
  "either",
@@ -3455,7 +3455,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket-websys"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "bytes",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index 8869505921d..780d26240db 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,8 +112,8 @@ libp2p-upnp = { version = "0.3.1", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
-libp2p-websocket = { version = "0.44.0", path = "transports/websocket" }
-libp2p-websocket-websys = { version = "0.4.0", path = "transports/websocket-websys" }
+libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
+libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
 multiaddr = "0.18.1"
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
index d0aeb509823..9d0cb7d7726 100644
--- a/transports/websocket-websys/CHANGELOG.md
+++ b/transports/websocket-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1
+
+- fix: Return `None` when extracting a `/dnsaddr` address
+  See [PR 5613](https://github.com/libp2p/rust-libp2p/pull/5613)
+
 ## 0.4.0
 
 - Implement refactored `Transport`.
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 32483f28c57..1687d3c0fb5 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket-websys"
 edition = "2021"
 rust-version = "1.60.0"
 description = "WebSocket for libp2p under WASM environment"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Vince Vasta <vince.vasta@gmail.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index 3467e802bc5..17b07c71c0a 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -130,8 +130,7 @@ fn extract_websocket_url(addr: &Multiaddr) -> Option<String> {
         }
         (Some(Protocol::Dns(h)), Some(Protocol::Tcp(port)))
         | (Some(Protocol::Dns4(h)), Some(Protocol::Tcp(port)))
-        | (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port)))
-        | (Some(Protocol::Dnsaddr(h)), Some(Protocol::Tcp(port))) => {
+        | (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port))) => {
             format!("{}:{}", &h, port)
         }
         _ => return None,
@@ -549,6 +548,12 @@ mod tests {
             .unwrap();
         assert!(extract_websocket_url(&addr).is_none());
 
+        // Check `/dnsaddr`
+        let addr = "/dnsaddr/example.com/tcp/2222/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        assert!(extract_websocket_url(&addr).is_none());
+
         // Check non-ws address
         let addr = "/ip4/127.0.0.1/tcp/2222".parse::<Multiaddr>().unwrap();
         assert!(extract_websocket_url(&addr).is_none());
diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
index cd079cfdd5a..1a8e9569c06 100644
--- a/transports/websocket/CHANGELOG.md
+++ b/transports/websocket/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.44.1
+
+- fix: Return `Error::InvalidMultiaddr` when dialed to a `/dnsaddr` address
+  See [PR 5613](https://github.com/libp2p/rust-libp2p/pull/5613)
+
 ## 0.44.0
 
 - Implement refactored `Transport`.
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index e08346da5ca..07f84901eda 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebSocket transport for libp2p"
-version = "0.44.0"
+version = "0.44.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 198443508d9..259be6a68f8 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -510,8 +510,7 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
             }
             (Some(Protocol::Dns(h)), Some(Protocol::Tcp(port)))
             | (Some(Protocol::Dns4(h)), Some(Protocol::Tcp(port)))
-            | (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port)))
-            | (Some(Protocol::Dnsaddr(h)), Some(Protocol::Tcp(port))) => {
+            | (Some(Protocol::Dns6(h)), Some(Protocol::Tcp(port))) => {
                 break (format!("{h}:{port}"), tls::dns_name_ref(&h)?)
             }
             (Some(_), Some(p)) => {
@@ -993,6 +992,12 @@ mod tests {
         assert_eq!(info.server_name, "::1".try_into().unwrap());
         assert_eq!(info.tcp_addr, "/ip6/::1/tcp/2222".parse().unwrap());
 
+        // Check `/dnsaddr`
+        let addr = "/dnsaddr/example.com/tcp/2222/ws"
+            .parse::<Multiaddr>()
+            .unwrap();
+        parse_ws_dial_addr::<io::Error>(addr).unwrap_err();
+
         // Check non-ws address
         let addr = "/ip4/127.0.0.1/tcp/2222".parse::<Multiaddr>().unwrap();
         parse_ws_dial_addr::<io::Error>(addr).unwrap_err();

From 5179d78e0ab602d03f672c3e96160181cf8f7188 Mon Sep 17 00:00:00 2001
From: yanziseeker <153156292+AdventureSeeker987@users.noreply.github.com>
Date: Wed, 6 Nov 2024 07:10:30 +0800
Subject: [PATCH 399/455] chore: fix some comments (#5661)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 protocols/gossipsub/src/behaviour.rs         | 2 +-
 protocols/gossipsub/src/peer_score/params.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 6ddb25316e5..bf94a5b7920 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -947,7 +947,7 @@ where
                     && !self.backoffs.is_backoff_with_slack(topic_hash, p)
             });
 
-            // Add up to mesh_n of them them to the mesh
+            // Add up to mesh_n of them to the mesh
             // NOTE: These aren't randomly added, currently FIFO
             let add_peers = std::cmp::min(peers.len(), self.config.mesh_n());
             tracing::debug!(
diff --git a/protocols/gossipsub/src/peer_score/params.rs b/protocols/gossipsub/src/peer_score/params.rs
index 35bea0e4353..8c7fdb9bd35 100644
--- a/protocols/gossipsub/src/peer_score/params.rs
+++ b/protocols/gossipsub/src/peer_score/params.rs
@@ -229,7 +229,7 @@ pub struct TopicScoreParams {
 
     ///  P1: time in the mesh
     ///  This is the time the peer has been grafted in the mesh.
-    ///  The value of of the parameter is the `time/time_in_mesh_quantum`, capped by `time_in_mesh_cap`
+    ///  The value of the parameter is the `time/time_in_mesh_quantum`, capped by `time_in_mesh_cap`
     ///  The weight of the parameter must be positive (or zero to disable).
     pub time_in_mesh_weight: f64,
     pub time_in_mesh_quantum: Duration,

From 858a4cd954bf52be108ebc63bbb00b52964770dd Mon Sep 17 00:00:00 2001
From: Krishang Shah <93703995+kamuik16@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:52:32 +0530
Subject: [PATCH 400/455] chore: identify::Config fields private (#5663)

## Description

Closes #5660

## Change checklist

- [x] I have performed a self-review of my own code
- [x] I have made corresponding changes to the documentation
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates
---
 Cargo.lock                          |  2 +-
 Cargo.toml                          |  2 +-
 protocols/identify/CHANGELOG.md     |  5 +++
 protocols/identify/Cargo.toml       |  2 +-
 protocols/identify/src/behaviour.rs | 49 ++++++++++++++++++++++++-----
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8a6278717f1..e5e41d3bdf8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2778,7 +2778,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.45.1"
+version = "0.46.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 780d26240db..aab7f0d71d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
-libp2p-identify = { version = "0.45.1", path = "protocols/identify" }
+libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.9" }
 libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index c5778ff92ee..9051c331bbc 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.46.0
+
+- Make `identify::Config` fields private and add getter functions.
+  See [PR 5663](https://github.com/libp2p/rust-libp2p/pull/5663).
+
 ## 0.45.1
 
 - Add `hide_listen_addrs` option to prevent leaking (local) listen addresses.
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index c3fb585c99c..13c43b6a71f 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Nodes identification protocol for libp2p"
-version = "0.45.1"
+version = "0.46.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index c8672674c1a..1f82cd154e3 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -117,20 +117,20 @@ pub struct Behaviour {
 pub struct Config {
     /// Application-specific version of the protocol family used by the peer,
     /// e.g. `ipfs/1.0.0` or `polkadot/1.0.0`.
-    pub protocol_version: String,
+    protocol_version: String,
     /// The public key of the local node. To report on the wire.
-    pub local_public_key: PublicKey,
+    local_public_key: PublicKey,
     /// Name and version of the local peer implementation, similar to the
     /// `User-Agent` header in the HTTP protocol.
     ///
     /// Defaults to `rust-libp2p/<libp2p-identify-version>`.
-    pub agent_version: String,
+    agent_version: String,
     /// The interval at which identification requests are sent to
     /// the remote on established connections after the first request,
     /// i.e. the delay between identification requests.
     ///
     /// Defaults to 5 minutes.
-    pub interval: Duration,
+    interval: Duration,
 
     /// Whether new or expired listen addresses of the local node should
     /// trigger an active push of an identify message to all connected peers.
@@ -140,19 +140,19 @@ pub struct Config {
     /// i.e. before the next periodic identify request with each peer.
     ///
     /// Disabled by default.
-    pub push_listen_addr_updates: bool,
+    push_listen_addr_updates: bool,
 
     /// How many entries of discovered peers to keep before we discard
     /// the least-recently used one.
     ///
     /// Disabled by default.
-    pub cache_size: usize,
+    cache_size: usize,
 
     /// Whether to include our listen addresses in our responses. If enabled,
     /// we will effectively only share our external addresses.
     ///
     /// Disabled by default.
-    pub hide_listen_addrs: bool,
+    hide_listen_addrs: bool,
 }
 
 impl Config {
@@ -202,6 +202,41 @@ impl Config {
         self.hide_listen_addrs = b;
         self
     }
+
+    /// Get the protocol version of the Config.
+    pub fn protocol_version(&self) -> &str {
+        &self.protocol_version
+    }
+
+    /// Get the local public key of the Config.
+    pub fn local_public_key(&self) -> &PublicKey {
+        &self.local_public_key
+    }
+
+    /// Get the agent version of the Config.
+    pub fn agent_version(&self) -> &str {
+        &self.agent_version
+    }
+
+    /// Get the interval of the Config.
+    pub fn interval(&self) -> Duration {
+        self.interval
+    }
+
+    /// Get the push listen address updates boolean value of the Config.
+    pub fn push_listen_addr_updates(&self) -> bool {
+        self.push_listen_addr_updates
+    }
+
+    /// Get the cache size of the Config.
+    pub fn cache_size(&self) -> usize {
+        self.cache_size
+    }
+
+    /// Get the hide listen address boolean value of the Config.
+    pub fn hide_listen_addrs(&self) -> bool {
+        self.hide_listen_addrs
+    }
 }
 
 impl Behaviour {

From a9b67995883d2b10ec8fe3b1e6644f44257de90f Mon Sep 17 00:00:00 2001
From: wangjingcun <wangjingcun@aliyun.com>
Date: Fri, 8 Nov 2024 12:23:13 +0800
Subject: [PATCH 401/455] chore(protocols): fix some typos in comment (#5665)

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

fix some typos in comment



## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates

Signed-off-by: wangjingcun <wangjingcun@aliyun.com>
---
 protocols/autonat/src/v2.rs         | 2 +-
 protocols/identify/src/behaviour.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/autonat/src/v2.rs b/protocols/autonat/src/v2.rs
index cdc807ea303..48e9f25f890 100644
--- a/protocols/autonat/src/v2.rs
+++ b/protocols/autonat/src/v2.rs
@@ -10,7 +10,7 @@
 //!     server then the dial back puts on the client, thus making the protocol unatractive for an
 //!     attacker.
 //!
-//! The protocol is seperated into two parts:
+//! The protocol is separated into two parts:
 //! - The client part, which is implemented in the `client` module. (The client is the party that
 //!     wants to check if it is reachable from the outside.)
 //! - The server part, which is implemented in the `server` module. (The server is the party
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index 1f82cd154e3..b69f2014d81 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -360,7 +360,7 @@ impl Behaviour {
         }
 
         // outgoing connection dialed with port reuse
-        // incomming connection
+        // incoming connection
         self.events
             .push_back(ToSwarm::NewExternalAddrCandidate(observed.clone()));
     }

From 4192fc3daed761a127e6986a75e016d483846555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 8 Nov 2024 19:21:23 +0000
Subject: [PATCH 402/455] chore(ci): fix interop tests region, and run them
 again on each PR (#5666)

---
 .github/workflows/interop-test.yml | 1 +
 scripts/build-interop-image.sh     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml
index 57d0f1a692d..e9446d013d7 100644
--- a/.github/workflows/interop-test.yml
+++ b/.github/workflows/interop-test.yml
@@ -1,5 +1,6 @@
 name: Interoperability Testing
 on:
+  pull_request:
   push:
     branches:
       - "master"
diff --git a/scripts/build-interop-image.sh b/scripts/build-interop-image.sh
index ad6ef78b153..4b96e353f9a 100755
--- a/scripts/build-interop-image.sh
+++ b/scripts/build-interop-image.sh
@@ -6,13 +6,13 @@ CACHE_TO=""
 
 # If we have credentials, write to cache
 if [[ -n "${AWS_SECRET_ACCESS_KEY}" ]]; then
-  CACHE_TO="--cache-to   type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
+  CACHE_TO="--cache-to   type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=ap-southeast-2,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
 fi
 
 docker buildx build \
   --load \
   $CACHE_TO \
-  --cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
+  --cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=ap-southeast-2,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
   -t ${FLAVOUR}-rust-libp2p-head \
   . \
   -f interop-tests/Dockerfile.${FLAVOUR}

From 0c34d9fdd45e81892824ba5faf3875ab35f14f1b Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Fri, 15 Nov 2024 02:09:15 +0700
Subject: [PATCH 403/455] chore: deprecate `void` crate (#5676)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

The `void` crate provides a `Void` type that is conceptually equivalent
to the [`never`
type(!)](https://doc.rust-lang.org/std/primitive.never.html). This PR
tries to remove `void` crate from the dependency tree by replacing
`void::Void` with
[`std::convert::Infallible`](https://doc.rust-lang.org/std/convert/enum.Infallible.html)
that will eventually become an alias of the `never` type(!)

> This enum has the same role as [the ! “never”
type](https://doc.rust-lang.org/std/primitive.never.html), which is
unstable in this version of Rust. When ! is stabilized, we plan to make
Infallible a type alias to it:

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] A changelog entry has been made in the appropriate crates
---
 Cargo.lock                                    | 26 ----------------
 core/Cargo.toml                               |  1 -
 core/src/lib.rs                               | 10 +++++++
 core/src/upgrade/denied.rs                    | 10 +++----
 core/src/upgrade/pending.rs                   | 10 +++----
 core/src/upgrade/ready.rs                     |  6 ++--
 examples/file-sharing/Cargo.toml              |  1 -
 identity/Cargo.toml                           |  3 +-
 identity/src/ecdsa.rs                         |  7 +++--
 misc/allow-block-list/Cargo.toml              |  1 -
 misc/allow-block-list/src/lib.rs              |  6 ++--
 misc/connection-limits/Cargo.toml             |  1 -
 misc/connection-limits/src/lib.rs             | 10 +++----
 misc/memory-connection-limits/Cargo.toml      |  1 -
 misc/memory-connection-limits/src/lib.rs      |  6 ++--
 .../tests/util/mod.rs                         |  6 ++--
 protocols/autonat/Cargo.toml                  |  3 +-
 .../src/v2/client/handler/dial_back.rs        |  6 ++--
 .../src/v2/client/handler/dial_request.rs     |  5 ++--
 protocols/autonat/src/v2/server/behaviour.rs  |  2 +-
 .../src/v2/server/handler/dial_request.rs     |  3 +-
 protocols/dcutr/Cargo.toml                    |  1 -
 protocols/dcutr/src/behaviour.rs              |  6 ++--
 protocols/dcutr/src/handler/relayed.rs        |  6 ++--
 protocols/gossipsub/Cargo.toml                |  1 -
 protocols/gossipsub/src/handler.rs            |  4 +--
 protocols/gossipsub/src/protocol.rs           |  6 ++--
 protocols/identify/Cargo.toml                 |  1 -
 protocols/identify/src/handler.rs             |  2 +-
 protocols/kad/Cargo.toml                      |  1 -
 protocols/kad/src/handler.rs                  |  4 +--
 protocols/mdns/Cargo.toml                     |  1 -
 protocols/mdns/src/behaviour.rs               |  2 +-
 protocols/perf/Cargo.toml                     |  1 -
 protocols/perf/src/client.rs                  |  4 +--
 protocols/perf/src/client/handler.rs          |  4 +--
 protocols/perf/src/server/handler.rs          | 14 ++++-----
 protocols/ping/Cargo.toml                     |  1 -
 protocols/ping/src/handler.rs                 |  8 ++---
 protocols/relay/Cargo.toml                    |  1 -
 protocols/relay/src/behaviour.rs              |  2 +-
 protocols/relay/src/behaviour/handler.rs      |  2 +-
 protocols/relay/src/priv_client.rs            |  6 ++--
 protocols/relay/src/priv_client/handler.rs    | 14 ++++-----
 protocols/rendezvous/Cargo.toml               |  1 -
 protocols/request-response/Cargo.toml         |  1 -
 protocols/request-response/src/handler.rs     |  4 +--
 .../request-response/src/handler/protocol.rs  |  6 ++--
 protocols/stream/Cargo.toml                   |  1 -
 protocols/stream/src/behaviour.rs             |  2 +-
 protocols/stream/src/handler.rs               |  9 +++---
 protocols/stream/src/upgrade.rs               |  9 ++++--
 protocols/upnp/Cargo.toml                     |  1 -
 protocols/upnp/src/behaviour.rs               |  2 +-
 swarm/Cargo.toml                              |  2 --
 swarm/src/behaviour/toggle.rs                 |  4 +--
 swarm/src/connection.rs                       | 30 +++++++++----------
 swarm/src/connection/pool.rs                  |  4 +--
 swarm/src/connection/pool/task.rs             | 10 +++----
 swarm/src/dummy.rs                            | 20 ++++++-------
 swarm/src/handler/one_shot.rs                 |  4 +--
 swarm/src/handler/pending.rs                  | 16 +++++-----
 swarm/tests/connection_close.rs               |  6 ++--
 swarm/tests/listener.rs                       |  3 +-
 swarm/tests/swarm_derive.rs                   | 10 +++----
 65 files changed, 168 insertions(+), 193 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5e41d3bdf8..5ef3a17a4a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1570,7 +1570,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
 ]
 
 [[package]]
@@ -2586,7 +2585,6 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-swarm-derive",
  "libp2p-swarm-test",
- "void",
 ]
 
 [[package]]
@@ -2615,7 +2613,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -2633,7 +2630,6 @@ dependencies = [
  "libp2p-swarm-test",
  "quickcheck-ext",
  "rand 0.8.5",
- "void",
 ]
 
 [[package]]
@@ -2663,7 +2659,6 @@ dependencies = [
  "thiserror",
  "tracing",
  "unsigned-varint 0.8.0",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -2697,7 +2692,6 @@ dependencies = [
  "thiserror",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -2772,7 +2766,6 @@ dependencies = [
  "smallvec",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -2797,7 +2790,6 @@ dependencies = [
  "thiserror",
  "tracing",
  "tracing-subscriber",
- "void",
 ]
 
 [[package]]
@@ -2825,7 +2817,6 @@ dependencies = [
  "sha2 0.10.8",
  "thiserror",
  "tracing",
- "void",
  "zeroize",
 ]
 
@@ -2860,7 +2851,6 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "uint",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -2887,7 +2877,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
 ]
 
 [[package]]
@@ -2905,7 +2894,6 @@ dependencies = [
  "rand 0.8.5",
  "sysinfo",
  "tracing",
- "void",
 ]
 
 [[package]]
@@ -3015,7 +3003,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -3035,7 +3022,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -3132,7 +3118,6 @@ dependencies = [
  "thiserror",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -3162,7 +3147,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -3191,7 +3175,6 @@ dependencies = [
  "smallvec",
  "tracing",
  "tracing-subscriber",
- "void",
  "web-time 1.1.0",
 ]
 
@@ -3228,7 +3211,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "void",
 ]
 
 [[package]]
@@ -3261,7 +3243,6 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "trybuild",
- "void",
  "wasm-bindgen-futures",
  "web-time 1.1.0",
 ]
@@ -3356,7 +3337,6 @@ dependencies = [
  "libp2p-swarm",
  "tokio",
  "tracing",
- "void",
 ]
 
 [[package]]
@@ -6507,12 +6487,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "waitgroup"
 version = "0.1.2"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 8a083276e7f..d8260e14d1f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -31,7 +31,6 @@ smallvec = "1.13.2"
 thiserror = "1.0"
 tracing = { workspace = true }
 unsigned-varint = { workspace = true }
-void = "1"
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
diff --git a/core/src/lib.rs b/core/src/lib.rs
index a42f56773df..ab5afbedae4 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -66,3 +66,13 @@ pub use upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 #[derive(Debug, thiserror::Error)]
 #[error(transparent)]
 pub struct DecodeError(quick_protobuf::Error);
+
+pub mod util {
+    use std::convert::Infallible;
+
+    /// A safe version of [`std::intrinsics::unreachable`].
+    #[inline(always)]
+    pub fn unreachable(x: Infallible) -> ! {
+        match x {}
+    }
+}
diff --git a/core/src/upgrade/denied.rs b/core/src/upgrade/denied.rs
index 353a184822d..568bbfb056d 100644
--- a/core/src/upgrade/denied.rs
+++ b/core/src/upgrade/denied.rs
@@ -20,8 +20,8 @@
 
 use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use futures::future;
+use std::convert::Infallible;
 use std::iter;
-use void::Void;
 
 /// Dummy implementation of `UpgradeInfo`/`InboundUpgrade`/`OutboundUpgrade` that doesn't support
 /// any protocol.
@@ -38,8 +38,8 @@ impl UpgradeInfo for DeniedUpgrade {
 }
 
 impl<C> InboundUpgrade<C> for DeniedUpgrade {
-    type Output = Void;
-    type Error = Void;
+    type Output = Infallible;
+    type Error = Infallible;
     type Future = future::Pending<Result<Self::Output, Self::Error>>;
 
     fn upgrade_inbound(self, _: C, _: Self::Info) -> Self::Future {
@@ -48,8 +48,8 @@ impl<C> InboundUpgrade<C> for DeniedUpgrade {
 }
 
 impl<C> OutboundUpgrade<C> for DeniedUpgrade {
-    type Output = Void;
-    type Error = Void;
+    type Output = Infallible;
+    type Error = Infallible;
     type Future = future::Pending<Result<Self::Output, Self::Error>>;
 
     fn upgrade_outbound(self, _: C, _: Self::Info) -> Self::Future {
diff --git a/core/src/upgrade/pending.rs b/core/src/upgrade/pending.rs
index 6931e20bfdc..5e3c65422f1 100644
--- a/core/src/upgrade/pending.rs
+++ b/core/src/upgrade/pending.rs
@@ -21,8 +21,8 @@
 
 use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use futures::future;
+use std::convert::Infallible;
 use std::iter;
-use void::Void;
 
 /// Implementation of [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`] that always
 /// returns a pending upgrade.
@@ -53,8 +53,8 @@ impl<C, P> InboundUpgrade<C> for PendingUpgrade<P>
 where
     P: AsRef<str> + Clone,
 {
-    type Output = Void;
-    type Error = Void;
+    type Output = Infallible;
+    type Error = Infallible;
     type Future = future::Pending<Result<Self::Output, Self::Error>>;
 
     fn upgrade_inbound(self, _: C, _: Self::Info) -> Self::Future {
@@ -66,8 +66,8 @@ impl<C, P> OutboundUpgrade<C> for PendingUpgrade<P>
 where
     P: AsRef<str> + Clone,
 {
-    type Output = Void;
-    type Error = Void;
+    type Output = Infallible;
+    type Error = Infallible;
     type Future = future::Pending<Result<Self::Output, Self::Error>>;
 
     fn upgrade_outbound(self, _: C, _: Self::Info) -> Self::Future {
diff --git a/core/src/upgrade/ready.rs b/core/src/upgrade/ready.rs
index 7e235902651..13270aa8b6d 100644
--- a/core/src/upgrade/ready.rs
+++ b/core/src/upgrade/ready.rs
@@ -21,8 +21,8 @@
 
 use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use futures::future;
+use std::convert::Infallible;
 use std::iter;
-use void::Void;
 
 /// Implementation of [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`] that directly yields the substream.
 #[derive(Debug, Copy, Clone)]
@@ -53,7 +53,7 @@ where
     P: AsRef<str> + Clone,
 {
     type Output = C;
-    type Error = Void;
+    type Error = Infallible;
     type Future = future::Ready<Result<Self::Output, Self::Error>>;
 
     fn upgrade_inbound(self, stream: C, _: Self::Info) -> Self::Future {
@@ -66,7 +66,7 @@ where
     P: AsRef<str> + Clone,
 {
     type Output = C;
-    type Error = Void;
+    type Error = Infallible;
     type Future = future::Ready<Result<Self::Output, Self::Error>>;
 
     fn upgrade_outbound(self, stream: C, _: Self::Info) -> Self::Future {
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index 7cbb96cc7ed..d098ce44317 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -16,7 +16,6 @@ futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-void = "1.0.2"
 
 [lints]
 workspace = true
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index cb0b8cb000e..370533eed58 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -26,7 +26,6 @@ sec1 = { version = "0.7", default-features = false, optional = true }
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = { version = "0.10.8", optional = true }
 thiserror = { version = "1.0", optional = true }
-void = { version = "1.0", optional = true }
 zeroize = { version = "1.8", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -34,7 +33,7 @@ ring = { workspace = true, features = ["alloc", "std"], optional = true }
 
 [features]
 secp256k1 = ["dep:libsecp256k1", "dep:asn1_der", "dep:sha2", "dep:hkdf", "dep:zeroize"]
-ecdsa = ["dep:p256", "dep:void", "dep:zeroize", "dep:sec1", "dep:sha2", "dep:hkdf"]
+ecdsa = ["dep:p256", "dep:zeroize", "dep:sec1", "dep:sha2", "dep:hkdf"]
 rsa = ["dep:ring", "dep:asn1_der", "dep:rand", "dep:zeroize"]
 ed25519 = ["dep:ed25519-dalek", "dep:zeroize", "dep:sha2", "dep:hkdf"]
 peerid = ["dep:multihash", "dep:bs58", "dep:thiserror", "dep:sha2", "dep:hkdf"]
diff --git a/identity/src/ecdsa.rs b/identity/src/ecdsa.rs
index 65cbe885b86..922675097df 100644
--- a/identity/src/ecdsa.rs
+++ b/identity/src/ecdsa.rs
@@ -32,7 +32,7 @@ use p256::{
     EncodedPoint,
 };
 use sec1::{DecodeEcPrivateKey, EncodeEcPrivateKey};
-use void::Void;
+use std::convert::Infallible;
 use zeroize::Zeroize;
 
 /// An ECDSA keypair generated using `secp256r1` curve.
@@ -182,7 +182,10 @@ impl PublicKey {
     /// Try to decode a public key from a DER encoded byte buffer as defined by SEC1 standard.
     pub fn try_decode_der(k: &[u8]) -> Result<PublicKey, DecodingError> {
         let buf = Self::del_asn1_header(k).ok_or_else(|| {
-            DecodingError::failed_to_parse::<Void, _>("ASN.1-encoded ecdsa p256 public key", None)
+            DecodingError::failed_to_parse::<Infallible, _>(
+                "ASN.1-encoded ecdsa p256 public key",
+                None,
+            )
         })?;
         Self::try_from_bytes(buf)
     }
diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml
index 1ff0ccff906..c169be87056 100644
--- a/misc/allow-block-list/Cargo.toml
+++ b/misc/allow-block-list/Cargo.toml
@@ -13,7 +13,6 @@ categories = ["network-programming", "asynchronous"]
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
-void = "1"
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
diff --git a/misc/allow-block-list/src/lib.rs b/misc/allow-block-list/src/lib.rs
index 56de29d1985..f93cf4ffefa 100644
--- a/misc/allow-block-list/src/lib.rs
+++ b/misc/allow-block-list/src/lib.rs
@@ -69,9 +69,9 @@ use libp2p_swarm::{
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use std::collections::{HashSet, VecDeque};
+use std::convert::Infallible;
 use std::fmt;
 use std::task::{Context, Poll, Waker};
-use void::Void;
 
 /// A [`NetworkBehaviour`] that can act as an allow or block list.
 #[derive(Default, Debug)]
@@ -222,7 +222,7 @@ where
     S: Enforce,
 {
     type ConnectionHandler = dummy::ConnectionHandler;
-    type ToSwarm = Void;
+    type ToSwarm = Infallible;
 
     fn handle_established_inbound_connection(
         &mut self,
@@ -273,7 +273,7 @@ where
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn poll(
diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml
index 56fe97f984b..0d17cb74862 100644
--- a/misc/connection-limits/Cargo.toml
+++ b/misc/connection-limits/Cargo.toml
@@ -13,7 +13,6 @@ categories = ["network-programming", "asynchronous"]
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
-void = "1"
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
diff --git a/misc/connection-limits/src/lib.rs b/misc/connection-limits/src/lib.rs
index 05a9b639f26..016a7f2cfd4 100644
--- a/misc/connection-limits/src/lib.rs
+++ b/misc/connection-limits/src/lib.rs
@@ -26,9 +26,9 @@ use libp2p_swarm::{
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use std::collections::{HashMap, HashSet};
+use std::convert::Infallible;
 use std::fmt;
 use std::task::{Context, Poll};
-use void::Void;
 
 /// A [`NetworkBehaviour`] that enforces a set of [`ConnectionLimits`].
 ///
@@ -203,7 +203,7 @@ impl ConnectionLimits {
 
 impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = dummy::ConnectionHandler;
-    type ToSwarm = Void;
+    type ToSwarm = Infallible;
 
     fn handle_pending_inbound_connection(
         &mut self,
@@ -357,7 +357,7 @@ impl NetworkBehaviour for Behaviour {
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
@@ -551,7 +551,7 @@ mod tests {
 
     impl NetworkBehaviour for ConnectionDenier {
         type ConnectionHandler = dummy::ConnectionHandler;
-        type ToSwarm = Void;
+        type ToSwarm = Infallible;
 
         fn handle_established_inbound_connection(
             &mut self,
@@ -590,7 +590,7 @@ mod tests {
         ) {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            void::unreachable(event)
+            libp2p_core::util::unreachable(event)
         }
 
         fn poll(
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index f56ed33d5ad..19ae256e853 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -16,7 +16,6 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
 sysinfo = "0.30"
 tracing = { workspace = true }
-void = "1"
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes"] }
diff --git a/misc/memory-connection-limits/src/lib.rs b/misc/memory-connection-limits/src/lib.rs
index 757ff770487..e2a89977991 100644
--- a/misc/memory-connection-limits/src/lib.rs
+++ b/misc/memory-connection-limits/src/lib.rs
@@ -24,7 +24,7 @@ use libp2p_swarm::{
     dummy, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use void::Void;
+use std::convert::Infallible;
 
 use std::{
     fmt,
@@ -139,7 +139,7 @@ impl Behaviour {
 
 impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = dummy::ConnectionHandler;
-    type ToSwarm = Void;
+    type ToSwarm = Infallible;
 
     fn handle_pending_inbound_connection(
         &mut self,
@@ -192,7 +192,7 @@ impl NetworkBehaviour for Behaviour {
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
diff --git a/misc/memory-connection-limits/tests/util/mod.rs b/misc/memory-connection-limits/tests/util/mod.rs
index 01e8cd9f655..333b0ee135f 100644
--- a/misc/memory-connection-limits/tests/util/mod.rs
+++ b/misc/memory-connection-limits/tests/util/mod.rs
@@ -26,7 +26,7 @@ use libp2p_swarm::{
     dummy, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use void::Void;
+use std::convert::Infallible;
 
 #[derive(libp2p_swarm_derive::NetworkBehaviour)]
 #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
@@ -62,7 +62,7 @@ impl<const MEM_PENDING: usize, const MEM_ESTABLISHED: usize> NetworkBehaviour
     for ConsumeMemoryBehaviour<MEM_PENDING, MEM_ESTABLISHED>
 {
     type ConnectionHandler = dummy::ConnectionHandler;
-    type ToSwarm = Void;
+    type ToSwarm = Infallible;
 
     fn handle_pending_inbound_connection(
         &mut self,
@@ -118,7 +118,7 @@ impl<const MEM_PENDING: usize, const MEM_ESTABLISHED: usize> NetworkBehaviour
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 0c0e757641d..169006e7508 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -30,7 +30,6 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 rand_core = { version = "0.6", optional = true }
 thiserror = { version = "1.0.52", optional = true }
-void = { version = "1", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1", features = ["macros", "rt", "sync"]}
@@ -43,7 +42,7 @@ libp2p-swarm = { workspace = true, features = ["macros"]}
 [features]
 default = ["v1", "v2"]
 v1 = ["dep:libp2p-request-response", "dep:web-time", "dep:async-trait"]
-v2 = ["dep:bytes", "dep:either", "dep:futures-bounded", "dep:thiserror", "dep:void", "dep:rand_core"]
+v2 = ["dep:bytes", "dep:either", "dep:futures-bounded", "dep:thiserror", "dep:rand_core"]
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/autonat/src/v2/client/handler/dial_back.rs b/protocols/autonat/src/v2/client/handler/dial_back.rs
index 98a41a82504..b3b3a59c02d 100644
--- a/protocols/autonat/src/v2/client/handler/dial_back.rs
+++ b/protocols/autonat/src/v2/client/handler/dial_back.rs
@@ -11,7 +11,7 @@ use libp2p_swarm::{
     handler::{ConnectionEvent, FullyNegotiatedInbound, ListenUpgradeError},
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
 };
-use void::Void;
+use std::convert::Infallible;
 
 use crate::v2::{protocol, Nonce, DIAL_BACK_PROTOCOL};
 
@@ -28,7 +28,7 @@ impl Handler {
 }
 
 impl ConnectionHandler for Handler {
-    type FromBehaviour = Void;
+    type FromBehaviour = Infallible;
     type ToBehaviour = IncomingNonce;
     type InboundProtocol = ReadyUpgrade<StreamProtocol>;
     type OutboundProtocol = DeniedUpgrade;
@@ -86,7 +86,7 @@ impl ConnectionHandler for Handler {
             // TODO: remove when Rust 1.82 is MSRVprotocols/autonat/src/v2/client/handler/dial_back.rs
             #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { error, .. }) => {
-                void::unreachable(error);
+                libp2p_core::util::unreachable(error);
             }
             _ => {}
         }
diff --git a/protocols/autonat/src/v2/client/handler/dial_request.rs b/protocols/autonat/src/v2/client/handler/dial_request.rs
index 85ad176ec30..0f303167523 100644
--- a/protocols/autonat/src/v2/client/handler/dial_request.rs
+++ b/protocols/autonat/src/v2/client/handler/dial_request.rs
@@ -15,6 +15,7 @@ use libp2p_swarm::{
 };
 use std::{
     collections::VecDeque,
+    convert::Infallible,
     io,
     iter::{once, repeat},
     task::{Context, Poll},
@@ -208,7 +209,7 @@ impl ConnectionHandler for Handler {
 
 async fn start_stream_handle(
     req: DialRequest,
-    stream_recv: oneshot::Receiver<Result<Stream, StreamUpgradeError<void::Void>>>,
+    stream_recv: oneshot::Receiver<Result<Stream, StreamUpgradeError<Infallible>>>,
 ) -> Result<(Multiaddr, usize), Error> {
     let stream = stream_recv
         .await
@@ -218,7 +219,7 @@ async fn start_stream_handle(
             StreamUpgradeError::Timeout => Error::Io(io::ErrorKind::TimedOut.into()),
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            StreamUpgradeError::Apply(v) => void::unreachable(v),
+            StreamUpgradeError::Apply(v) => libp2p_core::util::unreachable(v),
             StreamUpgradeError::Io(e) => Error::Io(e),
         })?;
 
diff --git a/protocols/autonat/src/v2/server/behaviour.rs b/protocols/autonat/src/v2/server/behaviour.rs
index 9264c728fe4..027cfff7c13 100644
--- a/protocols/autonat/src/v2/server/behaviour.rs
+++ b/protocols/autonat/src/v2/server/behaviour.rs
@@ -114,7 +114,7 @@ where
             }
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            Either::Left(Either::Right(v)) => void::unreachable(v),
+            Either::Left(Either::Right(v)) => libp2p_core::util::unreachable(v),
             Either::Right(Either::Left(cmd)) => {
                 let addr = cmd.addr.clone();
                 let opts = DialOpts::peer_id(peer_id)
diff --git a/protocols/autonat/src/v2/server/handler/dial_request.rs b/protocols/autonat/src/v2/server/handler/dial_request.rs
index 14ddb153416..5058e0f3f42 100644
--- a/protocols/autonat/src/v2/server/handler/dial_request.rs
+++ b/protocols/autonat/src/v2/server/handler/dial_request.rs
@@ -1,4 +1,5 @@
 use std::{
+    convert::Infallible,
     io,
     task::{Context, Poll},
     time::Duration,
@@ -73,7 +74,7 @@ impl<R> ConnectionHandler for Handler<R>
 where
     R: RngCore + Send + Clone + 'static,
 {
-    type FromBehaviour = void::Void;
+    type FromBehaviour = Infallible;
     type ToBehaviour = Either<DialBackCommand, Event>;
     type InboundProtocol = ReadyUpgrade<StreamProtocol>;
     type OutboundProtocol = DeniedUpgrade;
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 6b1d04f82f5..c470291af0d 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -23,7 +23,6 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 thiserror = "1.0"
 tracing = { workspace = true }
-void = "1"
 lru = "0.12.3"
 futures-bounded = { workspace = true }
 
diff --git a/protocols/dcutr/src/behaviour.rs b/protocols/dcutr/src/behaviour.rs
index babd56bd28e..7d0366c98bc 100644
--- a/protocols/dcutr/src/behaviour.rs
+++ b/protocols/dcutr/src/behaviour.rs
@@ -36,10 +36,10 @@ use libp2p_swarm::{
 use libp2p_swarm::{NetworkBehaviour, NotifyHandler, THandlerInEvent, ToSwarm};
 use lru::LruCache;
 use std::collections::{HashMap, HashSet, VecDeque};
+use std::convert::Infallible;
 use std::num::NonZeroUsize;
 use std::task::{Context, Poll};
 use thiserror::Error;
-use void::Void;
 
 pub(crate) const MAX_NUMBER_OF_UPGRADE_ATTEMPTS: u8 = 3;
 
@@ -68,7 +68,7 @@ enum InnerError {
 
 pub struct Behaviour {
     /// Queue of actions to return when polled.
-    queued_events: VecDeque<ToSwarm<Event, Either<handler::relayed::Command, Void>>>,
+    queued_events: VecDeque<ToSwarm<Event, Either<handler::relayed::Command, Infallible>>>,
 
     /// All direct (non-relayed) connections.
     direct_connections: HashMap<PeerId, HashSet<ConnectionId>>,
@@ -316,7 +316,7 @@ impl NetworkBehaviour for Behaviour {
             }
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            Either::Right(never) => void::unreachable(never),
+            Either::Right(never) => libp2p_core::util::unreachable(never),
         };
     }
 
diff --git a/protocols/dcutr/src/handler/relayed.rs b/protocols/dcutr/src/handler/relayed.rs
index 72af9fec264..ad12a196cb9 100644
--- a/protocols/dcutr/src/handler/relayed.rs
+++ b/protocols/dcutr/src/handler/relayed.rs
@@ -117,7 +117,7 @@ impl Handler {
             // A connection listener denies all incoming substreams, thus none can ever be fully negotiated.
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            future::Either::Right(output) => void::unreachable(output),
+            future::Either::Right(output) => libp2p_core::util::unreachable(output),
         }
     }
 
@@ -157,7 +157,7 @@ impl Handler {
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(error.into_inner());
+        libp2p_core::util::unreachable(error.into_inner());
     }
 
     fn on_dial_upgrade_error(
@@ -170,7 +170,7 @@ impl Handler {
         let error = match error {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            StreamUpgradeError::Apply(v) => void::unreachable(v),
+            StreamUpgradeError::Apply(v) => libp2p_core::util::unreachable(v),
             StreamUpgradeError::NegotiationFailed => outbound::Error::Unsupported,
             StreamUpgradeError::Io(e) => outbound::Error::Io(e),
             StreamUpgradeError::Timeout => outbound::Error::Io(io::ErrorKind::TimedOut.into()),
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 734ac36a231..1416cdb8de3 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -36,7 +36,6 @@ serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 smallvec = "1.13.2"
 tracing = { workspace = true }
-void = "1.0.2"
 
 # Metrics dependencies
 prometheus-client = { workspace = true }
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
index 8e3b3a8b022..0ccea667268 100644
--- a/protocols/gossipsub/src/handler.rs
+++ b/protocols/gossipsub/src/handler.rs
@@ -495,7 +495,7 @@ impl ConnectionHandler for Handler {
                         Either::Left(protocol) => handler.on_fully_negotiated_inbound(protocol),
                         // TODO: remove when Rust 1.82 is MSRV
                         #[allow(unreachable_patterns)]
-                        Either::Right(v) => void::unreachable(v),
+                        Either::Right(v) => libp2p_core::util::unreachable(v),
                     },
                     ConnectionEvent::FullyNegotiatedOutbound(fully_negotiated_outbound) => {
                         handler.on_fully_negotiated_outbound(fully_negotiated_outbound)
@@ -511,7 +511,7 @@ impl ConnectionHandler for Handler {
                     ConnectionEvent::DialUpgradeError(DialUpgradeError {
                         error: StreamUpgradeError::Apply(e),
                         ..
-                    }) => void::unreachable(e),
+                    }) => libp2p_core::util::unreachable(e),
                     ConnectionEvent::DialUpgradeError(DialUpgradeError {
                         error: StreamUpgradeError::NegotiationFailed,
                         ..
diff --git a/protocols/gossipsub/src/protocol.rs b/protocols/gossipsub/src/protocol.rs
index c13caae58b6..13edecd5846 100644
--- a/protocols/gossipsub/src/protocol.rs
+++ b/protocols/gossipsub/src/protocol.rs
@@ -34,8 +34,8 @@ use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_identity::{PeerId, PublicKey};
 use libp2p_swarm::StreamProtocol;
 use quick_protobuf::Writer;
+use std::convert::Infallible;
 use std::pin::Pin;
-use void::Void;
 
 pub(crate) const SIGNING_PREFIX: &[u8] = b"libp2p-pubsub:";
 
@@ -102,7 +102,7 @@ where
     TSocket: AsyncRead + AsyncWrite + Unpin + Send + 'static,
 {
     type Output = (Framed<TSocket, GossipsubCodec>, PeerKind);
-    type Error = Void;
+    type Error = Infallible;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Output, Self::Error>> + Send>>;
 
     fn upgrade_inbound(self, socket: TSocket, protocol_id: Self::Info) -> Self::Future {
@@ -121,7 +121,7 @@ where
     TSocket: AsyncWrite + AsyncRead + Unpin + Send + 'static,
 {
     type Output = (Framed<TSocket, GossipsubCodec>, PeerKind);
-    type Error = Void;
+    type Error = Infallible;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Output, Self::Error>> + Send>>;
 
     fn upgrade_outbound(self, socket: TSocket, protocol_id: Self::Info) -> Self::Future {
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 13c43b6a71f..87b3ed63774 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -24,7 +24,6 @@ quick-protobuf = "0.8"
 smallvec = "1.13.2"
 thiserror = "1.0"
 tracing = { workspace = true }
-void = "1.0"
 either = "1.12.0"
 
 [dev-dependencies]
diff --git a/protocols/identify/src/handler.rs b/protocols/identify/src/handler.rs
index f9b77e0b63a..dd073d50ed6 100644
--- a/protocols/identify/src/handler.rs
+++ b/protocols/identify/src/handler.rs
@@ -398,7 +398,7 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(DialUpgradeError { error, .. }) => {
                 self.events.push(ConnectionHandlerEvent::NotifyBehaviour(
                     Event::IdentificationError(
-                        error.map_upgrade_err(|e| void::unreachable(e.into_inner())),
+                        error.map_upgrade_err(|e| libp2p_core::util::unreachable(e.into_inner())),
                     ),
                 ));
                 self.trigger_next_identify.reset(self.interval);
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 5b95b8ac17d..11df81afbf8 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -27,7 +27,6 @@ rand = "0.8"
 sha2 = "0.10.8"
 smallvec = "1.13.2"
 uint = "0.9"
-void = "1.0"
 futures-timer = "3.0.3"
 web-time = { workspace = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
index 17c483da709..384ebc3f2b1 100644
--- a/protocols/kad/src/handler.rs
+++ b/protocols/kad/src/handler.rs
@@ -498,12 +498,12 @@ impl Handler {
         >,
     ) {
         // If `self.allow_listening` is false, then we produced a `DeniedUpgrade` and `protocol`
-        // is a `Void`.
+        // is a `Infallible`.
         let protocol = match protocol {
             future::Either::Left(p) => p,
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            future::Either::Right(p) => void::unreachable(p),
+            future::Either::Right(p) => libp2p_core::util::unreachable(p),
         };
 
         if self.protocol_status.is_none() {
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 19ae5ce9f36..338501aa896 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -25,7 +25,6 @@ socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { workspace = true, default-features = false, features = ["net", "time"], optional = true}
 tracing = { workspace = true }
 hickory-proto = { version = "0.24.1", default-features = false, features = ["mdns"] }
-void = "1.0.2"
 
 [features]
 tokio = ["dep:tokio", "if-watch/tokio"]
diff --git a/protocols/mdns/src/behaviour.rs b/protocols/mdns/src/behaviour.rs
index 6355fbf4943..cecd27bf78b 100644
--- a/protocols/mdns/src/behaviour.rs
+++ b/protocols/mdns/src/behaviour.rs
@@ -275,7 +275,7 @@ where
         _: ConnectionId,
         ev: THandlerOutEvent<Self>,
     ) {
-        void::unreachable(ev)
+        libp2p_core::util::unreachable(ev)
     }
 
     fn on_swarm_event(&mut self, event: FromSwarm) {
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 398bdce65ec..a1a6128c6ed 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -32,7 +32,6 @@ thiserror = "1.0"
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
-void = "1"
 
 [dev-dependencies]
 rand = "0.8"
diff --git a/protocols/perf/src/client.rs b/protocols/perf/src/client.rs
index c4614e979db..9f984a5bba1 100644
--- a/protocols/perf/src/client.rs
+++ b/protocols/perf/src/client.rs
@@ -25,7 +25,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 
 pub use behaviour::{Behaviour, Event};
 use libp2p_swarm::StreamUpgradeError;
-use void::Void;
+use std::convert::Infallible;
 
 static NEXT_RUN_ID: AtomicUsize = AtomicUsize::new(1);
 
@@ -43,7 +43,7 @@ impl RunId {
 #[derive(thiserror::Error, Debug)]
 pub enum RunError {
     #[error(transparent)]
-    Upgrade(#[from] StreamUpgradeError<Void>),
+    Upgrade(#[from] StreamUpgradeError<Infallible>),
     #[error("Failed to execute perf run: {0}")]
     Io(#[from] std::io::Error),
 }
diff --git a/protocols/perf/src/client/handler.rs b/protocols/perf/src/client/handler.rs
index 55fafad7fcc..85e864949f8 100644
--- a/protocols/perf/src/client/handler.rs
+++ b/protocols/perf/src/client/handler.rs
@@ -116,7 +116,7 @@ impl ConnectionHandler for Handler {
             #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                 protocol, ..
-            }) => void::unreachable(protocol),
+            }) => libp2p_core::util::unreachable(protocol),
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                 protocol,
                 info: (),
@@ -149,7 +149,7 @@ impl ConnectionHandler for Handler {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { info: (), error }) => {
-                void::unreachable(error)
+                libp2p_core::util::unreachable(error)
             }
             _ => {}
         }
diff --git a/protocols/perf/src/server/handler.rs b/protocols/perf/src/server/handler.rs
index 4cb535a452c..c1363ae2380 100644
--- a/protocols/perf/src/server/handler.rs
+++ b/protocols/perf/src/server/handler.rs
@@ -29,8 +29,8 @@ use libp2p_swarm::{
     },
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
 };
+use std::convert::Infallible;
 use tracing::error;
-use void::Void;
 
 use crate::Run;
 
@@ -61,11 +61,11 @@ impl Default for Handler {
 }
 
 impl ConnectionHandler for Handler {
-    type FromBehaviour = Void;
+    type FromBehaviour = Infallible;
     type ToBehaviour = Event;
     type InboundProtocol = ReadyUpgrade<StreamProtocol>;
     type OutboundProtocol = DeniedUpgrade;
-    type OutboundOpenInfo = Void;
+    type OutboundOpenInfo = Infallible;
     type InboundOpenInfo = ();
 
     fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
@@ -75,7 +75,7 @@ impl ConnectionHandler for Handler {
     fn on_behaviour_event(&mut self, v: Self::FromBehaviour) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(v)
+        libp2p_core::util::unreachable(v)
     }
 
     fn on_connection_event(
@@ -103,13 +103,13 @@ impl ConnectionHandler for Handler {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound { info, .. }) => {
-                void::unreachable(info)
+                libp2p_core::util::unreachable(info)
             }
 
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::DialUpgradeError(DialUpgradeError { info, .. }) => {
-                void::unreachable(info)
+                libp2p_core::util::unreachable(info)
             }
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::LocalProtocolsChange(_)
@@ -117,7 +117,7 @@ impl ConnectionHandler for Handler {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { info: (), error }) => {
-                void::unreachable(error)
+                libp2p_core::util::unreachable(error)
             }
             _ => {}
         }
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 794ab54ba42..755ebd35718 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -20,7 +20,6 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 rand = "0.8"
 tracing = { workspace = true }
-void = "1.0"
 
 [dev-dependencies]
 libp2p-swarm = { workspace = true, features = ["macros"] }
diff --git a/protocols/ping/src/handler.rs b/protocols/ping/src/handler.rs
index 7b36b2d4b3d..961716e934a 100644
--- a/protocols/ping/src/handler.rs
+++ b/protocols/ping/src/handler.rs
@@ -31,13 +31,13 @@ use libp2p_swarm::{
     SubstreamProtocol,
 };
 use std::collections::VecDeque;
+use std::convert::Infallible;
 use std::{
     error::Error,
     fmt, io,
     task::{Context, Poll},
     time::Duration,
 };
-use void::Void;
 
 /// The configuration for outbound pings.
 #[derive(Debug, Clone)]
@@ -212,7 +212,7 @@ impl Handler {
             },
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            StreamUpgradeError::Apply(e) => void::unreachable(e),
+            StreamUpgradeError::Apply(e) => libp2p_core::util::unreachable(e),
             StreamUpgradeError::Io(e) => Failure::Other { error: Box::new(e) },
         };
 
@@ -221,7 +221,7 @@ impl Handler {
 }
 
 impl ConnectionHandler for Handler {
-    type FromBehaviour = Void;
+    type FromBehaviour = Infallible;
     type ToBehaviour = Result<Duration, Failure>;
     type InboundProtocol = ReadyUpgrade<StreamProtocol>;
     type OutboundProtocol = ReadyUpgrade<StreamProtocol>;
@@ -232,7 +232,7 @@ impl ConnectionHandler for Handler {
         SubstreamProtocol::new(ReadyUpgrade::new(PROTOCOL_NAME), ())
     }
 
-    fn on_behaviour_event(&mut self, _: Void) {}
+    fn on_behaviour_event(&mut self, _: Infallible) {}
 
     #[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, cx))]
     fn poll(
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 084fec07efd..a3a659619b6 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -27,7 +27,6 @@ rand = "0.8.4"
 static_assertions = "1"
 thiserror = "1.0"
 tracing = { workspace = true }
-void = "1"
 
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
diff --git a/protocols/relay/src/behaviour.rs b/protocols/relay/src/behaviour.rs
index 46419ae64e3..e854ed2a1ff 100644
--- a/protocols/relay/src/behaviour.rs
+++ b/protocols/relay/src/behaviour.rs
@@ -368,7 +368,7 @@ impl NetworkBehaviour for Behaviour {
             Either::Left(e) => e,
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            Either::Right(v) => void::unreachable(v),
+            Either::Right(v) => libp2p_core::util::unreachable(v),
         };
 
         match event {
diff --git a/protocols/relay/src/behaviour/handler.rs b/protocols/relay/src/behaviour/handler.rs
index 23e90f4b3f8..92e45720f3f 100644
--- a/protocols/relay/src/behaviour/handler.rs
+++ b/protocols/relay/src/behaviour/handler.rs
@@ -451,7 +451,7 @@ impl Handler {
             StreamUpgradeError::Io(e) => outbound_stop::Error::Io(e),
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            StreamUpgradeError::Apply(v) => void::unreachable(v),
+            StreamUpgradeError::Apply(v) => libp2p_core::util::unreachable(v),
         };
 
         let stop_command = self
diff --git a/protocols/relay/src/priv_client.rs b/protocols/relay/src/priv_client.rs
index 8bbc813ec4c..fc9d28e66ed 100644
--- a/protocols/relay/src/priv_client.rs
+++ b/protocols/relay/src/priv_client.rs
@@ -44,11 +44,11 @@ use libp2p_swarm::{
     NotifyHandler, Stream, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use std::collections::{hash_map, HashMap, VecDeque};
+use std::convert::Infallible;
 use std::io::{Error, ErrorKind, IoSlice};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use transport::Transport;
-use void::Void;
 
 /// The events produced by the client `Behaviour`.
 #[derive(Debug)]
@@ -93,7 +93,7 @@ pub struct Behaviour {
     reservation_addresses: HashMap<ConnectionId, (Multiaddr, ReservationStatus)>,
 
     /// Queue of actions to return when polled.
-    queued_actions: VecDeque<ToSwarm<Event, Either<handler::In, Void>>>,
+    queued_actions: VecDeque<ToSwarm<Event, Either<handler::In, Infallible>>>,
 
     pending_handler_commands: HashMap<ConnectionId, handler::In>,
 }
@@ -238,7 +238,7 @@ impl NetworkBehaviour for Behaviour {
             Either::Left(e) => e,
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            Either::Right(v) => void::unreachable(v),
+            Either::Right(v) => libp2p_core::util::unreachable(v),
         };
 
         let event = match handler_event {
diff --git a/protocols/relay/src/priv_client/handler.rs b/protocols/relay/src/priv_client/handler.rs
index 05fdd5673ae..77b7f94ae60 100644
--- a/protocols/relay/src/priv_client/handler.rs
+++ b/protocols/relay/src/priv_client/handler.rs
@@ -37,10 +37,10 @@ use libp2p_swarm::{
     SubstreamProtocol,
 };
 use std::collections::VecDeque;
+use std::convert::Infallible;
 use std::task::{Context, Poll};
 use std::time::Duration;
 use std::{fmt, io};
-use void::Void;
 
 /// The maximum number of circuits being denied concurrently.
 ///
@@ -106,7 +106,7 @@ pub struct Handler {
         >,
     >,
 
-    pending_streams: VecDeque<oneshot::Sender<Result<Stream, StreamUpgradeError<Void>>>>,
+    pending_streams: VecDeque<oneshot::Sender<Result<Stream, StreamUpgradeError<Infallible>>>>,
 
     inflight_reserve_requests: futures_bounded::FuturesTupleSet<
         Result<outbound_hop::Reservation, outbound_hop::ReserveError>,
@@ -447,7 +447,7 @@ impl ConnectionHandler for Handler {
             }
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            ConnectionEvent::ListenUpgradeError(ev) => void::unreachable(ev.error),
+            ConnectionEvent::ListenUpgradeError(ev) => libp2p_core::util::unreachable(ev.error),
             ConnectionEvent::DialUpgradeError(ev) => {
                 if let Some(next) = self.pending_streams.pop_front() {
                     let _ = next.send(Err(ev.error));
@@ -580,27 +580,27 @@ impl Reservation {
     }
 }
 
-fn into_reserve_error(e: StreamUpgradeError<Void>) -> outbound_hop::ReserveError {
+fn into_reserve_error(e: StreamUpgradeError<Infallible>) -> outbound_hop::ReserveError {
     match e {
         StreamUpgradeError::Timeout => {
             outbound_hop::ReserveError::Io(io::ErrorKind::TimedOut.into())
         }
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        StreamUpgradeError::Apply(never) => void::unreachable(never),
+        StreamUpgradeError::Apply(never) => libp2p_core::util::unreachable(never),
         StreamUpgradeError::NegotiationFailed => outbound_hop::ReserveError::Unsupported,
         StreamUpgradeError::Io(e) => outbound_hop::ReserveError::Io(e),
     }
 }
 
-fn into_connect_error(e: StreamUpgradeError<Void>) -> outbound_hop::ConnectError {
+fn into_connect_error(e: StreamUpgradeError<Infallible>) -> outbound_hop::ConnectError {
     match e {
         StreamUpgradeError::Timeout => {
             outbound_hop::ConnectError::Io(io::ErrorKind::TimedOut.into())
         }
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        StreamUpgradeError::Apply(never) => void::unreachable(never),
+        StreamUpgradeError::Apply(never) => libp2p_core::util::unreachable(never),
         StreamUpgradeError::NegotiationFailed => outbound_hop::ConnectError::Unsupported,
         StreamUpgradeError::Io(e) => outbound_hop::ConnectError::Io(e),
     }
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 78a6a1a0a4c..5aa70688dbe 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -26,7 +26,6 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 thiserror = "1"
 tracing = { workspace = true }
-void = "1"
 
 [dev-dependencies]
 libp2p-swarm = { workspace = true, features = ["macros", "tokio"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index c6b2eda348b..8376f3ce795 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -23,7 +23,6 @@ serde = { version = "1.0", optional = true}
 serde_json = { version = "1.0.117", optional = true }
 smallvec = "1.13.2"
 tracing = { workspace = true }
-void = "1.0.2"
 futures-timer = "3.0.3"
 futures-bounded = { workspace = true }
 
diff --git a/protocols/request-response/src/handler.rs b/protocols/request-response/src/handler.rs
index 0591b37dc30..dbd7a0708ce 100644
--- a/protocols/request-response/src/handler.rs
+++ b/protocols/request-response/src/handler.rs
@@ -242,7 +242,7 @@ where
             }
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            StreamUpgradeError::Apply(e) => void::unreachable(e),
+            StreamUpgradeError::Apply(e) => libp2p_core::util::unreachable(e),
             StreamUpgradeError::Io(e) => {
                 self.pending_events.push_back(Event::OutboundStreamFailed {
                     request_id: message.request_id,
@@ -260,7 +260,7 @@ where
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(error)
+        libp2p_core::util::unreachable(error)
     }
 }
 
diff --git a/protocols/request-response/src/handler/protocol.rs b/protocols/request-response/src/handler/protocol.rs
index 833cacdd6ce..a55faec2f16 100644
--- a/protocols/request-response/src/handler/protocol.rs
+++ b/protocols/request-response/src/handler/protocol.rs
@@ -23,6 +23,8 @@
 //! receives a request and sends a response, whereas the
 //! outbound upgrade send a request and receives a response.
 
+use std::convert::Infallible;
+
 use futures::future::{ready, Ready};
 use libp2p_core::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_swarm::Stream;
@@ -82,7 +84,7 @@ where
     P: AsRef<str> + Clone,
 {
     type Output = (Stream, P);
-    type Error = void::Void;
+    type Error = Infallible;
     type Future = Ready<Result<Self::Output, Self::Error>>;
 
     fn upgrade_inbound(self, io: Stream, protocol: Self::Info) -> Self::Future {
@@ -95,7 +97,7 @@ where
     P: AsRef<str> + Clone,
 {
     type Output = (Stream, P);
-    type Error = void::Void;
+    type Error = Infallible;
     type Future = Ready<Result<Self::Output, Self::Error>>;
 
     fn upgrade_outbound(self, io: Stream, protocol: Self::Info) -> Self::Future {
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index 9aa9559a2d6..cd83c5978fa 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -15,7 +15,6 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
 libp2p-swarm = { workspace = true }
 tracing = { workspace = true }
-void = "1"
 rand = "0.8"
 
 [dev-dependencies]
diff --git a/protocols/stream/src/behaviour.rs b/protocols/stream/src/behaviour.rs
index 07549ccef54..e72af8fbfce 100644
--- a/protocols/stream/src/behaviour.rs
+++ b/protocols/stream/src/behaviour.rs
@@ -124,7 +124,7 @@ impl NetworkBehaviour for Behaviour {
         _connection_id: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
-        void::unreachable(event);
+        libp2p_core::util::unreachable(event);
     }
 
     fn poll(
diff --git a/protocols/stream/src/handler.rs b/protocols/stream/src/handler.rs
index bf80e30c3c6..b7ec516d3b1 100644
--- a/protocols/stream/src/handler.rs
+++ b/protocols/stream/src/handler.rs
@@ -1,4 +1,5 @@
 use std::{
+    convert::Infallible,
     io,
     sync::{Arc, Mutex},
     task::{Context, Poll},
@@ -44,8 +45,8 @@ impl Handler {
 }
 
 impl ConnectionHandler for Handler {
-    type FromBehaviour = void::Void;
-    type ToBehaviour = void::Void;
+    type FromBehaviour = Infallible;
+    type ToBehaviour = Infallible;
     type InboundProtocol = Upgrade;
     type OutboundProtocol = Upgrade;
     type InboundOpenInfo = ();
@@ -98,7 +99,7 @@ impl ConnectionHandler for Handler {
     fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn on_connection_event(
@@ -147,7 +148,7 @@ impl ConnectionHandler for Handler {
                     }
                     // TODO: remove when Rust 1.82 is MSRV
                     #[allow(unreachable_patterns)]
-                    swarm::StreamUpgradeError::Apply(v) => void::unreachable(v),
+                    swarm::StreamUpgradeError::Apply(v) => libp2p_core::util::unreachable(v),
                     swarm::StreamUpgradeError::NegotiationFailed => {
                         OpenStreamError::UnsupportedProtocol(p)
                     }
diff --git a/protocols/stream/src/upgrade.rs b/protocols/stream/src/upgrade.rs
index ac9fb3ed992..bbe679f4a2c 100644
--- a/protocols/stream/src/upgrade.rs
+++ b/protocols/stream/src/upgrade.rs
@@ -1,4 +1,7 @@
-use std::future::{ready, Ready};
+use std::{
+    convert::Infallible,
+    future::{ready, Ready},
+};
 
 use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_swarm::{Stream, StreamProtocol};
@@ -20,7 +23,7 @@ impl UpgradeInfo for Upgrade {
 impl InboundUpgrade<Stream> for Upgrade {
     type Output = (Stream, StreamProtocol);
 
-    type Error = void::Void;
+    type Error = Infallible;
 
     type Future = Ready<Result<Self::Output, Self::Error>>;
 
@@ -32,7 +35,7 @@ impl InboundUpgrade<Stream> for Upgrade {
 impl OutboundUpgrade<Stream> for Upgrade {
     type Output = (Stream, StreamProtocol);
 
-    type Error = void::Void;
+    type Error = Infallible;
 
     type Future = Ready<Result<Self::Output, Self::Error>>;
 
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
index 209733f53e6..a069331b1ed 100644
--- a/protocols/upnp/Cargo.toml
+++ b/protocols/upnp/Cargo.toml
@@ -18,7 +18,6 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 tokio = { workspace = true, default-features = false, features = ["rt"], optional = true }
 tracing = { workspace = true }
-void = "1.0.2"
 
 [features]
 tokio = ["igd-next/aio_tokio", "dep:tokio"]
diff --git a/protocols/upnp/src/behaviour.rs b/protocols/upnp/src/behaviour.rs
index 29a7fbf84a4..ee985042b68 100644
--- a/protocols/upnp/src/behaviour.rs
+++ b/protocols/upnp/src/behaviour.rs
@@ -366,7 +366,7 @@ impl NetworkBehaviour for Behaviour {
         _connection_id: ConnectionId,
         event: libp2p_swarm::THandlerOutEvent<Self>,
     ) {
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     #[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self, cx))]
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index cdee67f3fb3..4c3b8821ed6 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -26,7 +26,6 @@ once_cell = "1.19.0"
 rand = "0.8"
 smallvec = "1.13.2"
 tracing = { workspace = true }
-void = "1"
 wasm-bindgen-futures = { version = "0.4.42", optional = true }
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
@@ -53,7 +52,6 @@ libp2p-swarm-test = { path = "../swarm-test" }                      # Using `pat
 libp2p-yamux = { path = "../muxers/yamux" }                         # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 quickcheck = { workspace = true }
 criterion = { version = "0.5", features = ["async_tokio"] }
-void = "1"
 once_cell = "1.19.0"
 trybuild = "1.0.95"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
diff --git a/swarm/src/behaviour/toggle.rs b/swarm/src/behaviour/toggle.rs
index 5d72534c91e..3dde364bf19 100644
--- a/swarm/src/behaviour/toggle.rs
+++ b/swarm/src/behaviour/toggle.rs
@@ -212,7 +212,7 @@ where
             future::Either::Left(out) => out,
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            future::Either::Right(v) => void::unreachable(v),
+            future::Either::Right(v) => libp2p_core::util::unreachable(v),
         };
 
         if let Either::Left(info) = info {
@@ -255,7 +255,7 @@ where
             Either::Left(e) => e,
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            Either::Right(v) => void::unreachable(v),
+            Either::Right(v) => libp2p_core::util::unreachable(v),
         };
 
         inner.on_connection_event(ConnectionEvent::ListenUpgradeError(ListenUpgradeError {
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 859d138b83a..78c007fd71d 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -775,10 +775,10 @@ mod tests {
     use libp2p_core::upgrade::{DeniedUpgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
     use libp2p_core::StreamMuxer;
     use quickcheck::*;
+    use std::convert::Infallible;
     use std::sync::{Arc, Weak};
     use std::time::Instant;
     use tracing_subscriber::EnvFilter;
-    use void::Void;
 
     #[test]
     fn max_negotiating_inbound_streams() {
@@ -1016,7 +1016,7 @@ mod tests {
 
     impl StreamMuxer for DummyStreamMuxer {
         type Substream = PendingSubstream;
-        type Error = Void;
+        type Error = Infallible;
 
         fn poll_inbound(
             self: Pin<&mut Self>,
@@ -1051,7 +1051,7 @@ mod tests {
 
     impl StreamMuxer for PendingStreamMuxer {
         type Substream = PendingSubstream;
-        type Error = Void;
+        type Error = Infallible;
 
         fn poll_inbound(
             self: Pin<&mut Self>,
@@ -1113,7 +1113,7 @@ mod tests {
 
     struct MockConnectionHandler {
         outbound_requested: bool,
-        error: Option<StreamUpgradeError<Void>>,
+        error: Option<StreamUpgradeError<Infallible>>,
         upgrade_timeout: Duration,
     }
 
@@ -1133,7 +1133,7 @@ mod tests {
 
     #[derive(Default)]
     struct ConfigurableProtocolConnectionHandler {
-        events: Vec<ConnectionHandlerEvent<DeniedUpgrade, (), Void>>,
+        events: Vec<ConnectionHandlerEvent<DeniedUpgrade, (), Infallible>>,
         active_protocols: HashSet<StreamProtocol>,
         local_added: Vec<Vec<StreamProtocol>>,
         local_removed: Vec<Vec<StreamProtocol>>,
@@ -1166,8 +1166,8 @@ mod tests {
     }
 
     impl ConnectionHandler for MockConnectionHandler {
-        type FromBehaviour = Void;
-        type ToBehaviour = Void;
+        type FromBehaviour = Infallible;
+        type ToBehaviour = Infallible;
         type InboundProtocol = DeniedUpgrade;
         type OutboundProtocol = DeniedUpgrade;
         type InboundOpenInfo = ();
@@ -1194,13 +1194,13 @@ mod tests {
                 ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                     protocol,
                     ..
-                }) => void::unreachable(protocol),
+                }) => libp2p_core::util::unreachable(protocol),
                 // TODO: remove when Rust 1.82 is MSRV
                 #[allow(unreachable_patterns)]
                 ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                     protocol,
                     ..
-                }) => void::unreachable(protocol),
+                }) => libp2p_core::util::unreachable(protocol),
                 ConnectionEvent::DialUpgradeError(DialUpgradeError { error, .. }) => {
                     self.error = Some(error)
                 }
@@ -1216,7 +1216,7 @@ mod tests {
         fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            void::unreachable(event)
+            libp2p_core::util::unreachable(event)
         }
 
         fn connection_keep_alive(&self) -> bool {
@@ -1246,8 +1246,8 @@ mod tests {
     }
 
     impl ConnectionHandler for ConfigurableProtocolConnectionHandler {
-        type FromBehaviour = Void;
-        type ToBehaviour = Void;
+        type FromBehaviour = Infallible;
+        type ToBehaviour = Infallible;
         type InboundProtocol = ManyProtocolsUpgrade;
         type OutboundProtocol = DeniedUpgrade;
         type InboundOpenInfo = ();
@@ -1293,7 +1293,7 @@ mod tests {
         fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            void::unreachable(event)
+            libp2p_core::util::unreachable(event)
         }
 
         fn connection_keep_alive(&self) -> bool {
@@ -1333,7 +1333,7 @@ mod tests {
 
     impl<C> InboundUpgrade<C> for ManyProtocolsUpgrade {
         type Output = C;
-        type Error = Void;
+        type Error = Infallible;
         type Future = future::Ready<Result<Self::Output, Self::Error>>;
 
         fn upgrade_inbound(self, stream: C, _: Self::Info) -> Self::Future {
@@ -1343,7 +1343,7 @@ mod tests {
 
     impl<C> OutboundUpgrade<C> for ManyProtocolsUpgrade {
         type Output = C;
-        type Error = Void;
+        type Error = Infallible;
         type Future = future::Ready<Result<Self::Output, Self::Error>>;
 
         fn upgrade_outbound(self, stream: C, _: Self::Info) -> Self::Future {
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index 07f6968dec9..b2accf745ef 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -40,6 +40,7 @@ use futures::{
 use libp2p_core::connection::Endpoint;
 use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
 use libp2p_core::transport::PortUse;
+use std::convert::Infallible;
 use std::task::Waker;
 use std::{
     collections::HashMap,
@@ -50,7 +51,6 @@ use std::{
     task::Poll,
 };
 use tracing::Instrument;
-use void::Void;
 use web_time::{Duration, Instant};
 
 mod concurrent_dial;
@@ -200,7 +200,7 @@ struct PendingConnection {
     peer_id: Option<PeerId>,
     endpoint: PendingPoint,
     /// When dropped, notifies the task which then knows to terminate.
-    abort_notifier: Option<oneshot::Sender<Void>>,
+    abort_notifier: Option<oneshot::Sender<Infallible>>,
     /// The moment we became aware of this possible connection, useful for timing metrics.
     accepted_at: Instant,
 }
diff --git a/swarm/src/connection/pool/task.rs b/swarm/src/connection/pool/task.rs
index 13977a17b85..3b808a30fd1 100644
--- a/swarm/src/connection/pool/task.rs
+++ b/swarm/src/connection/pool/task.rs
@@ -36,8 +36,8 @@ use futures::{
     SinkExt, StreamExt,
 };
 use libp2p_core::muxing::StreamMuxerBox;
+use std::convert::Infallible;
 use std::pin::Pin;
-use void::Void;
 
 /// Commands that can be sent to a task driving an established connection.
 #[derive(Debug)]
@@ -93,7 +93,7 @@ pub(crate) enum EstablishedConnectionEvent<ToBehaviour> {
 pub(crate) async fn new_for_pending_outgoing_connection(
     connection_id: ConnectionId,
     dial: ConcurrentDial,
-    abort_receiver: oneshot::Receiver<Void>,
+    abort_receiver: oneshot::Receiver<Infallible>,
     mut events: mpsc::Sender<PendingConnectionEvent>,
 ) {
     match futures::future::select(abort_receiver, Box::pin(dial)).await {
@@ -107,7 +107,7 @@ pub(crate) async fn new_for_pending_outgoing_connection(
         }
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        Either::Left((Ok(v), _)) => void::unreachable(v),
+        Either::Left((Ok(v), _)) => libp2p_core::util::unreachable(v),
         Either::Right((Ok((address, output, errors)), _)) => {
             let _ = events
                 .send(PendingConnectionEvent::ConnectionEstablished {
@@ -131,7 +131,7 @@ pub(crate) async fn new_for_pending_outgoing_connection(
 pub(crate) async fn new_for_pending_incoming_connection<TFut>(
     connection_id: ConnectionId,
     future: TFut,
-    abort_receiver: oneshot::Receiver<Void>,
+    abort_receiver: oneshot::Receiver<Infallible>,
     mut events: mpsc::Sender<PendingConnectionEvent>,
 ) where
     TFut: Future<Output = Result<(PeerId, StreamMuxerBox), std::io::Error>> + Send + 'static,
@@ -147,7 +147,7 @@ pub(crate) async fn new_for_pending_incoming_connection<TFut>(
         }
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        Either::Left((Ok(v), _)) => void::unreachable(v),
+        Either::Left((Ok(v), _)) => libp2p_core::util::unreachable(v),
         Either::Right((Ok(output), _)) => {
             let _ = events
                 .send(PendingConnectionEvent::ConnectionEstablished {
diff --git a/swarm/src/dummy.rs b/swarm/src/dummy.rs
index 0bd8c06862d..b87ef32c8f7 100644
--- a/swarm/src/dummy.rs
+++ b/swarm/src/dummy.rs
@@ -12,15 +12,15 @@ use libp2p_core::upgrade::DeniedUpgrade;
 use libp2p_core::Endpoint;
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
+use std::convert::Infallible;
 use std::task::{Context, Poll};
-use void::Void;
 
 /// Implementation of [`NetworkBehaviour`] that doesn't do anything.
 pub struct Behaviour;
 
 impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = ConnectionHandler;
-    type ToSwarm = Void;
+    type ToSwarm = Infallible;
 
     fn handle_established_inbound_connection(
         &mut self,
@@ -51,7 +51,7 @@ impl NetworkBehaviour for Behaviour {
     ) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
@@ -66,12 +66,12 @@ impl NetworkBehaviour for Behaviour {
 pub struct ConnectionHandler;
 
 impl crate::handler::ConnectionHandler for ConnectionHandler {
-    type FromBehaviour = Void;
-    type ToBehaviour = Void;
+    type FromBehaviour = Infallible;
+    type ToBehaviour = Infallible;
     type InboundProtocol = DeniedUpgrade;
     type OutboundProtocol = DeniedUpgrade;
     type InboundOpenInfo = ();
-    type OutboundOpenInfo = Void;
+    type OutboundOpenInfo = Infallible;
 
     fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
         SubstreamProtocol::new(DeniedUpgrade, ())
@@ -80,7 +80,7 @@ impl crate::handler::ConnectionHandler for ConnectionHandler {
     fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn poll(
@@ -106,19 +106,19 @@ impl crate::handler::ConnectionHandler for ConnectionHandler {
             #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                 protocol, ..
-            }) => void::unreachable(protocol),
+            }) => libp2p_core::util::unreachable(protocol),
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                 protocol, ..
-            }) => void::unreachable(protocol),
+            }) => libp2p_core::util::unreachable(protocol),
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::DialUpgradeError(DialUpgradeError { info: _, error }) => match error {
                 // TODO: remove when Rust 1.82 is MSRV
                 #[allow(unreachable_patterns)]
                 StreamUpgradeError::Timeout => unreachable!(),
-                StreamUpgradeError::Apply(e) => void::unreachable(e),
+                StreamUpgradeError::Apply(e) => libp2p_core::util::unreachable(e),
                 StreamUpgradeError::NegotiationFailed | StreamUpgradeError::Io(_) => {
                     unreachable!("Denied upgrade does not support any protocols")
                 }
diff --git a/swarm/src/handler/one_shot.rs b/swarm/src/handler/one_shot.rs
index fc1074b31e4..7c84f4bb11a 100644
--- a/swarm/src/handler/one_shot.rs
+++ b/swarm/src/handler/one_shot.rs
@@ -217,11 +217,11 @@ mod tests {
     use futures::executor::block_on;
     use futures::future::poll_fn;
     use libp2p_core::upgrade::DeniedUpgrade;
-    use void::Void;
+    use std::convert::Infallible;
 
     #[test]
     fn do_not_keep_idle_connection_alive() {
-        let mut handler: OneShotHandler<_, DeniedUpgrade, Void> = OneShotHandler::new(
+        let mut handler: OneShotHandler<_, DeniedUpgrade, Infallible> = OneShotHandler::new(
             SubstreamProtocol::new(DeniedUpgrade {}, ()),
             Default::default(),
         );
diff --git a/swarm/src/handler/pending.rs b/swarm/src/handler/pending.rs
index 9601f5cf78b..656a38849d5 100644
--- a/swarm/src/handler/pending.rs
+++ b/swarm/src/handler/pending.rs
@@ -24,8 +24,8 @@ use crate::handler::{
     FullyNegotiatedOutbound, SubstreamProtocol,
 };
 use libp2p_core::upgrade::PendingUpgrade;
+use std::convert::Infallible;
 use std::task::{Context, Poll};
-use void::Void;
 
 /// Implementation of [`ConnectionHandler`] that returns a pending upgrade.
 #[derive(Clone, Debug)]
@@ -40,11 +40,11 @@ impl PendingConnectionHandler {
 }
 
 impl ConnectionHandler for PendingConnectionHandler {
-    type FromBehaviour = Void;
-    type ToBehaviour = Void;
+    type FromBehaviour = Infallible;
+    type ToBehaviour = Infallible;
     type InboundProtocol = PendingUpgrade<String>;
     type OutboundProtocol = PendingUpgrade<String>;
-    type OutboundOpenInfo = Void;
+    type OutboundOpenInfo = Infallible;
     type InboundOpenInfo = ();
 
     fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo> {
@@ -54,7 +54,7 @@ impl ConnectionHandler for PendingConnectionHandler {
     fn on_behaviour_event(&mut self, v: Self::FromBehaviour) {
         // TODO: remove when Rust 1.82 is MSRV
         #[allow(unreachable_patterns)]
-        void::unreachable(v)
+        libp2p_core::util::unreachable(v)
     }
 
     fn poll(
@@ -80,17 +80,17 @@ impl ConnectionHandler for PendingConnectionHandler {
             #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedInbound(FullyNegotiatedInbound {
                 protocol, ..
-            }) => void::unreachable(protocol),
+            }) => libp2p_core::util::unreachable(protocol),
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::FullyNegotiatedOutbound(FullyNegotiatedOutbound {
                 protocol,
                 info: _info,
             }) => {
-                void::unreachable(protocol);
+                libp2p_core::util::unreachable(protocol);
                 #[allow(unreachable_code, clippy::used_underscore_binding)]
                 {
-                    void::unreachable(_info);
+                    libp2p_core::util::unreachable(_info);
                 }
             }
             // TODO: remove when Rust 1.82 is MSRV
diff --git a/swarm/tests/connection_close.rs b/swarm/tests/connection_close.rs
index 4d530f47684..1d1a25eb84b 100644
--- a/swarm/tests/connection_close.rs
+++ b/swarm/tests/connection_close.rs
@@ -9,8 +9,8 @@ use libp2p_swarm::{
     THandlerOutEvent, ToSwarm,
 };
 use libp2p_swarm_test::SwarmExt;
+use std::convert::Infallible;
 use std::task::{Context, Poll};
-use void::Void;
 
 #[async_std::test]
 async fn sends_remaining_events_to_behaviour_on_connection_close() {
@@ -96,7 +96,7 @@ impl NetworkBehaviour for Behaviour {
 }
 
 impl ConnectionHandler for HandlerWithState {
-    type FromBehaviour = Void;
+    type FromBehaviour = Infallible;
     type ToBehaviour = u64;
     type InboundProtocol = DeniedUpgrade;
     type OutboundProtocol = DeniedUpgrade;
@@ -132,7 +132,7 @@ impl ConnectionHandler for HandlerWithState {
     }
 
     fn on_behaviour_event(&mut self, event: Self::FromBehaviour) {
-        void::unreachable(event)
+        libp2p_core::util::unreachable(event)
     }
 
     fn on_connection_event(
diff --git a/swarm/tests/listener.rs b/swarm/tests/listener.rs
index 160b1f5b064..74b23cf3f7f 100644
--- a/swarm/tests/listener.rs
+++ b/swarm/tests/listener.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::{HashSet, VecDeque},
+    convert::Infallible,
     task::{Context, Poll},
 };
 
@@ -79,7 +80,7 @@ impl Behaviour {
 
 impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = dummy::ConnectionHandler;
-    type ToSwarm = void::Void;
+    type ToSwarm = Infallible;
 
     fn handle_established_inbound_connection(
         &mut self,
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 667f68408cf..334d1b9d304 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -386,7 +386,7 @@ fn with_generics_constrained() {
 
     impl<A: Mark + 'static> NetworkBehaviour for Bar<A> {
         type ConnectionHandler = dummy::ConnectionHandler;
-        type ToSwarm = void::Void;
+        type ToSwarm = std::convert::Infallible;
 
         fn handle_established_inbound_connection(
             &mut self,
@@ -548,7 +548,7 @@ fn custom_out_event_no_type_parameters() {
 
     impl<T> NetworkBehaviour for TemplatedBehaviour<T> {
         type ConnectionHandler = dummy::ConnectionHandler;
-        type ToSwarm = void::Void;
+        type ToSwarm = std::convert::Infallible;
 
         fn handle_established_inbound_connection(
             &mut self,
@@ -579,7 +579,7 @@ fn custom_out_event_no_type_parameters() {
         ) {
             // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
-            void::unreachable(message);
+            libp2p_core::util::unreachable(message);
         }
 
         fn poll(
@@ -603,8 +603,8 @@ fn custom_out_event_no_type_parameters() {
         None,
     }
 
-    impl From<void::Void> for OutEvent {
-        fn from(_e: void::Void) -> Self {
+    impl From<std::convert::Infallible> for OutEvent {
+        fn from(_e: std::convert::Infallible) -> Self {
             Self::None
         }
     }

From 822246112aa4e982b43cecf2aacc1cb107a9ae03 Mon Sep 17 00:00:00 2001
From: Krishang Shah <93703995+kamuik16@users.noreply.github.com>
Date: Tue, 19 Nov 2024 00:27:09 +0530
Subject: [PATCH 404/455] chore: replace async-std with tokio in autonat tests
 (#5671)

## Description

ref #4449

Refactored `autonat` tests to use `tokio` instead of `async-std`.
---
 Cargo.lock                             |  1 -
 protocols/autonat/Cargo.toml           | 11 +++++++----
 protocols/autonat/tests/test_client.rs | 18 +++++++++---------
 protocols/autonat/tests/test_server.rs | 24 ++++++++++++------------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ef3a17a4a1..47e8e89b570 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2591,7 +2591,6 @@ dependencies = [
 name = "libp2p-autonat"
 version = "0.13.1"
 dependencies = [
- "async-std",
  "async-trait",
  "asynchronous-codec",
  "bytes",
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 169006e7508..ced5dbeb4e8 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -4,7 +4,11 @@ edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
 version = "0.13.1"
-authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>", "Hannes Furmans <hannes@umgefahren.xyz>"]
+authors = [
+    "David Craven <david@craven.ch>",
+    "Elena Frank <elena.frank@protonmail.com>",
+    "Hannes Furmans <hannes@umgefahren.xyz>",
+]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
@@ -32,12 +36,11 @@ rand_core = { version = "0.6", optional = true }
 thiserror = { version = "1.0.52", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1", features = ["macros", "rt", "sync"]}
-async-std = { version = "1.10", features = ["attributes"] }
+tokio = { workspace = true, features = ["macros", "rt", "sync"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 libp2p-identify = { workspace = true }
-libp2p-swarm = { workspace = true, features = ["macros"]}
+libp2p-swarm = { workspace = true, features = ["macros"] }
 
 [features]
 default = ["v1", "v2"]
diff --git a/protocols/autonat/tests/test_client.rs b/protocols/autonat/tests/test_client.rs
index 7509d3ef425..f5c18e3f34e 100644
--- a/protocols/autonat/tests/test_client.rs
+++ b/protocols/autonat/tests/test_client.rs
@@ -18,7 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use async_std::task::JoinHandle;
 use libp2p_autonat::{
     Behaviour, Config, Event, NatStatus, OutboundProbeError, OutboundProbeEvent, ResponseError,
 };
@@ -27,12 +26,13 @@ use libp2p_identity::PeerId;
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
 use std::time::Duration;
+use tokio::task::JoinHandle;
 
 const MAX_CONFIDENCE: usize = 3;
 const TEST_RETRY_INTERVAL: Duration = Duration::from_secs(1);
 const TEST_REFRESH_INTERVAL: Duration = Duration::from_secs(2);
 
-#[async_std::test]
+#[tokio::test]
 async fn test_auto_probe() {
     let mut client = Swarm::new_ephemeral(|key| {
         Behaviour::new(
@@ -133,7 +133,7 @@ async fn test_auto_probe() {
     assert!(client.behaviour().public_address().is_some());
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_confidence() {
     let mut client = Swarm::new_ephemeral(|key| {
         Behaviour::new(
@@ -217,7 +217,7 @@ async fn test_confidence() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_throttle_server_period() {
     let mut client = Swarm::new_ephemeral(|key| {
         Behaviour::new(
@@ -268,7 +268,7 @@ async fn test_throttle_server_period() {
     assert_eq!(client.behaviour().confidence(), 0);
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_use_connected_as_server() {
     let mut client = Swarm::new_ephemeral(|key| {
         Behaviour::new(
@@ -306,7 +306,7 @@ async fn test_use_connected_as_server() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_outbound_failure() {
     let mut client = Swarm::new_ephemeral(|key| {
         Behaviour::new(
@@ -351,7 +351,7 @@ async fn test_outbound_failure() {
     let mut inactive_servers = Vec::new();
 
     for (id, handle) in servers.split_off(1) {
-        handle.cancel().await;
+        handle.abort();
         inactive_servers.push(id);
     }
 
@@ -375,7 +375,7 @@ async fn test_outbound_failure() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_global_ips_config() {
     let mut client = Swarm::new_ephemeral(|key| {
         Behaviour::new(
@@ -426,7 +426,7 @@ async fn new_server_swarm() -> (PeerId, Multiaddr, JoinHandle<()>) {
     let (_, multiaddr) = swarm.listen().await;
     let peer_id = *swarm.local_peer_id();
 
-    let task = async_std::task::spawn(swarm.loop_on_next());
+    let task = tokio::spawn(swarm.loop_on_next());
 
     (peer_id, multiaddr, task)
 }
diff --git a/protocols/autonat/tests/test_server.rs b/protocols/autonat/tests/test_server.rs
index fd97b1a9132..d43d14198d4 100644
--- a/protocols/autonat/tests/test_server.rs
+++ b/protocols/autonat/tests/test_server.rs
@@ -28,12 +28,12 @@ use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
 use std::{num::NonZeroU32, time::Duration};
 
-#[async_std::test]
+#[tokio::test]
 async fn test_dial_back() {
     let (mut server, server_id, server_addr) = new_server_swarm(None).await;
     let (mut client, client_id) = new_client_swarm(server_id, server_addr).await;
     let (_, client_addr) = client.listen().await;
-    async_std::task::spawn(client.loop_on_next());
+    tokio::spawn(client.loop_on_next());
 
     let client_port = client_addr
         .into_iter()
@@ -128,14 +128,14 @@ async fn test_dial_back() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_dial_error() {
     let (mut server, server_id, server_addr) = new_server_swarm(None).await;
     let (mut client, client_id) = new_client_swarm(server_id, server_addr).await;
     client
         .behaviour_mut()
         .probe_address("/ip4/127.0.0.1/tcp/12345".parse().unwrap());
-    async_std::task::spawn(client.loop_on_next());
+    tokio::spawn(client.loop_on_next());
 
     let request_probe_id = match server.next_behaviour_event().await {
         Event::InboundProbe(InboundProbeEvent::Request { peer, probe_id, .. }) => {
@@ -178,7 +178,7 @@ async fn test_dial_error() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_throttle_global_max() {
     let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
         throttle_clients_global_max: 1,
@@ -190,7 +190,7 @@ async fn test_throttle_global_max() {
     for _ in 0..2 {
         let (mut client, _) = new_client_swarm(server_id, server_addr.clone()).await;
         client.listen().await;
-        async_std::task::spawn(client.loop_on_next());
+        tokio::spawn(client.loop_on_next());
     }
 
     let (first_probe_id, first_peer_id) = match server.next_behaviour_event().await {
@@ -218,7 +218,7 @@ async fn test_throttle_global_max() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_throttle_peer_max() {
     let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
         throttle_clients_peer_max: 1,
@@ -230,7 +230,7 @@ async fn test_throttle_peer_max() {
 
     let (mut client, client_id) = new_client_swarm(server_id, server_addr.clone()).await;
     client.listen().await;
-    async_std::task::spawn(client.loop_on_next());
+    tokio::spawn(client.loop_on_next());
 
     let first_probe_id = match server.next_behaviour_event().await {
         Event::InboundProbe(InboundProbeEvent::Request { peer, probe_id, .. }) => {
@@ -265,7 +265,7 @@ async fn test_throttle_peer_max() {
     };
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_dial_multiple_addr() {
     let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
         throttle_clients_peer_max: 1,
@@ -280,7 +280,7 @@ async fn test_dial_multiple_addr() {
     client
         .behaviour_mut()
         .probe_address("/ip4/127.0.0.1/tcp/12345".parse().unwrap());
-    async_std::task::spawn(client.loop_on_next());
+    tokio::spawn(client.loop_on_next());
 
     let dial_addresses = match server.next_behaviour_event().await {
         Event::InboundProbe(InboundProbeEvent::Request {
@@ -327,7 +327,7 @@ async fn test_dial_multiple_addr() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_global_ips_config() {
     let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
         // Enforce that only clients outside of the local network are qualified for dial-backs.
@@ -338,7 +338,7 @@ async fn test_global_ips_config() {
 
     let (mut client, _) = new_client_swarm(server_id, server_addr.clone()).await;
     client.listen().await;
-    async_std::task::spawn(client.loop_on_next());
+    tokio::spawn(client.loop_on_next());
 
     // Expect the probe to be refused as both peers run on the same machine and thus in the same local network.
     match server.next_behaviour_event().await {

From 0e9dcdd07b121b911c3088b0cadc106e790b41f6 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Wed, 20 Nov 2024 21:18:39 +0700
Subject: [PATCH 405/455] chore: bump crate versions and update changelogs for
 #5676 (#5678)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

<!--
Please write a summary of your changes and why you made them.
This section will appear as the commit message after merging.
Please craft it accordingly.
For a quick primer on good commit messages, check out this blog post:
https://cbea.ms/git-commit/

Please include any relevant issues in here, for example:

Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
-->

This PR bumps crate versions and add changelog entries for crates that
are changed in #5676

Question: When should a crate version bump in the current release
process? Should it be right before or right after publishing? I see most
of current crate versions are published while some are not (e.g.
libp2p-autonat@0.13.1 libp2p-gossisub@0.48.0 and libp2p-perf@0.4.0 etc.)

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which
don't need to go into the final commit message.
-->

## Change checklist

<!-- Please add a Changelog entry in the appropriate crates and bump the
crate versions if needed. See
<https://github.com/libp2p/rust-libp2p/blob/master/docs/release.md#development-between-releases>-->

- [x] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] A changelog entry has been made in the appropriate crates

---------

Co-authored-by: João Oliveira <hello@jxs.pt>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 Cargo.lock                                 | 24 +++++++++++-----------
 Cargo.toml                                 | 24 +++++++++++-----------
 core/CHANGELOG.md                          |  5 +++++
 core/Cargo.toml                            |  2 +-
 identity/CHANGELOG.md                      |  5 +++++
 identity/Cargo.toml                        |  2 +-
 libp2p/CHANGELOG.md                        |  5 +++++
 libp2p/Cargo.toml                          |  2 +-
 misc/allow-block-list/CHANGELOG.md         |  5 +++++
 misc/allow-block-list/Cargo.toml           |  2 +-
 misc/connection-limits/CHANGELOG.md        |  5 +++++
 misc/connection-limits/Cargo.toml          |  2 +-
 misc/memory-connection-limits/CHANGELOG.md |  5 +++++
 misc/memory-connection-limits/Cargo.toml   |  2 +-
 protocols/autonat/CHANGELOG.md             |  4 ++++
 protocols/dcutr/CHANGELOG.md               |  5 +++++
 protocols/dcutr/Cargo.toml                 |  2 +-
 protocols/gossipsub/CHANGELOG.md           |  3 +++
 protocols/perf/CHANGELOG.md                |  3 +++
 protocols/ping/CHANGELOG.md                |  5 +++++
 protocols/ping/Cargo.toml                  |  2 +-
 protocols/relay/CHANGELOG.md               |  5 +++++
 protocols/relay/Cargo.toml                 |  2 +-
 protocols/request-response/CHANGELOG.md    |  5 +++++
 protocols/request-response/Cargo.toml      |  2 +-
 protocols/stream/CHANGELOG.md              |  5 +++++
 protocols/stream/Cargo.toml                |  2 +-
 swarm/CHANGELOG.md                         |  3 +++
 transports/quic/CHANGELOG.md               |  5 +++++
 transports/quic/Cargo.toml                 |  2 +-
 30 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47e8e89b570..993d55a2952 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2525,7 +2525,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libp2p"
-version = "0.54.1"
+version = "0.54.2"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2577,7 +2577,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-allow-block-list"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "async-std",
  "libp2p-core",
@@ -2617,7 +2617,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-connection-limits"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "async-std",
  "libp2p-core",
@@ -2633,7 +2633,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.42.0"
+version = "0.42.1"
 dependencies = [
  "async-std",
  "either",
@@ -2663,7 +2663,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dcutr"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
@@ -2793,7 +2793,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identity"
-version = "0.2.9"
+version = "0.2.10"
 dependencies = [
  "asn1_der",
  "base64 0.22.1",
@@ -2880,7 +2880,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-memory-connection-limits"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "async-std",
  "libp2p-core",
@@ -3007,7 +3007,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "either",
  "futures",
@@ -3065,7 +3065,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.11.1"
+version = "0.11.2"
 dependencies = [
  "async-std",
  "bytes",
@@ -3094,7 +3094,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-relay"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3151,7 +3151,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "anyhow",
  "async-std",
@@ -3199,7 +3199,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-stream"
-version = "0.2.0-alpha"
+version = "0.2.0-alpha.1"
 dependencies = [
  "futures",
  "libp2p-core",
diff --git a/Cargo.toml b/Cargo.toml
index aab7f0d71d4..a7f944d22fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,33 +75,33 @@ rust-version = "1.75.0"
 asynchronous-codec = { version = "0.7.0" }
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
-libp2p = { version = "0.54.1", path = "libp2p" }
-libp2p-allow-block-list = { version = "0.4.1", path = "misc/allow-block-list" }
+libp2p = { version = "0.54.2", path = "libp2p" }
+libp2p-allow-block-list = { version = "0.4.2", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
-libp2p-connection-limits = { version = "0.4.0", path = "misc/connection-limits" }
-libp2p-core = { version = "0.42.0", path = "core" }
-libp2p-dcutr = { version = "0.12.0", path = "protocols/dcutr" }
+libp2p-connection-limits = { version = "0.4.1", path = "misc/connection-limits" }
+libp2p-core = { version = "0.42.1", path = "core" }
+libp2p-dcutr = { version = "0.12.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
-libp2p-identity = { version = "0.2.9" }
+libp2p-identity = { version = "0.2.10" }
 libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
-libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" }
+libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
 libp2p-noise = { version = "0.45.0", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
-libp2p-ping = { version = "0.45.0", path = "protocols/ping" }
+libp2p-ping = { version = "0.45.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.25.0", path = "transports/pnet" }
-libp2p-quic = { version = "0.11.1", path = "transports/quic" }
-libp2p-relay = { version = "0.18.0", path = "protocols/relay" }
+libp2p-quic = { version = "0.11.2", path = "transports/quic" }
+libp2p-relay = { version = "0.18.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" }
+libp2p-request-response = { version = "0.27.1", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.8", path = "misc/server" }
-libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" }
+libp2p-stream = { version = "0.2.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.5.0", path = "swarm-test" }
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 5ed4b4e181d..dbd46a38f07 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.42.1
+
+- Added `libp2p::core::util::unreachable` that is a drop-in replacement of `void::unreachable`.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.42.0
 
 - Update `Transport::dial` function signature with a `DialOpts` param and remove `Transport::dial_as_listener`:
diff --git a/core/Cargo.toml b/core/Cargo.toml
index d8260e14d1f..c257ff25ec4 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-core"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.42.0"
+version = "0.42.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md
index 9670a843130..8ee12c8124a 100644
--- a/identity/CHANGELOG.md
+++ b/identity/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.10
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.2.9
 
 - Add `rand` feature gate to ecdsa methods requiring a random number generator.
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index 370533eed58..d3b07c5dc87 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-identity"
-version = "0.2.9"
+version = "0.2.10"
 edition = "2021"
 description = "Data structures and algorithms for identifying peers in libp2p."
 rust-version = "1.73.0" # MUST NOT inherit from workspace because we don't want to publish breaking changes to `libp2p-identity`.
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 72a624786d4..e383cfd0cdc 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.54.2
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.54.1
 
 - Update individual crates.
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index b1017f5958c..83ef86a4ca4 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Peer-to-peer networking library"
-version = "0.54.1"
+version = "0.54.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/misc/allow-block-list/CHANGELOG.md b/misc/allow-block-list/CHANGELOG.md
index 3cda0603ee4..b5ffd7f0495 100644
--- a/misc/allow-block-list/CHANGELOG.md
+++ b/misc/allow-block-list/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.2
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.4.1
 
 - Add getters & setters for the allowed/blocked peers.
diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml
index c169be87056..66ee3ef9124 100644
--- a/misc/allow-block-list/Cargo.toml
+++ b/misc/allow-block-list/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-allow-block-list"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Allow/block list connection management for libp2p."
-version = "0.4.1"
+version = "0.4.2"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/connection-limits/CHANGELOG.md b/misc/connection-limits/CHANGELOG.md
index db88e99ffa7..f2722b3745a 100644
--- a/misc/connection-limits/CHANGELOG.md
+++ b/misc/connection-limits/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.4.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml
index 0d17cb74862..a0ecfd9da39 100644
--- a/misc/connection-limits/Cargo.toml
+++ b/misc/connection-limits/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-connection-limits"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Connection limits for libp2p."
-version = "0.4.0"
+version = "0.4.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/misc/memory-connection-limits/CHANGELOG.md b/misc/memory-connection-limits/CHANGELOG.md
index 9e580c5a1d2..bf198e27c65 100644
--- a/misc/memory-connection-limits/CHANGELOG.md
+++ b/misc/memory-connection-limits/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.3.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index 19ae256e853..f18cb09d193 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-memory-connection-limits"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Memory usage based connection limits for libp2p."
-version = "0.3.0"
+version = "0.3.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index f1aeda6ac18..9b2bc4cb2ea 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## 0.13.1
+
 - Verify that an incoming AutoNAT dial comes from a connected peer. See [PR 5597](https://github.com/libp2p/rust-libp2p/pull/5597).
 
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.13.0
 
 - Due to the refactor of `Transport` it's no longer required to create a seperate transport for
diff --git a/protocols/dcutr/CHANGELOG.md b/protocols/dcutr/CHANGELOG.md
index 0ddc4aa1148..80cac37321e 100644
--- a/protocols/dcutr/CHANGELOG.md
+++ b/protocols/dcutr/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.12.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.12.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index c470291af0d..7de195e7d54 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-dcutr"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Direct connection upgrade through relay"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index cdd170c0d4b..7357170ff93 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -3,6 +3,9 @@
 - Apply `max_transmit_size` to the inner message instead of the final payload.
   See [PR 5642](https://github.com/libp2p/rust-libp2p/pull/5642).
 
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.47.1
 
 - Attempt to publish to at least mesh_n peers when flood publish is disabled.
diff --git a/protocols/perf/CHANGELOG.md b/protocols/perf/CHANGELOG.md
index abeca9fad25..c5eda88d97d 100644
--- a/protocols/perf/CHANGELOG.md
+++ b/protocols/perf/CHANGELOG.md
@@ -4,6 +4,9 @@
 - Add ConnectionError to FromSwarm::ConnectionClosed.
   See [PR 5485](https://github.com/libp2p/rust-libp2p/pull/5485).
 
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.3.1
 - Use `web-time` instead of `instant`.
   See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md
index c0a124333e9..d6e71b2c2d0 100644
--- a/protocols/ping/CHANGELOG.md
+++ b/protocols/ping/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.45.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 755ebd35718..0fad9678aec 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-ping"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Ping protocol for libp2p"
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
index fc71ccedad5..8119c24a491 100644
--- a/protocols/relay/CHANGELOG.md
+++ b/protocols/relay/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.18.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.18.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index a3a659619b6..c996a014845 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-relay"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Communications relaying for libp2p"
-version = "0.18.0"
+version = "0.18.1"
 authors = ["Parity Technologies <admin@parity.io>", "Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index db0d9126516..9ed658fc90f 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.27.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.27.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 8376f3ce795..b2e6fd0b0ac 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-request-response"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Generic Request/Response Protocols"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/stream/CHANGELOG.md b/protocols/stream/CHANGELOG.md
index 2532970d3c6..6034104debd 100644
--- a/protocols/stream/CHANGELOG.md
+++ b/protocols/stream/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.0-alpha.1
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.2.0-alpha
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index cd83c5978fa..d9c9276cb12 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-stream"
-version = "0.2.0-alpha"
+version = "0.2.0-alpha.1"
 edition = "2021"
 rust-version.workspace = true
 description = "Generic stream protocols for libp2p"
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index c5d10872d40..0109a33747c 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -3,6 +3,9 @@
 - Don't report `NewExternalAddrCandidate` for confirmed external addresses.
   See [PR 5582](https://github.com/libp2p/rust-libp2p/pull/5582).
 
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.45.1
 
 - Update `libp2p-swarm-derive` to version `0.35.0`, see [PR 5545]
diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md
index 6fc64c5df36..238cbebe6cf 100644
--- a/transports/quic/CHANGELOG.md
+++ b/transports/quic/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.11.2
+
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 ## 0.11.1
 
 - Update `libp2p-tls` to version `0.5.0`, see [PR 5547]
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 42cc8e54edb..a33ef4ef0b1 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-quic"
-version = "0.11.1"
+version = "0.11.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 rust-version = { workspace = true }

From 059742f7da0c746fb87c89032efe99803170de22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 21 Nov 2024 10:31:51 +0000
Subject: [PATCH 406/455] chore(ci): add a mergify batch queue for external PRs
 (#5668)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and remove the if conditions no longer required as we are running them
again on every PR

---------

Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Co-authored-by: João Oliveira <jxs>
---
 .github/mergify.yml                | 17 +++++++++++++++++
 .github/workflows/interop-test.yml |  3 +++
 scripts/build-interop-image.sh     |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 91cd8881237..38f025c7814 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -32,6 +32,17 @@ pull_request_rules:
       - base=master
     actions:
       queue:
+        name: default
+
+  # Adds the Pr to the batch queue, so that we can run the interop tests. See the `external_prs` queue for more info.
+  - name: Add to batch merge queue
+    conditions:
+      # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
+      - label=send-it-batch
+      - base=master
+    actions:
+      queue:
+        name: external_prs
 
   - name: Add approved dependabot PRs to merge queue
     conditions:
@@ -40,6 +51,7 @@ pull_request_rules:
       - base=master
     actions:
       queue:
+        name: default
 
   - name: Remove reviews on updates after PR is queued for merging
     conditions:
@@ -74,3 +86,8 @@ pull_request_rules:
 queue_rules:
   - name: default
     conditions: []
+  # External PR's don't have access to secrets and variables, therefore they don't run the interop tests.
+  # using a batch queue allows to circumvent that as mergify creates it from an internal branch.
+  - name: external_prs
+    conditions: []
+    batch_size: 1
diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml
index e9446d013d7..c88579be68a 100644
--- a/.github/workflows/interop-test.yml
+++ b/.github/workflows/interop-test.yml
@@ -28,6 +28,7 @@ jobs:
           AWS_BUCKET_NAME: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           AWS_ACCESS_KEY_ID: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_REGION }}
           FLAVOUR: ${{ matrix.flavour }}
 
       - name: Run ${{ matrix.flavour }} tests
@@ -38,6 +39,7 @@ jobs:
           s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_REGION }}
           worker-count: 16
   run-holepunching-interop:
     name: Run hole-punch interoperability tests
@@ -56,4 +58,5 @@ jobs:
           s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_REGION }}
           worker-count: 16
diff --git a/scripts/build-interop-image.sh b/scripts/build-interop-image.sh
index 4b96e353f9a..ff6f344976c 100755
--- a/scripts/build-interop-image.sh
+++ b/scripts/build-interop-image.sh
@@ -6,13 +6,13 @@ CACHE_TO=""
 
 # If we have credentials, write to cache
 if [[ -n "${AWS_SECRET_ACCESS_KEY}" ]]; then
-  CACHE_TO="--cache-to   type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=ap-southeast-2,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
+  CACHE_TO="--cache-to   type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=${AWS_REGION},prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
 fi
 
 docker buildx build \
   --load \
   $CACHE_TO \
-  --cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=ap-southeast-2,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
+  --cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=${AWS_REGION},prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
   -t ${FLAVOUR}-rust-libp2p-head \
   . \
   -f interop-tests/Dockerfile.${FLAVOUR}

From 13b9ea2ab5dde2d5448a69e74bec3ac9236c21d1 Mon Sep 17 00:00:00 2001
From: Krishang Shah <93703995+kamuik16@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:16:52 +0530
Subject: [PATCH 407/455] chore: refactor dcutr and gossipsub tests to use
 tokio instead

ref #4449

Refactored dcutr and gossipsub tests to use `tokio` instead of `async-std`.

Pull-Request: #5662.
---
 Cargo.lock                                 |  4 ++--
 protocols/dcutr/Cargo.toml                 |  2 +-
 protocols/dcutr/tests/lib.rs               |  6 +++---
 protocols/gossipsub/Cargo.toml             |  2 +-
 protocols/gossipsub/src/behaviour/tests.rs |  2 +-
 protocols/gossipsub/tests/smoke.rs         | 11 +++++++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 993d55a2952..57f6df3862f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2665,7 +2665,6 @@ dependencies = [
 name = "libp2p-dcutr"
 version = "0.12.1"
 dependencies = [
- "async-std",
  "asynchronous-codec",
  "clap",
  "either",
@@ -2689,6 +2688,7 @@ dependencies = [
  "quick-protobuf-codec",
  "rand 0.8.5",
  "thiserror",
+ "tokio",
  "tracing",
  "tracing-subscriber",
  "web-time 1.1.0",
@@ -2736,7 +2736,6 @@ dependencies = [
 name = "libp2p-gossipsub"
 version = "0.48.0"
 dependencies = [
- "async-std",
  "asynchronous-codec",
  "base64 0.22.1",
  "byteorder",
@@ -2763,6 +2762,7 @@ dependencies = [
  "serde",
  "sha2 0.10.8",
  "smallvec",
+ "tokio",
  "tracing",
  "tracing-subscriber",
  "web-time 1.1.0",
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 7de195e7d54..69517181aab 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -27,7 +27,6 @@ lru = "0.12.3"
 futures-bounded = { workspace = true }
 
 [dev-dependencies]
-async-std = { version = "1.12.0", features = ["attributes"] }
 clap = { version = "4.5.6", features = ["derive"] }
 libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
@@ -41,6 +40,7 @@ libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 rand = "0.8"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tokio = { workspace = true, features = ["rt", "macros"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs
index 084ee744145..36f168fb04a 100644
--- a/protocols/dcutr/tests/lib.rs
+++ b/protocols/dcutr/tests/lib.rs
@@ -32,7 +32,7 @@ use libp2p_swarm_test::SwarmExt as _;
 use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
-#[async_std::test]
+#[tokio::test]
 async fn connect() {
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
@@ -53,7 +53,7 @@ async fn connect() {
     let relay_peer_id = *relay.local_peer_id();
     let dst_peer_id = *dst.local_peer_id();
 
-    async_std::task::spawn(relay.loop_on_next());
+    tokio::spawn(relay.loop_on_next());
 
     let dst_relayed_addr = relay_tcp_addr
         .with(Protocol::P2p(relay_peer_id))
@@ -68,7 +68,7 @@ async fn connect() {
         false, // No renewal.
     )
     .await;
-    async_std::task::spawn(dst.loop_on_next());
+    tokio::spawn(dst.loop_on_next());
 
     src.dial_and_wait(dst_relayed_addr.clone()).await;
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 1416cdb8de3..ca6185a85e4 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -41,7 +41,6 @@ tracing = { workspace = true }
 prometheus-client = { workspace = true }
 
 [dev-dependencies]
-async-std = { version = "1.6.3", features = ["unstable"] }
 hex = "0.4.2"
 libp2p-core = { workspace = true }
 libp2p-yamux = { workspace = true }
@@ -49,6 +48,7 @@ libp2p-noise = { workspace = true }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index a74566a1308..c7afe926a65 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -23,10 +23,10 @@
 use super::*;
 use crate::subscription_filter::WhitelistSubscriptionFilter;
 use crate::{config::ConfigBuilder, types::Rpc, IdentTopic as Topic};
-use async_std::net::Ipv4Addr;
 use byteorder::{BigEndian, ByteOrder};
 use libp2p_core::ConnectedPoint;
 use rand::Rng;
+use std::net::Ipv4Addr;
 use std::thread::sleep;
 
 #[derive(Default, Debug)]
diff --git a/protocols/gossipsub/tests/smoke.rs b/protocols/gossipsub/tests/smoke.rs
index c8876428b4e..3b6261afa54 100644
--- a/protocols/gossipsub/tests/smoke.rs
+++ b/protocols/gossipsub/tests/smoke.rs
@@ -18,7 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use async_std::prelude::FutureExt;
 use futures::stream::{FuturesUnordered, SelectAll};
 use futures::StreamExt;
 use libp2p_gossipsub as gossipsub;
@@ -28,7 +27,9 @@ use libp2p_swarm_test::SwarmExt as _;
 use quickcheck::{QuickCheck, TestResult};
 use rand::{seq::SliceRandom, SeedableRng};
 use std::{task::Poll, time::Duration};
+use tokio::{runtime::Runtime, time};
 use tracing_subscriber::EnvFilter;
+
 struct Graph {
     nodes: SelectAll<Swarm<gossipsub::Behaviour>>,
 }
@@ -84,7 +85,7 @@ impl Graph {
             }
         };
 
-        match condition.timeout(Duration::from_secs(10)).await {
+        match time::timeout(Duration::from_secs(10), condition).await {
             Ok(()) => true,
             Err(_) => false,
         }
@@ -98,7 +99,7 @@ impl Graph {
                 Poll::Pending => return Poll::Ready(()),
             }
         });
-        fut.timeout(Duration::from_secs(10)).await.unwrap();
+        time::timeout(Duration::from_secs(10), fut).await.unwrap();
     }
 }
 
@@ -139,7 +140,9 @@ fn multi_hop_propagation() {
 
         tracing::debug!(number_of_nodes=%num_nodes, seed=%seed);
 
-        async_std::task::block_on(async move {
+        let rt = Runtime::new().unwrap();
+
+        rt.block_on(async move {
             let mut graph = Graph::new_connected(num_nodes as usize, seed).await;
             let number_nodes = graph.nodes.len();
 

From c3a21d13f472fedfd459fa15d2bed5941eccfe26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 21 Nov 2024 14:27:19 +0000
Subject: [PATCH 408/455] chore(gossispsub): deprecate futures-ticker

to address [RUSTSEC-2024-0384 ](https://rustsec.org/advisories/RUSTSEC-2024-0384.html). Use `futures-timer` and `Delay` instead

Pull-Request: #5674.
---
 Cargo.lock                            | 41 ++++++++++-----------------
 protocols/gossipsub/CHANGELOG.md      |  2 ++
 protocols/gossipsub/Cargo.toml        |  4 +--
 protocols/gossipsub/src/behaviour.rs  | 25 ++++++++--------
 protocols/gossipsub/src/peer_score.rs |  5 ++--
 5 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 57f6df3862f..ec986f43d57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1629,9 +1629,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1639,9 +1639,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
@@ -1657,9 +1657,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1710,26 +1710,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-ticker"
-version = "0.0.3"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9763058047f713632a52e916cc7f6a4b3fc6e9fc1ff8c5b1dc49e5a89041682e"
-dependencies = [
- "futures",
- "futures-timer",
- "instant",
-]
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
@@ -1743,9 +1732,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2743,7 +2732,7 @@ dependencies = [
  "either",
  "fnv",
  "futures",
- "futures-ticker",
+ "futures-timer",
  "getrandom 0.2.15",
  "hex",
  "hex_fmt",
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 7357170ff93..7bf021c761e 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 0.48.0
 
+- Deprecate `futures-ticker` and use `futures-timer` instead.
+  See [PR 5674](https://github.com/libp2p/rust-libp2p/pull/5674).
 - Apply `max_transmit_size` to the inner message instead of the final payload.
   See [PR 5642](https://github.com/libp2p/rust-libp2p/pull/5642).
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index ca6185a85e4..1d58fc98896 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [features]
-wasm-bindgen = ["getrandom/js"]
+wasm-bindgen = ["getrandom/js", "futures-timer/wasm-bindgen"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
@@ -21,7 +21,6 @@ bytes = "1.6"
 either = "1.11"
 fnv = "1.0.7"
 futures = { workspace = true }
-futures-ticker = "0.0.3"
 getrandom = "0.2.15"
 hex_fmt = "0.3.0"
 web-time = { workspace = true }
@@ -39,6 +38,7 @@ tracing = { workspace = true }
 
 # Metrics dependencies
 prometheus-client = { workspace = true }
+futures-timer = "3.0.3"
 
 [dev-dependencies]
 hex = "0.4.2"
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index bf94a5b7920..d0fd3127f72 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -29,8 +29,8 @@ use std::{
     time::Duration,
 };
 
-use futures::StreamExt;
-use futures_ticker::Ticker;
+use futures::FutureExt;
+use futures_timer::Delay;
 use prometheus_client::registry::Registry;
 use rand::{seq::SliceRandom, thread_rng};
 
@@ -283,7 +283,7 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
     mcache: MessageCache,
 
     /// Heartbeat interval stream.
-    heartbeat: Ticker,
+    heartbeat: Delay,
 
     /// Number of heartbeats since the beginning of time; this allows us to amortize some resource
     /// clean up -- eg backoff clean up.
@@ -301,7 +301,7 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
 
     /// Stores optional peer score data together with thresholds, decay interval and gossip
     /// promises.
-    peer_score: Option<(PeerScore, PeerScoreThresholds, Ticker, GossipPromises)>,
+    peer_score: Option<(PeerScore, PeerScoreThresholds, Delay, GossipPromises)>,
 
     /// Counts the number of `IHAVE` received from each peer since the last heartbeat.
     count_received_ihave: HashMap<PeerId, usize>,
@@ -448,10 +448,7 @@ where
                 config.backoff_slack(),
             ),
             mcache: MessageCache::new(config.history_gossip(), config.history_length()),
-            heartbeat: Ticker::new_with_next(
-                config.heartbeat_interval(),
-                config.heartbeat_initial_delay(),
-            ),
+            heartbeat: Delay::new(config.heartbeat_interval() + config.heartbeat_initial_delay()),
             heartbeat_ticks: 0,
             px_peers: HashSet::new(),
             outbound_peers: HashSet::new(),
@@ -879,7 +876,7 @@ where
             return Err("Peer score set twice".into());
         }
 
-        let interval = Ticker::new(params.decay_interval);
+        let interval = Delay::new(params.decay_interval);
         let peer_score = PeerScore::new_with_message_delivery_time_callback(params, callback);
         self.peer_score = Some((peer_score, threshold, interval, GossipPromises::default()));
         Ok(())
@@ -1145,7 +1142,7 @@ where
     }
 
     fn score_below_threshold_from_scores(
-        peer_score: &Option<(PeerScore, PeerScoreThresholds, Ticker, GossipPromises)>,
+        peer_score: &Option<(PeerScore, PeerScoreThresholds, Delay, GossipPromises)>,
         peer_id: &PeerId,
         threshold: impl Fn(&PeerScoreThresholds) -> f64,
     ) -> (bool, f64) {
@@ -3105,14 +3102,16 @@ where
         }
 
         // update scores
-        if let Some((peer_score, _, interval, _)) = &mut self.peer_score {
-            while let Poll::Ready(Some(_)) = interval.poll_next_unpin(cx) {
+        if let Some((peer_score, _, delay, _)) = &mut self.peer_score {
+            if delay.poll_unpin(cx).is_ready() {
                 peer_score.refresh_scores();
+                delay.reset(peer_score.params.decay_interval);
             }
         }
 
-        while let Poll::Ready(Some(_)) = self.heartbeat.poll_next_unpin(cx) {
+        if self.heartbeat.poll_unpin(cx).is_ready() {
             self.heartbeat();
+            self.heartbeat.reset(self.config.heartbeat_interval());
         }
 
         Poll::Pending
diff --git a/protocols/gossipsub/src/peer_score.rs b/protocols/gossipsub/src/peer_score.rs
index ac24fc91970..4df8f162ed9 100644
--- a/protocols/gossipsub/src/peer_score.rs
+++ b/protocols/gossipsub/src/peer_score.rs
@@ -44,14 +44,15 @@ mod tests;
 const TIME_CACHE_DURATION: u64 = 120;
 
 pub(crate) struct PeerScore {
-    params: PeerScoreParams,
     /// The score parameters.
+    pub(crate) params: PeerScoreParams,
+    /// The stats per PeerId.
     peer_stats: HashMap<PeerId, PeerStats>,
     /// Tracking peers per IP.
     peer_ips: HashMap<IpAddr, HashSet<PeerId>>,
     /// Message delivery tracking. This is a time-cache of [`DeliveryRecord`]s.
     deliveries: TimeCache<MessageId, DeliveryRecord>,
-    /// callback for monitoring message delivery times
+    /// Callback for monitoring message delivery times.
     message_delivery_time_callback: Option<fn(&PeerId, &TopicHash, f64)>,
 }
 

From 00588a543a135f71ee7053b5315fdbb7c6e492f4 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Sat, 23 Nov 2024 00:24:17 +1100
Subject: [PATCH 409/455] chore: update FUNDING.json

I've added addresses to receive Drips donations. This is required for FIL-RetroPGF-2 in the coming days, we should get this into `master` ASAP.

This is a dedicated address controlled by Sigma Prime (including @AgeManning and myself).

Pull-Request: #5685.
---
 FUNDING.json | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/FUNDING.json b/FUNDING.json
index cce3fb3fe4c..d707bcb2f8c 100644
--- a/FUNDING.json
+++ b/FUNDING.json
@@ -1,5 +1,13 @@
 {
-  "opRetro": {
-    "projectId": "0xdf1bb03d08808e2d789f5eac8462bdc560f1bb5b0877f0cf8c66ab53a0bc2f5c"
-  }
+    "drips": {
+        "ethereum": {
+            "ownedBy": "0x79c49637182Ea32734f7e8445a3649c22ff348f2"
+        },
+        "filecoin": {
+            "ownedBy": "0x79c49637182Ea32734f7e8445a3649c22ff348f2"
+        }
+    },
+    "opRetro": {
+        "projectId": "0xdf1bb03d08808e2d789f5eac8462bdc560f1bb5b0877f0cf8c66ab53a0bc2f5c"
+    }
 }

From 237192287fd9785918ee9b8ca1ad7f713884d00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 25 Nov 2024 13:53:57 +0000
Subject: [PATCH 410/455] feat(gossipsub): introduce backpressure

superseeds #4914 with some changes and improvements, namely:

- introduce a `Delay` for `Forward` and `Publish` messages, messages that take more than the configured delay to be sent are discarded
- introduce scoring and penalize slow peers
- remove control pool
- report slow peers with the number of failed messages

Pull-Request: #5595.
---
 Cargo.lock                                   |   76 +-
 protocols/gossipsub/CHANGELOG.md             |    7 +
 protocols/gossipsub/Cargo.toml               |    5 +-
 protocols/gossipsub/src/behaviour.rs         |  647 +++---
 protocols/gossipsub/src/behaviour/tests.rs   | 1914 ++++++++++++------
 protocols/gossipsub/src/config.rs            |   43 +
 protocols/gossipsub/src/error.rs             |    3 +
 protocols/gossipsub/src/handler.rs           |   54 +-
 protocols/gossipsub/src/lib.rs               |    3 +-
 protocols/gossipsub/src/metrics.rs           |   76 +
 protocols/gossipsub/src/peer_score.rs        |   27 +-
 protocols/gossipsub/src/peer_score/params.rs |   10 +
 protocols/gossipsub/src/protocol.rs          |   53 +-
 protocols/gossipsub/src/rpc.rs               |  192 ++
 protocols/gossipsub/src/types.rs             |  149 +-
 15 files changed, 2201 insertions(+), 1058 deletions(-)
 create mode 100644 protocols/gossipsub/src/rpc.rs

diff --git a/Cargo.lock b/Cargo.lock
index ec986f43d57..e24db6e69d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -268,6 +268,18 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy 0.5.2",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-executor"
 version = "1.5.1"
@@ -300,7 +312,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-executor",
  "async-io 1.13.0",
  "async-lock 2.7.0",
@@ -364,7 +376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7"
 dependencies = [
  "event-listener 3.1.0",
- "event-listener-strategy",
+ "event-listener-strategy 0.3.0",
  "pin-project-lite",
 ]
 
@@ -405,7 +417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
 dependencies = [
  "async-attributes",
- "async-channel",
+ "async-channel 1.9.0",
  "async-global-executor",
  "async-io 1.13.0",
  "async-lock 2.7.0",
@@ -720,7 +732,7 @@ version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-lock 2.7.0",
  "async-task",
  "atomic-waker",
@@ -982,9 +994,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1518,6 +1530,17 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "event-listener-strategy"
 version = "0.3.0"
@@ -1528,6 +1551,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener 5.3.1",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1629,9 +1662,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1639,9 +1672,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
@@ -1657,9 +1690,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -1688,9 +1721,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1710,15 +1743,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
@@ -1732,9 +1765,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2725,6 +2758,7 @@ dependencies = [
 name = "libp2p-gossipsub"
 version = "0.48.0"
 dependencies = [
+ "async-channel 2.3.1",
  "asynchronous-codec",
  "base64 0.22.1",
  "byteorder",
@@ -5509,7 +5543,7 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-executor",
  "async-fs",
  "async-io 1.13.0",
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 7bf021c761e..8d95abc01a2 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -13,6 +13,13 @@
 - Attempt to publish to at least mesh_n peers when flood publish is disabled.
   See [PR 5578](https://github.com/libp2p/rust-libp2p/pull/5578).
 
+- Introduce back pressure and penalize slow peers. Drop stale messages that timeout before being
+  delivered.
+  See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
+- Change `Behaviour::unsubscribe` and `Behaviour::report_message_validation_result`
+  to `bool` they don't need to be a `Result`.
+  See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
+
 ## 0.47.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 1d58fc98896..c09286c8aa0 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -14,6 +14,7 @@ categories = ["network-programming", "asynchronous"]
 wasm-bindgen = ["getrandom/js", "futures-timer/wasm-bindgen"]
 
 [dependencies]
+async-channel = "2.3.1"
 asynchronous-codec = { workspace = true }
 base64 = "0.22.1"
 byteorder = "1.5.0"
@@ -21,6 +22,7 @@ bytes = "1.6"
 either = "1.11"
 fnv = "1.0.7"
 futures = { workspace = true }
+futures-timer = "3.0.2"
 getrandom = "0.2.15"
 hex_fmt = "0.3.0"
 web-time = { workspace = true }
@@ -38,7 +40,6 @@ tracing = { workspace = true }
 
 # Metrics dependencies
 prometheus-client = { workspace = true }
-futures-timer = "3.0.3"
 
 [dev-dependencies]
 hex = "0.4.2"
@@ -48,7 +49,7 @@ libp2p-noise = { workspace = true }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time"] }
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time", "macros"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index d0fd3127f72..fae45ed452e 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -47,12 +47,6 @@ use libp2p_swarm::{
 };
 use web_time::{Instant, SystemTime};
 
-use crate::backoff::BackoffStorage;
-use crate::config::{Config, ValidationMode};
-use crate::gossip_promises::GossipPromises;
-use crate::handler::{Handler, HandlerEvent, HandlerIn};
-use crate::mcache::MessageCache;
-use crate::metrics::{Churn, Config as MetricsConfig, Inclusion, Metrics, Penalty};
 use crate::peer_score::{PeerScore, PeerScoreParams, PeerScoreThresholds, RejectReason};
 use crate::protocol::SIGNING_PREFIX;
 use crate::subscription_filter::{AllowAllSubscriptionFilter, TopicSubscriptionFilter};
@@ -64,6 +58,21 @@ use crate::types::{
     SubscriptionAction,
 };
 use crate::types::{PeerConnections, PeerKind, RpcOut};
+use crate::{backoff::BackoffStorage, FailedMessages};
+use crate::{
+    config::{Config, ValidationMode},
+    types::Graft,
+};
+use crate::{gossip_promises::GossipPromises, types::Prune};
+use crate::{
+    handler::{Handler, HandlerEvent, HandlerIn},
+    types::IWant,
+};
+use crate::{mcache::MessageCache, types::IHave};
+use crate::{
+    metrics::{Churn, Config as MetricsConfig, Inclusion, Metrics, Penalty},
+    rpc::Sender,
+};
 use crate::{rpc_proto::proto, TopicScoreParams};
 use crate::{PublishError, SubscriptionError, ValidationError};
 use quick_protobuf::{MessageWrite, Writer};
@@ -145,6 +154,13 @@ pub enum Event {
     },
     /// A peer that does not support gossipsub has connected.
     GossipsubNotSupported { peer_id: PeerId },
+    /// A peer is not able to download messages in time.
+    SlowPeer {
+        /// The peer_id
+        peer_id: PeerId,
+        /// The types and amounts of failed messages that are occurring for this peer.
+        failed_messages: FailedMessages,
+    },
 }
 
 /// A data structure for storing configuration for publishing messages. See [`MessageAuthenticity`]
@@ -245,9 +261,6 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
     /// Events that need to be yielded to the outside when polling.
     events: VecDeque<ToSwarm<Event, HandlerIn>>,
 
-    /// Pools non-urgent control messages between heartbeats.
-    control_pool: HashMap<PeerId, Vec<ControlAction>>,
-
     /// Information used for publishing messages.
     publish_config: PublishConfig,
 
@@ -309,10 +322,6 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
     /// Counts the number of `IWANT` that we sent the each peer since the last heartbeat.
     count_sent_iwant: HashMap<PeerId, usize>,
 
-    /// Keeps track of IWANT messages that we are awaiting to send.
-    /// This is used to prevent sending duplicate IWANT messages for the same message.
-    pending_iwant_msgs: HashSet<MessageId>,
-
     /// Short term cache for published message ids. This is used for penalizing peers sending
     /// our own messages back if the messages are anonymous or use a random author.
     published_message_ids: DuplicateCache<MessageId>,
@@ -327,6 +336,9 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
 
     /// Keep track of a set of internal metrics relating to gossipsub.
     metrics: Option<Metrics>,
+
+    /// Tracks the numbers of failed messages per peer-id.
+    failed_messages: HashMap<PeerId, FailedMessages>,
 }
 
 impl<D, F> Behaviour<D, F>
@@ -434,7 +446,6 @@ where
         Ok(Behaviour {
             metrics: metrics.map(|(registry, cfg)| Metrics::new(registry, cfg)),
             events: VecDeque::new(),
-            control_pool: HashMap::new(),
             publish_config: privacy.into(),
             duplicate_cache: DuplicateCache::new(config.duplicate_cache_time()),
             explicit_peers: HashSet::new(),
@@ -455,12 +466,12 @@ where
             peer_score: None,
             count_received_ihave: HashMap::new(),
             count_sent_iwant: HashMap::new(),
-            pending_iwant_msgs: HashSet::new(),
             connected_peers: HashMap::new(),
             published_message_ids: DuplicateCache::new(config.published_message_ids_cache_time()),
             config,
             subscription_filter,
             data_transform,
+            failed_messages: Default::default(),
         })
     }
 }
@@ -524,10 +535,10 @@ where
         }
 
         // send subscription request to all peers
-        for peer in self.connected_peers.keys().copied().collect::<Vec<_>>() {
-            tracing::debug!(%peer, "Sending SUBSCRIBE to peer");
+        for peer_id in self.connected_peers.keys().copied().collect::<Vec<_>>() {
+            tracing::debug!(%peer_id, "Sending SUBSCRIBE to peer");
             let event = RpcOut::Subscribe(topic_hash.clone());
-            self.send_message(peer, event);
+            self.send_message(peer_id, event);
         }
 
         // call JOIN(topic)
@@ -539,16 +550,15 @@ where
 
     /// Unsubscribes from a topic.
     ///
-    /// Returns [`Ok(true)`] if we were subscribed to this topic.
-    #[allow(clippy::unnecessary_wraps)]
-    pub fn unsubscribe<H: Hasher>(&mut self, topic: &Topic<H>) -> Result<bool, PublishError> {
+    /// Returns `true` if we were subscribed to this topic.
+    pub fn unsubscribe<H: Hasher>(&mut self, topic: &Topic<H>) -> bool {
         tracing::debug!(%topic, "Unsubscribing from topic");
         let topic_hash = topic.hash();
 
         if !self.mesh.contains_key(&topic_hash) {
             tracing::debug!(topic=%topic_hash, "Already unsubscribed from topic");
             // we are not subscribed
-            return Ok(false);
+            return false;
         }
 
         // announce to all peers
@@ -563,7 +573,7 @@ where
         self.leave(&topic_hash);
 
         tracing::debug!(topic=%topic_hash, "Unsubscribed from topic");
-        Ok(true)
+        true
     }
 
     /// Publishes a message with multiple topics to the network.
@@ -721,9 +731,26 @@ where
         }
 
         // Send to peers we know are subscribed to the topic.
+        let mut publish_failed = true;
         for peer_id in recipient_peers.iter() {
             tracing::trace!(peer=%peer_id, "Sending message to peer");
-            self.send_message(*peer_id, RpcOut::Publish(raw_message.clone()));
+            if self.send_message(
+                *peer_id,
+                RpcOut::Publish {
+                    message: raw_message.clone(),
+                    timeout: Delay::new(self.config.publish_queue_duration()),
+                },
+            ) {
+                publish_failed = false
+            }
+        }
+
+        if recipient_peers.is_empty() {
+            return Err(PublishError::InsufficientPeers);
+        }
+
+        if publish_failed {
+            return Err(PublishError::AllQueuesFull(recipient_peers.len()));
         }
 
         tracing::debug!(message=%msg_id, "Published message");
@@ -759,7 +786,7 @@ where
         msg_id: &MessageId,
         propagation_source: &PeerId,
         acceptance: MessageAcceptance,
-    ) -> Result<bool, PublishError> {
+    ) -> bool {
         let reject_reason = match acceptance {
             MessageAcceptance::Accept => {
                 let (raw_message, originating_peers) = match self.mcache.validate(msg_id) {
@@ -774,7 +801,7 @@ where
                         if let Some(metrics) = self.metrics.as_mut() {
                             metrics.memcache_miss();
                         }
-                        return Ok(false);
+                        return false;
                     }
                 };
 
@@ -787,8 +814,8 @@ where
                     raw_message,
                     Some(propagation_source),
                     originating_peers,
-                )?;
-                return Ok(true);
+                );
+                return true;
             }
             MessageAcceptance::Reject => RejectReason::ValidationFailed,
             MessageAcceptance::Ignore => RejectReason::ValidationIgnored,
@@ -812,10 +839,10 @@ where
                     peer_score.reject_message(peer, msg_id, &raw_message.topic, reject_reason);
                 }
             }
-            Ok(true)
+            true
         } else {
             tracing::warn!(message=%msg_id, "Rejected message not in cache");
-            Ok(false)
+            false
         }
     }
 
@@ -1003,12 +1030,11 @@ where
             if let Some((peer_score, ..)) = &mut self.peer_score {
                 peer_score.graft(&peer_id, topic_hash.clone());
             }
-            Self::control_pool_add(
-                &mut self.control_pool,
+            self.send_message(
                 peer_id,
-                ControlAction::Graft {
+                RpcOut::Graft(Graft {
                     topic_hash: topic_hash.clone(),
-                },
+                }),
             );
 
             // If the peer did not previously exist in any mesh, inform the handler
@@ -1036,7 +1062,7 @@ where
         peer: &PeerId,
         do_px: bool,
         on_unsubscribe: bool,
-    ) -> ControlAction {
+    ) -> Prune {
         if let Some((peer_score, ..)) = &mut self.peer_score {
             peer_score.prune(peer, topic_hash.clone());
         }
@@ -1047,7 +1073,7 @@ where
             }
             Some(PeerKind::Gossipsub) => {
                 // GossipSub v1.0 -- no peer exchange, the peer won't be able to parse it anyway
-                return ControlAction::Prune {
+                return Prune {
                     topic_hash: topic_hash.clone(),
                     peers: Vec::new(),
                     backoff: None,
@@ -1083,7 +1109,7 @@ where
         // update backoff
         self.backoffs.update_backoff(topic_hash, peer, backoff);
 
-        ControlAction::Prune {
+        Prune {
             topic_hash: topic_hash.clone(),
             peers,
             backoff: Some(backoff.as_secs()),
@@ -1099,17 +1125,18 @@ where
             if let Some(m) = self.metrics.as_mut() {
                 m.left(topic_hash)
             }
-            for peer in peers {
+            for peer_id in peers {
                 // Send a PRUNE control message
-                tracing::debug!(%peer, "LEAVE: Sending PRUNE to peer");
+                tracing::debug!(%peer_id, "LEAVE: Sending PRUNE to peer");
+
                 let on_unsubscribe = true;
-                let control =
-                    self.make_prune(topic_hash, &peer, self.config.do_px(), on_unsubscribe);
-                Self::control_pool_add(&mut self.control_pool, peer, control);
+                let prune =
+                    self.make_prune(topic_hash, &peer_id, self.config.do_px(), on_unsubscribe);
+                self.send_message(peer_id, RpcOut::Prune(prune));
 
                 // If the peer did not previously exist in any mesh, inform the handler
                 peer_removed_from_mesh(
-                    peer,
+                    peer_id,
                     topic_hash,
                     &self.mesh,
                     &mut self.events,
@@ -1203,10 +1230,6 @@ where
                 return false;
             }
 
-            if self.pending_iwant_msgs.contains(id) {
-                return false;
-            }
-
             self.peer_score
                 .as_ref()
                 .map(|(_, _, _, promises)| !promises.contains(id))
@@ -1257,11 +1280,6 @@ where
             iwant_ids_vec.truncate(iask);
             *iasked += iask;
 
-            for message_id in &iwant_ids_vec {
-                // Add all messages to the pending list
-                self.pending_iwant_msgs.insert(message_id.clone());
-            }
-
             if let Some((_, _, _, gossip_promises)) = &mut self.peer_score {
                 gossip_promises.add_promise(
                     *peer_id,
@@ -1275,12 +1293,11 @@ where
                 iwant_ids_vec
             );
 
-            Self::control_pool_add(
-                &mut self.control_pool,
+            self.send_message(
                 *peer_id,
-                ControlAction::IWant {
+                RpcOut::IWant(IWant {
                     message_ids: iwant_ids_vec,
-                },
+                }),
             );
         }
         tracing::trace!(peer=%peer_id, "Completed IHAVE handling for peer");
@@ -1317,7 +1334,13 @@ where
                     );
                 } else {
                     tracing::debug!(peer=%peer_id, "IWANT: Sending cached messages to peer");
-                    self.send_message(*peer_id, RpcOut::Forward(msg));
+                    self.send_message(
+                        *peer_id,
+                        RpcOut::Forward {
+                            message: msg,
+                            timeout: Delay::new(self.config.forward_queue_duration()),
+                        },
+                    );
                 }
             }
         }
@@ -1471,12 +1494,13 @@ where
         if !to_prune_topics.is_empty() {
             // build the prune messages to send
             let on_unsubscribe = false;
-            for action in to_prune_topics
+
+            for prune in to_prune_topics
                 .iter()
                 .map(|t| self.make_prune(t, peer_id, do_px, on_unsubscribe))
                 .collect::<Vec<_>>()
             {
-                self.send_message(*peer_id, RpcOut::Control(action));
+                self.send_message(*peer_id, RpcOut::Prune(prune));
             }
             // Send the prune messages to the peer
             tracing::debug!(
@@ -1768,17 +1792,12 @@ where
 
         // forward the message to mesh peers, if no validation is required
         if !self.config.validate_messages() {
-            if self
-                .forward_msg(
-                    &msg_id,
-                    raw_message,
-                    Some(propagation_source),
-                    HashSet::new(),
-                )
-                .is_err()
-            {
-                tracing::error!("Failed to forward message. Too large");
-            }
+            self.forward_msg(
+                &msg_id,
+                raw_message,
+                Some(propagation_source),
+                HashSet::new(),
+            );
             tracing::debug!(message=%msg_id, "Completed message handling for message");
         }
     }
@@ -1962,12 +1981,8 @@ where
 
         // If we need to send grafts to peer, do so immediately, rather than waiting for the
         // heartbeat.
-        for action in topics_to_graft
-            .into_iter()
-            .map(|topic_hash| ControlAction::Graft { topic_hash })
-            .collect::<Vec<_>>()
-        {
-            self.send_message(*propagation_source, RpcOut::Control(action))
+        for topic_hash in topics_to_graft.into_iter() {
+            self.send_message(*propagation_source, RpcOut::Graft(Graft { topic_hash }));
         }
 
         // Notify the application of the subscriptions
@@ -1998,6 +2013,16 @@ where
         tracing::debug!("Starting heartbeat");
         let start = Instant::now();
 
+        // Every heartbeat we sample the send queues to add to our metrics. We do this intentionally
+        // before we add all the gossip from this heartbeat in order to gain a true measure of
+        // steady-state size of the queues.
+        if let Some(m) = &mut self.metrics {
+            for sender_queue in self.connected_peers.values().map(|v| &v.sender) {
+                m.observe_priority_queue_size(sender_queue.priority_queue_len());
+                m.observe_non_priority_queue_size(sender_queue.non_priority_queue_len());
+            }
+        }
+
         self.heartbeat_ticks += 1;
 
         let mut to_graft = HashMap::new();
@@ -2367,12 +2392,20 @@ where
             self.send_graft_prune(to_graft, to_prune, no_px);
         }
 
-        // piggyback pooled control messages
-        self.flush_control_pool();
-
         // shift the memcache
         self.mcache.shift();
 
+        // Report expired messages
+        for (peer_id, failed_messages) in self.failed_messages.drain() {
+            tracing::debug!("Peer couldn't consume messages: {:?}", failed_messages);
+            self.events
+                .push_back(ToSwarm::GenerateEvent(Event::SlowPeer {
+                    peer_id,
+                    failed_messages,
+                }));
+        }
+        self.failed_messages.shrink_to_fit();
+
         tracing::debug!("Completed Heartbeat");
         if let Some(metrics) = self.metrics.as_mut() {
             let duration = u64::try_from(start.elapsed().as_millis()).unwrap_or(u64::MAX);
@@ -2384,6 +2417,7 @@ where
     /// and fanout peers
     fn emit_gossip(&mut self) {
         let mut rng = thread_rng();
+        let mut messages = Vec::new();
         for (topic_hash, peers) in self.mesh.iter().chain(self.fanout.iter()) {
             let mut message_ids = self.mcache.get_gossip_message_ids(topic_hash);
             if message_ids.is_empty() {
@@ -2419,7 +2453,7 @@ where
 
             tracing::debug!("Gossiping IHAVE to {} peers", to_msg_peers.len());
 
-            for peer in to_msg_peers {
+            for peer_id in to_msg_peers {
                 let mut peer_message_ids = message_ids.clone();
 
                 if peer_message_ids.len() > self.config.max_ihave_length() {
@@ -2431,16 +2465,18 @@ where
                 }
 
                 // send an IHAVE message
-                Self::control_pool_add(
-                    &mut self.control_pool,
-                    peer,
-                    ControlAction::IHave {
+                messages.push((
+                    peer_id,
+                    RpcOut::IHave(IHave {
                         topic_hash: topic_hash.clone(),
                         message_ids: peer_message_ids,
-                    },
-                );
+                    }),
+                ));
             }
         }
+        for (peer_id, message) in messages {
+            self.send_message(peer_id, message);
+        }
     }
 
     /// Handles multiple GRAFT/PRUNE messages and coalesces them into chunked gossip control
@@ -2452,25 +2488,27 @@ where
         no_px: HashSet<PeerId>,
     ) {
         // handle the grafts and overlapping prunes per peer
-        for (peer, topics) in to_graft.into_iter() {
+        for (peer_id, topics) in to_graft.into_iter() {
             for topic in &topics {
                 // inform scoring of graft
                 if let Some((peer_score, ..)) = &mut self.peer_score {
-                    peer_score.graft(&peer, topic.clone());
+                    peer_score.graft(&peer_id, topic.clone());
                 }
 
                 // inform the handler of the peer being added to the mesh
                 // If the peer did not previously exist in any mesh, inform the handler
                 peer_added_to_mesh(
-                    peer,
+                    peer_id,
                     vec![topic],
                     &self.mesh,
                     &mut self.events,
                     &self.connected_peers,
                 );
             }
-            let control_msgs = topics.iter().map(|topic_hash| ControlAction::Graft {
-                topic_hash: topic_hash.clone(),
+            let rpc_msgs = topics.iter().map(|topic_hash| {
+                RpcOut::Graft(Graft {
+                    topic_hash: topic_hash.clone(),
+                })
             });
 
             // If there are prunes associated with the same peer add them.
@@ -2479,40 +2517,41 @@ where
             // of its removal from another.
 
             // The following prunes are not due to unsubscribing.
-            let prunes = to_prune
-                .remove(&peer)
+            let prune_msgs = to_prune
+                .remove(&peer_id)
                 .into_iter()
                 .flatten()
                 .map(|topic_hash| {
-                    self.make_prune(
+                    let prune = self.make_prune(
                         &topic_hash,
-                        &peer,
-                        self.config.do_px() && !no_px.contains(&peer),
+                        &peer_id,
+                        self.config.do_px() && !no_px.contains(&peer_id),
                         false,
-                    )
+                    );
+                    RpcOut::Prune(prune)
                 });
 
-            // send the control messages
-            for msg in control_msgs.chain(prunes).collect::<Vec<_>>() {
-                self.send_message(peer, RpcOut::Control(msg));
+            // send the rpc messages
+            for msg in rpc_msgs.chain(prune_msgs).collect::<Vec<_>>() {
+                self.send_message(peer_id, msg);
             }
         }
 
         // handle the remaining prunes
         // The following prunes are not due to unsubscribing.
-        for (peer, topics) in to_prune.iter() {
+        for (peer_id, topics) in to_prune.iter() {
             for topic_hash in topics {
                 let prune = self.make_prune(
                     topic_hash,
-                    peer,
-                    self.config.do_px() && !no_px.contains(peer),
+                    peer_id,
+                    self.config.do_px() && !no_px.contains(peer_id),
                     false,
                 );
-                self.send_message(*peer, RpcOut::Control(prune));
+                self.send_message(*peer_id, RpcOut::Prune(prune));
 
                 // inform the handler
                 peer_removed_from_mesh(
-                    *peer,
+                    *peer_id,
                     topic_hash,
                     &self.mesh,
                     &mut self.events,
@@ -2525,14 +2564,13 @@ where
     /// Helper function which forwards a message to mesh\[topic\] peers.
     ///
     /// Returns true if at least one peer was messaged.
-    #[allow(clippy::unnecessary_wraps)]
     fn forward_msg(
         &mut self,
         msg_id: &MessageId,
         message: RawMessage,
         propagation_source: Option<&PeerId>,
         originating_peers: HashSet<PeerId>,
-    ) -> Result<bool, PublishError> {
+    ) -> bool {
         // message is fully validated inform peer_score
         if let Some((peer_score, ..)) = &mut self.peer_score {
             if let Some(peer) = propagation_source {
@@ -2543,50 +2581,51 @@ where
         tracing::debug!(message=%msg_id, "Forwarding message");
         let mut recipient_peers = HashSet::new();
 
-        {
-            // Populate the recipient peers mapping
-
-            // Add explicit peers
-            for peer_id in &self.explicit_peers {
-                if let Some(peer) = self.connected_peers.get(peer_id) {
-                    if Some(peer_id) != propagation_source
-                        && !originating_peers.contains(peer_id)
-                        && Some(peer_id) != message.source.as_ref()
-                        && peer.topics.contains(&message.topic)
-                    {
-                        recipient_peers.insert(*peer_id);
-                    }
-                }
+        // Populate the recipient peers mapping
+
+        // Add explicit peers
+        for peer_id in &self.explicit_peers {
+            let Some(peer) = self.connected_peers.get(peer_id) else {
+                continue;
+            };
+            if Some(peer_id) != propagation_source
+                && !originating_peers.contains(peer_id)
+                && Some(peer_id) != message.source.as_ref()
+                && peer.topics.contains(&message.topic)
+            {
+                recipient_peers.insert(*peer_id);
             }
+        }
 
-            // add mesh peers
-            let topic = &message.topic;
-            // mesh
-            if let Some(mesh_peers) = self.mesh.get(topic) {
-                for peer_id in mesh_peers {
-                    if Some(peer_id) != propagation_source
-                        && !originating_peers.contains(peer_id)
-                        && Some(peer_id) != message.source.as_ref()
-                    {
-                        recipient_peers.insert(*peer_id);
-                    }
+        // add mesh peers
+        let topic = &message.topic;
+        // mesh
+        if let Some(mesh_peers) = self.mesh.get(topic) {
+            for peer_id in mesh_peers {
+                if Some(peer_id) != propagation_source
+                    && !originating_peers.contains(peer_id)
+                    && Some(peer_id) != message.source.as_ref()
+                {
+                    recipient_peers.insert(*peer_id);
                 }
             }
         }
 
-        // forward the message to peers
-        if !recipient_peers.is_empty() {
-            let event = RpcOut::Forward(message.clone());
+        if recipient_peers.is_empty() {
+            return false;
+        }
 
-            for peer in recipient_peers.iter() {
-                tracing::debug!(%peer, message=%msg_id, "Sending message to peer");
-                self.send_message(*peer, event.clone());
-            }
-            tracing::debug!("Completed forwarding message");
-            Ok(true)
-        } else {
-            Ok(false)
+        // forward the message to peers
+        for peer in recipient_peers.iter() {
+            let event = RpcOut::Forward {
+                message: message.clone(),
+                timeout: Delay::new(self.config.forward_queue_duration()),
+            };
+            tracing::debug!(%peer, message=%msg_id, "Sending message to peer");
+            self.send_message(*peer, event);
         }
+        tracing::debug!("Completed forwarding message");
+        true
     }
 
     /// Constructs a [`RawMessage`] performing message signing if required.
@@ -2681,49 +2720,69 @@ where
         }
     }
 
-    // adds a control action to control_pool
-    fn control_pool_add(
-        control_pool: &mut HashMap<PeerId, Vec<ControlAction>>,
-        peer: PeerId,
-        control: ControlAction,
-    ) {
-        control_pool.entry(peer).or_default().push(control);
-    }
-
-    /// Takes each control action mapping and turns it into a message
-    fn flush_control_pool(&mut self) {
-        for (peer, controls) in self.control_pool.drain().collect::<Vec<_>>() {
-            for msg in controls {
-                self.send_message(peer, RpcOut::Control(msg));
-            }
-        }
-
-        // This clears all pending IWANT messages
-        self.pending_iwant_msgs.clear();
-    }
-
-    /// Send a [`RpcOut`] message to a peer. This will wrap the message in an arc if it
-    /// is not already an arc.
-    fn send_message(&mut self, peer_id: PeerId, rpc: RpcOut) {
+    /// Send a [`RpcOut`] message to a peer.
+    ///
+    /// Returns `true` if sending was successful, `false` otherwise.
+    /// The method will update the peer score and failed message counter if
+    /// sending the message failed due to the channel to the connection handler being
+    /// full (which indicates a slow peer).
+    fn send_message(&mut self, peer_id: PeerId, rpc: RpcOut) -> bool {
         if let Some(m) = self.metrics.as_mut() {
-            if let RpcOut::Publish(ref message) | RpcOut::Forward(ref message) = rpc {
+            if let RpcOut::Publish { ref message, .. } | RpcOut::Forward { ref message, .. } = rpc {
                 // register bytes sent on the internal metrics.
                 m.msg_sent(&message.topic, message.raw_protobuf_len());
             }
         }
 
-        self.events.push_back(ToSwarm::NotifyHandler {
-            peer_id,
-            event: HandlerIn::Message(rpc),
-            handler: NotifyHandler::Any,
-        });
+        let Some(peer) = &mut self.connected_peers.get_mut(&peer_id) else {
+            tracing::error!(peer = %peer_id,
+                    "Could not send rpc to connection handler, peer doesn't exist in connected peer list");
+            return false;
+        };
+
+        // Try sending the message to the connection handler.
+        match peer.sender.send_message(rpc) {
+            Ok(()) => true,
+            Err(rpc) => {
+                // Sending failed because the channel is full.
+                tracing::warn!(peer=%peer_id, "Send Queue full. Could not send {:?}.", rpc);
+
+                // Update failed message counter.
+                let failed_messages = self.failed_messages.entry(peer_id).or_default();
+                match rpc {
+                    RpcOut::Publish { .. } => {
+                        failed_messages.priority += 1;
+                        failed_messages.publish += 1;
+                    }
+                    RpcOut::Forward { .. } => {
+                        failed_messages.non_priority += 1;
+                        failed_messages.forward += 1;
+                    }
+                    RpcOut::IWant(_) | RpcOut::IHave(_) => {
+                        failed_messages.non_priority += 1;
+                    }
+                    RpcOut::Graft(_)
+                    | RpcOut::Prune(_)
+                    | RpcOut::Subscribe(_)
+                    | RpcOut::Unsubscribe(_) => {
+                        unreachable!("Channel for highpriority contorl messages is unbounded and should always be open.")
+                    }
+                }
+
+                // Update peer score.
+                if let Some((peer_score, ..)) = &mut self.peer_score {
+                    peer_score.failed_message_slow_peer(&peer_id);
+                }
+
+                false
+            }
+        }
     }
 
     fn on_connection_established(
         &mut self,
         ConnectionEstablished {
             peer_id,
-            connection_id,
             endpoint,
             other_established,
             ..
@@ -2751,21 +2810,6 @@ where
             }
         }
 
-        // By default we assume a peer is only a floodsub peer.
-        //
-        // The protocol negotiation occurs once a message is sent/received. Once this happens we
-        // update the type of peer that this is in order to determine which kind of routing should
-        // occur.
-        self.connected_peers
-            .entry(peer_id)
-            .or_insert(PeerConnections {
-                kind: PeerKind::Floodsub,
-                connections: vec![],
-                topics: Default::default(),
-            })
-            .connections
-            .push(connection_id);
-
         if other_established > 0 {
             return; // Not our first connection to this peer, hence nothing to do.
         }
@@ -2840,37 +2884,32 @@ where
         } else {
             // remove from mesh, topic_peers, peer_topic and the fanout
             tracing::debug!(peer=%peer_id, "Peer disconnected");
-            {
-                let Some(peer) = self.connected_peers.get(&peer_id) else {
-                    debug_assert!(
-                        self.blacklisted_peers.contains(&peer_id),
-                        "Disconnected node not in connected list"
-                    );
-                    return;
-                };
-
-                // remove peer from all mappings
-                for topic in peer.topics.iter() {
-                    // check the mesh for the topic
-                    if let Some(mesh_peers) = self.mesh.get_mut(topic) {
-                        // check if the peer is in the mesh and remove it
-                        if mesh_peers.remove(&peer_id) {
-                            if let Some(m) = self.metrics.as_mut() {
-                                m.peers_removed(topic, Churn::Dc, 1);
-                                m.set_mesh_peers(topic, mesh_peers.len());
-                            }
-                        };
-                    }
+            let Some(connected_peer) = self.connected_peers.get(&peer_id) else {
+                tracing::error!(peer_id = %peer_id, "Peer non-existent when handling disconnection");
+                return;
+            };
 
-                    if let Some(m) = self.metrics.as_mut() {
-                        m.dec_topic_peers(topic);
-                    }
+            // remove peer from all mappings
+            for topic in &connected_peer.topics {
+                // check the mesh for the topic
+                if let Some(mesh_peers) = self.mesh.get_mut(topic) {
+                    // check if the peer is in the mesh and remove it
+                    if mesh_peers.remove(&peer_id) {
+                        if let Some(m) = self.metrics.as_mut() {
+                            m.peers_removed(topic, Churn::Dc, 1);
+                            m.set_mesh_peers(topic, mesh_peers.len());
+                        }
+                    };
+                }
 
-                    // remove from fanout
-                    self.fanout
-                        .get_mut(topic)
-                        .map(|peers| peers.remove(&peer_id));
+                if let Some(m) = self.metrics.as_mut() {
+                    m.dec_topic_peers(topic);
                 }
+
+                // remove from fanout
+                self.fanout
+                    .get_mut(topic)
+                    .map(|peers| peers.remove(&peer_id));
             }
 
             // Forget px and outbound status for this peer
@@ -2879,12 +2918,7 @@ where
 
             // If metrics are enabled, register the disconnection of a peer based on its protocol.
             if let Some(metrics) = self.metrics.as_mut() {
-                let peer_kind = &self
-                    .connected_peers
-                    .get(&peer_id)
-                    .expect("Connected peer must be registered")
-                    .kind;
-                metrics.peer_protocol_disconnected(peer_kind.clone());
+                metrics.peer_protocol_disconnected(connected_peer.kind.clone());
             }
 
             self.connected_peers.remove(&peer_id);
@@ -2946,23 +2980,58 @@ where
 
     fn handle_established_inbound_connection(
         &mut self,
-        _: ConnectionId,
-        _: PeerId,
+        connection_id: ConnectionId,
+        peer_id: PeerId,
         _: &Multiaddr,
         _: &Multiaddr,
     ) -> Result<THandler<Self>, ConnectionDenied> {
-        Ok(Handler::new(self.config.protocol_config()))
+        // By default we assume a peer is only a floodsub peer.
+        //
+        // The protocol negotiation occurs once a message is sent/received. Once this happens we
+        // update the type of peer that this is in order to determine which kind of routing should
+        // occur.
+        let connected_peer = self
+            .connected_peers
+            .entry(peer_id)
+            .or_insert(PeerConnections {
+                kind: PeerKind::Floodsub,
+                connections: vec![],
+                sender: Sender::new(self.config.connection_handler_queue_len()),
+                topics: Default::default(),
+            });
+        // Add the new connection
+        connected_peer.connections.push(connection_id);
+
+        Ok(Handler::new(
+            self.config.protocol_config(),
+            connected_peer.sender.new_receiver(),
+        ))
     }
 
     fn handle_established_outbound_connection(
         &mut self,
-        _: ConnectionId,
-        _: PeerId,
+        connection_id: ConnectionId,
+        peer_id: PeerId,
         _: &Multiaddr,
         _: Endpoint,
         _: PortUse,
     ) -> Result<THandler<Self>, ConnectionDenied> {
-        Ok(Handler::new(self.config.protocol_config()))
+        let connected_peer = self
+            .connected_peers
+            .entry(peer_id)
+            .or_insert(PeerConnections {
+                kind: PeerKind::Floodsub,
+                connections: vec![],
+                sender: Sender::new(self.config.connection_handler_queue_len()),
+                topics: Default::default(),
+            });
+        // Add the new connection
+        connected_peer.connections.push(connection_id);
+
+        Ok(Handler::new(
+            self.config.protocol_config(),
+            connected_peer.sender.new_receiver(),
+        ))
     }
 
     fn on_connection_handler_event(
@@ -3002,6 +3071,40 @@ where
                     }
                 }
             }
+            HandlerEvent::MessageDropped(rpc) => {
+                // Account for this in the scoring logic
+                if let Some((peer_score, _, _, _)) = &mut self.peer_score {
+                    peer_score.failed_message_slow_peer(&propagation_source);
+                }
+
+                // Keep track of expired messages for the application layer.
+                let failed_messages = self.failed_messages.entry(propagation_source).or_default();
+                failed_messages.timeout += 1;
+                match rpc {
+                    RpcOut::Publish { .. } => {
+                        failed_messages.publish += 1;
+                    }
+                    RpcOut::Forward { .. } => {
+                        failed_messages.forward += 1;
+                    }
+                    _ => {}
+                }
+
+                // Record metrics on the failure.
+                if let Some(metrics) = self.metrics.as_mut() {
+                    match rpc {
+                        RpcOut::Publish { message, .. } => {
+                            metrics.publish_msg_dropped(&message.topic);
+                            metrics.timeout_msg_dropped(&message.topic);
+                        }
+                        RpcOut::Forward { message, .. } => {
+                            metrics.forward_msg_dropped(&message.topic);
+                            metrics.timeout_msg_dropped(&message.topic);
+                        }
+                        _ => {}
+                    }
+                }
+            }
             HandlerEvent::Message {
                 rpc,
                 invalid_messages,
@@ -3062,21 +3165,21 @@ where
                 let mut prune_msgs = vec![];
                 for control_msg in rpc.control_msgs {
                     match control_msg {
-                        ControlAction::IHave {
+                        ControlAction::IHave(IHave {
                             topic_hash,
                             message_ids,
-                        } => {
+                        }) => {
                             ihave_msgs.push((topic_hash, message_ids));
                         }
-                        ControlAction::IWant { message_ids } => {
+                        ControlAction::IWant(IWant { message_ids }) => {
                             self.handle_iwant(&propagation_source, message_ids)
                         }
-                        ControlAction::Graft { topic_hash } => graft_msgs.push(topic_hash),
-                        ControlAction::Prune {
+                        ControlAction::Graft(Graft { topic_hash }) => graft_msgs.push(topic_hash),
+                        ControlAction::Prune(Prune {
                             topic_hash,
                             peers,
                             backoff,
-                        } => prune_msgs.push((topic_hash, peers, backoff)),
+                        }) => prune_msgs.push((topic_hash, peers, backoff)),
                     }
                 }
                 if !ihave_msgs.is_empty() {
@@ -3142,13 +3245,15 @@ fn peer_added_to_mesh(
     connections: &HashMap<PeerId, PeerConnections>,
 ) {
     // Ensure there is an active connection
-    let connection_id = {
-        let conn = connections.get(&peer_id).expect("To be connected to peer.");
-        assert!(
-            !conn.connections.is_empty(),
-            "Must have at least one connection"
-        );
-        conn.connections[0]
+    let connection_id = match connections.get(&peer_id) {
+        Some(p) => p
+            .connections
+            .first()
+            .expect("There should be at least one connection to a peer."),
+        None => {
+            tracing::error!(peer_id=%peer_id, "Peer not existent when added to the mesh");
+            return;
+        }
     };
 
     if let Some(peer) = connections.get(&peer_id) {
@@ -3167,7 +3272,7 @@ fn peer_added_to_mesh(
     events.push_back(ToSwarm::NotifyHandler {
         peer_id,
         event: HandlerIn::JoinedMesh,
-        handler: NotifyHandler::One(connection_id),
+        handler: NotifyHandler::One(*connection_id),
     });
 }
 
@@ -3182,12 +3287,16 @@ fn peer_removed_from_mesh(
     connections: &HashMap<PeerId, PeerConnections>,
 ) {
     // Ensure there is an active connection
-    let connection_id = connections
-        .get(&peer_id)
-        .expect("To be connected to peer.")
-        .connections
-        .first()
-        .expect("There should be at least one connection to a peer.");
+    let connection_id = match connections.get(&peer_id) {
+        Some(p) => p
+            .connections
+            .first()
+            .expect("There should be at least one connection to a peer."),
+        None => {
+            tracing::error!(peer_id=%peer_id, "Peer not existent when removed from mesh");
+            return;
+        }
+    };
 
     if let Some(peer) = connections.get(&peer_id) {
         for topic in &peer.topics {
@@ -3289,7 +3398,6 @@ impl<C: DataTransform, F: TopicSubscriptionFilter> fmt::Debug for Behaviour<C, F
         f.debug_struct("Behaviour")
             .field("config", &self.config)
             .field("events", &self.events.len())
-            .field("control_pool", &self.control_pool)
             .field("publish_config", &self.publish_config)
             .field("mesh", &self.mesh)
             .field("fanout", &self.fanout)
@@ -3314,42 +3422,3 @@ impl fmt::Debug for PublishConfig {
         }
     }
 }
-
-#[cfg(test)]
-mod local_test {
-    use super::*;
-    use crate::IdentTopic;
-    use quickcheck::*;
-
-    fn test_message() -> RawMessage {
-        RawMessage {
-            source: Some(PeerId::random()),
-            data: vec![0; 100],
-            sequence_number: None,
-            topic: TopicHash::from_raw("test_topic"),
-            signature: None,
-            key: None,
-            validated: false,
-        }
-    }
-
-    fn test_control() -> ControlAction {
-        ControlAction::IHave {
-            topic_hash: IdentTopic::new("TestTopic").hash(),
-            message_ids: vec![MessageId(vec![12u8]); 5],
-        }
-    }
-
-    impl Arbitrary for RpcOut {
-        fn arbitrary(g: &mut Gen) -> Self {
-            match u8::arbitrary(g) % 5 {
-                0 => RpcOut::Subscribe(IdentTopic::new("TestTopic").hash()),
-                1 => RpcOut::Unsubscribe(IdentTopic::new("TestTopic").hash()),
-                2 => RpcOut::Publish(test_message()),
-                3 => RpcOut::Forward(test_message()),
-                4 => RpcOut::Control(test_control()),
-                _ => panic!("outside range"),
-            }
-        }
-    }
-}
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index c7afe926a65..9567150382a 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -21,11 +21,13 @@
 // Collection of tests for the gossipsub network behaviour
 
 use super::*;
+use crate::rpc::Receiver;
 use crate::subscription_filter::WhitelistSubscriptionFilter;
 use crate::{config::ConfigBuilder, types::Rpc, IdentTopic as Topic};
 use byteorder::{BigEndian, ByteOrder};
 use libp2p_core::ConnectedPoint;
 use rand::Rng;
+use std::future;
 use std::net::Ipv4Addr;
 use std::thread::sleep;
 
@@ -53,7 +55,15 @@ where
     D: DataTransform + Default + Clone + Send + 'static,
     F: TopicSubscriptionFilter + Clone + Default + Send + 'static,
 {
-    pub(crate) fn create_network(self) -> (Behaviour<D, F>, Vec<PeerId>, Vec<TopicHash>) {
+    #[allow(clippy::type_complexity)]
+    pub(crate) fn create_network(
+        self,
+    ) -> (
+        Behaviour<D, F>,
+        Vec<PeerId>,
+        HashMap<PeerId, Receiver>,
+        Vec<TopicHash>,
+    ) {
         let keypair = libp2p_identity::Keypair::generate_ed25519();
         // create a gossipsub struct
         let mut gs: Behaviour<D, F> = Behaviour::new_with_subscription_filter_and_transform(
@@ -81,10 +91,11 @@ where
 
         // build and connect peer_no random peers
         let mut peers = vec![];
+        let mut receivers = HashMap::new();
 
         let empty = vec![];
         for i in 0..self.peer_no {
-            peers.push(add_peer(
+            let (peer, receiver) = add_peer(
                 &mut gs,
                 if self.to_subscribe {
                     &topic_hashes
@@ -93,10 +104,12 @@ where
                 },
                 i < self.outbound,
                 i < self.explicit,
-            ));
+            );
+            peers.push(peer);
+            receivers.insert(peer, receiver);
         }
 
-        (gs, peers, topic_hashes)
+        (gs, peers, receivers, topic_hashes)
     }
 
     fn peer_no(mut self, peer_no: usize) -> Self {
@@ -160,7 +173,7 @@ fn add_peer<D, F>(
     topic_hashes: &[TopicHash],
     outbound: bool,
     explicit: bool,
-) -> PeerId
+) -> (PeerId, Receiver)
 where
     D: DataTransform + Default + Clone + Send + 'static,
     F: TopicSubscriptionFilter + Clone + Default + Send + 'static,
@@ -174,7 +187,7 @@ fn add_peer_with_addr<D, F>(
     outbound: bool,
     explicit: bool,
     address: Multiaddr,
-) -> PeerId
+) -> (PeerId, Receiver)
 where
     D: DataTransform + Default + Clone + Send + 'static,
     F: TopicSubscriptionFilter + Clone + Default + Send + 'static,
@@ -196,7 +209,7 @@ fn add_peer_with_addr_and_kind<D, F>(
     explicit: bool,
     address: Multiaddr,
     kind: Option<PeerKind>,
-) -> PeerId
+) -> (PeerId, Receiver)
 where
     D: DataTransform + Default + Clone + Send + 'static,
     F: TopicSubscriptionFilter + Clone + Default + Send + 'static,
@@ -215,9 +228,22 @@ where
         }
     };
 
+    let sender = Sender::new(gs.config.connection_handler_queue_len());
+    let receiver = sender.new_receiver();
+    let connection_id = ConnectionId::new_unchecked(0);
+    gs.connected_peers.insert(
+        peer,
+        PeerConnections {
+            kind: kind.clone().unwrap_or(PeerKind::Floodsub),
+            connections: vec![connection_id],
+            topics: Default::default(),
+            sender,
+        },
+    );
+
     gs.on_swarm_event(FromSwarm::ConnectionEstablished(ConnectionEstablished {
         peer_id: peer,
-        connection_id: ConnectionId::new_unchecked(0),
+        connection_id,
         endpoint: &endpoint,
         failed_addresses: &[],
         other_established: 0, // first connection
@@ -245,7 +271,7 @@ where
             &peer,
         );
     }
-    peer
+    (peer, receiver)
 }
 
 fn disconnect_peer<D, F>(gs: &mut Behaviour<D, F>, peer_id: &PeerId)
@@ -298,33 +324,39 @@ fn proto_to_message(rpc: &proto::RPC) -> Rpc {
         let ihave_msgs: Vec<ControlAction> = rpc_control
             .ihave
             .into_iter()
-            .map(|ihave| ControlAction::IHave {
-                topic_hash: TopicHash::from_raw(ihave.topic_id.unwrap_or_default()),
-                message_ids: ihave
-                    .message_ids
-                    .into_iter()
-                    .map(MessageId::from)
-                    .collect::<Vec<_>>(),
+            .map(|ihave| {
+                ControlAction::IHave(IHave {
+                    topic_hash: TopicHash::from_raw(ihave.topic_id.unwrap_or_default()),
+                    message_ids: ihave
+                        .message_ids
+                        .into_iter()
+                        .map(MessageId::from)
+                        .collect::<Vec<_>>(),
+                })
             })
             .collect();
 
         let iwant_msgs: Vec<ControlAction> = rpc_control
             .iwant
             .into_iter()
-            .map(|iwant| ControlAction::IWant {
-                message_ids: iwant
-                    .message_ids
-                    .into_iter()
-                    .map(MessageId::from)
-                    .collect::<Vec<_>>(),
+            .map(|iwant| {
+                ControlAction::IWant(IWant {
+                    message_ids: iwant
+                        .message_ids
+                        .into_iter()
+                        .map(MessageId::from)
+                        .collect::<Vec<_>>(),
+                })
             })
             .collect();
 
         let graft_msgs: Vec<ControlAction> = rpc_control
             .graft
             .into_iter()
-            .map(|graft| ControlAction::Graft {
-                topic_hash: TopicHash::from_raw(graft.topic_id.unwrap_or_default()),
+            .map(|graft| {
+                ControlAction::Graft(Graft {
+                    topic_hash: TopicHash::from_raw(graft.topic_id.unwrap_or_default()),
+                })
             })
             .collect();
 
@@ -347,11 +379,11 @@ fn proto_to_message(rpc: &proto::RPC) -> Rpc {
                 .collect::<Vec<PeerInfo>>();
 
             let topic_hash = TopicHash::from_raw(prune.topic_id.unwrap_or_default());
-            prune_msgs.push(ControlAction::Prune {
+            prune_msgs.push(ControlAction::Prune(Prune {
                 topic_hash,
                 peers,
                 backoff: prune.backoff,
-            });
+            }));
         }
 
         control_msgs.extend(ihave_msgs);
@@ -387,7 +419,7 @@ fn test_subscribe() {
     // - run JOIN(topic)
 
     let subscribe_topic = vec![String::from("test_subscribe")];
-    let (gs, _, topic_hashes) = inject_nodes1()
+    let (gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(subscribe_topic)
         .to_subscribe(true)
@@ -399,26 +431,24 @@ fn test_subscribe() {
     );
 
     // collect all the subscriptions
-    let subscriptions = gs
-        .events
-        .iter()
-        .filter(|e| {
-            matches!(
-                e,
-                ToSwarm::NotifyHandler {
-                    event: HandlerIn::Message(RpcOut::Subscribe(_)),
-                    ..
+    let subscriptions = receivers
+        .into_values()
+        .fold(0, |mut collected_subscriptions, c| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Subscribe(_)) = priority.try_recv() {
+                    collected_subscriptions += 1
                 }
-            )
-        })
-        .count();
+            }
+            collected_subscriptions
+        });
 
     // we sent a subscribe to all known peers
     assert_eq!(subscriptions, 20);
 }
 
-#[test]
 /// Test unsubscribe.
+#[test]
 fn test_unsubscribe() {
     // Unsubscribe should:
     // - Remove the mesh entry for topic
@@ -432,7 +462,7 @@ fn test_unsubscribe() {
         .collect::<Vec<Topic>>();
 
     // subscribe to topic_strings
-    let (mut gs, _, topic_hashes) = inject_nodes1()
+    let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(topic_strings)
         .to_subscribe(true)
@@ -453,24 +483,25 @@ fn test_unsubscribe() {
 
     // unsubscribe from both topics
     assert!(
-        gs.unsubscribe(&topics[0]).unwrap(),
+        gs.unsubscribe(&topics[0]),
         "should be able to unsubscribe successfully from each topic",
     );
     assert!(
-        gs.unsubscribe(&topics[1]).unwrap(),
+        gs.unsubscribe(&topics[1]),
         "should be able to unsubscribe successfully from each topic",
     );
 
     // collect all the subscriptions
-    let subscriptions = gs
-        .events
-        .iter()
-        .fold(0, |collected_subscriptions, e| match e {
-            ToSwarm::NotifyHandler {
-                event: HandlerIn::Message(RpcOut::Subscribe(_)),
-                ..
-            } => collected_subscriptions + 1,
-            _ => collected_subscriptions,
+    let subscriptions = receivers
+        .into_values()
+        .fold(0, |mut collected_subscriptions, c| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Subscribe(_)) = priority.try_recv() {
+                    collected_subscriptions += 1
+                }
+            }
+            collected_subscriptions
         });
 
     // we sent a unsubscribe to all known peers, for two topics
@@ -485,8 +516,8 @@ fn test_unsubscribe() {
     }
 }
 
-#[test]
 /// Test JOIN(topic) functionality.
+#[test]
 fn test_join() {
     // The Join function should:
     // - Remove peers from fanout[topic]
@@ -503,19 +534,22 @@ fn test_join() {
         .map(|t| Topic::new(t.clone()))
         .collect::<Vec<Topic>>();
 
-    let (mut gs, _, topic_hashes) = inject_nodes1()
+    let (mut gs, _, mut receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(topic_strings)
         .to_subscribe(true)
         .create_network();
 
+    // Flush previous GRAFT messages.
+    receivers = flush_events(&mut gs, receivers);
+
     // unsubscribe, then call join to invoke functionality
     assert!(
-        gs.unsubscribe(&topics[0]).unwrap(),
+        gs.unsubscribe(&topics[0]),
         "should be able to unsubscribe successfully"
     );
     assert!(
-        gs.unsubscribe(&topics[1]).unwrap(),
+        gs.unsubscribe(&topics[1]),
         "should be able to unsubscribe successfully"
     );
 
@@ -531,24 +565,34 @@ fn test_join() {
         "Should have added 6 nodes to the mesh"
     );
 
-    fn collect_grafts(
-        mut collected_grafts: Vec<ControlAction>,
-        (_, controls): (&PeerId, &Vec<ControlAction>),
-    ) -> Vec<ControlAction> {
-        for c in controls.iter() {
-            if let ControlAction::Graft { topic_hash: _ } = c {
-                collected_grafts.push(c.clone())
+    fn count_grafts(receivers: HashMap<PeerId, Receiver>) -> (usize, HashMap<PeerId, Receiver>) {
+        let mut new_receivers = HashMap::new();
+        let mut acc = 0;
+
+        for (peer_id, c) in receivers.into_iter() {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Graft(_)) = priority.try_recv() {
+                    acc += 1;
+                }
             }
+            new_receivers.insert(
+                peer_id,
+                Receiver {
+                    priority_queue_len: c.priority_queue_len,
+                    priority: c.priority,
+                    non_priority: c.non_priority,
+                },
+            );
         }
-        collected_grafts
+        (acc, new_receivers)
     }
 
     // there should be mesh_n GRAFT messages.
-    let graft_messages = gs.control_pool.iter().fold(vec![], collect_grafts);
+    let (graft_messages, mut receivers) = count_grafts(receivers);
 
     assert_eq!(
-        graft_messages.len(),
-        6,
+        graft_messages, 6,
         "There should be 6 grafts messages sent to peers"
     );
 
@@ -557,14 +601,37 @@ fn test_join() {
     gs.fanout
         .insert(topic_hashes[1].clone(), Default::default());
     let mut new_peers: Vec<PeerId> = vec![];
+
     for _ in 0..3 {
         let random_peer = PeerId::random();
         // inform the behaviour of a new peer
+        let address = "/ip4/127.0.0.1".parse::<Multiaddr>().unwrap();
+        gs.handle_established_inbound_connection(
+            ConnectionId::new_unchecked(0),
+            random_peer,
+            &address,
+            &address,
+        )
+        .unwrap();
+        let sender = Sender::new(gs.config.connection_handler_queue_len());
+        let receiver = sender.new_receiver();
+        let connection_id = ConnectionId::new_unchecked(0);
+        gs.connected_peers.insert(
+            random_peer,
+            PeerConnections {
+                kind: PeerKind::Floodsub,
+                connections: vec![connection_id],
+                topics: Default::default(),
+                sender,
+            },
+        );
+        receivers.insert(random_peer, receiver);
+
         gs.on_swarm_event(FromSwarm::ConnectionEstablished(ConnectionEstablished {
             peer_id: random_peer,
-            connection_id: ConnectionId::new_unchecked(0),
+            connection_id,
             endpoint: &ConnectedPoint::Dialer {
-                address: "/ip4/127.0.0.1".parse::<Multiaddr>().unwrap(),
+                address,
                 role_override: Endpoint::Dialer,
                 port_use: PortUse::Reuse,
             },
@@ -594,12 +661,12 @@ fn test_join() {
         );
     }
 
-    // there should now be 12 graft messages to be sent
-    let graft_messages = gs.control_pool.iter().fold(vec![], collect_grafts);
+    // there should now 6 graft messages to be sent
+    let (graft_messages, _) = count_grafts(receivers);
 
-    assert!(
-        graft_messages.len() == 12,
-        "There should be 12 grafts messages sent to peers"
+    assert_eq!(
+        graft_messages, 6,
+        "There should be 6 grafts messages sent to peers"
     );
 }
 
@@ -617,7 +684,7 @@ fn test_publish_without_flood_publishing() {
         .unwrap();
 
     let publish_topic = String::from("test_publish");
-    let (mut gs, _, topic_hashes) = inject_nodes1()
+    let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![publish_topic.clone()])
         .to_subscribe(true)
@@ -644,18 +711,16 @@ fn test_publish_without_flood_publishing() {
     gs.publish(Topic::new(publish_topic), publish_data).unwrap();
 
     // Collect all publish messages
-    let publishes = gs
-        .events
-        .into_iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler {
-                event: HandlerIn::Message(RpcOut::Publish(message)),
-                ..
-            } => {
-                collected_publish.push(message);
-                collected_publish
+    let publishes = receivers
+        .into_values()
+        .fold(vec![], |mut collected_publish, c| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Publish { message, .. }) = priority.try_recv() {
+                    collected_publish.push(message);
+                }
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     // Transform the inbound message
@@ -699,7 +764,7 @@ fn test_fanout() {
         .unwrap();
 
     let fanout_topic = String::from("test_fanout");
-    let (mut gs, _, topic_hashes) = inject_nodes1()
+    let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![fanout_topic.clone()])
         .to_subscribe(true)
@@ -712,7 +777,7 @@ fn test_fanout() {
     );
     // Unsubscribe from topic
     assert!(
-        gs.unsubscribe(&Topic::new(fanout_topic.clone())).unwrap(),
+        gs.unsubscribe(&Topic::new(fanout_topic.clone())),
         "should be able to unsubscribe successfully from topic"
     );
 
@@ -731,18 +796,16 @@ fn test_fanout() {
     );
 
     // Collect all publish messages
-    let publishes = gs
-        .events
-        .into_iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler {
-                event: HandlerIn::Message(RpcOut::Publish(message)),
-                ..
-            } => {
-                collected_publish.push(message);
-                collected_publish
+    let publishes = receivers
+        .into_values()
+        .fold(vec![], |mut collected_publish, c| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Publish { message, .. }) = priority.try_recv() {
+                    collected_publish.push(message);
+                }
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     // Transform the inbound message
@@ -770,10 +833,10 @@ fn test_fanout() {
     );
 }
 
-#[test]
 /// Test the gossipsub NetworkBehaviour peer connection logic.
+#[test]
 fn test_inject_connected() {
-    let (gs, peers, topic_hashes) = inject_nodes1()
+    let (gs, peers, receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![String::from("topic1"), String::from("topic2")])
         .to_subscribe(true)
@@ -781,26 +844,20 @@ fn test_inject_connected() {
 
     // check that our subscriptions are sent to each of the peers
     // collect all the SendEvents
-    let subscriptions = gs
-        .events
-        .into_iter()
-        .filter_map(|e| match e {
-            ToSwarm::NotifyHandler {
-                event: HandlerIn::Message(RpcOut::Subscribe(topic)),
-                peer_id,
-                ..
-            } => Some((peer_id, topic)),
-            _ => None,
-        })
-        .fold(
-            HashMap::<PeerId, Vec<String>>::new(),
-            |mut subs, (peer, sub)| {
-                let mut peer_subs = subs.remove(&peer).unwrap_or_default();
-                peer_subs.push(sub.into_string());
-                subs.insert(peer, peer_subs);
-                subs
-            },
-        );
+    let subscriptions = receivers.into_iter().fold(
+        HashMap::<PeerId, Vec<String>>::new(),
+        |mut collected_subscriptions, (peer, c)| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Subscribe(topic)) = priority.try_recv() {
+                    let mut peer_subs = collected_subscriptions.remove(&peer).unwrap_or_default();
+                    peer_subs.push(topic.into_string());
+                    collected_subscriptions.insert(peer, peer_subs);
+                }
+            }
+            collected_subscriptions
+        },
+    );
 
     // check that there are two subscriptions sent to each peer
     for peer_subs in subscriptions.values() {
@@ -822,8 +879,8 @@ fn test_inject_connected() {
     }
 }
 
-#[test]
 /// Test subscription handling
+#[test]
 fn test_handle_received_subscriptions() {
     // For every subscription:
     // SUBSCRIBE:   - Add subscribed topic to peer_topics for peer.
@@ -835,7 +892,7 @@ fn test_handle_received_subscriptions() {
         .iter()
         .map(|&t| String::from(t))
         .collect();
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(topics)
         .to_subscribe(false)
@@ -914,10 +971,9 @@ fn test_handle_received_subscriptions() {
         &peers[0],
     );
 
-    let peer = gs.connected_peers.get(&peers[0]).unwrap().clone();
-    assert_eq!(
-        peer.topics,
-        topic_hashes[1..3].iter().cloned().collect::<BTreeSet<_>>(),
+    let peer = gs.connected_peers.get(&peers[0]).unwrap();
+    assert!(
+        peer.topics == topic_hashes[1..3].iter().cloned().collect::<BTreeSet<_>>(),
         "Peer should be subscribed to two topics"
     );
 
@@ -935,8 +991,8 @@ fn test_handle_received_subscriptions() {
     );
 }
 
-#[test]
 /// Test Gossipsub.get_random_peers() function
+#[test]
 fn test_get_random_peers() {
     // generate a default Config
     let gs_config = ConfigBuilder::default()
@@ -949,25 +1005,22 @@ fn test_get_random_peers() {
     // create a topic and fill it with some peers
     let topic_hash = Topic::new("Test").hash();
     let mut peers = vec![];
-    for _ in 0..20 {
-        peers.push(PeerId::random())
-    }
     let mut topics = BTreeSet::new();
     topics.insert(topic_hash.clone());
 
-    gs.connected_peers = peers
-        .iter()
-        .map(|p| {
-            (
-                *p,
-                PeerConnections {
-                    kind: PeerKind::Gossipsubv1_1,
-                    connections: vec![ConnectionId::new_unchecked(0)],
-                    topics: topics.clone(),
-                },
-            )
-        })
-        .collect();
+    for _ in 0..20 {
+        let peer_id = PeerId::random();
+        peers.push(peer_id);
+        gs.connected_peers.insert(
+            peer_id,
+            PeerConnections {
+                kind: PeerKind::Gossipsubv1_1,
+                connections: vec![ConnectionId::new_unchecked(0)],
+                topics: topics.clone(),
+                sender: Sender::new(gs.config.connection_handler_queue_len()),
+            },
+        );
+    }
 
     let random_peers = get_random_peers(&gs.connected_peers, &topic_hash, 5, |_| true);
     assert_eq!(random_peers.len(), 5, "Expected 5 peers to be returned");
@@ -997,7 +1050,7 @@ fn test_get_random_peers() {
 /// Tests that the correct message is sent when a peer asks for a message in our cache.
 #[test]
 fn test_handle_iwant_msg_cached() {
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, receivers, _) = inject_nodes1()
         .peer_no(20)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1025,18 +1078,17 @@ fn test_handle_iwant_msg_cached() {
     gs.handle_iwant(&peers[7], vec![msg_id.clone()]);
 
     // the messages we are sending
-    let sent_messages = gs.events.into_iter().fold(
-        Vec::<RawMessage>::new(),
-        |mut collected_messages, e| match e {
-            ToSwarm::NotifyHandler { event, .. } => {
-                if let HandlerIn::Message(RpcOut::Forward(message)) = event {
-                    collected_messages.push(message);
+    let sent_messages = receivers
+        .into_values()
+        .fold(vec![], |mut collected_messages, c| {
+            let non_priority = c.non_priority.get_ref();
+            while !non_priority.is_empty() {
+                if let Ok(RpcOut::Forward { message, .. }) = non_priority.try_recv() {
+                    collected_messages.push(message)
                 }
-                collected_messages
             }
-            _ => collected_messages,
-        },
-    );
+            collected_messages
+        });
 
     assert!(
         sent_messages
@@ -1050,7 +1102,7 @@ fn test_handle_iwant_msg_cached() {
 /// Tests that messages are sent correctly depending on the shifting of the message cache.
 #[test]
 fn test_handle_iwant_msg_cached_shifted() {
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, mut receivers, _) = inject_nodes1()
         .peer_no(20)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1083,19 +1135,29 @@ fn test_handle_iwant_msg_cached_shifted() {
         gs.handle_iwant(&peers[7], vec![msg_id.clone()]);
 
         // is the message is being sent?
-        let message_exists = gs.events.iter().any(|e| match e {
-            ToSwarm::NotifyHandler {
-                event: HandlerIn::Message(RpcOut::Forward(message)),
-                ..
-            } => {
-                gs.config.message_id(
-                    &gs.data_transform
-                        .inbound_transform(message.clone())
-                        .unwrap(),
-                ) == msg_id
+        let mut message_exists = false;
+        receivers = receivers.into_iter().map(|(peer_id, c)| {
+            let non_priority = c.non_priority.get_ref();
+            while !non_priority.is_empty() {
+                if matches!(non_priority.try_recv(), Ok(RpcOut::Forward{message, timeout: _ }) if
+                        gs.config.message_id(
+                            &gs.data_transform
+                                .inbound_transform(message.clone())
+                                .unwrap(),
+                        ) == msg_id)
+                {
+                    message_exists = true;
+                }
             }
-            _ => false,
-        });
+            (
+                peer_id,
+                Receiver {
+                    priority_queue_len: c.priority_queue_len,
+                    priority: c.priority,
+                    non_priority: c.non_priority,
+                },
+            )
+        }).collect();
         // default history_length is 5, expect no messages after shift > 5
         if shift < 5 {
             assert!(
@@ -1111,10 +1173,10 @@ fn test_handle_iwant_msg_cached_shifted() {
     }
 }
 
+/// tests that an event is not created when a peers asks for a message not in our cache
 #[test]
-// tests that an event is not created when a peers asks for a message not in our cache
 fn test_handle_iwant_msg_not_cached() {
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, _, _) = inject_nodes1()
         .peer_no(20)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1130,10 +1192,10 @@ fn test_handle_iwant_msg_not_cached() {
     );
 }
 
+/// tests that an event is created when a peer shares that it has a message we want
 #[test]
-// tests that an event is created when a peer shares that it has a message we want
 fn test_handle_ihave_subscribed_and_msg_not_cached() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, mut receivers, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -1145,15 +1207,20 @@ fn test_handle_ihave_subscribed_and_msg_not_cached() {
     );
 
     // check that we sent an IWANT request for `unknown id`
-    let iwant_exists = match gs.control_pool.get(&peers[7]) {
-        Some(controls) => controls.iter().any(|c| match c {
-            ControlAction::IWant { message_ids } => message_ids
+    let mut iwant_exists = false;
+    let receiver = receivers.remove(&peers[7]).unwrap();
+    let non_priority = receiver.non_priority.get_ref();
+    while !non_priority.is_empty() {
+        if let Ok(RpcOut::IWant(IWant { message_ids })) = non_priority.try_recv() {
+            if message_ids
                 .iter()
-                .any(|m| *m == MessageId::new(b"unknown id")),
-            _ => false,
-        }),
-        _ => false,
-    };
+                .any(|m| *m == MessageId::new(b"unknown id"))
+            {
+                iwant_exists = true;
+                break;
+            }
+        }
+    }
 
     assert!(
         iwant_exists,
@@ -1161,11 +1228,11 @@ fn test_handle_ihave_subscribed_and_msg_not_cached() {
     );
 }
 
+/// tests that an event is not created when a peer shares that it has a message that
+/// we already have
 #[test]
-// tests that an event is not created when a peer shares that it has a message that
-// we already have
 fn test_handle_ihave_subscribed_and_msg_cached() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -1183,11 +1250,11 @@ fn test_handle_ihave_subscribed_and_msg_cached() {
     )
 }
 
+/// test that an event is not created when a peer shares that it has a message in
+/// a topic that we are not subscribed to
 #[test]
-// test that an event is not created when a peer shares that it has a message in
-// a topic that we are not subscribed to
 fn test_handle_ihave_not_subscribed() {
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, _, _) = inject_nodes1()
         .peer_no(20)
         .topics(vec![])
         .to_subscribe(true)
@@ -1209,11 +1276,11 @@ fn test_handle_ihave_not_subscribed() {
     )
 }
 
+/// tests that a peer is added to our mesh when we are both subscribed
+/// to the same topic
 #[test]
-// tests that a peer is added to our mesh when we are both subscribed
-// to the same topic
 fn test_handle_graft_is_subscribed() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -1227,11 +1294,11 @@ fn test_handle_graft_is_subscribed() {
     );
 }
 
+/// tests that a peer is not added to our mesh when they are subscribed to
+/// a topic that we are not
 #[test]
-// tests that a peer is not added to our mesh when they are subscribed to
-// a topic that we are not
 fn test_handle_graft_is_not_subscribed() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -1248,15 +1315,15 @@ fn test_handle_graft_is_not_subscribed() {
     );
 }
 
+/// tests multiple topics in a single graft message
 #[test]
-// tests multiple topics in a single graft message
 fn test_handle_graft_multiple_topics() {
     let topics: Vec<String> = ["topic1", "topic2", "topic3", "topic4"]
         .iter()
         .map(|&t| String::from(t))
         .collect();
 
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(topics)
         .to_subscribe(true)
@@ -1283,10 +1350,10 @@ fn test_handle_graft_multiple_topics() {
     );
 }
 
+/// tests that a peer is removed from our mesh
 #[test]
-// tests that a peer is removed from our mesh
 fn test_handle_prune_peer_in_mesh() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(20)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -1313,36 +1380,68 @@ fn test_handle_prune_peer_in_mesh() {
     );
 }
 
-fn count_control_msgs<D: DataTransform, F: TopicSubscriptionFilter>(
-    gs: &Behaviour<D, F>,
-    mut filter: impl FnMut(&PeerId, &ControlAction) -> bool,
-) -> usize {
-    gs.control_pool
-        .iter()
-        .map(|(peer_id, actions)| actions.iter().filter(|m| filter(peer_id, m)).count())
-        .sum::<usize>()
-        + gs.events
-            .iter()
-            .filter(|e| match e {
-                ToSwarm::NotifyHandler {
-                    peer_id,
-                    event: HandlerIn::Message(RpcOut::Control(action)),
-                    ..
-                } => filter(peer_id, action),
-                _ => false,
-            })
-            .count()
+fn count_control_msgs(
+    receivers: HashMap<PeerId, Receiver>,
+    mut filter: impl FnMut(&PeerId, &RpcOut) -> bool,
+) -> (usize, HashMap<PeerId, Receiver>) {
+    let mut new_receivers = HashMap::new();
+    let mut collected_messages = 0;
+    for (peer_id, c) in receivers.into_iter() {
+        let priority = c.priority.get_ref();
+        let non_priority = c.non_priority.get_ref();
+        while !priority.is_empty() || !non_priority.is_empty() {
+            if let Ok(rpc) = priority.try_recv() {
+                if filter(&peer_id, &rpc) {
+                    collected_messages += 1;
+                }
+            }
+            if let Ok(rpc) = non_priority.try_recv() {
+                if filter(&peer_id, &rpc) {
+                    collected_messages += 1;
+                }
+            }
+        }
+        new_receivers.insert(
+            peer_id,
+            Receiver {
+                priority_queue_len: c.priority_queue_len,
+                priority: c.priority,
+                non_priority: c.non_priority,
+            },
+        );
+    }
+    (collected_messages, new_receivers)
 }
 
-fn flush_events<D: DataTransform, F: TopicSubscriptionFilter>(gs: &mut Behaviour<D, F>) {
-    gs.control_pool.clear();
+fn flush_events<D: DataTransform, F: TopicSubscriptionFilter>(
+    gs: &mut Behaviour<D, F>,
+    receivers: HashMap<PeerId, Receiver>,
+) -> HashMap<PeerId, Receiver> {
     gs.events.clear();
+    let mut new_receivers = HashMap::new();
+    for (peer_id, c) in receivers.into_iter() {
+        let priority = c.priority.get_ref();
+        let non_priority = c.non_priority.get_ref();
+        while !priority.is_empty() || !non_priority.is_empty() {
+            let _ = priority.try_recv();
+            let _ = non_priority.try_recv();
+        }
+        new_receivers.insert(
+            peer_id,
+            Receiver {
+                priority_queue_len: c.priority_queue_len,
+                priority: c.priority,
+                non_priority: c.non_priority,
+            },
+        );
+    }
+    new_receivers
 }
 
+/// tests that a peer added as explicit peer gets connected to
 #[test]
-// tests that a peer added as explicit peer gets connected to
 fn test_explicit_peer_gets_connected() {
-    let (mut gs, _, _) = inject_nodes1()
+    let (mut gs, _, _, _) = inject_nodes1()
         .peer_no(0)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1375,7 +1474,7 @@ fn test_explicit_peer_reconnects() {
         .check_explicit_peers_ticks(2)
         .build()
         .unwrap();
-    let (mut gs, others, _) = inject_nodes1()
+    let (mut gs, others, receivers, _) = inject_nodes1()
         .peer_no(1)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1387,7 +1486,7 @@ fn test_explicit_peer_reconnects() {
     //add peer as explicit peer
     gs.add_explicit_peer(peer);
 
-    flush_events(&mut gs);
+    flush_events(&mut gs, receivers);
 
     //disconnect peer
     disconnect_peer(&mut gs, peer);
@@ -1425,7 +1524,7 @@ fn test_explicit_peer_reconnects() {
 
 #[test]
 fn test_handle_graft_explicit_peer() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, receivers, topic_hashes) = inject_nodes1()
         .peer_no(1)
         .topics(vec![String::from("topic1"), String::from("topic2")])
         .to_subscribe(true)
@@ -1442,21 +1541,24 @@ fn test_handle_graft_explicit_peer() {
     assert!(gs.mesh[&topic_hashes[1]].is_empty());
 
     //check prunes
-    assert!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == peer
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == peer
             && match m {
-                ControlAction::Prune { topic_hash, .. } =>
-                    topic_hash == &topic_hashes[0] || topic_hash == &topic_hashes[1],
+                RpcOut::Prune(Prune { topic_hash, .. }) => {
+                    topic_hash == &topic_hashes[0] || topic_hash == &topic_hashes[1]
+                }
                 _ => false,
-            })
-            >= 2,
+            }
+    });
+    assert!(
+        control_msgs >= 2,
         "Not enough prunes sent when grafting from explicit peer"
     );
 }
 
 #[test]
 fn explicit_peers_not_added_to_mesh_on_receiving_subscription() {
-    let (gs, peers, topic_hashes) = inject_nodes1()
+    let (gs, peers, receivers, topic_hashes) = inject_nodes1()
         .peer_no(2)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -1471,25 +1573,27 @@ fn explicit_peers_not_added_to_mesh_on_receiving_subscription() {
     );
 
     //assert that graft gets created to non-explicit peer
+    let (control_msgs, receivers) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[1] && matches!(m, RpcOut::Graft { .. })
+    });
     assert!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[1]
-            && matches!(m, ControlAction::Graft { .. }))
-            >= 1,
+        control_msgs >= 1,
         "No graft message got created to non-explicit peer"
     );
 
     //assert that no graft gets created to explicit peer
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[0] && matches!(m, RpcOut::Graft { .. })
+    });
     assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[0]
-            && matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "A graft message got created to an explicit peer"
     );
 }
 
 #[test]
 fn do_not_graft_explicit_peer() {
-    let (mut gs, others, topic_hashes) = inject_nodes1()
+    let (mut gs, others, receivers, topic_hashes) = inject_nodes1()
         .peer_no(1)
         .topics(vec![String::from("topic")])
         .to_subscribe(true)
@@ -1503,17 +1607,18 @@ fn do_not_graft_explicit_peer() {
     assert_eq!(gs.mesh[&topic_hashes[0]], BTreeSet::new());
 
     //assert that no graft gets created to explicit peer
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &others[0] && matches!(m, RpcOut::Graft { .. })
+    });
     assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &others[0]
-            && matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "A graft message got created to an explicit peer"
     );
 }
 
 #[test]
 fn do_forward_messages_to_explicit_peers() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, receivers, topic_hashes) = inject_nodes1()
         .peer_no(2)
         .topics(vec![String::from("topic1"), String::from("topic2")])
         .to_subscribe(true)
@@ -1533,21 +1638,16 @@ fn do_forward_messages_to_explicit_peers() {
         validated: true,
     };
     gs.handle_received_message(message.clone(), &local_id);
-
     assert_eq!(
-        gs.events
-            .iter()
-            .filter(|e| match e {
-                ToSwarm::NotifyHandler {
-                    peer_id,
-                    event: HandlerIn::Message(RpcOut::Forward(m)),
-                    ..
-                } => {
-                    peer_id == &peers[0] && m.data == message.data
+        receivers.into_iter().fold(0, |mut fwds, (peer_id, c)| {
+            let non_priority = c.non_priority.get_ref();
+            while !non_priority.is_empty() {
+                if matches!(non_priority.try_recv(), Ok(RpcOut::Forward{message: m, timeout: _}) if peer_id == peers[0] && m.data == message.data) {
+        fwds +=1;
+        }
                 }
-                _ => false,
-            })
-            .count(),
+            fwds
+        }),
         1,
         "The message did not get forwarded to the explicit peer"
     );
@@ -1555,7 +1655,7 @@ fn do_forward_messages_to_explicit_peers() {
 
 #[test]
 fn explicit_peers_not_added_to_mesh_on_subscribe() {
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, receivers, _) = inject_nodes1()
         .peer_no(2)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1583,25 +1683,27 @@ fn explicit_peers_not_added_to_mesh_on_subscribe() {
     assert_eq!(gs.mesh[&topic_hash], vec![peers[1]].into_iter().collect());
 
     //assert that graft gets created to non-explicit peer
+    let (control_msgs, receivers) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[1] && matches!(m, RpcOut::Graft { .. })
+    });
     assert!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[1]
-            && matches!(m, ControlAction::Graft { .. }))
-            > 0,
+        control_msgs > 0,
         "No graft message got created to non-explicit peer"
     );
 
     //assert that no graft gets created to explicit peer
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[0] && matches!(m, RpcOut::Graft { .. })
+    });
     assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[0]
-            && matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "A graft message got created to an explicit peer"
     );
 }
 
 #[test]
 fn explicit_peers_not_added_to_mesh_from_fanout_on_subscribe() {
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, receivers, _) = inject_nodes1()
         .peer_no(2)
         .topics(Vec::new())
         .to_subscribe(true)
@@ -1632,25 +1734,27 @@ fn explicit_peers_not_added_to_mesh_from_fanout_on_subscribe() {
     assert_eq!(gs.mesh[&topic_hash], vec![peers[1]].into_iter().collect());
 
     //assert that graft gets created to non-explicit peer
+    let (control_msgs, receivers) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[1] && matches!(m, RpcOut::Graft { .. })
+    });
     assert!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[1]
-            && matches!(m, ControlAction::Graft { .. }))
-            >= 1,
+        control_msgs >= 1,
         "No graft message got created to non-explicit peer"
     );
 
     //assert that no graft gets created to explicit peer
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[0] && matches!(m, RpcOut::Graft { .. })
+    });
     assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[0]
-            && matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "A graft message got created to an explicit peer"
     );
 }
 
 #[test]
 fn no_gossip_gets_sent_to_explicit_peers() {
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, mut receivers, topic_hashes) = inject_nodes1()
         .peer_no(2)
         .topics(vec![String::from("topic1"), String::from("topic2")])
         .to_subscribe(true)
@@ -1679,25 +1783,24 @@ fn no_gossip_gets_sent_to_explicit_peers() {
     }
 
     //assert that no gossip gets sent to explicit peer
-    assert_eq!(
-        gs.control_pool
-            .get(&peers[0])
-            .unwrap_or(&Vec::new())
-            .iter()
-            .filter(|m| matches!(m, ControlAction::IHave { .. }))
-            .count(),
-        0,
-        "Gossip got emitted to explicit peer"
-    );
+    let receiver = receivers.remove(&peers[0]).unwrap();
+    let mut gossips = 0;
+    let non_priority = receiver.non_priority.get_ref();
+    while !non_priority.is_empty() {
+        if let Ok(RpcOut::IHave(_)) = non_priority.try_recv() {
+            gossips += 1;
+        }
+    }
+    assert_eq!(gossips, 0, "Gossip got emitted to explicit peer");
 }
 
-// Tests the mesh maintenance addition
+/// Tests the mesh maintenance addition
 #[test]
 fn test_mesh_addition() {
     let config: Config = Config::default();
 
     // Adds mesh_low peers and PRUNE 2 giving us a deficit.
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n() + 1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1725,7 +1828,7 @@ fn test_mesh_addition() {
     assert_eq!(gs.mesh.get(&topics[0]).unwrap().len(), config.mesh_n());
 }
 
-// Tests the mesh maintenance subtraction
+/// Tests the mesh maintenance subtraction
 #[test]
 fn test_mesh_subtraction() {
     let config = Config::default();
@@ -1733,7 +1836,7 @@ fn test_mesh_subtraction() {
     // Adds mesh_low peers and PRUNE 2 giving us a deficit.
     let n = config.mesh_n_high() + 10;
     //make all outbound connections so that we allow grafting to all
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(n)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1757,7 +1860,7 @@ fn test_mesh_subtraction() {
 fn test_connect_to_px_peers_on_handle_prune() {
     let config: Config = Config::default();
 
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1813,7 +1916,7 @@ fn test_send_px_and_backoff_in_prune() {
     let config: Config = Config::default();
 
     //build mesh with enough peers for px
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(config.prune_peers() + 1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1829,24 +1932,25 @@ fn test_send_px_and_backoff_in_prune() {
     );
 
     //check prune message
-    assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[0]
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[0]
             && match m {
-                ControlAction::Prune {
+                RpcOut::Prune(Prune {
                     topic_hash,
                     peers,
                     backoff,
-                } =>
+                }) => {
                     topic_hash == &topics[0] &&
                     peers.len() == config.prune_peers() &&
                     //all peers are different
                     peers.iter().collect::<HashSet<_>>().len() ==
                         config.prune_peers() &&
-                    backoff.unwrap() == config.prune_backoff().as_secs(),
+                    backoff.unwrap() == config.prune_backoff().as_secs()
+                }
                 _ => false,
-            }),
-        1
-    );
+            }
+    });
+    assert_eq!(control_msgs, 1);
 }
 
 #[test]
@@ -1854,7 +1958,7 @@ fn test_prune_backoffed_peer_on_graft() {
     let config: Config = Config::default();
 
     //build mesh with enough peers for px
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(config.prune_peers() + 1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1871,28 +1975,29 @@ fn test_prune_backoffed_peer_on_graft() {
     );
 
     //ignore all messages until now
-    gs.events.clear();
+    let receivers = flush_events(&mut gs, receivers);
 
     //handle graft
     gs.handle_graft(&peers[0], vec![topics[0].clone()]);
 
     //check prune message
-    assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[0]
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[0]
             && match m {
-                ControlAction::Prune {
+                RpcOut::Prune(Prune {
                     topic_hash,
                     peers,
                     backoff,
-                } =>
+                }) => {
                     topic_hash == &topics[0] &&
                     //no px in this case
                     peers.is_empty() &&
-                    backoff.unwrap() == config.prune_backoff().as_secs(),
+                    backoff.unwrap() == config.prune_backoff().as_secs()
+                }
                 _ => false,
-            }),
-        1
-    );
+            }
+    });
+    assert_eq!(control_msgs, 1);
 }
 
 #[test]
@@ -1903,7 +2008,7 @@ fn test_do_not_graft_within_backoff_period() {
         .build()
         .unwrap();
     //only one peer => mesh too small and will try to regraft as early as possible
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1914,7 +2019,7 @@ fn test_do_not_graft_within_backoff_period() {
     gs.handle_prune(&peers[0], vec![(topics[0].clone(), Vec::new(), Some(1))]);
 
     //forget all events until now
-    flush_events(&mut gs);
+    let receivers = flush_events(&mut gs, receivers);
 
     //call heartbeat
     gs.heartbeat();
@@ -1927,9 +2032,10 @@ fn test_do_not_graft_within_backoff_period() {
 
     //Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
     // is needed).
+    let (control_msgs, receivers) =
+        count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert_eq!(
-        count_control_msgs(&gs, |_, m| matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "Graft message created too early within backoff period"
     );
 
@@ -1938,8 +2044,9 @@ fn test_do_not_graft_within_backoff_period() {
     gs.heartbeat();
 
     //check that graft got created
+    let (control_msgs, _) = count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert!(
-        count_control_msgs(&gs, |_, m| matches!(m, ControlAction::Graft { .. })) > 0,
+        control_msgs > 0,
         "No graft message was created after backoff period"
     );
 }
@@ -1954,7 +2061,7 @@ fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without
         .build()
         .unwrap();
     //only one peer => mesh too small and will try to regraft as early as possible
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -1965,7 +2072,7 @@ fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without
     gs.handle_prune(&peers[0], vec![(topics[0].clone(), Vec::new(), None)]);
 
     //forget all events until now
-    flush_events(&mut gs);
+    let receivers = flush_events(&mut gs, receivers);
 
     //call heartbeat
     gs.heartbeat();
@@ -1976,9 +2083,10 @@ fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without
 
     //Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
     // is needed).
+    let (control_msgs, receivers) =
+        count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert_eq!(
-        count_control_msgs(&gs, |_, m| matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "Graft message created too early within backoff period"
     );
 
@@ -1987,8 +2095,9 @@ fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without
     gs.heartbeat();
 
     //check that graft got created
+    let (control_msgs, _) = count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert!(
-        count_control_msgs(&gs, |_, m| matches!(m, ControlAction::Graft { .. })) > 0,
+        control_msgs > 0,
         "No graft message was created after backoff period"
     );
 }
@@ -2007,7 +2116,7 @@ fn test_unsubscribe_backoff() {
 
     let topic = String::from("test");
     // only one peer => mesh too small and will try to regraft as early as possible
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec![topic.clone()])
         .to_subscribe(true)
@@ -2016,19 +2125,19 @@ fn test_unsubscribe_backoff() {
 
     let _ = gs.unsubscribe(&Topic::new(topic));
 
+    let (control_msgs, receivers) = count_control_msgs(receivers, |_, m| match m {
+        RpcOut::Prune(Prune { backoff, .. }) => backoff == &Some(1),
+        _ => false,
+    });
     assert_eq!(
-        count_control_msgs(&gs, |_, m| match m {
-            ControlAction::Prune { backoff, .. } => backoff == &Some(1),
-            _ => false,
-        }),
-        1,
+        control_msgs, 1,
         "Peer should be pruned with `unsubscribe_backoff`."
     );
 
     let _ = gs.subscribe(&Topic::new(topics[0].to_string()));
 
     // forget all events until now
-    flush_events(&mut gs);
+    let receivers = flush_events(&mut gs, receivers);
 
     // call heartbeat
     gs.heartbeat();
@@ -2041,9 +2150,10 @@ fn test_unsubscribe_backoff() {
 
     // Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
     // is needed).
+    let (control_msgs, receivers) =
+        count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert_eq!(
-        count_control_msgs(&gs, |_, m| matches!(m, ControlAction::Graft { .. })),
-        0,
+        control_msgs, 0,
         "Graft message created too early within backoff period"
     );
 
@@ -2052,8 +2162,9 @@ fn test_unsubscribe_backoff() {
     gs.heartbeat();
 
     // check that graft got created
+    let (control_msgs, _) = count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert!(
-        count_control_msgs(&gs, |_, m| matches!(m, ControlAction::Graft { .. })) > 0,
+        control_msgs > 0,
         "No graft message was created after backoff period"
     );
 }
@@ -2064,7 +2175,7 @@ fn test_flood_publish() {
 
     let topic = "test";
     // Adds more peers than mesh can hold to test flood publishing
-    let (mut gs, _, _) = inject_nodes1()
+    let (mut gs, _, receivers, _) = inject_nodes1()
         .peer_no(config.mesh_n_high() + 10)
         .topics(vec![topic.into()])
         .to_subscribe(true)
@@ -2075,17 +2186,16 @@ fn test_flood_publish() {
     gs.publish(Topic::new(topic), publish_data).unwrap();
 
     // Collect all publish messages
-    let publishes = gs
-        .events
-        .into_iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler { event, .. } => {
-                if let HandlerIn::Message(RpcOut::Publish(message)) = event {
+    let publishes = receivers
+        .into_values()
+        .fold(vec![], |mut collected_publish, c| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Publish { message, .. }) = priority.try_recv() {
                     collected_publish.push(message);
                 }
-                collected_publish
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     // Transform the inbound message
@@ -2120,7 +2230,7 @@ fn test_gossip_to_at_least_gossip_lazy_peers() {
 
     //add more peers than in mesh to test gossipping
     //by default only mesh_n_low peers will get added to mesh
-    let (mut gs, _, topic_hashes) = inject_nodes1()
+    let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(config.mesh_n_low() + config.gossip_lazy() + 1)
         .topics(vec!["topic".into()])
         .to_subscribe(true)
@@ -2147,16 +2257,14 @@ fn test_gossip_to_at_least_gossip_lazy_peers() {
     let msg_id = gs.config.message_id(message);
 
     //check that exactly config.gossip_lazy() many gossip messages were sent.
-    assert_eq!(
-        count_control_msgs(&gs, |_, action| match action {
-            ControlAction::IHave {
-                topic_hash,
-                message_ids,
-            } => topic_hash == &topic_hashes[0] && message_ids.iter().any(|id| id == &msg_id),
-            _ => false,
-        }),
-        config.gossip_lazy()
-    );
+    let (control_msgs, _) = count_control_msgs(receivers, |_, action| match action {
+        RpcOut::IHave(IHave {
+            topic_hash,
+            message_ids,
+        }) => topic_hash == &topic_hashes[0] && message_ids.iter().any(|id| id == &msg_id),
+        _ => false,
+    });
+    assert_eq!(control_msgs, config.gossip_lazy());
 }
 
 #[test]
@@ -2165,7 +2273,7 @@ fn test_gossip_to_at_most_gossip_factor_peers() {
 
     //add a lot of peers
     let m = config.mesh_n_low() + config.gossip_lazy() * (2.0 / config.gossip_factor()) as usize;
-    let (mut gs, _, topic_hashes) = inject_nodes1()
+    let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(m)
         .topics(vec!["topic".into()])
         .to_subscribe(true)
@@ -2191,14 +2299,15 @@ fn test_gossip_to_at_most_gossip_factor_peers() {
 
     let msg_id = gs.config.message_id(message);
     //check that exactly config.gossip_lazy() many gossip messages were sent.
+    let (control_msgs, _) = count_control_msgs(receivers, |_, action| match action {
+        RpcOut::IHave(IHave {
+            topic_hash,
+            message_ids,
+        }) => topic_hash == &topic_hashes[0] && message_ids.iter().any(|id| id == &msg_id),
+        _ => false,
+    });
     assert_eq!(
-        count_control_msgs(&gs, |_, action| match action {
-            ControlAction::IHave {
-                topic_hash,
-                message_ids,
-            } => topic_hash == &topic_hashes[0] && message_ids.iter().any(|id| id == &msg_id),
-            _ => false,
-        }),
+        control_msgs,
         ((m - config.mesh_n_low()) as f64 * config.gossip_factor()) as usize
     );
 }
@@ -2208,7 +2317,7 @@ fn test_accept_only_outbound_peer_grafts_when_mesh_full() {
     let config: Config = Config::default();
 
     //enough peers to fill the mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2223,8 +2332,8 @@ fn test_accept_only_outbound_peer_grafts_when_mesh_full() {
     assert_eq!(gs.mesh[&topics[0]].len(), config.mesh_n_high());
 
     //create an outbound and an inbound peer
-    let inbound = add_peer(&mut gs, &topics, false, false);
-    let outbound = add_peer(&mut gs, &topics, true, false);
+    let (inbound, _in_reciver) = add_peer(&mut gs, &topics, false, false);
+    let (outbound, _out_receiver) = add_peer(&mut gs, &topics, true, false);
 
     //send grafts
     gs.handle_graft(&inbound, vec![topics[0].clone()]);
@@ -2254,7 +2363,7 @@ fn test_do_not_remove_too_many_outbound_peers() {
         .unwrap();
 
     //fill the mesh with inbound connections
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(n)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2269,7 +2378,7 @@ fn test_do_not_remove_too_many_outbound_peers() {
     //create m outbound connections and graft (we will accept the graft)
     let mut outbound = HashSet::new();
     for _ in 0..m {
-        let peer = add_peer(&mut gs, &topics, true, false);
+        let (peer, _) = add_peer(&mut gs, &topics, true, false);
         outbound.insert(peer);
         gs.handle_graft(&peer, topics.clone());
     }
@@ -2292,7 +2401,7 @@ fn test_add_outbound_peers_if_min_is_not_satisfied() {
     let config: Config = Config::default();
 
     // Fill full mesh with inbound peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2304,8 +2413,9 @@ fn test_add_outbound_peers_if_min_is_not_satisfied() {
     }
 
     //create config.mesh_outbound_min() many outbound connections without grafting
+    let mut peers = vec![];
     for _ in 0..config.mesh_outbound_min() {
-        add_peer(&mut gs, &topics, true, false);
+        peers.push(add_peer(&mut gs, &topics, true, false));
     }
 
     // Nothing changed in the mesh yet
@@ -2326,7 +2436,7 @@ fn test_prune_negative_scored_peers() {
     let config = Config::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2349,29 +2459,30 @@ fn test_prune_negative_scored_peers() {
     assert!(gs.mesh[&topics[0]].is_empty());
 
     //check prune message
-    assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[0]
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[0]
             && match m {
-                ControlAction::Prune {
+                RpcOut::Prune(Prune {
                     topic_hash,
                     peers,
                     backoff,
-                } =>
+                }) => {
                     topic_hash == &topics[0] &&
                     //no px in this case
                     peers.is_empty() &&
-                    backoff.unwrap() == config.prune_backoff().as_secs(),
+                    backoff.unwrap() == config.prune_backoff().as_secs()
+                }
                 _ => false,
-            }),
-        1
-    );
+            }
+    });
+    assert_eq!(control_msgs, 1);
 }
 
 #[test]
 fn test_dont_graft_to_negative_scored_peers() {
     let config = Config::default();
     //init full mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2383,8 +2494,8 @@ fn test_dont_graft_to_negative_scored_peers() {
         .create_network();
 
     //add two additional peers that will not be part of the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, _receiver1) = add_peer(&mut gs, &topics, false, false);
+    let (p2, _receiver2) = add_peer(&mut gs, &topics, false, false);
 
     //reduce score of p1 to negative
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p1, 1);
@@ -2410,7 +2521,7 @@ fn test_ignore_px_from_negative_scored_peer() {
     let config = Config::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2457,7 +2568,7 @@ fn test_only_send_nonnegative_scoring_peers_in_px() {
         .unwrap();
 
     // Build mesh with three peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(3)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2483,21 +2594,22 @@ fn test_only_send_nonnegative_scoring_peers_in_px() {
     );
 
     // Check that px in prune message only contains third peer
-    assert_eq!(
-        count_control_msgs(&gs, |peer_id, m| peer_id == &peers[1]
+    let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
+        peer_id == &peers[1]
             && match m {
-                ControlAction::Prune {
+                RpcOut::Prune(Prune {
                     topic_hash,
                     peers: px,
                     ..
-                } =>
+                }) => {
                     topic_hash == &topics[0]
                         && px.len() == 1
-                        && px[0].peer_id.as_ref().unwrap() == &peers[2],
+                        && px[0].peer_id.as_ref().unwrap() == &peers[2]
+                }
                 _ => false,
-            }),
-        1
-    );
+            }
+    });
+    assert_eq!(control_msgs, 1);
 }
 
 #[test]
@@ -2510,7 +2622,7 @@ fn test_do_not_gossip_to_peers_below_gossip_threshold() {
     };
 
     // Build full mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2524,8 +2636,10 @@ fn test_do_not_gossip_to_peers_below_gossip_threshold() {
     }
 
     // Add two additional peers that will not be part of the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p2, receiver2);
 
     // Reduce score of p1 below peer_score_thresholds.gossip_threshold
     // note that penalties get squared so two penalties means a score of
@@ -2556,23 +2670,21 @@ fn test_do_not_gossip_to_peers_below_gossip_threshold() {
     gs.emit_gossip();
 
     // Check that exactly one gossip messages got sent and it got sent to p2
-    assert_eq!(
-        count_control_msgs(&gs, |peer, action| match action {
-            ControlAction::IHave {
-                topic_hash,
-                message_ids,
-            } => {
-                if topic_hash == &topics[0] && message_ids.iter().any(|id| id == &msg_id) {
-                    assert_eq!(peer, &p2);
-                    true
-                } else {
-                    false
-                }
+    let (control_msgs, _) = count_control_msgs(receivers, |peer, action| match action {
+        RpcOut::IHave(IHave {
+            topic_hash,
+            message_ids,
+        }) => {
+            if topic_hash == &topics[0] && message_ids.iter().any(|id| id == &msg_id) {
+                assert_eq!(peer, &p2);
+                true
+            } else {
+                false
             }
-            _ => false,
-        }),
-        1
-    );
+        }
+        _ => false,
+    });
+    assert_eq!(control_msgs, 1);
 }
 
 #[test]
@@ -2585,7 +2697,7 @@ fn test_iwant_msg_from_peer_below_gossip_threshold_gets_ignored() {
     };
 
     // Build full mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2601,8 +2713,10 @@ fn test_iwant_msg_from_peer_below_gossip_threshold_gets_ignored() {
     }
 
     // Add two additional peers that will not be part of the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p2, receiver2);
 
     // Reduce score of p1 below peer_score_thresholds.gossip_threshold
     // note that penalties get squared so two penalties means a score of
@@ -2633,18 +2747,18 @@ fn test_iwant_msg_from_peer_below_gossip_threshold_gets_ignored() {
     gs.handle_iwant(&p2, vec![msg_id.clone()]);
 
     // the messages we are sending
-    let sent_messages = gs
-        .events
-        .into_iter()
-        .fold(vec![], |mut collected_messages, e| match e {
-            ToSwarm::NotifyHandler { event, peer_id, .. } => {
-                if let HandlerIn::Message(RpcOut::Forward(message)) = event {
-                    collected_messages.push((peer_id, message));
+    let sent_messages =
+        receivers
+            .into_iter()
+            .fold(vec![], |mut collected_messages, (peer_id, c)| {
+                let non_priority = c.non_priority.get_ref();
+                while !non_priority.is_empty() {
+                    if let Ok(RpcOut::Forward { message, .. }) = non_priority.try_recv() {
+                        collected_messages.push((peer_id, message));
+                    }
                 }
                 collected_messages
-            }
-            _ => collected_messages,
-        });
+            });
 
     //the message got sent to p2
     assert!(sent_messages
@@ -2673,7 +2787,7 @@ fn test_ihave_msg_from_peer_below_gossip_threshold_gets_ignored() {
         ..PeerScoreThresholds::default()
     };
     //build full mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -2689,8 +2803,10 @@ fn test_ihave_msg_from_peer_below_gossip_threshold_gets_ignored() {
     }
 
     //add two additional peers that will not be part of the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p2, receiver2);
 
     //reduce score of p1 below peer_score_thresholds.gossip_threshold
     //note that penalties get squared so two penalties means a score of
@@ -2720,19 +2836,18 @@ fn test_ihave_msg_from_peer_below_gossip_threshold_gets_ignored() {
     gs.handle_ihave(&p2, vec![(topics[0].clone(), vec![msg_id.clone()])]);
 
     // check that we sent exactly one IWANT request to p2
-    assert_eq!(
-        count_control_msgs(&gs, |peer, c| match c {
-            ControlAction::IWant { message_ids } =>
-                if message_ids.iter().any(|m| m == &msg_id) {
-                    assert_eq!(peer, &p2);
-                    true
-                } else {
-                    false
-                },
-            _ => false,
-        }),
-        1
-    );
+    let (control_msgs, _) = count_control_msgs(receivers, |peer, c| match c {
+        RpcOut::IWant(IWant { message_ids }) => {
+            if message_ids.iter().any(|m| m == &msg_id) {
+                assert_eq!(peer, &p2);
+                true
+            } else {
+                false
+            }
+        }
+        _ => false,
+    });
+    assert_eq!(control_msgs, 1);
 }
 
 #[test]
@@ -2749,7 +2864,7 @@ fn test_do_not_publish_to_peer_below_publish_threshold() {
     };
 
     //build mesh with no peers and no subscribed topics
-    let (mut gs, _, _) = inject_nodes1()
+    let (mut gs, _, mut receivers, _) = inject_nodes1()
         .gs_config(config)
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
@@ -2759,8 +2874,10 @@ fn test_do_not_publish_to_peer_below_publish_threshold() {
     let topics = vec![topic.hash()];
 
     //add two additional peers that will be added to the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p2, receiver2);
 
     //reduce score of p1 below peer_score_thresholds.publish_threshold
     //note that penalties get squared so two penalties means a score of
@@ -2778,17 +2895,16 @@ fn test_do_not_publish_to_peer_below_publish_threshold() {
     gs.publish(topic, publish_data).unwrap();
 
     // Collect all publish messages
-    let publishes = gs
-        .events
+    let publishes = receivers
         .into_iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler { event, peer_id, .. } => {
-                if let HandlerIn::Message(RpcOut::Publish(message)) = event {
+        .fold(vec![], |mut collected_publish, (peer_id, c)| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Publish { message, .. }) = priority.try_recv() {
                     collected_publish.push((peer_id, message));
                 }
-                collected_publish
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     //assert only published to p2
@@ -2806,15 +2922,17 @@ fn test_do_not_flood_publish_to_peer_below_publish_threshold() {
         ..PeerScoreThresholds::default()
     };
     //build mesh with no peers
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .topics(vec!["test".into()])
         .gs_config(config)
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
 
     //add two additional peers that will be added to the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p2, receiver2);
 
     //reduce score of p1 below peer_score_thresholds.publish_threshold
     //note that penalties get squared so two penalties means a score of
@@ -2832,17 +2950,16 @@ fn test_do_not_flood_publish_to_peer_below_publish_threshold() {
     gs.publish(Topic::new("test"), publish_data).unwrap();
 
     // Collect all publish messages
-    let publishes = gs
-        .events
+    let publishes = receivers
         .into_iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler { event, peer_id, .. } => {
-                if let HandlerIn::Message(RpcOut::Publish(message)) = event {
-                    collected_publish.push((peer_id, message));
+        .fold(vec![], |mut collected_publish, (peer_id, c)| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if let Ok(RpcOut::Publish { message, .. }) = priority.try_recv() {
+                    collected_publish.push((peer_id, message))
                 }
-                collected_publish
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     //assert only published to p2
@@ -2862,15 +2979,15 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
     };
 
     //build mesh with no peers
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, _, topics) = inject_nodes1()
         .topics(vec!["test".into()])
         .gs_config(config.clone())
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
 
     //add two additional peers that will be added to the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, _receiver1) = add_peer(&mut gs, &topics, false, false);
+    let (p2, _receiver2) = add_peer(&mut gs, &topics, false, false);
 
     //reduce score of p1 below peer_score_thresholds.graylist_threshold
     //note that penalties get squared so two penalties means a score of
@@ -2931,10 +3048,10 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         topic_hash: topics[0].clone(),
     };
 
-    let control_action = ControlAction::IHave {
+    let control_action = ControlAction::IHave(IHave {
         topic_hash: topics[0].clone(),
         message_ids: vec![config.message_id(message2)],
-    };
+    });
 
     //clear events
     gs.events.clear();
@@ -2960,10 +3077,10 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         ToSwarm::GenerateEvent(Event::Subscribed { .. })
     ));
 
-    let control_action = ControlAction::IHave {
+    let control_action = ControlAction::IHave(IHave {
         topic_hash: topics[0].clone(),
         message_ids: vec![config.message_id(message4)],
-    };
+    });
 
     //receive from p2
     gs.on_connection_handler_event(
@@ -2992,7 +3109,7 @@ fn test_ignore_px_from_peers_below_accept_px_threshold() {
         ..PeerScoreThresholds::default()
     };
     // Build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3063,7 +3180,7 @@ fn test_keep_best_scoring_peers_on_oversubscription() {
 
     //build mesh with more peers than mesh can hold
     let n = config.mesh_n_high() + 1;
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(n)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3123,7 +3240,7 @@ fn test_scoring_p1() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with one peer
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, _, _) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3205,7 +3322,7 @@ fn test_scoring_p2() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3305,7 +3422,7 @@ fn test_scoring_p3() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3406,7 +3523,7 @@ fn test_scoring_p3b() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3498,7 +3615,7 @@ fn test_scoring_p4_valid_message() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3527,8 +3644,7 @@ fn test_scoring_p4_valid_message() {
         &config.message_id(message1),
         &peers[0],
         MessageAcceptance::Accept,
-    )
-    .unwrap();
+    );
 
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
 }
@@ -3557,7 +3673,7 @@ fn test_scoring_p4_invalid_signature() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3615,7 +3731,7 @@ fn test_scoring_p4_message_from_self() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3665,7 +3781,7 @@ fn test_scoring_p4_ignored_message() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3694,8 +3810,7 @@ fn test_scoring_p4_ignored_message() {
         &config.message_id(message1),
         &peers[0],
         MessageAcceptance::Ignore,
-    )
-    .unwrap();
+    );
 
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
 }
@@ -3724,7 +3839,7 @@ fn test_scoring_p4_application_invalidated_message() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3753,8 +3868,7 @@ fn test_scoring_p4_application_invalidated_message() {
         &config.message_id(message1),
         &peers[0],
         MessageAcceptance::Reject,
-    )
-    .unwrap();
+    );
 
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
@@ -3786,7 +3900,7 @@ fn test_scoring_p4_application_invalid_message_from_two_peers() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with two peers
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3819,8 +3933,7 @@ fn test_scoring_p4_application_invalid_message_from_two_peers() {
         &config.message_id(message1),
         &peers[0],
         MessageAcceptance::Reject,
-    )
-    .unwrap();
+    );
 
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
@@ -3856,7 +3969,7 @@ fn test_scoring_p4_three_application_invalid_messages() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3894,20 +4007,19 @@ fn test_scoring_p4_three_application_invalid_messages() {
         &config.message_id(message1),
         &peers[0],
         MessageAcceptance::Reject,
-    )
-    .unwrap();
+    );
+
     gs.report_message_validation_result(
         &config.message_id(message2),
         &peers[0],
         MessageAcceptance::Reject,
-    )
-    .unwrap();
+    );
+
     gs.report_message_validation_result(
         &config.message_id(message3),
         &peers[0],
         MessageAcceptance::Reject,
-    )
-    .unwrap();
+    );
 
     //number of invalid messages gets squared
     assert_eq!(
@@ -3940,7 +4052,7 @@ fn test_scoring_p4_decay() {
     let peer_score_thresholds = PeerScoreThresholds::default();
 
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -3968,8 +4080,7 @@ fn test_scoring_p4_decay() {
         &config.message_id(message1),
         &peers[0],
         MessageAcceptance::Reject,
-    )
-    .unwrap();
+    );
 
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
@@ -3994,7 +4105,7 @@ fn test_scoring_p5() {
     };
 
     //build mesh with one peer
-    let (mut gs, peers, _) = inject_nodes1()
+    let (mut gs, peers, _, _) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -4020,7 +4131,7 @@ fn test_scoring_p6() {
         ..Default::default()
     };
 
-    let (mut gs, _, _) = inject_nodes1()
+    let (mut gs, _, _, _) = inject_nodes1()
         .peer_no(0)
         .topics(vec![])
         .to_subscribe(false)
@@ -4033,20 +4144,20 @@ fn test_scoring_p6() {
     //create 5 peers with the same ip
     let addr = Multiaddr::from(Ipv4Addr::new(10, 1, 2, 3));
     let peers = vec![
-        add_peer_with_addr(&mut gs, &[], false, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &[], false, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &[], true, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &[], true, false, addr.clone()),
-        add_peer_with_addr(&mut gs, &[], true, true, addr.clone()),
+        add_peer_with_addr(&mut gs, &[], false, false, addr.clone()).0,
+        add_peer_with_addr(&mut gs, &[], false, false, addr.clone()).0,
+        add_peer_with_addr(&mut gs, &[], true, false, addr.clone()).0,
+        add_peer_with_addr(&mut gs, &[], true, false, addr.clone()).0,
+        add_peer_with_addr(&mut gs, &[], true, true, addr.clone()).0,
     ];
 
     //create 4 other peers with other ip
     let addr2 = Multiaddr::from(Ipv4Addr::new(10, 1, 2, 4));
     let others = vec![
-        add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()),
-        add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()),
-        add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()),
-        add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()),
+        add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()).0,
+        add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()).0,
+        add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()).0,
+        add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()).0,
     ];
 
     //no penalties yet
@@ -4153,7 +4264,7 @@ fn test_scoring_p7_grafts_before_backoff() {
         ..Default::default()
     };
 
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4230,7 +4341,7 @@ fn test_opportunistic_grafting() {
         ..Default::default()
     };
 
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(5)
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4259,7 +4370,7 @@ fn test_opportunistic_grafting() {
     }
 
     //set scores for peers in the mesh
-    for (i, peer) in others.iter().enumerate().take(5) {
+    for (i, (peer, _receiver)) in others.iter().enumerate().take(5) {
         gs.set_application_score(peer, 0.0 + i as f64);
     }
 
@@ -4299,7 +4410,7 @@ fn test_opportunistic_grafting() {
     );
 
     assert!(
-        gs.mesh[&topics[0]].is_disjoint(&others.iter().cloned().take(2).collect()),
+        gs.mesh[&topics[0]].is_disjoint(&others.iter().map(|(p, _)| p).cloned().take(2).collect()),
         "peers below or equal to median should not be added in opportunistic grafting"
     );
 }
@@ -4307,19 +4418,19 @@ fn test_opportunistic_grafting() {
 #[test]
 fn test_ignore_graft_from_unknown_topic() {
     //build gossipsub without subscribing to any topics
-    let (mut gs, _, _) = inject_nodes1()
-        .peer_no(0)
+    let (mut gs, peers, receivers, _) = inject_nodes1()
+        .peer_no(1)
         .topics(vec![])
         .to_subscribe(false)
         .create_network();
 
     //handle an incoming graft for some topic
-    gs.handle_graft(&PeerId::random(), vec![Topic::new("test").hash()]);
+    gs.handle_graft(&peers[0], vec![Topic::new("test").hash()]);
 
     //assert that no prune got created
+    let (control_msgs, _) = count_control_msgs(receivers, |_, a| matches!(a, RpcOut::Prune { .. }));
     assert_eq!(
-        count_control_msgs(&gs, |_, a| matches!(a, ControlAction::Prune { .. })),
-        0,
+        control_msgs, 0,
         "we should not prune after graft in unknown topic"
     );
 }
@@ -4328,14 +4439,15 @@ fn test_ignore_graft_from_unknown_topic() {
 fn test_ignore_too_many_iwants_from_same_peer_for_same_message() {
     let config = Config::default();
     //build gossipsub with full mesh
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(false)
         .create_network();
 
     //add another peer not in the mesh
-    let peer = add_peer(&mut gs, &topics, false, false);
+    let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(peer, receiver);
 
     //receive a message
     let mut seq = 0;
@@ -4349,7 +4461,7 @@ fn test_ignore_too_many_iwants_from_same_peer_for_same_message() {
     gs.handle_received_message(m1, &PeerId::random());
 
     //clear events
-    gs.events.clear();
+    let receivers = flush_events(&mut gs, receivers);
 
     //the first gossip_retransimission many iwants return the valid message, all others are
     // ignored.
@@ -4358,16 +4470,15 @@ fn test_ignore_too_many_iwants_from_same_peer_for_same_message() {
     }
 
     assert_eq!(
-        gs.events
-            .iter()
-            .filter(|e| matches!(
-                e,
-                ToSwarm::NotifyHandler {
-                    event: HandlerIn::Message(RpcOut::Forward(_)),
-                    ..
+        receivers.into_values().fold(0, |mut fwds, c| {
+            let non_priority = c.non_priority.get_ref();
+            while !non_priority.is_empty() {
+                if let Ok(RpcOut::Forward { .. }) = non_priority.try_recv() {
+                    fwds += 1;
                 }
-            ))
-            .count(),
+            }
+            fwds
+        }),
         config.gossip_retransimission() as usize,
         "not more then gossip_retransmission many messages get sent back"
     );
@@ -4380,7 +4491,7 @@ fn test_ignore_too_many_ihaves() {
         .build()
         .unwrap();
     //build gossipsub with full mesh
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4388,7 +4499,8 @@ fn test_ignore_too_many_ihaves() {
         .create_network();
 
     //add another peer not in the mesh
-    let peer = add_peer(&mut gs, &topics, false, false);
+    let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(peer, receiver);
 
     //peer has 20 messages
     let mut seq = 0;
@@ -4416,15 +4528,18 @@ fn test_ignore_too_many_ihaves() {
         .collect();
 
     //we send iwant only for the first 10 messages
+    let (control_msgs, receivers) = count_control_msgs(receivers, |p, action| {
+        p == &peer
+            && matches!(action, RpcOut::IWant(IWant { message_ids }) if message_ids.len() == 1 && first_ten.contains(&message_ids[0]))
+    });
     assert_eq!(
-        count_control_msgs(&gs, |p, action| p == &peer
-            && matches!(action, ControlAction::IWant { message_ids } if message_ids.len() == 1 && first_ten.contains(&message_ids[0]))),
-        10,
+        control_msgs, 10,
         "exactly the first ten ihaves should be processed and one iwant for each created"
     );
 
     //after a heartbeat everything is forgotten
     gs.heartbeat();
+
     for raw_message in messages[10..].iter() {
         // Transform the inbound message
         let message = &gs
@@ -4438,13 +4553,12 @@ fn test_ignore_too_many_ihaves() {
         );
     }
 
-    //we sent iwant for all 20 messages
-    assert_eq!(
-        count_control_msgs(&gs, |p, action| p == &peer
-            && matches!(action, ControlAction::IWant { message_ids } if message_ids.len() == 1)),
-        20,
-        "all 20 should get sent"
-    );
+    //we sent iwant for all 10 messages
+    let (control_msgs, _) = count_control_msgs(receivers, |p, action| {
+        p == &peer
+            && matches!(action, RpcOut::IWant(IWant { message_ids }) if message_ids.len() == 1)
+    });
+    assert_eq!(control_msgs, 10, "all 20 should get sent");
 }
 
 #[test]
@@ -4455,7 +4569,7 @@ fn test_ignore_too_many_messages_in_ihave() {
         .build()
         .unwrap();
     //build gossipsub with full mesh
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4463,7 +4577,8 @@ fn test_ignore_too_many_messages_in_ihave() {
         .create_network();
 
     //add another peer not in the mesh
-    let peer = add_peer(&mut gs, &topics, false, false);
+    let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(peer, receiver);
 
     //peer has 20 messages
     let mut seq = 0;
@@ -4488,17 +4603,18 @@ fn test_ignore_too_many_messages_in_ihave() {
 
     //we send iwant only for the first 10 messages
     let mut sum = 0;
+    let (control_msgs, receivers) = count_control_msgs(receivers, |p, rpc| match rpc {
+        RpcOut::IWant(IWant { message_ids }) => {
+            p == &peer && {
+                assert!(first_twelve.is_superset(&message_ids.iter().collect()));
+                sum += message_ids.len();
+                true
+            }
+        }
+        _ => false,
+    });
     assert_eq!(
-        count_control_msgs(&gs, |p, action| match action {
-            ControlAction::IWant { message_ids } =>
-                p == &peer && {
-                    assert!(first_twelve.is_superset(&message_ids.iter().collect()));
-                    sum += message_ids.len();
-                    true
-                },
-            _ => false,
-        }),
-        2,
+        control_msgs, 2,
         "the third ihave should get ignored and no iwant sent"
     );
 
@@ -4511,20 +4627,19 @@ fn test_ignore_too_many_messages_in_ihave() {
         vec![(topics[0].clone(), message_ids[10..20].to_vec())],
     );
 
-    //we sent 20 iwant messages
+    //we sent 10 iwant messages ids via a IWANT rpc.
     let mut sum = 0;
-    assert_eq!(
-        count_control_msgs(&gs, |p, action| match action {
-            ControlAction::IWant { message_ids } =>
-                p == &peer && {
-                    sum += message_ids.len();
-                    true
-                },
-            _ => false,
-        }),
-        3
-    );
-    assert_eq!(sum, 20, "exactly 20 iwants should get sent");
+    let (control_msgs, _) = count_control_msgs(receivers, |p, rpc| match rpc {
+        RpcOut::IWant(IWant { message_ids }) => {
+            p == &peer && {
+                sum += message_ids.len();
+                true
+            }
+        }
+        _ => false,
+    });
+    assert_eq!(control_msgs, 1);
+    assert_eq!(sum, 10, "exactly 20 iwants should get sent");
 }
 
 #[test]
@@ -4535,7 +4650,7 @@ fn test_limit_number_of_message_ids_inside_ihave() {
         .build()
         .unwrap();
     //build gossipsub with full mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4548,8 +4663,10 @@ fn test_limit_number_of_message_ids_inside_ihave() {
     }
 
     //add two other peers not in the mesh
-    let p1 = add_peer(&mut gs, &topics, false, false);
-    let p2 = add_peer(&mut gs, &topics, false, false);
+    let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
+    receivers.insert(p2, receiver2);
 
     //receive 200 messages from another peer
     let mut seq = 0;
@@ -4567,22 +4684,22 @@ fn test_limit_number_of_message_ids_inside_ihave() {
     let mut ihaves1 = HashSet::new();
     let mut ihaves2 = HashSet::new();
 
-    assert_eq!(
-        count_control_msgs(&gs, |p, action| match action {
-            ControlAction::IHave { message_ids, .. } => {
-                if p == &p1 {
-                    ihaves1 = message_ids.iter().cloned().collect();
-                    true
-                } else if p == &p2 {
-                    ihaves2 = message_ids.iter().cloned().collect();
-                    true
-                } else {
-                    false
-                }
+    let (control_msgs, _) = count_control_msgs(receivers, |p, action| match action {
+        RpcOut::IHave(IHave { message_ids, .. }) => {
+            if p == &p1 {
+                ihaves1 = message_ids.iter().cloned().collect();
+                true
+            } else if p == &p2 {
+                ihaves2 = message_ids.iter().cloned().collect();
+                true
+            } else {
+                false
             }
-            _ => false,
-        }),
-        2,
+        }
+        _ => false,
+    });
+    assert_eq!(
+        control_msgs, 2,
         "should have emitted one ihave to p1 and one to p2"
     );
 
@@ -4610,11 +4727,12 @@ fn test_limit_number_of_message_ids_inside_ihave() {
 
 #[test]
 fn test_iwant_penalties() {
+    /*
     use tracing_subscriber::EnvFilter;
     let _ = tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())
         .try_init();
-
+    */
     let config = ConfigBuilder::default()
         .iwant_followup_time(Duration::from_secs(4))
         .build()
@@ -4625,7 +4743,7 @@ fn test_iwant_penalties() {
     };
 
     // fill the mesh
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4649,7 +4767,7 @@ fn test_iwant_penalties() {
     let mut first_messages = Vec::new();
     let mut second_messages = Vec::new();
     let mut seq = 0;
-    for peer in &other_peers {
+    for (peer, _receiver) in &other_peers {
         let msg1 = random_message(&mut seq, &topics);
         let msg2 = random_message(&mut seq, &topics);
 
@@ -4672,19 +4790,19 @@ fn test_iwant_penalties() {
     }
 
     // the peers send us all the first message ids in time
-    for (index, peer) in other_peers.iter().enumerate() {
+    for (index, (peer, _receiver)) in other_peers.iter().enumerate() {
         gs.handle_received_message(first_messages[index].clone(), peer);
     }
 
     // now we do a heartbeat no penalization should have been applied yet
     gs.heartbeat();
 
-    for peer in &other_peers {
+    for (peer, _receiver) in &other_peers {
         assert_eq!(gs.peer_score.as_ref().unwrap().0.score(peer), 0.0);
     }
 
     // receive the first twenty of the other peers then send their response
-    for (index, peer) in other_peers.iter().enumerate().take(20) {
+    for (index, (peer, _receiver)) in other_peers.iter().enumerate().take(20) {
         gs.handle_received_message(second_messages[index].clone(), peer);
     }
 
@@ -4695,7 +4813,7 @@ fn test_iwant_penalties() {
     gs.heartbeat();
 
     // now we get the second messages from the last 80 peers.
-    for (index, peer) in other_peers.iter().enumerate() {
+    for (index, (peer, _receiver)) in other_peers.iter().enumerate() {
         if index > 19 {
             gs.handle_received_message(second_messages[index].clone(), peer);
         }
@@ -4709,7 +4827,7 @@ fn test_iwant_penalties() {
     let mut single_penalized = 0;
     let mut double_penalized = 0;
 
-    for (i, peer) in other_peers.iter().enumerate() {
+    for (i, (peer, _receiver)) in other_peers.iter().enumerate() {
         let score = gs.peer_score.as_ref().unwrap().0.score(peer);
         if score == 0.0 {
             not_penalized += 1;
@@ -4737,7 +4855,7 @@ fn test_publish_to_floodsub_peers_without_flood_publish() {
         .flood_publish(false)
         .build()
         .unwrap();
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_low() - 1)
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4745,7 +4863,7 @@ fn test_publish_to_floodsub_peers_without_flood_publish() {
         .create_network();
 
     //add two floodsub peer, one explicit, one implicit
-    let p1 = add_peer_with_addr_and_kind(
+    let (p1, receiver1) = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
         false,
@@ -4753,7 +4871,11 @@ fn test_publish_to_floodsub_peers_without_flood_publish() {
         Multiaddr::empty(),
         Some(PeerKind::Floodsub),
     );
-    let p2 = add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
+    receivers.insert(p1, receiver1);
+
+    let (p2, receiver2) =
+        add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
+    receivers.insert(p2, receiver2);
 
     //p1 and p2 are not in the mesh
     assert!(!gs.mesh[&topics[0]].contains(&p1) && !gs.mesh[&topics[0]].contains(&p2));
@@ -4763,24 +4885,22 @@ fn test_publish_to_floodsub_peers_without_flood_publish() {
     gs.publish(Topic::new("test"), publish_data).unwrap();
 
     // Collect publish messages to floodsub peers
-    let publishes = gs
-        .events
-        .iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler { peer_id, event, .. } => {
-                if peer_id == &p1 || peer_id == &p2 {
-                    if let HandlerIn::Message(RpcOut::Publish(message)) = event {
-                        collected_publish.push(message);
-                    }
+    let publishes = receivers
+        .into_iter()
+        .fold(0, |mut collected_publish, (peer_id, c)| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if matches!(priority.try_recv(),
+            Ok(RpcOut::Publish{..}) if peer_id == p1 || peer_id == p2)
+                {
+                    collected_publish += 1;
                 }
-                collected_publish
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     assert_eq!(
-        publishes.len(),
-        2,
+        publishes, 2,
         "Should send a publish message to all floodsub peers"
     );
 }
@@ -4791,7 +4911,7 @@ fn test_do_not_use_floodsub_in_fanout() {
         .flood_publish(false)
         .build()
         .unwrap();
-    let (mut gs, _, _) = inject_nodes1()
+    let (mut gs, _, mut receivers, _) = inject_nodes1()
         .peer_no(config.mesh_n_low() - 1)
         .topics(Vec::new())
         .to_subscribe(false)
@@ -4802,7 +4922,7 @@ fn test_do_not_use_floodsub_in_fanout() {
     let topics = vec![topic.hash()];
 
     //add two floodsub peer, one explicit, one implicit
-    let p1 = add_peer_with_addr_and_kind(
+    let (p1, receiver1) = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
         false,
@@ -4810,31 +4930,33 @@ fn test_do_not_use_floodsub_in_fanout() {
         Multiaddr::empty(),
         Some(PeerKind::Floodsub),
     );
-    let p2 = add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
 
+    receivers.insert(p1, receiver1);
+    let (p2, receiver2) =
+        add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
+
+    receivers.insert(p2, receiver2);
     //publish a message
     let publish_data = vec![0; 42];
     gs.publish(Topic::new("test"), publish_data).unwrap();
 
     // Collect publish messages to floodsub peers
-    let publishes = gs
-        .events
-        .iter()
-        .fold(vec![], |mut collected_publish, e| match e {
-            ToSwarm::NotifyHandler { peer_id, event, .. } => {
-                if peer_id == &p1 || peer_id == &p2 {
-                    if let HandlerIn::Message(RpcOut::Publish(message)) = event {
-                        collected_publish.push(message);
-                    }
+    let publishes = receivers
+        .into_iter()
+        .fold(0, |mut collected_publish, (peer_id, c)| {
+            let priority = c.priority.get_ref();
+            while !priority.is_empty() {
+                if matches!(priority.try_recv(),
+            Ok(RpcOut::Publish{..}) if peer_id == p1 || peer_id == p2)
+                {
+                    collected_publish += 1;
                 }
-                collected_publish
             }
-            _ => collected_publish,
+            collected_publish
         });
 
     assert_eq!(
-        publishes.len(),
-        2,
+        publishes, 2,
         "Should send a publish message to all floodsub peers"
     );
 
@@ -4846,7 +4968,7 @@ fn test_do_not_use_floodsub_in_fanout() {
 
 #[test]
 fn test_dont_add_floodsub_peers_to_mesh_on_join() {
-    let (mut gs, _, _) = inject_nodes1()
+    let (mut gs, _, _, _) = inject_nodes1()
         .peer_no(0)
         .topics(Vec::new())
         .to_subscribe(false)
@@ -4876,14 +4998,14 @@ fn test_dont_add_floodsub_peers_to_mesh_on_join() {
 
 #[test]
 fn test_dont_send_px_to_old_gossipsub_peers() {
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, receivers, topics) = inject_nodes1()
         .peer_no(0)
         .topics(vec!["test".into()])
         .to_subscribe(false)
         .create_network();
 
     //add an old gossipsub peer
-    let p1 = add_peer_with_addr_and_kind(
+    let (p1, _receiver1) = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
         false,
@@ -4900,20 +5022,17 @@ fn test_dont_send_px_to_old_gossipsub_peers() {
     );
 
     //check that prune does not contain px
-    assert_eq!(
-        count_control_msgs(&gs, |_, m| match m {
-            ControlAction::Prune { peers: px, .. } => !px.is_empty(),
-            _ => false,
-        }),
-        0,
-        "Should not send px to floodsub peers"
-    );
+    let (control_msgs, _) = count_control_msgs(receivers, |_, m| match m {
+        RpcOut::Prune(Prune { peers: px, .. }) => !px.is_empty(),
+        _ => false,
+    });
+    assert_eq!(control_msgs, 0, "Should not send px to floodsub peers");
 }
 
 #[test]
 fn test_dont_send_floodsub_peers_in_px() {
     //build mesh with one peer
-    let (mut gs, peers, topics) = inject_nodes1()
+    let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
@@ -4938,19 +5057,16 @@ fn test_dont_send_floodsub_peers_in_px() {
     );
 
     //check that px in prune message is empty
-    assert_eq!(
-        count_control_msgs(&gs, |_, m| match m {
-            ControlAction::Prune { peers: px, .. } => !px.is_empty(),
-            _ => false,
-        }),
-        0,
-        "Should not include floodsub peers in px"
-    );
+    let (control_msgs, _) = count_control_msgs(receivers, |_, m| match m {
+        RpcOut::Prune(Prune { peers: px, .. }) => !px.is_empty(),
+        _ => false,
+    });
+    assert_eq!(control_msgs, 0, "Should not include floodsub peers in px");
 }
 
 #[test]
 fn test_dont_add_floodsub_peers_to_mesh_in_heartbeat() {
-    let (mut gs, _, topics) = inject_nodes1()
+    let (mut gs, _, _, topics) = inject_nodes1()
         .peer_no(0)
         .topics(vec!["test".into()])
         .to_subscribe(false)
@@ -4978,7 +5094,7 @@ fn test_dont_add_floodsub_peers_to_mesh_in_heartbeat() {
 // Some very basic test of public api methods.
 #[test]
 fn test_public_api() {
-    let (gs, peers, topic_hashes) = inject_nodes1()
+    let (gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(4)
         .topics(vec![String::from("topic1")])
         .to_subscribe(true)
@@ -5010,7 +5126,7 @@ fn test_public_api() {
 fn test_subscribe_to_invalid_topic() {
     let t1 = Topic::new("t1");
     let t2 = Topic::new("t2");
-    let (mut gs, _, _) = inject_nodes::<IdentityTransform, _>()
+    let (mut gs, _, _, _) = inject_nodes::<IdentityTransform, _>()
         .subscription_filter(WhitelistSubscriptionFilter(
             vec![t1.hash()].into_iter().collect(),
         ))
@@ -5024,7 +5140,7 @@ fn test_subscribe_to_invalid_topic() {
 #[test]
 fn test_subscribe_and_graft_with_negative_score() {
     //simulate a communication between two gossipsub instances
-    let (mut gs1, _, topic_hashes) = inject_nodes1()
+    let (mut gs1, _, _, topic_hashes) = inject_nodes1()
         .topics(vec!["test".into()])
         .scoring(Some((
             PeerScoreParams::default(),
@@ -5032,14 +5148,14 @@ fn test_subscribe_and_graft_with_negative_score() {
         )))
         .create_network();
 
-    let (mut gs2, _, _) = inject_nodes1().create_network();
+    let (mut gs2, _, receivers, _) = inject_nodes1().create_network();
 
     let connection_id = ConnectionId::new_unchecked(0);
 
     let topic = Topic::new("test");
 
-    let p2 = add_peer(&mut gs1, &Vec::new(), true, false);
-    let p1 = add_peer(&mut gs2, &topic_hashes, false, false);
+    let (p2, _receiver1) = add_peer(&mut gs1, &Vec::new(), true, false);
+    let (p1, _receiver2) = add_peer(&mut gs2, &topic_hashes, false, false);
 
     //add penalty to peer p2
     gs1.peer_score.as_mut().unwrap().0.add_penalty(&p2, 1);
@@ -5049,43 +5165,41 @@ fn test_subscribe_and_graft_with_negative_score() {
     //subscribe to topic in gs2
     gs2.subscribe(&topic).unwrap();
 
-    let forward_messages_to_p1 = |gs1: &mut Behaviour<_, _>, gs2: &mut Behaviour<_, _>| {
-        //collect messages to p1
-        let messages_to_p1 = gs2.events.drain(..).filter_map(|e| match e {
-            ToSwarm::NotifyHandler { peer_id, event, .. } => {
-                if peer_id == p1 {
-                    if let HandlerIn::Message(m) = event {
-                        Some(m)
-                    } else {
-                        None
-                    }
-                } else {
-                    None
+    let forward_messages_to_p1 = |gs1: &mut Behaviour<_, _>,
+                                  p1: PeerId,
+                                  p2: PeerId,
+                                  connection_id: ConnectionId,
+                                  receivers: HashMap<PeerId, Receiver>|
+     -> HashMap<PeerId, Receiver> {
+        let new_receivers = HashMap::new();
+        for (peer_id, receiver) in receivers.into_iter() {
+            let non_priority = receiver.non_priority.get_ref();
+            match non_priority.try_recv() {
+                Ok(rpc) if peer_id == p1 => {
+                    gs1.on_connection_handler_event(
+                        p2,
+                        connection_id,
+                        HandlerEvent::Message {
+                            rpc: proto_to_message(&rpc.into_protobuf()),
+                            invalid_messages: vec![],
+                        },
+                    );
                 }
+                _ => {}
             }
-            _ => None,
-        });
-        for message in messages_to_p1 {
-            gs1.on_connection_handler_event(
-                p2,
-                connection_id,
-                HandlerEvent::Message {
-                    rpc: proto_to_message(&message.into_protobuf()),
-                    invalid_messages: vec![],
-                },
-            );
         }
+        new_receivers
     };
 
     //forward the subscribe message
-    forward_messages_to_p1(&mut gs1, &mut gs2);
+    let receivers = forward_messages_to_p1(&mut gs1, p1, p2, connection_id, receivers);
 
     //heartbeats on both
     gs1.heartbeat();
     gs2.heartbeat();
 
     //forward messages again
-    forward_messages_to_p1(&mut gs1, &mut gs2);
+    forward_messages_to_p1(&mut gs1, p1, p2, connection_id, receivers);
 
     //nobody got penalized
     assert!(gs1.peer_score.as_ref().unwrap().0.score(&p2) >= original_score);
@@ -5102,7 +5216,7 @@ fn test_graft_without_subscribe() {
     let topic = String::from("test_subscribe");
     let subscribe_topic = vec![topic.clone()];
     let subscribe_topic_hash = vec![Topic::new(topic.clone()).hash()];
-    let (mut gs, peers, topic_hashes) = inject_nodes1()
+    let (mut gs, peers, _, topic_hashes) = inject_nodes1()
         .peer_no(1)
         .topics(subscribe_topic)
         .to_subscribe(false)
@@ -5122,3 +5236,473 @@ fn test_graft_without_subscribe() {
     // We unsubscribe from the topic.
     let _ = gs.unsubscribe(&Topic::new(topic));
 }
+
+#[test]
+fn test_all_queues_full() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+
+    let topic_hash = Topic::new("Test").hash();
+    let mut peers = vec![];
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
+
+    let peer_id = PeerId::random();
+    peers.push(peer_id);
+    gs.connected_peers.insert(
+        peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(2),
+        },
+    );
+
+    let publish_data = vec![0; 42];
+    gs.publish(topic_hash.clone(), publish_data.clone())
+        .unwrap();
+    let publish_data = vec![2; 59];
+    let err = gs.publish(topic_hash, publish_data).unwrap_err();
+    assert!(matches!(err, PublishError::AllQueuesFull(f) if f == 1));
+}
+
+#[test]
+fn test_slow_peer_returns_failed_publish() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+
+    let topic_hash = Topic::new("Test").hash();
+    let mut peers = vec![];
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
+
+    let slow_peer_id = PeerId::random();
+    peers.push(slow_peer_id);
+    gs.connected_peers.insert(
+        slow_peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(2),
+        },
+    );
+    let peer_id = PeerId::random();
+    peers.push(peer_id);
+    gs.connected_peers.insert(
+        peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(gs.config.connection_handler_queue_len()),
+        },
+    );
+
+    let publish_data = vec![0; 42];
+    gs.publish(topic_hash.clone(), publish_data.clone())
+        .unwrap();
+    let publish_data = vec![2; 59];
+    gs.publish(topic_hash.clone(), publish_data).unwrap();
+    gs.heartbeat();
+
+    gs.heartbeat();
+
+    let slow_peer_failed_messages = match gs.events.pop_front().unwrap() {
+        ToSwarm::GenerateEvent(Event::SlowPeer {
+            peer_id,
+            failed_messages,
+        }) if peer_id == slow_peer_id => failed_messages,
+        _ => panic!("invalid event"),
+    };
+
+    let failed_messages = FailedMessages {
+        publish: 1,
+        forward: 0,
+        priority: 1,
+        non_priority: 0,
+        timeout: 0,
+    };
+
+    assert_eq!(slow_peer_failed_messages.priority, failed_messages.priority);
+    assert_eq!(
+        slow_peer_failed_messages.non_priority,
+        failed_messages.non_priority
+    );
+    assert_eq!(slow_peer_failed_messages.publish, failed_messages.publish);
+    assert_eq!(slow_peer_failed_messages.forward, failed_messages.forward);
+}
+
+#[test]
+fn test_slow_peer_returns_failed_ihave_handling() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+
+    let topic_hash = Topic::new("Test").hash();
+    let mut peers = vec![];
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
+
+    let slow_peer_id = PeerId::random();
+    peers.push(slow_peer_id);
+    gs.connected_peers.insert(
+        slow_peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(2),
+        },
+    );
+    peers.push(slow_peer_id);
+    let mesh = gs.mesh.entry(topic_hash.clone()).or_default();
+    mesh.insert(slow_peer_id);
+
+    let peer_id = PeerId::random();
+    peers.push(peer_id);
+    gs.connected_peers.insert(
+        peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(gs.config.connection_handler_queue_len()),
+        },
+    );
+
+    let publish_data = vec![1; 59];
+    let transformed = gs
+        .data_transform
+        .outbound_transform(&topic_hash, publish_data.clone())
+        .unwrap();
+    let raw_message = gs
+        .build_raw_message(topic_hash.clone(), transformed)
+        .unwrap();
+    let msg_id = gs.config.message_id(&Message {
+        source: raw_message.source,
+        data: publish_data,
+        sequence_number: raw_message.sequence_number,
+        topic: raw_message.topic.clone(),
+    });
+
+    gs.handle_ihave(
+        &slow_peer_id,
+        vec![(topic_hash.clone(), vec![msg_id.clone()])],
+    );
+    gs.handle_ihave(&slow_peer_id, vec![(topic_hash, vec![msg_id.clone()])]);
+
+    gs.heartbeat();
+
+    let slow_peer_failed_messages = gs
+        .events
+        .into_iter()
+        .find_map(|e| match e {
+            ToSwarm::GenerateEvent(Event::SlowPeer {
+                peer_id,
+                failed_messages,
+            }) if peer_id == slow_peer_id => Some(failed_messages),
+            _ => None,
+        })
+        .unwrap();
+
+    let failed_messages = FailedMessages {
+        publish: 0,
+        forward: 0,
+        priority: 0,
+        non_priority: 1,
+        timeout: 0,
+    };
+
+    assert_eq!(slow_peer_failed_messages.priority, failed_messages.priority);
+    assert_eq!(
+        slow_peer_failed_messages.non_priority,
+        failed_messages.non_priority
+    );
+    assert_eq!(slow_peer_failed_messages.publish, failed_messages.publish);
+    assert_eq!(slow_peer_failed_messages.forward, failed_messages.forward);
+}
+
+#[test]
+fn test_slow_peer_returns_failed_iwant_handling() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+
+    let topic_hash = Topic::new("Test").hash();
+    let mut peers = vec![];
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
+
+    let slow_peer_id = PeerId::random();
+    peers.push(slow_peer_id);
+    gs.connected_peers.insert(
+        slow_peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(2),
+        },
+    );
+    peers.push(slow_peer_id);
+    let mesh = gs.mesh.entry(topic_hash.clone()).or_default();
+    mesh.insert(slow_peer_id);
+
+    let peer_id = PeerId::random();
+    peers.push(peer_id);
+    gs.connected_peers.insert(
+        peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(gs.config.connection_handler_queue_len()),
+        },
+    );
+
+    let publish_data = vec![1; 59];
+    let transformed = gs
+        .data_transform
+        .outbound_transform(&topic_hash, publish_data.clone())
+        .unwrap();
+    let raw_message = gs
+        .build_raw_message(topic_hash.clone(), transformed)
+        .unwrap();
+    let msg_id = gs.config.message_id(&Message {
+        source: raw_message.source,
+        data: publish_data,
+        sequence_number: raw_message.sequence_number,
+        topic: raw_message.topic.clone(),
+    });
+
+    gs.mcache.put(&msg_id, raw_message);
+    gs.handle_iwant(&slow_peer_id, vec![msg_id.clone(), msg_id]);
+
+    gs.heartbeat();
+
+    let slow_peer_failed_messages = gs
+        .events
+        .into_iter()
+        .find_map(|e| match e {
+            ToSwarm::GenerateEvent(Event::SlowPeer {
+                peer_id,
+                failed_messages,
+            }) if peer_id == slow_peer_id => Some(failed_messages),
+            _ => None,
+        })
+        .unwrap();
+
+    let failed_messages = FailedMessages {
+        publish: 0,
+        forward: 1,
+        priority: 0,
+        non_priority: 1,
+        timeout: 0,
+    };
+
+    assert_eq!(slow_peer_failed_messages.priority, failed_messages.priority);
+    assert_eq!(
+        slow_peer_failed_messages.non_priority,
+        failed_messages.non_priority
+    );
+    assert_eq!(slow_peer_failed_messages.publish, failed_messages.publish);
+    assert_eq!(slow_peer_failed_messages.forward, failed_messages.forward);
+}
+
+#[test]
+fn test_slow_peer_returns_failed_forward() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+
+    let topic_hash = Topic::new("Test").hash();
+    let mut peers = vec![];
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
+
+    let slow_peer_id = PeerId::random();
+    peers.push(slow_peer_id);
+    gs.connected_peers.insert(
+        slow_peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(2),
+        },
+    );
+    peers.push(slow_peer_id);
+    let mesh = gs.mesh.entry(topic_hash.clone()).or_default();
+    mesh.insert(slow_peer_id);
+
+    let peer_id = PeerId::random();
+    peers.push(peer_id);
+    gs.connected_peers.insert(
+        peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(gs.config.connection_handler_queue_len()),
+        },
+    );
+
+    let publish_data = vec![1; 59];
+    let transformed = gs
+        .data_transform
+        .outbound_transform(&topic_hash, publish_data.clone())
+        .unwrap();
+    let raw_message = gs
+        .build_raw_message(topic_hash.clone(), transformed)
+        .unwrap();
+    let msg_id = gs.config.message_id(&Message {
+        source: raw_message.source,
+        data: publish_data,
+        sequence_number: raw_message.sequence_number,
+        topic: raw_message.topic.clone(),
+    });
+
+    gs.forward_msg(&msg_id, raw_message.clone(), None, HashSet::new());
+    gs.forward_msg(&msg_id, raw_message, None, HashSet::new());
+
+    gs.heartbeat();
+
+    let slow_peer_failed_messages = gs
+        .events
+        .into_iter()
+        .find_map(|e| match e {
+            ToSwarm::GenerateEvent(Event::SlowPeer {
+                peer_id,
+                failed_messages,
+            }) if peer_id == slow_peer_id => Some(failed_messages),
+            _ => None,
+        })
+        .unwrap();
+
+    let failed_messages = FailedMessages {
+        publish: 0,
+        forward: 1,
+        priority: 0,
+        non_priority: 1,
+        timeout: 0,
+    };
+
+    assert_eq!(slow_peer_failed_messages.priority, failed_messages.priority);
+    assert_eq!(
+        slow_peer_failed_messages.non_priority,
+        failed_messages.non_priority
+    );
+    assert_eq!(slow_peer_failed_messages.publish, failed_messages.publish);
+    assert_eq!(slow_peer_failed_messages.forward, failed_messages.forward);
+}
+
+#[test]
+fn test_slow_peer_is_downscored_on_publish() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+    let slow_peer_params = PeerScoreParams::default();
+    gs.with_peer_score(slow_peer_params.clone(), PeerScoreThresholds::default())
+        .unwrap();
+
+    let topic_hash = Topic::new("Test").hash();
+    let mut peers = vec![];
+    let mut topics = BTreeSet::new();
+    topics.insert(topic_hash.clone());
+
+    let slow_peer_id = PeerId::random();
+    peers.push(slow_peer_id);
+    let mesh = gs.mesh.entry(topic_hash.clone()).or_default();
+    mesh.insert(slow_peer_id);
+    gs.connected_peers.insert(
+        slow_peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(2),
+        },
+    );
+    gs.peer_score.as_mut().unwrap().0.add_peer(slow_peer_id);
+    let peer_id = PeerId::random();
+    peers.push(peer_id);
+    gs.connected_peers.insert(
+        peer_id,
+        PeerConnections {
+            kind: PeerKind::Gossipsubv1_1,
+            connections: vec![ConnectionId::new_unchecked(0)],
+            topics: topics.clone(),
+            sender: Sender::new(gs.config.connection_handler_queue_len()),
+        },
+    );
+
+    let publish_data = vec![0; 42];
+    gs.publish(topic_hash.clone(), publish_data.clone())
+        .unwrap();
+    let publish_data = vec![2; 59];
+    gs.publish(topic_hash.clone(), publish_data).unwrap();
+    gs.heartbeat();
+    let slow_peer_score = gs.peer_score(&slow_peer_id).unwrap();
+    assert_eq!(slow_peer_score, slow_peer_params.slow_peer_weight);
+}
+
+#[tokio::test]
+async fn test_timedout_messages_are_reported() {
+    let gs_config = ConfigBuilder::default()
+        .validation_mode(ValidationMode::Permissive)
+        .build()
+        .unwrap();
+
+    let mut gs: Behaviour = Behaviour::new(MessageAuthenticity::RandomAuthor, gs_config).unwrap();
+
+    let sender = Sender::new(2);
+    let topic_hash = Topic::new("Test").hash();
+    let publish_data = vec![2; 59];
+    let raw_message = gs.build_raw_message(topic_hash, publish_data).unwrap();
+
+    sender
+        .send_message(RpcOut::Publish {
+            message: raw_message,
+            timeout: Delay::new(Duration::from_nanos(1)),
+        })
+        .unwrap();
+    let mut receiver = sender.new_receiver();
+    let stale = future::poll_fn(|cx| receiver.poll_stale(cx)).await.unwrap();
+    assert!(matches!(stale, RpcOut::Publish { .. }));
+}
+
+#[test]
+fn test_priority_messages_are_always_sent() {
+    let sender = Sender::new(2);
+    let topic_hash = Topic::new("Test").hash();
+    // Fill the buffer with the first message.
+    assert!(sender
+        .send_message(RpcOut::Subscribe(topic_hash.clone()))
+        .is_ok());
+    assert!(sender
+        .send_message(RpcOut::Subscribe(topic_hash.clone()))
+        .is_ok());
+    assert!(sender.send_message(RpcOut::Unsubscribe(topic_hash)).is_ok());
+}
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index 1ee2e940661..6e7861bae10 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -95,6 +95,9 @@ pub struct Config {
     max_ihave_messages: usize,
     iwant_followup_time: Duration,
     published_message_ids_cache_time: Duration,
+    connection_handler_queue_len: usize,
+    connection_handler_publish_duration: Duration,
+    connection_handler_forward_duration: Duration,
 }
 
 impl Config {
@@ -351,6 +354,23 @@ impl Config {
     pub fn published_message_ids_cache_time(&self) -> Duration {
         self.published_message_ids_cache_time
     }
+
+    /// The max number of messages a `ConnectionHandler` can buffer. The default is 5000.
+    pub fn connection_handler_queue_len(&self) -> usize {
+        self.connection_handler_queue_len
+    }
+
+    /// The duration a message to be published can wait to be sent before it is abandoned. The
+    /// default is 5 seconds.
+    pub fn publish_queue_duration(&self) -> Duration {
+        self.connection_handler_publish_duration
+    }
+
+    /// The duration a message to be forwarded can wait to be sent before it is abandoned. The
+    /// default is 1s.
+    pub fn forward_queue_duration(&self) -> Duration {
+        self.connection_handler_forward_duration
+    }
 }
 
 impl Default for Config {
@@ -418,6 +438,9 @@ impl Default for ConfigBuilder {
                 max_ihave_messages: 10,
                 iwant_followup_time: Duration::from_secs(3),
                 published_message_ids_cache_time: Duration::from_secs(10),
+                connection_handler_queue_len: 5000,
+                connection_handler_publish_duration: Duration::from_secs(5),
+                connection_handler_forward_duration: Duration::from_secs(1),
             },
             invalid_protocol: false,
         }
@@ -783,6 +806,26 @@ impl ConfigBuilder {
         self
     }
 
+    /// The max number of messages a `ConnectionHandler` can buffer. The default is 5000.
+    pub fn connection_handler_queue_len(&mut self, len: usize) -> &mut Self {
+        self.config.connection_handler_queue_len = len;
+        self
+    }
+
+    /// The duration a message to be published can wait to be sent before it is abandoned. The
+    /// default is 5 seconds.
+    pub fn publish_queue_duration(&mut self, duration: Duration) -> &mut Self {
+        self.config.connection_handler_publish_duration = duration;
+        self
+    }
+
+    /// The duration a message to be forwarded can wait to be sent before it is abandoned. The
+    /// default is 1s.
+    pub fn forward_queue_duration(&mut self, duration: Duration) -> &mut Self {
+        self.config.connection_handler_forward_duration = duration;
+        self
+    }
+
     /// Constructs a [`Config`] from the given configuration and validates the settings.
     pub fn build(&self) -> Result<Config, ConfigBuilderError> {
         // check all constraints on config
diff --git a/protocols/gossipsub/src/error.rs b/protocols/gossipsub/src/error.rs
index 8761630467b..047d50f2338 100644
--- a/protocols/gossipsub/src/error.rs
+++ b/protocols/gossipsub/src/error.rs
@@ -36,6 +36,9 @@ pub enum PublishError {
     MessageTooLarge,
     /// The compression algorithm failed.
     TransformFailed(std::io::Error),
+    /// Messages could not be sent because the queues for all peers were full. The usize represents the
+    /// number of peers that were attempted.
+    AllQueuesFull(usize),
 }
 
 impl std::fmt::Display for PublishError {
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
index 0ccea667268..5f9669c02c2 100644
--- a/protocols/gossipsub/src/handler.rs
+++ b/protocols/gossipsub/src/handler.rs
@@ -19,6 +19,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use crate::protocol::{GossipsubCodec, ProtocolConfig};
+use crate::rpc::Receiver;
 use crate::rpc_proto::proto;
 use crate::types::{PeerKind, RawMessage, Rpc, RpcOut};
 use crate::ValidationError;
@@ -32,7 +33,6 @@ use libp2p_swarm::handler::{
     FullyNegotiatedInbound, FullyNegotiatedOutbound, StreamUpgradeError, SubstreamProtocol,
 };
 use libp2p_swarm::Stream;
-use smallvec::SmallVec;
 use std::{
     pin::Pin,
     task::{Context, Poll},
@@ -55,14 +55,14 @@ pub enum HandlerEvent {
     /// An inbound or outbound substream has been established with the peer and this informs over
     /// which protocol. This message only occurs once per connection.
     PeerKind(PeerKind),
+    /// A message to be published was dropped because it could not be sent in time.
+    MessageDropped(RpcOut),
 }
 
 /// A message sent from the behaviour to the handler.
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum HandlerIn {
-    /// A gossipsub message to send.
-    Message(RpcOut),
     /// The peer has joined the mesh.
     JoinedMesh,
     /// The peer has left the mesh.
@@ -94,8 +94,8 @@ pub struct EnabledHandler {
     /// The single long-lived inbound substream.
     inbound_substream: Option<InboundSubstreamState>,
 
-    /// Queue of values that we want to send to the remote.
-    send_queue: SmallVec<[proto::RPC; 16]>,
+    /// Queue of values that we want to send to the remote
+    send_queue: Receiver,
 
     /// Flag indicating that an outbound substream is being established to prevent duplicate
     /// requests.
@@ -159,7 +159,7 @@ enum OutboundSubstreamState {
 
 impl Handler {
     /// Builds a new [`Handler`].
-    pub fn new(protocol_config: ProtocolConfig) -> Self {
+    pub fn new(protocol_config: ProtocolConfig, message_queue: Receiver) -> Self {
         Handler::Enabled(EnabledHandler {
             listen_protocol: protocol_config,
             inbound_substream: None,
@@ -167,7 +167,7 @@ impl Handler {
             outbound_substream_establishing: false,
             outbound_substream_attempts: 0,
             inbound_substream_attempts: 0,
-            send_queue: SmallVec::new(),
+            send_queue: message_queue,
             peer_kind: None,
             peer_kind_sent: false,
             last_io_activity: Instant::now(),
@@ -232,7 +232,7 @@ impl EnabledHandler {
         }
 
         // determine if we need to create the outbound stream
-        if !self.send_queue.is_empty()
+        if !self.send_queue.poll_is_empty(cx)
             && self.outbound_substream.is_none()
             && !self.outbound_substream_establishing
         {
@@ -250,10 +250,31 @@ impl EnabledHandler {
             ) {
                 // outbound idle state
                 Some(OutboundSubstreamState::WaitingOutput(substream)) => {
-                    if let Some(message) = self.send_queue.pop() {
-                        self.send_queue.shrink_to_fit();
-                        self.outbound_substream =
-                            Some(OutboundSubstreamState::PendingSend(substream, message));
+                    if let Poll::Ready(Some(mut message)) = self.send_queue.poll_next_unpin(cx) {
+                        match message {
+                            RpcOut::Publish {
+                                message: _,
+                                ref mut timeout,
+                            }
+                            | RpcOut::Forward {
+                                message: _,
+                                ref mut timeout,
+                            } => {
+                                if Pin::new(timeout).poll(cx).is_ready() {
+                                    // Inform the behaviour and end the poll.
+                                    self.outbound_substream =
+                                        Some(OutboundSubstreamState::WaitingOutput(substream));
+                                    return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                                        HandlerEvent::MessageDropped(message),
+                                    ));
+                                }
+                            }
+                            _ => {} // All other messages are not time-bound.
+                        }
+                        self.outbound_substream = Some(OutboundSubstreamState::PendingSend(
+                            substream,
+                            message.into_protobuf(),
+                        ));
                         continue;
                     }
 
@@ -319,6 +340,7 @@ impl EnabledHandler {
             }
         }
 
+        // Handle inbound messages.
         loop {
             match std::mem::replace(
                 &mut self.inbound_substream,
@@ -383,6 +405,13 @@ impl EnabledHandler {
             }
         }
 
+        // Drop the next message in queue if it's stale.
+        if let Poll::Ready(Some(rpc)) = self.send_queue.poll_stale(cx) {
+            return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                HandlerEvent::MessageDropped(rpc),
+            ));
+        }
+
         Poll::Pending
     }
 }
@@ -409,7 +438,6 @@ impl ConnectionHandler for Handler {
     fn on_behaviour_event(&mut self, message: HandlerIn) {
         match self {
             Handler::Enabled(handler) => match message {
-                HandlerIn::Message(m) => handler.send_queue.push(m.into_protobuf()),
                 HandlerIn::JoinedMesh => {
                     handler.in_mesh = true;
                 }
diff --git a/protocols/gossipsub/src/lib.rs b/protocols/gossipsub/src/lib.rs
index 3db2fa7ce51..f6a51da4a51 100644
--- a/protocols/gossipsub/src/lib.rs
+++ b/protocols/gossipsub/src/lib.rs
@@ -103,6 +103,7 @@ mod mcache;
 mod metrics;
 mod peer_score;
 mod protocol;
+mod rpc;
 mod rpc_proto;
 mod subscription_filter;
 mod time_cache;
@@ -125,7 +126,7 @@ pub use self::subscription_filter::{
 };
 pub use self::topic::{Hasher, Topic, TopicHash};
 pub use self::transform::{DataTransform, IdentityTransform};
-pub use self::types::{Message, MessageAcceptance, MessageId, RawMessage};
+pub use self::types::{FailedMessages, Message, MessageAcceptance, MessageId, RawMessage};
 
 #[deprecated(note = "Will be removed from the public API.")]
 pub type Rpc = self::types::Rpc;
diff --git a/protocols/gossipsub/src/metrics.rs b/protocols/gossipsub/src/metrics.rs
index 7d4acada3c7..40af1af2cac 100644
--- a/protocols/gossipsub/src/metrics.rs
+++ b/protocols/gossipsub/src/metrics.rs
@@ -127,6 +127,12 @@ pub(crate) struct Metrics {
     ignored_messages: Family<TopicHash, Counter>,
     /// The number of messages rejected by the application (validation result).
     rejected_messages: Family<TopicHash, Counter>,
+    /// The number of publish messages dropped by the sender.
+    publish_messages_dropped: Family<TopicHash, Counter>,
+    /// The number of forward messages dropped by the sender.
+    forward_messages_dropped: Family<TopicHash, Counter>,
+    /// The number of messages that timed out and could not be sent.
+    timedout_messages_dropped: Family<TopicHash, Counter>,
 
     /* Metrics regarding mesh state */
     /// Number of peers in our mesh. This metric should be updated with the count of peers for a
@@ -174,6 +180,11 @@ pub(crate) struct Metrics {
     /// The number of times we have decided that an IWANT control message is required for this
     /// topic. A very high metric might indicate an underperforming network.
     topic_iwant_msgs: Family<TopicHash, Counter>,
+
+    /// The size of the priority queue.
+    priority_queue_size: Histogram,
+    /// The size of the non-priority queue.
+    non_priority_queue_size: Histogram,
 }
 
 impl Metrics {
@@ -222,6 +233,21 @@ impl Metrics {
             "Number of rejected messages received for each topic"
         );
 
+        let publish_messages_dropped = register_family!(
+            "publish_messages_dropped_per_topic",
+            "Number of publish messages dropped per topic"
+        );
+
+        let forward_messages_dropped = register_family!(
+            "forward_messages_dropped_per_topic",
+            "Number of forward messages dropped per topic"
+        );
+
+        let timedout_messages_dropped = register_family!(
+            "timedout_messages_dropped_per_topic",
+            "Number of timedout messages dropped per topic"
+        );
+
         let mesh_peer_counts = register_family!(
             "mesh_peer_counts",
             "Number of peers in each topic in our mesh"
@@ -302,6 +328,20 @@ impl Metrics {
             metric
         };
 
+        let priority_queue_size = Histogram::new(linear_buckets(0.0, 25.0, 100));
+        registry.register(
+            "priority_queue_size",
+            "Histogram of observed priority queue sizes",
+            priority_queue_size.clone(),
+        );
+
+        let non_priority_queue_size = Histogram::new(linear_buckets(0.0, 25.0, 100));
+        registry.register(
+            "non_priority_queue_size",
+            "Histogram of observed non-priority queue sizes",
+            non_priority_queue_size.clone(),
+        );
+
         Self {
             max_topics,
             max_never_subscribed_topics,
@@ -312,6 +352,9 @@ impl Metrics {
             accepted_messages,
             ignored_messages,
             rejected_messages,
+            publish_messages_dropped,
+            forward_messages_dropped,
+            timedout_messages_dropped,
             mesh_peer_counts,
             mesh_peer_inclusion_events,
             mesh_peer_churn_events,
@@ -327,6 +370,8 @@ impl Metrics {
             heartbeat_duration,
             memcache_misses,
             topic_iwant_msgs,
+            priority_queue_size,
+            non_priority_queue_size,
         }
     }
 
@@ -457,6 +502,27 @@ impl Metrics {
         }
     }
 
+    /// Register dropping a Publish message over a topic.
+    pub(crate) fn publish_msg_dropped(&mut self, topic: &TopicHash) {
+        if self.register_topic(topic).is_ok() {
+            self.publish_messages_dropped.get_or_create(topic).inc();
+        }
+    }
+
+    /// Register dropping a Forward message over a topic.
+    pub(crate) fn forward_msg_dropped(&mut self, topic: &TopicHash) {
+        if self.register_topic(topic).is_ok() {
+            self.forward_messages_dropped.get_or_create(topic).inc();
+        }
+    }
+
+    /// Register dropping a message that timedout over a topic.
+    pub(crate) fn timeout_msg_dropped(&mut self, topic: &TopicHash) {
+        if self.register_topic(topic).is_ok() {
+            self.timedout_messages_dropped.get_or_create(topic).inc();
+        }
+    }
+
     /// Register that a message was received (and was not a duplicate).
     pub(crate) fn msg_recvd(&mut self, topic: &TopicHash) {
         if self.register_topic(topic).is_ok() {
@@ -507,6 +573,16 @@ impl Metrics {
         self.heartbeat_duration.observe(millis as f64);
     }
 
+    /// Observes a priority queue size.
+    pub(crate) fn observe_priority_queue_size(&mut self, len: usize) {
+        self.priority_queue_size.observe(len as f64);
+    }
+
+    /// Observes a non-priority queue size.
+    pub(crate) fn observe_non_priority_queue_size(&mut self, len: usize) {
+        self.non_priority_queue_size.observe(len as f64);
+    }
+
     /// Observe a score of a mesh peer.
     pub(crate) fn observe_mesh_peers_score(&mut self, topic: &TopicHash, score: f64) {
         if self.register_topic(topic).is_ok() {
diff --git a/protocols/gossipsub/src/peer_score.rs b/protocols/gossipsub/src/peer_score.rs
index 4df8f162ed9..e8d1a6e5f97 100644
--- a/protocols/gossipsub/src/peer_score.rs
+++ b/protocols/gossipsub/src/peer_score.rs
@@ -68,6 +68,8 @@ struct PeerStats {
     behaviour_penalty: f64,
     /// Application specific score. Can be manipulated by calling PeerScore::set_application_score
     application_score: f64,
+    /// Scoring based on how whether this peer consumes messages fast enough or not.
+    slow_peer_penalty: f64,
 }
 
 enum ConnectionStatus {
@@ -88,6 +90,7 @@ impl Default for PeerStats {
             known_ips: HashSet::new(),
             behaviour_penalty: 0f64,
             application_score: 0f64,
+            slow_peer_penalty: 0f64,
         }
     }
 }
@@ -334,12 +337,19 @@ impl PeerScore {
             }
         }
 
-        // P7: behavioural pattern penalty
+        // P7: behavioural pattern penalty.
         if peer_stats.behaviour_penalty > self.params.behaviour_penalty_threshold {
             let excess = peer_stats.behaviour_penalty - self.params.behaviour_penalty_threshold;
             let p7 = excess * excess;
             score += p7 * self.params.behaviour_penalty_weight;
         }
+
+        // Slow peer weighting.
+        if peer_stats.slow_peer_penalty > self.params.slow_peer_threshold {
+            let excess = peer_stats.slow_peer_penalty - self.params.slow_peer_threshold;
+            score += excess * self.params.slow_peer_weight;
+        }
+
         score
     }
 
@@ -429,6 +439,13 @@ impl PeerScore {
             if peer_stats.behaviour_penalty < params_ref.decay_to_zero {
                 peer_stats.behaviour_penalty = 0.0;
             }
+
+            // decay slow peer score
+            peer_stats.slow_peer_penalty *= params_ref.slow_peer_decay;
+            if peer_stats.slow_peer_penalty < params_ref.decay_to_zero {
+                peer_stats.slow_peer_penalty = 0.0;
+            }
+
             true
         });
     }
@@ -456,6 +473,14 @@ impl PeerScore {
         self.peer_ips.entry(ip).or_default().insert(*peer_id);
     }
 
+    /// Indicate that a peer has been too slow to consume a message.
+    pub(crate) fn failed_message_slow_peer(&mut self, peer_id: &PeerId) {
+        if let Some(peer_stats) = self.peer_stats.get_mut(peer_id) {
+            peer_stats.slow_peer_penalty += 1.0;
+            tracing::debug!(peer=%peer_id, %peer_stats.slow_peer_penalty, "[Penalty] Expired message penalty.");
+        }
+    }
+
     /// Removes an ip from a peer
     pub(crate) fn remove_ip(&mut self, peer_id: &PeerId, ip: &IpAddr) {
         if let Some(peer_stats) = self.peer_stats.get_mut(peer_id) {
diff --git a/protocols/gossipsub/src/peer_score/params.rs b/protocols/gossipsub/src/peer_score/params.rs
index 8c7fdb9bd35..ae70991f7fb 100644
--- a/protocols/gossipsub/src/peer_score/params.rs
+++ b/protocols/gossipsub/src/peer_score/params.rs
@@ -148,6 +148,13 @@ pub struct PeerScoreParams {
 
     /// Time to remember counters for a disconnected peer.
     pub retain_score: Duration,
+
+    /// Slow peer penalty conditions,
+    /// by default `slow_peer_weight` is 50 times lower than `behaviour_penalty_weight`
+    /// i.e. 50 slow peer penalties match 1 behaviour penalty.
+    pub slow_peer_weight: f64,
+    pub slow_peer_threshold: f64,
+    pub slow_peer_decay: f64,
 }
 
 impl Default for PeerScoreParams {
@@ -165,6 +172,9 @@ impl Default for PeerScoreParams {
             decay_interval: Duration::from_secs(DEFAULT_DECAY_INTERVAL),
             decay_to_zero: DEFAULT_DECAY_TO_ZERO,
             retain_score: Duration::from_secs(3600),
+            slow_peer_weight: -0.2,
+            slow_peer_threshold: 0.0,
+            slow_peer_decay: 0.2,
         }
     }
 }
diff --git a/protocols/gossipsub/src/protocol.rs b/protocols/gossipsub/src/protocol.rs
index 13edecd5846..8d33fe51a90 100644
--- a/protocols/gossipsub/src/protocol.rs
+++ b/protocols/gossipsub/src/protocol.rs
@@ -23,7 +23,8 @@ use crate::handler::HandlerEvent;
 use crate::rpc_proto::proto;
 use crate::topic::TopicHash;
 use crate::types::{
-    ControlAction, MessageId, PeerInfo, PeerKind, RawMessage, Rpc, Subscription, SubscriptionAction,
+    ControlAction, Graft, IHave, IWant, MessageId, PeerInfo, PeerKind, Prune, RawMessage, Rpc,
+    Subscription, SubscriptionAction,
 };
 use crate::ValidationError;
 use asynchronous_codec::{Decoder, Encoder, Framed};
@@ -412,33 +413,39 @@ impl Decoder for GossipsubCodec {
             let ihave_msgs: Vec<ControlAction> = rpc_control
                 .ihave
                 .into_iter()
-                .map(|ihave| ControlAction::IHave {
-                    topic_hash: TopicHash::from_raw(ihave.topic_id.unwrap_or_default()),
-                    message_ids: ihave
-                        .message_ids
-                        .into_iter()
-                        .map(MessageId::from)
-                        .collect::<Vec<_>>(),
+                .map(|ihave| {
+                    ControlAction::IHave(IHave {
+                        topic_hash: TopicHash::from_raw(ihave.topic_id.unwrap_or_default()),
+                        message_ids: ihave
+                            .message_ids
+                            .into_iter()
+                            .map(MessageId::from)
+                            .collect::<Vec<_>>(),
+                    })
                 })
                 .collect();
 
             let iwant_msgs: Vec<ControlAction> = rpc_control
                 .iwant
                 .into_iter()
-                .map(|iwant| ControlAction::IWant {
-                    message_ids: iwant
-                        .message_ids
-                        .into_iter()
-                        .map(MessageId::from)
-                        .collect::<Vec<_>>(),
+                .map(|iwant| {
+                    ControlAction::IWant(IWant {
+                        message_ids: iwant
+                            .message_ids
+                            .into_iter()
+                            .map(MessageId::from)
+                            .collect::<Vec<_>>(),
+                    })
                 })
                 .collect();
 
             let graft_msgs: Vec<ControlAction> = rpc_control
                 .graft
                 .into_iter()
-                .map(|graft| ControlAction::Graft {
-                    topic_hash: TopicHash::from_raw(graft.topic_id.unwrap_or_default()),
+                .map(|graft| {
+                    ControlAction::Graft(Graft {
+                        topic_hash: TopicHash::from_raw(graft.topic_id.unwrap_or_default()),
+                    })
                 })
                 .collect();
 
@@ -462,11 +469,11 @@ impl Decoder for GossipsubCodec {
                     .collect::<Vec<PeerInfo>>();
 
                 let topic_hash = TopicHash::from_raw(prune.topic_id.unwrap_or_default());
-                prune_msgs.push(ControlAction::Prune {
+                prune_msgs.push(ControlAction::Prune(Prune {
                     topic_hash,
                     peers,
                     backoff: prune.backoff,
-                });
+                }));
             }
 
             control_msgs.extend(ihave_msgs);
@@ -501,7 +508,7 @@ impl Decoder for GossipsubCodec {
 mod tests {
     use super::*;
     use crate::config::Config;
-    use crate::{Behaviour, ConfigBuilder};
+    use crate::{Behaviour, ConfigBuilder, MessageAuthenticity};
     use crate::{IdentTopic as Topic, Version};
     use libp2p_identity::Keypair;
     use quickcheck::*;
@@ -516,8 +523,9 @@ mod tests {
             // generate an arbitrary GossipsubMessage using the behaviour signing functionality
             let config = Config::default();
             let mut gs: Behaviour =
-                Behaviour::new(crate::MessageAuthenticity::Signed(keypair.0), config).unwrap();
-            let data = (0..g.gen_range(10..10024u32))
+                Behaviour::new(MessageAuthenticity::Signed(keypair.0), config).unwrap();
+            let mut data_g = quickcheck::Gen::new(10024);
+            let data = (0..u8::arbitrary(&mut data_g))
                 .map(|_| u8::arbitrary(g))
                 .collect::<Vec<_>>();
             let topic_id = TopicId::arbitrary(g).0;
@@ -530,7 +538,8 @@ mod tests {
 
     impl Arbitrary for TopicId {
         fn arbitrary(g: &mut Gen) -> Self {
-            let topic_string: String = (0..g.gen_range(20..1024u32))
+            let mut data_g = quickcheck::Gen::new(1024);
+            let topic_string: String = (0..u8::arbitrary(&mut data_g))
                 .map(|_| char::arbitrary(g))
                 .collect::<String>();
             TopicId(Topic::new(topic_string).into())
diff --git a/protocols/gossipsub/src/rpc.rs b/protocols/gossipsub/src/rpc.rs
new file mode 100644
index 00000000000..c90e46a85da
--- /dev/null
+++ b/protocols/gossipsub/src/rpc.rs
@@ -0,0 +1,192 @@
+// Copyright 2020 Sigma Prime Pty Ltd.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+use futures::{stream::Peekable, Stream, StreamExt};
+use std::{
+    future::Future,
+    pin::Pin,
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc,
+    },
+    task::{Context, Poll},
+};
+
+use crate::types::RpcOut;
+
+/// `RpcOut` sender that is priority aware.
+#[derive(Debug)]
+pub(crate) struct Sender {
+    /// Capacity of the priority channel for `Publish` messages.
+    priority_cap: usize,
+    len: Arc<AtomicUsize>,
+    pub(crate) priority_sender: async_channel::Sender<RpcOut>,
+    pub(crate) non_priority_sender: async_channel::Sender<RpcOut>,
+    priority_receiver: async_channel::Receiver<RpcOut>,
+    non_priority_receiver: async_channel::Receiver<RpcOut>,
+}
+
+impl Sender {
+    /// Create a RpcSender.
+    pub(crate) fn new(cap: usize) -> Sender {
+        // We intentionally do not bound the channel, as we still need to send control messages
+        // such as `GRAFT`, `PRUNE`, `SUBSCRIBE`, and `UNSUBSCRIBE`.
+        // That's also why we define `cap` and divide it by two,
+        // to ensure there is capacity for both priority and non_priority messages.
+        let (priority_sender, priority_receiver) = async_channel::unbounded();
+        let (non_priority_sender, non_priority_receiver) = async_channel::bounded(cap / 2);
+        let len = Arc::new(AtomicUsize::new(0));
+        Sender {
+            priority_cap: cap / 2,
+            len,
+            priority_sender,
+            non_priority_sender,
+            priority_receiver,
+            non_priority_receiver,
+        }
+    }
+
+    /// Create a new Receiver to the sender.
+    pub(crate) fn new_receiver(&self) -> Receiver {
+        Receiver {
+            priority_queue_len: self.len.clone(),
+            priority: Box::pin(self.priority_receiver.clone().peekable()),
+            non_priority: Box::pin(self.non_priority_receiver.clone().peekable()),
+        }
+    }
+
+    #[allow(clippy::result_large_err)]
+    pub(crate) fn send_message(&self, rpc: RpcOut) -> Result<(), RpcOut> {
+        if let RpcOut::Publish { .. } = rpc {
+            // Update number of publish message in queue.
+            let len = self.len.load(Ordering::Relaxed);
+            if len >= self.priority_cap {
+                return Err(rpc);
+            }
+            self.len.store(len + 1, Ordering::Relaxed);
+        }
+        let sender = match rpc {
+            RpcOut::Publish { .. }
+            | RpcOut::Graft(_)
+            | RpcOut::Prune(_)
+            | RpcOut::Subscribe(_)
+            | RpcOut::Unsubscribe(_) => &self.priority_sender,
+            RpcOut::Forward { .. } | RpcOut::IHave(_) | RpcOut::IWant(_) => {
+                &self.non_priority_sender
+            }
+        };
+        sender.try_send(rpc).map_err(|err| err.into_inner())
+    }
+
+    /// Returns the current size of the priority queue.
+    pub(crate) fn priority_queue_len(&self) -> usize {
+        self.len.load(Ordering::Relaxed)
+    }
+
+    /// Returns the current size of the non-priority queue.
+    pub(crate) fn non_priority_queue_len(&self) -> usize {
+        self.non_priority_sender.len()
+    }
+}
+
+/// `RpcOut` sender that is priority aware.
+#[derive(Debug)]
+pub struct Receiver {
+    /// The maximum length of the priority queue.
+    pub(crate) priority_queue_len: Arc<AtomicUsize>,
+    /// The priority queue receiver.
+    pub(crate) priority: Pin<Box<Peekable<async_channel::Receiver<RpcOut>>>>,
+    /// The non priority queue receiver.
+    pub(crate) non_priority: Pin<Box<Peekable<async_channel::Receiver<RpcOut>>>>,
+}
+
+impl Receiver {
+    // Peek the next message in the queues and return it if its timeout has elapsed.
+    // Returns `None` if there aren't any more messages on the stream or none is stale.
+    pub(crate) fn poll_stale(&mut self, cx: &mut Context<'_>) -> Poll<Option<RpcOut>> {
+        // Peek priority queue.
+        let priority = match self.priority.as_mut().poll_peek_mut(cx) {
+            Poll::Ready(Some(RpcOut::Publish {
+                message: _,
+                ref mut timeout,
+            })) => {
+                if Pin::new(timeout).poll(cx).is_ready() {
+                    // Return the message.
+                    let dropped = futures::ready!(self.priority.poll_next_unpin(cx))
+                        .expect("There should be a message");
+                    return Poll::Ready(Some(dropped));
+                }
+                Poll::Ready(None)
+            }
+            poll => poll,
+        };
+
+        let non_priority = match self.non_priority.as_mut().poll_peek_mut(cx) {
+            Poll::Ready(Some(RpcOut::Forward {
+                message: _,
+                ref mut timeout,
+            })) => {
+                if Pin::new(timeout).poll(cx).is_ready() {
+                    // Return the message.
+                    let dropped = futures::ready!(self.non_priority.poll_next_unpin(cx))
+                        .expect("There should be a message");
+                    return Poll::Ready(Some(dropped));
+                }
+                Poll::Ready(None)
+            }
+            poll => poll,
+        };
+
+        match (priority, non_priority) {
+            (Poll::Ready(None), Poll::Ready(None)) => Poll::Ready(None),
+            _ => Poll::Pending,
+        }
+    }
+
+    /// Poll queues and return true if both are empty.
+    pub(crate) fn poll_is_empty(&mut self, cx: &mut Context<'_>) -> bool {
+        matches!(
+            (
+                self.priority.as_mut().poll_peek(cx),
+                self.non_priority.as_mut().poll_peek(cx),
+            ),
+            (Poll::Ready(None), Poll::Ready(None))
+        )
+    }
+}
+
+impl Stream for Receiver {
+    type Item = RpcOut;
+
+    fn poll_next(
+        mut self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Self::Item>> {
+        // The priority queue is first polled.
+        if let Poll::Ready(rpc) = Pin::new(&mut self.priority).poll_next(cx) {
+            if let Some(RpcOut::Publish { .. }) = rpc {
+                self.priority_queue_len.fetch_sub(1, Ordering::Relaxed);
+            }
+            return Poll::Ready(rpc);
+        }
+        // Then we poll the non priority.
+        Pin::new(&mut self.non_priority).poll_next(cx)
+    }
+}
diff --git a/protocols/gossipsub/src/types.rs b/protocols/gossipsub/src/types.rs
index a88f4822ac2..bb1916fefd0 100644
--- a/protocols/gossipsub/src/types.rs
+++ b/protocols/gossipsub/src/types.rs
@@ -19,7 +19,9 @@
 // DEALINGS IN THE SOFTWARE.
 
 //! A collection of types using the Gossipsub system.
+use crate::rpc::Sender;
 use crate::TopicHash;
+use futures_timer::Delay;
 use libp2p_identity::PeerId;
 use libp2p_swarm::ConnectionId;
 use prometheus_client::encoding::EncodeLabelValue;
@@ -31,6 +33,33 @@ use crate::rpc_proto::proto;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+/// Messages that have expired while attempting to be sent to a peer.
+#[derive(Clone, Debug, Default)]
+pub struct FailedMessages {
+    /// The number of publish messages that failed to be published in a heartbeat.
+    pub publish: usize,
+    /// The number of forward messages that failed to be published in a heartbeat.
+    pub forward: usize,
+    /// The number of messages that were failed to be sent to the priority queue as it was full.
+    pub priority: usize,
+    /// The number of messages that were failed to be sent to the non-priority queue as it was full.
+    pub non_priority: usize,
+    /// The number of messages that timed out and could not be sent.
+    pub timeout: usize,
+}
+
+impl FailedMessages {
+    /// The total number of messages that failed due to the queue being full.
+    pub fn total_queue_full(&self) -> usize {
+        self.priority + self.non_priority
+    }
+
+    /// The total failed messages in a heartbeat.
+    pub fn total(&self) -> usize {
+        self.priority + self.non_priority
+    }
+}
+
 #[derive(Debug)]
 /// Validation kinds from the application for received messages.
 pub enum MessageAcceptance {
@@ -71,7 +100,7 @@ impl std::fmt::Debug for MessageId {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug)]
 pub(crate) struct PeerConnections {
     /// The kind of protocol the peer supports.
     pub(crate) kind: PeerKind,
@@ -79,6 +108,8 @@ pub(crate) struct PeerConnections {
     pub(crate) connections: Vec<ConnectionId>,
     /// Subscribed topics.
     pub(crate) topics: BTreeSet<TopicHash>,
+    /// The rpc sender to the connection handler(s).
+    pub(crate) sender: Sender,
 }
 
 /// Describes the types of peers that can exist in the gossipsub context.
@@ -197,8 +228,8 @@ pub enum SubscriptionAction {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PeerInfo {
-    pub peer_id: Option<PeerId>,
+pub(crate) struct PeerInfo {
+    pub(crate) peer_id: Option<PeerId>,
     //TODO add this when RFC: Signed Address Records got added to the spec (see pull request
     // https://github.com/libp2p/specs/pull/217)
     //pub signed_peer_record: ?,
@@ -208,46 +239,70 @@ pub struct PeerInfo {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ControlAction {
     /// Node broadcasts known messages per topic - IHave control message.
-    IHave {
-        /// The topic of the messages.
-        topic_hash: TopicHash,
-        /// A list of known message ids (peer_id + sequence _number) as a string.
-        message_ids: Vec<MessageId>,
-    },
+    IHave(IHave),
     /// The node requests specific message ids (peer_id + sequence _number) - IWant control message.
-    IWant {
-        /// A list of known message ids (peer_id + sequence _number) as a string.
-        message_ids: Vec<MessageId>,
-    },
+    IWant(IWant),
     /// The node has been added to the mesh - Graft control message.
-    Graft {
-        /// The mesh topic the peer should be added to.
-        topic_hash: TopicHash,
-    },
+    Graft(Graft),
     /// The node has been removed from the mesh - Prune control message.
-    Prune {
-        /// The mesh topic the peer should be removed from.
-        topic_hash: TopicHash,
-        /// A list of peers to be proposed to the removed peer as peer exchange
-        peers: Vec<PeerInfo>,
-        /// The backoff time in seconds before we allow to reconnect
-        backoff: Option<u64>,
-    },
+    Prune(Prune),
 }
 
-/// A Gossipsub RPC message sent.
+/// Node broadcasts known messages per topic - IHave control message.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct IHave {
+    /// The topic of the messages.
+    pub(crate) topic_hash: TopicHash,
+    /// A list of known message ids (peer_id + sequence _number) as a string.
+    pub(crate) message_ids: Vec<MessageId>,
+}
+
+/// The node requests specific message ids (peer_id + sequence _number) - IWant control message.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct IWant {
+    /// A list of known message ids (peer_id + sequence _number) as a string.
+    pub(crate) message_ids: Vec<MessageId>,
+}
+
+/// The node has been added to the mesh - Graft control message.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Graft {
+    /// The mesh topic the peer should be added to.
+    pub(crate) topic_hash: TopicHash,
+}
+
+/// The node has been removed from the mesh - Prune control message.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Prune {
+    /// The mesh topic the peer should be removed from.
+    pub(crate) topic_hash: TopicHash,
+    /// A list of peers to be proposed to the removed peer as peer exchange
+    pub(crate) peers: Vec<PeerInfo>,
+    /// The backoff time in seconds before we allow to reconnect
+    pub(crate) backoff: Option<u64>,
+}
+
+/// A Gossipsub RPC message sent.
+#[derive(Debug)]
 pub enum RpcOut {
-    /// Publish a Gossipsub message on network.
-    Publish(RawMessage),
-    /// Forward a Gossipsub message to the network.
-    Forward(RawMessage),
+    /// Publish a Gossipsub message on network.`timeout` limits the duration the message
+    /// can wait to be sent before it is abandoned.
+    Publish { message: RawMessage, timeout: Delay },
+    /// Forward a Gossipsub message on network. `timeout` limits the duration the message
+    /// can wait to be sent before it is abandoned.
+    Forward { message: RawMessage, timeout: Delay },
     /// Subscribe a topic.
     Subscribe(TopicHash),
     /// Unsubscribe a topic.
     Unsubscribe(TopicHash),
-    /// List of Gossipsub control messages.
-    Control(ControlAction),
+    /// Send a GRAFT control message.
+    Graft(Graft),
+    /// Send a PRUNE control message.
+    Prune(Prune),
+    /// Send a IHave control message.
+    IHave(IHave),
+    /// Send a IWant control message.
+    IWant(IWant),
 }
 
 impl RpcOut {
@@ -262,12 +317,18 @@ impl From<RpcOut> for proto::RPC {
     /// Converts the RPC into protobuf format.
     fn from(rpc: RpcOut) -> Self {
         match rpc {
-            RpcOut::Publish(message) => proto::RPC {
+            RpcOut::Publish {
+                message,
+                timeout: _,
+            } => proto::RPC {
                 subscriptions: Vec::new(),
                 publish: vec![message.into()],
                 control: None,
             },
-            RpcOut::Forward(message) => proto::RPC {
+            RpcOut::Forward {
+                message,
+                timeout: _,
+            } => proto::RPC {
                 publish: vec![message.into()],
                 subscriptions: Vec::new(),
                 control: None,
@@ -288,7 +349,7 @@ impl From<RpcOut> for proto::RPC {
                 }],
                 control: None,
             },
-            RpcOut::Control(ControlAction::IHave {
+            RpcOut::IHave(IHave {
                 topic_hash,
                 message_ids,
             }) => proto::RPC {
@@ -304,7 +365,7 @@ impl From<RpcOut> for proto::RPC {
                     prune: vec![],
                 }),
             },
-            RpcOut::Control(ControlAction::IWant { message_ids }) => proto::RPC {
+            RpcOut::IWant(IWant { message_ids }) => proto::RPC {
                 publish: Vec::new(),
                 subscriptions: Vec::new(),
                 control: Some(proto::ControlMessage {
@@ -316,7 +377,7 @@ impl From<RpcOut> for proto::RPC {
                     prune: vec![],
                 }),
             },
-            RpcOut::Control(ControlAction::Graft { topic_hash }) => proto::RPC {
+            RpcOut::Graft(Graft { topic_hash }) => proto::RPC {
                 publish: Vec::new(),
                 subscriptions: vec![],
                 control: Some(proto::ControlMessage {
@@ -328,7 +389,7 @@ impl From<RpcOut> for proto::RPC {
                     prune: vec![],
                 }),
             },
-            RpcOut::Control(ControlAction::Prune {
+            RpcOut::Prune(Prune {
                 topic_hash,
                 peers,
                 backoff,
@@ -420,33 +481,33 @@ impl From<Rpc> for proto::RPC {
         for action in rpc.control_msgs {
             match action {
                 // collect all ihave messages
-                ControlAction::IHave {
+                ControlAction::IHave(IHave {
                     topic_hash,
                     message_ids,
-                } => {
+                }) => {
                     let rpc_ihave = proto::ControlIHave {
                         topic_id: Some(topic_hash.into_string()),
                         message_ids: message_ids.into_iter().map(|msg_id| msg_id.0).collect(),
                     };
                     control.ihave.push(rpc_ihave);
                 }
-                ControlAction::IWant { message_ids } => {
+                ControlAction::IWant(IWant { message_ids }) => {
                     let rpc_iwant = proto::ControlIWant {
                         message_ids: message_ids.into_iter().map(|msg_id| msg_id.0).collect(),
                     };
                     control.iwant.push(rpc_iwant);
                 }
-                ControlAction::Graft { topic_hash } => {
+                ControlAction::Graft(Graft { topic_hash }) => {
                     let rpc_graft = proto::ControlGraft {
                         topic_id: Some(topic_hash.into_string()),
                     };
                     control.graft.push(rpc_graft);
                 }
-                ControlAction::Prune {
+                ControlAction::Prune(Prune {
                     topic_hash,
                     peers,
                     backoff,
-                } => {
+                }) => {
                     let rpc_prune = proto::ControlPrune {
                         topic_id: Some(topic_hash.into_string()),
                         peers: peers

From b057f918df4ca1da0d3af6e0103811618eb90c06 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Tue, 26 Nov 2024 04:14:50 +0800
Subject: [PATCH 411/455] chore(deps): upgrade `thiserror` to 2.0

Changes:
- upgrade `thiserror` crate from `1` to `2`
- move `thiserror` to `workspace.dependencies`
- sort `workspace.dependencies`
- ~run `cargo update` to update `Cargo.lock`~
(Skipping changelog as `thiserror` does not present in any public APIs)

Pull-Request: #5689.
---
 Cargo.lock                                | 200 ++++++++++++----------
 Cargo.toml                                |  17 +-
 core/Cargo.toml                           |   2 +-
 identity/Cargo.toml                       |   2 +-
 libp2p/Cargo.toml                         |   2 +-
 misc/quick-protobuf-codec/Cargo.toml      |   2 +-
 misc/webrtc-utils/Cargo.toml              |   2 +-
 muxers/yamux/Cargo.toml                   |   2 +-
 protocols/autonat/Cargo.toml              |   2 +-
 protocols/dcutr/Cargo.toml                |   2 +-
 protocols/floodsub/Cargo.toml             |   2 +-
 protocols/identify/Cargo.toml             |   2 +-
 protocols/kad/Cargo.toml                  |   2 +-
 protocols/perf/Cargo.toml                 |   2 +-
 protocols/relay/Cargo.toml                |   2 +-
 protocols/rendezvous/Cargo.toml           |   2 +-
 transports/noise/Cargo.toml               |   2 +-
 transports/quic/Cargo.toml                |   2 +-
 transports/tls/Cargo.toml                 |   2 +-
 transports/webrtc-websys/Cargo.toml       |   2 +-
 transports/webrtc/Cargo.toml              |   2 +-
 transports/websocket-websys/Cargo.toml    |   2 +-
 transports/websocket/Cargo.toml           |   2 +-
 transports/webtransport-websys/Cargo.toml |   2 +-
 24 files changed, 142 insertions(+), 119 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e24db6e69d4..d405464f58f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -175,7 +175,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.63",
  "time",
 ]
 
@@ -191,7 +191,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.63",
  "time",
 ]
 
@@ -215,7 +215,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
  "synstructure 0.13.1",
 ]
 
@@ -238,7 +238,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -472,7 +472,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -489,7 +489,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -963,7 +963,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1226,7 +1226,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1366,7 +1366,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1471,7 +1471,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1727,7 +1727,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1981,7 +1981,7 @@ dependencies = [
  "once_cell",
  "rand 0.8.5",
  "socket2 0.5.7",
- "thiserror",
+ "thiserror 1.0.63",
  "tinyvec",
  "tokio",
  "tracing",
@@ -2004,7 +2004,7 @@ dependencies = [
  "rand 0.8.5",
  "resolv-conf",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "tracing",
 ]
@@ -2369,7 +2369,7 @@ dependencies = [
  "rand 0.8.5",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
@@ -2592,7 +2592,7 @@ dependencies = [
  "multiaddr",
  "pin-project",
  "rw-stream-sink",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing-subscriber",
 ]
@@ -2630,7 +2630,7 @@ dependencies = [
  "quick-protobuf-codec",
  "rand 0.8.5",
  "rand_core 0.6.4",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -2677,7 +2677,7 @@ dependencies = [
  "rw-stream-sink",
  "serde",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "unsigned-varint 0.8.0",
  "web-time 1.1.0",
@@ -2709,7 +2709,7 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -2750,7 +2750,7 @@ dependencies = [
  "quick-protobuf-codec",
  "rand 0.8.5",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
 ]
 
@@ -2809,7 +2809,7 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "tracing-subscriber",
 ]
@@ -2837,7 +2837,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "zeroize",
 ]
@@ -2869,7 +2869,7 @@ dependencies = [
  "serde",
  "sha2 0.10.8",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "tracing-subscriber",
  "uint",
@@ -2992,7 +2992,7 @@ dependencies = [
  "sha2 0.10.8",
  "snow",
  "static_assertions",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "tracing-subscriber",
  "x25519-dalek",
@@ -3021,7 +3021,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3109,7 +3109,7 @@ dependencies = [
  "ring 0.17.8",
  "rustls 0.23.11",
  "socket2 0.5.7",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3137,7 +3137,7 @@ dependencies = [
  "quickcheck-ext",
  "rand 0.8.5",
  "static_assertions",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "tracing-subscriber",
  "web-time 1.1.0",
@@ -3165,7 +3165,7 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3276,7 +3276,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -3330,7 +3330,7 @@ dependencies = [
  "ring 0.17.8",
  "rustls 0.23.11",
  "rustls-webpki 0.101.7",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "x509-parser 0.16.0",
  "yasna",
@@ -3381,7 +3381,7 @@ dependencies = [
  "rcgen",
  "serde",
  "stun 0.6.0",
- "thiserror",
+ "thiserror 2.0.3",
  "tinytemplate",
  "tokio",
  "tokio-util",
@@ -3407,7 +3407,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 2.0.3",
  "tinytemplate",
  "tracing",
 ]
@@ -3425,7 +3425,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-webrtc-utils",
  "send_wrapper 0.6.0",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3449,7 +3449,7 @@ dependencies = [
  "rcgen",
  "rw-stream-sink",
  "soketto",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "url",
  "webpki-roots 0.25.2",
@@ -3468,7 +3468,7 @@ dependencies = [
  "libp2p-yamux",
  "parking_lot",
  "send_wrapper 0.6.0",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "wasm-bindgen",
  "web-sys",
@@ -3488,7 +3488,7 @@ dependencies = [
  "multihash",
  "once_cell",
  "send_wrapper 0.6.0",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3504,7 +3504,7 @@ dependencies = [
  "futures",
  "libp2p-core",
  "libp2p-muxer-test-harness",
- "thiserror",
+ "thiserror 2.0.3",
  "tracing",
  "yamux 0.12.1",
  "yamux 0.13.3",
@@ -3861,7 +3861,7 @@ dependencies = [
  "anyhow",
  "byteorder",
  "paste",
- "thiserror",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
@@ -3875,7 +3875,7 @@ dependencies = [
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
 ]
 
@@ -4066,7 +4066,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -4099,7 +4099,7 @@ dependencies = [
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror",
+ "thiserror 1.0.63",
  "urlencoding",
 ]
 
@@ -4114,7 +4114,7 @@ dependencies = [
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
@@ -4146,7 +4146,7 @@ dependencies = [
  "opentelemetry-proto",
  "opentelemetry_sdk 0.25.0",
  "prost",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "tonic",
 ]
@@ -4189,7 +4189,7 @@ dependencies = [
  "ordered-float 4.2.0",
  "percent-encoding",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "tokio-stream",
 ]
@@ -4210,7 +4210,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.8.5",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "tokio-stream",
 ]
@@ -4340,7 +4340,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -4492,9 +4492,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -4519,7 +4519,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -4542,7 +4542,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -4570,7 +4570,7 @@ dependencies = [
  "futures",
  "quick-protobuf",
  "quickcheck-ext",
- "thiserror",
+ "thiserror 2.0.3",
  "unsigned-varint 0.8.0",
 ]
 
@@ -4608,7 +4608,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash 1.1.0",
  "rustls 0.23.11",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "tracing",
 ]
@@ -4625,7 +4625,7 @@ dependencies = [
  "rustc-hash 2.0.0",
  "rustls 0.23.11",
  "slab",
- "thiserror",
+ "thiserror 1.0.63",
  "tinyvec",
  "tracing",
 ]
@@ -4801,7 +4801,7 @@ checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom 0.2.15",
  "redox_syscall 0.2.16",
- "thiserror",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
@@ -5006,7 +5006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3677908cadfbecb4cc1da9a56a32524fae4ebdfa7c2ea93886e1b1e846488cb9"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.63",
  "webrtc-util 0.8.1",
 ]
 
@@ -5022,7 +5022,7 @@ dependencies = [
  "netlink-packet-route",
  "netlink-proto",
  "nix 0.24.3",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
 ]
 
@@ -5035,7 +5035,7 @@ dependencies = [
  "bytes",
  "rand 0.8.5",
  "serde",
- "thiserror",
+ "thiserror 1.0.63",
  "webrtc-util 0.8.1",
 ]
 
@@ -5060,7 +5060,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.66",
+ "syn 2.0.89",
  "walkdir",
 ]
 
@@ -5294,7 +5294,7 @@ checksum = "4653054c30ebce63658762eb0d64e27673868a95564474811ae6c220cf767640"
 dependencies = [
  "rand 0.8.5",
  "substring",
- "thiserror",
+ "thiserror 1.0.63",
  "url",
 ]
 
@@ -5373,7 +5373,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -5406,7 +5406,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -5691,7 +5691,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -5707,7 +5707,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "subtle",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "url",
  "webrtc-util 0.8.1",
@@ -5726,7 +5726,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "subtle",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "url",
  "webrtc-util 0.9.0",
@@ -5760,9 +5760,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5801,7 +5801,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -5881,7 +5881,7 @@ dependencies = [
  "stringmatch",
  "strum",
  "thirtyfour-macros",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "tracing",
  "url",
@@ -5895,7 +5895,7 @@ checksum = "b72d056365e368fc57a56d0cec9e41b02fb4a3474a61c8735262b1cfebe67425"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -5904,7 +5904,16 @@ version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.63",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
 ]
 
 [[package]]
@@ -5915,7 +5924,18 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -6033,7 +6053,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -6223,7 +6243,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -6346,7 +6366,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.16.20",
  "stun 0.5.1",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "webrtc-util 0.8.1",
 ]
@@ -6577,7 +6597,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
  "wasm-bindgen-shared",
 ]
 
@@ -6611,7 +6631,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6645,7 +6665,7 @@ checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -6732,7 +6752,7 @@ dependencies = [
  "sha2 0.10.8",
  "smol_str",
  "stun 0.5.1",
- "thiserror",
+ "thiserror 1.0.63",
  "time",
  "tokio",
  "turn",
@@ -6756,7 +6776,7 @@ checksum = "a45d2461d0e0bf93f181e30eb0b40df32b8bf3efb89c53cebb1990e603e2067d"
 dependencies = [
  "bytes",
  "log",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "webrtc-sctp",
  "webrtc-util 0.8.1",
@@ -6792,7 +6812,7 @@ dependencies = [
  "sha1",
  "sha2 0.10.8",
  "subtle",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "webrtc-util 0.8.1",
  "x25519-dalek",
@@ -6813,7 +6833,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun 0.5.1",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "turn",
  "url",
@@ -6831,7 +6851,7 @@ checksum = "62bebbd40e7f8b630a0f1a74783dbfff1edfc0ccaae891c4689891156a8c4d8c"
 dependencies = [
  "log",
  "socket2 0.5.7",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "webrtc-util 0.8.1",
 ]
@@ -6846,7 +6866,7 @@ dependencies = [
  "bytes",
  "rand 0.8.5",
  "rtp",
- "thiserror",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
@@ -6861,7 +6881,7 @@ dependencies = [
  "crc",
  "log",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "webrtc-util 0.8.1",
 ]
@@ -6884,7 +6904,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "webrtc-util 0.8.1",
 ]
@@ -6904,7 +6924,7 @@ dependencies = [
  "log",
  "nix 0.26.4",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "winapi",
 ]
@@ -6925,7 +6945,7 @@ dependencies = [
  "nix 0.26.4",
  "portable-atomic",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.63",
  "tokio",
  "winapi",
 ]
@@ -7210,7 +7230,7 @@ dependencies = [
  "oid-registry 0.6.1",
  "ring 0.16.20",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.63",
  "time",
 ]
 
@@ -7227,7 +7247,7 @@ dependencies = [
  "nom",
  "oid-registry 0.7.0",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.63",
  "time",
 ]
 
@@ -7303,7 +7323,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -7323,5 +7343,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.89",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a7f944d22fc..b631b587dee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,9 +72,6 @@ resolver = "2"
 rust-version = "1.75.0"
 
 [workspace.dependencies]
-asynchronous-codec = { version = "0.7.0" }
-futures-bounded = { version = "0.2.4" }
-futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.2", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.4.2", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
@@ -116,21 +113,27 @@ libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
+
+# External dependencies
+asynchronous-codec = { version = "0.7.0" }
+futures = "0.3.30"
+futures-bounded = { version = "0.2.4" }
+futures-rustls = { version = "0.26.0", default-features = false }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
 prometheus-client = "0.22.2"
 quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
+rcgen = "0.11.3"
+ring = "0.17.8"
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
-unsigned-varint = { version = "0.8.0" }
+thiserror = "2"
 tokio = { version = "1.38", default-features = false }
 tracing = "0.1.37"
 tracing-subscriber = "0.3"
-futures = "0.3.30"
+unsigned-varint = { version = "0.8.0" }
 web-time = "1.1.0"
-ring = "0.17.8"
-rcgen = "0.11.3"
 
 [patch.crates-io]
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index c257ff25ec4..8ec0b0fc197 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -28,7 +28,7 @@ rand = "0.8"
 rw-stream-sink = { workspace = true }
 serde = { version = "1", optional = true, features = ["derive"] }
 smallvec = "1.13.2"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 unsigned-varint = { workspace = true }
 
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index d3b07c5dc87..cc41abb3e24 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -25,7 +25,7 @@ rand = { version = "0.8", optional = true }
 sec1 = { version = "0.7", default-features = false, optional = true }
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = { version = "0.10.8", optional = true }
-thiserror = { version = "1.0", optional = true }
+thiserror = { workspace = true, optional = true }
 zeroize = { version = "1.8", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 83ef86a4ca4..79f4b8fbb9a 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -122,7 +122,7 @@ libp2p-webtransport-websys = { workspace = true, optional = true }
 libp2p-yamux = { workspace = true, optional = true }
 multiaddr = { workspace = true }
 pin-project = "1.0.0"
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 libp2p-dns = { workspace = true, optional = true }
diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
index 985479059a2..2501e94ca19 100644
--- a/misc/quick-protobuf-codec/Cargo.toml
+++ b/misc/quick-protobuf-codec/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = { version = "1" }
-thiserror = "1.0"
+thiserror = { workspace = true }
 unsigned-varint = { workspace = true, features = ["std"] }
 quick-protobuf = "0.8"
 
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
index 88f576f12d9..287388a49e7 100644
--- a/misc/webrtc-utils/Cargo.toml
+++ b/misc/webrtc-utils/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.10.8"
-thiserror = "1"
+thiserror = { workspace = true }
 tinytemplate = "1.2"
 tracing = { workspace = true }
 
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
index 0c52eca3fd4..cd3f8347bd0 100644
--- a/muxers/yamux/Cargo.toml
+++ b/muxers/yamux/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 either = "1"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 yamux012 = { version = "0.12.1", package = "yamux" }
 yamux013 = { version = "0.13.3", package = "yamux" }
 tracing = { workspace = true }
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index ced5dbeb4e8..92ca163d8ec 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -33,7 +33,7 @@ tracing = { workspace = true }
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 rand_core = { version = "0.6", optional = true }
-thiserror = { version = "1.0.52", optional = true }
+thiserror = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "rt", "sync"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 69517181aab..a47f5400488 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 lru = "0.12.3"
 futures-bounded = { workspace = true }
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
index 18d77e99e9c..dcfde6383cc 100644
--- a/protocols/floodsub/Cargo.toml
+++ b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 87b3ed63774..d7f6b6eca76 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -22,7 +22,7 @@ lru = "0.12.3"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 either = "1.12.0"
 
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 11df81afbf8..295414f6ddd 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -30,7 +30,7 @@ uint = "0.9"
 futures-timer = "3.0.3"
 web-time = { workspace = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
-thiserror = "1"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index a1a6128c6ed..cd499a8c949 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -28,7 +28,7 @@ libp2p-tls = { workspace = true }
 libp2p-yamux = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index c996a014845..6c2c7b90304 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -25,7 +25,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8.4"
 static_assertions = "1"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 5aa70688dbe..5fa40c3785b 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -24,7 +24,7 @@ libp2p-request-response = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-thiserror = "1"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 7f8e9004cd0..9798ba1836e 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index a33ef4ef0b1..17d5014b974 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.3"
 quinn = { version = "0.11.2", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.9", default-features = false }
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.7"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index c27e14bb537..fce76e2aa79 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 rcgen = { workspace = true }
 ring = { workspace = true }
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
 x509-parser = "0.16.0"
 yasna = "0.5.2"
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 453abe57f74..4663913c849 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 libp2p-webrtc-utils = { workspace = true }
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 wasm-bindgen = { version = "0.2.90" }
 wasm-bindgen-futures = { version = "0.4.42" }
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index fc2748d93c3..4197a9419d8 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8"
 rcgen = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 stun = "0.6"
-thiserror = "1"
+thiserror = { workspace = true }
 tinytemplate = "1.2"
 tokio = { workspace = true, features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 1687d3c0fb5..1e604ba0478 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
 tracing = { workspace = true }
 parking_lot = "0.12.3"
 send_wrapper = "0.6.0"
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 wasm-bindgen = "0.2.90"
 web-sys = { version = "0.3.69", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }
 
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
index 07f84901eda..5c9734e420a 100644
--- a/transports/websocket/Cargo.toml
+++ b/transports/websocket/Cargo.toml
@@ -21,7 +21,7 @@ pin-project-lite = "0.2.14"
 rw-stream-sink = { workspace = true }
 soketto = "0.8.0"
 tracing = { workspace = true }
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 url = "2.5"
 webpki-roots = "0.25"
 
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index eeb474d4a63..0cfc37bf041 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -23,7 +23,7 @@ multiaddr = { workspace = true }
 multihash = { workspace = true }
 once_cell = "1.19.0"
 send_wrapper = { version = "0.6.0", features = ["futures"] }
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 wasm-bindgen = "0.2.93"
 wasm-bindgen-futures = "0.4.43"

From c9c44b1b1b031c215a5e20f523b202b1694fc4b4 Mon Sep 17 00:00:00 2001
From: leopardracer <136604165+leopardracer@users.noreply.github.com>
Date: Wed, 27 Nov 2024 01:11:10 +0200
Subject: [PATCH 412/455] fix: typos in documentation files

Pull-Request: #5693.
---
 core/CHANGELOG.md     | 2 +-
 identity/CHANGELOG.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index dbd46a38f07..68b1f99cc2a 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 - Update `Transport::dial` function signature with a `DialOpts` param and remove `Transport::dial_as_listener`:
   - `DialOpts` struct contains `PortUse` and `Endpoint`, 
-  - `PortUse` allows controling port allocation of new connections (defaults to `PortUse::Reuse`)   - 
+  - `PortUse` allows controlling port allocation of new connections (defaults to `PortUse::Reuse`)   - 
   - Add `port_use` field to `ConnectedPoint`
   - Set `endpoint` field in `DialOpts` to `Endpoint::Listener` to dial as a listener
 - Remove `Transport::address_translation` and relocate functionality to `libp2p_swarm`
diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md
index 8ee12c8124a..98f3e5c5636 100644
--- a/identity/CHANGELOG.md
+++ b/identity/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 ## 0.2.8
 
-- Bump `ring` to `0.17.5.
+- Bump `ring` to `0.17.5`.
   See [PR 4779](https://github.com/libp2p/rust-libp2p/pull/4779).
 
 ## 0.2.7

From 0d890fdc65743b7c5af50905dd3e6cd26ce773ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Wed, 27 Nov 2024 17:05:29 +0000
Subject: [PATCH 413/455] fix(gossipsub): fix mesh/fanout inconsistencies

When a peer unsubscribes also remove it from fanout.

Pull-Request: #5690.
---
 protocols/gossipsub/CHANGELOG.md     | 6 ++++--
 protocols/gossipsub/src/behaviour.rs | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 8d95abc01a2..ddbbc7fb552 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,15 +1,17 @@
 ## 0.48.0
 
+- Correct state inconsistencies with the mesh and fanout when unsubscribing.
+  See [PR 5690](https://github.com/libp2p/rust-libp2p/pull/5690)
+
 - Deprecate `futures-ticker` and use `futures-timer` instead.
   See [PR 5674](https://github.com/libp2p/rust-libp2p/pull/5674).
+
 - Apply `max_transmit_size` to the inner message instead of the final payload.
   See [PR 5642](https://github.com/libp2p/rust-libp2p/pull/5642).
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
 
-## 0.47.1
-
 - Attempt to publish to at least mesh_n peers when flood publish is disabled.
   See [PR 5578](https://github.com/libp2p/rust-libp2p/pull/5578).
 
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index fae45ed452e..075a881db48 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -1962,8 +1962,11 @@ where
             }
         }
 
-        // remove unsubscribed peers from the mesh if it exists
+        // remove unsubscribed peers from the mesh and fanout if they exist there.
         for (peer_id, topic_hash) in unsubscribed_peers {
+            self.fanout
+                .get_mut(&topic_hash)
+                .map(|peers| peers.remove(&peer_id));
             self.remove_peer_from_mesh(&peer_id, &topic_hash, None, false, Churn::Unsub);
         }
 

From 930118ef5a6566f058d22e1614a8e96b4c287262 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Thu, 28 Nov 2024 18:04:50 +0800
Subject: [PATCH 414/455] fix(ci): Clippy Beta

Fixes CI failure in Clippy (Beta)

https://github.com/libp2p/rust-libp2p/actions/runs/12055058396/job/33614543029

Pull-Request: #5700.
---
 Cargo.lock                                  | 4 ++--
 Cargo.toml                                  | 4 ++--
 protocols/gossipsub/CHANGELOG.md            | 4 ++++
 protocols/gossipsub/src/backoff.rs          | 2 +-
 protocols/gossipsub/src/behaviour.rs        | 2 +-
 protocols/kad/CHANGELOG.md                  | 2 ++
 protocols/kad/src/jobs.rs                   | 2 +-
 protocols/kad/src/kbucket.rs                | 4 ++--
 protocols/kad/src/kbucket/bucket.rs         | 4 ++--
 protocols/kad/src/record.rs                 | 4 ++--
 swarm/CHANGELOG.md                          | 3 +++
 swarm/src/connection/pool.rs                | 2 +-
 transports/noise/CHANGELOG.md               | 5 +++++
 transports/noise/Cargo.toml                 | 2 +-
 transports/noise/src/io/handshake.rs        | 2 +-
 transports/websocket-websys/CHANGELOG.md    | 3 +++
 transports/websocket-websys/src/lib.rs      | 2 ++
 transports/webtransport-websys/CHANGELOG.md | 5 +++++
 transports/webtransport-websys/Cargo.toml   | 2 +-
 transports/webtransport-websys/src/lib.rs   | 2 ++
 wasm-tests/webtransport-tests/src/lib.rs    | 2 ++
 21 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d405464f58f..4093d49504b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2974,7 +2974,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.45.0"
+version = "0.45.1"
 dependencies = [
  "asynchronous-codec",
  "bytes",
@@ -3476,7 +3476,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webtransport-websys"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "futures",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index b631b587dee..dfa32628dbc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -88,7 +88,7 @@ libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
-libp2p-noise = { version = "0.45.0", path = "transports/noise" }
+libp2p-noise = { version = "0.45.1", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.45.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
@@ -111,7 +111,7 @@ libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
+libp2p-webtransport-websys = { version = "0.4.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
 
 # External dependencies
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index ddbbc7fb552..0bfee4d3e91 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -18,10 +18,14 @@
 - Introduce back pressure and penalize slow peers. Drop stale messages that timeout before being
   delivered.
   See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
+
 - Change `Behaviour::unsubscribe` and `Behaviour::report_message_validation_result`
   to `bool` they don't need to be a `Result`.
   See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
 
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.47.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
index 4414ffb00e6..c955ee59c65 100644
--- a/protocols/gossipsub/src/backoff.rs
+++ b/protocols/gossipsub/src/backoff.rs
@@ -124,7 +124,7 @@ impl BackoffStorage {
     pub(crate) fn is_backoff_with_slack(&self, topic: &TopicHash, peer: &PeerId) -> bool {
         self.backoffs
             .get(topic)
-            .map_or(false, |m| m.contains_key(peer))
+            .is_some_and(|m| m.contains_key(peer))
     }
 
     pub(crate) fn get_backoff_time(&self, topic: &TopicHash, peer: &PeerId) -> Option<Instant> {
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 075a881db48..ae808d97261 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -1689,7 +1689,7 @@ where
         let self_published = !self.config.allow_self_origin()
             && if let Some(own_id) = self.publish_config.get_own_id() {
                 own_id != propagation_source
-                    && raw_message.source.as_ref().map_or(false, |s| s == own_id)
+                    && raw_message.source.as_ref().is_some_and(|s| s == own_id)
             } else {
                 self.published_message_ids.contains(msg_id)
             };
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 55d269bf98f..64049c7b60b 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -6,6 +6,8 @@
   See [PR 5573](https://github.com/libp2p/rust-libp2p/pull/5573).
 - Add `Behavior::find_closest_local_peers()`.
   See [PR 5645](https://github.com/libp2p/rust-libp2p/pull/5645).
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
 ## 0.46.2
 
diff --git a/protocols/kad/src/jobs.rs b/protocols/kad/src/jobs.rs
index 537f652b7a4..fa558878a38 100644
--- a/protocols/kad/src/jobs.rs
+++ b/protocols/kad/src/jobs.rs
@@ -203,7 +203,7 @@ impl PutRecordJob {
         T: RecordStore,
     {
         if self.inner.check_ready(cx, now) {
-            let publish = self.next_publish.map_or(false, |t_pub| now >= t_pub);
+            let publish = self.next_publish.is_some_and(|t_pub| now >= t_pub);
             let records = store
                 .records()
                 .filter_map(|r| {
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 28d7df03917..99d534fa669 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -529,12 +529,12 @@ where
 
     /// Returns true if the bucket has a pending node.
     pub fn has_pending(&self) -> bool {
-        self.bucket.pending().map_or(false, |n| !n.is_ready())
+        self.bucket.pending().is_some_and(|n| !n.is_ready())
     }
 
     /// Tests whether the given distance falls into this bucket.
     pub fn contains(&self, d: &Distance) -> bool {
-        BucketIndex::new(d).map_or(false, |i| i == self.index)
+        BucketIndex::new(d).is_some_and(|i| i == self.index)
     }
 
     /// Generates a random distance that falls into this bucket.
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
index 1426017aa7a..ec2b7756c43 100644
--- a/protocols/kad/src/kbucket/bucket.rs
+++ b/protocols/kad/src/kbucket/bucket.rs
@@ -377,7 +377,7 @@ where
             // Adjust `first_connected_pos` accordingly.
             match status {
                 NodeStatus::Connected => {
-                    if self.first_connected_pos.map_or(false, |p| p == pos.0)
+                    if self.first_connected_pos.is_some_and(|p| p == pos.0)
                         && pos.0 == self.nodes.len()
                     {
                         // It was the last connected node.
@@ -398,7 +398,7 @@ where
 
     /// Returns the status of the node at the given position.
     pub(crate) fn status(&self, pos: Position) -> NodeStatus {
-        if self.first_connected_pos.map_or(false, |i| pos.0 >= i) {
+        if self.first_connected_pos.is_some_and(|i| pos.0 >= i) {
             NodeStatus::Connected
         } else {
             NodeStatus::Disconnected
diff --git a/protocols/kad/src/record.rs b/protocols/kad/src/record.rs
index cb7c4b866fc..b8a644acdd6 100644
--- a/protocols/kad/src/record.rs
+++ b/protocols/kad/src/record.rs
@@ -101,7 +101,7 @@ impl Record {
 
     /// Checks whether the record is expired w.r.t. the given `Instant`.
     pub fn is_expired(&self, now: Instant) -> bool {
-        self.expires.map_or(false, |t| now >= t)
+        self.expires.is_some_and(|t| now >= t)
     }
 }
 
@@ -154,7 +154,7 @@ impl ProviderRecord {
 
     /// Checks whether the provider record is expired w.r.t. the given `Instant`.
     pub fn is_expired(&self, now: Instant) -> bool {
-        self.expires.map_or(false, |t| now >= t)
+        self.expires.is_some_and(|t| now >= t)
     }
 }
 
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 0109a33747c..69446e62d07 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -5,6 +5,9 @@
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+  
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
 ## 0.45.1
 
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index b2accf745ef..7964ecbfa69 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -207,7 +207,7 @@ struct PendingConnection {
 
 impl PendingConnection {
     fn is_for_same_remote_as(&self, other: PeerId) -> bool {
-        self.peer_id.map_or(false, |peer| peer == other)
+        self.peer_id == Some(other)
     }
 
     /// Aborts the connection attempt, closing the connection.
diff --git a/transports/noise/CHANGELOG.md b/transports/noise/CHANGELOG.md
index f599ae3533f..cda7132cb28 100644
--- a/transports/noise/CHANGELOG.md
+++ b/transports/noise/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.1
+
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.45.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 9798ba1836e..8824adcc50c 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-noise"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Cryptographic handshake protocol using the noise framework."
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
index 8993a5795b6..d8dfb9b802e 100644
--- a/transports/noise/src/io/handshake.rs
+++ b/transports/noise/src/io/handshake.rs
@@ -106,7 +106,7 @@ where
             .id_remote_pubkey
             .ok_or_else(|| Error::AuthenticationFailed)?;
 
-        let is_valid_signature = self.dh_remote_pubkey_sig.as_ref().map_or(false, |s| {
+        let is_valid_signature = self.dh_remote_pubkey_sig.as_ref().is_some_and(|s| {
             id_pk.verify(&[STATIC_KEY_DOMAIN.as_bytes(), pubkey.as_ref()].concat(), s)
         });
 
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
index 9d0cb7d7726..affe9ff2551 100644
--- a/transports/websocket-websys/CHANGELOG.md
+++ b/transports/websocket-websys/CHANGELOG.md
@@ -3,6 +3,9 @@
 - fix: Return `None` when extracting a `/dnsaddr` address
   See [PR 5613](https://github.com/libp2p/rust-libp2p/pull/5613)
 
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.4.0
 
 - Implement refactored `Transport`.
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index 17b07c71c0a..21789eeca66 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -20,6 +20,8 @@
 
 //! Libp2p websocket transports built on [web-sys](https://rustwasm.github.io/wasm-bindgen/web-sys/index.html).
 
+#![allow(unexpected_cfgs)]
+
 mod web_context;
 
 use bytes::BytesMut;
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
index 411117918bd..45a94495e4e 100644
--- a/transports/webtransport-websys/CHANGELOG.md
+++ b/transports/webtransport-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1
+
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.4.0
 
 - Implement refactored `Transport`.
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
index 0cfc37bf041..ef2865535bf 100644
--- a/transports/webtransport-websys/Cargo.toml
+++ b/transports/webtransport-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-webtransport-websys"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebTransport for libp2p under WASM environment"
-version = "0.4.0"
+version = "0.4.1"
 authors = [
     "Yiannis Marangos <yiannis@eiger.co>",
     "oblique <psyberbits@gmail.com>",
diff --git a/transports/webtransport-websys/src/lib.rs b/transports/webtransport-websys/src/lib.rs
index f9c59694fa3..dcb1010d986 100644
--- a/transports/webtransport-websys/src/lib.rs
+++ b/transports/webtransport-websys/src/lib.rs
@@ -1,5 +1,7 @@
 //! Libp2p WebTransport built on [web-sys](https://rustwasm.github.io/wasm-bindgen/web-sys/index.html)
 
+#![allow(unexpected_cfgs)]
+
 mod bindings;
 mod connection;
 mod endpoint;
diff --git a/wasm-tests/webtransport-tests/src/lib.rs b/wasm-tests/webtransport-tests/src/lib.rs
index 938cdf0b3e1..4cf4375bf7a 100644
--- a/wasm-tests/webtransport-tests/src/lib.rs
+++ b/wasm-tests/webtransport-tests/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(unexpected_cfgs)]
+
 use futures::channel::oneshot;
 use futures::{AsyncReadExt, AsyncWriteExt};
 use getrandom::getrandom;

From b187c14ef36744ea6b2f29740321b5fe896a50ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 28 Nov 2024 15:44:50 +0000
Subject: [PATCH 415/455] chore: introduce rustfmt.toml

Pull-Request: #5695.
---
 core/src/connection.rs                        |  22 +-
 core/src/either.rs                            |  17 +-
 core/src/lib.rs                               |  17 +-
 core/src/muxing.rs                            |  48 +-
 core/src/muxing/boxed.rs                      |  20 +-
 core/src/peer_record.rs                       |  21 +-
 core/src/signed_envelope.rs                   |  20 +-
 core/src/transport.rs                         |  28 +-
 core/src/transport/and_then.rs                |  15 +-
 core/src/transport/boxed.rs                   |   8 +-
 core/src/transport/choice.rs                  |  13 +-
 core/src/transport/dummy.rs                   |  13 +-
 core/src/transport/global_only.rs             |  47 +-
 core/src/transport/map.rs                     |  13 +-
 core/src/transport/map_err.rs                 |  10 +-
 core/src/transport/memory.rs                  |  24 +-
 core/src/transport/optional.rs                |   9 +-
 core/src/transport/timeout.rs                 |  16 +-
 core/src/transport/upgrade.rs                 |  38 +-
 core/src/upgrade.rs                           |   7 +-
 core/src/upgrade/apply.rs                     |  16 +-
 core/src/upgrade/denied.rs                    |   7 +-
 core/src/upgrade/either.rs                    |   8 +-
 core/src/upgrade/error.rs                     |   3 +-
 core/src/upgrade/pending.rs                   |   7 +-
 core/src/upgrade/ready.rs                     |  10 +-
 core/src/upgrade/select.rs                    |  16 +-
 core/tests/transport_upgrade.rs               |  11 +-
 examples/autonat/src/bin/autonat_client.rs    |  16 +-
 examples/autonat/src/bin/autonat_server.rs    |  15 +-
 examples/browser-webrtc/src/lib.rs            |   8 +-
 examples/browser-webrtc/src/main.rs           |  25 +-
 examples/chat/src/main.rs                     |  20 +-
 examples/dcutr/src/main.rs                    |   4 +-
 .../distributed-key-value-store/src/main.rs   |   9 +-
 examples/file-sharing/src/main.rs             |  11 +-
 examples/file-sharing/src/network.rs          |  23 +-
 examples/identify/src/main.rs                 |   3 +-
 examples/ipfs-kad/src/main.rs                 |  16 +-
 examples/ipfs-private/src/main.rs             |   3 +-
 examples/metrics/src/http_service.rs          |  16 +-
 examples/metrics/src/main.rs                  |  20 +-
 examples/ping/src/main.rs                     |   3 +-
 examples/relay-server/src/main.rs             |  10 +-
 examples/rendezvous/src/bin/rzv-discover.rs   |   4 +-
 examples/rendezvous/src/bin/rzv-identify.rs   |   3 +-
 examples/rendezvous/src/bin/rzv-register.rs   |   7 +-
 examples/rendezvous/src/main.rs               |   4 +-
 examples/stream/src/main.rs                   |  11 +-
 examples/upnp/src/main.rs                     |   3 +-
 hole-punching-tests/src/main.rs               |  23 +-
 identity/src/ecdsa.rs                         |  16 +-
 identity/src/ed25519.rs                       |  14 +-
 identity/src/error.rs                         |   3 +-
 identity/src/keypair.rs                       |  39 +-
 identity/src/peer_id.rs                       |   6 +-
 identity/src/rsa.rs                           |  20 +-
 identity/src/secp256k1.rs                     |   8 +-
 interop-tests/src/arch.rs                     |  27 +-
 interop-tests/src/bin/wasm_ping.rs            |  31 +-
 interop-tests/src/lib.rs                      |  13 +-
 libp2p/src/bandwidth.rs                       |  19 +-
 libp2p/src/builder.rs                         |  53 +-
 libp2p/src/builder/phase.rs                   |  11 +-
 libp2p/src/builder/phase/bandwidth_logging.rs |   7 +-
 libp2p/src/builder/phase/bandwidth_metrics.rs |   7 +-
 libp2p/src/builder/phase/behaviour.rs         |   7 +-
 libp2p/src/builder/phase/build.rs             |   6 +-
 libp2p/src/builder/phase/dns.rs               |   3 +-
 libp2p/src/builder/phase/identity.rs          |   3 +-
 libp2p/src/builder/phase/other_transport.rs   |  13 +-
 libp2p/src/builder/phase/provider.rs          |  16 +-
 libp2p/src/builder/phase/quic.rs              |   8 +-
 libp2p/src/builder/phase/relay.rs             |   3 +-
 libp2p/src/builder/phase/tcp.rs               |   8 +-
 libp2p/src/builder/phase/websocket.rs         |  12 +-
 libp2p/src/builder/select_muxer.rs            |  11 +-
 libp2p/src/builder/select_security.rs         |  12 +-
 libp2p/src/lib.rs                             |  30 +-
 libp2p/src/transport_ext.rs                   |  28 +-
 libp2p/src/tutorials/hole_punching.rs         |  21 +-
 libp2p/src/tutorials/ping.rs                  |  36 +-
 misc/allow-block-list/src/lib.rs              |  37 +-
 misc/connection-limits/src/lib.rs             |  43 +-
 misc/keygen/src/config.rs                     |   8 +-
 misc/keygen/src/main.rs                       |  13 +-
 misc/memory-connection-limits/src/lib.rs      |  42 +-
 .../tests/max_bytes.rs                        |   9 +-
 .../tests/max_percentage.rs                   |  12 +-
 .../tests/util/mod.rs                         |   6 +-
 misc/metrics/src/bandwidth.rs                 |  16 +-
 misc/metrics/src/dcutr.rs                     |   9 +-
 misc/metrics/src/gossipsub.rs                 |   3 +-
 misc/metrics/src/identify.rs                  |  22 +-
 misc/metrics/src/kad.rs                       |  14 +-
 misc/metrics/src/lib.rs                       |   2 +-
 misc/metrics/src/ping.rs                      |  14 +-
 misc/metrics/src/relay.rs                     |   9 +-
 misc/metrics/src/swarm.rs                     |  23 +-
 misc/multistream-select/src/dialer_select.rs  |  34 +-
 .../src/length_delimited.rs                   |  11 +-
 misc/multistream-select/src/lib.rs            |  17 +-
 .../multistream-select/src/listener_select.rs |  19 +-
 misc/multistream-select/src/negotiated.rs     |  35 +-
 misc/multistream-select/src/protocol.rs       |  19 +-
 misc/quick-protobuf-codec/src/lib.rs          |  13 +-
 .../tests/large_message.rs                    |   3 +-
 misc/quickcheck-ext/src/lib.rs                |   4 +-
 misc/rw-stream-sink/src/lib.rs                |  11 +-
 misc/server/src/behaviour.rs                  |  17 +-
 misc/server/src/config.rs                     |   4 +-
 misc/server/src/http_service.rs               |  16 +-
 misc/server/src/main.rs                       |  24 +-
 misc/webrtc-utils/src/fingerprint.rs          |   3 +-
 misc/webrtc-utils/src/noise.rs                |  12 +-
 misc/webrtc-utils/src/sdp.rs                  |  11 +-
 misc/webrtc-utils/src/stream.rs               |  29 +-
 misc/webrtc-utils/src/stream/drop_listener.rs |  23 +-
 misc/webrtc-utils/src/stream/framed_dc.rs     |   6 +-
 misc/webrtc-utils/src/stream/state.rs         |  15 +-
 misc/webrtc-utils/src/transport.rs            |   9 +-
 muxers/mplex/benches/split_send_size.rs       |  26 +-
 muxers/mplex/src/codec.rs                     |   7 +-
 muxers/mplex/src/config.rs                    |   3 +-
 muxers/mplex/src/io.rs                        |  51 +-
 muxers/mplex/src/lib.rs                       |  15 +-
 muxers/test-harness/src/lib.rs                |  36 +-
 muxers/yamux/src/lib.rs                       |  32 +-
 protocols/autonat/src/v1.rs                   |   3 +-
 protocols/autonat/src/v1/behaviour.rs         |  61 +-
 .../autonat/src/v1/behaviour/as_client.rs     |  21 +-
 .../autonat/src/v1/behaviour/as_server.rs     |  20 +-
 protocols/autonat/src/v1/protocol.rs          |  12 +-
 protocols/autonat/src/v2.rs                   |  12 +-
 protocols/autonat/src/v2/client.rs            |   3 +-
 protocols/autonat/src/v2/client/behaviour.rs  |  17 +-
 .../src/v2/client/handler/dial_back.rs        |   4 +-
 .../src/v2/client/handler/dial_request.rs     |  22 +-
 protocols/autonat/src/v2/protocol.rs          |  10 +-
 protocols/autonat/src/v2/server.rs            |   3 +-
 protocols/autonat/src/v2/server/behaviour.rs  |   9 +-
 .../src/v2/server/handler/dial_back.rs        |   3 +-
 protocols/autonat/tests/autonatv2.rs          |  14 +-
 protocols/autonat/tests/test_client.rs        |   6 +-
 protocols/autonat/tests/test_server.rs        |   9 +-
 protocols/dcutr/src/behaviour.rs              |  44 +-
 protocols/dcutr/src/handler/relayed.rs        |  33 +-
 protocols/dcutr/src/protocol/inbound.rs       |   6 +-
 protocols/dcutr/src/protocol/outbound.rs      |   7 +-
 protocols/dcutr/tests/lib.rs                  |  10 +-
 protocols/floodsub/src/layer.rs               |  38 +-
 protocols/floodsub/src/lib.rs                 |   8 +-
 protocols/floodsub/src/protocol.rs            |  10 +-
 protocols/gossipsub/src/backoff.rs            |  22 +-
 protocols/gossipsub/src/behaviour.rs          |  86 +--
 protocols/gossipsub/src/behaviour/tests.rs    | 688 +++++++++---------
 protocols/gossipsub/src/config.rs             |  46 +-
 protocols/gossipsub/src/error.rs              |   4 +-
 protocols/gossipsub/src/gossip_promises.rs    |   8 +-
 protocols/gossipsub/src/handler.rs            |  35 +-
 protocols/gossipsub/src/lib.rs                |  51 +-
 protocols/gossipsub/src/mcache.rs             |  17 +-
 protocols/gossipsub/src/metrics.rs            |  42 +-
 protocols/gossipsub/src/peer_score.rs         |  51 +-
 protocols/gossipsub/src/peer_score/params.rs  |  34 +-
 protocols/gossipsub/src/peer_score/tests.rs   |   7 +-
 protocols/gossipsub/src/protocol.rs           |  36 +-
 protocols/gossipsub/src/rpc.rs                |   3 +-
 protocols/gossipsub/src/rpc_proto.rs          |   4 +-
 .../gossipsub/src/subscription_filter.rs      |   8 +-
 protocols/gossipsub/src/time_cache.rs         |  19 +-
 protocols/gossipsub/src/topic.rs              |   6 +-
 protocols/gossipsub/src/types.rs              |  20 +-
 protocols/gossipsub/tests/smoke.rs            |   9 +-
 protocols/identify/src/behaviour.rs           |  47 +-
 protocols/identify/src/handler.rs             |  31 +-
 protocols/identify/src/lib.rs                 |  14 +-
 protocols/identify/src/protocol.rs            |  12 +-
 protocols/identify/tests/smoke.rs             |  15 +-
 protocols/kad/src/addresses.rs                |   3 +-
 protocols/kad/src/behaviour.rs                | 107 +--
 protocols/kad/src/behaviour/test.rs           |  25 +-
 protocols/kad/src/bootstrap.rs                |  50 +-
 protocols/kad/src/handler.rs                  |  38 +-
 protocols/kad/src/jobs.rs                     |  37 +-
 protocols/kad/src/kbucket.rs                  |  11 +-
 protocols/kad/src/kbucket/bucket.rs           |  24 +-
 protocols/kad/src/kbucket/entry.rs            |   1 -
 protocols/kad/src/kbucket/key.rs              |  19 +-
 protocols/kad/src/lib.rs                      |  26 +-
 protocols/kad/src/protocol.rs                 | 194 ++---
 protocols/kad/src/query.rs                    |  27 +-
 protocols/kad/src/query/peers.rs              |  13 +-
 protocols/kad/src/query/peers/closest.rs      |  24 +-
 .../kad/src/query/peers/closest/disjoint.rs   |  12 +-
 protocols/kad/src/query/peers/fixed.rs        |   5 +-
 protocols/kad/src/record.rs                   |  13 +-
 protocols/kad/src/record/store.rs             |  23 +-
 protocols/kad/src/record/store/memory.rs      |  16 +-
 protocols/kad/tests/client_mode.rs            |   7 +-
 protocols/mdns/src/behaviour.rs               |  56 +-
 protocols/mdns/src/behaviour/iface.rs         |  29 +-
 protocols/mdns/src/behaviour/iface/dns.rs     |  13 +-
 protocols/mdns/src/behaviour/iface/query.rs   |  21 +-
 protocols/mdns/src/behaviour/socket.rs        |  12 +-
 protocols/mdns/src/behaviour/timer.rs         |  16 +-
 protocols/mdns/src/lib.rs                     |  11 +-
 protocols/mdns/tests/use-async-std.rs         |   6 +-
 protocols/mdns/tests/use-tokio.rs             |   3 +-
 protocols/perf/src/bin/perf.rs                |  13 +-
 protocols/perf/src/client.rs                  |   6 +-
 protocols/perf/src/client/behaviour.rs        |   4 +-
 protocols/perf/src/client/handler.rs          |   6 +-
 protocols/perf/src/protocol.rs                |   4 +-
 protocols/perf/src/server/behaviour.rs        |   3 +-
 protocols/perf/src/server/handler.rs          |   6 +-
 protocols/ping/src/handler.rs                 |  33 +-
 protocols/ping/src/lib.rs                     |  28 +-
 protocols/ping/src/protocol.rs                |  14 +-
 protocols/ping/tests/ping.rs                  |   6 +-
 protocols/relay/src/behaviour.rs              |  39 +-
 protocols/relay/src/behaviour/handler.rs      |  38 +-
 protocols/relay/src/behaviour/rate_limiter.rs |  17 +-
 protocols/relay/src/copy_future.rs            |  37 +-
 protocols/relay/src/lib.rs                    |   4 +-
 protocols/relay/src/multiaddr_ext.rs          |   3 +-
 protocols/relay/src/priv_client.rs            |  45 +-
 protocols/relay/src/priv_client/handler.rs    |  40 +-
 protocols/relay/src/priv_client/transport.rs  |  53 +-
 protocols/relay/src/protocol.rs               |   6 +-
 protocols/relay/src/protocol/inbound_hop.rs   |   9 +-
 protocols/relay/src/protocol/inbound_stop.rs  |  10 +-
 protocols/relay/src/protocol/outbound_hop.rs  |  15 +-
 protocols/relay/src/protocol/outbound_stop.rs |   9 +-
 protocols/relay/tests/lib.rs                  |  30 +-
 protocols/rendezvous/src/client.rs            |  39 +-
 protocols/rendezvous/src/codec.rs             |  16 +-
 protocols/rendezvous/src/lib.rs               |   3 +-
 protocols/rendezvous/src/server.rs            |  36 +-
 protocols/rendezvous/tests/rendezvous.rs      |  17 +-
 protocols/request-response/src/cbor.rs        |  14 +-
 protocols/request-response/src/codec.rs       |   3 +-
 protocols/request-response/src/handler.rs     |  36 +-
 protocols/request-response/src/json.rs        |  16 +-
 protocols/request-response/src/lib.rs         |  31 +-
 .../request-response/tests/error_reporting.rs |   5 +-
 .../request-response/tests/peer_address.rs    |   3 +-
 protocols/request-response/tests/ping.rs      |   3 +-
 protocols/stream/src/control.rs               |  11 +-
 protocols/stream/src/handler.rs               |   3 +-
 protocols/stream/src/shared.rs                |   9 +-
 protocols/upnp/src/behaviour.rs               |   8 +-
 protocols/upnp/src/lib.rs                     |   1 -
 protocols/upnp/src/tokio.rs                   |   4 +-
 rustfmt.toml                                  |  10 +
 swarm-derive/src/lib.rs                       |   6 +-
 swarm-test/src/lib.rs                         | 101 ++-
 swarm/benches/connection_handler.rs           |   5 +-
 swarm/src/behaviour.rs                        | 133 ++--
 swarm/src/behaviour/either.rs                 |  15 +-
 swarm/src/behaviour/external_addresses.rs     |  10 +-
 swarm/src/behaviour/listen_addresses.rs       |   9 +-
 swarm/src/behaviour/peer_addresses.rs         |  13 +-
 swarm/src/behaviour/toggle.rs                 |  28 +-
 swarm/src/connection.rs                       | 127 ++--
 swarm/src/connection/error.rs                 |   5 +-
 swarm/src/connection/pool.rs                  |  61 +-
 swarm/src/connection/pool/concurrent_dial.rs  |  14 +-
 swarm/src/connection/pool/task.rs             |  17 +-
 swarm/src/connection/supported_protocols.rs   |   4 +-
 swarm/src/dial_opts.rs                        |  18 +-
 swarm/src/dummy.rs                            |  24 +-
 swarm/src/executor.rs                         |  11 +-
 swarm/src/handler.rs                          |  96 ++-
 swarm/src/handler/either.rs                   |  16 +-
 swarm/src/handler/map_in.rs                   |   7 +-
 swarm/src/handler/map_out.rs                  |  10 +-
 swarm/src/handler/multi.rs                    |  24 +-
 swarm/src/handler/one_shot.rs                 |  33 +-
 swarm/src/handler/pending.rs                  |  10 +-
 swarm/src/handler/select.rs                   |  19 +-
 swarm/src/lib.rs                              | 195 ++---
 swarm/src/listen_opts.rs                      |   3 +-
 swarm/src/stream.rs                           |   6 +-
 swarm/src/stream_protocol.rs                  |  13 +-
 swarm/src/test.rs                             |  35 +-
 swarm/src/upgrade.rs                          |   9 +-
 swarm/tests/connection_close.rs               |  18 +-
 swarm/tests/listener.rs                       |   1 -
 swarm/tests/swarm_derive.rs                   |  19 +-
 transports/dns/src/lib.rs                     |  65 +-
 transports/noise/src/io.rs                    |  10 +-
 transports/noise/src/io/framed.rs             |  17 +-
 transports/noise/src/io/handshake.rs          |  30 +-
 transports/noise/src/lib.rs                   |  33 +-
 transports/noise/src/protocol.rs              |   3 +-
 transports/noise/tests/smoke.rs               |  11 +-
 .../noise/tests/webtransport_certhashes.rs    |   3 +-
 transports/plaintext/src/error.rs             |   4 +-
 transports/plaintext/src/handshake.rs         |  12 +-
 transports/plaintext/src/lib.rs               |  21 +-
 transports/pnet/src/crypt_writer.rs           |   6 +-
 transports/pnet/src/lib.rs                    |  23 +-
 transports/pnet/tests/smoke.rs                |   7 +-
 transports/quic/src/config.rs                 |   3 +-
 transports/quic/src/connection.rs             |  14 +-
 transports/quic/src/connection/connecting.rs  |  13 +-
 transports/quic/src/hole_punching.rs          |  13 +-
 transports/quic/src/lib.rs                    |  12 +-
 transports/quic/src/provider.rs               |   8 +-
 transports/quic/src/provider/async_std.rs     |   3 +-
 transports/quic/src/provider/tokio.rs         |   3 +-
 transports/quic/src/transport.rs              |  56 +-
 transports/quic/tests/smoke.rs                |  47 +-
 transports/quic/tests/stream_compliance.rs    |  12 +-
 transports/tcp/src/lib.rs                     |  56 +-
 transports/tcp/src/provider.rs                |  17 +-
 transports/tcp/src/provider/async_io.rs       |  19 +-
 transports/tcp/src/provider/tokio.rs          |  21 +-
 transports/tls/src/certificate.rs             |  11 +-
 transports/tls/src/lib.rs                     |   8 +-
 transports/tls/src/upgrade.rs                 |  26 +-
 transports/tls/src/verifier.rs                |  18 +-
 transports/tls/tests/smoke.rs                 |   8 +-
 transports/uds/src/lib.rs                     |  23 +-
 transports/webrtc-websys/src/connection.rs    |  26 +-
 transports/webrtc-websys/src/lib.rs           |  10 +-
 transports/webrtc-websys/src/sdp.rs           |   3 +-
 transports/webrtc-websys/src/stream.rs        |  10 +-
 .../src/stream/poll_data_channel.rs           |  39 +-
 transports/webrtc-websys/src/transport.rs     |  23 +-
 transports/webrtc-websys/src/upgrade.rs       |  14 +-
 transports/webrtc/src/lib.rs                  |   9 +-
 transports/webrtc/src/tokio/certificate.rs    |   3 +-
 transports/webrtc/src/tokio/connection.rs     |  27 +-
 transports/webrtc/src/tokio/req_res_chan.rs   |  10 +-
 transports/webrtc/src/tokio/sdp.rs            |   6 +-
 transports/webrtc/src/tokio/stream.rs         |   4 +-
 transports/webrtc/src/tokio/transport.rs      |  27 +-
 transports/webrtc/src/tokio/udp_mux.rs        |  31 +-
 transports/webrtc/src/tokio/upgrade.rs        |  30 +-
 transports/webrtc/tests/smoke.rs              |  33 +-
 transports/websocket-websys/src/lib.rs        |  36 +-
 transports/websocket/src/error.rs             |   6 +-
 transports/websocket/src/framed.rs            |  27 +-
 transports/websocket/src/lib.rs               |  51 +-
 transports/websocket/src/quicksink.rs         |  11 +-
 transports/websocket/src/tls.rs               |   3 +-
 .../webtransport-websys/src/connection.rs     |  31 +-
 .../webtransport-websys/src/endpoint.rs       |  12 +-
 .../src/fused_js_promise.rs                   |   9 +-
 transports/webtransport-websys/src/lib.rs     |  10 +-
 transports/webtransport-websys/src/stream.rs  |  20 +-
 .../webtransport-websys/src/transport.rs      |  19 +-
 transports/webtransport-websys/src/utils.rs   |   5 +-
 wasm-tests/webtransport-tests/src/lib.rs      |  12 +-
 356 files changed, 4305 insertions(+), 3310 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/core/src/connection.rs b/core/src/connection.rs
index bb6639842c9..d46a6cf81e6 100644
--- a/core/src/connection.rs
+++ b/core/src/connection.rs
@@ -70,18 +70,16 @@ pub enum ConnectedPoint {
         ///
         /// - [`Endpoint::Dialer`] represents the default non-overriding option.
         ///
-        /// - [`Endpoint::Listener`] represents the overriding option.
-        ///   Realization depends on the transport protocol. E.g. in the case of
-        ///   TCP, both endpoints dial each other, resulting in a _simultaneous
-        ///   open_ TCP connection. On this new connection both endpoints assume
-        ///   to be the dialer of the connection. This is problematic during the
-        ///   connection upgrade process where an upgrade assumes one side to be
-        ///   the listener. With the help of this option, both peers can
-        ///   negotiate the roles (dialer and listener) for the new connection
-        ///   ahead of time, through some external channel, e.g. the DCUtR
-        ///   protocol, and thus have one peer dial the other and upgrade the
-        ///   connection as a dialer and one peer dial the other and upgrade the
-        ///   connection _as a listener_ overriding its role.
+        /// - [`Endpoint::Listener`] represents the overriding option. Realization depends on the
+        ///   transport protocol. E.g. in the case of TCP, both endpoints dial each other,
+        ///   resulting in a _simultaneous open_ TCP connection. On this new connection both
+        ///   endpoints assume to be the dialer of the connection. This is problematic during the
+        ///   connection upgrade process where an upgrade assumes one side to be the listener. With
+        ///   the help of this option, both peers can negotiate the roles (dialer and listener) for
+        ///   the new connection ahead of time, through some external channel, e.g. the DCUtR
+        ///   protocol, and thus have one peer dial the other and upgrade the connection as a
+        ///   dialer and one peer dial the other and upgrade the connection _as a listener_
+        ///   overriding its role.
         role_override: Endpoint,
         /// Whether the port for the outgoing connection was reused from a listener
         /// or a new port was allocated. This is useful for address translation.
diff --git a/core/src/either.rs b/core/src/either.rs
index 2593174290c..aa0340a46bf 100644
--- a/core/src/either.rs
+++ b/core/src/either.rs
@@ -18,17 +18,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::muxing::StreamMuxerEvent;
-use crate::transport::DialOpts;
-use crate::{
-    muxing::StreamMuxer,
-    transport::{ListenerId, Transport, TransportError, TransportEvent},
-    Multiaddr,
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
 };
+
 use either::Either;
 use futures::prelude::*;
 use pin_project::pin_project;
-use std::{pin::Pin, task::Context, task::Poll};
+
+use crate::{
+    muxing::{StreamMuxer, StreamMuxerEvent},
+    transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent},
+    Multiaddr,
+};
 
 impl<A, B> StreamMuxer for future::Either<A, B>
 where
diff --git a/core/src/lib.rs b/core/src/lib.rs
index ab5afbedae4..bbe42adc26a 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -22,14 +22,12 @@
 //!
 //! The main concepts of libp2p-core are:
 //!
-//! - The [`Transport`] trait defines how to reach a remote node or listen for
-//!   incoming remote connections. See the [`transport`] module.
-//! - The [`StreamMuxer`] trait is implemented on structs that hold a connection
-//!   to a remote and can subdivide this connection into multiple substreams.
-//!   See the [`muxing`] module.
-//! - The [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`] traits
-//!   define how to upgrade each individual substream to use a protocol.
-//!   See the `upgrade` module.
+//! - The [`Transport`] trait defines how to reach a remote node or listen for incoming remote
+//!   connections. See the [`transport`] module.
+//! - The [`StreamMuxer`] trait is implemented on structs that hold a connection to a remote and can
+//!   subdivide this connection into multiple substreams. See the [`muxing`] module.
+//! - The [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`] traits define how to upgrade
+//!   each individual substream to use a protocol. See the `upgrade` module.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
@@ -37,7 +35,8 @@ mod proto {
     #![allow(unreachable_pub)]
     include!("generated/mod.rs");
     pub use self::{
-        envelope_proto::*, peer_record_proto::mod_PeerRecord::*, peer_record_proto::PeerRecord,
+        envelope_proto::*,
+        peer_record_proto::{mod_PeerRecord::*, PeerRecord},
     };
 }
 
diff --git a/core/src/muxing.rs b/core/src/muxing.rs
index 477e1608073..60062f899f9 100644
--- a/core/src/muxing.rs
+++ b/core/src/muxing.rs
@@ -24,7 +24,7 @@
 //! has ownership of a connection, lets you open and close substreams.
 //!
 //! > **Note**: You normally don't need to use the methods of the `StreamMuxer` directly, as this
-//! >           is managed by the library's internals.
+//! > is managed by the library's internals.
 //!
 //! Each substream of a connection is an isolated stream of data. All the substreams are muxed
 //! together so that the data read from or written to each substream doesn't influence the other
@@ -36,9 +36,9 @@
 //! require maintaining long-lived channels of communication.
 //!
 //! > **Example**: The Kademlia protocol opens a new substream for each request it wants to
-//! >              perform. Multiple requests can be performed simultaneously by opening multiple
-//! >              substreams, without having to worry about associating responses with the
-//! >              right request.
+//! > perform. Multiple requests can be performed simultaneously by opening multiple
+//! > substreams, without having to worry about associating responses with the
+//! > right request.
 //!
 //! # Implementing a muxing protocol
 //!
@@ -50,21 +50,23 @@
 //! The upgrade process will take ownership of the connection, which makes it possible for the
 //! implementation of `StreamMuxer` to control everything that happens on the wire.
 
-use futures::{task::Context, task::Poll, AsyncRead, AsyncWrite};
+use std::{future::Future, pin::Pin};
+
+use futures::{
+    task::{Context, Poll},
+    AsyncRead, AsyncWrite,
+};
 use multiaddr::Multiaddr;
-use std::future::Future;
-use std::pin::Pin;
 
-pub use self::boxed::StreamMuxerBox;
-pub use self::boxed::SubstreamBox;
+pub use self::boxed::{StreamMuxerBox, SubstreamBox};
 
 mod boxed;
 
 /// Provides multiplexing for a connection by allowing users to open substreams.
 ///
-/// A substream created by a [`StreamMuxer`] is a type that implements [`AsyncRead`] and [`AsyncWrite`].
-/// The [`StreamMuxer`] itself is modelled closely after [`AsyncWrite`]. It features `poll`-style
-/// functions that allow the implementation to make progress on various tasks.
+/// A substream created by a [`StreamMuxer`] is a type that implements [`AsyncRead`] and
+/// [`AsyncWrite`]. The [`StreamMuxer`] itself is modelled closely after [`AsyncWrite`]. It features
+/// `poll`-style functions that allow the implementation to make progress on various tasks.
 pub trait StreamMuxer {
     /// Type of the object that represents the raw substream where data can be read and written.
     type Substream: AsyncRead + AsyncWrite;
@@ -90,13 +92,13 @@ pub trait StreamMuxer {
 
     /// Poll to close this [`StreamMuxer`].
     ///
-    /// After this has returned `Poll::Ready(Ok(()))`, the muxer has become useless and may be safely
-    /// dropped.
+    /// After this has returned `Poll::Ready(Ok(()))`, the muxer has become useless and may be
+    /// safely dropped.
     ///
     /// > **Note**: You are encouraged to call this method and wait for it to return `Ready`, so
-    /// >           that the remote is properly informed of the shutdown. However, apart from
-    /// >           properly informing the remote, there is no difference between this and
-    /// >           immediately dropping the muxer.
+    /// > that the remote is properly informed of the shutdown. However, apart from
+    /// > properly informing the remote, there is no difference between this and
+    /// > immediately dropping the muxer.
     fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>>;
 
     /// Poll to allow the underlying connection to make progress.
@@ -120,7 +122,8 @@ pub enum StreamMuxerEvent {
 
 /// Extension trait for [`StreamMuxer`].
 pub trait StreamMuxerExt: StreamMuxer + Sized {
-    /// Convenience function for calling [`StreamMuxer::poll_inbound`] for [`StreamMuxer`]s that are `Unpin`.
+    /// Convenience function for calling [`StreamMuxer::poll_inbound`]
+    /// for [`StreamMuxer`]s that are `Unpin`.
     fn poll_inbound_unpin(
         &mut self,
         cx: &mut Context<'_>,
@@ -131,7 +134,8 @@ pub trait StreamMuxerExt: StreamMuxer + Sized {
         Pin::new(self).poll_inbound(cx)
     }
 
-    /// Convenience function for calling [`StreamMuxer::poll_outbound`] for [`StreamMuxer`]s that are `Unpin`.
+    /// Convenience function for calling [`StreamMuxer::poll_outbound`]
+    /// for [`StreamMuxer`]s that are `Unpin`.
     fn poll_outbound_unpin(
         &mut self,
         cx: &mut Context<'_>,
@@ -142,7 +146,8 @@ pub trait StreamMuxerExt: StreamMuxer + Sized {
         Pin::new(self).poll_outbound(cx)
     }
 
-    /// Convenience function for calling [`StreamMuxer::poll`] for [`StreamMuxer`]s that are `Unpin`.
+    /// Convenience function for calling [`StreamMuxer::poll`]
+    /// for [`StreamMuxer`]s that are `Unpin`.
     fn poll_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<StreamMuxerEvent, Self::Error>>
     where
         Self: Unpin,
@@ -150,7 +155,8 @@ pub trait StreamMuxerExt: StreamMuxer + Sized {
         Pin::new(self).poll(cx)
     }
 
-    /// Convenience function for calling [`StreamMuxer::poll_close`] for [`StreamMuxer`]s that are `Unpin`.
+    /// Convenience function for calling [`StreamMuxer::poll_close`]
+    /// for [`StreamMuxer`]s that are `Unpin`.
     fn poll_close_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>>
     where
         Self: Unpin,
diff --git a/core/src/muxing/boxed.rs b/core/src/muxing/boxed.rs
index e909fb9fbf1..8e76c32b73e 100644
--- a/core/src/muxing/boxed.rs
+++ b/core/src/muxing/boxed.rs
@@ -1,12 +1,15 @@
-use crate::muxing::{StreamMuxer, StreamMuxerEvent};
+use std::{
+    error::Error,
+    fmt, io,
+    io::{IoSlice, IoSliceMut},
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{AsyncRead, AsyncWrite};
 use pin_project::pin_project;
-use std::error::Error;
-use std::fmt;
-use std::io;
-use std::io::{IoSlice, IoSliceMut};
-use std::pin::Pin;
-use std::task::{Context, Poll};
+
+use crate::muxing::{StreamMuxer, StreamMuxerEvent};
 
 /// Abstract `StreamMuxer`.
 pub struct StreamMuxerBox {
@@ -139,7 +142,8 @@ impl StreamMuxer for StreamMuxerBox {
 }
 
 impl SubstreamBox {
-    /// Construct a new [`SubstreamBox`] from something that implements [`AsyncRead`] and [`AsyncWrite`].
+    /// Construct a new [`SubstreamBox`] from something
+    /// that implements [`AsyncRead`] and [`AsyncWrite`].
     pub fn new<S: AsyncRead + AsyncWrite + Send + 'static>(stream: S) -> Self {
         Self(Box::pin(stream))
     }
diff --git a/core/src/peer_record.rs b/core/src/peer_record.rs
index ac488338cc6..9c6b7f73f05 100644
--- a/core/src/peer_record.rs
+++ b/core/src/peer_record.rs
@@ -1,18 +1,16 @@
-use crate::signed_envelope::SignedEnvelope;
-use crate::{proto, signed_envelope, DecodeError, Multiaddr};
-use libp2p_identity::Keypair;
-use libp2p_identity::PeerId;
-use libp2p_identity::SigningError;
+use libp2p_identity::{Keypair, PeerId, SigningError};
 use quick_protobuf::{BytesReader, Writer};
 use web_time::SystemTime;
 
+use crate::{proto, signed_envelope, signed_envelope::SignedEnvelope, DecodeError, Multiaddr};
+
 const PAYLOAD_TYPE: &str = "/libp2p/routing-state-record";
 const DOMAIN_SEP: &str = "libp2p-routing-state";
 
 /// Represents a peer routing record.
 ///
-/// Peer records are designed to be distributable and carry a signature by being wrapped in a signed envelope.
-/// For more information see RFC0003 of the libp2p specifications: <https://github.com/libp2p/specs/blob/master/RFC/0003-routing-records.md>
+/// Peer records are designed to be distributable and carry a signature by being wrapped in a signed
+/// envelope. For more information see RFC0003 of the libp2p specifications: <https://github.com/libp2p/specs/blob/master/RFC/0003-routing-records.md>
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct PeerRecord {
     peer_id: PeerId,
@@ -21,14 +19,16 @@ pub struct PeerRecord {
 
     /// A signed envelope representing this [`PeerRecord`].
     ///
-    /// If this [`PeerRecord`] was constructed from a [`SignedEnvelope`], this is the original instance.
+    /// If this [`PeerRecord`] was constructed from a [`SignedEnvelope`], this is the original
+    /// instance.
     envelope: SignedEnvelope,
 }
 
 impl PeerRecord {
     /// Attempt to re-construct a [`PeerRecord`] from a [`SignedEnvelope`].
     ///
-    /// If this function succeeds, the [`SignedEnvelope`] contained a peer record with a valid signature and can hence be considered authenticated.
+    /// If this function succeeds, the [`SignedEnvelope`] contained a peer record with a valid
+    /// signature and can hence be considered authenticated.
     pub fn from_signed_envelope(envelope: SignedEnvelope) -> Result<Self, FromEnvelopeError> {
         use quick_protobuf::MessageRead;
 
@@ -60,7 +60,8 @@ impl PeerRecord {
 
     /// Construct a new [`PeerRecord`] by authenticating the provided addresses with the given key.
     ///
-    /// This is the same key that is used for authenticating every libp2p connection of your application, i.e. what you use when setting up your [`crate::transport::Transport`].
+    /// This is the same key that is used for authenticating every libp2p connection of your
+    /// application, i.e. what you use when setting up your [`crate::transport::Transport`].
     pub fn new(key: &Keypair, addresses: Vec<Multiaddr>) -> Result<Self, SigningError> {
         use quick_protobuf::MessageWrite;
 
diff --git a/core/src/signed_envelope.rs b/core/src/signed_envelope.rs
index 19a0cac4f82..754d6ec204d 100644
--- a/core/src/signed_envelope.rs
+++ b/core/src/signed_envelope.rs
@@ -1,11 +1,13 @@
-use crate::{proto, DecodeError};
-use libp2p_identity::SigningError;
-use libp2p_identity::{Keypair, PublicKey};
-use quick_protobuf::{BytesReader, Writer};
 use std::fmt;
+
+use libp2p_identity::{Keypair, PublicKey, SigningError};
+use quick_protobuf::{BytesReader, Writer};
 use unsigned_varint::encode::usize_buffer;
 
-/// A signed envelope contains an arbitrary byte string payload, a signature of the payload, and the public key that can be used to verify the signature.
+use crate::{proto, DecodeError};
+
+/// A signed envelope contains an arbitrary byte string payload, a signature of the payload, and the
+/// public key that can be used to verify the signature.
 ///
 /// For more details see libp2p RFC0002: <https://github.com/libp2p/specs/blob/master/RFC/0002-signed-envelopes.md>
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -46,8 +48,9 @@ impl SignedEnvelope {
 
     /// Extract the payload and signing key of this [`SignedEnvelope`].
     ///
-    /// You must provide the correct domain-separation string and expected payload type in order to get the payload.
-    /// This guards against accidental mis-use of the payload where the signature was created for a different purpose or payload type.
+    /// You must provide the correct domain-separation string and expected payload type in order to
+    /// get the payload. This guards against accidental mis-use of the payload where the
+    /// signature was created for a different purpose or payload type.
     ///
     /// It is the caller's responsibility to check that the signing key is what
     /// is expected. For example, checking that the signing key is from a
@@ -156,7 +159,8 @@ pub enum DecodingError {
 /// Errors that occur whilst extracting the payload of a [`SignedEnvelope`].
 #[derive(Debug)]
 pub enum ReadPayloadError {
-    /// The signature on the signed envelope does not verify with the provided domain separation string.
+    /// The signature on the signed envelope does not verify
+    /// with the provided domain separation string.
     InvalidSignature,
     /// The payload contained in the envelope is not of the expected type.
     UnexpectedPayloadType { expected: Vec<u8>, got: Vec<u8> },
diff --git a/core/src/transport.rs b/core/src/transport.rs
index 28ce2dbf650..ecd332f28cc 100644
--- a/core/src/transport.rs
+++ b/core/src/transport.rs
@@ -25,8 +25,6 @@
 //! any desired protocols. The rest of the module defines combinators for
 //! modifying a transport through composition with other transports or protocol upgrades.
 
-use futures::prelude::*;
-use multiaddr::Multiaddr;
 use std::{
     error::Error,
     fmt,
@@ -35,6 +33,9 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::prelude::*;
+use multiaddr::Multiaddr;
+
 pub mod and_then;
 pub mod choice;
 pub mod dummy;
@@ -48,14 +49,12 @@ pub mod upgrade;
 mod boxed;
 mod optional;
 
+pub use self::{
+    boxed::Boxed, choice::OrTransport, memory::MemoryTransport, optional::OptionalTransport,
+    upgrade::Upgrade,
+};
 use crate::{ConnectedPoint, Endpoint};
 
-pub use self::boxed::Boxed;
-pub use self::choice::OrTransport;
-pub use self::memory::MemoryTransport;
-pub use self::optional::OptionalTransport;
-pub use self::upgrade::Upgrade;
-
 static NEXT_LISTENER_ID: AtomicUsize = AtomicUsize::new(1);
 
 /// The port use policy for a new connection.
@@ -75,8 +74,9 @@ pub enum PortUse {
 pub struct DialOpts {
     /// The endpoint establishing a new connection.
     ///
-    /// When attempting a hole-punch, both parties simultaneously "dial" each other but one party has to be the "listener" on the final connection.
-    /// This option specifies the role of this node in the final connection.
+    /// When attempting a hole-punch, both parties simultaneously "dial" each other but one party
+    /// has to be the "listener" on the final connection. This option specifies the role of
+    /// this node in the final connection.
     pub role: Endpoint,
     /// The port use policy for a new connection.
     pub port_use: PortUse,
@@ -161,10 +161,10 @@ pub trait Transport {
 
     /// Poll for [`TransportEvent`]s.
     ///
-    /// A [`TransportEvent::Incoming`] should be produced whenever a connection is received at the lowest
-    /// level of the transport stack. The item must be a [`ListenerUpgrade`](Transport::ListenerUpgrade)
-    /// future that resolves to an [`Output`](Transport::Output) value once all protocol upgrades have
-    /// been applied.
+    /// A [`TransportEvent::Incoming`] should be produced whenever a connection is received at the
+    /// lowest level of the transport stack. The item must be a
+    /// [`ListenerUpgrade`](Transport::ListenerUpgrade) future that resolves to an
+    /// [`Output`](Transport::Output) value once all protocol upgrades have been applied.
     ///
     /// Transports are expected to produce [`TransportEvent::Incoming`] events only for
     /// listen addresses which have previously been announced via
diff --git a/core/src/transport/and_then.rs b/core/src/transport/and_then.rs
index e85703f77fb..5d2b7d91553 100644
--- a/core/src/transport/and_then.rs
+++ b/core/src/transport/and_then.rs
@@ -18,14 +18,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{
-    connection::ConnectedPoint,
-    transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent},
+use std::{
+    error,
+    marker::PhantomPinned,
+    pin::Pin,
+    task::{Context, Poll},
 };
+
 use either::Either;
 use futures::prelude::*;
 use multiaddr::Multiaddr;
-use std::{error, marker::PhantomPinned, pin::Pin, task::Context, task::Poll};
+
+use crate::{
+    connection::ConnectedPoint,
+    transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent},
+};
 
 /// See the [`Transport::and_then`] method.
 #[pin_project::pin_project]
diff --git a/core/src/transport/boxed.rs b/core/src/transport/boxed.rs
index 596ab262221..6894d9876aa 100644
--- a/core/src/transport/boxed.rs
+++ b/core/src/transport/boxed.rs
@@ -18,9 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
-use futures::{prelude::*, stream::FusedStream};
-use multiaddr::Multiaddr;
 use std::{
     error::Error,
     fmt, io,
@@ -28,6 +25,11 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::{prelude::*, stream::FusedStream};
+use multiaddr::Multiaddr;
+
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
+
 /// Creates a new [`Boxed`] transport from the given transport.
 pub(crate) fn boxed<T>(transport: T) -> Boxed<T::Output>
 where
diff --git a/core/src/transport/choice.rs b/core/src/transport/choice.rs
index 4339f6bba71..251091f2008 100644
--- a/core/src/transport/choice.rs
+++ b/core/src/transport/choice.rs
@@ -18,12 +18,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::either::EitherFuture;
-use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use either::Either;
 use futures::future;
 use multiaddr::Multiaddr;
-use std::{pin::Pin, task::Context, task::Poll};
+
+use crate::{
+    either::EitherFuture,
+    transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent},
+};
 
 /// Struct returned by `or_transport()`.
 #[derive(Debug, Copy, Clone)]
diff --git a/core/src/transport/dummy.rs b/core/src/transport/dummy.rs
index 72558d34a79..85c5815fd37 100644
--- a/core/src/transport/dummy.rs
+++ b/core/src/transport/dummy.rs
@@ -18,11 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
-use crate::Multiaddr;
-use futures::{prelude::*, task::Context, task::Poll};
 use std::{fmt, io, marker::PhantomData, pin::Pin};
 
+use futures::{
+    prelude::*,
+    task::{Context, Poll},
+};
+
+use crate::{
+    transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent},
+    Multiaddr,
+};
+
 /// Implementation of `Transport` that doesn't support any multiaddr.
 ///
 /// Useful for testing purposes, or as a fallback implementation when no protocol is available.
diff --git a/core/src/transport/global_only.rs b/core/src/transport/global_only.rs
index 83774f37004..00df6457412 100644
--- a/core/src/transport/global_only.rs
+++ b/core/src/transport/global_only.rs
@@ -18,15 +18,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{
-    multiaddr::{Multiaddr, Protocol},
-    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
-};
 use std::{
     pin::Pin,
     task::{Context, Poll},
 };
 
+use crate::{
+    multiaddr::{Multiaddr, Protocol},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
+};
+
 /// Dropping all dial requests to non-global IP addresses.
 #[derive(Debug, Clone, Default)]
 pub struct Transport<T> {
@@ -104,7 +105,8 @@ mod ipv4_global {
 
     /// Returns [`true`] if the address appears to be globally reachable
     /// as specified by the [IANA IPv4 Special-Purpose Address Registry].
-    /// Whether or not an address is practically reachable will depend on your network configuration.
+    /// Whether or not an address is practically reachable will depend on your network
+    /// configuration.
     ///
     /// Most IPv4 addresses are globally reachable;
     /// unless they are specifically defined as *not* globally reachable.
@@ -121,7 +123,8 @@ mod ipv4_global {
     /// - Reserved addresses ([`is_reserved`](Ipv4Addr::is_reserved))
     /// - The [broadcast address] ([`is_broadcast`](Ipv4Addr::is_broadcast))
     ///
-    /// For the complete overview of which addresses are globally reachable, see the table at the [IANA IPv4 Special-Purpose Address Registry].
+    /// For the complete overview of which addresses are globally reachable, see the table at the
+    /// [IANA IPv4 Special-Purpose Address Registry].
     ///
     /// [IANA IPv4 Special-Purpose Address Registry]: https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
     /// [unspecified address]: Ipv4Addr::UNSPECIFIED
@@ -154,9 +157,10 @@ mod ipv6_global {
     /// Returns `true` if the address is a unicast address with link-local scope,
     /// as defined in [RFC 4291].
     ///
-    /// A unicast address has link-local scope if it has the prefix `fe80::/10`, as per [RFC 4291 section 2.4].
-    /// Note that this encompasses more addresses than those defined in [RFC 4291 section 2.5.6],
-    /// which describes "Link-Local IPv6 Unicast Addresses" as having the following stricter format:
+    /// A unicast address has link-local scope if it has the prefix `fe80::/10`, as per [RFC 4291
+    /// section 2.4]. Note that this encompasses more addresses than those defined in [RFC 4291
+    /// section 2.5.6], which describes "Link-Local IPv6 Unicast Addresses" as having the
+    /// following stricter format:
     ///
     /// ```text
     /// | 10 bits  |         54 bits         |          64 bits           |
@@ -164,12 +168,14 @@ mod ipv6_global {
     /// |1111111010|           0             |       interface ID         |
     /// +----------+-------------------------+----------------------------+
     /// ```
-    /// So while currently the only addresses with link-local scope an application will encounter are all in `fe80::/64`,
-    /// this might change in the future with the publication of new standards. More addresses in `fe80::/10` could be allocated,
-    /// and those addresses will have link-local scope.
+    /// So while currently the only addresses with link-local scope an application will encounter
+    /// are all in `fe80::/64`, this might change in the future with the publication of new
+    /// standards. More addresses in `fe80::/10` could be allocated, and those addresses will
+    /// have link-local scope.
     ///
-    /// Also note that while [RFC 4291 section 2.5.3] mentions about the [loopback address] (`::1`) that "it is treated as having Link-Local scope",
-    /// this does not mean that the loopback address actually has link-local scope and this method will return `false` on it.
+    /// Also note that while [RFC 4291 section 2.5.3] mentions about the [loopback address] (`::1`)
+    /// that "it is treated as having Link-Local scope", this does not mean that the loopback
+    /// address actually has link-local scope and this method will return `false` on it.
     ///
     /// [RFC 4291]: https://tools.ietf.org/html/rfc4291
     /// [RFC 4291 section 2.4]: https://tools.ietf.org/html/rfc4291#section-2.4
@@ -207,7 +213,8 @@ mod ipv6_global {
 
     /// Returns [`true`] if the address appears to be globally reachable
     /// as specified by the [IANA IPv6 Special-Purpose Address Registry].
-    /// Whether or not an address is practically reachable will depend on your network configuration.
+    /// Whether or not an address is practically reachable will depend on your network
+    /// configuration.
     ///
     /// Most IPv6 addresses are globally reachable;
     /// unless they are specifically defined as *not* globally reachable.
@@ -219,13 +226,15 @@ mod ipv6_global {
     /// - Addresses reserved for benchmarking
     /// - Addresses reserved for documentation ([`is_documentation`](Ipv6Addr::is_documentation))
     /// - Unique local addresses ([`is_unique_local`](Ipv6Addr::is_unique_local))
-    /// - Unicast addresses with link-local scope ([`is_unicast_link_local`](Ipv6Addr::is_unicast_link_local))
+    /// - Unicast addresses with link-local scope
+    ///   ([`is_unicast_link_local`](Ipv6Addr::is_unicast_link_local))
     ///
-    /// For the complete overview of which addresses are globally reachable, see the table at the [IANA IPv6 Special-Purpose Address Registry].
+    /// For the complete overview of which addresses are globally reachable, see the table at the
+    /// [IANA IPv6 Special-Purpose Address Registry].
     ///
     /// Note that an address having global scope is not the same as being globally reachable,
-    /// and there is no direct relation between the two concepts: There exist addresses with global scope
-    /// that are not globally reachable (for example unique local addresses),
+    /// and there is no direct relation between the two concepts: There exist addresses with global
+    /// scope that are not globally reachable (for example unique local addresses),
     /// and addresses that are globally reachable without having global scope
     /// (multicast addresses with non-global scope).
     ///
diff --git a/core/src/transport/map.rs b/core/src/transport/map.rs
index 9aab84ba8b1..4f6910b141f 100644
--- a/core/src/transport/map.rs
+++ b/core/src/transport/map.rs
@@ -18,16 +18,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::DialOpts;
-use crate::{
-    connection::ConnectedPoint,
-    transport::{Transport, TransportError, TransportEvent},
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
 };
+
 use futures::prelude::*;
 use multiaddr::Multiaddr;
-use std::{pin::Pin, task::Context, task::Poll};
 
 use super::ListenerId;
+use crate::{
+    connection::ConnectedPoint,
+    transport::{DialOpts, Transport, TransportError, TransportEvent},
+};
 
 /// See `Transport::map`.
 #[derive(Debug, Copy, Clone)]
diff --git a/core/src/transport/map_err.rs b/core/src/transport/map_err.rs
index 5d44af9af2e..f47f5713225 100644
--- a/core/src/transport/map_err.rs
+++ b/core/src/transport/map_err.rs
@@ -18,10 +18,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
+use std::{
+    error,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::prelude::*;
 use multiaddr::Multiaddr;
-use std::{error, pin::Pin, task::Context, task::Poll};
+
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 
 /// See `Transport::map_err`.
 #[derive(Debug, Copy, Clone)]
diff --git a/core/src/transport/memory.rs b/core/src/transport/memory.rs
index 85680265e8b..19197ddf714 100644
--- a/core/src/transport/memory.rs
+++ b/core/src/transport/memory.rs
@@ -18,13 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
-use fnv::FnvHashMap;
-use futures::{channel::mpsc, future::Ready, prelude::*, task::Context, task::Poll};
-use multiaddr::{Multiaddr, Protocol};
-use once_cell::sync::Lazy;
-use parking_lot::Mutex;
-use rw_stream_sink::RwStreamSink;
 use std::{
     collections::{hash_map::Entry, VecDeque},
     error, fmt, io,
@@ -32,6 +25,20 @@ use std::{
     pin::Pin,
 };
 
+use fnv::FnvHashMap;
+use futures::{
+    channel::mpsc,
+    future::Ready,
+    prelude::*,
+    task::{Context, Poll},
+};
+use multiaddr::{Multiaddr, Protocol};
+use once_cell::sync::Lazy;
+use parking_lot::Mutex;
+use rw_stream_sink::RwStreamSink;
+
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
+
 static HUB: Lazy<Hub> = Lazy::new(|| Hub(Mutex::new(FnvHashMap::default())));
 
 struct Hub(Mutex<FnvHashMap<NonZeroU64, ChannelSender>>);
@@ -398,9 +405,8 @@ impl<T> Drop for Chan<T> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{transport::PortUse, Endpoint};
-
     use super::*;
+    use crate::{transport::PortUse, Endpoint};
 
     #[test]
     fn parse_memory_addr_works() {
diff --git a/core/src/transport/optional.rs b/core/src/transport/optional.rs
index f18bfa441b0..262f84f3095 100644
--- a/core/src/transport/optional.rs
+++ b/core/src/transport/optional.rs
@@ -18,9 +18,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use multiaddr::Multiaddr;
-use std::{pin::Pin, task::Context, task::Poll};
+
+use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 
 /// Transport that is possibly disabled.
 ///
diff --git a/core/src/transport/timeout.rs b/core/src/transport/timeout.rs
index 830ed099629..ce494216279 100644
--- a/core/src/transport/timeout.rs
+++ b/core/src/transport/timeout.rs
@@ -24,14 +24,20 @@
 //! underlying `Transport`.
 // TODO: add example
 
-use crate::transport::DialOpts;
-use crate::{
-    transport::{ListenerId, TransportError, TransportEvent},
-    Multiaddr, Transport,
+use std::{
+    error, fmt, io,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
 };
+
 use futures::prelude::*;
 use futures_timer::Delay;
-use std::{error, fmt, io, pin::Pin, task::Context, task::Poll, time::Duration};
+
+use crate::{
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
+    Multiaddr, Transport,
+};
 
 /// A `TransportTimeout` is a `Transport` that wraps another `Transport` and adds
 /// timeouts to all inbound and outbound connection attempts.
diff --git a/core/src/transport/upgrade.rs b/core/src/transport/upgrade.rs
index 66b9e7509af..480c2710020 100644
--- a/core/src/transport/upgrade.rs
+++ b/core/src/transport/upgrade.rs
@@ -20,15 +20,25 @@
 
 //! Configuration of transport protocol upgrades.
 
-pub use crate::upgrade::Version;
+use std::{
+    error::Error,
+    fmt,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{prelude::*, ready};
+use libp2p_identity::PeerId;
+use multiaddr::Multiaddr;
 
-use crate::transport::DialOpts;
+pub use crate::upgrade::Version;
 use crate::{
     connection::ConnectedPoint,
     muxing::{StreamMuxer, StreamMuxerBox},
     transport::{
-        and_then::AndThen, boxed::boxed, timeout::TransportTimeout, ListenerId, Transport,
-        TransportError, TransportEvent,
+        and_then::AndThen, boxed::boxed, timeout::TransportTimeout, DialOpts, ListenerId,
+        Transport, TransportError, TransportEvent,
     },
     upgrade::{
         self, apply_inbound, apply_outbound, InboundConnectionUpgrade, InboundUpgradeApply,
@@ -36,16 +46,6 @@ use crate::{
     },
     Negotiated,
 };
-use futures::{prelude::*, ready};
-use libp2p_identity::PeerId;
-use multiaddr::Multiaddr;
-use std::{
-    error::Error,
-    fmt,
-    pin::Pin,
-    task::{Context, Poll},
-    time::Duration,
-};
 
 /// A `Builder` facilitates upgrading of a [`Transport`] for use with
 /// a `Swarm`.
@@ -59,13 +59,13 @@ use std::{
 /// It thus enforces the following invariants on every transport
 /// obtained from [`multiplex`](Authenticated::multiplex):
 ///
-///   1. The transport must be [authenticated](Builder::authenticate)
-///      and [multiplexed](Authenticated::multiplex).
+///   1. The transport must be [authenticated](Builder::authenticate) and
+///      [multiplexed](Authenticated::multiplex).
 ///   2. Authentication must precede the negotiation of a multiplexer.
 ///   3. Applying a multiplexer is the last step in the upgrade process.
-///   4. The [`Transport::Output`] conforms to the requirements of a `Swarm`,
-///      namely a tuple of a [`PeerId`] (from the authentication upgrade) and a
-///      [`StreamMuxer`] (from the multiplexing upgrade).
+///   4. The [`Transport::Output`] conforms to the requirements of a `Swarm`, namely a tuple of a
+///      [`PeerId`] (from the authentication upgrade) and a [`StreamMuxer`] (from the multiplexing
+///      upgrade).
 #[derive(Clone)]
 pub struct Builder<T> {
     inner: T,
diff --git a/core/src/upgrade.rs b/core/src/upgrade.rs
index 7a1fd3724d0..93039705938 100644
--- a/core/src/upgrade.rs
+++ b/core/src/upgrade.rs
@@ -29,8 +29,8 @@
 //! connection or substream.
 //!
 //! > **Note**: Multiple versions of the same protocol are treated as different protocols.
-//! >           For example, `/foo/1.0.0` and `/foo/1.1.0` are totally unrelated as far as
-//! >           upgrading is concerned.
+//! > For example, `/foo/1.0.0` and `/foo/1.1.0` are totally unrelated as far as
+//! > upgrading is concerned.
 //!
 //! # Upgrade process
 //!
@@ -55,7 +55,6 @@
 //! > connection or substream. However if you use the recommended `Swarm` or
 //! > `ConnectionHandler` APIs, the upgrade is automatically handled for you and you don't
 //! > need to use these methods.
-//!
 
 mod apply;
 mod denied;
@@ -70,12 +69,12 @@ pub(crate) use apply::{
 };
 pub(crate) use error::UpgradeError;
 use futures::future::Future;
+pub use multistream_select::{NegotiatedComplete, NegotiationError, ProtocolError, Version};
 
 pub use self::{
     denied::DeniedUpgrade, pending::PendingUpgrade, ready::ReadyUpgrade, select::SelectUpgrade,
 };
 pub use crate::Negotiated;
-pub use multistream_select::{NegotiatedComplete, NegotiationError, ProtocolError, Version};
 
 /// Common trait for upgrades that can be applied on inbound substreams, outbound substreams,
 /// or both.
diff --git a/core/src/upgrade/apply.rs b/core/src/upgrade/apply.rs
index f84aaaac9fa..9e090267b0c 100644
--- a/core/src/upgrade/apply.rs
+++ b/core/src/upgrade/apply.rs
@@ -18,13 +18,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeError};
-use crate::{connection::ConnectedPoint, Negotiated};
+use std::{
+    mem,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{future::Either, prelude::*};
+pub(crate) use multistream_select::Version;
 use multistream_select::{DialerSelectFuture, ListenerSelectFuture};
-use std::{mem, pin::Pin, task::Context, task::Poll};
 
-pub(crate) use multistream_select::Version;
+use crate::{
+    connection::ConnectedPoint,
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeError},
+    Negotiated,
+};
 
 // TODO: Still needed?
 /// Applies an upgrade to the inbound and outbound direction of a connection or substream.
diff --git a/core/src/upgrade/denied.rs b/core/src/upgrade/denied.rs
index 568bbfb056d..9bea6fb023b 100644
--- a/core/src/upgrade/denied.rs
+++ b/core/src/upgrade/denied.rs
@@ -18,10 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
+use std::{convert::Infallible, iter};
+
 use futures::future;
-use std::convert::Infallible;
-use std::iter;
+
+use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 
 /// Dummy implementation of `UpgradeInfo`/`InboundUpgrade`/`OutboundUpgrade` that doesn't support
 /// any protocol.
diff --git a/core/src/upgrade/either.rs b/core/src/upgrade/either.rs
index db62f8d6558..9970dcb0b1d 100644
--- a/core/src/upgrade/either.rs
+++ b/core/src/upgrade/either.rs
@@ -18,13 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::iter::Map;
+
+use either::Either;
+use futures::future;
+
 use crate::{
     either::EitherFuture,
     upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo},
 };
-use either::Either;
-use futures::future;
-use std::iter::Map;
 
 impl<A, B> UpgradeInfo for Either<A, B>
 where
diff --git a/core/src/upgrade/error.rs b/core/src/upgrade/error.rs
index 3d349587c2c..c81ed7cf75b 100644
--- a/core/src/upgrade/error.rs
+++ b/core/src/upgrade/error.rs
@@ -18,9 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use multistream_select::NegotiationError;
 use std::fmt;
 
+use multistream_select::NegotiationError;
+
 /// Error that can happen when upgrading a connection or substream to use a protocol.
 #[derive(Debug)]
 pub enum UpgradeError<E> {
diff --git a/core/src/upgrade/pending.rs b/core/src/upgrade/pending.rs
index 5e3c65422f1..60a9fb9aba1 100644
--- a/core/src/upgrade/pending.rs
+++ b/core/src/upgrade/pending.rs
@@ -19,10 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
+use std::{convert::Infallible, iter};
+
 use futures::future;
-use std::convert::Infallible;
-use std::iter;
+
+use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 
 /// Implementation of [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`] that always
 /// returns a pending upgrade.
diff --git a/core/src/upgrade/ready.rs b/core/src/upgrade/ready.rs
index 13270aa8b6d..22708d726e7 100644
--- a/core/src/upgrade/ready.rs
+++ b/core/src/upgrade/ready.rs
@@ -19,12 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
+use std::{convert::Infallible, iter};
+
 use futures::future;
-use std::convert::Infallible;
-use std::iter;
 
-/// Implementation of [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`] that directly yields the substream.
+use crate::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
+
+/// Implementation of [`UpgradeInfo`], [`InboundUpgrade`] and [`OutboundUpgrade`]
+/// that directly yields the substream.
 #[derive(Debug, Copy, Clone)]
 pub struct ReadyUpgrade<P> {
     protocol_name: P,
diff --git a/core/src/upgrade/select.rs b/core/src/upgrade/select.rs
index 037045a2f29..b7fe4a53a7f 100644
--- a/core/src/upgrade/select.rs
+++ b/core/src/upgrade/select.rs
@@ -18,14 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::either::EitherFuture;
-use crate::upgrade::{
-    InboundConnectionUpgrade, InboundUpgrade, OutboundConnectionUpgrade, OutboundUpgrade,
-    UpgradeInfo,
-};
+use std::iter::{Chain, Map};
+
 use either::Either;
 use futures::future;
-use std::iter::{Chain, Map};
+
+use crate::{
+    either::EitherFuture,
+    upgrade::{
+        InboundConnectionUpgrade, InboundUpgrade, OutboundConnectionUpgrade, OutboundUpgrade,
+        UpgradeInfo,
+    },
+};
 
 /// Upgrade that combines two upgrades into one. Supports all the protocols supported by either
 /// sub-upgrade.
diff --git a/core/tests/transport_upgrade.rs b/core/tests/transport_upgrade.rs
index d8bec6f2b59..b9733e38322 100644
--- a/core/tests/transport_upgrade.rs
+++ b/core/tests/transport_upgrade.rs
@@ -18,18 +18,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{io, pin::Pin};
+
 use futures::prelude::*;
-use libp2p_core::transport::{DialOpts, ListenerId, MemoryTransport, PortUse, Transport};
-use libp2p_core::upgrade::{
-    self, InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo,
+use libp2p_core::{
+    transport::{DialOpts, ListenerId, MemoryTransport, PortUse, Transport},
+    upgrade::{self, InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo},
+    Endpoint,
 };
-use libp2p_core::Endpoint;
 use libp2p_identity as identity;
 use libp2p_mplex::MplexConfig;
 use libp2p_noise as noise;
 use multiaddr::{Multiaddr, Protocol};
 use rand::random;
-use std::{io, pin::Pin};
 
 #[derive(Clone)]
 struct HelloUpgrade {}
diff --git a/examples/autonat/src/bin/autonat_client.rs b/examples/autonat/src/bin/autonat_client.rs
index def66c4823b..80d7039eccb 100644
--- a/examples/autonat/src/bin/autonat_client.rs
+++ b/examples/autonat/src/bin/autonat_client.rs
@@ -20,15 +20,17 @@
 
 #![doc = include_str!("../../README.md")]
 
+use std::{error::Error, net::Ipv4Addr, time::Duration};
+
 use clap::Parser;
 use futures::StreamExt;
-use libp2p::core::multiaddr::Protocol;
-use libp2p::core::Multiaddr;
-use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
-use libp2p::{autonat, identify, identity, noise, tcp, yamux, PeerId};
-use std::error::Error;
-use std::net::Ipv4Addr;
-use std::time::Duration;
+use libp2p::{
+    autonat,
+    core::{multiaddr::Protocol, Multiaddr},
+    identify, identity, noise,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    tcp, yamux, PeerId,
+};
 use tracing_subscriber::EnvFilter;
 
 #[derive(Debug, Parser)]
diff --git a/examples/autonat/src/bin/autonat_server.rs b/examples/autonat/src/bin/autonat_server.rs
index 389cc0fa26f..83e456d8fda 100644
--- a/examples/autonat/src/bin/autonat_server.rs
+++ b/examples/autonat/src/bin/autonat_server.rs
@@ -20,14 +20,17 @@
 
 #![doc = include_str!("../../README.md")]
 
+use std::{error::Error, net::Ipv4Addr, time::Duration};
+
 use clap::Parser;
 use futures::StreamExt;
-use libp2p::core::{multiaddr::Protocol, Multiaddr};
-use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
-use libp2p::{autonat, identify, identity, noise, tcp, yamux};
-use std::error::Error;
-use std::net::Ipv4Addr;
-use std::time::Duration;
+use libp2p::{
+    autonat,
+    core::{multiaddr::Protocol, Multiaddr},
+    identify, identity, noise,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    tcp, yamux,
+};
 use tracing_subscriber::EnvFilter;
 
 #[derive(Debug, Parser)]
diff --git a/examples/browser-webrtc/src/lib.rs b/examples/browser-webrtc/src/lib.rs
index 9499ccbd158..e2d884cb445 100644
--- a/examples/browser-webrtc/src/lib.rs
+++ b/examples/browser-webrtc/src/lib.rs
@@ -1,13 +1,11 @@
 #![cfg(target_arch = "wasm32")]
 
+use std::{io, time::Duration};
+
 use futures::StreamExt;
 use js_sys::Date;
-use libp2p::core::Multiaddr;
-use libp2p::ping;
-use libp2p::swarm::SwarmEvent;
+use libp2p::{core::Multiaddr, ping, swarm::SwarmEvent};
 use libp2p_webrtc_websys as webrtc_websys;
-use std::io;
-use std::time::Duration;
 use wasm_bindgen::prelude::*;
 use web_sys::{Document, HtmlElement};
 
diff --git a/examples/browser-webrtc/src/main.rs b/examples/browser-webrtc/src/main.rs
index 7f06b0d0d99..ec6be0c066d 100644
--- a/examples/browser-webrtc/src/main.rs
+++ b/examples/browser-webrtc/src/main.rs
@@ -1,23 +1,27 @@
 #![allow(non_upper_case_globals)]
 
+use std::{
+    net::{Ipv4Addr, SocketAddr},
+    time::Duration,
+};
+
 use anyhow::Result;
-use axum::extract::{Path, State};
-use axum::http::header::CONTENT_TYPE;
-use axum::http::StatusCode;
-use axum::response::{Html, IntoResponse};
-use axum::{http::Method, routing::get, Router};
+use axum::{
+    extract::{Path, State},
+    http::{header::CONTENT_TYPE, Method, StatusCode},
+    response::{Html, IntoResponse},
+    routing::get,
+    Router,
+};
 use futures::StreamExt;
 use libp2p::{
-    core::muxing::StreamMuxerBox,
-    core::Transport,
+    core::{muxing::StreamMuxerBox, Transport},
     multiaddr::{Multiaddr, Protocol},
     ping,
     swarm::SwarmEvent,
 };
 use libp2p_webrtc as webrtc;
 use rand::thread_rng;
-use std::net::{Ipv4Addr, SocketAddr};
-use std::time::Duration;
 use tokio::net::TcpListener;
 use tower_http::cors::{Any, CorsLayer};
 
@@ -127,7 +131,8 @@ struct Libp2pEndpoint(Multiaddr);
 /// Serves the index.html file for our client.
 ///
 /// Our server listens on a random UDP port for the WebRTC transport.
-/// To allow the client to connect, we replace the `__LIBP2P_ENDPOINT__` placeholder with the actual address.
+/// To allow the client to connect, we replace the `__LIBP2P_ENDPOINT__`
+/// placeholder with the actual address.
 async fn get_index(
     State(Libp2pEndpoint(libp2p_endpoint)): State<Libp2pEndpoint>,
 ) -> Result<Html<String>, StatusCode> {
diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs
index c785d301c2f..cda1e90bd35 100644
--- a/examples/chat/src/main.rs
+++ b/examples/chat/src/main.rs
@@ -20,12 +20,19 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{
+    collections::hash_map::DefaultHasher,
+    error::Error,
+    hash::{Hash, Hasher},
+    time::Duration,
+};
+
 use futures::stream::StreamExt;
-use libp2p::{gossipsub, mdns, noise, swarm::NetworkBehaviour, swarm::SwarmEvent, tcp, yamux};
-use std::collections::hash_map::DefaultHasher;
-use std::error::Error;
-use std::hash::{Hash, Hasher};
-use std::time::Duration;
+use libp2p::{
+    gossipsub, mdns, noise,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    tcp, yamux,
+};
 use tokio::{io, io::AsyncBufReadExt, select};
 use tracing_subscriber::EnvFilter;
 
@@ -61,7 +68,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
             // Set a custom gossipsub configuration
             let gossipsub_config = gossipsub::ConfigBuilder::default()
                 .heartbeat_interval(Duration::from_secs(10)) // This is set to aid debugging by not cluttering the log space
-                .validation_mode(gossipsub::ValidationMode::Strict) // This sets the kind of message validation. The default is Strict (enforce message signing)
+                .validation_mode(gossipsub::ValidationMode::Strict) // This sets the kind of message validation. The default is Strict (enforce message
+                // signing)
                 .message_id_fn(message_id_fn) // content-address messages. No two messages of the same content will be propagated.
                 .build()
                 .map_err(|msg| io::Error::new(io::ErrorKind::Other, msg))?; // Temporary hack because `build` does not return a proper `std::error::Error`.
diff --git a/examples/dcutr/src/main.rs b/examples/dcutr/src/main.rs
index 630d4b2b1f3..0ec1f2a321a 100644
--- a/examples/dcutr/src/main.rs
+++ b/examples/dcutr/src/main.rs
@@ -20,6 +20,8 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{error::Error, str::FromStr, time::Duration};
+
 use clap::Parser;
 use futures::{executor::block_on, future::FutureExt, stream::StreamExt};
 use libp2p::{
@@ -28,8 +30,6 @@ use libp2p::{
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux, PeerId,
 };
-use std::str::FromStr;
-use std::{error::Error, time::Duration};
 use tracing_subscriber::EnvFilter;
 
 #[derive(Debug, Parser)]
diff --git a/examples/distributed-key-value-store/src/main.rs b/examples/distributed-key-value-store/src/main.rs
index 6b7947b7eb3..63944f2e9bd 100644
--- a/examples/distributed-key-value-store/src/main.rs
+++ b/examples/distributed-key-value-store/src/main.rs
@@ -20,17 +20,16 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{error::Error, time::Duration};
+
 use futures::stream::StreamExt;
-use libp2p::kad;
-use libp2p::kad::store::MemoryStore;
-use libp2p::kad::Mode;
 use libp2p::{
+    kad,
+    kad::{store::MemoryStore, Mode},
     mdns, noise,
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux,
 };
-use std::error::Error;
-use std::time::Duration;
 use tokio::{
     io::{self, AsyncBufReadExt},
     select,
diff --git a/examples/file-sharing/src/main.rs b/examples/file-sharing/src/main.rs
index 5f6be83dc11..1e3b80a330c 100644
--- a/examples/file-sharing/src/main.rs
+++ b/examples/file-sharing/src/main.rs
@@ -22,15 +22,12 @@
 
 mod network;
 
-use clap::Parser;
-use tokio::task::spawn;
+use std::{error::Error, io::Write, path::PathBuf};
 
-use futures::prelude::*;
-use futures::StreamExt;
+use clap::Parser;
+use futures::{prelude::*, StreamExt};
 use libp2p::{core::Multiaddr, multiaddr::Protocol};
-use std::error::Error;
-use std::io::Write;
-use std::path::PathBuf;
+use tokio::task::spawn;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/examples/file-sharing/src/network.rs b/examples/file-sharing/src/network.rs
index a74afd1c0da..409255ee9ec 100644
--- a/examples/file-sharing/src/network.rs
+++ b/examples/file-sharing/src/network.rs
@@ -1,7 +1,14 @@
-use futures::channel::{mpsc, oneshot};
-use futures::prelude::*;
-use futures::StreamExt;
+use std::{
+    collections::{hash_map, HashMap, HashSet},
+    error::Error,
+    time::Duration,
+};
 
+use futures::{
+    channel::{mpsc, oneshot},
+    prelude::*,
+    StreamExt,
+};
 use libp2p::{
     core::Multiaddr,
     identity, kad,
@@ -9,19 +16,13 @@ use libp2p::{
     noise,
     request_response::{self, OutboundRequestId, ProtocolSupport, ResponseChannel},
     swarm::{NetworkBehaviour, Swarm, SwarmEvent},
-    tcp, yamux, PeerId,
+    tcp, yamux, PeerId, StreamProtocol,
 };
-
-use libp2p::StreamProtocol;
 use serde::{Deserialize, Serialize};
-use std::collections::{hash_map, HashMap, HashSet};
-use std::error::Error;
-use std::time::Duration;
 
 /// Creates the network components, namely:
 ///
-/// - The network client to interact with the network layer from anywhere
-///   within your application.
+/// - The network client to interact with the network layer from anywhere within your application.
 ///
 /// - The network event stream, e.g. for incoming requests.
 ///
diff --git a/examples/identify/src/main.rs b/examples/identify/src/main.rs
index 22474061da6..55d093c0399 100644
--- a/examples/identify/src/main.rs
+++ b/examples/identify/src/main.rs
@@ -20,9 +20,10 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{error::Error, time::Duration};
+
 use futures::StreamExt;
 use libp2p::{core::multiaddr::Multiaddr, identify, noise, swarm::SwarmEvent, tcp, yamux};
-use std::{error::Error, time::Duration};
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/examples/ipfs-kad/src/main.rs b/examples/ipfs-kad/src/main.rs
index 95921d6fa35..c2df603fcc2 100644
--- a/examples/ipfs-kad/src/main.rs
+++ b/examples/ipfs-kad/src/main.rs
@@ -20,15 +20,21 @@
 
 #![doc = include_str!("../README.md")]
 
-use std::num::NonZeroUsize;
-use std::ops::Add;
-use std::time::{Duration, Instant};
+use std::{
+    num::NonZeroUsize,
+    ops::Add,
+    time::{Duration, Instant},
+};
 
 use anyhow::{bail, Result};
 use clap::Parser;
 use futures::StreamExt;
-use libp2p::swarm::{StreamProtocol, SwarmEvent};
-use libp2p::{bytes::BufMut, identity, kad, noise, tcp, yamux, PeerId};
+use libp2p::{
+    bytes::BufMut,
+    identity, kad, noise,
+    swarm::{StreamProtocol, SwarmEvent},
+    tcp, yamux, PeerId,
+};
 use tracing_subscriber::EnvFilter;
 
 const BOOTNODES: [&str; 4] = [
diff --git a/examples/ipfs-private/src/main.rs b/examples/ipfs-private/src/main.rs
index a57bfd465e0..19d38c767e9 100644
--- a/examples/ipfs-private/src/main.rs
+++ b/examples/ipfs-private/src/main.rs
@@ -20,6 +20,8 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{env, error::Error, fs, path::Path, str::FromStr, time::Duration};
+
 use either::Either;
 use futures::prelude::*;
 use libp2p::{
@@ -31,7 +33,6 @@ use libp2p::{
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux, Multiaddr, Transport,
 };
-use std::{env, error::Error, fs, path::Path, str::FromStr, time::Duration};
 use tokio::{io, io::AsyncBufReadExt, select};
 use tracing_subscriber::EnvFilter;
 
diff --git a/examples/metrics/src/http_service.rs b/examples/metrics/src/http_service.rs
index 4a9c9785bb3..f1485832d86 100644
--- a/examples/metrics/src/http_service.rs
+++ b/examples/metrics/src/http_service.rs
@@ -18,15 +18,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use axum::extract::State;
-use axum::http::StatusCode;
-use axum::response::IntoResponse;
-use axum::routing::get;
-use axum::Router;
-use prometheus_client::encoding::text::encode;
-use prometheus_client::registry::Registry;
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex};
+use std::{
+    net::SocketAddr,
+    sync::{Arc, Mutex},
+};
+
+use axum::{extract::State, http::StatusCode, response::IntoResponse, routing::get, Router};
+use prometheus_client::{encoding::text::encode, registry::Registry};
 use tokio::net::TcpListener;
 
 const METRICS_CONTENT_TYPE: &str = "application/openmetrics-text;charset=utf-8;version=1.0.0";
diff --git a/examples/metrics/src/main.rs b/examples/metrics/src/main.rs
index 1755c769053..92aa90479fd 100644
--- a/examples/metrics/src/main.rs
+++ b/examples/metrics/src/main.rs
@@ -20,18 +20,20 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{error::Error, time::Duration};
+
 use futures::StreamExt;
-use libp2p::core::Multiaddr;
-use libp2p::metrics::{Metrics, Recorder};
-use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
-use libp2p::{identify, identity, noise, ping, tcp, yamux};
+use libp2p::{
+    core::Multiaddr,
+    identify, identity,
+    metrics::{Metrics, Recorder},
+    noise, ping,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    tcp, yamux,
+};
 use opentelemetry::{trace::TracerProvider, KeyValue};
 use prometheus_client::registry::Registry;
-use std::error::Error;
-use std::time::Duration;
-use tracing_subscriber::layer::SubscriberExt;
-use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::{EnvFilter, Layer};
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 
 mod http_service;
 
diff --git a/examples/ping/src/main.rs b/examples/ping/src/main.rs
index 911b0384f89..565ef057c0d 100644
--- a/examples/ping/src/main.rs
+++ b/examples/ping/src/main.rs
@@ -20,9 +20,10 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{error::Error, time::Duration};
+
 use futures::prelude::*;
 use libp2p::{noise, ping, swarm::SwarmEvent, tcp, yamux, Multiaddr};
-use std::{error::Error, time::Duration};
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/examples/relay-server/src/main.rs b/examples/relay-server/src/main.rs
index 46a122d0717..b7868418fb0 100644
--- a/examples/relay-server/src/main.rs
+++ b/examples/relay-server/src/main.rs
@@ -21,17 +21,19 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{
+    error::Error,
+    net::{Ipv4Addr, Ipv6Addr},
+};
+
 use clap::Parser;
 use futures::StreamExt;
 use libp2p::{
-    core::multiaddr::Protocol,
-    core::Multiaddr,
+    core::{multiaddr::Protocol, Multiaddr},
     identify, identity, noise, ping, relay,
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux,
 };
-use std::error::Error;
-use std::net::{Ipv4Addr, Ipv6Addr};
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/examples/rendezvous/src/bin/rzv-discover.rs b/examples/rendezvous/src/bin/rzv-discover.rs
index edd3d10a0ce..b133c82d158 100644
--- a/examples/rendezvous/src/bin/rzv-discover.rs
+++ b/examples/rendezvous/src/bin/rzv-discover.rs
@@ -18,6 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{error::Error, time::Duration};
+
 use futures::StreamExt;
 use libp2p::{
     multiaddr::Protocol,
@@ -25,8 +27,6 @@ use libp2p::{
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux, Multiaddr,
 };
-use std::error::Error;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 const NAMESPACE: &str = "rendezvous";
diff --git a/examples/rendezvous/src/bin/rzv-identify.rs b/examples/rendezvous/src/bin/rzv-identify.rs
index ff637aa6f49..ce4933a29a9 100644
--- a/examples/rendezvous/src/bin/rzv-identify.rs
+++ b/examples/rendezvous/src/bin/rzv-identify.rs
@@ -18,13 +18,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::time::Duration;
+
 use futures::StreamExt;
 use libp2p::{
     identify, noise, ping, rendezvous,
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux, Multiaddr,
 };
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/examples/rendezvous/src/bin/rzv-register.rs b/examples/rendezvous/src/bin/rzv-register.rs
index bd848238d4a..8ef2d30c880 100644
--- a/examples/rendezvous/src/bin/rzv-register.rs
+++ b/examples/rendezvous/src/bin/rzv-register.rs
@@ -18,13 +18,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::time::Duration;
+
 use futures::StreamExt;
 use libp2p::{
     noise, ping, rendezvous,
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux, Multiaddr,
 };
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
@@ -54,8 +55,8 @@ async fn main() {
         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(5)))
         .build();
 
-    // In production the external address should be the publicly facing IP address of the rendezvous point.
-    // This address is recorded in the registration entry by the rendezvous point.
+    // In production the external address should be the publicly facing IP address of the rendezvous
+    // point. This address is recorded in the registration entry by the rendezvous point.
     let external_address = "/ip4/127.0.0.1/tcp/0".parse::<Multiaddr>().unwrap();
     swarm.add_external_address(external_address);
 
diff --git a/examples/rendezvous/src/main.rs b/examples/rendezvous/src/main.rs
index a15bc1ca2d3..0f26f2c9934 100644
--- a/examples/rendezvous/src/main.rs
+++ b/examples/rendezvous/src/main.rs
@@ -20,14 +20,14 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::{error::Error, time::Duration};
+
 use futures::StreamExt;
 use libp2p::{
     identify, noise, ping, rendezvous,
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux,
 };
-use std::error::Error;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/examples/stream/src/main.rs b/examples/stream/src/main.rs
index 872ab8c3b98..71d2d2fcc76 100644
--- a/examples/stream/src/main.rs
+++ b/examples/stream/src/main.rs
@@ -44,12 +44,14 @@ async fn main() -> Result<()> {
     // Deal with incoming streams.
     // Spawning a dedicated task is just one way of doing this.
     // libp2p doesn't care how you handle incoming streams but you _must_ handle them somehow.
-    // To mitigate DoS attacks, libp2p will internally drop incoming streams if your application cannot keep up processing them.
+    // To mitigate DoS attacks, libp2p will internally drop incoming streams if your application
+    // cannot keep up processing them.
     tokio::spawn(async move {
         // This loop handles incoming streams _sequentially_ but that doesn't have to be the case.
         // You can also spawn a dedicated task per stream if you want to.
-        // Be aware that this breaks backpressure though as spawning new tasks is equivalent to an unbounded buffer.
-        // Each task needs memory meaning an aggressive remote peer may force you OOM this way.
+        // Be aware that this breaks backpressure though as spawning new tasks is equivalent to an
+        // unbounded buffer. Each task needs memory meaning an aggressive remote peer may
+        // force you OOM this way.
 
         while let Some((peer, stream)) = incoming_streams.next().await {
             match echo(stream).await {
@@ -102,7 +104,8 @@ async fn connection_handler(peer: PeerId, mut control: stream::Control) {
             }
             Err(error) => {
                 // Other errors may be temporary.
-                // In production, something like an exponential backoff / circuit-breaker may be more appropriate.
+                // In production, something like an exponential backoff / circuit-breaker may be
+                // more appropriate.
                 tracing::debug!(%peer, %error);
                 continue;
             }
diff --git a/examples/upnp/src/main.rs b/examples/upnp/src/main.rs
index fd0764990d1..19de8d773ae 100644
--- a/examples/upnp/src/main.rs
+++ b/examples/upnp/src/main.rs
@@ -20,9 +20,10 @@
 
 #![doc = include_str!("../README.md")]
 
+use std::error::Error;
+
 use futures::prelude::*;
 use libp2p::{noise, swarm::SwarmEvent, upnp, yamux, Multiaddr};
-use std::error::Error;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
diff --git a/hole-punching-tests/src/main.rs b/hole-punching-tests/src/main.rs
index 02229e16262..bc5a1bae4f5 100644
--- a/hole-punching-tests/src/main.rs
+++ b/hole-punching-tests/src/main.rs
@@ -18,24 +18,27 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    collections::HashMap,
+    fmt, io,
+    net::{IpAddr, Ipv4Addr},
+    str::FromStr,
+    time::Duration,
+};
+
 use anyhow::{Context, Result};
 use either::Either;
 use futures::stream::StreamExt;
-use libp2p::core::transport::ListenerId;
-use libp2p::swarm::dial_opts::DialOpts;
-use libp2p::swarm::ConnectionId;
 use libp2p::{
-    core::multiaddr::{Multiaddr, Protocol},
+    core::{
+        multiaddr::{Multiaddr, Protocol},
+        transport::ListenerId,
+    },
     dcutr, identify, noise, ping, relay,
-    swarm::{NetworkBehaviour, SwarmEvent},
+    swarm::{dial_opts::DialOpts, ConnectionId, NetworkBehaviour, SwarmEvent},
     tcp, yamux, Swarm,
 };
 use redis::AsyncCommands;
-use std::collections::HashMap;
-use std::net::{IpAddr, Ipv4Addr};
-use std::str::FromStr;
-use std::time::Duration;
-use std::{fmt, io};
 
 /// The redis key we push the relay's TCP listen address to.
 const RELAY_TCP_ADDRESS: &str = "RELAY_TCP_ADDRESS";
diff --git a/identity/src/ecdsa.rs b/identity/src/ecdsa.rs
index 922675097df..11cdaced795 100644
--- a/identity/src/ecdsa.rs
+++ b/identity/src/ecdsa.rs
@@ -20,10 +20,9 @@
 
 //! ECDSA keys with secp256r1 curve support.
 
-use super::error::DecodingError;
-use core::cmp;
-use core::fmt;
-use core::hash;
+use core::{cmp, fmt, hash};
+use std::convert::Infallible;
+
 use p256::{
     ecdsa::{
         signature::{Signer, Verifier},
@@ -32,9 +31,10 @@ use p256::{
     EncodedPoint,
 };
 use sec1::{DecodeEcPrivateKey, EncodeEcPrivateKey};
-use std::convert::Infallible;
 use zeroize::Zeroize;
 
+use super::error::DecodingError;
+
 /// An ECDSA keypair generated using `secp256r1` curve.
 #[derive(Clone)]
 pub struct Keypair {
@@ -158,7 +158,8 @@ impl PublicKey {
         self.0.verify(msg, &sig).is_ok()
     }
 
-    /// Try to parse a public key from a byte buffer containing raw components of a key with or without compression.
+    /// Try to parse a public key from a byte buffer containing raw
+    /// components of a key with or without compression.
     pub fn try_from_bytes(k: &[u8]) -> Result<PublicKey, DecodingError> {
         let enc_pt = EncodedPoint::from_bytes(k)
             .map_err(|e| DecodingError::failed_to_parse("ecdsa p256 encoded point", e))?;
@@ -168,7 +169,8 @@ impl PublicKey {
             .map(PublicKey)
     }
 
-    /// Convert a public key into a byte buffer containing raw components of the key without compression.
+    /// Convert a public key into a byte buffer containing
+    /// raw components of the key without compression.
     pub fn to_bytes(&self) -> Vec<u8> {
         self.0.to_encoded_point(false).as_bytes().to_owned()
     }
diff --git a/identity/src/ed25519.rs b/identity/src/ed25519.rs
index d77c44547d6..5a1a53dd4af 100644
--- a/identity/src/ed25519.rs
+++ b/identity/src/ed25519.rs
@@ -20,13 +20,13 @@
 
 //! Ed25519 keys.
 
-use super::error::DecodingError;
-use core::cmp;
-use core::fmt;
-use core::hash;
+use core::{cmp, fmt, hash};
+
 use ed25519_dalek::{self as ed25519, Signer as _, Verifier as _};
 use zeroize::Zeroize;
 
+use super::error::DecodingError;
+
 /// An Ed25519 keypair.
 #[derive(Clone)]
 pub struct Keypair(ed25519::SigningKey);
@@ -152,7 +152,8 @@ impl PublicKey {
         self.0.to_bytes()
     }
 
-    /// Try to parse a public key from a byte array containing the actual key as produced by `to_bytes`.
+    /// Try to parse a public key from a byte array containing
+    /// the actual key as produced by `to_bytes`.
     pub fn try_from_bytes(k: &[u8]) -> Result<PublicKey, DecodingError> {
         let k = <[u8; 32]>::try_from(k)
             .map_err(|e| DecodingError::failed_to_parse("Ed25519 public key", e))?;
@@ -206,9 +207,10 @@ impl SecretKey {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use quickcheck::*;
 
+    use super::*;
+
     fn eq_keypairs(kp1: &Keypair, kp2: &Keypair) -> bool {
         kp1.public() == kp2.public() && kp1.0.to_bytes() == kp2.0.to_bytes()
     }
diff --git a/identity/src/error.rs b/identity/src/error.rs
index 71cd78fe1ea..6e8c4d02caa 100644
--- a/identity/src/error.rs
+++ b/identity/src/error.rs
@@ -20,8 +20,7 @@
 
 //! Errors during identity key operations.
 
-use std::error::Error;
-use std::fmt;
+use std::{error::Error, fmt};
 
 use crate::KeyType;
 
diff --git a/identity/src/keypair.rs b/identity/src/keypair.rs
index f1e8a7c2142..a1bbba00fa9 100644
--- a/identity/src/keypair.rs
+++ b/identity/src/keypair.rs
@@ -24,40 +24,40 @@
     feature = "ed25519",
     feature = "rsa"
 ))]
-#[cfg(feature = "ed25519")]
-use crate::ed25519;
+use quick_protobuf::{BytesReader, Writer};
+
+#[cfg(feature = "ecdsa")]
+use crate::ecdsa;
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
     feature = "ed25519",
     feature = "rsa"
 ))]
-use crate::error::OtherVariantError;
-use crate::error::{DecodingError, SigningError};
+#[cfg(feature = "ed25519")]
+use crate::ed25519;
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
     feature = "ed25519",
     feature = "rsa"
 ))]
-use crate::proto;
+use crate::error::OtherVariantError;
 #[cfg(any(
     feature = "ecdsa",
     feature = "secp256k1",
     feature = "ed25519",
     feature = "rsa"
 ))]
-use quick_protobuf::{BytesReader, Writer};
-
+use crate::proto;
 #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
 use crate::rsa;
-
 #[cfg(feature = "secp256k1")]
 use crate::secp256k1;
-
-#[cfg(feature = "ecdsa")]
-use crate::ecdsa;
-use crate::KeyType;
+use crate::{
+    error::{DecodingError, SigningError},
+    KeyType,
+};
 
 /// Identity keypair of a node.
 ///
@@ -75,7 +75,6 @@ use crate::KeyType;
 /// let mut bytes = std::fs::read("private.pk8").unwrap();
 /// let keypair = Keypair::rsa_from_pkcs8(&mut bytes);
 /// ```
-///
 #[derive(Debug, Clone)]
 pub struct Keypair {
     keypair: KeyPairInner,
@@ -341,7 +340,8 @@ impl Keypair {
         }
     }
 
-    /// Deterministically derive a new secret from this [`Keypair`], taking into account the provided domain.
+    /// Deterministically derive a new secret from this [`Keypair`],
+    /// taking into account the provided domain.
     ///
     /// This works for all key types except RSA where it returns `None`.
     ///
@@ -352,10 +352,11 @@ impl Keypair {
     /// # use libp2p_identity as identity;
     /// let key = identity::Keypair::generate_ed25519();
     ///
-    /// let new_key = key.derive_secret(b"my encryption key").expect("can derive secret for ed25519");
+    /// let new_key = key
+    ///     .derive_secret(b"my encryption key")
+    ///     .expect("can derive secret for ed25519");
     /// # }
     /// ```
-    ///
     #[cfg(any(
         feature = "ecdsa",
         feature = "secp256k1",
@@ -904,9 +905,10 @@ mod tests {
 
     #[test]
     fn public_key_implements_hash() {
-        use crate::PublicKey;
         use std::hash::Hash;
 
+        use crate::PublicKey;
+
         fn assert_implements_hash<T: Hash>() {}
 
         assert_implements_hash::<PublicKey>();
@@ -914,9 +916,10 @@ mod tests {
 
     #[test]
     fn public_key_implements_ord() {
-        use crate::PublicKey;
         use std::cmp::Ord;
 
+        use crate::PublicKey;
+
         fn assert_implements_ord<T: Ord>() {}
 
         assert_implements_ord::<PublicKey>();
diff --git a/identity/src/peer_id.rs b/identity/src/peer_id.rs
index 8ae6d99ae32..7f6d1f44eab 100644
--- a/identity/src/peer_id.rs
+++ b/identity/src/peer_id.rs
@@ -18,17 +18,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{fmt, str::FromStr};
+
 #[cfg(feature = "rand")]
 use rand::Rng;
 use sha2::Digest as _;
-use std::{fmt, str::FromStr};
 use thiserror::Error;
 
 /// Local type-alias for multihash.
 ///
 /// Must be big enough to accommodate for `MAX_INLINE_KEY_LENGTH`.
 /// 64 satisfies that and can hold 512 bit hashes which is what the ecosystem typically uses.
-/// Given that this appears in our type-signature, using a "common" number here makes us more compatible.
+/// Given that this appears in our type-signature,
+/// using a "common" number here makes us more compatible.
 type Multihash = multihash::Multihash<64>;
 
 #[cfg(feature = "serde")]
diff --git a/identity/src/rsa.rs b/identity/src/rsa.rs
index 5eb78a4af75..b14d8c66d86 100644
--- a/identity/src/rsa.rs
+++ b/identity/src/rsa.rs
@@ -20,15 +20,20 @@
 
 //! RSA keys.
 
-use super::error::*;
-use asn1_der::typed::{DerDecodable, DerEncodable, DerTypeView, Sequence};
-use asn1_der::{Asn1DerError, Asn1DerErrorVariant, DerObject, Sink, VecBacking};
-use ring::rand::SystemRandom;
-use ring::signature::KeyPair;
-use ring::signature::{self, RsaKeyPair, RSA_PKCS1_2048_8192_SHA256, RSA_PKCS1_SHA256};
 use std::{fmt, sync::Arc};
+
+use asn1_der::{
+    typed::{DerDecodable, DerEncodable, DerTypeView, Sequence},
+    Asn1DerError, Asn1DerErrorVariant, DerObject, Sink, VecBacking,
+};
+use ring::{
+    rand::SystemRandom,
+    signature::{self, KeyPair, RsaKeyPair, RSA_PKCS1_2048_8192_SHA256, RSA_PKCS1_SHA256},
+};
 use zeroize::Zeroize;
 
+use super::error::*;
+
 /// An RSA keypair.
 #[derive(Clone)]
 pub struct Keypair(Arc<RsaKeyPair>);
@@ -315,9 +320,10 @@ impl DerDecodable<'_> for Asn1SubjectPublicKeyInfo {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use quickcheck::*;
 
+    use super::*;
+
     const KEY1: &[u8] = include_bytes!("test/rsa-2048.pk8");
     const KEY2: &[u8] = include_bytes!("test/rsa-3072.pk8");
     const KEY3: &[u8] = include_bytes!("test/rsa-4096.pk8");
diff --git a/identity/src/secp256k1.rs b/identity/src/secp256k1.rs
index a6e9e923268..e884cf1385d 100644
--- a/identity/src/secp256k1.rs
+++ b/identity/src/secp256k1.rs
@@ -20,15 +20,15 @@
 
 //! Secp256k1 keys.
 
-use super::error::DecodingError;
+use core::{cmp, fmt, hash};
+
 use asn1_der::typed::{DerDecodable, Sequence};
-use core::cmp;
-use core::fmt;
-use core::hash;
 use libsecp256k1::{Message, Signature};
 use sha2::{Digest as ShaDigestTrait, Sha256};
 use zeroize::Zeroize;
 
+use super::error::DecodingError;
+
 /// A Secp256k1 keypair.
 #[derive(Clone)]
 pub struct Keypair {
diff --git a/interop-tests/src/arch.rs b/interop-tests/src/arch.rs
index df36f8e5baf..87a508742dc 100644
--- a/interop-tests/src/arch.rs
+++ b/interop-tests/src/arch.rs
@@ -1,7 +1,6 @@
 // Native re-exports
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) use native::{build_swarm, init_logger, sleep, Instant, RedisClient};
-
 // Wasm re-exports
 #[cfg(target_arch = "wasm32")]
 pub(crate) use wasm::{build_swarm, init_logger, sleep, Instant, RedisClient};
@@ -11,11 +10,13 @@ pub(crate) mod native {
     use std::time::Duration;
 
     use anyhow::{bail, Context, Result};
-    use futures::future::BoxFuture;
-    use futures::FutureExt;
-    use libp2p::identity::Keypair;
-    use libp2p::swarm::{NetworkBehaviour, Swarm};
-    use libp2p::{noise, tcp, tls, yamux};
+    use futures::{future::BoxFuture, FutureExt};
+    use libp2p::{
+        identity::Keypair,
+        noise,
+        swarm::{NetworkBehaviour, Swarm},
+        tcp, tls, yamux,
+    };
     use libp2p_mplex as mplex;
     use libp2p_webrtc as webrtc;
     use redis::AsyncCommands;
@@ -186,15 +187,19 @@ pub(crate) mod native {
 
 #[cfg(target_arch = "wasm32")]
 pub(crate) mod wasm {
+    use std::time::Duration;
+
     use anyhow::{bail, Context, Result};
     use futures::future::{BoxFuture, FutureExt};
-    use libp2p::core::upgrade::Version;
-    use libp2p::identity::Keypair;
-    use libp2p::swarm::{NetworkBehaviour, Swarm};
-    use libp2p::{noise, websocket_websys, webtransport_websys, yamux, Transport as _};
+    use libp2p::{
+        core::upgrade::Version,
+        identity::Keypair,
+        noise,
+        swarm::{NetworkBehaviour, Swarm},
+        websocket_websys, webtransport_websys, yamux, Transport as _,
+    };
     use libp2p_mplex as mplex;
     use libp2p_webrtc_websys as webrtc_websys;
-    use std::time::Duration;
 
     use crate::{BlpopRequest, Muxer, SecProtocol, Transport};
 
diff --git a/interop-tests/src/bin/wasm_ping.rs b/interop-tests/src/bin/wasm_ping.rs
index 0d697a0e2a3..7730b869456 100644
--- a/interop-tests/src/bin/wasm_ping.rs
+++ b/interop-tests/src/bin/wasm_ping.rs
@@ -1,26 +1,27 @@
 #![allow(non_upper_case_globals)]
 
-use std::future::IntoFuture;
-use std::process::Stdio;
-use std::time::Duration;
+use std::{future::IntoFuture, process::Stdio, time::Duration};
 
 use anyhow::{bail, Context, Result};
-use axum::http::{header, Uri};
-use axum::response::{Html, IntoResponse, Response};
-use axum::routing::get;
-use axum::{extract::State, http::StatusCode, routing::post, Json, Router};
+use axum::{
+    extract::State,
+    http::{header, StatusCode, Uri},
+    response::{Html, IntoResponse, Response},
+    routing::{get, post},
+    Json, Router,
+};
+use interop_tests::{BlpopRequest, Report};
 use redis::{AsyncCommands, Client};
 use thirtyfour::prelude::*;
-use tokio::io::{AsyncBufReadExt, BufReader};
-use tokio::net::TcpListener;
-use tokio::process::Child;
-use tokio::sync::mpsc;
-use tower_http::cors::CorsLayer;
-use tower_http::trace::TraceLayer;
+use tokio::{
+    io::{AsyncBufReadExt, BufReader},
+    net::TcpListener,
+    process::Child,
+    sync::mpsc,
+};
+use tower_http::{cors::CorsLayer, trace::TraceLayer};
 use tracing_subscriber::{fmt, prelude::*, EnvFilter};
 
-use interop_tests::{BlpopRequest, Report};
-
 mod config;
 
 const BIND_ADDR: &str = "127.0.0.1:8080";
diff --git a/interop-tests/src/lib.rs b/interop-tests/src/lib.rs
index 0154bec51a4..a16dc4b8228 100644
--- a/interop-tests/src/lib.rs
+++ b/interop-tests/src/lib.rs
@@ -1,11 +1,14 @@
-use std::str::FromStr;
-use std::time::Duration;
+use std::{str::FromStr, time::Duration};
 
 use anyhow::{bail, Context, Result};
 use futures::{FutureExt, StreamExt};
-use libp2p::identity::Keypair;
-use libp2p::swarm::SwarmEvent;
-use libp2p::{identify, ping, swarm::NetworkBehaviour, Multiaddr};
+use libp2p::{
+    identify,
+    identity::Keypair,
+    ping,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    Multiaddr,
+};
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::prelude::*;
 
diff --git a/libp2p/src/bandwidth.rs b/libp2p/src/bandwidth.rs
index 8931c5c4166..ac668e26b3f 100644
--- a/libp2p/src/bandwidth.rs
+++ b/libp2p/src/bandwidth.rs
@@ -20,13 +20,6 @@
 
 #![allow(deprecated)]
 
-use crate::core::muxing::{StreamMuxer, StreamMuxerEvent};
-
-use futures::{
-    io::{IoSlice, IoSliceMut},
-    prelude::*,
-    ready,
-};
 use std::{
     convert::TryFrom as _,
     io,
@@ -38,6 +31,14 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::{
+    io::{IoSlice, IoSliceMut},
+    prelude::*,
+    ready,
+};
+
+use crate::core::muxing::{StreamMuxer, StreamMuxerEvent};
+
 /// Wraps around a [`StreamMuxer`] and counts the number of bytes that go through all the opened
 /// streams.
 #[derive(Clone)]
@@ -123,7 +124,7 @@ impl BandwidthSinks {
     /// Returns the total number of bytes that have been downloaded on all the streams.
     ///
     /// > **Note**: This method is by design subject to race conditions. The returned value should
-    /// >           only ever be used for statistics purposes.
+    /// > only ever be used for statistics purposes.
     pub fn total_inbound(&self) -> u64 {
         self.inbound.load(Ordering::Relaxed)
     }
@@ -131,7 +132,7 @@ impl BandwidthSinks {
     /// Returns the total number of bytes that have been uploaded on all the streams.
     ///
     /// > **Note**: This method is by design subject to race conditions. The returned value should
-    /// >           only ever be used for statistics purposes.
+    /// > only ever be used for statistics purposes.
     pub fn total_outbound(&self) -> u64 {
         self.outbound.load(Ordering::Relaxed)
     }
diff --git a/libp2p/src/builder.rs b/libp2p/src/builder.rs
index de003314cca..99c340a5e3e 100644
--- a/libp2p/src/builder.rs
+++ b/libp2p/src/builder.rs
@@ -33,31 +33,31 @@ mod select_security;
 /// #         relay: libp2p_relay::client::Behaviour,
 /// #     }
 ///
-///  let swarm = SwarmBuilder::with_new_identity()
-///      .with_tokio()
-///      .with_tcp(
-///          Default::default(),
-///          (libp2p_tls::Config::new, libp2p_noise::Config::new),
-///          libp2p_yamux::Config::default,
-///      )?
-///      .with_quic()
-///      .with_other_transport(|_key| DummyTransport::<(PeerId, StreamMuxerBox)>::new())?
-///      .with_dns()?
-///      .with_websocket(
-///          (libp2p_tls::Config::new, libp2p_noise::Config::new),
-///          libp2p_yamux::Config::default,
-///      )
-///      .await?
-///      .with_relay_client(
-///          (libp2p_tls::Config::new, libp2p_noise::Config::new),
-///          libp2p_yamux::Config::default,
-///      )?
-///      .with_behaviour(|_key, relay| MyBehaviour { relay })?
-///      .with_swarm_config(|cfg| {
-///          // Edit cfg here.
-///          cfg
-///      })
-///      .build();
+/// let swarm = SwarmBuilder::with_new_identity()
+///     .with_tokio()
+///     .with_tcp(
+///         Default::default(),
+///         (libp2p_tls::Config::new, libp2p_noise::Config::new),
+///         libp2p_yamux::Config::default,
+///     )?
+///     .with_quic()
+///     .with_other_transport(|_key| DummyTransport::<(PeerId, StreamMuxerBox)>::new())?
+///     .with_dns()?
+///     .with_websocket(
+///         (libp2p_tls::Config::new, libp2p_noise::Config::new),
+///         libp2p_yamux::Config::default,
+///     )
+///     .await?
+///     .with_relay_client(
+///         (libp2p_tls::Config::new, libp2p_noise::Config::new),
+///         libp2p_yamux::Config::default,
+///     )?
+///     .with_behaviour(|_key, relay| MyBehaviour { relay })?
+///     .with_swarm_config(|cfg| {
+///         // Edit cfg here.
+///         cfg
+///     })
+///     .build();
 /// #
 /// #     Ok(())
 /// # }
@@ -70,11 +70,12 @@ pub struct SwarmBuilder<Provider, Phase> {
 
 #[cfg(test)]
 mod tests {
-    use crate::SwarmBuilder;
     use libp2p_core::{muxing::StreamMuxerBox, transport::dummy::DummyTransport};
     use libp2p_identity::PeerId;
     use libp2p_swarm::NetworkBehaviour;
 
+    use crate::SwarmBuilder;
+
     #[test]
     #[cfg(all(
         feature = "tokio",
diff --git a/libp2p/src/builder/phase.rs b/libp2p/src/builder/phase.rs
index c9679a46767..6e3f41755ca 100644
--- a/libp2p/src/builder/phase.rs
+++ b/libp2p/src/builder/phase.rs
@@ -19,6 +19,8 @@ use bandwidth_metrics::*;
 use behaviour::*;
 use build::*;
 use dns::*;
+use libp2p_core::{muxing::StreamMuxerBox, Transport};
+use libp2p_identity::Keypair;
 use other_transport::*;
 use provider::*;
 use quic::*;
@@ -27,12 +29,9 @@ use swarm::*;
 use tcp::*;
 use websocket::*;
 
-use super::select_muxer::SelectMuxerUpgrade;
-use super::select_security::SelectSecurityUpgrade;
-use super::SwarmBuilder;
-
-use libp2p_core::{muxing::StreamMuxerBox, Transport};
-use libp2p_identity::Keypair;
+use super::{
+    select_muxer::SelectMuxerUpgrade, select_security::SelectSecurityUpgrade, SwarmBuilder,
+};
 
 #[allow(unreachable_pub)]
 pub trait IntoSecurityUpgrade<C> {
diff --git a/libp2p/src/builder/phase/bandwidth_logging.rs b/libp2p/src/builder/phase/bandwidth_logging.rs
index cee9498fcaa..f24df5f3df5 100644
--- a/libp2p/src/builder/phase/bandwidth_logging.rs
+++ b/libp2p/src/builder/phase/bandwidth_logging.rs
@@ -1,10 +1,9 @@
+use std::{marker::PhantomData, sync::Arc};
+
 use super::*;
 #[allow(deprecated)]
 use crate::bandwidth::BandwidthSinks;
-use crate::transport_ext::TransportExt;
-use crate::SwarmBuilder;
-use std::marker::PhantomData;
-use std::sync::Arc;
+use crate::{transport_ext::TransportExt, SwarmBuilder};
 
 pub struct BandwidthLoggingPhase<T, R> {
     pub(crate) relay_behaviour: R,
diff --git a/libp2p/src/builder/phase/bandwidth_metrics.rs b/libp2p/src/builder/phase/bandwidth_metrics.rs
index 52daa731ddd..ddd292c140e 100644
--- a/libp2p/src/builder/phase/bandwidth_metrics.rs
+++ b/libp2p/src/builder/phase/bandwidth_metrics.rs
@@ -1,10 +1,9 @@
+use std::{marker::PhantomData, sync::Arc};
+
 use super::*;
 #[allow(deprecated)]
 use crate::bandwidth::BandwidthSinks;
-use crate::transport_ext::TransportExt;
-use crate::SwarmBuilder;
-use std::marker::PhantomData;
-use std::sync::Arc;
+use crate::{transport_ext::TransportExt, SwarmBuilder};
 
 pub struct BandwidthMetricsPhase<T, R> {
     pub(crate) relay_behaviour: R,
diff --git a/libp2p/src/builder/phase/behaviour.rs b/libp2p/src/builder/phase/behaviour.rs
index 939db935c80..22f8c617051 100644
--- a/libp2p/src/builder/phase/behaviour.rs
+++ b/libp2p/src/builder/phase/behaviour.rs
@@ -1,8 +1,9 @@
+use std::{convert::Infallible, marker::PhantomData};
+
+use libp2p_swarm::NetworkBehaviour;
+
 use super::*;
 use crate::SwarmBuilder;
-use libp2p_swarm::NetworkBehaviour;
-use std::convert::Infallible;
-use std::marker::PhantomData;
 
 pub struct BehaviourPhase<T, R> {
     pub(crate) relay_behaviour: R,
diff --git a/libp2p/src/builder/phase/build.rs b/libp2p/src/builder/phase/build.rs
index 80a83994eeb..f9621da756b 100644
--- a/libp2p/src/builder/phase/build.rs
+++ b/libp2p/src/builder/phase/build.rs
@@ -1,9 +1,9 @@
+use libp2p_core::Transport;
+use libp2p_swarm::Swarm;
+
 #[allow(unused_imports)]
 use super::*;
-
 use crate::SwarmBuilder;
-use libp2p_core::Transport;
-use libp2p_swarm::Swarm;
 
 pub struct BuildPhase<T, B> {
     pub(crate) behaviour: B,
diff --git a/libp2p/src/builder/phase/dns.rs b/libp2p/src/builder/phase/dns.rs
index 638064d58bb..83653836a34 100644
--- a/libp2p/src/builder/phase/dns.rs
+++ b/libp2p/src/builder/phase/dns.rs
@@ -1,6 +1,7 @@
+use std::marker::PhantomData;
+
 use super::*;
 use crate::SwarmBuilder;
-use std::marker::PhantomData;
 
 pub struct DnsPhase<T> {
     pub(crate) transport: T,
diff --git a/libp2p/src/builder/phase/identity.rs b/libp2p/src/builder/phase/identity.rs
index ceb86819dc7..e2511267cd3 100644
--- a/libp2p/src/builder/phase/identity.rs
+++ b/libp2p/src/builder/phase/identity.rs
@@ -1,6 +1,7 @@
+use std::marker::PhantomData;
+
 use super::*;
 use crate::SwarmBuilder;
-use std::marker::PhantomData;
 
 pub struct IdentityPhase {}
 
diff --git a/libp2p/src/builder/phase/other_transport.rs b/libp2p/src/builder/phase/other_transport.rs
index e04621b2e3f..c3b951c8c75 100644
--- a/libp2p/src/builder/phase/other_transport.rs
+++ b/libp2p/src/builder/phase/other_transport.rs
@@ -1,20 +1,19 @@
-use std::convert::Infallible;
-use std::marker::PhantomData;
-use std::sync::Arc;
+use std::{convert::Infallible, marker::PhantomData, sync::Arc};
 
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::Transport;
+use libp2p_core::{
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    Transport,
+};
 #[cfg(feature = "relay")]
 use libp2p_core::{Negotiated, UpgradeInfo};
 #[cfg(feature = "relay")]
 use libp2p_identity::PeerId;
 
+use super::*;
 #[allow(deprecated)]
 use crate::bandwidth::BandwidthSinks;
 use crate::SwarmBuilder;
 
-use super::*;
-
 pub struct OtherTransportPhase<T> {
     pub(crate) transport: T,
 }
diff --git a/libp2p/src/builder/phase/provider.rs b/libp2p/src/builder/phase/provider.rs
index 2a9154cda74..00a79e14a30 100644
--- a/libp2p/src/builder/phase/provider.rs
+++ b/libp2p/src/builder/phase/provider.rs
@@ -1,13 +1,15 @@
+use std::marker::PhantomData;
+
 #[allow(unused_imports)]
 use super::*;
 use crate::SwarmBuilder;
-use std::marker::PhantomData;
 /// Represents the phase where a provider is not yet specified.
-/// This is a marker type used in the type-state pattern to ensure compile-time checks of the builder's state.
+/// This is a marker type used in the type-state pattern to ensure compile-time checks of the
+/// builder's state.
 pub enum NoProviderSpecified {}
 
-// Define enums for each of the possible runtime environments. These are used as markers in the type-state pattern,
-// allowing compile-time checks for the appropriate environment configuration.
+// Define enums for each of the possible runtime environments. These are used as markers in the
+// type-state pattern, allowing compile-time checks for the appropriate environment configuration.
 
 #[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
 /// Represents the AsyncStd runtime environment.
@@ -26,7 +28,8 @@ pub struct ProviderPhase {}
 
 impl SwarmBuilder<NoProviderSpecified, ProviderPhase> {
     /// Configures the SwarmBuilder to use the AsyncStd runtime.
-    /// This method is only available when compiling for non-Wasm targets with the `async-std` feature enabled.
+    /// This method is only available when compiling for non-Wasm
+    /// targets with the `async-std` feature enabled.
     #[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
     pub fn with_async_std(self) -> SwarmBuilder<AsyncStd, TcpPhase> {
         SwarmBuilder {
@@ -37,7 +40,8 @@ impl SwarmBuilder<NoProviderSpecified, ProviderPhase> {
     }
 
     /// Configures the SwarmBuilder to use the Tokio runtime.
-    /// This method is only available when compiling for non-Wasm targets with the `tokio` feature enabled
+    /// This method is only available when compiling for non-Wasm
+    /// targets with the `tokio` feature enabled
     #[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
     pub fn with_tokio(self) -> SwarmBuilder<Tokio, TcpPhase> {
         SwarmBuilder {
diff --git a/libp2p/src/builder/phase/quic.rs b/libp2p/src/builder/phase/quic.rs
index e030e9493bb..1b6329c1095 100644
--- a/libp2p/src/builder/phase/quic.rs
+++ b/libp2p/src/builder/phase/quic.rs
@@ -1,5 +1,5 @@
-use super::*;
-use crate::SwarmBuilder;
+use std::{marker::PhantomData, sync::Arc};
+
 #[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
 use libp2p_core::muxing::StreamMuxer;
 use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
@@ -8,7 +8,9 @@ use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
     all(not(target_arch = "wasm32"), feature = "websocket")
 ))]
 use libp2p_core::{InboundUpgrade, Negotiated, OutboundUpgrade, UpgradeInfo};
-use std::{marker::PhantomData, sync::Arc};
+
+use super::*;
+use crate::SwarmBuilder;
 
 pub struct QuicPhase<T> {
     pub(crate) transport: T,
diff --git a/libp2p/src/builder/phase/relay.rs b/libp2p/src/builder/phase/relay.rs
index f8305f9d246..33dbf1fb54c 100644
--- a/libp2p/src/builder/phase/relay.rs
+++ b/libp2p/src/builder/phase/relay.rs
@@ -10,9 +10,8 @@ use libp2p_core::{InboundUpgrade, Negotiated, OutboundUpgrade, StreamMuxer, Upgr
 #[cfg(feature = "relay")]
 use libp2p_identity::PeerId;
 
-use crate::SwarmBuilder;
-
 use super::*;
+use crate::SwarmBuilder;
 
 pub struct RelayPhase<T> {
     pub(crate) transport: T,
diff --git a/libp2p/src/builder/phase/tcp.rs b/libp2p/src/builder/phase/tcp.rs
index 4b7cf29b3d2..f38f52441e5 100644
--- a/libp2p/src/builder/phase/tcp.rs
+++ b/libp2p/src/builder/phase/tcp.rs
@@ -1,5 +1,5 @@
-use super::*;
-use crate::SwarmBuilder;
+use std::marker::PhantomData;
+
 #[cfg(all(
     not(target_arch = "wasm32"),
     any(feature = "tcp", feature = "websocket")
@@ -14,7 +14,9 @@ use libp2p_core::Transport;
 use libp2p_core::{
     upgrade::InboundConnectionUpgrade, upgrade::OutboundConnectionUpgrade, Negotiated, UpgradeInfo,
 };
-use std::marker::PhantomData;
+
+use super::*;
+use crate::SwarmBuilder;
 
 pub struct TcpPhase {}
 
diff --git a/libp2p/src/builder/phase/websocket.rs b/libp2p/src/builder/phase/websocket.rs
index 68a85bb77b7..a23c6eca854 100644
--- a/libp2p/src/builder/phase/websocket.rs
+++ b/libp2p/src/builder/phase/websocket.rs
@@ -1,5 +1,5 @@
-use super::*;
-use crate::SwarmBuilder;
+use std::marker::PhantomData;
+
 #[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
 use libp2p_core::muxing::{StreamMuxer, StreamMuxerBox};
 use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
@@ -15,7 +15,9 @@ use libp2p_core::{InboundUpgrade, Negotiated, OutboundUpgrade, UpgradeInfo};
     feature = "relay"
 ))]
 use libp2p_identity::PeerId;
-use std::marker::PhantomData;
+
+use super::*;
+use crate::SwarmBuilder;
 
 pub struct WebsocketPhase<T> {
     pub(crate) transport: T,
@@ -126,8 +128,8 @@ impl_websocket_builder!(
 impl_websocket_builder!(
     "tokio",
     super::provider::Tokio,
-    // Note this is an unnecessary await for Tokio Websocket (i.e. tokio dns) in order to be consistent
-    // with above AsyncStd construction.
+    // Note this is an unnecessary await for Tokio Websocket (i.e. tokio dns) in order to be
+    // consistent with above AsyncStd construction.
     futures::future::ready(libp2p_dns::tokio::Transport::system(
         libp2p_tcp::tokio::Transport::new(libp2p_tcp::Config::default())
     )),
diff --git a/libp2p/src/builder/select_muxer.rs b/libp2p/src/builder/select_muxer.rs
index c93ba9d9991..93ae0547269 100644
--- a/libp2p/src/builder/select_muxer.rs
+++ b/libp2p/src/builder/select_muxer.rs
@@ -20,12 +20,15 @@
 
 #![allow(unreachable_pub)]
 
+use std::iter::{Chain, Map};
+
 use either::Either;
 use futures::future;
-use libp2p_core::either::EitherFuture;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::UpgradeInfo;
-use std::iter::{Chain, Map};
+use libp2p_core::{
+    either::EitherFuture,
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    UpgradeInfo,
+};
 
 #[derive(Debug, Clone)]
 pub struct SelectMuxerUpgrade<A, B>(A, B);
diff --git a/libp2p/src/builder/select_security.rs b/libp2p/src/builder/select_security.rs
index d6c7f8c172f..1ed760feb1b 100644
--- a/libp2p/src/builder/select_security.rs
+++ b/libp2p/src/builder/select_security.rs
@@ -21,13 +21,15 @@
 
 #![allow(unreachable_pub)]
 
+use std::iter::{Chain, Map};
+
 use either::Either;
-use futures::future::MapOk;
-use futures::{future, TryFutureExt};
-use libp2p_core::either::EitherFuture;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo};
+use futures::{future, future::MapOk, TryFutureExt};
+use libp2p_core::{
+    either::EitherFuture,
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo},
+};
 use libp2p_identity::PeerId;
-use std::iter::{Chain, Map};
 
 /// Upgrade that combines two upgrades into one. Supports all the protocols supported by either
 /// sub-upgrade.
diff --git a/libp2p/src/lib.rs b/libp2p/src/lib.rs
index 58f911e9445..1ec1cc530fc 100644
--- a/libp2p/src/lib.rs
+++ b/libp2p/src/lib.rs
@@ -34,11 +34,6 @@
 
 pub use bytes;
 pub use futures;
-#[doc(inline)]
-pub use libp2p_core::multihash;
-#[doc(inline)]
-pub use multiaddr;
-
 #[doc(inline)]
 pub use libp2p_allow_block_list as allow_block_list;
 #[cfg(feature = "autonat")]
@@ -48,6 +43,8 @@ pub use libp2p_autonat as autonat;
 pub use libp2p_connection_limits as connection_limits;
 #[doc(inline)]
 pub use libp2p_core as core;
+#[doc(inline)]
+pub use libp2p_core::multihash;
 #[cfg(feature = "dcutr")]
 #[doc(inline)]
 pub use libp2p_dcutr as dcutr;
@@ -140,6 +137,8 @@ pub use libp2p_webtransport_websys as webtransport_websys;
 #[cfg(feature = "yamux")]
 #[doc(inline)]
 pub use libp2p_yamux as yamux;
+#[doc(inline)]
+pub use multiaddr;
 
 mod builder;
 mod transport_ext;
@@ -149,15 +148,18 @@ pub mod bandwidth;
 #[cfg(doc)]
 pub mod tutorials;
 
-pub use self::builder::SwarmBuilder;
-pub use self::core::{
-    transport::TransportError,
-    upgrade::{InboundUpgrade, OutboundUpgrade},
-    Transport,
-};
-pub use self::multiaddr::{multiaddr as build_multiaddr, Multiaddr};
-pub use self::swarm::Swarm;
-pub use self::transport_ext::TransportExt;
 pub use libp2p_identity as identity;
 pub use libp2p_identity::PeerId;
 pub use libp2p_swarm::{Stream, StreamProtocol};
+
+pub use self::{
+    builder::SwarmBuilder,
+    core::{
+        transport::TransportError,
+        upgrade::{InboundUpgrade, OutboundUpgrade},
+        Transport,
+    },
+    multiaddr::{multiaddr as build_multiaddr, Multiaddr},
+    swarm::Swarm,
+    transport_ext::TransportExt,
+};
diff --git a/libp2p/src/transport_ext.rs b/libp2p/src/transport_ext.rs
index 4f07484fc1f..0ed5b816903 100644
--- a/libp2p/src/transport_ext.rs
+++ b/libp2p/src/transport_ext.rs
@@ -20,15 +20,19 @@
 
 //! Provides the `TransportExt` trait.
 
+use std::sync::Arc;
+
+use libp2p_identity::PeerId;
+
 #[allow(deprecated)]
 use crate::bandwidth::{BandwidthLogging, BandwidthSinks};
-use crate::core::{
-    muxing::{StreamMuxer, StreamMuxerBox},
-    transport::Boxed,
+use crate::{
+    core::{
+        muxing::{StreamMuxer, StreamMuxerBox},
+        transport::Boxed,
+    },
+    Transport,
 };
-use crate::Transport;
-use libp2p_identity::PeerId;
-use std::sync::Arc;
 
 /// Trait automatically implemented on all objects that implement `Transport`. Provides some
 /// additional utilities.
@@ -42,23 +46,17 @@ pub trait TransportExt: Transport {
     /// # Example
     ///
     /// ```
-    /// use libp2p_yamux as yamux;
+    /// use libp2p::{core::upgrade, identity, Transport, TransportExt};
     /// use libp2p_noise as noise;
     /// use libp2p_tcp as tcp;
-    /// use libp2p::{
-    ///     core::upgrade,
-    ///     identity,
-    ///     TransportExt,
-    ///     Transport,
-    /// };
+    /// use libp2p_yamux as yamux;
     ///
     /// let id_keys = identity::Keypair::generate_ed25519();
     ///
     /// let transport = tcp::tokio::Transport::new(tcp::Config::default().nodelay(true))
     ///     .upgrade(upgrade::Version::V1)
     ///     .authenticate(
-    ///         noise::Config::new(&id_keys)
-    ///             .expect("Signing libp2p-noise static DH keypair failed."),
+    ///         noise::Config::new(&id_keys).expect("Signing libp2p-noise static DH keypair failed."),
     ///     )
     ///     .multiplex(yamux::Config::default())
     ///     .boxed();
diff --git a/libp2p/src/tutorials/hole_punching.rs b/libp2p/src/tutorials/hole_punching.rs
index 0963c0ca59e..06a4dad4037 100644
--- a/libp2p/src/tutorials/hole_punching.rs
+++ b/libp2p/src/tutorials/hole_punching.rs
@@ -57,8 +57,8 @@
 //! cargo build --bin relay-server-example
 //! ```
 //!
-//! You can find the binary at `target/debug/relay-server-example`. In case you built it locally, copy
-//! it to your server.
+//! You can find the binary at `target/debug/relay-server-example`. In case you built it locally,
+//! copy it to your server.
 //!
 //! On your server, start the relay server binary:
 //!
@@ -98,7 +98,8 @@
 //!
 //!    ``` bash
 //!    $ libp2p-lookup direct --address /ip4/111.11.111.111/tcp/4001
-//!    Lookup for peer with id PeerId("12D3KooWDpJ7As7BWAwRMfu1VU2WCqNjvq387JEYKDBj4kx6nXTN") succeeded.
+//!    Lookup for peer with id PeerId("12D3KooWDpJ7As7BWAwRMfu1VU2WCqNjvq387JEYKDBj4kx6nXTN")
+//! succeeded.
 //!
 //!    Protocol version: "/TODO/0.0.1"
 //!    Agent version: "rust-libp2p/0.36.0"
@@ -163,12 +164,18 @@
 //!    [`Multiaddr`](crate::Multiaddr).
 //!
 //!    ``` ignore
-//!    [2022-01-30T12:54:10Z INFO  client] Established connection to PeerId("12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X") via Dialer { address: "/ip4/$RELAY_PEER_ID/tcp/4001/p2p/12D3KooWDpJ7As7BWAwRMfu1VU2WCqNjvq387JEYKDBj4kx6nXTN/p2p-circuit/p2p/12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X", role_override: Dialer }
+//!    [2022-01-30T12:54:10Z INFO  client] Established connection to
+//!    PeerId("12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X") via Dialer { address:
+//!    "/ip4/$RELAY_PEER_ID/tcp/4001/p2p/12D3KooWDpJ7As7BWAwRMfu1VU2WCqNjvq387JEYKDBj4kx6nXTN/
+//!    p2p-circuit/p2p/12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X",
+//!    role_override: Dialer  }
 //!    ```
 //!
-//! 2. The direct connection upgrade, also known as hole punch, succeeding.
-//!    Reported by [`dcutr`](crate::dcutr) through [`Event`](crate::dcutr::Event) containing [`Result::Ok`] with the [`ConnectionId`](libp2p_swarm::ConnectionId) of the new direct connection.
+//! 2. The direct connection upgrade, also known as hole punch, succeeding. Reported by
+//!    [`dcutr`](crate::dcutr) through [`Event`](crate::dcutr::Event) containing [`Result::Ok`] with
+//!    the [`ConnectionId`](libp2p_swarm::ConnectionId) of the new direct connection.
 //!
 //!    ``` ignore
-//!    [2022-01-30T12:54:11Z INFO  client] Event { remote_peer_id: PeerId("12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X"), result: Ok(2) }
+//!    [2022-01-30T12:54:11Z INFO  client] Event { remote_peer_id:
+//!    PeerId("12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X"), result: Ok(2) }
 //!    ```
diff --git a/libp2p/src/tutorials/ping.rs b/libp2p/src/tutorials/ping.rs
index 31bf5ba3a14..f35fef8f488 100644
--- a/libp2p/src/tutorials/ping.rs
+++ b/libp2p/src/tutorials/ping.rs
@@ -72,6 +72,7 @@
 //!
 //! ```rust
 //! use std::error::Error;
+//!
 //! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
@@ -98,8 +99,9 @@
 //!
 //! ```rust
 //! use std::error::Error;
-//! use tracing_subscriber::EnvFilter;
+//!
 //! use libp2p::{noise, tcp, yamux};
+//! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
@@ -139,12 +141,14 @@
 //! The two traits [`Transport`] and [`NetworkBehaviour`] allow us to cleanly
 //! separate _how_ to send bytes from _what_ bytes and to _whom_ to send.
 //!
-//! With the above in mind, let's extend our example, creating a [`ping::Behaviour`](crate::ping::Behaviour) at the end:
+//! With the above in mind, let's extend our example, creating a
+//! [`ping::Behaviour`](crate::ping::Behaviour) at the end:
 //!
 //! ```rust
 //! use std::error::Error;
-//! use tracing_subscriber::EnvFilter;
+//!
 //! use libp2p::{noise, ping, tcp, yamux};
+//! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
@@ -174,8 +178,9 @@
 //!
 //! ```rust
 //! use std::error::Error;
-//! use tracing_subscriber::EnvFilter;
+//!
 //! use libp2p::{noise, ping, tcp, yamux};
+//! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
@@ -209,8 +214,9 @@
 //!
 //! ```rust
 //! use std::{error::Error, time::Duration};
-//! use tracing_subscriber::EnvFilter;
+//!
 //! use libp2p::{noise, ping, tcp, yamux};
+//! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
@@ -226,7 +232,9 @@
 //!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
+//!         .with_swarm_config(|cfg| {
+//!             cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
+//!         })
 //!         .build();
 //!
 //!     Ok(())
@@ -261,8 +269,9 @@
 //!
 //! ```rust
 //! use std::{error::Error, time::Duration};
-//! use tracing_subscriber::EnvFilter;
+//!
 //! use libp2p::{noise, ping, tcp, yamux, Multiaddr};
+//! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
@@ -278,7 +287,9 @@
 //!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
+//!         .with_swarm_config(|cfg| {
+//!             cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
+//!         })
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned
@@ -305,9 +316,10 @@
 //!
 //! ```no_run
 //! use std::{error::Error, time::Duration};
-//! use tracing_subscriber::EnvFilter;
-//! use libp2p::{noise, ping, tcp, yamux, Multiaddr, swarm::SwarmEvent};
+//!
 //! use futures::prelude::*;
+//! use libp2p::{noise, ping, swarm::SwarmEvent, tcp, yamux, Multiaddr};
+//! use tracing_subscriber::EnvFilter;
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
@@ -323,7 +335,9 @@
 //!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
+//!         .with_swarm_config(|cfg| {
+//!             cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
+//!         })
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned
diff --git a/misc/allow-block-list/src/lib.rs b/misc/allow-block-list/src/lib.rs
index f93cf4ffefa..ea0d56b5a67 100644
--- a/misc/allow-block-list/src/lib.rs
+++ b/misc/allow-block-list/src/lib.rs
@@ -31,12 +31,12 @@
 //! #[derive(NetworkBehaviour)]
 //! # #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
 //! struct MyBehaviour {
-//!    allowed_peers: allow_block_list::Behaviour<AllowedPeers>,
+//!     allowed_peers: allow_block_list::Behaviour<AllowedPeers>,
 //! }
 //!
 //! # fn main() {
 //! let behaviour = MyBehaviour {
-//!     allowed_peers: allow_block_list::Behaviour::default()
+//!     allowed_peers: allow_block_list::Behaviour::default(),
 //! };
 //! # }
 //! ```
@@ -51,27 +51,29 @@
 //! #[derive(NetworkBehaviour)]
 //! # #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
 //! struct MyBehaviour {
-//!    blocked_peers: allow_block_list::Behaviour<BlockedPeers>,
+//!     blocked_peers: allow_block_list::Behaviour<BlockedPeers>,
 //! }
 //!
 //! # fn main() {
 //! let behaviour = MyBehaviour {
-//!     blocked_peers: allow_block_list::Behaviour::default()
+//!     blocked_peers: allow_block_list::Behaviour::default(),
 //! };
 //! # }
 //! ```
 
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use std::{
+    collections::{HashSet, VecDeque},
+    convert::Infallible,
+    fmt,
+    task::{Context, Poll, Waker},
+};
+
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     dummy, CloseConnection, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler,
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use std::collections::{HashSet, VecDeque};
-use std::convert::Infallible;
-use std::fmt;
-use std::task::{Context, Poll, Waker};
 
 /// A [`NetworkBehaviour`] that can act as an allow or block list.
 #[derive(Default, Debug)]
@@ -101,7 +103,8 @@ impl Behaviour<AllowedPeers> {
 
     /// Allow connections to the given peer.
     ///
-    /// Returns whether the peer was newly inserted. Does nothing if the peer was already present in the set.
+    /// Returns whether the peer was newly inserted. Does nothing if the peer
+    /// was already present in the set.
     pub fn allow_peer(&mut self, peer: PeerId) -> bool {
         let inserted = self.state.peers.insert(peer);
         if inserted {
@@ -116,7 +119,8 @@ impl Behaviour<AllowedPeers> {
     ///
     /// All active connections to this peer will be closed immediately.
     ///
-    /// Returns whether the peer was present in the set. Does nothing if the peer was not present in the set.
+    /// Returns whether the peer was present in the set. Does nothing if the peer
+    /// was not present in the set.
     pub fn disallow_peer(&mut self, peer: PeerId) -> bool {
         let removed = self.state.peers.remove(&peer);
         if removed {
@@ -139,7 +143,8 @@ impl Behaviour<BlockedPeers> {
     ///
     /// All active connections to this peer will be closed immediately.
     ///
-    /// Returns whether the peer was newly inserted. Does nothing if the peer was already present in the set.
+    /// Returns whether the peer was newly inserted. Does nothing if the peer was already present in
+    /// the set.
     pub fn block_peer(&mut self, peer: PeerId) -> bool {
         let inserted = self.state.peers.insert(peer);
         if inserted {
@@ -153,7 +158,8 @@ impl Behaviour<BlockedPeers> {
 
     /// Unblock connections to a given peer.
     ///
-    /// Returns whether the peer was present in the set. Does nothing if the peer was not present in the set.
+    /// Returns whether the peer was present in the set. Does nothing if the peer
+    /// was not present in the set.
     pub fn unblock_peer(&mut self, peer: PeerId) -> bool {
         let removed = self.state.peers.remove(&peer);
         if removed {
@@ -294,10 +300,11 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_swarm::{dial_opts::DialOpts, DialError, ListenError, Swarm, SwarmEvent};
     use libp2p_swarm_test::SwarmExt;
 
+    use super::*;
+
     #[async_std::test]
     async fn cannot_dial_blocked_peer() {
         let mut dialer = Swarm::new_ephemeral(|_| Behaviour::<BlockedPeers>::default());
diff --git a/misc/connection-limits/src/lib.rs b/misc/connection-limits/src/lib.rs
index 016a7f2cfd4..c8df5be5653 100644
--- a/misc/connection-limits/src/lib.rs
+++ b/misc/connection-limits/src/lib.rs
@@ -18,6 +18,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    collections::{HashMap, HashSet},
+    convert::Infallible,
+    fmt,
+    task::{Context, Poll},
+};
+
 use libp2p_core::{transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
@@ -25,22 +32,22 @@ use libp2p_swarm::{
     dummy, ConnectionClosed, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler,
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use std::collections::{HashMap, HashSet};
-use std::convert::Infallible;
-use std::fmt;
-use std::task::{Context, Poll};
 
 /// A [`NetworkBehaviour`] that enforces a set of [`ConnectionLimits`].
 ///
-/// For these limits to take effect, this needs to be composed into the behaviour tree of your application.
+/// For these limits to take effect, this needs to be composed
+/// into the behaviour tree of your application.
 ///
-/// If a connection is denied due to a limit, either a [`SwarmEvent::IncomingConnectionError`](libp2p_swarm::SwarmEvent::IncomingConnectionError)
-/// or [`SwarmEvent::OutgoingConnectionError`](libp2p_swarm::SwarmEvent::OutgoingConnectionError) will be emitted.
-/// The [`ListenError::Denied`](libp2p_swarm::ListenError::Denied) and respectively the [`DialError::Denied`](libp2p_swarm::DialError::Denied) variant
-/// contain a [`ConnectionDenied`] type that can be downcast to [`Exceeded`] error if (and only if) **this**
-/// behaviour denied the connection.
+/// If a connection is denied due to a limit, either a
+/// [`SwarmEvent::IncomingConnectionError`](libp2p_swarm::SwarmEvent::IncomingConnectionError)
+/// or [`SwarmEvent::OutgoingConnectionError`](libp2p_swarm::SwarmEvent::OutgoingConnectionError)
+/// will be emitted. The [`ListenError::Denied`](libp2p_swarm::ListenError::Denied) and respectively
+/// the [`DialError::Denied`](libp2p_swarm::DialError::Denied) variant
+/// contain a [`ConnectionDenied`] type that can be downcast to [`Exceeded`] error if (and only if)
+/// **this** behaviour denied the connection.
 ///
-/// If you employ multiple [`NetworkBehaviour`]s that manage connections, it may also be a different error.
+/// If you employ multiple [`NetworkBehaviour`]s that manage connections,
+/// it may also be a different error.
 ///
 /// # Example
 ///
@@ -53,9 +60,9 @@ use std::task::{Context, Poll};
 /// #[derive(NetworkBehaviour)]
 /// # #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
 /// struct MyBehaviour {
-///   identify: identify::Behaviour,
-///   ping: ping::Behaviour,
-///   limits: connection_limits::Behaviour
+///     identify: identify::Behaviour,
+///     ping: ping::Behaviour,
+///     limits: connection_limits::Behaviour,
 /// }
 /// ```
 pub struct Behaviour {
@@ -367,14 +374,16 @@ impl NetworkBehaviour for Behaviour {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_swarm::{
-        behaviour::toggle::Toggle, dial_opts::DialOpts, dial_opts::PeerCondition, DialError,
-        ListenError, Swarm, SwarmEvent,
+        behaviour::toggle::Toggle,
+        dial_opts::{DialOpts, PeerCondition},
+        DialError, ListenError, Swarm, SwarmEvent,
     };
     use libp2p_swarm_test::SwarmExt;
     use quickcheck::*;
 
+    use super::*;
+
     #[test]
     fn max_outgoing() {
         use rand::Rng;
diff --git a/misc/keygen/src/config.rs b/misc/keygen/src/config.rs
index e6c563b3c32..7d46b1849bd 100644
--- a/misc/keygen/src/config.rs
+++ b/misc/keygen/src/config.rs
@@ -1,10 +1,8 @@
+use std::{error::Error, path::Path};
+
 use base64::prelude::*;
+use libp2p_identity::{Keypair, PeerId};
 use serde::{Deserialize, Serialize};
-use std::error::Error;
-use std::path::Path;
-
-use libp2p_identity::Keypair;
-use libp2p_identity::PeerId;
 
 #[derive(Clone, Serialize, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/misc/keygen/src/main.rs b/misc/keygen/src/main.rs
index 64d98005369..4c4d3bfbf66 100644
--- a/misc/keygen/src/main.rs
+++ b/misc/keygen/src/main.rs
@@ -1,9 +1,12 @@
+use std::{
+    error::Error,
+    path::PathBuf,
+    str::{self, FromStr},
+    sync::mpsc,
+    thread,
+};
+
 use base64::prelude::*;
-use std::error::Error;
-use std::path::PathBuf;
-use std::str::{self, FromStr};
-use std::sync::mpsc;
-use std::thread;
 
 mod config;
 
diff --git a/misc/memory-connection-limits/src/lib.rs b/misc/memory-connection-limits/src/lib.rs
index e2a89977991..0735464a67e 100644
--- a/misc/memory-connection-limits/src/lib.rs
+++ b/misc/memory-connection-limits/src/lib.rs
@@ -18,35 +18,40 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    convert::Infallible,
+    fmt,
+    task::{Context, Poll},
+    time::{Duration, Instant},
+};
+
 use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     dummy, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use std::convert::Infallible;
-
-use std::{
-    fmt,
-    task::{Context, Poll},
-    time::{Duration, Instant},
-};
 use sysinfo::MemoryRefreshKind;
 
 /// A [`NetworkBehaviour`] that enforces a set of memory usage based limits.
 ///
-/// For these limits to take effect, this needs to be composed into the behaviour tree of your application.
+/// For these limits to take effect, this needs to be composed
+/// into the behaviour tree of your application.
 ///
-/// If a connection is denied due to a limit, either a [`SwarmEvent::IncomingConnectionError`](libp2p_swarm::SwarmEvent::IncomingConnectionError)
-/// or [`SwarmEvent::OutgoingConnectionError`](libp2p_swarm::SwarmEvent::OutgoingConnectionError) will be emitted.
-/// The [`ListenError::Denied`](libp2p_swarm::ListenError::Denied) and respectively the [`DialError::Denied`](libp2p_swarm::DialError::Denied) variant
-/// contain a [`ConnectionDenied`] type that can be downcast to [`MemoryUsageLimitExceeded`] error if (and only if) **this**
-/// behaviour denied the connection.
+/// If a connection is denied due to a limit, either a
+/// [`SwarmEvent::IncomingConnectionError`](libp2p_swarm::SwarmEvent::IncomingConnectionError)
+/// or [`SwarmEvent::OutgoingConnectionError`](libp2p_swarm::SwarmEvent::OutgoingConnectionError)
+/// will be emitted. The [`ListenError::Denied`](libp2p_swarm::ListenError::Denied) and respectively
+/// the [`DialError::Denied`](libp2p_swarm::DialError::Denied) variant
+/// contain a [`ConnectionDenied`] type that can be downcast to [`MemoryUsageLimitExceeded`] error
+/// if (and only if) **this** behaviour denied the connection.
 ///
-/// If you employ multiple [`NetworkBehaviour`]s that manage connections, it may also be a different error.
+/// If you employ multiple [`NetworkBehaviour`]s that manage connections,
+/// it may also be a different error.
 ///
 /// [Behaviour::with_max_bytes] and [Behaviour::with_max_percentage] are mutually exclusive.
-/// If you need to employ both of them, compose two instances of [Behaviour] into your custom behaviour.
+/// If you need to employ both of them,
+/// compose two instances of [Behaviour] into your custom behaviour.
 ///
 /// # Example
 ///
@@ -58,8 +63,8 @@ use sysinfo::MemoryRefreshKind;
 /// #[derive(NetworkBehaviour)]
 /// # #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
 /// struct MyBehaviour {
-///   identify: identify::Behaviour,
-///   limits: memory_connection_limits::Behaviour
+///     identify: identify::Behaviour,
+///     limits: memory_connection_limits::Behaviour,
 /// }
 /// ```
 pub struct Behaviour {
@@ -68,7 +73,8 @@ pub struct Behaviour {
     last_refreshed: Instant,
 }
 
-/// The maximum duration for which the retrieved memory-stats of the process are allowed to be stale.
+/// The maximum duration for which the retrieved memory-stats
+/// of the process are allowed to be stale.
 ///
 /// Once exceeded, we will retrieve new stats.
 const MAX_STALE_DURATION: Duration = Duration::from_millis(100);
diff --git a/misc/memory-connection-limits/tests/max_bytes.rs b/misc/memory-connection-limits/tests/max_bytes.rs
index 7f89e2c7a9a..e82ad67d076 100644
--- a/misc/memory-connection-limits/tests/max_bytes.rs
+++ b/misc/memory-connection-limits/tests/max_bytes.rs
@@ -20,14 +20,14 @@
 
 mod util;
 
+use std::time::Duration;
+
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_memory_connection_limits::*;
-use std::time::Duration;
-use util::*;
-
 use libp2p_swarm::{dial_opts::DialOpts, DialError, Swarm};
 use libp2p_swarm_test::SwarmExt;
+use util::*;
 
 #[test]
 fn max_bytes() {
@@ -69,7 +69,8 @@ fn max_bytes() {
             .expect("Unexpected connection limit.");
     }
 
-    std::thread::sleep(Duration::from_millis(100)); // Memory stats are only updated every 100ms internally, ensure they are up-to-date when we try to exceed it.
+    std::thread::sleep(Duration::from_millis(100)); // Memory stats are only updated every 100ms internally, ensure they are up-to-date when we try
+                                                    // to exceed it.
 
     match network
         .dial(
diff --git a/misc/memory-connection-limits/tests/max_percentage.rs b/misc/memory-connection-limits/tests/max_percentage.rs
index bfb1b504af5..51fe783b3c5 100644
--- a/misc/memory-connection-limits/tests/max_percentage.rs
+++ b/misc/memory-connection-limits/tests/max_percentage.rs
@@ -20,18 +20,18 @@
 
 mod util;
 
+use std::time::Duration;
+
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_memory_connection_limits::*;
-use std::time::Duration;
-use sysinfo::{MemoryRefreshKind, RefreshKind};
-use util::*;
-
 use libp2p_swarm::{
     dial_opts::{DialOpts, PeerCondition},
     DialError, Swarm,
 };
 use libp2p_swarm_test::SwarmExt;
+use sysinfo::{MemoryRefreshKind, RefreshKind};
+use util::*;
 
 #[test]
 fn max_percentage() {
@@ -76,7 +76,9 @@ fn max_percentage() {
             .expect("Unexpected connection limit.");
     }
 
-    std::thread::sleep(Duration::from_millis(100)); // Memory stats are only updated every 100ms internally, ensure they are up-to-date when we try to exceed it.
+    // Memory stats are only updated every 100ms internally,
+    // ensure they are up-to-date when we try to exceed it.
+    std::thread::sleep(Duration::from_millis(100));
 
     match network
         .dial(
diff --git a/misc/memory-connection-limits/tests/util/mod.rs b/misc/memory-connection-limits/tests/util/mod.rs
index 333b0ee135f..205f4d13bc4 100644
--- a/misc/memory-connection-limits/tests/util/mod.rs
+++ b/misc/memory-connection-limits/tests/util/mod.rs
@@ -18,7 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::task::{Context, Poll};
+use std::{
+    convert::Infallible,
+    task::{Context, Poll},
+};
 
 use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
@@ -26,7 +29,6 @@ use libp2p_swarm::{
     dummy, ConnectionDenied, ConnectionId, FromSwarm, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use std::convert::Infallible;
 
 #[derive(libp2p_swarm_derive::NetworkBehaviour)]
 #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
diff --git a/misc/metrics/src/bandwidth.rs b/misc/metrics/src/bandwidth.rs
index 8a0f54e5b65..b6308ed1b51 100644
--- a/misc/metrics/src/bandwidth.rs
+++ b/misc/metrics/src/bandwidth.rs
@@ -1,4 +1,10 @@
-use crate::protocol_stack;
+use std::{
+    convert::TryFrom as _,
+    io,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{
     future::{MapOk, TryFutureExt},
     io::{IoSlice, IoSliceMut},
@@ -16,12 +22,8 @@ use prometheus_client::{
     metrics::{counter::Counter, family::Family},
     registry::{Registry, Unit},
 };
-use std::{
-    convert::TryFrom as _,
-    io,
-    pin::Pin,
-    task::{Context, Poll},
-};
+
+use crate::protocol_stack;
 
 #[derive(Debug, Clone)]
 #[pin_project::pin_project]
diff --git a/misc/metrics/src/dcutr.rs b/misc/metrics/src/dcutr.rs
index 3e60dca2cab..6a0f27394e9 100644
--- a/misc/metrics/src/dcutr.rs
+++ b/misc/metrics/src/dcutr.rs
@@ -18,10 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::family::Family;
-use prometheus_client::registry::Registry;
+use prometheus_client::{
+    encoding::{EncodeLabelSet, EncodeLabelValue},
+    metrics::{counter::Counter, family::Family},
+    registry::Registry,
+};
 
 pub(crate) struct Metrics {
     events: Family<EventLabels, Counter>,
diff --git a/misc/metrics/src/gossipsub.rs b/misc/metrics/src/gossipsub.rs
index 2d90b92fbc6..b3e2e11f0b0 100644
--- a/misc/metrics/src/gossipsub.rs
+++ b/misc/metrics/src/gossipsub.rs
@@ -18,8 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::registry::Registry;
+use prometheus_client::{metrics::counter::Counter, registry::Registry};
 
 pub(crate) struct Metrics {
     messages: Counter,
diff --git a/misc/metrics/src/identify.rs b/misc/metrics/src/identify.rs
index 03ac3f9634e..b16c6a56ccf 100644
--- a/misc/metrics/src/identify.rs
+++ b/misc/metrics/src/identify.rs
@@ -18,17 +18,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::protocol_stack;
+use std::{
+    collections::HashMap,
+    sync::{Arc, Mutex},
+};
+
 use libp2p_identity::PeerId;
 use libp2p_swarm::StreamProtocol;
-use prometheus_client::collector::Collector;
-use prometheus_client::encoding::{DescriptorEncoder, EncodeMetric};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::gauge::ConstGauge;
-use prometheus_client::metrics::MetricType;
-use prometheus_client::registry::Registry;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
+use prometheus_client::{
+    collector::Collector,
+    encoding::{DescriptorEncoder, EncodeMetric},
+    metrics::{counter::Counter, gauge::ConstGauge, MetricType},
+    registry::Registry,
+};
+
+use crate::protocol_stack;
 
 const ALLOWED_PROTOCOLS: &[StreamProtocol] = &[
     #[cfg(feature = "dcutr")]
diff --git a/misc/metrics/src/kad.rs b/misc/metrics/src/kad.rs
index bd5a6526737..0a2a8038511 100644
--- a/misc/metrics/src/kad.rs
+++ b/misc/metrics/src/kad.rs
@@ -18,11 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::family::Family;
-use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
-use prometheus_client::registry::{Registry, Unit};
+use prometheus_client::{
+    encoding::{EncodeLabelSet, EncodeLabelValue},
+    metrics::{
+        counter::Counter,
+        family::Family,
+        histogram::{exponential_buckets, Histogram},
+    },
+    registry::{Registry, Unit},
+};
 
 pub(crate) struct Metrics {
     query_result_get_record_ok: Counter,
diff --git a/misc/metrics/src/lib.rs b/misc/metrics/src/lib.rs
index 74fd15e2181..1fd79e7846f 100644
--- a/misc/metrics/src/lib.rs
+++ b/misc/metrics/src/lib.rs
@@ -67,8 +67,8 @@ impl Metrics {
     /// Create a new set of Swarm and protocol [`Metrics`].
     ///
     /// ```
-    /// use prometheus_client::registry::Registry;
     /// use libp2p_metrics::Metrics;
+    /// use prometheus_client::registry::Registry;
     /// let mut registry = Registry::default();
     /// let metrics = Metrics::new(&mut registry);
     /// ```
diff --git a/misc/metrics/src/ping.rs b/misc/metrics/src/ping.rs
index afdd05134a6..ce653c72ea1 100644
--- a/misc/metrics/src/ping.rs
+++ b/misc/metrics/src/ping.rs
@@ -18,11 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::family::Family;
-use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
-use prometheus_client::registry::{Registry, Unit};
+use prometheus_client::{
+    encoding::{EncodeLabelSet, EncodeLabelValue},
+    metrics::{
+        counter::Counter,
+        family::Family,
+        histogram::{exponential_buckets, Histogram},
+    },
+    registry::{Registry, Unit},
+};
 
 #[derive(Clone, Hash, PartialEq, Eq, EncodeLabelSet, Debug)]
 struct FailureLabels {
diff --git a/misc/metrics/src/relay.rs b/misc/metrics/src/relay.rs
index 607daf3f1e1..d4c25b6eb3e 100644
--- a/misc/metrics/src/relay.rs
+++ b/misc/metrics/src/relay.rs
@@ -18,10 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::family::Family;
-use prometheus_client::registry::Registry;
+use prometheus_client::{
+    encoding::{EncodeLabelSet, EncodeLabelValue},
+    metrics::{counter::Counter, family::Family},
+    registry::Registry,
+};
 
 pub(crate) struct Metrics {
     events: Family<EventLabels, Counter>,
diff --git a/misc/metrics/src/swarm.rs b/misc/metrics/src/swarm.rs
index 51c0a0af253..6e95d082de6 100644
--- a/misc/metrics/src/swarm.rs
+++ b/misc/metrics/src/swarm.rs
@@ -18,18 +18,25 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
+use std::{
+    collections::HashMap,
+    sync::{Arc, Mutex},
+};
 
-use crate::protocol_stack;
 use libp2p_swarm::{ConnectionId, DialError, SwarmEvent};
-use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::family::Family;
-use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
-use prometheus_client::registry::{Registry, Unit};
+use prometheus_client::{
+    encoding::{EncodeLabelSet, EncodeLabelValue},
+    metrics::{
+        counter::Counter,
+        family::Family,
+        histogram::{exponential_buckets, Histogram},
+    },
+    registry::{Registry, Unit},
+};
 use web_time::Instant;
 
+use crate::protocol_stack;
+
 pub(crate) struct Metrics {
     connections_incoming: Family<AddressLabels, Counter>,
     connections_incoming_error: Family<IncomingConnectionErrorLabels, Counter>,
diff --git a/misc/multistream-select/src/dialer_select.rs b/misc/multistream-select/src/dialer_select.rs
index 83bb4909041..1d13e94910d 100644
--- a/misc/multistream-select/src/dialer_select.rs
+++ b/misc/multistream-select/src/dialer_select.rs
@@ -20,10 +20,6 @@
 
 //! Protocol negotiation strategies for the peer acting as the dialer.
 
-use crate::protocol::{HeaderLine, Message, MessageIO, Protocol, ProtocolError};
-use crate::{Negotiated, NegotiationError, Version};
-
-use futures::prelude::*;
 use std::{
     convert::TryFrom as _,
     iter, mem,
@@ -31,6 +27,13 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::prelude::*;
+
+use crate::{
+    protocol::{HeaderLine, Message, MessageIO, Protocol, ProtocolError},
+    Negotiated, NegotiationError, Version,
+};
+
 /// Returns a `Future` that negotiates a protocol on the given I/O stream
 /// for a peer acting as the _dialer_ (or _initiator_).
 ///
@@ -84,8 +87,9 @@ enum State<R, N> {
 
 impl<R, I> Future for DialerSelectFuture<R, I>
 where
-    // The Unpin bound here is required because we produce a `Negotiated<R>` as the output.
-    // It also makes the implementation considerably easier to write.
+    // The Unpin bound here is required because we produce
+    // a `Negotiated<R>` as the output. It also makes
+    // the implementation considerably easier to write.
     R: AsyncRead + AsyncWrite + Unpin,
     I: Iterator,
     I::Item: AsRef<str>,
@@ -204,15 +208,19 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::listener_select_proto;
-    use async_std::future::timeout;
-    use async_std::net::{TcpListener, TcpStream};
-    use quickcheck::{Arbitrary, Gen, GenRange};
     use std::time::Duration;
+
+    use async_std::{
+        future::timeout,
+        net::{TcpListener, TcpStream},
+    };
+    use quickcheck::{Arbitrary, Gen, GenRange};
     use tracing::metadata::LevelFilter;
     use tracing_subscriber::EnvFilter;
 
+    use super::*;
+    use crate::listener_select_proto;
+
     #[test]
     fn select_proto_basic() {
         async fn run(version: Version) {
@@ -353,8 +361,8 @@ mod tests {
                 .unwrap();
             assert_eq!(proto, "/proto1");
 
-            // client can close the connection even though protocol negotiation is not yet done, i.e.
-            // `_server_connection` had been untouched.
+            // client can close the connection even though protocol negotiation is not yet done,
+            // i.e. `_server_connection` had been untouched.
             io.close().await.unwrap();
         });
 
diff --git a/misc/multistream-select/src/length_delimited.rs b/misc/multistream-select/src/length_delimited.rs
index 3a7988d0548..8062455de46 100644
--- a/misc/multistream-select/src/length_delimited.rs
+++ b/misc/multistream-select/src/length_delimited.rs
@@ -18,8 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use bytes::{Buf as _, BufMut as _, Bytes, BytesMut};
-use futures::{io::IoSlice, prelude::*};
 use std::{
     convert::TryFrom as _,
     io,
@@ -27,6 +25,9 @@ use std::{
     task::{Context, Poll},
 };
 
+use bytes::{Buf as _, BufMut as _, Bytes, BytesMut};
+use futures::{io::IoSlice, prelude::*};
+
 const MAX_LEN_BYTES: u16 = 2;
 const MAX_FRAME_SIZE: u16 = (1 << (MAX_LEN_BYTES * 8 - MAX_LEN_BYTES)) - 1;
 const DEFAULT_BUFFER_SIZE: usize = 64;
@@ -383,10 +384,12 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::length_delimited::LengthDelimited;
+    use std::io::ErrorKind;
+
     use futures::{io::Cursor, prelude::*};
     use quickcheck::*;
-    use std::io::ErrorKind;
+
+    use crate::length_delimited::LengthDelimited;
 
     #[test]
     fn basic_read() {
diff --git a/misc/multistream-select/src/lib.rs b/misc/multistream-select/src/lib.rs
index 5565623f25e..96432de6cb0 100644
--- a/misc/multistream-select/src/lib.rs
+++ b/misc/multistream-select/src/lib.rs
@@ -70,20 +70,21 @@
 //!
 //! ```no_run
 //! use async_std::net::TcpStream;
-//! use multistream_select::{dialer_select_proto, Version};
 //! use futures::prelude::*;
+//! use multistream_select::{dialer_select_proto, Version};
 //!
 //! async_std::task::block_on(async move {
 //!     let socket = TcpStream::connect("127.0.0.1:10333").await.unwrap();
 //!
 //!     let protos = vec!["/echo/1.0.0", "/echo/2.5.0"];
-//!     let (protocol, _io) = dialer_select_proto(socket, protos, Version::V1).await.unwrap();
+//!     let (protocol, _io) = dialer_select_proto(socket, protos, Version::V1)
+//!         .await
+//!         .unwrap();
 //!
 //!     println!("Negotiated protocol: {:?}", protocol);
 //!     // You can now use `_io` to communicate with the remote.
 //! });
 //! ```
-//!
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
@@ -93,10 +94,12 @@ mod listener_select;
 mod negotiated;
 mod protocol;
 
-pub use self::dialer_select::{dialer_select_proto, DialerSelectFuture};
-pub use self::listener_select::{listener_select_proto, ListenerSelectFuture};
-pub use self::negotiated::{Negotiated, NegotiatedComplete, NegotiationError};
-pub use self::protocol::ProtocolError;
+pub use self::{
+    dialer_select::{dialer_select_proto, DialerSelectFuture},
+    listener_select::{listener_select_proto, ListenerSelectFuture},
+    negotiated::{Negotiated, NegotiatedComplete, NegotiationError},
+    protocol::ProtocolError,
+};
 
 /// Supported multistream-select versions.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
diff --git a/misc/multistream-select/src/listener_select.rs b/misc/multistream-select/src/listener_select.rs
index b4236310a1d..cd5af72a9d0 100644
--- a/misc/multistream-select/src/listener_select.rs
+++ b/misc/multistream-select/src/listener_select.rs
@@ -21,11 +21,6 @@
 //! Protocol negotiation strategies for the peer acting as the listener
 //! in a multistream-select protocol negotiation.
 
-use crate::protocol::{HeaderLine, Message, MessageIO, Protocol, ProtocolError};
-use crate::{Negotiated, NegotiationError};
-
-use futures::prelude::*;
-use smallvec::SmallVec;
 use std::{
     convert::TryFrom as _,
     mem,
@@ -33,6 +28,14 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::prelude::*;
+use smallvec::SmallVec;
+
+use crate::{
+    protocol::{HeaderLine, Message, MessageIO, Protocol, ProtocolError},
+    Negotiated, NegotiationError,
+};
+
 /// Returns a `Future` that negotiates a protocol on the given I/O stream
 /// for a peer acting as the _listener_ (or _responder_).
 ///
@@ -109,8 +112,10 @@ enum State<R, N> {
 
 impl<R, N> Future for ListenerSelectFuture<R, N>
 where
-    // The Unpin bound here is required because we produce a `Negotiated<R>` as the output.
-    // It also makes the implementation considerably easier to write.
+    // The Unpin bound here is required because
+    // we produce a `Negotiated<R>` as the output.
+    // It also makes the implementation considerably
+    // easier to write.
     R: AsyncRead + AsyncWrite + Unpin,
     N: AsRef<str> + Clone,
 {
diff --git a/misc/multistream-select/src/negotiated.rs b/misc/multistream-select/src/negotiated.rs
index a24014a4f5f..6693b3b5636 100644
--- a/misc/multistream-select/src/negotiated.rs
+++ b/misc/multistream-select/src/negotiated.rs
@@ -18,7 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::protocol::{HeaderLine, Message, MessageReader, Protocol, ProtocolError};
+use std::{
+    error::Error,
+    fmt, io, mem,
+    pin::Pin,
+    task::{Context, Poll},
+};
 
 use futures::{
     io::{IoSlice, IoSliceMut},
@@ -26,12 +31,8 @@ use futures::{
     ready,
 };
 use pin_project::pin_project;
-use std::{
-    error::Error,
-    fmt, io, mem,
-    pin::Pin,
-    task::{Context, Poll},
-};
+
+use crate::protocol::{HeaderLine, Message, MessageReader, Protocol, ProtocolError};
 
 /// An I/O stream that has settled on an (application-layer) protocol to use.
 ///
@@ -59,8 +60,10 @@ pub struct NegotiatedComplete<TInner> {
 
 impl<TInner> Future for NegotiatedComplete<TInner>
 where
-    // `Unpin` is required not because of implementation details but because we produce the
-    // `Negotiated` as the output of the future.
+    // `Unpin` is required not because of
+    // implementation details but because we produce
+    // the `Negotiated` as the output of the
+    // future.
     TInner: AsyncRead + AsyncWrite + Unpin,
 {
     type Output = Result<Negotiated<TInner>, NegotiationError>;
@@ -250,13 +253,13 @@ where
     }
 
     // TODO: implement once method is stabilized in the futures crate
-    /*unsafe fn initializer(&self) -> Initializer {
-        match &self.state {
-            State::Completed { io, .. } => io.initializer(),
-            State::Expecting { io, .. } => io.inner_ref().initializer(),
-            State::Invalid => panic!("Negotiated: Invalid state"),
-        }
-    }*/
+    // unsafe fn initializer(&self) -> Initializer {
+    // match &self.state {
+    // State::Completed { io, .. } => io.initializer(),
+    // State::Expecting { io, .. } => io.inner_ref().initializer(),
+    // State::Invalid => panic!("Negotiated: Invalid state"),
+    // }
+    // }
 
     fn poll_read_vectored(
         mut self: Pin<&mut Self>,
diff --git a/misc/multistream-select/src/protocol.rs b/misc/multistream-select/src/protocol.rs
index 92b6acedaeb..93cd4ac02b5 100644
--- a/misc/multistream-select/src/protocol.rs
+++ b/misc/multistream-select/src/protocol.rs
@@ -25,19 +25,22 @@
 //! `Stream` and `Sink` implementations of `MessageIO` and
 //! `MessageReader`.
 
-use crate::length_delimited::{LengthDelimited, LengthDelimitedReader};
-use crate::Version;
-
-use bytes::{BufMut, Bytes, BytesMut};
-use futures::{io::IoSlice, prelude::*, ready};
 use std::{
     error::Error,
     fmt, io,
     pin::Pin,
     task::{Context, Poll},
 };
+
+use bytes::{BufMut, Bytes, BytesMut};
+use futures::{io::IoSlice, prelude::*, ready};
 use unsigned_varint as uvi;
 
+use crate::{
+    length_delimited::{LengthDelimited, LengthDelimitedReader},
+    Version,
+};
+
 /// The maximum number of supported protocols that can be processed.
 const MAX_PROTOCOLS: usize = 1000;
 
@@ -461,10 +464,12 @@ impl fmt::Display for ProtocolError {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use quickcheck::*;
     use std::iter;
 
+    use quickcheck::*;
+
+    use super::*;
+
     impl Arbitrary for Protocol {
         fn arbitrary(g: &mut Gen) -> Protocol {
             let n = g.gen_range(1..g.size());
diff --git a/misc/quick-protobuf-codec/src/lib.rs b/misc/quick-protobuf-codec/src/lib.rs
index c57b7da7db8..d49315a54c3 100644
--- a/misc/quick-protobuf-codec/src/lib.rs
+++ b/misc/quick-protobuf-codec/src/lib.rs
@@ -1,10 +1,10 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
+use std::{io, marker::PhantomData};
+
 use asynchronous_codec::{Decoder, Encoder};
 use bytes::{Buf, BufMut, BytesMut};
 use quick_protobuf::{BytesReader, MessageRead, MessageWrite, Writer, WriterBackend};
-use std::io;
-use std::marker::PhantomData;
 
 mod generated;
 
@@ -182,12 +182,13 @@ impl From<Error> for io::Error {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::error::Error;
+
     use asynchronous_codec::FramedRead;
-    use futures::io::Cursor;
-    use futures::{FutureExt, StreamExt};
+    use futures::{io::Cursor, FutureExt, StreamExt};
     use quickcheck::{Arbitrary, Gen, QuickCheck};
-    use std::error::Error;
+
+    use super::*;
 
     #[test]
     fn honors_max_message_length() {
diff --git a/misc/quick-protobuf-codec/tests/large_message.rs b/misc/quick-protobuf-codec/tests/large_message.rs
index 65dafe065d1..a434d3ce17f 100644
--- a/misc/quick-protobuf-codec/tests/large_message.rs
+++ b/misc/quick-protobuf-codec/tests/large_message.rs
@@ -1,7 +1,6 @@
 use asynchronous_codec::Encoder;
 use bytes::BytesMut;
-use quick_protobuf_codec::proto;
-use quick_protobuf_codec::Codec;
+use quick_protobuf_codec::{proto, Codec};
 
 #[test]
 fn encode_large_message() {
diff --git a/misc/quickcheck-ext/src/lib.rs b/misc/quickcheck-ext/src/lib.rs
index 4ada7e73ba1..9c2deec8743 100644
--- a/misc/quickcheck-ext/src/lib.rs
+++ b/misc/quickcheck-ext/src/lib.rs
@@ -1,9 +1,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-pub use quickcheck::*;
-
 use core::ops::Range;
+
 use num_traits::sign::Unsigned;
+pub use quickcheck::*;
 
 pub trait GenRange {
     fn gen_range<T: Unsigned + Arbitrary + Copy>(&mut self, _range: Range<T>) -> T;
diff --git a/misc/rw-stream-sink/src/lib.rs b/misc/rw-stream-sink/src/lib.rs
index f10e683ad33..5fdf1987252 100644
--- a/misc/rw-stream-sink/src/lib.rs
+++ b/misc/rw-stream-sink/src/lib.rs
@@ -27,7 +27,6 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-use futures::{prelude::*, ready};
 use std::{
     io::{self, Read},
     mem,
@@ -35,6 +34,8 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::{prelude::*, ready};
+
 static_assertions::const_assert!(mem::size_of::<usize>() <= mem::size_of::<u64>());
 
 /// Wraps a [`Stream`] and [`Sink`] whose items are buffers.
@@ -115,14 +116,16 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::RwStreamSink;
-    use async_std::task;
-    use futures::{channel::mpsc, prelude::*};
     use std::{
         pin::Pin,
         task::{Context, Poll},
     };
 
+    use async_std::task;
+    use futures::{channel::mpsc, prelude::*};
+
+    use super::RwStreamSink;
+
     // This struct merges a stream and a sink and is quite useful for tests.
     struct Wrapper<St, Si>(St, Si);
 
diff --git a/misc/server/src/behaviour.rs b/misc/server/src/behaviour.rs
index 36b18c9798d..230d62a2ef3 100644
--- a/misc/server/src/behaviour.rs
+++ b/misc/server/src/behaviour.rs
@@ -1,13 +1,10 @@
-use libp2p::autonat;
-use libp2p::identify;
-use libp2p::kad;
-use libp2p::ping;
-use libp2p::relay;
-use libp2p::swarm::behaviour::toggle::Toggle;
-use libp2p::swarm::{NetworkBehaviour, StreamProtocol};
-use libp2p::{identity, Multiaddr, PeerId};
-use std::str::FromStr;
-use std::time::Duration;
+use std::{str::FromStr, time::Duration};
+
+use libp2p::{
+    autonat, identify, identity, kad, ping, relay,
+    swarm::{behaviour::toggle::Toggle, NetworkBehaviour, StreamProtocol},
+    Multiaddr, PeerId,
+};
 
 const BOOTNODES: [&str; 4] = [
     "QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
diff --git a/misc/server/src/config.rs b/misc/server/src/config.rs
index c3e3ec529c1..2e4b2746d09 100644
--- a/misc/server/src/config.rs
+++ b/misc/server/src/config.rs
@@ -1,7 +1,7 @@
+use std::{error::Error, path::Path};
+
 use libp2p::Multiaddr;
 use serde_derive::Deserialize;
-use std::error::Error;
-use std::path::Path;
 
 #[derive(Clone, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/misc/server/src/http_service.rs b/misc/server/src/http_service.rs
index cee1aa96e28..87a8adb94e0 100644
--- a/misc/server/src/http_service.rs
+++ b/misc/server/src/http_service.rs
@@ -18,15 +18,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use axum::extract::State;
-use axum::http::StatusCode;
-use axum::response::IntoResponse;
-use axum::routing::get;
-use axum::Router;
-use prometheus_client::encoding::text::encode;
-use prometheus_client::registry::Registry;
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex};
+use std::{
+    net::SocketAddr,
+    sync::{Arc, Mutex},
+};
+
+use axum::{extract::State, http::StatusCode, response::IntoResponse, routing::get, Router};
+use prometheus_client::{encoding::text::encode, registry::Registry};
 use tokio::net::TcpListener;
 
 const METRICS_CONTENT_TYPE: &str = "application/openmetrics-text;charset=utf-8;version=1.0.0";
diff --git a/misc/server/src/main.rs b/misc/server/src/main.rs
index 820921beaed..a633a80207e 100644
--- a/misc/server/src/main.rs
+++ b/misc/server/src/main.rs
@@ -1,18 +1,18 @@
+use std::{error::Error, path::PathBuf, str::FromStr};
+
 use base64::Engine;
 use clap::Parser;
 use futures::stream::StreamExt;
-use libp2p::identity;
-use libp2p::identity::PeerId;
-use libp2p::kad;
-use libp2p::metrics::{Metrics, Recorder};
-use libp2p::swarm::SwarmEvent;
-use libp2p::tcp;
-use libp2p::{identify, noise, yamux};
-use prometheus_client::metrics::info::Info;
-use prometheus_client::registry::Registry;
-use std::error::Error;
-use std::path::PathBuf;
-use std::str::FromStr;
+use libp2p::{
+    identify, identity,
+    identity::PeerId,
+    kad,
+    metrics::{Metrics, Recorder},
+    noise,
+    swarm::SwarmEvent,
+    tcp, yamux,
+};
+use prometheus_client::{metrics::info::Info, registry::Registry};
 use tracing_subscriber::EnvFilter;
 use zeroize::Zeroizing;
 
diff --git a/misc/webrtc-utils/src/fingerprint.rs b/misc/webrtc-utils/src/fingerprint.rs
index a02c4d1116d..c32d33d5bab 100644
--- a/misc/webrtc-utils/src/fingerprint.rs
+++ b/misc/webrtc-utils/src/fingerprint.rs
@@ -19,9 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::fmt;
+
 use libp2p_core::multihash;
 use sha2::Digest as _;
-use std::fmt;
 
 pub const SHA256: &str = "sha-256";
 const MULTIHASH_SHA256_CODE: u64 = 0x12;
diff --git a/misc/webrtc-utils/src/noise.rs b/misc/webrtc-utils/src/noise.rs
index 9180acfc1ca..705db7f4697 100644
--- a/misc/webrtc-utils/src/noise.rs
+++ b/misc/webrtc-utils/src/noise.rs
@@ -19,16 +19,17 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures::{AsyncRead, AsyncWrite, AsyncWriteExt};
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::UpgradeInfo;
+use libp2p_core::{
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    UpgradeInfo,
+};
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use libp2p_noise as noise;
+pub use noise::Error;
 
 use crate::fingerprint::Fingerprint;
 
-pub use noise::Error;
-
 pub async fn inbound<T>(
     id_keys: identity::Keypair,
     stream: T,
@@ -89,9 +90,10 @@ pub(crate) fn noise_prologue(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use hex_literal::hex;
 
+    use super::*;
+
     #[test]
     fn noise_prologue_tests() {
         let a = Fingerprint::raw(hex!(
diff --git a/misc/webrtc-utils/src/sdp.rs b/misc/webrtc-utils/src/sdp.rs
index 0796548f449..96a07f5db95 100644
--- a/misc/webrtc-utils/src/sdp.rs
+++ b/misc/webrtc-utils/src/sdp.rs
@@ -18,13 +18,13 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-use crate::fingerprint::Fingerprint;
-use serde::Serialize;
 use std::net::{IpAddr, SocketAddr};
+
+use rand::{distributions::Alphanumeric, thread_rng, Rng};
+use serde::Serialize;
 use tinytemplate::TinyTemplate;
 
-use rand::distributions::Alphanumeric;
-use rand::{thread_rng, Rng};
+use crate::fingerprint::Fingerprint;
 
 pub fn answer(addr: SocketAddr, server_fingerprint: Fingerprint, client_ufrag: &str) -> String {
     let answer = render_description(
@@ -71,7 +71,8 @@ pub fn answer(addr: SocketAddr, server_fingerprint: Fingerprint, client_ufrag: &
 //     the answerer is received, which adds additional latency. setup:active allows the answer and
 //     the DTLS handshake to occur in parallel. Thus, setup:active is RECOMMENDED.
 //
-// a=candidate:<foundation> <component-id> <transport> <priority> <connection-address> <port> <cand-type>
+// a=candidate:<foundation> <component-id> <transport> <priority> <connection-address> <port>
+// <cand-type>
 //
 //     A transport address for a candidate that can be used for connectivity checks (RFC8839).
 //
diff --git a/misc/webrtc-utils/src/stream.rs b/misc/webrtc-utils/src/stream.rs
index 17f746a92a1..0ec420a103a 100644
--- a/misc/webrtc-utils/src/stream.rs
+++ b/misc/webrtc-utils/src/stream.rs
@@ -19,20 +19,22 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use bytes::Bytes;
-use futures::{channel::oneshot, prelude::*, ready};
-
 use std::{
     io,
     pin::Pin,
     task::{Context, Poll},
 };
 
-use crate::proto::{Flag, Message};
+use bytes::Bytes;
+use futures::{channel::oneshot, prelude::*, ready};
+
 use crate::{
-    stream::drop_listener::GracefullyClosed,
-    stream::framed_dc::FramedDc,
-    stream::state::{Closing, State},
+    proto::{Flag, Message},
+    stream::{
+        drop_listener::GracefullyClosed,
+        framed_dc::FramedDc,
+        state::{Closing, State},
+    },
 };
 
 mod drop_listener;
@@ -69,7 +71,8 @@ impl<T> Stream<T>
 where
     T: AsyncRead + AsyncWrite + Unpin + Clone,
 {
-    /// Returns a new [`Stream`] and a [`DropListener`], which will notify the receiver when/if the stream is dropped.
+    /// Returns a new [`Stream`] and a [`DropListener`],
+    /// which will notify the receiver when/if the stream is dropped.
     pub fn new(data_channel: T) -> (Self, DropListener<T>) {
         let (sender, receiver) = oneshot::channel();
 
@@ -175,8 +178,9 @@ where
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
         while self.state.read_flags_in_async_write() {
-            // TODO: In case AsyncRead::poll_read encountered an error or returned None earlier, we will poll the
-            // underlying I/O resource once more. Is that allowed? How about introducing a state IoReadClosed?
+            // TODO: In case AsyncRead::poll_read encountered an error or returned None earlier, we
+            // will poll the underlying I/O resource once more. Is that allowed? How
+            // about introducing a state IoReadClosed?
 
             let Self {
                 read_buffer,
@@ -265,11 +269,12 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::stream::framed_dc::codec;
     use asynchronous_codec::Encoder;
     use bytes::BytesMut;
 
+    use super::*;
+    use crate::stream::framed_dc::codec;
+
     #[test]
     fn max_data_len() {
         // Largest possible message.
diff --git a/misc/webrtc-utils/src/stream/drop_listener.rs b/misc/webrtc-utils/src/stream/drop_listener.rs
index 9745e3d4364..ea3f19d2f57 100644
--- a/misc/webrtc-utils/src/stream/drop_listener.rs
+++ b/misc/webrtc-utils/src/stream/drop_listener.rs
@@ -18,17 +18,22 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::channel::oneshot;
-use futures::channel::oneshot::Canceled;
-use futures::{AsyncRead, AsyncWrite, FutureExt, SinkExt};
+use std::{
+    future::Future,
+    io,
+    pin::Pin,
+    task::{Context, Poll},
+};
 
-use std::future::Future;
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
+use futures::{
+    channel::{oneshot, oneshot::Canceled},
+    AsyncRead, AsyncWrite, FutureExt, SinkExt,
+};
 
-use crate::proto::{Flag, Message};
-use crate::stream::framed_dc::FramedDc;
+use crate::{
+    proto::{Flag, Message},
+    stream::framed_dc::FramedDc,
+};
 
 #[must_use]
 pub struct DropListener<T> {
diff --git a/misc/webrtc-utils/src/stream/framed_dc.rs b/misc/webrtc-utils/src/stream/framed_dc.rs
index 721178fdcd3..a7b9b6214e0 100644
--- a/misc/webrtc-utils/src/stream/framed_dc.rs
+++ b/misc/webrtc-utils/src/stream/framed_dc.rs
@@ -21,8 +21,10 @@
 use asynchronous_codec::Framed;
 use futures::{AsyncRead, AsyncWrite};
 
-use crate::proto::Message;
-use crate::stream::{MAX_DATA_LEN, MAX_MSG_LEN, VARINT_LEN};
+use crate::{
+    proto::Message,
+    stream::{MAX_DATA_LEN, MAX_MSG_LEN, VARINT_LEN},
+};
 
 pub(crate) type FramedDc<T> = Framed<T, quick_protobuf_codec::Codec<Message>>;
 pub(crate) fn new<T>(inner: T) -> FramedDc<T>
diff --git a/misc/webrtc-utils/src/stream/state.rs b/misc/webrtc-utils/src/stream/state.rs
index 082325e4d47..006c1610d00 100644
--- a/misc/webrtc-utils/src/stream/state.rs
+++ b/misc/webrtc-utils/src/stream/state.rs
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use bytes::Bytes;
-
 use std::io;
 
+use bytes::Bytes;
+
 use crate::proto::Flag;
 
 #[derive(Debug, Copy, Clone)]
@@ -46,8 +46,8 @@ pub(crate) enum State {
 
 /// Represents the state of closing one half (either read or write) of the connection.
 ///
-/// Gracefully closing the read or write requires sending the `STOP_SENDING` or `FIN` flag respectively
-/// and flushing the underlying connection.
+/// Gracefully closing the read or write requires sending the `STOP_SENDING` or `FIN` flag
+/// respectively and flushing the underlying connection.
 #[derive(Debug, Copy, Clone)]
 pub(crate) enum Closing {
     Requested,
@@ -181,8 +181,8 @@ impl State {
 
     /// Whether we should read from the stream in the [`futures::AsyncWrite`] implementation.
     ///
-    /// This is necessary for read-closed streams because we would otherwise not read any more flags from
-    /// the socket.
+    /// This is necessary for read-closed streams because we would otherwise
+    /// not read any more flags from the socket.
     pub(crate) fn read_flags_in_async_write(&self) -> bool {
         matches!(self, Self::ReadClosed)
     }
@@ -324,9 +324,10 @@ impl State {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::io::ErrorKind;
 
+    use super::*;
+
     #[test]
     fn cannot_read_after_receiving_fin() {
         let mut open = State::Open;
diff --git a/misc/webrtc-utils/src/transport.rs b/misc/webrtc-utils/src/transport.rs
index 440ad73ed02..60b1934082f 100644
--- a/misc/webrtc-utils/src/transport.rs
+++ b/misc/webrtc-utils/src/transport.rs
@@ -1,7 +1,9 @@
-use crate::fingerprint::Fingerprint;
-use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use std::net::{IpAddr, SocketAddr};
 
+use libp2p_core::{multiaddr::Protocol, Multiaddr};
+
+use crate::fingerprint::Fingerprint;
+
 /// Parse the given [`Multiaddr`] into a [`SocketAddr`] and a [`Fingerprint`] for dialing.
 pub fn parse_webrtc_dial_addr(addr: &Multiaddr) -> Option<(SocketAddr, Fingerprint)> {
     let mut iter = addr.iter();
@@ -38,9 +40,10 @@ pub fn parse_webrtc_dial_addr(addr: &Multiaddr) -> Option<(SocketAddr, Fingerpri
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::net::{Ipv4Addr, Ipv6Addr};
 
+    use super::*;
+
     #[test]
     fn parse_valid_address_with_certhash_and_p2p() {
         let addr = "/ip4/127.0.0.1/udp/39901/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS"
diff --git a/muxers/mplex/benches/split_send_size.rs b/muxers/mplex/benches/split_send_size.rs
index 44eafa884ac..b0dd4babff7 100644
--- a/muxers/mplex/benches/split_send_size.rs
+++ b/muxers/mplex/benches/split_send_size.rs
@@ -21,21 +21,23 @@
 //! A benchmark for the `split_send_size` configuration option
 //! using different transports.
 
+use std::{pin::Pin, time::Duration};
+
 use async_std::task;
 use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
-use futures::future::poll_fn;
-use futures::prelude::*;
-use futures::{channel::oneshot, future::join};
-use libp2p_core::muxing::StreamMuxerExt;
-use libp2p_core::transport::ListenerId;
-use libp2p_core::Endpoint;
-use libp2p_core::{multiaddr::multiaddr, muxing, transport, upgrade, Multiaddr, Transport};
+use futures::{
+    channel::oneshot,
+    future::{join, poll_fn},
+    prelude::*,
+};
+use libp2p_core::{
+    multiaddr::multiaddr, muxing, muxing::StreamMuxerExt, transport, transport::ListenerId,
+    upgrade, Endpoint, Multiaddr, Transport,
+};
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use libp2p_mplex as mplex;
 use libp2p_plaintext as plaintext;
-use std::pin::Pin;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 type BenchTransport = transport::Boxed<(PeerId, muxing::StreamMuxerBox)>;
@@ -120,7 +122,8 @@ fn run(
                 }
                 transport::TransportEvent::Incoming { upgrade, .. } => {
                     let (_peer, mut conn) = upgrade.await.unwrap();
-                    // Just calling `poll_inbound` without `poll` is fine here because mplex makes progress through all `poll_` functions. It is hacky though.
+                    // Just calling `poll_inbound` without `poll` is fine here because mplex makes
+                    // progress through all `poll_` functions. It is hacky though.
                     let mut s = poll_fn(|cx| conn.poll_inbound_unpin(cx))
                         .await
                         .expect("unexpected error");
@@ -158,7 +161,8 @@ fn run(
             .unwrap()
             .await
             .unwrap();
-        // Just calling `poll_outbound` without `poll` is fine here because mplex makes progress through all `poll_` functions. It is hacky though.
+        // Just calling `poll_outbound` without `poll` is fine here because mplex makes progress
+        // through all `poll_` functions. It is hacky though.
         let mut stream = poll_fn(|cx| conn.poll_outbound_unpin(cx)).await.unwrap();
         let mut off = 0;
         loop {
diff --git a/muxers/mplex/src/codec.rs b/muxers/mplex/src/codec.rs
index 014ee899280..a4a04d1964d 100644
--- a/muxers/mplex/src/codec.rs
+++ b/muxers/mplex/src/codec.rs
@@ -18,14 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use asynchronous_codec::{Decoder, Encoder};
-use bytes::{BufMut, Bytes, BytesMut};
-use libp2p_core::Endpoint;
 use std::{
     fmt,
     hash::{Hash, Hasher},
     io, mem,
 };
+
+use asynchronous_codec::{Decoder, Encoder};
+use bytes::{BufMut, Bytes, BytesMut};
+use libp2p_core::Endpoint;
 use unsigned_varint::{codec, encode};
 
 // Maximum size for a packet: 1MB as per the spec.
diff --git a/muxers/mplex/src/config.rs b/muxers/mplex/src/config.rs
index 3bf5e703a18..45bb05b2240 100644
--- a/muxers/mplex/src/config.rs
+++ b/muxers/mplex/src/config.rs
@@ -18,9 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::codec::MAX_FRAME_SIZE;
 use std::cmp;
 
+use crate::codec::MAX_FRAME_SIZE;
+
 pub(crate) const DEFAULT_MPLEX_PROTOCOL_NAME: &str = "/mplex/6.7.0";
 
 /// Configuration for the multiplexer.
diff --git a/muxers/mplex/src/io.rs b/muxers/mplex/src/io.rs
index 50fc0fc1d3f..ac93fd3865e 100644
--- a/muxers/mplex/src/io.rs
+++ b/muxers/mplex/src/io.rs
@@ -18,23 +18,31 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::codec::{Codec, Frame, LocalStreamId, RemoteStreamId};
-use crate::{MaxBufferBehaviour, MplexConfig};
+pub(crate) use std::io::{Error, Result};
+use std::{
+    cmp,
+    collections::VecDeque,
+    fmt, io, mem,
+    sync::Arc,
+    task::{Context, Poll, Waker},
+};
+
 use asynchronous_codec::Framed;
 use bytes::Bytes;
-use futures::task::{waker_ref, ArcWake, AtomicWaker, WakerRef};
-use futures::{prelude::*, ready, stream::Fuse};
+use futures::{
+    prelude::*,
+    ready,
+    stream::Fuse,
+    task::{waker_ref, ArcWake, AtomicWaker, WakerRef},
+};
 use nohash_hasher::{IntMap, IntSet};
 use parking_lot::Mutex;
 use smallvec::SmallVec;
-use std::collections::VecDeque;
-use std::{
-    cmp, fmt, io, mem,
-    sync::Arc,
-    task::{Context, Poll, Waker},
-};
 
-pub(crate) use std::io::{Error, Result};
+use crate::{
+    codec::{Codec, Frame, LocalStreamId, RemoteStreamId},
+    MaxBufferBehaviour, MplexConfig,
+};
 /// A connection identifier.
 ///
 /// Randomly generated and mainly intended to improve log output
@@ -302,13 +310,11 @@ where
     /// reading and writing immediately. The remote is informed
     /// based on the current state of the substream:
     ///
-    /// * If the substream was open, a `Reset` frame is sent at
-    ///   the next opportunity.
-    /// * If the substream was half-closed, i.e. a `Close` frame
-    ///   has already been sent, nothing further happens.
-    /// * If the substream was half-closed by the remote, i.e.
-    ///   a `Close` frame has already been received, a `Close`
-    ///   frame is sent at the next opportunity.
+    /// * If the substream was open, a `Reset` frame is sent at the next opportunity.
+    /// * If the substream was half-closed, i.e. a `Close` frame has already been sent, nothing
+    ///   further happens.
+    /// * If the substream was half-closed by the remote, i.e. a `Close` frame has already been
+    ///   received, a `Close` frame is sent at the next opportunity.
     ///
     /// If the multiplexed stream is closed or encountered
     /// an error earlier, or there is no known substream with
@@ -1146,15 +1152,14 @@ const EXTRA_PENDING_FRAMES: usize = 1000;
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::{collections::HashSet, num::NonZeroU8, ops::DerefMut, pin::Pin};
+
     use async_std::task;
     use asynchronous_codec::{Decoder, Encoder};
     use bytes::BytesMut;
     use quickcheck::*;
-    use std::collections::HashSet;
-    use std::num::NonZeroU8;
-    use std::ops::DerefMut;
-    use std::pin::Pin;
+
+    use super::*;
 
     impl Arbitrary for MaxBufferBehaviour {
         fn arbitrary(g: &mut Gen) -> MaxBufferBehaviour {
diff --git a/muxers/mplex/src/lib.rs b/muxers/mplex/src/lib.rs
index 17ca9ad46f6..1ef89dc283a 100644
--- a/muxers/mplex/src/lib.rs
+++ b/muxers/mplex/src/lib.rs
@@ -26,15 +26,22 @@ mod codec;
 mod config;
 mod io;
 
-pub use config::{MaxBufferBehaviour, MplexConfig};
+use std::{
+    cmp, iter,
+    pin::Pin,
+    sync::Arc,
+    task::{Context, Poll},
+};
 
 use bytes::Bytes;
 use codec::LocalStreamId;
+pub use config::{MaxBufferBehaviour, MplexConfig};
 use futures::{prelude::*, ready};
-use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo};
+use libp2p_core::{
+    muxing::{StreamMuxer, StreamMuxerEvent},
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo},
+};
 use parking_lot::Mutex;
-use std::{cmp, iter, pin::Pin, sync::Arc, task::Context, task::Poll};
 
 impl UpgradeInfo for MplexConfig {
     type Info = &'static str;
diff --git a/muxers/test-harness/src/lib.rs b/muxers/test-harness/src/lib.rs
index d03bdbdfed7..489d476f158 100644
--- a/muxers/test-harness/src/lib.rs
+++ b/muxers/test-harness/src/lib.rs
@@ -1,15 +1,20 @@
+use std::{
+    fmt,
+    future::Future,
+    mem,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{future, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, Stream, StreamExt};
+use libp2p_core::{
+    muxing::StreamMuxerExt,
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    StreamMuxer, UpgradeInfo,
+};
+
 use crate::future::{BoxFuture, Either, FutureExt};
-use futures::{future, AsyncRead, AsyncWrite};
-use futures::{AsyncReadExt, Stream};
-use futures::{AsyncWriteExt, StreamExt};
-use libp2p_core::muxing::StreamMuxerExt;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::{StreamMuxer, UpgradeInfo};
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
-use std::{fmt, mem};
 
 pub async fn connected_muxers_on_memory_ring_buffer<MC, M, E>() -> (M, M)
 where
@@ -41,7 +46,8 @@ where
         .unwrap()
 }
 
-/// Verifies that Alice can send a message and immediately close the stream afterwards and Bob can use `read_to_end` to read the entire message.
+/// Verifies that Alice can send a message and immediately close the stream afterwards and Bob can
+/// use `read_to_end` to read the entire message.
 pub async fn close_implies_flush<A, B, S, E>(alice: A, bob: B)
 where
     A: StreamMuxer<Substream = S, Error = E> + Unpin,
@@ -99,7 +105,8 @@ where
     .await;
 }
 
-/// Runs the given protocol between the two parties, ensuring commutativity, i.e. either party can be the dialer and listener.
+/// Runs the given protocol between the two parties, ensuring commutativity, i.e. either party can
+/// be the dialer and listener.
 async fn run_commutative<A, B, S, E, F1, F2>(
     mut alice: A,
     mut bob: B,
@@ -120,7 +127,8 @@ async fn run_commutative<A, B, S, E, F1, F2>(
 /// Runs a given protocol between the two parties.
 ///
 /// The first party will open a new substream and the second party will wait for this.
-/// The [`StreamMuxer`] is polled until both parties have completed the protocol to ensure that the underlying connection can make progress at all times.
+/// The [`StreamMuxer`] is polled until both parties have completed the protocol to ensure that the
+/// underlying connection can make progress at all times.
 async fn run<A, B, S, E, F1, F2>(
     dialer: &mut A,
     listener: &mut B,
diff --git a/muxers/yamux/src/lib.rs b/muxers/yamux/src/lib.rs
index bcfeb62fccf..001eb6b0348 100644
--- a/muxers/yamux/src/lib.rs
+++ b/muxers/yamux/src/lib.rs
@@ -22,17 +22,20 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-use either::Either;
-use futures::{prelude::*, ready};
-use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo};
-use std::collections::VecDeque;
-use std::io::{IoSlice, IoSliceMut};
-use std::task::Waker;
 use std::{
-    io, iter,
+    collections::VecDeque,
+    io,
+    io::{IoSlice, IoSliceMut},
+    iter,
     pin::Pin,
-    task::{Context, Poll},
+    task::{Context, Poll, Waker},
+};
+
+use either::Either;
+use futures::{prelude::*, ready};
+use libp2p_core::{
+    muxing::{StreamMuxer, StreamMuxerEvent},
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade, UpgradeInfo},
 };
 use thiserror::Error;
 
@@ -40,10 +43,12 @@ use thiserror::Error;
 #[derive(Debug)]
 pub struct Muxer<C> {
     connection: Either<yamux012::Connection<C>, yamux013::Connection<C>>,
-    /// Temporarily buffers inbound streams in case our node is performing backpressure on the remote.
+    /// Temporarily buffers inbound streams in case our node is
+    /// performing backpressure on the remote.
     ///
-    /// The only way how yamux can make progress is by calling [`yamux013::Connection::poll_next_inbound`]. However, the
-    /// [`StreamMuxer`] interface is designed to allow a caller to selectively make progress via
+    /// The only way how yamux can make progress is by calling
+    /// [`yamux013::Connection::poll_next_inbound`]. However, the [`StreamMuxer`] interface is
+    /// designed to allow a caller to selectively make progress via
     /// [`StreamMuxer::poll_inbound`] and [`StreamMuxer::poll_outbound`] whilst the more general
     /// [`StreamMuxer::poll`] is designed to make progress on existing streams etc.
     ///
@@ -57,7 +62,8 @@ pub struct Muxer<C> {
 /// How many streams to buffer before we start resetting them.
 ///
 /// This is equal to the ACK BACKLOG in `rust-yamux`.
-/// Thus, for peers running on a recent version of `rust-libp2p`, we should never need to reset streams because they'll voluntarily stop opening them once they hit the ACK backlog.
+/// Thus, for peers running on a recent version of `rust-libp2p`, we should never need to reset
+/// streams because they'll voluntarily stop opening them once they hit the ACK backlog.
 const MAX_BUFFERED_INBOUND_STREAMS: usize = 256;
 
 impl<C> Muxer<C>
diff --git a/protocols/autonat/src/v1.rs b/protocols/autonat/src/v1.rs
index c60e4805f40..4de601c5df5 100644
--- a/protocols/autonat/src/v1.rs
+++ b/protocols/autonat/src/v1.rs
@@ -29,6 +29,8 @@
 pub(crate) mod behaviour;
 pub(crate) mod protocol;
 
+pub use libp2p_request_response::{InboundFailure, OutboundFailure};
+
 pub use self::{
     behaviour::{
         Behaviour, Config, Event, InboundProbeError, InboundProbeEvent, NatStatus,
@@ -36,7 +38,6 @@ pub use self::{
     },
     protocol::{ResponseError, DEFAULT_PROTOCOL_NAME},
 };
-pub use libp2p_request_response::{InboundFailure, OutboundFailure};
 
 pub(crate) mod proto {
     #![allow(unreachable_pub)]
diff --git a/protocols/autonat/src/v1/behaviour.rs b/protocols/autonat/src/v1/behaviour.rs
index 7a717baed8d..24ec1b13be7 100644
--- a/protocols/autonat/src/v1/behaviour.rs
+++ b/protocols/autonat/src/v1/behaviour.rs
@@ -21,15 +21,19 @@
 mod as_client;
 mod as_server;
 
-use crate::protocol::{AutoNatCodec, DialRequest, DialResponse, ResponseError};
-use crate::DEFAULT_PROTOCOL_NAME;
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    iter,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use as_client::AsClient;
 pub use as_client::{OutboundProbeError, OutboundProbeEvent};
 use as_server::AsServer;
 pub use as_server::{InboundProbeError, InboundProbeEvent};
 use futures_timer::Delay;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{multiaddr::Protocol, transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
     self as request_response, InboundRequestId, OutboundRequestId, ProtocolSupport, ResponseChannel,
@@ -39,14 +43,13 @@ use libp2p_swarm::{
     ConnectionDenied, ConnectionId, ListenAddresses, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use std::{
-    collections::{HashMap, HashSet, VecDeque},
-    iter,
-    task::{Context, Poll},
-    time::Duration,
-};
 use web_time::Instant;
 
+use crate::{
+    protocol::{AutoNatCodec, DialRequest, DialResponse, ResponseError},
+    DEFAULT_PROTOCOL_NAME,
+};
+
 /// Config for the [`Behaviour`].
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Config {
@@ -148,17 +151,18 @@ pub enum Event {
 
 /// [`NetworkBehaviour`] for AutoNAT.
 ///
-/// The behaviour frequently runs probes to determine whether the local peer is behind NAT and/ or a firewall, or
-/// publicly reachable.
-/// In a probe, a dial-back request is sent to a peer that is randomly selected from the list of fixed servers and
-/// connected peers. Upon receiving a dial-back request, the remote tries to dial the included addresses. When a
-/// first address was successfully dialed, a status Ok will be send back together with the dialed address. If no address
-/// can be reached a dial-error is send back.
+/// The behaviour frequently runs probes to determine whether the local peer is behind NAT and/ or a
+/// firewall, or publicly reachable.
+/// In a probe, a dial-back request is sent to a peer that is randomly selected from the list of
+/// fixed servers and connected peers. Upon receiving a dial-back request, the remote tries to dial
+/// the included addresses. When a first address was successfully dialed, a status Ok will be send
+/// back together with the dialed address. If no address can be reached a dial-error is send back.
 /// Based on the received response, the sender assumes themselves to be public or private.
-/// The status is retried in a frequency of [`Config::retry_interval`] or [`Config::retry_interval`], depending on whether
-/// enough confidence in the assumed NAT status was reached or not.
-/// The confidence increases each time a probe confirms the assumed status, and decreases if a different status is reported.
-/// If the confidence is 0, the status is flipped and the Behaviour will report the new status in an `OutEvent`.
+/// The status is retried in a frequency of [`Config::retry_interval`] or
+/// [`Config::retry_interval`], depending on whether enough confidence in the assumed NAT status was
+/// reached or not. The confidence increases each time a probe confirms the assumed status, and
+/// decreases if a different status is reported. If the confidence is 0, the status is flipped and
+/// the Behaviour will report the new status in an `OutEvent`.
 pub struct Behaviour {
     // Local peer id
     local_peer_id: PeerId,
@@ -195,11 +199,12 @@ pub struct Behaviour {
     ongoing_outbound: HashMap<OutboundRequestId, ProbeId>,
 
     // Connected peers with the observed address of each connection.
-    // If the endpoint of a connection is relayed or not global (in case of Config::only_global_ips),
-    // the observed address is `None`.
+    // If the endpoint of a connection is relayed or not global (in case of
+    // Config::only_global_ips), the observed address is `None`.
     connected: HashMap<PeerId, HashMap<ConnectionId, Option<Multiaddr>>>,
 
-    // Used servers in recent outbound probes that are throttled through Config::throttle_server_period.
+    // Used servers in recent outbound probes that are throttled through
+    // Config::throttle_server_period.
     throttled_servers: Vec<(PeerId, Instant)>,
 
     // Recent probes done for clients
@@ -264,8 +269,8 @@ impl Behaviour {
     }
 
     /// Add a peer to the list over servers that may be used for probes.
-    /// These peers are used for dial-request even if they are currently not connection, in which case a connection will be
-    /// establish before sending the dial-request.
+    /// These peers are used for dial-request even if they are currently not connection, in which
+    /// case a connection will be establish before sending the dial-request.
     pub fn add_server(&mut self, peer: PeerId, address: Option<Multiaddr>) {
         self.servers.insert(peer);
         if let Some(addr) = address {
@@ -564,7 +569,8 @@ impl NetworkBehaviour for Behaviour {
 
 type Action = ToSwarm<<Behaviour as NetworkBehaviour>::ToSwarm, THandlerInEvent<Behaviour>>;
 
-// Trait implemented for `AsClient` and `AsServer` to handle events from the inner [`request_response::Behaviour`] Protocol.
+// Trait implemented for `AsClient` and `AsServer` to handle events from the inner
+// [`request_response::Behaviour`] Protocol.
 trait HandleInnerEvent {
     fn handle_event(
         &mut self,
@@ -671,7 +677,8 @@ impl GlobalIp for std::net::Ipv6Addr {
 
         // Variation of unstable method [`std::net::Ipv6Addr::multicast_scope`] that instead of the
         // `Ipv6MulticastScope` just returns if the scope is global or not.
-        // Equivalent to `Ipv6Addr::multicast_scope(..).map(|scope| matches!(scope, Ipv6MulticastScope::Global))`.
+        // Equivalent to `Ipv6Addr::multicast_scope(..).map(|scope| matches!(scope,
+        // Ipv6MulticastScope::Global))`.
         fn is_multicast_scope_global(addr: &std::net::Ipv6Addr) -> Option<bool> {
             match addr.segments()[0] & 0x000f {
                 14 => Some(true),         // Global multicast scope.
diff --git a/protocols/autonat/src/v1/behaviour/as_client.rs b/protocols/autonat/src/v1/behaviour/as_client.rs
index 385dee50ee1..3377964373c 100644
--- a/protocols/autonat/src/v1/behaviour/as_client.rs
+++ b/protocols/autonat/src/v1/behaviour/as_client.rs
@@ -18,12 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::ResponseError;
-
-use super::{
-    Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, NatStatus,
-    ProbeId,
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    task::{Context, Poll},
+    time::Duration,
 };
+
 use futures::FutureExt;
 use futures_timer::Delay;
 use libp2p_core::Multiaddr;
@@ -31,13 +31,14 @@ use libp2p_identity::PeerId;
 use libp2p_request_response::{self as request_response, OutboundFailure, OutboundRequestId};
 use libp2p_swarm::{ConnectionId, ListenAddresses, ToSwarm};
 use rand::{seq::SliceRandom, thread_rng};
-use std::{
-    collections::{HashMap, HashSet, VecDeque},
-    task::{Context, Poll},
-    time::Duration,
-};
 use web_time::Instant;
 
+use super::{
+    Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, NatStatus,
+    ProbeId,
+};
+use crate::ResponseError;
+
 /// Outbound probe failed or was aborted.
 #[derive(Debug)]
 pub enum OutboundProbeError {
diff --git a/protocols/autonat/src/v1/behaviour/as_server.rs b/protocols/autonat/src/v1/behaviour/as_server.rs
index 01148add6e8..663f94122c7 100644
--- a/protocols/autonat/src/v1/behaviour/as_server.rs
+++ b/protocols/autonat/src/v1/behaviour/as_server.rs
@@ -17,10 +17,11 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-use super::{
-    Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, ProbeId,
-    ResponseError,
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    num::NonZeroU8,
 };
+
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
@@ -30,12 +31,13 @@ use libp2p_swarm::{
     dial_opts::{DialOpts, PeerCondition},
     ConnectionId, DialError, ToSwarm,
 };
-use std::{
-    collections::{HashMap, HashSet, VecDeque},
-    num::NonZeroU8,
-};
 use web_time::Instant;
 
+use super::{
+    Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, ProbeId,
+    ResponseError,
+};
+
 /// Inbound probe failed.
 #[derive(Debug)]
 pub enum InboundProbeError {
@@ -379,10 +381,10 @@ impl AsServer<'_> {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-
     use std::net::Ipv4Addr;
 
+    use super::*;
+
     fn random_ip<'a>() -> Protocol<'a> {
         Protocol::Ip4(Ipv4Addr::new(
             rand::random(),
diff --git a/protocols/autonat/src/v1/protocol.rs b/protocols/autonat/src/v1/protocol.rs
index 2ce538fddf4..6aa0c99167b 100644
--- a/protocols/autonat/src/v1/protocol.rs
+++ b/protocols/autonat/src/v1/protocol.rs
@@ -18,16 +18,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
+use std::io;
+
 use async_trait::async_trait;
 use asynchronous_codec::{FramedRead, FramedWrite};
-use futures::io::{AsyncRead, AsyncWrite};
-use futures::{SinkExt, StreamExt};
+use futures::{
+    io::{AsyncRead, AsyncWrite},
+    SinkExt, StreamExt,
+};
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_request_response::{self as request_response};
 use libp2p_swarm::StreamProtocol;
-use std::io;
+
+use crate::proto;
 
 /// The protocol name used for negotiating with multistream-select.
 pub const DEFAULT_PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/libp2p/autonat/1.0.0");
diff --git a/protocols/autonat/src/v2.rs b/protocols/autonat/src/v2.rs
index 48e9f25f890..94decf50a55 100644
--- a/protocols/autonat/src/v2.rs
+++ b/protocols/autonat/src/v2.rs
@@ -4,17 +4,17 @@
 //!
 //! The new version fixes the issues of the first version:
 //! - The server now always dials back over a newly allocated port. This greatly reduces the risk of
-//!     false positives that often occurred in the first version, when the clinet-server connection
-//!     occurred over a hole-punched port.
+//!   false positives that often occurred in the first version, when the clinet-server connection
+//!   occurred over a hole-punched port.
 //! - The server protects against DoS attacks by requiring the client to send more data to the
-//!     server then the dial back puts on the client, thus making the protocol unatractive for an
-//!     attacker.
+//!   server then the dial back puts on the client, thus making the protocol unatractive for an
+//!   attacker.
 //!
 //! The protocol is separated into two parts:
 //! - The client part, which is implemented in the `client` module. (The client is the party that
-//!     wants to check if it is reachable from the outside.)
+//!   wants to check if it is reachable from the outside.)
 //! - The server part, which is implemented in the `server` module. (The server is the party
-//!     performing reachability checks on behalf of the client.)
+//!   performing reachability checks on behalf of the client.)
 //!
 //! The two can be used together.
 
diff --git a/protocols/autonat/src/v2/client.rs b/protocols/autonat/src/v2/client.rs
index d3272512f35..11ddb792839 100644
--- a/protocols/autonat/src/v2/client.rs
+++ b/protocols/autonat/src/v2/client.rs
@@ -1,5 +1,4 @@
 mod behaviour;
 mod handler;
 
-pub use behaviour::Event;
-pub use behaviour::{Behaviour, Config};
+pub use behaviour::{Behaviour, Config, Event};
diff --git a/protocols/autonat/src/v2/client/behaviour.rs b/protocols/autonat/src/v2/client/behaviour.rs
index 97509c05443..8e238fc9be4 100644
--- a/protocols/autonat/src/v2/client/behaviour.rs
+++ b/protocols/autonat/src/v2/client/behaviour.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::{HashMap, VecDeque},
+    fmt::{Debug, Display, Formatter},
     task::{Context, Poll},
     time::Duration,
 };
@@ -15,14 +16,12 @@ use libp2p_swarm::{
 };
 use rand::prelude::*;
 use rand_core::OsRng;
-use std::fmt::{Debug, Display, Formatter};
-
-use crate::v2::{protocol::DialRequest, Nonce};
 
 use super::handler::{
     dial_back::{self, IncomingNonce},
     dial_request,
 };
+use crate::v2::{protocol::DialRequest, Nonce};
 
 #[derive(Debug, Clone, Copy)]
 pub struct Config {
@@ -281,10 +280,12 @@ where
         }
     }
 
-    /// Issues dial requests to random AutoNAT servers for the most frequently reported, untested candidates.
+    /// Issues dial requests to random AutoNAT servers for the most frequently reported, untested
+    /// candidates.
     ///
     /// In the current implementation, we only send a single address to each AutoNAT server.
-    /// This spreads our candidates out across all servers we are connected to which should give us pretty fast feedback on all of them.
+    /// This spreads our candidates out across all servers we are connected to which should give us
+    /// pretty fast feedback on all of them.
     fn issue_dial_requests_for_untested_candidates(&mut self) {
         for addr in self.untested_candidates() {
             let Some((conn_id, peer_id)) = self.random_autonat_server() else {
@@ -311,7 +312,8 @@ where
 
     /// Returns all untested candidates, sorted by the frequency they were reported at.
     ///
-    /// More frequently reported candidates are considered to more likely be external addresses and thus tested first.
+    /// More frequently reported candidates are considered to more likely be external addresses and
+    /// thus tested first.
     fn untested_candidates(&self) -> impl Iterator<Item = Multiaddr> {
         let mut entries = self
             .address_candidates
@@ -333,7 +335,8 @@ where
             .map(|(addr, _)| addr)
     }
 
-    /// Chooses an active connection to one of our peers that reported support for the [`DIAL_REQUEST_PROTOCOL`](crate::v2::DIAL_REQUEST_PROTOCOL) protocol.
+    /// Chooses an active connection to one of our peers that reported support for the
+    /// [`DIAL_REQUEST_PROTOCOL`](crate::v2::DIAL_REQUEST_PROTOCOL) protocol.
     fn random_autonat_server(&mut self) -> Option<(ConnectionId, PeerId)> {
         let (conn_id, info) = self
             .peer_info
diff --git a/protocols/autonat/src/v2/client/handler/dial_back.rs b/protocols/autonat/src/v2/client/handler/dial_back.rs
index b3b3a59c02d..ef544a4c77a 100644
--- a/protocols/autonat/src/v2/client/handler/dial_back.rs
+++ b/protocols/autonat/src/v2/client/handler/dial_back.rs
@@ -1,4 +1,5 @@
 use std::{
+    convert::Infallible,
     io,
     task::{Context, Poll},
     time::Duration,
@@ -11,7 +12,6 @@ use libp2p_swarm::{
     handler::{ConnectionEvent, FullyNegotiatedInbound, ListenUpgradeError},
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
 };
-use std::convert::Infallible;
 
 use crate::v2::{protocol, Nonce, DIAL_BACK_PROTOCOL};
 
@@ -83,7 +83,7 @@ impl ConnectionHandler for Handler {
                     tracing::warn!("Dial back request dropped, too many requests in flight");
                 }
             }
-            // TODO: remove when Rust 1.82 is MSRVprotocols/autonat/src/v2/client/handler/dial_back.rs
+            // TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { error, .. }) => {
                 libp2p_core::util::unreachable(error);
diff --git a/protocols/autonat/src/v2/client/handler/dial_request.rs b/protocols/autonat/src/v2/client/handler/dial_request.rs
index 0f303167523..fff83ad9453 100644
--- a/protocols/autonat/src/v2/client/handler/dial_request.rs
+++ b/protocols/autonat/src/v2/client/handler/dial_request.rs
@@ -1,10 +1,18 @@
+use std::{
+    collections::VecDeque,
+    convert::Infallible,
+    io,
+    iter::{once, repeat},
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use futures::{channel::oneshot, AsyncWrite};
 use futures_bounded::FuturesMap;
 use libp2p_core::{
     upgrade::{DeniedUpgrade, ReadyUpgrade},
     Multiaddr,
 };
-
 use libp2p_swarm::{
     handler::{
         ConnectionEvent, DialUpgradeError, FullyNegotiatedOutbound, OutboundUpgradeSend,
@@ -13,14 +21,6 @@ use libp2p_swarm::{
     ConnectionHandler, ConnectionHandlerEvent, Stream, StreamProtocol, StreamUpgradeError,
     SubstreamProtocol,
 };
-use std::{
-    collections::VecDeque,
-    convert::Infallible,
-    io,
-    iter::{once, repeat},
-    task::{Context, Poll},
-    time::Duration,
-};
 
 use crate::v2::{
     generated::structs::{mod_DialResponse::ResponseStatus, DialStatus},
@@ -261,7 +261,9 @@ async fn start_stream_handle(
         Ok(_) => {}
         Err(err) => {
             if err.kind() == io::ErrorKind::ConnectionReset {
-                // The AutoNAT server may have already closed the stream (this is normal because the probe is finished), in this case we have this error:
+                // The AutoNAT server may have already closed the stream
+                // (this is normal because the probe is finished),
+                // in this case we have this error:
                 // Err(Custom { kind: ConnectionReset, error: Stopped(0) })
                 // so we silently ignore this error
             } else {
diff --git a/protocols/autonat/src/v2/protocol.rs b/protocols/autonat/src/v2/protocol.rs
index 4077fd65f5d..70f9f8c37af 100644
--- a/protocols/autonat/src/v2/protocol.rs
+++ b/protocols/autonat/src/v2/protocol.rs
@@ -1,13 +1,10 @@
 // change to quick-protobuf-codec
 
-use std::io;
-use std::io::ErrorKind;
+use std::{io, io::ErrorKind};
 
 use asynchronous_codec::{Framed, FramedRead, FramedWrite};
-
 use futures::{AsyncRead, AsyncWrite, SinkExt, StreamExt};
 use libp2p_core::Multiaddr;
-
 use quick_protobuf_codec::Codec;
 use rand::Rng;
 
@@ -103,7 +100,10 @@ impl From<DialDataResponse> for proto::Message {
         );
         proto::Message {
             msg: proto::mod_Message::OneOfmsg::dialDataResponse(proto::DialDataResponse {
-                data: vec![0; val.data_count], // One could use Cow::Borrowed here, but it will require a modification of the generated code and that will fail the CI
+                // One could use Cow::Borrowed here, but it will
+                // require a modification of the generated code
+                // and that will fail the CI
+                data: vec![0; val.data_count],
             }),
         }
     }
diff --git a/protocols/autonat/src/v2/server.rs b/protocols/autonat/src/v2/server.rs
index 25819307784..cd9b1e46b18 100644
--- a/protocols/autonat/src/v2/server.rs
+++ b/protocols/autonat/src/v2/server.rs
@@ -1,5 +1,4 @@
 mod behaviour;
 mod handler;
 
-pub use behaviour::Behaviour;
-pub use behaviour::Event;
+pub use behaviour::{Behaviour, Event};
diff --git a/protocols/autonat/src/v2/server/behaviour.rs b/protocols/autonat/src/v2/server/behaviour.rs
index 027cfff7c13..125955cb53a 100644
--- a/protocols/autonat/src/v2/server/behaviour.rs
+++ b/protocols/autonat/src/v2/server/behaviour.rs
@@ -4,20 +4,19 @@ use std::{
     task::{Context, Poll},
 };
 
-use crate::v2::server::handler::dial_request::DialBackStatus;
 use either::Either;
 use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::dial_opts::PeerCondition;
 use libp2p_swarm::{
-    dial_opts::DialOpts, dummy, ConnectionDenied, ConnectionHandler, ConnectionId, DialFailure,
-    FromSwarm, NetworkBehaviour, ToSwarm,
+    dial_opts::{DialOpts, PeerCondition},
+    dummy, ConnectionDenied, ConnectionHandler, ConnectionId, DialFailure, FromSwarm,
+    NetworkBehaviour, ToSwarm,
 };
 use rand_core::{OsRng, RngCore};
 
 use crate::v2::server::handler::{
     dial_back,
-    dial_request::{self, DialBackCommand},
+    dial_request::{self, DialBackCommand, DialBackStatus},
     Handler,
 };
 
diff --git a/protocols/autonat/src/v2/server/handler/dial_back.rs b/protocols/autonat/src/v2/server/handler/dial_back.rs
index 3cacd4ff32b..61593da318d 100644
--- a/protocols/autonat/src/v2/server/handler/dial_back.rs
+++ b/protocols/autonat/src/v2/server/handler/dial_back.rs
@@ -14,13 +14,12 @@ use libp2p_swarm::{
     SubstreamProtocol,
 };
 
+use super::dial_request::{DialBackCommand, DialBackStatus as DialBackRes};
 use crate::v2::{
     protocol::{dial_back, recv_dial_back_response},
     DIAL_BACK_PROTOCOL,
 };
 
-use super::dial_request::{DialBackCommand, DialBackStatus as DialBackRes};
-
 pub(crate) type ToBehaviour = io::Result<()>;
 
 pub struct Handler {
diff --git a/protocols/autonat/tests/autonatv2.rs b/protocols/autonat/tests/autonatv2.rs
index f22a2e51470..49866a9adb5 100644
--- a/protocols/autonat/tests/autonatv2.rs
+++ b/protocols/autonat/tests/autonatv2.rs
@@ -1,15 +1,15 @@
-use libp2p_autonat::v2::client::{self, Config};
-use libp2p_autonat::v2::server;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::TransportError;
-use libp2p_core::Multiaddr;
+use std::{sync::Arc, time::Duration};
+
+use libp2p_autonat::v2::{
+    client::{self, Config},
+    server,
+};
+use libp2p_core::{multiaddr::Protocol, transport::TransportError, Multiaddr};
 use libp2p_swarm::{
     DialError, FromSwarm, NetworkBehaviour, NewExternalAddrCandidate, Swarm, SwarmEvent,
 };
 use libp2p_swarm_test::SwarmExt;
 use rand_core::OsRng;
-use std::sync::Arc;
-use std::time::Duration;
 use tokio::sync::oneshot;
 use tracing_subscriber::EnvFilter;
 
diff --git a/protocols/autonat/tests/test_client.rs b/protocols/autonat/tests/test_client.rs
index f5c18e3f34e..49c6c483514 100644
--- a/protocols/autonat/tests/test_client.rs
+++ b/protocols/autonat/tests/test_client.rs
@@ -18,6 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::time::Duration;
+
 use libp2p_autonat::{
     Behaviour, Config, Event, NatStatus, OutboundProbeError, OutboundProbeEvent, ResponseError,
 };
@@ -25,7 +27,6 @@ use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use std::time::Duration;
 use tokio::task::JoinHandle;
 
 const MAX_CONFIDENCE: usize = 3;
@@ -116,7 +117,8 @@ async fn test_auto_probe() {
 
     // It can happen that the server observed the established connection and
     // returned a response before the inbound established connection was reported at the client.
-    // In this (rare) case the `ConnectionEstablished` event occurs after the `OutboundProbeEvent::Response`.
+    // In this (rare) case the `ConnectionEstablished` event
+    // occurs after the `OutboundProbeEvent::Response`.
     if !had_connection_event {
         match client.next_swarm_event().await {
             SwarmEvent::ConnectionEstablished {
diff --git a/protocols/autonat/tests/test_server.rs b/protocols/autonat/tests/test_server.rs
index d43d14198d4..944c4301b20 100644
--- a/protocols/autonat/tests/test_server.rs
+++ b/protocols/autonat/tests/test_server.rs
@@ -18,15 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{num::NonZeroU32, time::Duration};
+
 use libp2p_autonat::{
     Behaviour, Config, Event, InboundProbeError, InboundProbeEvent, ResponseError,
 };
 use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::DialError;
-use libp2p_swarm::{Swarm, SwarmEvent};
+use libp2p_swarm::{DialError, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use std::{num::NonZeroU32, time::Duration};
 
 #[tokio::test]
 async fn test_dial_back() {
@@ -340,7 +340,8 @@ async fn test_global_ips_config() {
     client.listen().await;
     tokio::spawn(client.loop_on_next());
 
-    // Expect the probe to be refused as both peers run on the same machine and thus in the same local network.
+    // Expect the probe to be refused as both peers run
+    // on the same machine and thus in the same local network.
     match server.next_behaviour_event().await {
         Event::InboundProbe(InboundProbeEvent::Error { error, .. }) => assert!(matches!(
             error,
diff --git a/protocols/dcutr/src/behaviour.rs b/protocols/dcutr/src/behaviour.rs
index 7d0366c98bc..989635c02ba 100644
--- a/protocols/dcutr/src/behaviour.rs
+++ b/protocols/dcutr/src/behaviour.rs
@@ -20,27 +20,29 @@
 
 //! [`NetworkBehaviour`] to act as a direct connection upgrade through relay node.
 
-use crate::{handler, protocol};
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    convert::Infallible,
+    num::NonZeroUsize,
+    task::{Context, Poll},
+};
+
 use either::Either;
-use libp2p_core::connection::ConnectedPoint;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{
+    connection::ConnectedPoint, multiaddr::Protocol, transport::PortUse, Endpoint, Multiaddr,
+};
 use libp2p_identity::PeerId;
-use libp2p_swarm::behaviour::{ConnectionClosed, DialFailure, FromSwarm};
-use libp2p_swarm::dial_opts::{self, DialOpts};
 use libp2p_swarm::{
-    dummy, ConnectionDenied, ConnectionHandler, ConnectionId, NewExternalAddrCandidate, THandler,
-    THandlerOutEvent,
+    behaviour::{ConnectionClosed, DialFailure, FromSwarm},
+    dial_opts::{self, DialOpts},
+    dummy, ConnectionDenied, ConnectionHandler, ConnectionId, NetworkBehaviour,
+    NewExternalAddrCandidate, NotifyHandler, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use libp2p_swarm::{NetworkBehaviour, NotifyHandler, THandlerInEvent, ToSwarm};
 use lru::LruCache;
-use std::collections::{HashMap, HashSet, VecDeque};
-use std::convert::Infallible;
-use std::num::NonZeroUsize;
-use std::task::{Context, Poll};
 use thiserror::Error;
 
+use crate::{handler, protocol};
+
 pub(crate) const MAX_NUMBER_OF_UPGRADE_ATTEMPTS: u8 = 3;
 
 /// The events produced by the [`Behaviour`].
@@ -184,7 +186,8 @@ impl NetworkBehaviour for Behaviour {
                 handler::relayed::Handler::new(connected_point, self.observed_addresses());
             handler.on_behaviour_event(handler::relayed::Command::Connect);
 
-            return Ok(Either::Left(handler)); // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
+            // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
+            return Ok(Either::Left(handler));
         }
         self.direct_connections
             .entry(peer)
@@ -217,7 +220,8 @@ impl NetworkBehaviour for Behaviour {
                     port_use,
                 },
                 self.observed_addresses(),
-            ))); // TODO: We could make two `handler::relayed::Handler` here, one inbound one outbound.
+            ))); // TODO: We could make two `handler::relayed::Handler` here, one inbound one
+                 // outbound.
         }
 
         self.direct_connections
@@ -255,7 +259,8 @@ impl NetworkBehaviour for Behaviour {
             Either::Left(_) => connection_id,
             Either::Right(_) => match self.direct_to_relayed_connections.get(&connection_id) {
                 None => {
-                    // If the connection ID is unknown to us, it means we didn't create it so ignore any event coming from it.
+                    // If the connection ID is unknown to us, it means we didn't create it so ignore
+                    // any event coming from it.
                     return;
                 }
                 Some(relayed_connection_id) => *relayed_connection_id,
@@ -347,8 +352,9 @@ impl NetworkBehaviour for Behaviour {
 ///
 /// We use an [`LruCache`] to favor addresses that are reported more often.
 /// When attempting a hole-punch, we will try more frequent addresses first.
-/// Most of these addresses will come from observations by other nodes (via e.g. the identify protocol).
-/// More common observations mean a more likely stable port-mapping and thus a higher chance of a successful hole-punch.
+/// Most of these addresses will come from observations by other nodes (via e.g. the identify
+/// protocol). More common observations mean a more likely stable port-mapping and thus a higher
+/// chance of a successful hole-punch.
 struct Candidates {
     inner: LruCache<Multiaddr, ()>,
     me: PeerId,
diff --git a/protocols/dcutr/src/handler/relayed.rs b/protocols/dcutr/src/handler/relayed.rs
index ad12a196cb9..0d6e1b5e889 100644
--- a/protocols/dcutr/src/handler/relayed.rs
+++ b/protocols/dcutr/src/handler/relayed.rs
@@ -20,26 +20,31 @@
 
 //! [`ConnectionHandler`] handling relayed connection potentially upgraded to a direct connection.
 
-use crate::behaviour::MAX_NUMBER_OF_UPGRADE_ATTEMPTS;
-use crate::{protocol, PROTOCOL_NAME};
+use std::{
+    collections::VecDeque,
+    io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use either::Either;
 use futures::future;
-use libp2p_core::multiaddr::Multiaddr;
-use libp2p_core::upgrade::{DeniedUpgrade, ReadyUpgrade};
-use libp2p_core::ConnectedPoint;
-use libp2p_swarm::handler::{
-    ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
-    ListenUpgradeError,
+use libp2p_core::{
+    multiaddr::Multiaddr,
+    upgrade::{DeniedUpgrade, ReadyUpgrade},
+    ConnectedPoint,
 };
 use libp2p_swarm::{
+    handler::{
+        ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
+        ListenUpgradeError,
+    },
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, StreamUpgradeError,
     SubstreamProtocol,
 };
 use protocol::{inbound, outbound};
-use std::collections::VecDeque;
-use std::io;
-use std::task::{Context, Poll};
-use std::time::Duration;
+
+use crate::{behaviour::MAX_NUMBER_OF_UPGRADE_ATTEMPTS, protocol, PROTOCOL_NAME};
 
 #[derive(Debug)]
 pub enum Command {
@@ -114,8 +119,8 @@ impl Handler {
                 }
                 self.attempts += 1;
             }
-            // A connection listener denies all incoming substreams, thus none can ever be fully negotiated.
-            // TODO: remove when Rust 1.82 is MSRV
+            // A connection listener denies all incoming substreams, thus none can ever be fully
+            // negotiated. TODO: remove when Rust 1.82 is MSRV
             #[allow(unreachable_patterns)]
             future::Either::Right(output) => libp2p_core::util::unreachable(output),
         }
diff --git a/protocols/dcutr/src/protocol/inbound.rs b/protocols/dcutr/src/protocol/inbound.rs
index 005d8394f5e..c5209930ca2 100644
--- a/protocols/dcutr/src/protocol/inbound.rs
+++ b/protocols/dcutr/src/protocol/inbound.rs
@@ -18,14 +18,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
+use std::io;
+
 use asynchronous_codec::Framed;
 use futures::prelude::*;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_swarm::Stream;
-use std::io;
 use thiserror::Error;
 
+use crate::proto;
+
 pub(crate) async fn handshake(
     stream: Stream,
     candidates: Vec<Multiaddr>,
diff --git a/protocols/dcutr/src/protocol/outbound.rs b/protocols/dcutr/src/protocol/outbound.rs
index 8639ff4f053..cdd3d5fbf0b 100644
--- a/protocols/dcutr/src/protocol/outbound.rs
+++ b/protocols/dcutr/src/protocol/outbound.rs
@@ -18,17 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
-use crate::PROTOCOL_NAME;
+use std::io;
+
 use asynchronous_codec::Framed;
 use futures::prelude::*;
 use futures_timer::Delay;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_swarm::Stream;
-use std::io;
 use thiserror::Error;
 use web_time::Instant;
 
+use crate::{proto, PROTOCOL_NAME};
+
 pub(crate) async fn handshake(
     stream: Stream,
     candidates: Vec<Multiaddr>,
diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs
index 36f168fb04a..a35c9a50cfe 100644
--- a/protocols/dcutr/tests/lib.rs
+++ b/protocols/dcutr/tests/lib.rs
@@ -18,9 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use libp2p_core::multiaddr::{Multiaddr, Protocol};
-use libp2p_core::transport::upgrade::Version;
-use libp2p_core::transport::{MemoryTransport, Transport};
+use std::time::Duration;
+
+use libp2p_core::{
+    multiaddr::{Multiaddr, Protocol},
+    transport::{upgrade::Version, MemoryTransport, Transport},
+};
 use libp2p_dcutr as dcutr;
 use libp2p_identify as identify;
 use libp2p_identity as identity;
@@ -29,7 +32,6 @@ use libp2p_plaintext as plaintext;
 use libp2p_relay as relay;
 use libp2p_swarm::{Config, NetworkBehaviour, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
diff --git a/protocols/floodsub/src/layer.rs b/protocols/floodsub/src/layer.rs
index 1a70d2213b2..477172b42c0 100644
--- a/protocols/floodsub/src/layer.rs
+++ b/protocols/floodsub/src/layer.rs
@@ -18,27 +18,36 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::protocol::{
-    FloodsubMessage, FloodsubProtocol, FloodsubRpc, FloodsubSubscription,
-    FloodsubSubscriptionAction,
+use std::{
+    collections::{
+        hash_map::{DefaultHasher, HashMap},
+        VecDeque,
+    },
+    iter,
+    task::{Context, Poll},
 };
-use crate::topic::Topic;
-use crate::FloodsubConfig;
+
 use bytes::Bytes;
 use cuckoofilter::{CuckooError, CuckooFilter};
 use fnv::FnvHashSet;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm};
 use libp2p_swarm::{
-    dial_opts::DialOpts, CloseConnection, ConnectionDenied, ConnectionId, NetworkBehaviour,
-    NotifyHandler, OneShotHandler, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+    behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm},
+    dial_opts::DialOpts,
+    CloseConnection, ConnectionDenied, ConnectionId, NetworkBehaviour, NotifyHandler,
+    OneShotHandler, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use smallvec::SmallVec;
-use std::collections::hash_map::{DefaultHasher, HashMap};
-use std::task::{Context, Poll};
-use std::{collections::VecDeque, iter};
+
+use crate::{
+    protocol::{
+        FloodsubMessage, FloodsubProtocol, FloodsubRpc, FloodsubSubscription,
+        FloodsubSubscriptionAction,
+    },
+    topic::Topic,
+    FloodsubConfig,
+};
 
 /// Network behaviour that handles the floodsub protocol.
 pub struct Floodsub {
@@ -192,7 +201,8 @@ impl Floodsub {
         self.publish_many_inner(topic, data, true)
     }
 
-    /// Publishes a message with multiple topics to the network, even if we're not subscribed to any of the topics.
+    /// Publishes a message with multiple topics to the network, even if we're not subscribed to any
+    /// of the topics.
     pub fn publish_many_any(
         &mut self,
         topic: impl IntoIterator<Item = impl Into<Topic>>,
diff --git a/protocols/floodsub/src/lib.rs b/protocols/floodsub/src/lib.rs
index 94766d5fdca..d43b0c88788 100644
--- a/protocols/floodsub/src/lib.rs
+++ b/protocols/floodsub/src/lib.rs
@@ -35,9 +35,11 @@ mod proto {
     pub(crate) use self::floodsub::pb::{mod_RPC::SubOpts, Message, RPC};
 }
 
-pub use self::layer::{Floodsub, FloodsubEvent};
-pub use self::protocol::{FloodsubMessage, FloodsubRpc};
-pub use self::topic::Topic;
+pub use self::{
+    layer::{Floodsub, FloodsubEvent},
+    protocol::{FloodsubMessage, FloodsubRpc},
+    topic::Topic,
+};
 
 /// Configuration options for the Floodsub protocol.
 #[derive(Debug, Clone)]
diff --git a/protocols/floodsub/src/protocol.rs b/protocols/floodsub/src/protocol.rs
index edc842be8ce..69cfcbd9dc7 100644
--- a/protocols/floodsub/src/protocol.rs
+++ b/protocols/floodsub/src/protocol.rs
@@ -18,19 +18,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
-use crate::topic::Topic;
+use std::{io, iter, pin::Pin};
+
 use asynchronous_codec::Framed;
 use bytes::Bytes;
 use futures::{
     io::{AsyncRead, AsyncWrite},
-    Future,
+    Future, SinkExt, StreamExt,
 };
-use futures::{SinkExt, StreamExt};
 use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_identity::PeerId;
 use libp2p_swarm::StreamProtocol;
-use std::{io, iter, pin::Pin};
+
+use crate::{proto, topic::Topic};
 
 const MAX_MESSAGE_LEN_BYTES: usize = 2048;
 
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
index c955ee59c65..ee600d22098 100644
--- a/protocols/gossipsub/src/backoff.rs
+++ b/protocols/gossipsub/src/backoff.rs
@@ -19,15 +19,19 @@
 // DEALINGS IN THE SOFTWARE.
 
 //! Data structure for efficiently storing known back-off's when pruning peers.
-use crate::topic::TopicHash;
-use libp2p_identity::PeerId;
-use std::collections::{
-    hash_map::{Entry, HashMap},
-    HashSet,
+use std::{
+    collections::{
+        hash_map::{Entry, HashMap},
+        HashSet,
+    },
+    time::Duration,
 };
-use std::time::Duration;
+
+use libp2p_identity::PeerId;
 use web_time::Instant;
 
+use crate::topic::TopicHash;
+
 #[derive(Copy, Clone)]
 struct HeartbeatIndex(usize);
 
@@ -68,8 +72,8 @@ impl BackoffStorage {
         }
     }
 
-    /// Updates the backoff for a peer (if there is already a more restrictive backoff then this call
-    /// doesn't change anything).
+    /// Updates the backoff for a peer (if there is already a more restrictive backoff then this
+    /// call doesn't change anything).
     pub(crate) fn update_backoff(&mut self, topic: &TopicHash, peer: &PeerId, time: Duration) {
         let instant = Instant::now() + time;
         let insert_into_backoffs_by_heartbeat =
@@ -155,7 +159,7 @@ impl BackoffStorage {
                     None => false,
                 };
                 if !keep {
-                    //remove from backoffs
+                    // remove from backoffs
                     if let Entry::Occupied(mut m) = backoffs.entry(topic.clone()) {
                         if m.get_mut().remove(peer).is_some() && m.get().is_empty() {
                             m.remove();
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index ae808d97261..bb3eaaa9b5a 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -19,11 +19,10 @@
 // DEALINGS IN THE SOFTWARE.
 
 use std::{
-    cmp::{max, Ordering},
-    collections::HashSet,
-    collections::VecDeque,
-    collections::{BTreeSet, HashMap},
+    cmp::{max, Ordering, Ordering::Equal},
+    collections::{BTreeSet, HashMap, HashSet, VecDeque},
     fmt,
+    fmt::Debug,
     net::IpAddr,
     task::{Context, Poll},
     time::Duration,
@@ -31,52 +30,44 @@ use std::{
 
 use futures::FutureExt;
 use futures_timer::Delay;
-use prometheus_client::registry::Registry;
-use rand::{seq::SliceRandom, thread_rng};
-
 use libp2p_core::{
-    multiaddr::Protocol::Ip4, multiaddr::Protocol::Ip6, transport::PortUse, Endpoint, Multiaddr,
+    multiaddr::Protocol::{Ip4, Ip6},
+    transport::PortUse,
+    Endpoint, Multiaddr,
 };
-use libp2p_identity::Keypair;
-use libp2p_identity::PeerId;
+use libp2p_identity::{Keypair, PeerId};
 use libp2p_swarm::{
     behaviour::{AddressChange, ConnectionClosed, ConnectionEstablished, FromSwarm},
     dial_opts::DialOpts,
     ConnectionDenied, ConnectionId, NetworkBehaviour, NotifyHandler, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
+use prometheus_client::registry::Registry;
+use quick_protobuf::{MessageWrite, Writer};
+use rand::{seq::SliceRandom, thread_rng};
 use web_time::{Instant, SystemTime};
 
-use crate::peer_score::{PeerScore, PeerScoreParams, PeerScoreThresholds, RejectReason};
-use crate::protocol::SIGNING_PREFIX;
-use crate::subscription_filter::{AllowAllSubscriptionFilter, TopicSubscriptionFilter};
-use crate::time_cache::DuplicateCache;
-use crate::topic::{Hasher, Topic, TopicHash};
-use crate::transform::{DataTransform, IdentityTransform};
-use crate::types::{
-    ControlAction, Message, MessageAcceptance, MessageId, PeerInfo, RawMessage, Subscription,
-    SubscriptionAction,
-};
-use crate::types::{PeerConnections, PeerKind, RpcOut};
-use crate::{backoff::BackoffStorage, FailedMessages};
 use crate::{
+    backoff::BackoffStorage,
     config::{Config, ValidationMode},
-    types::Graft,
-};
-use crate::{gossip_promises::GossipPromises, types::Prune};
-use crate::{
+    gossip_promises::GossipPromises,
     handler::{Handler, HandlerEvent, HandlerIn},
-    types::IWant,
-};
-use crate::{mcache::MessageCache, types::IHave};
-use crate::{
+    mcache::MessageCache,
     metrics::{Churn, Config as MetricsConfig, Inclusion, Metrics, Penalty},
+    peer_score::{PeerScore, PeerScoreParams, PeerScoreThresholds, RejectReason},
+    protocol::SIGNING_PREFIX,
     rpc::Sender,
+    rpc_proto::proto,
+    subscription_filter::{AllowAllSubscriptionFilter, TopicSubscriptionFilter},
+    time_cache::DuplicateCache,
+    topic::{Hasher, Topic, TopicHash},
+    transform::{DataTransform, IdentityTransform},
+    types::{
+        ControlAction, Graft, IHave, IWant, Message, MessageAcceptance, MessageId, PeerConnections,
+        PeerInfo, PeerKind, Prune, RawMessage, RpcOut, Subscription, SubscriptionAction,
+    },
+    FailedMessages, PublishError, SubscriptionError, TopicScoreParams, ValidationError,
 };
-use crate::{rpc_proto::proto, TopicScoreParams};
-use crate::{PublishError, SubscriptionError, ValidationError};
-use quick_protobuf::{MessageWrite, Writer};
-use std::{cmp::Ordering::Equal, fmt::Debug};
 
 #[cfg(test)]
 mod tests;
@@ -221,8 +212,9 @@ impl From<MessageAuthenticity> for PublishConfig {
                 let public_key = keypair.public();
                 let key_enc = public_key.encode_protobuf();
                 let key = if key_enc.len() <= 42 {
-                    // The public key can be inlined in [`rpc_proto::proto::::Message::from`], so we don't include it
-                    // specifically in the [`rpc_proto::proto::Message::key`] field.
+                    // The public key can be inlined in [`rpc_proto::proto::::Message::from`], so we
+                    // don't include it specifically in the
+                    // [`rpc_proto::proto::Message::key`] field.
                     None
                 } else {
                     // Include the protobuf encoding of the public key in the message.
@@ -289,7 +281,7 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
     /// The last publish time for fanout topics.
     fanout_last_pub: HashMap<TopicHash, Instant>,
 
-    ///Storage for backoffs
+    /// Storage for backoffs
     backoffs: BackoffStorage,
 
     /// Message cache for the last few heartbeats.
@@ -1415,7 +1407,7 @@ where
                                     + self.config.graft_flood_threshold())
                                     - self.config.prune_backoff();
                                 if flood_cutoff > now {
-                                    //extra penalty
+                                    // extra penalty
                                     peer_score.add_penalty(peer_id, 1);
                                 }
                             }
@@ -1436,15 +1428,16 @@ where
                             topic=%topic_hash,
                             "GRAFT: ignoring peer with negative score"
                         );
-                        // we do send them PRUNE however, because it's a matter of protocol correctness
+                        // we do send them PRUNE however, because it's a matter of protocol
+                        // correctness
                         to_prune_topics.insert(topic_hash.clone());
                         // but we won't PX to them
                         do_px = false;
                         continue;
                     }
 
-                    // check mesh upper bound and only allow graft if the upper bound is not reached or
-                    // if it is an outbound peer
+                    // check mesh upper bound and only allow graft if the upper bound is not reached
+                    // or if it is an outbound peer
                     if peers.len() >= self.config.mesh_n_high()
                         && !self.outbound_peers.contains(peer_id)
                     {
@@ -1572,7 +1565,7 @@ where
             self.remove_peer_from_mesh(peer_id, &topic_hash, backoff, true, Churn::Prune);
 
             if self.mesh.contains_key(&topic_hash) {
-                //connect to px peers
+                // connect to px peers
                 if !px.is_empty() {
                     // we ignore PX from peers with insufficient score
                     if below_threshold {
@@ -1604,7 +1597,7 @@ where
         let n = self.config.prune_peers();
         // Ignore peerInfo with no ID
         //
-        //TODO: Once signed records are spec'd: Can we use peerInfo without any IDs if they have a
+        // TODO: Once signed records are spec'd: Can we use peerInfo without any IDs if they have a
         // signed peer record?
         px.retain(|p| p.peer_id.is_some());
         if px.len() > n {
@@ -2867,8 +2860,8 @@ where
                     .expect("Previously established connection to peer must be present");
                 peer.connections.remove(index);
 
-                // If there are more connections and this peer is in a mesh, inform the first connection
-                // handler.
+                // If there are more connections and this peer is in a mesh, inform the first
+                // connection handler.
                 if !peer.connections.is_empty() {
                     for topic in &peer.topics {
                         if let Some(mesh_peers) = self.mesh.get(topic) {
@@ -3162,7 +3155,8 @@ where
                 }
 
                 // Handle control messages
-                // group some control messages, this minimises SendEvents (code is simplified to handle each event at a time however)
+                // group some control messages, this minimises SendEvents (code is simplified to
+                // handle each event at a time however)
                 let mut ihave_msgs = vec![];
                 let mut graft_msgs = vec![];
                 let mut prune_msgs = vec![];
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index 9567150382a..eaa983d214d 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -20,16 +20,17 @@
 
 // Collection of tests for the gossipsub network behaviour
 
-use super::*;
-use crate::rpc::Receiver;
-use crate::subscription_filter::WhitelistSubscriptionFilter;
-use crate::{config::ConfigBuilder, types::Rpc, IdentTopic as Topic};
+use std::{future, net::Ipv4Addr, thread::sleep};
+
 use byteorder::{BigEndian, ByteOrder};
 use libp2p_core::ConnectedPoint;
 use rand::Rng;
-use std::future;
-use std::net::Ipv4Addr;
-use std::thread::sleep;
+
+use super::*;
+use crate::{
+    config::ConfigBuilder, rpc::Receiver, subscription_filter::WhitelistSubscriptionFilter,
+    types::Rpc, IdentTopic as Topic,
+};
 
 #[derive(Default, Debug)]
 struct InjectNodes<D, F>
@@ -311,7 +312,8 @@ fn proto_to_message(rpc: &proto::RPC) -> Rpc {
         messages.push(RawMessage {
             source: message.from.map(|x| PeerId::from_bytes(&x).unwrap()),
             data: message.data.unwrap_or_default(),
-            sequence_number: message.seqno.map(|x| BigEndian::read_u64(&x)), // don't inform the application
+            sequence_number: message.seqno.map(|x| BigEndian::read_u64(&x)), /* don't inform the
+                                                                              * application */
             topic: TopicHash::from_raw(message.topic),
             signature: message.signature, // don't inform the application
             key: None,
@@ -677,7 +679,7 @@ fn test_publish_without_flood_publishing() {
     // - Send publish message to all peers
     // - Insert message into gs.mcache and gs.received
 
-    //turn off flood publish to test old behaviour
+    // turn off flood publish to test old behaviour
     let config = ConfigBuilder::default()
         .flood_publish(false)
         .build()
@@ -757,7 +759,7 @@ fn test_fanout() {
     // - Send publish message to fanout peers
     // - Insert message into gs.mcache and gs.received
 
-    //turn off flood publish to test fanout behaviour
+    // turn off flood publish to test fanout behaviour
     let config = ConfigBuilder::default()
         .flood_publish(false)
         .build()
@@ -1447,10 +1449,10 @@ fn test_explicit_peer_gets_connected() {
         .to_subscribe(true)
         .create_network();
 
-    //create new peer
+    // create new peer
     let peer = PeerId::random();
 
-    //add peer as explicit peer
+    // add peer as explicit peer
     gs.add_explicit_peer(&peer);
 
     let num_events = gs
@@ -1483,17 +1485,17 @@ fn test_explicit_peer_reconnects() {
 
     let peer = others.first().unwrap();
 
-    //add peer as explicit peer
+    // add peer as explicit peer
     gs.add_explicit_peer(peer);
 
     flush_events(&mut gs, receivers);
 
-    //disconnect peer
+    // disconnect peer
     disconnect_peer(&mut gs, peer);
 
     gs.heartbeat();
 
-    //check that no reconnect after first heartbeat since `explicit_peer_ticks == 2`
+    // check that no reconnect after first heartbeat since `explicit_peer_ticks == 2`
     assert_eq!(
         gs.events
             .iter()
@@ -1508,7 +1510,7 @@ fn test_explicit_peer_reconnects() {
 
     gs.heartbeat();
 
-    //check that there is a reconnect after second heartbeat
+    // check that there is a reconnect after second heartbeat
     assert!(
         gs.events
             .iter()
@@ -1536,11 +1538,11 @@ fn test_handle_graft_explicit_peer() {
 
     gs.handle_graft(peer, topic_hashes.clone());
 
-    //peer got not added to mesh
+    // peer got not added to mesh
     assert!(gs.mesh[&topic_hashes[0]].is_empty());
     assert!(gs.mesh[&topic_hashes[1]].is_empty());
 
-    //check prunes
+    // check prunes
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == peer
             && match m {
@@ -1566,13 +1568,13 @@ fn explicit_peers_not_added_to_mesh_on_receiving_subscription() {
         .explicit(1)
         .create_network();
 
-    //only peer 1 is in the mesh not peer 0 (which is an explicit peer)
+    // only peer 1 is in the mesh not peer 0 (which is an explicit peer)
     assert_eq!(
         gs.mesh[&topic_hashes[0]],
         vec![peers[1]].into_iter().collect()
     );
 
-    //assert that graft gets created to non-explicit peer
+    // assert that graft gets created to non-explicit peer
     let (control_msgs, receivers) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[1] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1581,7 +1583,7 @@ fn explicit_peers_not_added_to_mesh_on_receiving_subscription() {
         "No graft message got created to non-explicit peer"
     );
 
-    //assert that no graft gets created to explicit peer
+    // assert that no graft gets created to explicit peer
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[0] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1603,10 +1605,10 @@ fn do_not_graft_explicit_peer() {
 
     gs.heartbeat();
 
-    //mesh stays empty
+    // mesh stays empty
     assert_eq!(gs.mesh[&topic_hashes[0]], BTreeSet::new());
 
-    //assert that no graft gets created to explicit peer
+    // assert that no graft gets created to explicit peer
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &others[0] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1663,7 +1665,7 @@ fn explicit_peers_not_added_to_mesh_on_subscribe() {
         .explicit(1)
         .create_network();
 
-    //create new topic, both peers subscribing to it but we do not subscribe to it
+    // create new topic, both peers subscribing to it but we do not subscribe to it
     let topic = Topic::new(String::from("t"));
     let topic_hash = topic.hash();
     for peer in peers.iter().take(2) {
@@ -1676,13 +1678,13 @@ fn explicit_peers_not_added_to_mesh_on_subscribe() {
         );
     }
 
-    //subscribe now to topic
+    // subscribe now to topic
     gs.subscribe(&topic).unwrap();
 
-    //only peer 1 is in the mesh not peer 0 (which is an explicit peer)
+    // only peer 1 is in the mesh not peer 0 (which is an explicit peer)
     assert_eq!(gs.mesh[&topic_hash], vec![peers[1]].into_iter().collect());
 
-    //assert that graft gets created to non-explicit peer
+    // assert that graft gets created to non-explicit peer
     let (control_msgs, receivers) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[1] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1691,7 +1693,7 @@ fn explicit_peers_not_added_to_mesh_on_subscribe() {
         "No graft message got created to non-explicit peer"
     );
 
-    //assert that no graft gets created to explicit peer
+    // assert that no graft gets created to explicit peer
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[0] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1711,7 +1713,7 @@ fn explicit_peers_not_added_to_mesh_from_fanout_on_subscribe() {
         .explicit(1)
         .create_network();
 
-    //create new topic, both peers subscribing to it but we do not subscribe to it
+    // create new topic, both peers subscribing to it but we do not subscribe to it
     let topic = Topic::new(String::from("t"));
     let topic_hash = topic.hash();
     for peer in peers.iter().take(2) {
@@ -1724,16 +1726,16 @@ fn explicit_peers_not_added_to_mesh_from_fanout_on_subscribe() {
         );
     }
 
-    //we send a message for this topic => this will initialize the fanout
+    // we send a message for this topic => this will initialize the fanout
     gs.publish(topic.clone(), vec![1, 2, 3]).unwrap();
 
-    //subscribe now to topic
+    // subscribe now to topic
     gs.subscribe(&topic).unwrap();
 
-    //only peer 1 is in the mesh not peer 0 (which is an explicit peer)
+    // only peer 1 is in the mesh not peer 0 (which is an explicit peer)
     assert_eq!(gs.mesh[&topic_hash], vec![peers[1]].into_iter().collect());
 
-    //assert that graft gets created to non-explicit peer
+    // assert that graft gets created to non-explicit peer
     let (control_msgs, receivers) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[1] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1742,7 +1744,7 @@ fn explicit_peers_not_added_to_mesh_from_fanout_on_subscribe() {
         "No graft message got created to non-explicit peer"
     );
 
-    //assert that no graft gets created to explicit peer
+    // assert that no graft gets created to explicit peer
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[0] && matches!(m, RpcOut::Graft { .. })
     });
@@ -1774,15 +1776,15 @@ fn no_gossip_gets_sent_to_explicit_peers() {
         validated: true,
     };
 
-    //forward the message
+    // forward the message
     gs.handle_received_message(message, &local_id);
 
-    //simulate multiple gossip calls (for randomness)
+    // simulate multiple gossip calls (for randomness)
     for _ in 0..3 {
         gs.emit_gossip();
     }
 
-    //assert that no gossip gets sent to explicit peer
+    // assert that no gossip gets sent to explicit peer
     let receiver = receivers.remove(&peers[0]).unwrap();
     let mut gossips = 0;
     let non_priority = receiver.non_priority.get_ref();
@@ -1835,7 +1837,7 @@ fn test_mesh_subtraction() {
 
     // Adds mesh_low peers and PRUNE 2 giving us a deficit.
     let n = config.mesh_n_high() + 10;
-    //make all outbound connections so that we allow grafting to all
+    // make all outbound connections so that we allow grafting to all
     let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(n)
         .topics(vec!["test".into()])
@@ -1866,10 +1868,10 @@ fn test_connect_to_px_peers_on_handle_prune() {
         .to_subscribe(true)
         .create_network();
 
-    //handle prune from single peer with px peers
+    // handle prune from single peer with px peers
 
     let mut px = Vec::new();
-    //propose more px peers than config.prune_peers()
+    // propose more px peers than config.prune_peers()
     for _ in 0..config.prune_peers() + 5 {
         px.push(PeerInfo {
             peer_id: Some(PeerId::random()),
@@ -1885,7 +1887,7 @@ fn test_connect_to_px_peers_on_handle_prune() {
         )],
     );
 
-    //Check DialPeer events for px peers
+    // Check DialPeer events for px peers
     let dials: Vec<_> = gs
         .events
         .iter()
@@ -1903,7 +1905,7 @@ fn test_connect_to_px_peers_on_handle_prune() {
     // No duplicates
     assert_eq!(dials_set.len(), config.prune_peers());
 
-    //all dial peers must be in px
+    // all dial peers must be in px
     assert!(dials_set.is_subset(
         &px.iter()
             .map(|i| *i.peer_id.as_ref().unwrap())
@@ -1915,14 +1917,14 @@ fn test_connect_to_px_peers_on_handle_prune() {
 fn test_send_px_and_backoff_in_prune() {
     let config: Config = Config::default();
 
-    //build mesh with enough peers for px
+    // build mesh with enough peers for px
     let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(config.prune_peers() + 1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
         .create_network();
 
-    //send prune to peer
+    // send prune to peer
     gs.send_graft_prune(
         HashMap::new(),
         vec![(peers[0], vec![topics[0].clone()])]
@@ -1931,7 +1933,7 @@ fn test_send_px_and_backoff_in_prune() {
         HashSet::new(),
     );
 
-    //check prune message
+    // check prune message
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[0]
             && match m {
@@ -1957,14 +1959,14 @@ fn test_send_px_and_backoff_in_prune() {
 fn test_prune_backoffed_peer_on_graft() {
     let config: Config = Config::default();
 
-    //build mesh with enough peers for px
+    // build mesh with enough peers for px
     let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(config.prune_peers() + 1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
         .create_network();
 
-    //remove peer from mesh and send prune to peer => this adds a backoff for this peer
+    // remove peer from mesh and send prune to peer => this adds a backoff for this peer
     gs.mesh.get_mut(&topics[0]).unwrap().remove(&peers[0]);
     gs.send_graft_prune(
         HashMap::new(),
@@ -1974,13 +1976,13 @@ fn test_prune_backoffed_peer_on_graft() {
         HashSet::new(),
     );
 
-    //ignore all messages until now
+    // ignore all messages until now
     let receivers = flush_events(&mut gs, receivers);
 
-    //handle graft
+    // handle graft
     gs.handle_graft(&peers[0], vec![topics[0].clone()]);
 
-    //check prune message
+    // check prune message
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[0]
             && match m {
@@ -2007,7 +2009,7 @@ fn test_do_not_graft_within_backoff_period() {
         .heartbeat_interval(Duration::from_millis(100))
         .build()
         .unwrap();
-    //only one peer => mesh too small and will try to regraft as early as possible
+    // only one peer => mesh too small and will try to regraft as early as possible
     let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -2015,22 +2017,22 @@ fn test_do_not_graft_within_backoff_period() {
         .gs_config(config)
         .create_network();
 
-    //handle prune from peer with backoff of one second
+    // handle prune from peer with backoff of one second
     gs.handle_prune(&peers[0], vec![(topics[0].clone(), Vec::new(), Some(1))]);
 
-    //forget all events until now
+    // forget all events until now
     let receivers = flush_events(&mut gs, receivers);
 
-    //call heartbeat
+    // call heartbeat
     gs.heartbeat();
 
-    //Sleep for one second and apply 10 regular heartbeats (interval = 100ms).
+    // Sleep for one second and apply 10 regular heartbeats (interval = 100ms).
     for _ in 0..10 {
         sleep(Duration::from_millis(100));
         gs.heartbeat();
     }
 
-    //Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
+    // Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
     // is needed).
     let (control_msgs, receivers) =
         count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
@@ -2039,11 +2041,11 @@ fn test_do_not_graft_within_backoff_period() {
         "Graft message created too early within backoff period"
     );
 
-    //Heartbeat one more time this should graft now
+    // Heartbeat one more time this should graft now
     sleep(Duration::from_millis(100));
     gs.heartbeat();
 
-    //check that graft got created
+    // check that graft got created
     let (control_msgs, _) = count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert!(
         control_msgs > 0,
@@ -2053,14 +2055,14 @@ fn test_do_not_graft_within_backoff_period() {
 
 #[test]
 fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without_backoff() {
-    //set default backoff period to 1 second
+    // set default backoff period to 1 second
     let config = ConfigBuilder::default()
         .prune_backoff(Duration::from_millis(90))
         .backoff_slack(1)
         .heartbeat_interval(Duration::from_millis(100))
         .build()
         .unwrap();
-    //only one peer => mesh too small and will try to regraft as early as possible
+    // only one peer => mesh too small and will try to regraft as early as possible
     let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -2068,20 +2070,20 @@ fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without
         .gs_config(config)
         .create_network();
 
-    //handle prune from peer without a specified backoff
+    // handle prune from peer without a specified backoff
     gs.handle_prune(&peers[0], vec![(topics[0].clone(), Vec::new(), None)]);
 
-    //forget all events until now
+    // forget all events until now
     let receivers = flush_events(&mut gs, receivers);
 
-    //call heartbeat
+    // call heartbeat
     gs.heartbeat();
 
-    //Apply one more heartbeat
+    // Apply one more heartbeat
     sleep(Duration::from_millis(100));
     gs.heartbeat();
 
-    //Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
+    // Check that no graft got created (we have backoff_slack = 1 therefore one more heartbeat
     // is needed).
     let (control_msgs, receivers) =
         count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
@@ -2090,11 +2092,11 @@ fn test_do_not_graft_within_default_backoff_period_after_receiving_prune_without
         "Graft message created too early within backoff period"
     );
 
-    //Heartbeat one more time this should graft now
+    // Heartbeat one more time this should graft now
     sleep(Duration::from_millis(100));
     gs.heartbeat();
 
-    //check that graft got created
+    // check that graft got created
     let (control_msgs, _) = count_control_msgs(receivers, |_, m| matches!(m, RpcOut::Graft { .. }));
     assert!(
         control_msgs > 0,
@@ -2181,7 +2183,7 @@ fn test_flood_publish() {
         .to_subscribe(true)
         .create_network();
 
-    //publish message
+    // publish message
     let publish_data = vec![0; 42];
     gs.publish(Topic::new(topic), publish_data).unwrap();
 
@@ -2228,15 +2230,15 @@ fn test_flood_publish() {
 fn test_gossip_to_at_least_gossip_lazy_peers() {
     let config: Config = Config::default();
 
-    //add more peers than in mesh to test gossipping
-    //by default only mesh_n_low peers will get added to mesh
+    // add more peers than in mesh to test gossipping
+    // by default only mesh_n_low peers will get added to mesh
     let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(config.mesh_n_low() + config.gossip_lazy() + 1)
         .topics(vec!["topic".into()])
         .to_subscribe(true)
         .create_network();
 
-    //receive message
+    // receive message
     let raw_message = RawMessage {
         source: Some(PeerId::random()),
         data: vec![],
@@ -2248,7 +2250,7 @@ fn test_gossip_to_at_least_gossip_lazy_peers() {
     };
     gs.handle_received_message(raw_message.clone(), &PeerId::random());
 
-    //emit gossip
+    // emit gossip
     gs.emit_gossip();
 
     // Transform the inbound message
@@ -2256,7 +2258,7 @@ fn test_gossip_to_at_least_gossip_lazy_peers() {
 
     let msg_id = gs.config.message_id(message);
 
-    //check that exactly config.gossip_lazy() many gossip messages were sent.
+    // check that exactly config.gossip_lazy() many gossip messages were sent.
     let (control_msgs, _) = count_control_msgs(receivers, |_, action| match action {
         RpcOut::IHave(IHave {
             topic_hash,
@@ -2271,7 +2273,7 @@ fn test_gossip_to_at_least_gossip_lazy_peers() {
 fn test_gossip_to_at_most_gossip_factor_peers() {
     let config: Config = Config::default();
 
-    //add a lot of peers
+    // add a lot of peers
     let m = config.mesh_n_low() + config.gossip_lazy() * (2.0 / config.gossip_factor()) as usize;
     let (mut gs, _, receivers, topic_hashes) = inject_nodes1()
         .peer_no(m)
@@ -2279,7 +2281,7 @@ fn test_gossip_to_at_most_gossip_factor_peers() {
         .to_subscribe(true)
         .create_network();
 
-    //receive message
+    // receive message
     let raw_message = RawMessage {
         source: Some(PeerId::random()),
         data: vec![],
@@ -2291,14 +2293,14 @@ fn test_gossip_to_at_most_gossip_factor_peers() {
     };
     gs.handle_received_message(raw_message.clone(), &PeerId::random());
 
-    //emit gossip
+    // emit gossip
     gs.emit_gossip();
 
     // Transform the inbound message
     let message = &gs.data_transform.inbound_transform(raw_message).unwrap();
 
     let msg_id = gs.config.message_id(message);
-    //check that exactly config.gossip_lazy() many gossip messages were sent.
+    // check that exactly config.gossip_lazy() many gossip messages were sent.
     let (control_msgs, _) = count_control_msgs(receivers, |_, action| match action {
         RpcOut::IHave(IHave {
             topic_hash,
@@ -2316,7 +2318,7 @@ fn test_gossip_to_at_most_gossip_factor_peers() {
 fn test_accept_only_outbound_peer_grafts_when_mesh_full() {
     let config: Config = Config::default();
 
-    //enough peers to fill the mesh
+    // enough peers to fill the mesh
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
@@ -2328,30 +2330,30 @@ fn test_accept_only_outbound_peer_grafts_when_mesh_full() {
         gs.handle_graft(&peer, topics.clone());
     }
 
-    //assert current mesh size
+    // assert current mesh size
     assert_eq!(gs.mesh[&topics[0]].len(), config.mesh_n_high());
 
-    //create an outbound and an inbound peer
+    // create an outbound and an inbound peer
     let (inbound, _in_reciver) = add_peer(&mut gs, &topics, false, false);
     let (outbound, _out_receiver) = add_peer(&mut gs, &topics, true, false);
 
-    //send grafts
+    // send grafts
     gs.handle_graft(&inbound, vec![topics[0].clone()]);
     gs.handle_graft(&outbound, vec![topics[0].clone()]);
 
-    //assert mesh size
+    // assert mesh size
     assert_eq!(gs.mesh[&topics[0]].len(), config.mesh_n_high() + 1);
 
-    //inbound is not in mesh
+    // inbound is not in mesh
     assert!(!gs.mesh[&topics[0]].contains(&inbound));
 
-    //outbound is in mesh
+    // outbound is in mesh
     assert!(gs.mesh[&topics[0]].contains(&outbound));
 }
 
 #[test]
 fn test_do_not_remove_too_many_outbound_peers() {
-    //use an extreme case to catch errors with high probability
+    // use an extreme case to catch errors with high probability
     let m = 50;
     let n = 2 * m;
     let config = ConfigBuilder::default()
@@ -2362,7 +2364,7 @@ fn test_do_not_remove_too_many_outbound_peers() {
         .build()
         .unwrap();
 
-    //fill the mesh with inbound connections
+    // fill the mesh with inbound connections
     let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(n)
         .topics(vec!["test".into()])
@@ -2375,7 +2377,7 @@ fn test_do_not_remove_too_many_outbound_peers() {
         gs.handle_graft(&peer, topics.clone());
     }
 
-    //create m outbound connections and graft (we will accept the graft)
+    // create m outbound connections and graft (we will accept the graft)
     let mut outbound = HashSet::new();
     for _ in 0..m {
         let (peer, _) = add_peer(&mut gs, &topics, true, false);
@@ -2383,7 +2385,7 @@ fn test_do_not_remove_too_many_outbound_peers() {
         gs.handle_graft(&peer, topics.clone());
     }
 
-    //mesh is overly full
+    // mesh is overly full
     assert_eq!(gs.mesh.get(&topics[0]).unwrap().len(), n + m);
 
     // run a heartbeat
@@ -2392,7 +2394,7 @@ fn test_do_not_remove_too_many_outbound_peers() {
     // Peers should be removed to reach n
     assert_eq!(gs.mesh.get(&topics[0]).unwrap().len(), n);
 
-    //all outbound peers are still in the mesh
+    // all outbound peers are still in the mesh
     assert!(outbound.iter().all(|p| gs.mesh[&topics[0]].contains(p)));
 }
 
@@ -2412,7 +2414,7 @@ fn test_add_outbound_peers_if_min_is_not_satisfied() {
         gs.handle_graft(&peer, topics.clone());
     }
 
-    //create config.mesh_outbound_min() many outbound connections without grafting
+    // create config.mesh_outbound_min() many outbound connections without grafting
     let mut peers = vec![];
     for _ in 0..config.mesh_outbound_min() {
         peers.push(add_peer(&mut gs, &topics, true, false));
@@ -2435,7 +2437,7 @@ fn test_add_outbound_peers_if_min_is_not_satisfied() {
 fn test_prune_negative_scored_peers() {
     let config = Config::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -2449,16 +2451,16 @@ fn test_prune_negative_scored_peers() {
         )))
         .create_network();
 
-    //add penalty to peer
+    // add penalty to peer
     gs.peer_score.as_mut().unwrap().0.add_penalty(&peers[0], 1);
 
-    //execute heartbeat
+    // execute heartbeat
     gs.heartbeat();
 
-    //peer should not be in mesh anymore
+    // peer should not be in mesh anymore
     assert!(gs.mesh[&topics[0]].is_empty());
 
-    //check prune message
+    // check prune message
     let (control_msgs, _) = count_control_msgs(receivers, |peer_id, m| {
         peer_id == &peers[0]
             && match m {
@@ -2481,7 +2483,7 @@ fn test_prune_negative_scored_peers() {
 #[test]
 fn test_dont_graft_to_negative_scored_peers() {
     let config = Config::default();
-    //init full mesh
+    // init full mesh
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
@@ -2493,34 +2495,34 @@ fn test_dont_graft_to_negative_scored_peers() {
         )))
         .create_network();
 
-    //add two additional peers that will not be part of the mesh
+    // add two additional peers that will not be part of the mesh
     let (p1, _receiver1) = add_peer(&mut gs, &topics, false, false);
     let (p2, _receiver2) = add_peer(&mut gs, &topics, false, false);
 
-    //reduce score of p1 to negative
+    // reduce score of p1 to negative
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p1, 1);
 
-    //handle prunes of all other peers
+    // handle prunes of all other peers
     for p in peers {
         gs.handle_prune(&p, vec![(topics[0].clone(), Vec::new(), None)]);
     }
 
-    //heartbeat
+    // heartbeat
     gs.heartbeat();
 
-    //assert that mesh only contains p2
+    // assert that mesh only contains p2
     assert_eq!(gs.mesh.get(&topics[0]).unwrap().len(), 1);
     assert!(gs.mesh.get(&topics[0]).unwrap().contains(&p2));
 }
 
-///Note that in this test also without a penalty the px would be ignored because of the
+/// Note that in this test also without a penalty the px would be ignored because of the
 /// acceptPXThreshold, but the spec still explicitly states the rule that px from negative
 /// peers should get ignored, therefore we test it here.
 #[test]
 fn test_ignore_px_from_negative_scored_peer() {
     let config = Config::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -2532,10 +2534,10 @@ fn test_ignore_px_from_negative_scored_peer() {
         )))
         .create_network();
 
-    //penalize peer
+    // penalize peer
     gs.peer_score.as_mut().unwrap().0.add_penalty(&peers[0], 1);
 
-    //handle prune from single peer with px peers
+    // handle prune from single peer with px peers
     let px = vec![PeerInfo {
         peer_id: Some(PeerId::random()),
     }];
@@ -2549,7 +2551,7 @@ fn test_ignore_px_from_negative_scored_peer() {
         )],
     );
 
-    //assert no dials
+    // assert no dials
     assert_eq!(
         gs.events
             .iter()
@@ -2760,7 +2762,7 @@ fn test_iwant_msg_from_peer_below_gossip_threshold_gets_ignored() {
                 collected_messages
             });
 
-    //the message got sent to p2
+    // the message got sent to p2
     assert!(sent_messages
         .iter()
         .map(|(peer_id, msg)| (
@@ -2768,7 +2770,7 @@ fn test_iwant_msg_from_peer_below_gossip_threshold_gets_ignored() {
             gs.data_transform.inbound_transform(msg.clone()).unwrap()
         ))
         .any(|(peer_id, msg)| peer_id == &p2 && gs.config.message_id(&msg) == msg_id));
-    //the message got not sent to p1
+    // the message got not sent to p1
     assert!(sent_messages
         .iter()
         .map(|(peer_id, msg)| (
@@ -2786,7 +2788,7 @@ fn test_ihave_msg_from_peer_below_gossip_threshold_gets_ignored() {
         gossip_threshold: 3.0 * peer_score_params.behaviour_penalty_weight,
         ..PeerScoreThresholds::default()
     };
-    //build full mesh
+    // build full mesh
     let (mut gs, peers, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
@@ -2802,21 +2804,21 @@ fn test_ihave_msg_from_peer_below_gossip_threshold_gets_ignored() {
         gs.handle_graft(&peer, topics.clone());
     }
 
-    //add two additional peers that will not be part of the mesh
+    // add two additional peers that will not be part of the mesh
     let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p1, receiver1);
     let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p2, receiver2);
 
-    //reduce score of p1 below peer_score_thresholds.gossip_threshold
-    //note that penalties get squared so two penalties means a score of
+    // reduce score of p1 below peer_score_thresholds.gossip_threshold
+    // note that penalties get squared so two penalties means a score of
     // 4 * peer_score_params.behaviour_penalty_weight.
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p1, 2);
 
-    //reduce score of p2 below 0 but not below peer_score_thresholds.gossip_threshold
+    // reduce score of p2 below 0 but not below peer_score_thresholds.gossip_threshold
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p2, 1);
 
-    //message that other peers have
+    // message that other peers have
     let raw_message = RawMessage {
         source: Some(PeerId::random()),
         data: vec![],
@@ -2863,31 +2865,31 @@ fn test_do_not_publish_to_peer_below_publish_threshold() {
         ..PeerScoreThresholds::default()
     };
 
-    //build mesh with no peers and no subscribed topics
+    // build mesh with no peers and no subscribed topics
     let (mut gs, _, mut receivers, _) = inject_nodes1()
         .gs_config(config)
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
 
-    //create a new topic for which we are not subscribed
+    // create a new topic for which we are not subscribed
     let topic = Topic::new("test");
     let topics = vec![topic.hash()];
 
-    //add two additional peers that will be added to the mesh
+    // add two additional peers that will be added to the mesh
     let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p1, receiver1);
     let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p2, receiver2);
 
-    //reduce score of p1 below peer_score_thresholds.publish_threshold
-    //note that penalties get squared so two penalties means a score of
+    // reduce score of p1 below peer_score_thresholds.publish_threshold
+    // note that penalties get squared so two penalties means a score of
     // 4 * peer_score_params.behaviour_penalty_weight.
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p1, 2);
 
-    //reduce score of p2 below 0 but not below peer_score_thresholds.publish_threshold
+    // reduce score of p2 below 0 but not below peer_score_thresholds.publish_threshold
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p2, 1);
 
-    //a heartbeat will remove the peers from the mesh
+    // a heartbeat will remove the peers from the mesh
     gs.heartbeat();
 
     // publish on topic
@@ -2907,7 +2909,7 @@ fn test_do_not_publish_to_peer_below_publish_threshold() {
             collected_publish
         });
 
-    //assert only published to p2
+    // assert only published to p2
     assert_eq!(publishes.len(), 1);
     assert_eq!(publishes[0].0, p2);
 }
@@ -2921,28 +2923,28 @@ fn test_do_not_flood_publish_to_peer_below_publish_threshold() {
         publish_threshold: 3.0 * peer_score_params.behaviour_penalty_weight,
         ..PeerScoreThresholds::default()
     };
-    //build mesh with no peers
+    // build mesh with no peers
     let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .topics(vec!["test".into()])
         .gs_config(config)
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
 
-    //add two additional peers that will be added to the mesh
+    // add two additional peers that will be added to the mesh
     let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p1, receiver1);
     let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p2, receiver2);
 
-    //reduce score of p1 below peer_score_thresholds.publish_threshold
-    //note that penalties get squared so two penalties means a score of
+    // reduce score of p1 below peer_score_thresholds.publish_threshold
+    // note that penalties get squared so two penalties means a score of
     // 4 * peer_score_params.behaviour_penalty_weight.
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p1, 2);
 
-    //reduce score of p2 below 0 but not below peer_score_thresholds.publish_threshold
+    // reduce score of p2 below 0 but not below peer_score_thresholds.publish_threshold
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p2, 1);
 
-    //a heartbeat will remove the peers from the mesh
+    // a heartbeat will remove the peers from the mesh
     gs.heartbeat();
 
     // publish on topic
@@ -2962,7 +2964,7 @@ fn test_do_not_flood_publish_to_peer_below_publish_threshold() {
             collected_publish
         });
 
-    //assert only published to p2
+    // assert only published to p2
     assert_eq!(publishes.len(), 1);
     assert!(publishes[0].0 == p2);
 }
@@ -2978,23 +2980,23 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         ..PeerScoreThresholds::default()
     };
 
-    //build mesh with no peers
+    // build mesh with no peers
     let (mut gs, _, _, topics) = inject_nodes1()
         .topics(vec!["test".into()])
         .gs_config(config.clone())
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
 
-    //add two additional peers that will be added to the mesh
+    // add two additional peers that will be added to the mesh
     let (p1, _receiver1) = add_peer(&mut gs, &topics, false, false);
     let (p2, _receiver2) = add_peer(&mut gs, &topics, false, false);
 
-    //reduce score of p1 below peer_score_thresholds.graylist_threshold
-    //note that penalties get squared so two penalties means a score of
+    // reduce score of p1 below peer_score_thresholds.graylist_threshold
+    // note that penalties get squared so two penalties means a score of
     // 4 * peer_score_params.behaviour_penalty_weight.
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p1, 2);
 
-    //reduce score of p2 below publish_threshold but not below graylist_threshold
+    // reduce score of p2 below publish_threshold but not below graylist_threshold
     gs.peer_score.as_mut().unwrap().0.add_penalty(&p2, 1);
 
     let raw_message1 = RawMessage {
@@ -3053,10 +3055,10 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         message_ids: vec![config.message_id(message2)],
     });
 
-    //clear events
+    // clear events
     gs.events.clear();
 
-    //receive from p1
+    // receive from p1
     gs.on_connection_handler_event(
         p1,
         ConnectionId::new_unchecked(0),
@@ -3070,7 +3072,7 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         },
     );
 
-    //only the subscription event gets processed, the rest is dropped
+    // only the subscription event gets processed, the rest is dropped
     assert_eq!(gs.events.len(), 1);
     assert!(matches!(
         gs.events[0],
@@ -3082,7 +3084,7 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         message_ids: vec![config.message_id(message4)],
     });
 
-    //receive from p2
+    // receive from p2
     gs.on_connection_handler_event(
         p2,
         ConnectionId::new_unchecked(0),
@@ -3096,7 +3098,7 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
         },
     );
 
-    //events got processed
+    // events got processed
     assert!(gs.events.len() > 1);
 }
 
@@ -3145,7 +3147,7 @@ fn test_ignore_px_from_peers_below_accept_px_threshold() {
         0
     );
 
-    //handle prune from peer peers[1] with px peers
+    // handle prune from peer peers[1] with px peers
     let px = vec![PeerInfo {
         peer_id: Some(PeerId::random()),
     }];
@@ -3158,7 +3160,7 @@ fn test_ignore_px_from_peers_below_accept_px_threshold() {
         )],
     );
 
-    //assert there are dials now
+    // assert there are dials now
     assert!(
         gs.events
             .iter()
@@ -3178,7 +3180,7 @@ fn test_keep_best_scoring_peers_on_oversubscription() {
         .build()
         .unwrap();
 
-    //build mesh with more peers than mesh can hold
+    // build mesh with more peers than mesh can hold
     let n = config.mesh_n_high() + 1;
     let (mut gs, peers, _receivers, topics) = inject_nodes1()
         .peer_no(n)
@@ -3198,21 +3200,21 @@ fn test_keep_best_scoring_peers_on_oversubscription() {
         gs.handle_graft(peer, topics.clone());
     }
 
-    //assign scores to peers equalling their index
+    // assign scores to peers equalling their index
 
-    //set random positive scores
+    // set random positive scores
     for (index, peer) in peers.iter().enumerate() {
         gs.set_application_score(peer, index as f64);
     }
 
     assert_eq!(gs.mesh[&topics[0]].len(), n);
 
-    //heartbeat to prune some peers
+    // heartbeat to prune some peers
     gs.heartbeat();
 
     assert_eq!(gs.mesh[&topics[0]].len(), config.mesh_n());
 
-    //mesh contains retain_scores best peers
+    // mesh contains retain_scores best peers
     assert!(gs.mesh[&topics[0]].is_superset(
         &peers[(n - config.retain_scores())..]
             .iter()
@@ -3239,7 +3241,7 @@ fn test_scoring_p1() {
         .insert(topic_hash, topic_params.clone());
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, _) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3250,9 +3252,9 @@ fn test_scoring_p1() {
         .scoring(Some((peer_score_params, peer_score_thresholds)))
         .create_network();
 
-    //sleep for 2 times the mesh_quantum
+    // sleep for 2 times the mesh_quantum
     sleep(topic_params.time_in_mesh_quantum * 2);
-    //refresh scores
+    // refresh scores
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
     assert!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0])
@@ -3265,9 +3267,9 @@ fn test_scoring_p1() {
         "score should be less than 3 * time_in_mesh_weight * topic_weight"
     );
 
-    //sleep again for 2 times the mesh_quantum
+    // sleep again for 2 times the mesh_quantum
     sleep(topic_params.time_in_mesh_quantum * 2);
-    //refresh scores
+    // refresh scores
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
     assert!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0])
@@ -3275,9 +3277,9 @@ fn test_scoring_p1() {
         "score should be at least 4 * time_in_mesh_weight * topic_weight"
     );
 
-    //sleep for enough periods to reach maximum
+    // sleep for enough periods to reach maximum
     sleep(topic_params.time_in_mesh_quantum * (topic_params.time_in_mesh_cap - 3.0) as u32);
-    //refresh scores
+    // refresh scores
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
@@ -3309,7 +3311,7 @@ fn test_scoring_p2() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0, //deactivate time in mesh
+        time_in_mesh_weight: 0.0, // deactivate time in mesh
         first_message_deliveries_weight: 2.0,
         first_message_deliveries_cap: 10.0,
         first_message_deliveries_decay: 0.9,
@@ -3321,7 +3323,7 @@ fn test_scoring_p2() {
         .insert(topic_hash, topic_params.clone());
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
@@ -3338,9 +3340,9 @@ fn test_scoring_p2() {
     };
 
     let m1 = random_message(&mut seq, &topics);
-    //peer 0 delivers message first
+    // peer 0 delivers message first
     deliver_message(&mut gs, 0, m1.clone());
-    //peer 1 delivers message second
+    // peer 1 delivers message second
     deliver_message(&mut gs, 1, m1);
 
     assert_eq!(
@@ -3355,7 +3357,7 @@ fn test_scoring_p2() {
         "there should be no score for second message deliveries * topic_weight"
     );
 
-    //peer 2 delivers two new messages
+    // peer 2 delivers two new messages
     deliver_message(&mut gs, 1, random_message(&mut seq, &topics));
     deliver_message(&mut gs, 1, random_message(&mut seq, &topics));
     assert_eq!(
@@ -3364,7 +3366,7 @@ fn test_scoring_p2() {
         "score should be exactly 2 * first_message_deliveries_weight * topic_weight"
     );
 
-    //test decaying
+    // test decaying
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
 
     assert_eq!(
@@ -3385,7 +3387,7 @@ fn test_scoring_p2() {
                first_message_deliveries_weight * topic_weight"
     );
 
-    //test cap
+    // test cap
     for _ in 0..topic_params.first_message_deliveries_cap as u64 {
         deliver_message(&mut gs, 1, random_message(&mut seq, &topics));
     }
@@ -3407,8 +3409,8 @@ fn test_scoring_p3() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
+        time_in_mesh_weight: 0.0,             // deactivate time in mesh
+        first_message_deliveries_weight: 0.0, // deactivate first time deliveries
         mesh_message_deliveries_weight: -2.0,
         mesh_message_deliveries_decay: 0.9,
         mesh_message_deliveries_cap: 10.0,
@@ -3421,7 +3423,7 @@ fn test_scoring_p3() {
     peer_score_params.topics.insert(topic_hash, topic_params);
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with two peers
+    // build mesh with two peers
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
@@ -3439,35 +3441,35 @@ fn test_scoring_p3() {
 
     let mut expected_message_deliveries = 0.0;
 
-    //messages used to test window
+    // messages used to test window
     let m1 = random_message(&mut seq, &topics);
     let m2 = random_message(&mut seq, &topics);
 
-    //peer 1 delivers m1
+    // peer 1 delivers m1
     deliver_message(&mut gs, 1, m1.clone());
 
-    //peer 0 delivers two message
+    // peer 0 delivers two message
     deliver_message(&mut gs, 0, random_message(&mut seq, &topics));
     deliver_message(&mut gs, 0, random_message(&mut seq, &topics));
     expected_message_deliveries += 2.0;
 
     sleep(Duration::from_millis(60));
 
-    //peer 1 delivers m2
+    // peer 1 delivers m2
     deliver_message(&mut gs, 1, m2.clone());
 
     sleep(Duration::from_millis(70));
-    //peer 0 delivers m1 and m2 only m2 gets counted
+    // peer 0 delivers m1 and m2 only m2 gets counted
     deliver_message(&mut gs, 0, m1);
     deliver_message(&mut gs, 0, m2);
     expected_message_deliveries += 1.0;
 
     sleep(Duration::from_millis(900));
 
-    //message deliveries penalties get activated, peer 0 has only delivered 3 messages and
+    // message deliveries penalties get activated, peer 0 has only delivered 3 messages and
     // therefore gets a penalty
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
-    expected_message_deliveries *= 0.9; //decay
+    expected_message_deliveries *= 0.9; // decay
 
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
@@ -3483,10 +3485,10 @@ fn test_scoring_p3() {
 
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
 
-    //apply 10 decays
+    // apply 10 decays
     for _ in 0..10 {
         gs.peer_score.as_mut().unwrap().0.refresh_scores();
-        expected_message_deliveries *= 0.9; //decay
+        expected_message_deliveries *= 0.9; // decay
     }
 
     assert_eq!(
@@ -3505,8 +3507,8 @@ fn test_scoring_p3b() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
+        time_in_mesh_weight: 0.0,             // deactivate time in mesh
+        first_message_deliveries_weight: 0.0, // deactivate first time deliveries
         mesh_message_deliveries_weight: -2.0,
         mesh_message_deliveries_decay: 0.9,
         mesh_message_deliveries_cap: 10.0,
@@ -3522,7 +3524,7 @@ fn test_scoring_p3b() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3540,49 +3542,49 @@ fn test_scoring_p3b() {
 
     let mut expected_message_deliveries = 0.0;
 
-    //add some positive score
+    // add some positive score
     gs.peer_score
         .as_mut()
         .unwrap()
         .0
         .set_application_score(&peers[0], 100.0);
 
-    //peer 0 delivers two message
+    // peer 0 delivers two message
     deliver_message(&mut gs, 0, random_message(&mut seq, &topics));
     deliver_message(&mut gs, 0, random_message(&mut seq, &topics));
     expected_message_deliveries += 2.0;
 
     sleep(Duration::from_millis(1050));
 
-    //activation kicks in
+    // activation kicks in
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
-    expected_message_deliveries *= 0.9; //decay
+    expected_message_deliveries *= 0.9; // decay
 
-    //prune peer
+    // prune peer
     gs.handle_prune(&peers[0], vec![(topics[0].clone(), vec![], None)]);
 
-    //wait backoff
+    // wait backoff
     sleep(Duration::from_millis(130));
 
-    //regraft peer
+    // regraft peer
     gs.handle_graft(&peers[0], topics.clone());
 
-    //the score should now consider p3b
+    // the score should now consider p3b
     let mut expected_b3 = (5f64 - expected_message_deliveries).powi(2);
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
         100.0 + expected_b3 * -3.0 * 0.7
     );
 
-    //we can also add a new p3 to the score
+    // we can also add a new p3 to the score
 
-    //peer 0 delivers one message
+    // peer 0 delivers one message
     deliver_message(&mut gs, 0, random_message(&mut seq, &topics));
     expected_message_deliveries += 1.0;
 
     sleep(Duration::from_millis(1050));
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
-    expected_message_deliveries *= 0.9; //decay
+    expected_message_deliveries *= 0.9; // decay
     expected_b3 *= 0.95;
 
     assert_eq!(
@@ -3601,10 +3603,14 @@ fn test_scoring_p4_valid_message() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3614,7 +3620,7 @@ fn test_scoring_p4_valid_message() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with two peers
+    // build mesh with two peers
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3630,7 +3636,7 @@ fn test_scoring_p4_valid_message() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers valid message
+    // peer 0 delivers valid message
     let m1 = random_message(&mut seq, &topics);
     deliver_message(&mut gs, 0, m1.clone());
 
@@ -3639,7 +3645,7 @@ fn test_scoring_p4_valid_message() {
 
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
 
-    //message m1 gets validated
+    // message m1 gets validated
     gs.report_message_validation_result(
         &config.message_id(message1),
         &peers[0],
@@ -3659,10 +3665,14 @@ fn test_scoring_p4_invalid_signature() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3672,7 +3682,7 @@ fn test_scoring_p4_invalid_signature() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3685,7 +3695,7 @@ fn test_scoring_p4_invalid_signature() {
 
     let mut seq = 0;
 
-    //peer 0 delivers message with invalid signature
+    // peer 0 delivers message with invalid signature
     let m = random_message(&mut seq, &topics);
 
     gs.on_connection_handler_event(
@@ -3717,10 +3727,14 @@ fn test_scoring_p4_message_from_self() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3730,7 +3744,7 @@ fn test_scoring_p4_message_from_self() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with two peers
+    // build mesh with two peers
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3746,7 +3760,7 @@ fn test_scoring_p4_message_from_self() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers invalid message from self
+    // peer 0 delivers invalid message from self
     let mut m = random_message(&mut seq, &topics);
     m.source = Some(*gs.publish_config.get_own_id().unwrap());
 
@@ -3767,10 +3781,14 @@ fn test_scoring_p4_ignored_message() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3780,7 +3798,7 @@ fn test_scoring_p4_ignored_message() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with two peers
+    // build mesh with two peers
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3796,7 +3814,7 @@ fn test_scoring_p4_ignored_message() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers ignored message
+    // peer 0 delivers ignored message
     let m1 = random_message(&mut seq, &topics);
     deliver_message(&mut gs, 0, m1.clone());
 
@@ -3805,7 +3823,7 @@ fn test_scoring_p4_ignored_message() {
     // Transform the inbound message
     let message1 = &gs.data_transform.inbound_transform(m1).unwrap();
 
-    //message m1 gets ignored
+    // message m1 gets ignored
     gs.report_message_validation_result(
         &config.message_id(message1),
         &peers[0],
@@ -3825,10 +3843,14 @@ fn test_scoring_p4_application_invalidated_message() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3838,7 +3860,7 @@ fn test_scoring_p4_application_invalidated_message() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with two peers
+    // build mesh with two peers
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3854,7 +3876,7 @@ fn test_scoring_p4_application_invalidated_message() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers invalid message
+    // peer 0 delivers invalid message
     let m1 = random_message(&mut seq, &topics);
     deliver_message(&mut gs, 0, m1.clone());
 
@@ -3863,7 +3885,7 @@ fn test_scoring_p4_application_invalidated_message() {
     // Transform the inbound message
     let message1 = &gs.data_transform.inbound_transform(m1).unwrap();
 
-    //message m1 gets rejected
+    // message m1 gets rejected
     gs.report_message_validation_result(
         &config.message_id(message1),
         &peers[0],
@@ -3886,10 +3908,14 @@ fn test_scoring_p4_application_invalid_message_from_two_peers() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3899,7 +3925,7 @@ fn test_scoring_p4_application_invalid_message_from_two_peers() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with two peers
+    // build mesh with two peers
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(2)
         .topics(vec!["test".into()])
@@ -3915,20 +3941,20 @@ fn test_scoring_p4_application_invalid_message_from_two_peers() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers invalid message
+    // peer 0 delivers invalid message
     let m1 = random_message(&mut seq, &topics);
     deliver_message(&mut gs, 0, m1.clone());
 
     // Transform the inbound message
     let message1 = &gs.data_transform.inbound_transform(m1.clone()).unwrap();
 
-    //peer 1 delivers same message
+    // peer 1 delivers same message
     deliver_message(&mut gs, 1, m1);
 
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[1]), 0.0);
 
-    //message m1 gets rejected
+    // message m1 gets rejected
     gs.report_message_validation_result(
         &config.message_id(message1),
         &peers[0],
@@ -3955,10 +3981,14 @@ fn test_scoring_p4_three_application_invalid_messages() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -3968,7 +3998,7 @@ fn test_scoring_p4_three_application_invalid_messages() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -3984,7 +4014,7 @@ fn test_scoring_p4_three_application_invalid_messages() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers two invalid message
+    // peer 0 delivers two invalid message
     let m1 = random_message(&mut seq, &topics);
     let m2 = random_message(&mut seq, &topics);
     let m3 = random_message(&mut seq, &topics);
@@ -4002,7 +4032,7 @@ fn test_scoring_p4_three_application_invalid_messages() {
 
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
 
-    //messages gets rejected
+    // messages gets rejected
     gs.report_message_validation_result(
         &config.message_id(message1),
         &peers[0],
@@ -4021,7 +4051,7 @@ fn test_scoring_p4_three_application_invalid_messages() {
         MessageAcceptance::Reject,
     );
 
-    //number of invalid messages gets squared
+    // number of invalid messages gets squared
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
         9.0 * -2.0 * 0.7
@@ -4038,10 +4068,14 @@ fn test_scoring_p4_decay() {
     let topic = Topic::new("test");
     let topic_hash = topic.hash();
     let topic_params = TopicScoreParams {
-        time_in_mesh_weight: 0.0,             //deactivate time in mesh
-        first_message_deliveries_weight: 0.0, //deactivate first time deliveries
-        mesh_message_deliveries_weight: 0.0,  //deactivate message deliveries
-        mesh_failure_penalty_weight: 0.0,     //deactivate mesh failure penalties
+        // deactivate time in mesh
+        time_in_mesh_weight: 0.0,
+        // deactivate first time deliveries
+        first_message_deliveries_weight: 0.0,
+        // deactivate message deliveries
+        mesh_message_deliveries_weight: 0.0,
+        // deactivate mesh failure penalties
+        mesh_failure_penalty_weight: 0.0,
         invalid_message_deliveries_weight: -2.0,
         invalid_message_deliveries_decay: 0.9,
         topic_weight: 0.7,
@@ -4051,7 +4085,7 @@ fn test_scoring_p4_decay() {
     peer_score_params.app_specific_weight = 1.0;
     let peer_score_thresholds = PeerScoreThresholds::default();
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -4067,7 +4101,7 @@ fn test_scoring_p4_decay() {
         gs.handle_received_message(msg, &peers[index]);
     };
 
-    //peer 0 delivers invalid message
+    // peer 0 delivers invalid message
     let m1 = random_message(&mut seq, &topics);
     deliver_message(&mut gs, 0, m1.clone());
 
@@ -4075,7 +4109,7 @@ fn test_scoring_p4_decay() {
     let message1 = &gs.data_transform.inbound_transform(m1).unwrap();
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&peers[0]), 0.0);
 
-    //message m1 gets rejected
+    // message m1 gets rejected
     gs.report_message_validation_result(
         &config.message_id(message1),
         &peers[0],
@@ -4087,7 +4121,7 @@ fn test_scoring_p4_decay() {
         -2.0 * 0.7
     );
 
-    //we decay
+    // we decay
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
 
     // the number of invalids gets decayed to 0.9 and then squared in the score
@@ -4104,7 +4138,7 @@ fn test_scoring_p5() {
         ..PeerScoreParams::default()
     };
 
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, _, _) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
@@ -4141,7 +4175,7 @@ fn test_scoring_p6() {
         .scoring(Some((peer_score_params, PeerScoreThresholds::default())))
         .create_network();
 
-    //create 5 peers with the same ip
+    // create 5 peers with the same ip
     let addr = Multiaddr::from(Ipv4Addr::new(10, 1, 2, 3));
     let peers = vec![
         add_peer_with_addr(&mut gs, &[], false, false, addr.clone()).0,
@@ -4151,7 +4185,7 @@ fn test_scoring_p6() {
         add_peer_with_addr(&mut gs, &[], true, true, addr.clone()).0,
     ];
 
-    //create 4 other peers with other ip
+    // create 4 other peers with other ip
     let addr2 = Multiaddr::from(Ipv4Addr::new(10, 1, 2, 4));
     let others = vec![
         add_peer_with_addr(&mut gs, &[], false, false, addr2.clone()).0,
@@ -4160,12 +4194,12 @@ fn test_scoring_p6() {
         add_peer_with_addr(&mut gs, &[], true, false, addr2.clone()).0,
     ];
 
-    //no penalties yet
+    // no penalties yet
     for peer in peers.iter().chain(others.iter()) {
         assert_eq!(gs.peer_score.as_ref().unwrap().0.score(peer), 0.0);
     }
 
-    //add additional connection for 3 others with addr
+    // add additional connection for 3 others with addr
     for id in others.iter().take(3) {
         gs.on_swarm_event(FromSwarm::ConnectionEstablished(ConnectionEstablished {
             peer_id: *id,
@@ -4180,14 +4214,14 @@ fn test_scoring_p6() {
         }));
     }
 
-    //penalties apply squared
+    // penalties apply squared
     for peer in peers.iter().chain(others.iter().take(3)) {
         assert_eq!(gs.peer_score.as_ref().unwrap().0.score(peer), 9.0 * -2.0);
     }
-    //fourth other peer still no penalty
+    // fourth other peer still no penalty
     assert_eq!(gs.peer_score.as_ref().unwrap().0.score(&others[3]), 0.0);
 
-    //add additional connection for 3 of the peers to addr2
+    // add additional connection for 3 of the peers to addr2
     for peer in peers.iter().take(3) {
         gs.on_swarm_event(FromSwarm::ConnectionEstablished(ConnectionEstablished {
             peer_id: *peer,
@@ -4202,7 +4236,7 @@ fn test_scoring_p6() {
         }));
     }
 
-    //double penalties for the first three of each
+    // double penalties for the first three of each
     for peer in peers.iter().take(3).chain(others.iter().take(3)) {
         assert_eq!(
             gs.peer_score.as_ref().unwrap().0.score(peer),
@@ -4210,7 +4244,7 @@ fn test_scoring_p6() {
         );
     }
 
-    //single penalties for the rest
+    // single penalties for the rest
     for peer in peers.iter().skip(3) {
         assert_eq!(gs.peer_score.as_ref().unwrap().0.score(peer), 9.0 * -2.0);
     }
@@ -4219,7 +4253,7 @@ fn test_scoring_p6() {
         4.0 * -2.0
     );
 
-    //two times same ip doesn't count twice
+    // two times same ip doesn't count twice
     gs.on_swarm_event(FromSwarm::ConnectionEstablished(ConnectionEstablished {
         peer_id: peers[0],
         connection_id: ConnectionId::new_unchecked(0),
@@ -4232,8 +4266,8 @@ fn test_scoring_p6() {
         other_established: 2,
     }));
 
-    //nothing changed
-    //double penalties for the first three of each
+    // nothing changed
+    // double penalties for the first three of each
     for peer in peers.iter().take(3).chain(others.iter().take(3)) {
         assert_eq!(
             gs.peer_score.as_ref().unwrap().0.score(peer),
@@ -4241,7 +4275,7 @@ fn test_scoring_p6() {
         );
     }
 
-    //single penalties for the rest
+    // single penalties for the rest
     for peer in peers.iter().skip(3) {
         assert_eq!(gs.peer_score.as_ref().unwrap().0.score(peer), 9.0 * -2.0);
     }
@@ -4274,7 +4308,7 @@ fn test_scoring_p7_grafts_before_backoff() {
         .scoring(Some((peer_score_params, PeerScoreThresholds::default())))
         .create_network();
 
-    //remove peers from mesh and send prune to them => this adds a backoff for the peers
+    // remove peers from mesh and send prune to them => this adds a backoff for the peers
     for peer in peers.iter().take(2) {
         gs.mesh.get_mut(&topics[0]).unwrap().remove(peer);
         gs.send_graft_prune(
@@ -4284,31 +4318,31 @@ fn test_scoring_p7_grafts_before_backoff() {
         );
     }
 
-    //wait 50 millisecs
+    // wait 50 millisecs
     sleep(Duration::from_millis(50));
 
-    //first peer tries to graft
+    // first peer tries to graft
     gs.handle_graft(&peers[0], vec![topics[0].clone()]);
 
-    //double behaviour penalty for first peer (squared)
+    // double behaviour penalty for first peer (squared)
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[0]),
         4.0 * -2.0
     );
 
-    //wait 100 millisecs
+    // wait 100 millisecs
     sleep(Duration::from_millis(100));
 
-    //second peer tries to graft
+    // second peer tries to graft
     gs.handle_graft(&peers[1], vec![topics[0].clone()]);
 
-    //single behaviour penalty for second peer
+    // single behaviour penalty for second peer
     assert_eq!(
         gs.peer_score.as_ref().unwrap().0.score(&peers[1]),
         1.0 * -2.0
     );
 
-    //test decay
+    // test decay
     gs.peer_score.as_mut().unwrap().0.refresh_scores();
 
     assert_eq!(
@@ -4327,7 +4361,7 @@ fn test_opportunistic_grafting() {
         .mesh_n_low(3)
         .mesh_n(5)
         .mesh_n_high(7)
-        .mesh_outbound_min(0) //deactivate outbound handling
+        .mesh_outbound_min(0) // deactivate outbound handling
         .opportunistic_graft_ticks(2)
         .opportunistic_graft_peers(2)
         .build()
@@ -4351,30 +4385,30 @@ fn test_opportunistic_grafting() {
         .scoring(Some((peer_score_params, thresholds)))
         .create_network();
 
-    //fill mesh with 5 peers
+    // fill mesh with 5 peers
     for peer in &peers {
         gs.handle_graft(peer, topics.clone());
     }
 
-    //add additional 5 peers
+    // add additional 5 peers
     let others: Vec<_> = (0..5)
         .map(|_| add_peer(&mut gs, &topics, false, false))
         .collect();
 
-    //currently mesh equals peers
+    // currently mesh equals peers
     assert_eq!(gs.mesh[&topics[0]], peers.iter().cloned().collect());
 
-    //give others high scores (but the first two have not high enough scores)
+    // give others high scores (but the first two have not high enough scores)
     for (i, peer) in peers.iter().enumerate().take(5) {
         gs.set_application_score(peer, 0.0 + i as f64);
     }
 
-    //set scores for peers in the mesh
+    // set scores for peers in the mesh
     for (i, (peer, _receiver)) in others.iter().enumerate().take(5) {
         gs.set_application_score(peer, 0.0 + i as f64);
     }
 
-    //this gives a median of exactly 2.0 => should not apply opportunistic grafting
+    // this gives a median of exactly 2.0 => should not apply opportunistic grafting
     gs.heartbeat();
     gs.heartbeat();
 
@@ -4384,10 +4418,10 @@ fn test_opportunistic_grafting() {
         "should not apply opportunistic grafting"
     );
 
-    //reduce middle score to 1.0 giving a median of 1.0
+    // reduce middle score to 1.0 giving a median of 1.0
     gs.set_application_score(&peers[2], 1.0);
 
-    //opportunistic grafting after two heartbeats
+    // opportunistic grafting after two heartbeats
 
     gs.heartbeat();
     assert_eq!(
@@ -4417,17 +4451,17 @@ fn test_opportunistic_grafting() {
 
 #[test]
 fn test_ignore_graft_from_unknown_topic() {
-    //build gossipsub without subscribing to any topics
+    // build gossipsub without subscribing to any topics
     let (mut gs, peers, receivers, _) = inject_nodes1()
         .peer_no(1)
         .topics(vec![])
         .to_subscribe(false)
         .create_network();
 
-    //handle an incoming graft for some topic
+    // handle an incoming graft for some topic
     gs.handle_graft(&peers[0], vec![Topic::new("test").hash()]);
 
-    //assert that no prune got created
+    // assert that no prune got created
     let (control_msgs, _) = count_control_msgs(receivers, |_, a| matches!(a, RpcOut::Prune { .. }));
     assert_eq!(
         control_msgs, 0,
@@ -4438,18 +4472,18 @@ fn test_ignore_graft_from_unknown_topic() {
 #[test]
 fn test_ignore_too_many_iwants_from_same_peer_for_same_message() {
     let config = Config::default();
-    //build gossipsub with full mesh
+    // build gossipsub with full mesh
     let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
         .to_subscribe(false)
         .create_network();
 
-    //add another peer not in the mesh
+    // add another peer not in the mesh
     let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(peer, receiver);
 
-    //receive a message
+    // receive a message
     let mut seq = 0;
     let m1 = random_message(&mut seq, &topics);
 
@@ -4460,10 +4494,10 @@ fn test_ignore_too_many_iwants_from_same_peer_for_same_message() {
 
     gs.handle_received_message(m1, &PeerId::random());
 
-    //clear events
+    // clear events
     let receivers = flush_events(&mut gs, receivers);
 
-    //the first gossip_retransimission many iwants return the valid message, all others are
+    // the first gossip_retransimission many iwants return the valid message, all others are
     // ignored.
     for _ in 0..(2 * config.gossip_retransimission() + 10) {
         gs.handle_iwant(&peer, vec![id.clone()]);
@@ -4490,7 +4524,7 @@ fn test_ignore_too_many_ihaves() {
         .max_ihave_messages(10)
         .build()
         .unwrap();
-    //build gossipsub with full mesh
+    // build gossipsub with full mesh
     let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
@@ -4498,15 +4532,15 @@ fn test_ignore_too_many_ihaves() {
         .gs_config(config.clone())
         .create_network();
 
-    //add another peer not in the mesh
+    // add another peer not in the mesh
     let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(peer, receiver);
 
-    //peer has 20 messages
+    // peer has 20 messages
     let mut seq = 0;
     let messages: Vec<_> = (0..20).map(|_| random_message(&mut seq, &topics)).collect();
 
-    //peer sends us one ihave for each message in order
+    // peer sends us one ihave for each message in order
     for raw_message in &messages {
         // Transform the inbound message
         let message = &gs
@@ -4527,7 +4561,7 @@ fn test_ignore_too_many_ihaves() {
         .map(|m| config.message_id(&m))
         .collect();
 
-    //we send iwant only for the first 10 messages
+    // we send iwant only for the first 10 messages
     let (control_msgs, receivers) = count_control_msgs(receivers, |p, action| {
         p == &peer
             && matches!(action, RpcOut::IWant(IWant { message_ids }) if message_ids.len() == 1 && first_ten.contains(&message_ids[0]))
@@ -4537,7 +4571,7 @@ fn test_ignore_too_many_ihaves() {
         "exactly the first ten ihaves should be processed and one iwant for each created"
     );
 
-    //after a heartbeat everything is forgotten
+    // after a heartbeat everything is forgotten
     gs.heartbeat();
 
     for raw_message in messages[10..].iter() {
@@ -4553,7 +4587,7 @@ fn test_ignore_too_many_ihaves() {
         );
     }
 
-    //we sent iwant for all 10 messages
+    // we sent iwant for all 10 messages
     let (control_msgs, _) = count_control_msgs(receivers, |p, action| {
         p == &peer
             && matches!(action, RpcOut::IWant(IWant { message_ids }) if message_ids.len() == 1)
@@ -4568,7 +4602,7 @@ fn test_ignore_too_many_messages_in_ihave() {
         .max_ihave_length(10)
         .build()
         .unwrap();
-    //build gossipsub with full mesh
+    // build gossipsub with full mesh
     let (mut gs, _, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
@@ -4576,11 +4610,11 @@ fn test_ignore_too_many_messages_in_ihave() {
         .gs_config(config.clone())
         .create_network();
 
-    //add another peer not in the mesh
+    // add another peer not in the mesh
     let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(peer, receiver);
 
-    //peer has 20 messages
+    // peer has 20 messages
     let mut seq = 0;
     let message_ids: Vec<_> = (0..20)
         .map(|_| random_message(&mut seq, &topics))
@@ -4588,7 +4622,7 @@ fn test_ignore_too_many_messages_in_ihave() {
         .map(|msg| config.message_id(&msg))
         .collect();
 
-    //peer sends us three ihaves
+    // peer sends us three ihaves
     gs.handle_ihave(&peer, vec![(topics[0].clone(), message_ids[0..8].to_vec())]);
     gs.handle_ihave(
         &peer,
@@ -4601,7 +4635,7 @@ fn test_ignore_too_many_messages_in_ihave() {
 
     let first_twelve: HashSet<_> = message_ids.iter().take(12).collect();
 
-    //we send iwant only for the first 10 messages
+    // we send iwant only for the first 10 messages
     let mut sum = 0;
     let (control_msgs, receivers) = count_control_msgs(receivers, |p, rpc| match rpc {
         RpcOut::IWant(IWant { message_ids }) => {
@@ -4620,14 +4654,14 @@ fn test_ignore_too_many_messages_in_ihave() {
 
     assert_eq!(sum, 10, "exactly the first ten ihaves should be processed");
 
-    //after a heartbeat everything is forgotten
+    // after a heartbeat everything is forgotten
     gs.heartbeat();
     gs.handle_ihave(
         &peer,
         vec![(topics[0].clone(), message_ids[10..20].to_vec())],
     );
 
-    //we sent 10 iwant messages ids via a IWANT rpc.
+    // we sent 10 iwant messages ids via a IWANT rpc.
     let mut sum = 0;
     let (control_msgs, _) = count_control_msgs(receivers, |p, rpc| match rpc {
         RpcOut::IWant(IWant { message_ids }) => {
@@ -4649,7 +4683,7 @@ fn test_limit_number_of_message_ids_inside_ihave() {
         .max_ihave_length(100)
         .build()
         .unwrap();
-    //build gossipsub with full mesh
+    // build gossipsub with full mesh
     let (mut gs, peers, mut receivers, topics) = inject_nodes1()
         .peer_no(config.mesh_n_high())
         .topics(vec!["test".into()])
@@ -4657,24 +4691,24 @@ fn test_limit_number_of_message_ids_inside_ihave() {
         .gs_config(config)
         .create_network();
 
-    //graft to all peers to really fill the mesh with all the peers
+    // graft to all peers to really fill the mesh with all the peers
     for peer in peers {
         gs.handle_graft(&peer, topics.clone());
     }
 
-    //add two other peers not in the mesh
+    // add two other peers not in the mesh
     let (p1, receiver1) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p1, receiver1);
     let (p2, receiver2) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(p2, receiver2);
 
-    //receive 200 messages from another peer
+    // receive 200 messages from another peer
     let mut seq = 0;
     for _ in 0..200 {
         gs.handle_received_message(random_message(&mut seq, &topics), &PeerId::random());
     }
 
-    //emit gossip
+    // emit gossip
     gs.emit_gossip();
 
     // both peers should have gotten 100 random ihave messages, to assert the randomness, we
@@ -4727,12 +4761,10 @@ fn test_limit_number_of_message_ids_inside_ihave() {
 
 #[test]
 fn test_iwant_penalties() {
-    /*
-    use tracing_subscriber::EnvFilter;
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
-    */
+    // use tracing_subscriber::EnvFilter;
+    // let _ = tracing_subscriber::fmt()
+    // .with_env_filter(EnvFilter::from_default_env())
+    // .try_init();
     let config = ConfigBuilder::default()
         .iwant_followup_time(Duration::from_secs(4))
         .build()
@@ -4862,7 +4894,7 @@ fn test_publish_to_floodsub_peers_without_flood_publish() {
         .gs_config(config)
         .create_network();
 
-    //add two floodsub peer, one explicit, one implicit
+    // add two floodsub peer, one explicit, one implicit
     let (p1, receiver1) = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
@@ -4877,10 +4909,10 @@ fn test_publish_to_floodsub_peers_without_flood_publish() {
         add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
     receivers.insert(p2, receiver2);
 
-    //p1 and p2 are not in the mesh
+    // p1 and p2 are not in the mesh
     assert!(!gs.mesh[&topics[0]].contains(&p1) && !gs.mesh[&topics[0]].contains(&p2));
 
-    //publish a message
+    // publish a message
     let publish_data = vec![0; 42];
     gs.publish(Topic::new("test"), publish_data).unwrap();
 
@@ -4921,7 +4953,7 @@ fn test_do_not_use_floodsub_in_fanout() {
     let topic = Topic::new("test");
     let topics = vec![topic.hash()];
 
-    //add two floodsub peer, one explicit, one implicit
+    // add two floodsub peer, one explicit, one implicit
     let (p1, receiver1) = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
@@ -4936,7 +4968,7 @@ fn test_do_not_use_floodsub_in_fanout() {
         add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
 
     receivers.insert(p2, receiver2);
-    //publish a message
+    // publish a message
     let publish_data = vec![0; 42];
     gs.publish(Topic::new("test"), publish_data).unwrap();
 
@@ -4977,7 +5009,7 @@ fn test_dont_add_floodsub_peers_to_mesh_on_join() {
     let topic = Topic::new("test");
     let topics = vec![topic.hash()];
 
-    //add two floodsub peer, one explicit, one implicit
+    // add two floodsub peer, one explicit, one implicit
     let _p1 = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
@@ -5004,7 +5036,7 @@ fn test_dont_send_px_to_old_gossipsub_peers() {
         .to_subscribe(false)
         .create_network();
 
-    //add an old gossipsub peer
+    // add an old gossipsub peer
     let (p1, _receiver1) = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
@@ -5014,14 +5046,14 @@ fn test_dont_send_px_to_old_gossipsub_peers() {
         Some(PeerKind::Gossipsub),
     );
 
-    //prune the peer
+    // prune the peer
     gs.send_graft_prune(
         HashMap::new(),
         vec![(p1, topics.clone())].into_iter().collect(),
         HashSet::new(),
     );
 
-    //check that prune does not contain px
+    // check that prune does not contain px
     let (control_msgs, _) = count_control_msgs(receivers, |_, m| match m {
         RpcOut::Prune(Prune { peers: px, .. }) => !px.is_empty(),
         _ => false,
@@ -5031,14 +5063,14 @@ fn test_dont_send_px_to_old_gossipsub_peers() {
 
 #[test]
 fn test_dont_send_floodsub_peers_in_px() {
-    //build mesh with one peer
+    // build mesh with one peer
     let (mut gs, peers, receivers, topics) = inject_nodes1()
         .peer_no(1)
         .topics(vec!["test".into()])
         .to_subscribe(true)
         .create_network();
 
-    //add two floodsub peers
+    // add two floodsub peers
     let _p1 = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
@@ -5049,14 +5081,14 @@ fn test_dont_send_floodsub_peers_in_px() {
     );
     let _p2 = add_peer_with_addr_and_kind(&mut gs, &topics, false, false, Multiaddr::empty(), None);
 
-    //prune only mesh node
+    // prune only mesh node
     gs.send_graft_prune(
         HashMap::new(),
         vec![(peers[0], topics.clone())].into_iter().collect(),
         HashSet::new(),
     );
 
-    //check that px in prune message is empty
+    // check that px in prune message is empty
     let (control_msgs, _) = count_control_msgs(receivers, |_, m| match m {
         RpcOut::Prune(Prune { peers: px, .. }) => !px.is_empty(),
         _ => false,
@@ -5072,7 +5104,7 @@ fn test_dont_add_floodsub_peers_to_mesh_in_heartbeat() {
         .to_subscribe(false)
         .create_network();
 
-    //add two floodsub peer, one explicit, one implicit
+    // add two floodsub peer, one explicit, one implicit
     let _p1 = add_peer_with_addr_and_kind(
         &mut gs,
         &topics,
@@ -5139,7 +5171,7 @@ fn test_subscribe_to_invalid_topic() {
 
 #[test]
 fn test_subscribe_and_graft_with_negative_score() {
-    //simulate a communication between two gossipsub instances
+    // simulate a communication between two gossipsub instances
     let (mut gs1, _, _, topic_hashes) = inject_nodes1()
         .topics(vec!["test".into()])
         .scoring(Some((
@@ -5157,12 +5189,12 @@ fn test_subscribe_and_graft_with_negative_score() {
     let (p2, _receiver1) = add_peer(&mut gs1, &Vec::new(), true, false);
     let (p1, _receiver2) = add_peer(&mut gs2, &topic_hashes, false, false);
 
-    //add penalty to peer p2
+    // add penalty to peer p2
     gs1.peer_score.as_mut().unwrap().0.add_penalty(&p2, 1);
 
     let original_score = gs1.peer_score.as_ref().unwrap().0.score(&p2);
 
-    //subscribe to topic in gs2
+    // subscribe to topic in gs2
     gs2.subscribe(&topic).unwrap();
 
     let forward_messages_to_p1 = |gs1: &mut Behaviour<_, _>,
@@ -5191,17 +5223,17 @@ fn test_subscribe_and_graft_with_negative_score() {
         new_receivers
     };
 
-    //forward the subscribe message
+    // forward the subscribe message
     let receivers = forward_messages_to_p1(&mut gs1, p1, p2, connection_id, receivers);
 
-    //heartbeats on both
+    // heartbeats on both
     gs1.heartbeat();
     gs2.heartbeat();
 
-    //forward messages again
+    // forward messages again
     forward_messages_to_p1(&mut gs1, p1, p2, connection_id, receivers);
 
-    //nobody got penalized
+    // nobody got penalized
     assert!(gs1.peer_score.as_ref().unwrap().0.score(&p2) >= original_score);
 }
 
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index 6e7861bae10..d53908ad267 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -18,22 +18,22 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::borrow::Cow;
-use std::sync::Arc;
-use std::time::Duration;
-
-use crate::error::ConfigBuilderError;
-use crate::protocol::{ProtocolConfig, ProtocolId, FLOODSUB_PROTOCOL};
-use crate::types::{Message, MessageId, PeerKind};
+use std::{borrow::Cow, sync::Arc, time::Duration};
 
 use libp2p_identity::PeerId;
 use libp2p_swarm::StreamProtocol;
 
+use crate::{
+    error::ConfigBuilderError,
+    protocol::{ProtocolConfig, ProtocolId, FLOODSUB_PROTOCOL},
+    types::{Message, MessageId, PeerKind},
+};
+
 /// The types of message validation that can be employed by gossipsub.
 #[derive(Debug, Clone)]
 pub enum ValidationMode {
-    /// This is the default setting. This requires the message author to be a valid [`PeerId`] and to
-    /// be present as well as the sequence number. All messages must have valid signatures.
+    /// This is the default setting. This requires the message author to be a valid [`PeerId`] and
+    /// to be present as well as the sequence number. All messages must have valid signatures.
     ///
     /// NOTE: This setting will reject messages from nodes using
     /// [`crate::behaviour::MessageAuthenticity::Anonymous`] and all messages that do not have
@@ -134,8 +134,8 @@ impl Config {
 
     /// Affects how peers are selected when pruning a mesh due to over subscription.
     ///
-    ///  At least `retain_scores` of the retained peers will be high-scoring, while the remainder are
-    ///  chosen randomly (D_score in the spec, default is 4).
+    ///  At least `retain_scores` of the retained peers will be high-scoring, while the remainder
+    /// are  chosen randomly (D_score in the spec, default is 4).
     pub fn retain_scores(&self) -> usize {
         self.retain_scores
     }
@@ -423,7 +423,9 @@ impl Default for ConfigBuilder {
                 }),
                 allow_self_origin: false,
                 do_px: false,
-                prune_peers: 0, // NOTE: Increasing this currently has little effect until Signed records are implemented.
+                // NOTE: Increasing this currently has little effect until Signed
+                // records are implemented.
+                prune_peers: 0,
                 prune_backoff: Duration::from_secs(60),
                 unsubscribe_backoff: Duration::from_secs(10),
                 backoff_slack: 1,
@@ -457,7 +459,8 @@ impl From<Config> for ConfigBuilder {
 }
 
 impl ConfigBuilder {
-    /// The protocol id prefix to negotiate this protocol (default is `/meshsub/1.1.0` and `/meshsub/1.0.0`).
+    /// The protocol id prefix to negotiate this protocol (default is `/meshsub/1.1.0` and
+    /// `/meshsub/1.0.0`).
     pub fn protocol_id_prefix(
         &mut self,
         protocol_id_prefix: impl Into<Cow<'static, str>>,
@@ -547,8 +550,8 @@ impl ConfigBuilder {
 
     /// Affects how peers are selected when pruning a mesh due to over subscription.
     ///
-    /// At least [`Self::retain_scores`] of the retained peers will be high-scoring, while the remainder are
-    /// chosen randomly (D_score in the spec, default is 4).
+    /// At least [`Self::retain_scores`] of the retained peers will be high-scoring, while the
+    /// remainder are chosen randomly (D_score in the spec, default is 4).
     pub fn retain_scores(&mut self, retain_scores: usize) -> &mut Self {
         self.config.retain_scores = retain_scores;
         self
@@ -902,12 +905,15 @@ impl std::fmt::Debug for Config {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-    use crate::topic::IdentityHash;
-    use crate::Topic;
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
+
     use libp2p_core::UpgradeInfo;
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::{Hash, Hasher};
+
+    use super::*;
+    use crate::{topic::IdentityHash, Topic};
 
     #[test]
     fn create_config_with_message_id_as_plain_function() {
diff --git a/protocols/gossipsub/src/error.rs b/protocols/gossipsub/src/error.rs
index 047d50f2338..eae4c51214e 100644
--- a/protocols/gossipsub/src/error.rs
+++ b/protocols/gossipsub/src/error.rs
@@ -36,8 +36,8 @@ pub enum PublishError {
     MessageTooLarge,
     /// The compression algorithm failed.
     TransformFailed(std::io::Error),
-    /// Messages could not be sent because the queues for all peers were full. The usize represents the
-    /// number of peers that were attempted.
+    /// Messages could not be sent because the queues for all peers were full. The usize represents
+    /// the number of peers that were attempted.
     AllQueuesFull(usize),
 }
 
diff --git a/protocols/gossipsub/src/gossip_promises.rs b/protocols/gossipsub/src/gossip_promises.rs
index bdf58b74fc2..b64811bb062 100644
--- a/protocols/gossipsub/src/gossip_promises.rs
+++ b/protocols/gossipsub/src/gossip_promises.rs
@@ -18,13 +18,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::peer_score::RejectReason;
-use crate::MessageId;
-use crate::ValidationError;
-use libp2p_identity::PeerId;
 use std::collections::HashMap;
+
+use libp2p_identity::PeerId;
 use web_time::Instant;
 
+use crate::{peer_score::RejectReason, MessageId, ValidationError};
+
 /// Tracks recently sent `IWANT` messages and checks if peers respond to them.
 #[derive(Default)]
 pub(crate) struct GossipPromises {
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
index 5f9669c02c2..2936182c3f8 100644
--- a/protocols/gossipsub/src/handler.rs
+++ b/protocols/gossipsub/src/handler.rs
@@ -18,27 +18,31 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::protocol::{GossipsubCodec, ProtocolConfig};
-use crate::rpc::Receiver;
-use crate::rpc_proto::proto;
-use crate::types::{PeerKind, RawMessage, Rpc, RpcOut};
-use crate::ValidationError;
-use asynchronous_codec::Framed;
-use futures::future::Either;
-use futures::prelude::*;
-use futures::StreamExt;
-use libp2p_core::upgrade::DeniedUpgrade;
-use libp2p_swarm::handler::{
-    ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
-    FullyNegotiatedInbound, FullyNegotiatedOutbound, StreamUpgradeError, SubstreamProtocol,
-};
-use libp2p_swarm::Stream;
 use std::{
     pin::Pin,
     task::{Context, Poll},
 };
+
+use asynchronous_codec::Framed;
+use futures::{future::Either, prelude::*, StreamExt};
+use libp2p_core::upgrade::DeniedUpgrade;
+use libp2p_swarm::{
+    handler::{
+        ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
+        FullyNegotiatedInbound, FullyNegotiatedOutbound, StreamUpgradeError, SubstreamProtocol,
+    },
+    Stream,
+};
 use web_time::Instant;
 
+use crate::{
+    protocol::{GossipsubCodec, ProtocolConfig},
+    rpc::Receiver,
+    rpc_proto::proto,
+    types::{PeerKind, RawMessage, Rpc, RpcOut},
+    ValidationError,
+};
+
 /// The event emitted by the Handler. This informs the behaviour of various events created
 /// by the handler.
 #[derive(Debug)]
@@ -111,7 +115,6 @@ pub struct EnabledHandler {
     peer_kind: Option<PeerKind>,
 
     /// Keeps track on whether we have sent the peer kind to the behaviour.
-    //
     // NOTE: Use this flag rather than checking the substream count each poll.
     peer_kind_sent: bool,
 
diff --git a/protocols/gossipsub/src/lib.rs b/protocols/gossipsub/src/lib.rs
index f6a51da4a51..87db1b771d1 100644
--- a/protocols/gossipsub/src/lib.rs
+++ b/protocols/gossipsub/src/lib.rs
@@ -43,22 +43,23 @@
 //! implementations, due to undefined elements in the current specification.
 //!
 //! - **Topics** -  In gossipsub, topics configurable by the `hash_topics` configuration parameter.
-//!   Topics are of type [`TopicHash`]. The current go implementation uses raw utf-8 strings, and this
-//!   is default configuration in rust-libp2p. Topics can be hashed (SHA256 hashed then base64
+//!   Topics are of type [`TopicHash`]. The current go implementation uses raw utf-8 strings, and
+//!   this is default configuration in rust-libp2p. Topics can be hashed (SHA256 hashed then base64
 //!   encoded) by setting the `hash_topics` configuration parameter to true.
 //!
 //! - **Sequence Numbers** - A message on the gossipsub network is identified by the source
-//!   [`PeerId`](libp2p_identity::PeerId) and a nonce (sequence number) of the message. The sequence numbers in
-//!   this implementation are sent as raw bytes across the wire. They are 64-bit big-endian unsigned
-//!   integers. When messages are signed, they are monotonically increasing integers starting from a
-//!   random value and wrapping around u64::MAX. When messages are unsigned, they are chosen at random.
-//!   NOTE: These numbers are sequential in the current go implementation.
+//!   [`PeerId`](libp2p_identity::PeerId) and a nonce (sequence number) of the message. The sequence
+//!   numbers in this implementation are sent as raw bytes across the wire. They are 64-bit
+//!   big-endian unsigned integers. When messages are signed, they are monotonically increasing
+//!   integers starting from a random value and wrapping around u64::MAX. When messages are
+//!   unsigned, they are chosen at random. NOTE: These numbers are sequential in the current go
+//!   implementation.
 //!
 //! # Peer Discovery
 //!
 //! Gossipsub does not provide peer discovery by itself. Peer discovery is the process by which
-//! peers in a p2p network exchange information about each other among other reasons to become resistant
-//! against the failure or replacement of the
+//! peers in a p2p network exchange information about each other among other reasons to become
+//! resistant against the failure or replacement of the
 //! [boot nodes](https://docs.libp2p.io/reference/glossary/#boot-node) of the network.
 //!
 //! Peer
@@ -111,22 +112,24 @@ mod topic;
 mod transform;
 mod types;
 
-pub use self::behaviour::{Behaviour, Event, MessageAuthenticity};
-pub use self::config::{Config, ConfigBuilder, ValidationMode, Version};
-pub use self::error::{ConfigBuilderError, PublishError, SubscriptionError, ValidationError};
-pub use self::metrics::Config as MetricsConfig;
-pub use self::peer_score::{
-    score_parameter_decay, score_parameter_decay_with_base, PeerScoreParams, PeerScoreThresholds,
-    TopicScoreParams,
+pub use self::{
+    behaviour::{Behaviour, Event, MessageAuthenticity},
+    config::{Config, ConfigBuilder, ValidationMode, Version},
+    error::{ConfigBuilderError, PublishError, SubscriptionError, ValidationError},
+    metrics::Config as MetricsConfig,
+    peer_score::{
+        score_parameter_decay, score_parameter_decay_with_base, PeerScoreParams,
+        PeerScoreThresholds, TopicScoreParams,
+    },
+    subscription_filter::{
+        AllowAllSubscriptionFilter, CallbackSubscriptionFilter, CombinedSubscriptionFilters,
+        MaxCountSubscriptionFilter, RegexSubscriptionFilter, TopicSubscriptionFilter,
+        WhitelistSubscriptionFilter,
+    },
+    topic::{Hasher, Topic, TopicHash},
+    transform::{DataTransform, IdentityTransform},
+    types::{FailedMessages, Message, MessageAcceptance, MessageId, RawMessage},
 };
-pub use self::subscription_filter::{
-    AllowAllSubscriptionFilter, CallbackSubscriptionFilter, CombinedSubscriptionFilters,
-    MaxCountSubscriptionFilter, RegexSubscriptionFilter, TopicSubscriptionFilter,
-    WhitelistSubscriptionFilter,
-};
-pub use self::topic::{Hasher, Topic, TopicHash};
-pub use self::transform::{DataTransform, IdentityTransform};
-pub use self::types::{FailedMessages, Message, MessageAcceptance, MessageId, RawMessage};
 
 #[deprecated(note = "Will be removed from the public API.")]
 pub type Rpc = self::types::Rpc;
diff --git a/protocols/gossipsub/src/mcache.rs b/protocols/gossipsub/src/mcache.rs
index aa65e3b7f1d..8ed71ea07f2 100644
--- a/protocols/gossipsub/src/mcache.rs
+++ b/protocols/gossipsub/src/mcache.rs
@@ -18,14 +18,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::topic::TopicHash;
-use crate::types::{MessageId, RawMessage};
-use libp2p_identity::PeerId;
-use std::collections::hash_map::Entry;
-use std::fmt::Debug;
 use std::{
-    collections::{HashMap, HashSet},
+    collections::{hash_map::Entry, HashMap, HashSet},
     fmt,
+    fmt::Debug,
+};
+
+use libp2p_identity::PeerId;
+
+use crate::{
+    topic::TopicHash,
+    types::{MessageId, RawMessage},
 };
 
 /// CacheEntry stored in the history.
@@ -210,7 +213,7 @@ impl MessageCache {
         &mut self,
         message_id: &MessageId,
     ) -> Option<(RawMessage, HashSet<PeerId>)> {
-        //We only remove the message from msgs and iwant_count and keep the message_id in the
+        // We only remove the message from msgs and iwant_count and keep the message_id in the
         // history vector. Zhe id in the history vector will simply be ignored on popping.
 
         self.iwant_counts.remove(message_id);
diff --git a/protocols/gossipsub/src/metrics.rs b/protocols/gossipsub/src/metrics.rs
index 40af1af2cac..2519da64b73 100644
--- a/protocols/gossipsub/src/metrics.rs
+++ b/protocols/gossipsub/src/metrics.rs
@@ -23,15 +23,21 @@
 
 use std::collections::HashMap;
 
-use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
-use prometheus_client::metrics::counter::Counter;
-use prometheus_client::metrics::family::{Family, MetricConstructor};
-use prometheus_client::metrics::gauge::Gauge;
-use prometheus_client::metrics::histogram::{linear_buckets, Histogram};
-use prometheus_client::registry::Registry;
-
-use crate::topic::TopicHash;
-use crate::types::{MessageAcceptance, PeerKind};
+use prometheus_client::{
+    encoding::{EncodeLabelSet, EncodeLabelValue},
+    metrics::{
+        counter::Counter,
+        family::{Family, MetricConstructor},
+        gauge::Gauge,
+        histogram::{linear_buckets, Histogram},
+    },
+    registry::Registry,
+};
+
+use crate::{
+    topic::TopicHash,
+    types::{MessageAcceptance, PeerKind},
+};
 
 // Default value that limits for how many topics do we store metrics.
 const DEFAULT_MAX_TOPICS: usize = 300;
@@ -100,7 +106,7 @@ type EverSubscribed = bool;
 
 /// A collection of metrics used throughout the Gossipsub behaviour.
 pub(crate) struct Metrics {
-    /* Configuration parameters */
+    // Configuration parameters
     /// Maximum number of topics for which we store metrics. This helps keep the metrics bounded.
     max_topics: usize,
     /// Maximum number of topics for which we store metrics, where the topic in not one to which we
@@ -108,11 +114,11 @@ pub(crate) struct Metrics {
     /// from received messages and not explicit application subscriptions.
     max_never_subscribed_topics: usize,
 
-    /* Auxiliary variables */
+    // Auxiliary variables
     /// Information needed to decide if a topic is allowed or not.
     topic_info: HashMap<TopicHash, EverSubscribed>,
 
-    /* Metrics per known topic */
+    // Metrics per known topic
     /// Status of our subscription to this topic. This metric allows analyzing other topic metrics
     /// filtered by our current subscription status.
     topic_subscription_status: Family<TopicHash, Gauge>,
@@ -134,7 +140,7 @@ pub(crate) struct Metrics {
     /// The number of messages that timed out and could not be sent.
     timedout_messages_dropped: Family<TopicHash, Counter>,
 
-    /* Metrics regarding mesh state */
+    // Metrics regarding mesh state
     /// Number of peers in our mesh. This metric should be updated with the count of peers for a
     /// topic in the mesh regardless of inclusion and churn events.
     mesh_peer_counts: Family<TopicHash, Gauge>,
@@ -143,7 +149,7 @@ pub(crate) struct Metrics {
     /// Number of times we remove peers in a topic mesh for different reasons.
     mesh_peer_churn_events: Family<ChurnLabel, Counter>,
 
-    /* Metrics regarding messages sent/received */
+    // Metrics regarding messages sent/received
     /// Number of gossip messages sent to each topic.
     topic_msg_sent_counts: Family<TopicHash, Counter>,
     /// Bytes from gossip messages sent to each topic.
@@ -158,13 +164,13 @@ pub(crate) struct Metrics {
     /// Bytes received from gossip messages for each topic.
     topic_msg_recv_bytes: Family<TopicHash, Counter>,
 
-    /* Metrics related to scoring */
+    // Metrics related to scoring
     /// Histogram of the scores for each mesh topic.
     score_per_mesh: Family<TopicHash, Histogram, HistBuilder>,
     /// A counter of the kind of penalties being applied to peers.
     scoring_penalties: Family<PenaltyLabel, Counter>,
 
-    /* General Metrics */
+    // General Metrics
     /// Gossipsub supports floodsub, gossipsub v1.0 and gossipsub v1.1. Peers are classified based
     /// on which protocol they support. This metric keeps track of the number of peers that are
     /// connected of each type.
@@ -172,7 +178,7 @@ pub(crate) struct Metrics {
     /// The time it takes to complete one iteration of the heartbeat.
     heartbeat_duration: Histogram,
 
-    /* Performance metrics */
+    // Performance metrics
     /// When the user validates a message, it tries to re propagate it to its mesh peers. If the
     /// message expires from the memcache before it can be validated, we count this a cache miss
     /// and it is an indicator that the memcache size should be increased.
@@ -414,7 +420,7 @@ impl Metrics {
         }
     }
 
-    /* Mesh related methods */
+    // Mesh related methods
 
     /// Registers the subscription to a topic if the configured limits allow it.
     /// Sets the registered number of peers in the mesh to 0.
diff --git a/protocols/gossipsub/src/peer_score.rs b/protocols/gossipsub/src/peer_score.rs
index e8d1a6e5f97..33573ebeacc 100644
--- a/protocols/gossipsub/src/peer_score.rs
+++ b/protocols/gossipsub/src/peer_score.rs
@@ -18,25 +18,31 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//!
 //! Manages and stores the Scoring logic of a particular peer on the gossipsub behaviour.
 
-use crate::metrics::{Metrics, Penalty};
-use crate::time_cache::TimeCache;
-use crate::{MessageId, TopicHash};
+use std::{
+    collections::{hash_map, HashMap, HashSet},
+    net::IpAddr,
+    time::Duration,
+};
+
 use libp2p_identity::PeerId;
-use std::collections::{hash_map, HashMap, HashSet};
-use std::net::IpAddr;
-use std::time::Duration;
 use web_time::Instant;
 
+use crate::{
+    metrics::{Metrics, Penalty},
+    time_cache::TimeCache,
+    MessageId, TopicHash,
+};
+
 mod params;
-use crate::ValidationError;
 pub use params::{
     score_parameter_decay, score_parameter_decay_with_base, PeerScoreParams, PeerScoreThresholds,
     TopicScoreParams,
 };
 
+use crate::ValidationError;
+
 #[cfg(test)]
 mod tests;
 
@@ -96,8 +102,9 @@ impl Default for PeerStats {
 }
 
 impl PeerStats {
-    /// Returns a mutable reference to topic stats if they exist, otherwise if the supplied parameters score the
-    /// topic, inserts the default stats and returns a reference to those. If neither apply, returns None.
+    /// Returns a mutable reference to topic stats if they exist, otherwise if the supplied
+    /// parameters score the topic, inserts the default stats and returns a reference to those.
+    /// If neither apply, returns None.
     pub(crate) fn stats_or_default_mut(
         &mut self,
         topic_hash: TopicHash,
@@ -285,12 +292,14 @@ impl PeerScore {
                 }
 
                 // P3b:
-                // NOTE: the weight of P3b is negative (validated in TopicScoreParams.validate), so this detracts.
+                // NOTE: the weight of P3b is negative (validated in TopicScoreParams.validate), so
+                // this detracts.
                 let p3b = topic_stats.mesh_failure_penalty;
                 topic_score += p3b * topic_params.mesh_failure_penalty_weight;
 
                 // P4: invalid messages
-                // NOTE: the weight of P4 is negative (validated in TopicScoreParams.validate), so this detracts.
+                // NOTE: the weight of P4 is negative (validated in TopicScoreParams.validate), so
+                // this detracts.
                 let p4 =
                     topic_stats.invalid_message_deliveries * topic_stats.invalid_message_deliveries;
                 topic_score += p4 * topic_params.invalid_message_deliveries_weight;
@@ -391,8 +400,8 @@ impl PeerScore {
                 }
 
                 // we don't decay retained scores, as the peer is not active.
-                // this way the peer cannot reset a negative score by simply disconnecting and reconnecting,
-                // unless the retention period has elapsed.
+                // this way the peer cannot reset a negative score by simply disconnecting and
+                // reconnecting, unless the retention period has elapsed.
                 // similarly, a well behaved peer does not lose its score by getting disconnected.
                 return true;
             }
@@ -638,7 +647,8 @@ impl PeerScore {
         }
     }
 
-    /// Similar to `reject_message` except does not require the message id or reason for an invalid message.
+    /// Similar to `reject_message` except does not require the message id or reason for an invalid
+    /// message.
     pub(crate) fn reject_invalid_message(&mut self, from: &PeerId, topic_hash: &TopicHash) {
         tracing::debug!(
             peer=%from,
@@ -679,8 +689,8 @@ impl PeerScore {
             }
 
             if let RejectReason::ValidationIgnored = reason {
-                // we were explicitly instructed by the validator to ignore the message but not penalize
-                // the peer
+                // we were explicitly instructed by the validator to ignore the message but not
+                // penalize the peer
                 record.status = DeliveryStatus::Ignored;
                 record.peers.clear();
                 return;
@@ -882,13 +892,14 @@ impl PeerScore {
                         .get(topic_hash)
                         .expect("Topic must exist if there are known topic_stats");
 
-                    // check against the mesh delivery window -- if the validated time is passed as 0, then
-                    // the message was received before we finished validation and thus falls within the mesh
+                    // check against the mesh delivery window -- if the validated time is passed as
+                    // 0, then the message was received before we finished
+                    // validation and thus falls within the mesh
                     // delivery window.
                     let mut falls_in_mesh_deliver_window = true;
                     if let Some(validated_time) = validated_time {
                         if let Some(now) = &now {
-                            //should always be true
+                            // should always be true
                             let window_time = validated_time
                                 .checked_add(topic_params.mesh_message_deliveries_window)
                                 .unwrap_or(*now);
diff --git a/protocols/gossipsub/src/peer_score/params.rs b/protocols/gossipsub/src/peer_score/params.rs
index ae70991f7fb..cc48df8f61b 100644
--- a/protocols/gossipsub/src/peer_score/params.rs
+++ b/protocols/gossipsub/src/peer_score/params.rs
@@ -18,10 +18,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    collections::{HashMap, HashSet},
+    net::IpAddr,
+    time::Duration,
+};
+
 use crate::TopicHash;
-use std::collections::{HashMap, HashSet};
-use std::net::IpAddr;
-use std::time::Duration;
 
 /// The default number of seconds for a decay interval.
 const DEFAULT_DECAY_INTERVAL: u64 = 1;
@@ -117,12 +120,13 @@ pub struct PeerScoreParams {
 
     ///  P6: IP-colocation factor.
     ///  The parameter has an associated counter which counts the number of peers with the same IP.
-    ///  If the number of peers in the same IP exceeds `ip_colocation_factor_threshold, then the value
-    ///  is the square of the difference, ie `(peers_in_same_ip - ip_colocation_threshold)^2`.
-    ///  If the number of peers in the same IP is less than the threshold, then the value is 0.
-    ///  The weight of the parameter MUST be negative, unless you want to disable for testing.
-    ///  Note: In order to simulate many IPs in a manageable manner when testing, you can set the weight to 0
-    ///        thus disabling the IP colocation penalty.
+    ///  If the number of peers in the same IP exceeds `ip_colocation_factor_threshold, then the
+    /// value  is the square of the difference, ie `(peers_in_same_ip -
+    /// ip_colocation_threshold)^2`.  If the number of peers in the same IP is less than the
+    /// threshold, then the value is 0.  The weight of the parameter MUST be negative, unless
+    /// you want to disable for testing.  Note: In order to simulate many IPs in a manageable
+    /// manner when testing, you can set the weight to 0        thus disabling the IP
+    /// colocation penalty.
     pub ip_colocation_factor_weight: f64,
     pub ip_colocation_factor_threshold: f64,
     pub ip_colocation_factor_whitelist: HashSet<IpAddr>,
@@ -239,16 +243,16 @@ pub struct TopicScoreParams {
 
     ///  P1: time in the mesh
     ///  This is the time the peer has been grafted in the mesh.
-    ///  The value of the parameter is the `time/time_in_mesh_quantum`, capped by `time_in_mesh_cap`
-    ///  The weight of the parameter must be positive (or zero to disable).
+    ///  The value of the parameter is the `time/time_in_mesh_quantum`, capped by
+    /// `time_in_mesh_cap`  The weight of the parameter must be positive (or zero to disable).
     pub time_in_mesh_weight: f64,
     pub time_in_mesh_quantum: Duration,
     pub time_in_mesh_cap: f64,
 
     ///  P2: first message deliveries
     ///  This is the number of message deliveries in the topic.
-    ///  The value of the parameter is a counter, decaying with `first_message_deliveries_decay`, and capped
-    ///  by `first_message_deliveries_cap`.
+    ///  The value of the parameter is a counter, decaying with `first_message_deliveries_decay`,
+    /// and capped  by `first_message_deliveries_cap`.
     ///  The weight of the parameter MUST be positive (or zero to disable).
     pub first_message_deliveries_weight: f64,
     pub first_message_deliveries_decay: f64,
@@ -264,8 +268,8 @@ pub struct TopicScoreParams {
     ///  before we have forwarded it to them.
     ///  The parameter has an associated counter, decaying with `mesh_message_deliveries_decay`.
     ///  If the counter exceeds the threshold, its value is 0.
-    ///  If the counter is below the `mesh_message_deliveries_threshold`, the value is the square of
-    ///  the deficit, ie (`message_deliveries_threshold - counter)^2`
+    ///  If the counter is below the `mesh_message_deliveries_threshold`, the value is the square
+    /// of  the deficit, ie (`message_deliveries_threshold - counter)^2`
     ///  The penalty is only activated after `mesh_message_deliveries_activation` time in the mesh.
     ///  The weight of the parameter MUST be negative (or zero to disable).
     pub mesh_message_deliveries_weight: f64,
diff --git a/protocols/gossipsub/src/peer_score/tests.rs b/protocols/gossipsub/src/peer_score/tests.rs
index 064e277eed7..9e20cea2dde 100644
--- a/protocols/gossipsub/src/peer_score/tests.rs
+++ b/protocols/gossipsub/src/peer_score/tests.rs
@@ -20,9 +20,7 @@
 
 /// A collection of unit tests mostly ported from the go implementation.
 use super::*;
-
-use crate::types::RawMessage;
-use crate::{IdentTopic as Topic, Message};
+use crate::{types::RawMessage, IdentTopic as Topic, Message};
 
 // estimates a value within variance
 fn within_variance(value: f64, expected: f64, variance: f64) -> bool {
@@ -447,7 +445,8 @@ fn test_score_mesh_message_deliveries_decay() {
     }
 
     let score_a = peer_score.score(&peer_id_a);
-    // the penalty is the difference between the threshold and the (decayed) mesh deliveries, squared.
+    // the penalty is the difference between the threshold and the (decayed)
+    // mesh deliveries, squared.
     let deficit = topic_params.mesh_message_deliveries_threshold - decayed_delivery_count;
     let penalty = deficit * deficit;
     let expected =
diff --git a/protocols/gossipsub/src/protocol.rs b/protocols/gossipsub/src/protocol.rs
index 8d33fe51a90..e4272737342 100644
--- a/protocols/gossipsub/src/protocol.rs
+++ b/protocols/gossipsub/src/protocol.rs
@@ -18,15 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::config::ValidationMode;
-use crate::handler::HandlerEvent;
-use crate::rpc_proto::proto;
-use crate::topic::TopicHash;
-use crate::types::{
-    ControlAction, Graft, IHave, IWant, MessageId, PeerInfo, PeerKind, Prune, RawMessage, Rpc,
-    Subscription, SubscriptionAction,
-};
-use crate::ValidationError;
+use std::{convert::Infallible, pin::Pin};
+
 use asynchronous_codec::{Decoder, Encoder, Framed};
 use byteorder::{BigEndian, ByteOrder};
 use bytes::BytesMut;
@@ -35,8 +28,18 @@ use libp2p_core::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use libp2p_identity::{PeerId, PublicKey};
 use libp2p_swarm::StreamProtocol;
 use quick_protobuf::Writer;
-use std::convert::Infallible;
-use std::pin::Pin;
+
+use crate::{
+    config::ValidationMode,
+    handler::HandlerEvent,
+    rpc_proto::proto,
+    topic::TopicHash,
+    types::{
+        ControlAction, Graft, IHave, IWant, MessageId, PeerInfo, PeerKind, Prune, RawMessage, Rpc,
+        Subscription, SubscriptionAction,
+    },
+    ValidationError,
+};
 
 pub(crate) const SIGNING_PREFIX: &[u8] = b"libp2p-pubsub:";
 
@@ -136,7 +139,7 @@ where
     }
 }
 
-/* Gossip codec for the framing */
+// Gossip codec for the framing
 
 pub struct GossipsubCodec {
     /// Determines the level of validation performed on incoming messages.
@@ -506,13 +509,14 @@ impl Decoder for GossipsubCodec {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::config::Config;
-    use crate::{Behaviour, ConfigBuilder, MessageAuthenticity};
-    use crate::{IdentTopic as Topic, Version};
     use libp2p_identity::Keypair;
     use quickcheck::*;
 
+    use super::*;
+    use crate::{
+        config::Config, Behaviour, ConfigBuilder, IdentTopic as Topic, MessageAuthenticity, Version,
+    };
+
     #[derive(Clone, Debug)]
     struct Message(RawMessage);
 
diff --git a/protocols/gossipsub/src/rpc.rs b/protocols/gossipsub/src/rpc.rs
index c90e46a85da..b5f05c7b2e5 100644
--- a/protocols/gossipsub/src/rpc.rs
+++ b/protocols/gossipsub/src/rpc.rs
@@ -18,7 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::{stream::Peekable, Stream, StreamExt};
 use std::{
     future::Future,
     pin::Pin,
@@ -29,6 +28,8 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::{stream::Peekable, Stream, StreamExt};
+
 use crate::types::RpcOut;
 
 /// `RpcOut` sender that is priority aware.
diff --git a/protocols/gossipsub/src/rpc_proto.rs b/protocols/gossipsub/src/rpc_proto.rs
index 94c7aafbc3e..2f6832a01a1 100644
--- a/protocols/gossipsub/src/rpc_proto.rs
+++ b/protocols/gossipsub/src/rpc_proto.rs
@@ -26,12 +26,12 @@ pub(crate) mod proto {
 
 #[cfg(test)]
 mod test {
-    use crate::rpc_proto::proto::compat;
-    use crate::IdentTopic as Topic;
     use libp2p_identity::PeerId;
     use quick_protobuf::{BytesReader, MessageRead, MessageWrite, Writer};
     use rand::Rng;
 
+    use crate::{rpc_proto::proto::compat, IdentTopic as Topic};
+
     #[test]
     fn test_multi_topic_message_compatibility() {
         let topic1 = Topic::new("t1").hash();
diff --git a/protocols/gossipsub/src/subscription_filter.rs b/protocols/gossipsub/src/subscription_filter.rs
index 02bb9b4eab6..c051b6c333b 100644
--- a/protocols/gossipsub/src/subscription_filter.rs
+++ b/protocols/gossipsub/src/subscription_filter.rs
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::types::Subscription;
-use crate::TopicHash;
 use std::collections::{BTreeSet, HashMap, HashSet};
 
+use crate::{types::Subscription, TopicHash};
+
 pub trait TopicSubscriptionFilter {
     /// Returns true iff the topic is of interest and we can subscribe to it.
     fn can_subscribe(&mut self, topic_hash: &TopicHash) -> bool;
@@ -82,7 +82,7 @@ pub trait TopicSubscriptionFilter {
     }
 }
 
-//some useful implementers
+// some useful implementers
 
 /// Allows all subscriptions
 #[derive(Default, Clone)]
@@ -199,7 +199,7 @@ where
     }
 }
 
-///A subscription filter that filters topics based on a regular expression.
+/// A subscription filter that filters topics based on a regular expression.
 pub struct RegexSubscriptionFilter(pub regex::Regex);
 
 impl TopicSubscriptionFilter for RegexSubscriptionFilter {
diff --git a/protocols/gossipsub/src/time_cache.rs b/protocols/gossipsub/src/time_cache.rs
index a3e5c01ac4c..ace02606e88 100644
--- a/protocols/gossipsub/src/time_cache.rs
+++ b/protocols/gossipsub/src/time_cache.rs
@@ -20,13 +20,18 @@
 
 //! This implements a time-based LRU cache for checking gossipsub message duplicates.
 
-use fnv::FnvHashMap;
-use std::collections::hash_map::{
-    self,
-    Entry::{Occupied, Vacant},
+use std::{
+    collections::{
+        hash_map::{
+            self,
+            Entry::{Occupied, Vacant},
+        },
+        VecDeque,
+    },
+    time::Duration,
 };
-use std::collections::VecDeque;
-use std::time::Duration;
+
+use fnv::FnvHashMap;
 use web_time::Instant;
 
 struct ExpiringElement<Element> {
@@ -206,7 +211,7 @@ mod test {
         cache.insert("t");
         assert!(!cache.insert("t"));
         cache.insert("e");
-        //assert!(!cache.insert("t"));
+        // assert!(!cache.insert("t"));
         assert!(!cache.insert("e"));
         // sleep until cache expiry
         std::thread::sleep(Duration::from_millis(101));
diff --git a/protocols/gossipsub/src/topic.rs b/protocols/gossipsub/src/topic.rs
index a73496b53f2..4793c23a8e1 100644
--- a/protocols/gossipsub/src/topic.rs
+++ b/protocols/gossipsub/src/topic.rs
@@ -18,12 +18,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::rpc_proto::proto;
+use std::fmt;
+
 use base64::prelude::*;
 use prometheus_client::encoding::EncodeLabelSet;
 use quick_protobuf::Writer;
 use sha2::{Digest, Sha256};
-use std::fmt;
+
+use crate::rpc_proto::proto;
 
 /// A generic trait that can be extended for various hashing types for a topic.
 pub trait Hasher {
diff --git a/protocols/gossipsub/src/types.rs b/protocols/gossipsub/src/types.rs
index bb1916fefd0..bcb1f279ae5 100644
--- a/protocols/gossipsub/src/types.rs
+++ b/protocols/gossipsub/src/types.rs
@@ -19,20 +19,18 @@
 // DEALINGS IN THE SOFTWARE.
 
 //! A collection of types using the Gossipsub system.
-use crate::rpc::Sender;
-use crate::TopicHash;
+use std::{collections::BTreeSet, fmt, fmt::Debug};
+
 use futures_timer::Delay;
 use libp2p_identity::PeerId;
 use libp2p_swarm::ConnectionId;
 use prometheus_client::encoding::EncodeLabelValue;
 use quick_protobuf::MessageWrite;
-use std::fmt::Debug;
-use std::{collections::BTreeSet, fmt};
-
-use crate::rpc_proto::proto;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+use crate::{rpc::Sender, rpc_proto::proto, TopicHash};
+
 /// Messages that have expired while attempting to be sent to a peer.
 #[derive(Clone, Debug, Default)]
 pub struct FailedMessages {
@@ -42,7 +40,8 @@ pub struct FailedMessages {
     pub forward: usize,
     /// The number of messages that were failed to be sent to the priority queue as it was full.
     pub priority: usize,
-    /// The number of messages that were failed to be sent to the non-priority queue as it was full.
+    /// The number of messages that were failed to be sent to the non-priority queue as it was
+    /// full.
     pub non_priority: usize,
     /// The number of messages that timed out and could not be sent.
     pub timeout: usize,
@@ -230,9 +229,9 @@ pub enum SubscriptionAction {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct PeerInfo {
     pub(crate) peer_id: Option<PeerId>,
-    //TODO add this when RFC: Signed Address Records got added to the spec (see pull request
+    // TODO add this when RFC: Signed Address Records got added to the spec (see pull request
     // https://github.com/libp2p/specs/pull/217)
-    //pub signed_peer_record: ?,
+    // pub signed_peer_record: ?,
 }
 
 /// A Control message received by the gossipsub system.
@@ -240,7 +239,8 @@ pub(crate) struct PeerInfo {
 pub enum ControlAction {
     /// Node broadcasts known messages per topic - IHave control message.
     IHave(IHave),
-    /// The node requests specific message ids (peer_id + sequence _number) - IWant control message.
+    /// The node requests specific message ids (peer_id + sequence _number) - IWant control
+    /// message.
     IWant(IWant),
     /// The node has been added to the mesh - Graft control message.
     Graft(Graft),
diff --git a/protocols/gossipsub/tests/smoke.rs b/protocols/gossipsub/tests/smoke.rs
index 3b6261afa54..85038665b4d 100644
--- a/protocols/gossipsub/tests/smoke.rs
+++ b/protocols/gossipsub/tests/smoke.rs
@@ -18,15 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::stream::{FuturesUnordered, SelectAll};
-use futures::StreamExt;
+use std::{task::Poll, time::Duration};
+
+use futures::{
+    stream::{FuturesUnordered, SelectAll},
+    StreamExt,
+};
 use libp2p_gossipsub as gossipsub;
 use libp2p_gossipsub::{MessageAuthenticity, ValidationMode};
 use libp2p_swarm::Swarm;
 use libp2p_swarm_test::SwarmExt as _;
 use quickcheck::{QuickCheck, TestResult};
 use rand::{seq::SliceRandom, SeedableRng};
-use std::{task::Poll, time::Duration};
 use tokio::{runtime::Runtime, time};
 use tracing_subscriber::EnvFilter;
 
diff --git a/protocols/identify/src/behaviour.rs b/protocols/identify/src/behaviour.rs
index b69f2014d81..0cd27d90717 100644
--- a/protocols/identify/src/behaviour.rs
+++ b/protocols/identify/src/behaviour.rs
@@ -18,28 +18,27 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::handler::{self, Handler, InEvent};
-use crate::protocol::{Info, UpgradeError};
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{multiaddr, ConnectedPoint, Endpoint, Multiaddr};
-use libp2p_identity::PeerId;
-use libp2p_identity::PublicKey;
-use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm};
+use std::{
+    collections::{hash_map::Entry, HashMap, HashSet, VecDeque},
+    num::NonZeroUsize,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use libp2p_core::{
+    multiaddr, multiaddr::Protocol, transport::PortUse, ConnectedPoint, Endpoint, Multiaddr,
+};
+use libp2p_identity::{PeerId, PublicKey};
 use libp2p_swarm::{
-    ConnectionDenied, DialError, ExternalAddresses, ListenAddresses, NetworkBehaviour,
-    NotifyHandler, PeerAddresses, StreamUpgradeError, THandlerInEvent, ToSwarm,
-    _address_translation,
+    behaviour::{ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm},
+    ConnectionDenied, ConnectionId, DialError, ExternalAddresses, ListenAddresses,
+    NetworkBehaviour, NotifyHandler, PeerAddresses, StreamUpgradeError, THandler, THandlerInEvent,
+    THandlerOutEvent, ToSwarm, _address_translation,
 };
-use libp2p_swarm::{ConnectionId, THandler, THandlerOutEvent};
 
-use std::collections::hash_map::Entry;
-use std::num::NonZeroUsize;
-use std::{
-    collections::{HashMap, HashSet, VecDeque},
-    task::Context,
-    task::Poll,
-    time::Duration,
+use crate::{
+    handler::{self, Handler, InEvent},
+    protocol::{Info, UpgradeError},
 };
 
 /// Whether an [`Multiaddr`] is a valid for the QUIC transport.
@@ -323,7 +322,8 @@ impl Behaviour {
             .contains(&connection_id)
         {
             // Apply address translation to the candidate address.
-            // For TCP without port-reuse, the observed address contains an ephemeral port which needs to be replaced by the port of a listen address.
+            // For TCP without port-reuse, the observed address contains an ephemeral port which
+            // needs to be replaced by the port of a listen address.
             let translated_addresses = {
                 let mut addrs: Vec<_> = self
                     .listen_addresses
@@ -398,7 +398,8 @@ impl NetworkBehaviour for Behaviour {
     ) -> Result<THandler<Self>, ConnectionDenied> {
         // Contrary to inbound events, outbound events are full-p2p qualified
         // so we remove /p2p/ in order to be homogeneous
-        // this will avoid Autonatv2 to probe twice the same address (fully-p2p-qualified + not fully-p2p-qualified)
+        // this will avoid Autonatv2 to probe twice the same address (fully-p2p-qualified + not
+        // fully-p2p-qualified)
         let mut addr = addr.clone();
         if matches!(addr.iter().last(), Some(multiaddr::Protocol::P2p(_))) {
             addr.pop();
@@ -415,7 +416,9 @@ impl NetworkBehaviour for Behaviour {
             self.config.local_public_key.clone(),
             self.config.protocol_version.clone(),
             self.config.agent_version.clone(),
-            addr.clone(), // TODO: This is weird? That is the public address we dialed, shouldn't need to tell the other party?
+            // TODO: This is weird? That is the public address we dialed,
+            // shouldn't need to tell the other party?
+            addr.clone(),
             self.all_addresses(),
         ))
     }
diff --git a/protocols/identify/src/handler.rs b/protocols/identify/src/handler.rs
index dd073d50ed6..cda49f992b8 100644
--- a/protocols/identify/src/handler.rs
+++ b/protocols/identify/src/handler.rs
@@ -18,29 +18,38 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::protocol::{Info, PushInfo, UpgradeError};
-use crate::{protocol, PROTOCOL_NAME, PUSH_PROTOCOL_NAME};
+use std::{
+    collections::HashSet,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use either::Either;
 use futures::prelude::*;
 use futures_bounded::Timeout;
 use futures_timer::Delay;
-use libp2p_core::upgrade::{ReadyUpgrade, SelectUpgrade};
-use libp2p_core::Multiaddr;
-use libp2p_identity::PeerId;
-use libp2p_identity::PublicKey;
-use libp2p_swarm::handler::{
-    ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
-    ProtocolSupport,
+use libp2p_core::{
+    upgrade::{ReadyUpgrade, SelectUpgrade},
+    Multiaddr,
 };
+use libp2p_identity::{PeerId, PublicKey};
 use libp2p_swarm::{
+    handler::{
+        ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
+        ProtocolSupport,
+    },
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, StreamUpgradeError,
     SubstreamProtocol, SupportedProtocols,
 };
 use smallvec::SmallVec;
-use std::collections::HashSet;
-use std::{task::Context, task::Poll, time::Duration};
 use tracing::Level;
 
+use crate::{
+    protocol,
+    protocol::{Info, PushInfo, UpgradeError},
+    PROTOCOL_NAME, PUSH_PROTOCOL_NAME,
+};
+
 const STREAM_TIMEOUT: Duration = Duration::from_secs(60);
 const MAX_CONCURRENT_STREAMS_PER_CONNECTION: usize = 10;
 
diff --git a/protocols/identify/src/lib.rs b/protocols/identify/src/lib.rs
index 7d28e5b5cc7..868ace87aeb 100644
--- a/protocols/identify/src/lib.rs
+++ b/protocols/identify/src/lib.rs
@@ -28,10 +28,10 @@
 //!
 //! # Important Discrepancies
 //!
-//! - **Using Identify with other protocols** Unlike some other libp2p implementations,
-//!   rust-libp2p does not treat Identify as a core protocol. This means that other protocols cannot
-//!   rely upon the existence of Identify, and need to be manually hooked up to Identify in order to
-//!   make use of its capabilities.
+//! - **Using Identify with other protocols** Unlike some other libp2p implementations, rust-libp2p
+//!   does not treat Identify as a core protocol. This means that other protocols cannot rely upon
+//!   the existence of Identify, and need to be manually hooked up to Identify in order to make use
+//!   of its capabilities.
 //!
 //! # Usage
 //!
@@ -41,8 +41,10 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-pub use self::behaviour::{Behaviour, Config, Event};
-pub use self::protocol::{Info, UpgradeError, PROTOCOL_NAME, PUSH_PROTOCOL_NAME};
+pub use self::{
+    behaviour::{Behaviour, Config, Event},
+    protocol::{Info, UpgradeError, PROTOCOL_NAME, PUSH_PROTOCOL_NAME},
+};
 
 mod behaviour;
 mod handler;
diff --git a/protocols/identify/src/protocol.rs b/protocols/identify/src/protocol.rs
index f4dfd544dd1..33aeedb7c4f 100644
--- a/protocols/identify/src/protocol.rs
+++ b/protocols/identify/src/protocol.rs
@@ -18,16 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
+use std::io;
+
 use asynchronous_codec::{FramedRead, FramedWrite};
 use futures::prelude::*;
 use libp2p_core::{multiaddr, Multiaddr};
 use libp2p_identity as identity;
 use libp2p_identity::PublicKey;
 use libp2p_swarm::StreamProtocol;
-use std::io;
 use thiserror::Error;
 
+use crate::proto;
+
 const MAX_MESSAGE_SIZE_BYTES: usize = 4096;
 
 pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/id/1.0.0");
@@ -77,7 +79,8 @@ impl Info {
 }
 
 /// Identify push information of a peer sent in protocol messages.
-/// Note that missing fields should be ignored, as peers may choose to send partial updates containing only the fields whose values have changed.
+/// Note that missing fields should be ignored, as peers may choose to send partial updates
+/// containing only the fields whose values have changed.
 #[derive(Debug, Clone)]
 pub struct PushInfo {
     pub public_key: Option<PublicKey>,
@@ -264,9 +267,10 @@ pub enum UpgradeError {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_identity as identity;
 
+    use super::*;
+
     #[test]
     fn skip_invalid_multiaddr() {
         let valid_multiaddr: Multiaddr = "/ip6/2001:db8::/tcp/1234".parse().unwrap();
diff --git a/protocols/identify/tests/smoke.rs b/protocols/identify/tests/smoke.rs
index d624005408e..dd48b314173 100644
--- a/protocols/identify/tests/smoke.rs
+++ b/protocols/identify/tests/smoke.rs
@@ -1,10 +1,13 @@
+use std::{
+    collections::HashSet,
+    iter,
+    time::{Duration, Instant},
+};
+
 use futures::StreamExt;
 use libp2p_identify as identify;
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use std::collections::HashSet;
-use std::iter;
-use std::time::{Duration, Instant};
 use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
@@ -34,8 +37,7 @@ async fn periodic_identify() {
     let (swarm2_memory_listen, swarm2_tcp_listen_addr) = swarm2.listen().await;
     swarm2.connect(&mut swarm1).await;
 
-    use identify::Event::Received;
-    use identify::Event::Sent;
+    use identify::Event::{Received, Sent};
 
     match libp2p_swarm_test::drive(&mut swarm1, &mut swarm2).await {
         (
@@ -67,7 +69,8 @@ async fn periodic_identify() {
             assert_eq!(s2_info.agent_version, "b");
             assert!(!s2_info.protocols.is_empty());
 
-            // Cannot assert observed address of dialer because memory transport uses ephemeral, outgoing ports.
+            // Cannot assert observed address of dialer because memory transport uses ephemeral,
+            // outgoing ports.
             // assert_eq!(
             //     s2_info.observed_addr,
             //     swarm2_memory_listen.with(Protocol::P2p(swarm2_peer_id.into()))
diff --git a/protocols/kad/src/addresses.rs b/protocols/kad/src/addresses.rs
index 0b3dc71e649..c2168be661e 100644
--- a/protocols/kad/src/addresses.rs
+++ b/protocols/kad/src/addresses.rs
@@ -18,9 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::fmt;
+
 use libp2p_core::Multiaddr;
 use smallvec::SmallVec;
-use std::fmt;
 
 /// A non-empty list of (unique) addresses of a peer in the routing table.
 /// Every address must be a fully-qualified /p2p address.
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index f577971167f..988a16dc41f 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -22,41 +22,46 @@
 
 mod test;
 
-use crate::addresses::Addresses;
-use crate::handler::{Handler, HandlerEvent, HandlerIn, RequestId};
-use crate::kbucket::{self, Distance, KBucketConfig, KBucketsTable, NodeStatus};
-use crate::protocol::{ConnectionType, KadPeer, ProtocolConfig};
-use crate::query::{Query, QueryConfig, QueryId, QueryPool, QueryPoolState};
-use crate::record::{
-    self,
-    store::{self, RecordStore},
-    ProviderRecord, Record,
+use std::{
+    collections::{BTreeMap, HashMap, HashSet, VecDeque},
+    fmt,
+    num::NonZeroUsize,
+    task::{Context, Poll, Waker},
+    time::Duration,
+    vec,
 };
-use crate::{bootstrap, K_VALUE};
-use crate::{jobs::*, protocol};
+
 use fnv::FnvHashSet;
 use libp2p_core::{transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::behaviour::{
-    AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm,
-};
 use libp2p_swarm::{
+    behaviour::{AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm},
     dial_opts::{self, DialOpts},
     ConnectionDenied, ConnectionHandler, ConnectionId, DialError, ExternalAddresses,
     ListenAddresses, NetworkBehaviour, NotifyHandler, StreamProtocol, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
-use std::fmt;
-use std::num::NonZeroUsize;
-use std::task::{Context, Poll, Waker};
-use std::time::Duration;
-use std::vec;
 use thiserror::Error;
 use tracing::Level;
 use web_time::Instant;
 
 pub use crate::query::QueryStats;
+use crate::{
+    addresses::Addresses,
+    bootstrap,
+    handler::{Handler, HandlerEvent, HandlerIn, RequestId},
+    jobs::*,
+    kbucket::{self, Distance, KBucketConfig, KBucketsTable, NodeStatus},
+    protocol,
+    protocol::{ConnectionType, KadPeer, ProtocolConfig},
+    query::{Query, QueryConfig, QueryId, QueryPool, QueryPoolState},
+    record::{
+        self,
+        store::{self, RecordStore},
+        ProviderRecord, Record,
+    },
+    K_VALUE,
+};
 
 /// `Behaviour` is a `NetworkBehaviour` that implements the libp2p
 /// Kademlia protocol.
@@ -157,8 +162,9 @@ pub enum StoreInserts {
     /// the record is forwarded immediately to the [`RecordStore`].
     Unfiltered,
     /// Whenever a (provider) record is received, an event is emitted.
-    /// Provider records generate a [`InboundRequest::AddProvider`] under [`Event::InboundRequest`],
-    /// normal records generate a [`InboundRequest::PutRecord`] under [`Event::InboundRequest`].
+    /// Provider records generate a [`InboundRequest::AddProvider`] under
+    /// [`Event::InboundRequest`], normal records generate a [`InboundRequest::PutRecord`]
+    /// under [`Event::InboundRequest`].
     ///
     /// When deemed valid, a (provider) record needs to be explicitly stored in
     /// the [`RecordStore`] via [`RecordStore::put`] or [`RecordStore::add_provider`],
@@ -205,9 +211,10 @@ pub enum Caching {
     /// [`GetRecordOk::FinishedWithNoAdditionalRecord`] is always empty.
     Disabled,
     /// Up to `max_peers` peers not returning a record that are closest to the key
-    /// being looked up are tracked and returned in [`GetRecordOk::FinishedWithNoAdditionalRecord`].
-    /// The write-back operation must be performed explicitly, if
-    /// desired and after choosing a record from the results, via [`Behaviour::put_record_to`].
+    /// being looked up are tracked and returned in
+    /// [`GetRecordOk::FinishedWithNoAdditionalRecord`]. The write-back operation must be
+    /// performed explicitly, if desired and after choosing a record from the results, via
+    /// [`Behaviour::put_record_to`].
     Enabled { max_peers: u16 },
 }
 
@@ -442,16 +449,17 @@ impl Config {
         self
     }
 
-    /// Sets the time to wait before calling [`Behaviour::bootstrap`] after a new peer is inserted in the routing table.
-    /// This prevent cascading bootstrap requests when multiple peers are inserted into the routing table "at the same time".
-    /// This also allows to wait a little bit for other potential peers to be inserted into the routing table before
-    /// triggering a bootstrap, giving more context to the future bootstrap request.
+    /// Sets the time to wait before calling [`Behaviour::bootstrap`] after a new peer is inserted
+    /// in the routing table. This prevent cascading bootstrap requests when multiple peers are
+    /// inserted into the routing table "at the same time". This also allows to wait a little
+    /// bit for other potential peers to be inserted into the routing table before triggering a
+    /// bootstrap, giving more context to the future bootstrap request.
     ///
     /// * Default to `500` ms.
-    /// * Set to `Some(Duration::ZERO)` to never wait before triggering a bootstrap request when a new peer
-    ///     is inserted in the routing table.
-    /// * Set to `None` to disable automatic bootstrap (no bootstrap request will be triggered when a new
-    ///     peer is inserted in the routing table).
+    /// * Set to `Some(Duration::ZERO)` to never wait before triggering a bootstrap request when a
+    ///   new peer is inserted in the routing table.
+    /// * Set to `None` to disable automatic bootstrap (no bootstrap request will be triggered when
+    ///   a new peer is inserted in the routing table).
     #[cfg(test)]
     pub(crate) fn set_automatic_bootstrap_throttle(
         &mut self,
@@ -573,15 +581,13 @@ where
     ///
     /// Explicitly adding addresses of peers serves two purposes:
     ///
-    ///   1. In order for a node to join the DHT, it must know about at least
-    ///      one other node of the DHT.
+    ///   1. In order for a node to join the DHT, it must know about at least one other node of the
+    ///      DHT.
     ///
-    ///   2. When a remote peer initiates a connection and that peer is not
-    ///      yet in the routing table, the `Kademlia` behaviour must be
-    ///      informed of an address on which that peer is listening for
-    ///      connections before it can be added to the routing table
-    ///      from where it can subsequently be discovered by all peers
-    ///      in the DHT.
+    ///   2. When a remote peer initiates a connection and that peer is not yet in the routing
+    ///      table, the `Kademlia` behaviour must be informed of an address on which that peer is
+    ///      listening for connections before it can be added to the routing table from where it can
+    ///      subsequently be discovered by all peers in the DHT.
     ///
     /// If the routing table has been updated as a result of this operation,
     /// a [`Event::RoutingUpdated`] event is emitted.
@@ -983,7 +989,8 @@ where
     ///
     /// > **Note**: Bootstrap does not require to be called manually. It is periodically
     /// > invoked at regular intervals based on the configured `periodic_bootstrap_interval` (see
-    /// > [`Config::set_periodic_bootstrap_interval`] for details) and it is also automatically invoked
+    /// > [`Config::set_periodic_bootstrap_interval`] for details) and it is also automatically
+    /// > invoked
     /// > when a new peer is inserted in the routing table.
     /// > This parameter is used to call [`Behaviour::bootstrap`] periodically and automatically
     /// > to ensure a healthy routing table.
@@ -1107,10 +1114,12 @@ where
 
     /// Set the [`Mode`] in which we should operate.
     ///
-    /// By default, we are in [`Mode::Client`] and will swap into [`Mode::Server`] as soon as we have a confirmed, external address via [`FromSwarm::ExternalAddrConfirmed`].
+    /// By default, we are in [`Mode::Client`] and will swap into [`Mode::Server`] as soon as we
+    /// have a confirmed, external address via [`FromSwarm::ExternalAddrConfirmed`].
     ///
-    /// Setting a mode via this function disables this automatic behaviour and unconditionally operates in the specified mode.
-    /// To reactivate the automatic configuration, pass [`None`] instead.
+    /// Setting a mode via this function disables this automatic behaviour and unconditionally
+    /// operates in the specified mode. To reactivate the automatic configuration, pass [`None`]
+    /// instead.
     pub fn set_mode(&mut self, mode: Option<Mode>) {
         match mode {
             Some(mode) => {
@@ -1191,8 +1200,8 @@ where
                     "Previous match arm handled empty list"
                 );
 
-                // Previously, server-mode, now also server-mode because > 1 external address. Don't log anything to avoid spam.
-
+                // Previously, server-mode, now also server-mode because > 1 external address.
+                //  Don't log anything to avoid spam.
                 Mode::Server
             }
         };
@@ -2157,7 +2166,8 @@ where
         }
     }
 
-    /// Preloads a new [`Handler`] with requests that are waiting to be sent to the newly connected peer.
+    /// Preloads a new [`Handler`] with requests that are waiting
+    /// to be sent to the newly connected peer.
     fn preload_new_handler(
         &mut self,
         handler: &mut Handler,
@@ -2755,7 +2765,6 @@ pub struct PeerRecord {
 #[allow(clippy::large_enum_variant)]
 pub enum Event {
     /// An inbound request has been received and handled.
-    //
     // Note on the difference between 'request' and 'query': A request is a
     // single request-response style exchange with a single remote peer. A query
     // is made of multiple requests across multiple remote peers.
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 7409168ac2a..82749ffb5fd 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -20,10 +20,6 @@
 
 #![cfg(test)]
 
-use super::*;
-
-use crate::record::{store::MemoryStore, Key};
-use crate::{K_VALUE, PROTOCOL_NAME, SHA_256_MH};
 use futures::{executor::block_on, future::poll_fn, prelude::*};
 use futures_timer::Delay;
 use libp2p_core::{
@@ -39,6 +35,12 @@ use libp2p_yamux as yamux;
 use quickcheck::*;
 use rand::{random, rngs::StdRng, thread_rng, Rng, SeedableRng};
 
+use super::*;
+use crate::{
+    record::{store::MemoryStore, Key},
+    K_VALUE, PROTOCOL_NAME, SHA_256_MH,
+};
+
 type TestSwarm = Swarm<Behaviour<MemoryStore>>;
 
 fn build_node() -> (Multiaddr, TestSwarm) {
@@ -164,7 +166,8 @@ fn bootstrap() {
         let num_group = rng.gen_range(1..(num_total % K_VALUE.get()) + 2);
 
         let mut cfg = Config::new(PROTOCOL_NAME);
-        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from
+        // triggering automatically.
         cfg.set_periodic_bootstrap_interval(None);
         cfg.set_automatic_bootstrap_throttle(None);
         if rng.gen() {
@@ -246,7 +249,8 @@ fn query_iter() {
     fn run(rng: &mut impl Rng) {
         let num_total = rng.gen_range(2..20);
         let mut config = Config::new(PROTOCOL_NAME);
-        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from
+        // triggering automatically.
         config.set_periodic_bootstrap_interval(None);
         config.set_automatic_bootstrap_throttle(None);
         let mut swarms = build_connected_nodes_with_config(num_total, 1, config)
@@ -561,7 +565,8 @@ fn put_record() {
 
         let mut config = Config::new(PROTOCOL_NAME);
         config.set_replication_factor(replication_factor);
-        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from
+        // triggering automatically.
         config.set_periodic_bootstrap_interval(None);
         config.set_automatic_bootstrap_throttle(None);
         if rng.gen() {
@@ -933,7 +938,8 @@ fn add_provider() {
 
         let mut config = Config::new(PROTOCOL_NAME);
         config.set_replication_factor(replication_factor);
-        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+        // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from
+        // triggering automatically.
         config.set_periodic_bootstrap_interval(None);
         config.set_automatic_bootstrap_throttle(None);
         if rng.gen() {
@@ -1161,7 +1167,8 @@ fn disjoint_query_does_not_finish_before_all_paths_did() {
     config.disjoint_query_paths(true);
     // I.e. setting the amount disjoint paths to be explored to 2.
     config.set_parallelism(NonZeroUsize::new(2).unwrap());
-    // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering automatically.
+    // Disabling periodic bootstrap and automatic bootstrap to prevent the bootstrap from triggering
+    // automatically.
     config.set_periodic_bootstrap_interval(None);
     config.set_automatic_bootstrap_throttle(None);
 
diff --git a/protocols/kad/src/bootstrap.rs b/protocols/kad/src/bootstrap.rs
index 40acdfd88ee..d6576a3ef54 100644
--- a/protocols/kad/src/bootstrap.rs
+++ b/protocols/kad/src/bootstrap.rs
@@ -1,7 +1,9 @@
-use futures::FutureExt;
-use std::task::{Context, Poll, Waker};
-use std::time::Duration;
+use std::{
+    task::{Context, Poll, Waker},
+    time::Duration,
+};
 
+use futures::FutureExt;
 use futures_timer::Delay;
 
 /// Default value chosen at `<https://github.com/libp2p/rust-libp2p/pull/4838#discussion_r1490184754>`.
@@ -9,18 +11,18 @@ pub(crate) const DEFAULT_AUTOMATIC_THROTTLE: Duration = Duration::from_millis(50
 
 #[derive(Debug)]
 pub(crate) struct Status {
-    /// If the user did not disable periodic bootstrap (by providing `None` for `periodic_interval`)
-    /// this is the periodic interval and the delay of the current period. When `Delay` finishes,
-    /// a bootstrap will be triggered and the `Delay` will be reset.
+    /// If the user did not disable periodic bootstrap (by providing `None` for
+    /// `periodic_interval`) this is the periodic interval and the delay of the current period.
+    /// When `Delay` finishes, a bootstrap will be triggered and the `Delay` will be reset.
     interval_and_delay: Option<(Duration, Delay)>,
 
     /// Configured duration to wait before triggering a bootstrap when a new peer
     /// is inserted in the routing table. `None` if automatic bootstrap is disabled.
     automatic_throttle: Option<Duration>,
     /// Timer that will be set (if automatic bootstrap is not disabled) when a new peer is inserted
-    /// in the routing table. When it finishes, it will trigger a bootstrap and will be set to `None`
-    /// again. If an other new peer is inserted in the routing table before this timer finishes,
-    /// the timer is reset.
+    /// in the routing table. When it finishes, it will trigger a bootstrap and will be set to
+    /// `None` again. If an other new peer is inserted in the routing table before this timer
+    /// finishes, the timer is reset.
     throttle_timer: Option<ThrottleTimer>,
 
     /// Number of bootstrap requests currently in progress. We ensure neither periodic bootstrap
@@ -108,16 +110,19 @@ impl Status {
             // A `throttle_timer` has been registered. It means one or more peers have been
             // inserted into the routing table and that a bootstrap request should be triggered.
             // However, to not risk cascading bootstrap requests, we wait a little time to ensure
-            // the user will not add more peers in the routing table in the next "throttle_timer" remaining.
+            // the user will not add more peers in the routing table in the next "throttle_timer"
+            // remaining.
             if throttle_delay.poll_unpin(cx).is_ready() {
                 // The `throttle_timer` is finished, triggering bootstrap right now.
                 // The call to `on_started` will reset `throttle_delay`.
                 return Poll::Ready(());
             }
 
-            // The `throttle_timer` is not finished but the periodic interval for triggering bootstrap might be reached.
+            // The `throttle_timer` is not finished but the periodic interval for triggering
+            // bootstrap might be reached.
         } else {
-            // No new peer has recently been inserted into the routing table or automatic bootstrap is disabled.
+            // No new peer has recently been inserted into the routing table or automatic bootstrap
+            // is disabled.
         }
 
         // Checking if the user has enabled the periodic bootstrap feature.
@@ -131,7 +136,8 @@ impl Status {
             // The user disabled periodic bootstrap.
         }
 
-        // Registering the `waker` so that we can wake up when calling `on_new_peer_in_routing_table`.
+        // Registering the `waker` so that we can wake up when calling
+        // `on_new_peer_in_routing_table`.
         self.waker = Some(cx.waker().clone());
         Poll::Pending
     }
@@ -175,9 +181,10 @@ impl futures::Future for ThrottleTimer {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use web_time::Instant;
 
+    use super::*;
+
     const MS_5: Duration = Duration::from_millis(5);
     const MS_100: Duration = Duration::from_millis(100);
 
@@ -296,7 +303,8 @@ mod tests {
 
             let elapsed = Instant::now().duration_since(start);
 
-            assert!(elapsed > (i * MS_100 - Duration::from_millis(10))); // Subtract 10ms to avoid flakes.
+            // Subtract 10ms to avoid flakes.
+            assert!(elapsed > (i * MS_100 - Duration::from_millis(10)));
         }
     }
 
@@ -308,7 +316,8 @@ mod tests {
         status.trigger();
         for _ in 0..10 {
             Delay::new(MS_100 / 2).await;
-            status.trigger(); // should reset throttle_timer
+            // should reset throttle_timer
+            status.trigger();
         }
         assert!(
             status.next().now_or_never().is_none(),
@@ -330,9 +339,12 @@ mod tests {
     ) {
         let mut status = Status::new(Some(MS_100), None);
 
-        status.on_started(); // first manually triggering
-        status.on_started(); // second manually triggering
-        status.on_finish(); // one finishes
+        // first manually triggering
+        status.on_started();
+        // second manually triggering
+        status.on_started();
+        // one finishes
+        status.on_finish();
 
         assert!(
             async_std::future::timeout(10 * MS_100, status.next())
diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
index 384ebc3f2b1..6b4e944e2b0 100644
--- a/protocols/kad/src/handler.rs
+++ b/protocols/kad/src/handler.rs
@@ -18,27 +18,33 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::behaviour::Mode;
-use crate::protocol::{
-    KadInStreamSink, KadOutStreamSink, KadPeer, KadRequestMsg, KadResponseMsg, ProtocolConfig,
+use std::{
+    collections::VecDeque,
+    error, fmt, io,
+    marker::PhantomData,
+    pin::Pin,
+    task::{Context, Poll, Waker},
+    time::Duration,
 };
-use crate::record::{self, Record};
-use crate::QueryId;
+
 use either::Either;
-use futures::channel::oneshot;
-use futures::prelude::*;
-use futures::stream::SelectAll;
+use futures::{channel::oneshot, prelude::*, stream::SelectAll};
 use libp2p_core::{upgrade, ConnectedPoint};
 use libp2p_identity::PeerId;
-use libp2p_swarm::handler::{ConnectionEvent, FullyNegotiatedInbound, FullyNegotiatedOutbound};
 use libp2p_swarm::{
+    handler::{ConnectionEvent, FullyNegotiatedInbound, FullyNegotiatedOutbound},
     ConnectionHandler, ConnectionHandlerEvent, Stream, StreamUpgradeError, SubstreamProtocol,
     SupportedProtocols,
 };
-use std::collections::VecDeque;
-use std::task::Waker;
-use std::time::Duration;
-use std::{error, fmt, io, marker::PhantomData, pin::Pin, task::Context, task::Poll};
+
+use crate::{
+    behaviour::Mode,
+    protocol::{
+        KadInStreamSink, KadOutStreamSink, KadPeer, KadRequestMsg, KadResponseMsg, ProtocolConfig,
+    },
+    record::{self, Record},
+    QueryId,
+};
 
 const MAX_NUM_STREAMS: usize = 32;
 
@@ -550,7 +556,8 @@ impl Handler {
             });
     }
 
-    /// Takes the given [`KadRequestMsg`] and composes it into an outbound request-response protocol handshake using a [`oneshot::channel`].
+    /// Takes the given [`KadRequestMsg`] and composes it into an outbound request-response protocol
+    /// handshake using a [`oneshot::channel`].
     fn queue_new_stream(&mut self, id: QueryId, msg: KadRequestMsg) {
         let (sender, receiver) = oneshot::channel();
 
@@ -1060,10 +1067,11 @@ fn process_kad_response(event: KadResponseMsg, query_id: QueryId) -> HandlerEven
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use quickcheck::{Arbitrary, Gen};
     use tracing_subscriber::EnvFilter;
 
+    use super::*;
+
     impl Arbitrary for ProtocolStatus {
         fn arbitrary(g: &mut Gen) -> Self {
             Self {
diff --git a/protocols/kad/src/jobs.rs b/protocols/kad/src/jobs.rs
index fa558878a38..56b3e080d96 100644
--- a/protocols/kad/src/jobs.rs
+++ b/protocols/kad/src/jobs.rs
@@ -25,12 +25,11 @@
 //! To ensure persistence of records in the DHT, a Kademlia node
 //! must periodically (re-)publish and (re-)replicate its records:
 //!
-//!   1. (Re-)publishing: The original publisher or provider of a record
-//!      must regularly re-publish in order to prolong the expiration.
+//!   1. (Re-)publishing: The original publisher or provider of a record must regularly re-publish
+//!      in order to prolong the expiration.
 //!
-//!   2. (Re-)replication: Every node storing a replica of a record must
-//!      regularly re-replicate it to the closest nodes to the key in
-//!      order to ensure the record is present at these nodes.
+//!   2. (Re-)replication: Every node storing a replica of a record must regularly re-replicate it
+//!      to the closest nodes to the key in order to ensure the record is present at these nodes.
 //!
 //! Re-publishing primarily ensures persistence of the record beyond its
 //! initial TTL, for as long as the publisher stores (or provides) the record,
@@ -41,11 +40,10 @@
 //!
 //! This module implements two periodic jobs:
 //!
-//!   * [`PutRecordJob`]: For (re-)publication and (re-)replication of
-//!     regular (value-)records.
+//!   * [`PutRecordJob`]: For (re-)publication and (re-)replication of regular (value-)records.
 //!
-//!   * [`AddProviderJob`]: For (re-)publication of provider records.
-//!     Provider records currently have no separate replication mechanism.
+//!   * [`AddProviderJob`]: For (re-)publication of provider records. Provider records currently
+//!     have no separate replication mechanism.
 //!
 //! A periodic job is driven like a `Future` or `Stream` by `poll`ing it.
 //! Once a job starts running it emits records to send to the `k` closest
@@ -61,17 +59,21 @@
 //! > to the size of all stored records. As a job runs, the records are moved
 //! > out of the job to the consumer, where they can be dropped after being sent.
 
-use crate::record::{self, store::RecordStore, ProviderRecord, Record};
+use std::{
+    collections::HashSet,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+    vec,
+};
+
 use futures::prelude::*;
 use futures_timer::Delay;
 use libp2p_identity::PeerId;
-use std::collections::HashSet;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
-use std::vec;
 use web_time::Instant;
 
+use crate::record::{self, store::RecordStore, ProviderRecord, Record};
+
 /// The maximum number of queries towards which background jobs
 /// are allowed to start new queries on an invocation of
 /// `Behaviour::poll`.
@@ -335,12 +337,13 @@ impl AddProviderJob {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::record::store::MemoryStore;
     use futures::{executor::block_on, future::poll_fn};
     use quickcheck::*;
     use rand::Rng;
 
+    use super::*;
+    use crate::record::store::MemoryStore;
+
     fn rand_put_record_job() -> PutRecordJob {
         let mut rng = rand::thread_rng();
         let id = PeerId::random();
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 99d534fa669..1c6d8857c9c 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -72,13 +72,11 @@ mod entry;
 #[allow(clippy::assign_op_pattern)]
 mod key;
 
-pub use bucket::NodeStatus;
-pub use entry::*;
+use std::{collections::VecDeque, num::NonZeroUsize, time::Duration};
 
 use bucket::KBucket;
-use std::collections::VecDeque;
-use std::num::NonZeroUsize;
-use std::time::Duration;
+pub use bucket::NodeStatus;
+pub use entry::*;
 use web_time::Instant;
 
 /// Maximum number of k-buckets.
@@ -561,10 +559,11 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_identity::PeerId;
     use quickcheck::*;
 
+    use super::*;
+
     type TestTable = KBucketsTable<KeyBytes, ()>;
 
     impl Arbitrary for TestTable {
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
index ec2b7756c43..244525238ec 100644
--- a/protocols/kad/src/kbucket/bucket.rs
+++ b/protocols/kad/src/kbucket/bucket.rs
@@ -311,19 +311,18 @@ where
     ///
     /// The status of the node to insert determines the result as follows:
     ///
-    ///   * `NodeStatus::Connected`: If the bucket is full and either all nodes are connected
-    ///     or there is already a pending node, insertion fails with `InsertResult::Full`.
-    ///     If the bucket is full but at least one node is disconnected and there is no pending
-    ///     node, the new node is inserted as pending, yielding `InsertResult::Pending`.
-    ///     Otherwise the bucket has free slots and the new node is added to the end of the
-    ///     bucket as the most-recently connected node.
+    ///   * `NodeStatus::Connected`: If the bucket is full and either all nodes are connected or
+    ///     there is already a pending node, insertion fails with `InsertResult::Full`. If the
+    ///     bucket is full but at least one node is disconnected and there is no pending node, the
+    ///     new node is inserted as pending, yielding `InsertResult::Pending`. Otherwise the bucket
+    ///     has free slots and the new node is added to the end of the bucket as the most-recently
+    ///     connected node.
     ///
     ///   * `NodeStatus::Disconnected`: If the bucket is full, insertion fails with
-    ///     `InsertResult::Full`. Otherwise the bucket has free slots and the new node
-    ///     is inserted at the position preceding the first connected node,
-    ///     i.e. as the most-recently disconnected node. If there are no connected nodes,
-    ///     the new node is added as the last element of the bucket.
-    ///
+    ///     `InsertResult::Full`. Otherwise the bucket has free slots and the new node is inserted
+    ///     at the position preceding the first connected node, i.e. as the most-recently
+    ///     disconnected node. If there are no connected nodes, the new node is added as the last
+    ///     element of the bucket.
     pub(crate) fn insert(
         &mut self,
         node: Node<TKey, TVal>,
@@ -443,10 +442,11 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_identity::PeerId;
     use quickcheck::*;
 
+    use super::*;
+
     impl Arbitrary for KBucket<Key<PeerId>, ()> {
         fn arbitrary(g: &mut Gen) -> KBucket<Key<PeerId>, ()> {
             let timeout = Duration::from_secs(g.gen_range(1..g.size()) as u64);
diff --git a/protocols/kad/src/kbucket/entry.rs b/protocols/kad/src/kbucket/entry.rs
index 808db08d858..bdf8b9b5a18 100644
--- a/protocols/kad/src/kbucket/entry.rs
+++ b/protocols/kad/src/kbucket/entry.rs
@@ -23,7 +23,6 @@
 
 pub(crate) use super::bucket::{AppliedPending, InsertResult, Node, K_VALUE};
 pub use super::key::*;
-
 use super::*;
 
 /// An immutable by-reference view of a bucket entry.
diff --git a/protocols/kad/src/kbucket/key.rs b/protocols/kad/src/kbucket/key.rs
index f35849c6b26..367dfa807d3 100644
--- a/protocols/kad/src/kbucket/key.rs
+++ b/protocols/kad/src/kbucket/key.rs
@@ -18,15 +18,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::record;
+use std::{
+    borrow::Borrow,
+    hash::{Hash, Hasher},
+};
+
 use libp2p_core::multihash::Multihash;
 use libp2p_identity::PeerId;
-use sha2::digest::generic_array::{typenum::U32, GenericArray};
-use sha2::{Digest, Sha256};
-use std::borrow::Borrow;
-use std::hash::{Hash, Hasher};
+use sha2::{
+    digest::generic_array::{typenum::U32, GenericArray},
+    Digest, Sha256,
+};
 use uint::*;
 
+use crate::record;
+
 construct_uint! {
     /// 256-bit unsigned integer.
     pub(super) struct U256(4);
@@ -200,9 +206,10 @@ impl Distance {
 
 #[cfg(test)]
 mod tests {
+    use quickcheck::*;
+
     use super::*;
     use crate::SHA_256_MH;
-    use quickcheck::*;
 
     impl Arbitrary for Key<PeerId> {
         fn arbitrary(_: &mut Gen) -> Key<PeerId> {
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index 060bfc518e4..8ab45665c9b 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -54,36 +54,34 @@ mod proto {
     };
 }
 
+use std::num::NonZeroUsize;
+
 pub use addresses::Addresses;
 pub use behaviour::{
     AddProviderContext, AddProviderError, AddProviderOk, AddProviderPhase, AddProviderResult,
-    BootstrapError, BootstrapOk, BootstrapResult, GetClosestPeersError, GetClosestPeersOk,
-    GetClosestPeersResult, GetProvidersError, GetProvidersOk, GetProvidersResult, GetRecordError,
-    GetRecordOk, GetRecordResult, InboundRequest, Mode, NoKnownPeers, PeerInfo, PeerRecord,
-    PutRecordContext, PutRecordError, PutRecordOk, PutRecordPhase, PutRecordResult, QueryInfo,
-    QueryMut, QueryRef, QueryResult, QueryStats, RoutingUpdate,
-};
-pub use behaviour::{
-    Behaviour, BucketInserts, Caching, Config, Event, ProgressStep, Quorum, StoreInserts,
+    Behaviour, BootstrapError, BootstrapOk, BootstrapResult, BucketInserts, Caching, Config, Event,
+    GetClosestPeersError, GetClosestPeersOk, GetClosestPeersResult, GetProvidersError,
+    GetProvidersOk, GetProvidersResult, GetRecordError, GetRecordOk, GetRecordResult,
+    InboundRequest, Mode, NoKnownPeers, PeerInfo, PeerRecord, ProgressStep, PutRecordContext,
+    PutRecordError, PutRecordOk, PutRecordPhase, PutRecordResult, QueryInfo, QueryMut, QueryRef,
+    QueryResult, QueryStats, Quorum, RoutingUpdate, StoreInserts,
 };
 pub use kbucket::{
     Distance as KBucketDistance, EntryView, KBucketRef, Key as KBucketKey, NodeStatus,
 };
+use libp2p_swarm::StreamProtocol;
 pub use protocol::{ConnectionType, KadPeer};
 pub use query::QueryId;
 pub use record::{store, Key as RecordKey, ProviderRecord, Record};
 
-use libp2p_swarm::StreamProtocol;
-use std::num::NonZeroUsize;
-
 /// The `k` parameter of the Kademlia specification.
 ///
 /// This parameter determines:
 ///
 ///   1) The (fixed) maximum number of nodes in a bucket.
-///   2) The (default) replication factor, which in turn determines:
-///       a) The number of closer peers returned in response to a request.
-///       b) The number of closest peers to a key to search for in an iterative query.
+///   2) The (default) replication factor, which in turn determines: a) The number of closer peers
+///      returned in response to a request. b) The number of closest peers to a key to search for in
+///      an iterative query.
 ///
 /// The choice of (1) is fixed to this constant. The replication factor is configurable
 /// but should generally be no greater than `K_VALUE`. All nodes in a Kademlia
diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs
index 9d2ef56f5d8..9d0d69b670e 100644
--- a/protocols/kad/src/protocol.rs
+++ b/protocols/kad/src/protocol.rs
@@ -26,21 +26,25 @@
 //! to poll the underlying transport for incoming messages, and the `Sink` component
 //! is used to send messages to remote peers.
 
-use crate::proto;
-use crate::record::{self, Record};
+use std::{io, iter, marker::PhantomData, time::Duration};
+
 use asynchronous_codec::{Decoder, Encoder, Framed};
 use bytes::BytesMut;
 use futures::prelude::*;
-use libp2p_core::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
-use libp2p_core::Multiaddr;
+use libp2p_core::{
+    upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo},
+    Multiaddr,
+};
 use libp2p_identity::PeerId;
 use libp2p_swarm::StreamProtocol;
-use std::marker::PhantomData;
-use std::time::Duration;
-use std::{io, iter};
 use tracing::debug;
 use web_time::Instant;
 
+use crate::{
+    proto,
+    record::{self, Record},
+};
+
 /// The protocol name used for negotiating with multistream-select.
 pub(crate) const DEFAULT_PROTO_NAME: StreamProtocol = StreamProtocol::new("/ipfs/kad/1.0.0");
 /// The default maximum size for a varint length-delimited packet.
@@ -667,92 +671,92 @@ mod tests {
         assert_eq!(peer.multiaddrs, vec![valid_multiaddr])
     }
 
-    /*// TODO: restore
-    use self::libp2p_tcp::TcpTransport;
-    use self::tokio::runtime::current_thread::Runtime;
-    use futures::{Future, Sink, Stream};
-    use libp2p_core::{PeerId, PublicKey, Transport};
-    use multihash::{encode, Hash};
-    use protocol::{ConnectionType, KadPeer, ProtocolConfig};
-    use std::sync::mpsc;
-    use std::thread;
-
-    #[test]
-    fn correct_transfer() {
-        // We open a server and a client, send a message between the two, and check that they were
-        // successfully received.
-
-        test_one(KadMsg::Ping);
-        test_one(KadMsg::FindNodeReq {
-            key: PeerId::random(),
-        });
-        test_one(KadMsg::FindNodeRes {
-            closer_peers: vec![KadPeer {
-                node_id: PeerId::random(),
-                multiaddrs: vec!["/ip4/100.101.102.103/tcp/20105".parse().unwrap()],
-                connection_ty: ConnectionType::Connected,
-            }],
-        });
-        test_one(KadMsg::GetProvidersReq {
-            key: encode(Hash::SHA2256, &[9, 12, 0, 245, 245, 201, 28, 95]).unwrap(),
-        });
-        test_one(KadMsg::GetProvidersRes {
-            closer_peers: vec![KadPeer {
-                node_id: PeerId::random(),
-                multiaddrs: vec!["/ip4/100.101.102.103/tcp/20105".parse().unwrap()],
-                connection_ty: ConnectionType::Connected,
-            }],
-            provider_peers: vec![KadPeer {
-                node_id: PeerId::random(),
-                multiaddrs: vec!["/ip4/200.201.202.203/tcp/1999".parse().unwrap()],
-                connection_ty: ConnectionType::NotConnected,
-            }],
-        });
-        test_one(KadMsg::AddProvider {
-            key: encode(Hash::SHA2256, &[9, 12, 0, 245, 245, 201, 28, 95]).unwrap(),
-            provider_peer: KadPeer {
-                node_id: PeerId::random(),
-                multiaddrs: vec!["/ip4/9.1.2.3/udp/23".parse().unwrap()],
-                connection_ty: ConnectionType::Connected,
-            },
-        });
-        // TODO: all messages
-
-        fn test_one(msg_server: KadMsg) {
-            let msg_client = msg_server.clone();
-            let (tx, rx) = mpsc::channel();
-
-            let bg_thread = thread::spawn(move || {
-                let transport = TcpTransport::default().with_upgrade(ProtocolConfig);
-
-                let (listener, addr) = transport
-                    .listen_on( "/ip4/127.0.0.1/tcp/0".parse().unwrap())
-                    .unwrap();
-                tx.send(addr).unwrap();
-
-                let future = listener
-                    .into_future()
-                    .map_err(|(err, _)| err)
-                    .and_then(|(client, _)| client.unwrap().0)
-                    .and_then(|proto| proto.into_future().map_err(|(err, _)| err).map(|(v, _)| v))
-                    .map(|recv_msg| {
-                        assert_eq!(recv_msg.unwrap(), msg_server);
-                        ()
-                    });
-                let mut rt = Runtime::new().unwrap();
-                let _ = rt.block_on(future).unwrap();
-            });
-
-            let transport = TcpTransport::default().with_upgrade(ProtocolConfig);
-
-            let future = transport
-                .dial(rx.recv().unwrap())
-                .unwrap()
-                .and_then(|proto| proto.send(msg_client))
-                .map(|_| ());
-            let mut rt = Runtime::new().unwrap();
-            let _ = rt.block_on(future).unwrap();
-            bg_thread.join().unwrap();
-        }
-    }*/
+    // // TODO: restore
+    // use self::libp2p_tcp::TcpTransport;
+    // use self::tokio::runtime::current_thread::Runtime;
+    // use futures::{Future, Sink, Stream};
+    // use libp2p_core::{PeerId, PublicKey, Transport};
+    // use multihash::{encode, Hash};
+    // use protocol::{ConnectionType, KadPeer, ProtocolConfig};
+    // use std::sync::mpsc;
+    // use std::thread;
+    //
+    // #[test]
+    // fn correct_transfer() {
+    // We open a server and a client, send a message between the two, and check that they were
+    // successfully received.
+    //
+    // test_one(KadMsg::Ping);
+    // test_one(KadMsg::FindNodeReq {
+    // key: PeerId::random(),
+    // });
+    // test_one(KadMsg::FindNodeRes {
+    // closer_peers: vec![KadPeer {
+    // node_id: PeerId::random(),
+    // multiaddrs: vec!["/ip4/100.101.102.103/tcp/20105".parse().unwrap()],
+    // connection_ty: ConnectionType::Connected,
+    // }],
+    // });
+    // test_one(KadMsg::GetProvidersReq {
+    // key: encode(Hash::SHA2256, &[9, 12, 0, 245, 245, 201, 28, 95]).unwrap(),
+    // });
+    // test_one(KadMsg::GetProvidersRes {
+    // closer_peers: vec![KadPeer {
+    // node_id: PeerId::random(),
+    // multiaddrs: vec!["/ip4/100.101.102.103/tcp/20105".parse().unwrap()],
+    // connection_ty: ConnectionType::Connected,
+    // }],
+    // provider_peers: vec![KadPeer {
+    // node_id: PeerId::random(),
+    // multiaddrs: vec!["/ip4/200.201.202.203/tcp/1999".parse().unwrap()],
+    // connection_ty: ConnectionType::NotConnected,
+    // }],
+    // });
+    // test_one(KadMsg::AddProvider {
+    // key: encode(Hash::SHA2256, &[9, 12, 0, 245, 245, 201, 28, 95]).unwrap(),
+    // provider_peer: KadPeer {
+    // node_id: PeerId::random(),
+    // multiaddrs: vec!["/ip4/9.1.2.3/udp/23".parse().unwrap()],
+    // connection_ty: ConnectionType::Connected,
+    // },
+    // });
+    // TODO: all messages
+    //
+    // fn test_one(msg_server: KadMsg) {
+    // let msg_client = msg_server.clone();
+    // let (tx, rx) = mpsc::channel();
+    //
+    // let bg_thread = thread::spawn(move || {
+    // let transport = TcpTransport::default().with_upgrade(ProtocolConfig);
+    //
+    // let (listener, addr) = transport
+    // .listen_on( "/ip4/127.0.0.1/tcp/0".parse().unwrap())
+    // .unwrap();
+    // tx.send(addr).unwrap();
+    //
+    // let future = listener
+    // .into_future()
+    // .map_err(|(err, _)| err)
+    // .and_then(|(client, _)| client.unwrap().0)
+    // .and_then(|proto| proto.into_future().map_err(|(err, _)| err).map(|(v, _)| v))
+    // .map(|recv_msg| {
+    // assert_eq!(recv_msg.unwrap(), msg_server);
+    // ()
+    // });
+    // let mut rt = Runtime::new().unwrap();
+    // let _ = rt.block_on(future).unwrap();
+    // });
+    //
+    // let transport = TcpTransport::default().with_upgrade(ProtocolConfig);
+    //
+    // let future = transport
+    // .dial(rx.recv().unwrap())
+    // .unwrap()
+    // .and_then(|proto| proto.send(msg_client))
+    // .map(|_| ());
+    // let mut rt = Runtime::new().unwrap();
+    // let _ = rt.block_on(future).unwrap();
+    // bg_thread.join().unwrap();
+    // }
+    // }
 }
diff --git a/protocols/kad/src/query.rs b/protocols/kad/src/query.rs
index 1a895d9627c..69257f73b26 100644
--- a/protocols/kad/src/query.rs
+++ b/protocols/kad/src/query.rs
@@ -20,24 +20,27 @@
 
 mod peers;
 
-use libp2p_core::Multiaddr;
-use peers::closest::{
-    disjoint::ClosestDisjointPeersIter, ClosestPeersIter, ClosestPeersIterConfig,
-};
-use peers::fixed::FixedPeersIter;
-use peers::PeersIterState;
-use smallvec::SmallVec;
+use std::{num::NonZeroUsize, time::Duration};
 
-use crate::behaviour::PeerInfo;
-use crate::handler::HandlerIn;
-use crate::kbucket::{Key, KeyBytes};
-use crate::{QueryInfo, ALPHA_VALUE, K_VALUE};
 use either::Either;
 use fnv::FnvHashMap;
+use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
-use std::{num::NonZeroUsize, time::Duration};
+use peers::{
+    closest::{disjoint::ClosestDisjointPeersIter, ClosestPeersIter, ClosestPeersIterConfig},
+    fixed::FixedPeersIter,
+    PeersIterState,
+};
+use smallvec::SmallVec;
 use web_time::Instant;
 
+use crate::{
+    behaviour::PeerInfo,
+    handler::HandlerIn,
+    kbucket::{Key, KeyBytes},
+    QueryInfo, ALPHA_VALUE, K_VALUE,
+};
+
 /// A `QueryPool` provides an aggregate state machine for driving `Query`s to completion.
 ///
 /// Internally, a `Query` is in turn driven by an underlying `QueryPeerIter`
diff --git a/protocols/kad/src/query/peers.rs b/protocols/kad/src/query/peers.rs
index 11b8f974de9..fe8ada51e44 100644
--- a/protocols/kad/src/query/peers.rs
+++ b/protocols/kad/src/query/peers.rs
@@ -23,13 +23,11 @@
 //! Using a peer iterator in a query involves performing the following steps
 //! repeatedly and in an alternating fashion:
 //!
-//!   1. Calling `next` to observe the next state of the iterator and determine
-//!      what to do, which is to either issue new requests to peers or continue
-//!      waiting for responses.
+//!   1. Calling `next` to observe the next state of the iterator and determine what to do, which is
+//!      to either issue new requests to peers or continue waiting for responses.
 //!
-//!   2. When responses are received or requests fail, providing input to the
-//!      iterator via the `on_success` and `on_failure` callbacks,
-//!      respectively, followed by repeating step (1).
+//!   2. When responses are received or requests fail, providing input to the iterator via the
+//!      `on_success` and `on_failure` callbacks, respectively, followed by repeating step (1).
 //!
 //! When a call to `next` returns [`Finished`], no more peers can be obtained
 //! from the iterator and the results can be obtained from `into_result`.
@@ -40,9 +38,10 @@
 
 pub(crate) mod closest;
 pub(crate) mod fixed;
-use libp2p_identity::PeerId;
 use std::borrow::Cow;
 
+use libp2p_identity::PeerId;
+
 /// The state of a peer iterator.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PeersIterState<'a> {
diff --git a/protocols/kad/src/query/peers/closest.rs b/protocols/kad/src/query/peers/closest.rs
index 2505ee2e9b2..2d1f91f050c 100644
--- a/protocols/kad/src/query/peers/closest.rs
+++ b/protocols/kad/src/query/peers/closest.rs
@@ -18,14 +18,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::*;
+use std::{
+    collections::btree_map::{BTreeMap, Entry},
+    num::NonZeroUsize,
+    time::Duration,
+};
 
-use crate::kbucket::{Distance, Key, KeyBytes};
-use crate::{ALPHA_VALUE, K_VALUE};
-use std::collections::btree_map::{BTreeMap, Entry};
-use std::{num::NonZeroUsize, time::Duration};
 use web_time::Instant;
 
+use super::*;
+use crate::{
+    kbucket::{Distance, Key, KeyBytes},
+    ALPHA_VALUE, K_VALUE,
+};
+
 pub(crate) mod disjoint;
 /// A peer iterator for a dynamically changing list of peers, sorted by increasing
 /// distance to a chosen target.
@@ -494,12 +500,14 @@ enum PeerState {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::SHA_256_MH;
+    use std::iter;
+
     use libp2p_core::multihash::Multihash;
     use quickcheck::*;
     use rand::{rngs::StdRng, Rng, SeedableRng};
-    use std::iter;
+
+    use super::*;
+    use crate::SHA_256_MH;
 
     fn random_peers<R: Rng>(n: usize, g: &mut R) -> Vec<PeerId> {
         (0..n)
diff --git a/protocols/kad/src/query/peers/closest/disjoint.rs b/protocols/kad/src/query/peers/closest/disjoint.rs
index cafe87b6ef4..70ded360c7e 100644
--- a/protocols/kad/src/query/peers/closest/disjoint.rs
+++ b/protocols/kad/src/query/peers/closest/disjoint.rs
@@ -18,13 +18,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::*;
 use std::{
     collections::HashMap,
     iter::{Cycle, Map, Peekable},
     ops::{Index, IndexMut, Range},
 };
 
+use super::*;
+
 /// Wraps around a set of [`ClosestPeersIter`], enforcing a disjoint discovery
 /// path per configured parallelism according to the S/Kademlia paper.
 pub(crate) struct ClosestDisjointPeersIter {
@@ -373,7 +374,6 @@ enum ResponseState {
 
 /// Iterator combining the result of multiple [`ClosestPeersIter`] into a single
 /// deduplicated ordered iterator.
-//
 // Note: This operates under the assumption that `I` is ordered.
 #[derive(Clone, Debug)]
 struct ResultIter<I>
@@ -433,13 +433,13 @@ impl<I: Iterator<Item = Key<PeerId>>> Iterator for ResultIter<I> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::{collections::HashSet, iter};
 
-    use crate::SHA_256_MH;
     use libp2p_core::multihash::Multihash;
     use quickcheck::*;
-    use std::collections::HashSet;
-    use std::iter;
+
+    use super::*;
+    use crate::SHA_256_MH;
 
     impl Arbitrary for ResultIter<std::vec::IntoIter<Key<PeerId>>> {
         fn arbitrary(g: &mut Gen) -> Self {
diff --git a/protocols/kad/src/query/peers/fixed.rs b/protocols/kad/src/query/peers/fixed.rs
index 2d0b312454d..41cb3559f1b 100644
--- a/protocols/kad/src/query/peers/fixed.rs
+++ b/protocols/kad/src/query/peers/fixed.rs
@@ -18,10 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::*;
+use std::{collections::hash_map::Entry, num::NonZeroUsize, vec};
 
 use fnv::FnvHashMap;
-use std::{collections::hash_map::Entry, num::NonZeroUsize, vec};
+
+use super::*;
 
 /// A peer iterator for a fixed set of peers.
 pub(crate) struct FixedPeersIter {
diff --git a/protocols/kad/src/record.rs b/protocols/kad/src/record.rs
index b8a644acdd6..fea17f826a4 100644
--- a/protocols/kad/src/record.rs
+++ b/protocols/kad/src/record.rs
@@ -22,13 +22,16 @@
 
 pub mod store;
 
+use std::{
+    borrow::Borrow,
+    hash::{Hash, Hasher},
+};
+
 use bytes::Bytes;
 use libp2p_core::{multihash::Multihash, Multiaddr};
 use libp2p_identity::PeerId;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
-use std::borrow::Borrow;
-use std::hash::{Hash, Hasher};
 use web_time::Instant;
 
 /// The (opaque) key of a record.
@@ -160,10 +163,12 @@ impl ProviderRecord {
 
 #[cfg(test)]
 mod tests {
+    use std::time::Duration;
+
+    use quickcheck::*;
+
     use super::*;
     use crate::SHA_256_MH;
-    use quickcheck::*;
-    use std::time::Duration;
 
     impl Arbitrary for Key {
         fn arbitrary(g: &mut Gen) -> Key {
diff --git a/protocols/kad/src/record/store.rs b/protocols/kad/src/record/store.rs
index 5c25bc8b2fa..ee40f568bb3 100644
--- a/protocols/kad/src/record/store.rs
+++ b/protocols/kad/src/record/store.rs
@@ -20,12 +20,13 @@
 
 mod memory;
 
+use std::borrow::Cow;
+
 pub use memory::{MemoryStore, MemoryStoreConfig};
 use thiserror::Error;
 
 use super::*;
 use crate::K_VALUE;
-use std::borrow::Cow;
 
 /// The result of an operation on a `RecordStore`.
 pub type Result<T> = std::result::Result<T, Error>;
@@ -50,20 +51,16 @@ pub enum Error {
 ///
 /// There are two types of records managed by a `RecordStore`:
 ///
-///   1. Regular (value-)records. These records store an arbitrary value
-///      associated with a key which is distributed to the closest nodes
-///      to the key in the Kademlia DHT as per the standard Kademlia "push-model".
-///      These records are subject to re-replication and re-publication as
+///   1. Regular (value-)records. These records store an arbitrary value associated with a key which
+///      is distributed to the closest nodes to the key in the Kademlia DHT as per the standard
+///      Kademlia "push-model". These records are subject to re-replication and re-publication as
 ///      per the standard Kademlia protocol.
 ///
-///   2. Provider records. These records associate the ID of a peer with a key
-///      who can supposedly provide the associated value. These records are
-///      mere "pointers" to the data which may be followed by contacting these
-///      providers to obtain the value. These records are specific to the
-///      libp2p Kademlia specification and realise a "pull-model" for distributed
-///      content. Just like a regular record, a provider record is distributed
-///      to the closest nodes to the key.
-///
+///   2. Provider records. These records associate the ID of a peer with a key who can supposedly
+///      provide the associated value. These records are mere "pointers" to the data which may be
+///      followed by contacting these providers to obtain the value. These records are specific to
+///      the libp2p Kademlia specification and realise a "pull-model" for distributed content. Just
+///      like a regular record, a provider record is distributed to the closest nodes to the key.
 pub trait RecordStore {
     type RecordsIter<'a>: Iterator<Item = Cow<'a, Record>>
     where
diff --git a/protocols/kad/src/record/store/memory.rs b/protocols/kad/src/record/store/memory.rs
index 3fb6d2be3e8..28f6a55044f 100644
--- a/protocols/kad/src/record/store/memory.rs
+++ b/protocols/kad/src/record/store/memory.rs
@@ -18,12 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::*;
+use std::{
+    collections::{hash_map, hash_set, HashMap, HashSet},
+    iter,
+};
 
-use crate::kbucket;
 use smallvec::SmallVec;
-use std::collections::{hash_map, hash_set, HashMap, HashSet};
-use std::iter;
+
+use super::*;
+use crate::kbucket;
 
 /// In-memory implementation of a `RecordStore`.
 pub struct MemoryStore {
@@ -208,11 +211,12 @@ impl RecordStore for MemoryStore {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::SHA_256_MH;
     use quickcheck::*;
     use rand::Rng;
 
+    use super::*;
+    use crate::SHA_256_MH;
+
     fn random_multihash() -> Multihash<64> {
         Multihash::wrap(SHA_256_MH, &rand::thread_rng().gen::<[u8; 32]>()).unwrap()
     }
diff --git a/protocols/kad/tests/client_mode.rs b/protocols/kad/tests/client_mode.rs
index 2c8d11beac7..3275c525890 100644
--- a/protocols/kad/tests/client_mode.rs
+++ b/protocols/kad/tests/client_mode.rs
@@ -1,7 +1,6 @@
 use libp2p_identify as identify;
 use libp2p_identity as identity;
-use libp2p_kad::store::MemoryStore;
-use libp2p_kad::{Behaviour, Config, Event, Mode};
+use libp2p_kad::{store::MemoryStore, Behaviour, Config, Event, Mode};
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use tracing_subscriber::EnvFilter;
@@ -104,7 +103,9 @@ async fn adding_an_external_addresses_activates_server_mode_on_existing_connecti
     // Server learns its external address (this could be through AutoNAT or some other mechanism).
     server.add_external_address(memory_addr);
 
-    // The server reconfigured its connection to the client to be in server mode, pushes that information to client which as a result updates its routing table and triggers a mode change to Mode::Server.
+    // The server reconfigured its connection to the client to be in server mode,
+    // pushes that information to client which as a result updates its routing
+    // table and triggers a mode change to Mode::Server.
     match libp2p_swarm_test::drive(&mut client, &mut server).await {
         (
             [Identify(identify::Event::Received { .. }), Kad(RoutingUpdated { peer: peer1, .. })],
diff --git a/protocols/mdns/src/behaviour.rs b/protocols/mdns/src/behaviour.rs
index cecd27bf78b..b6dde8f4487 100644
--- a/protocols/mdns/src/behaviour.rs
+++ b/protocols/mdns/src/behaviour.rs
@@ -22,25 +22,34 @@ mod iface;
 mod socket;
 mod timer;
 
-use self::iface::InterfaceState;
-use crate::behaviour::{socket::AsyncSocket, timer::Builder};
-use crate::Config;
-use futures::channel::mpsc;
-use futures::{Stream, StreamExt};
+use std::{
+    cmp,
+    collections::hash_map::{Entry, HashMap},
+    fmt,
+    future::Future,
+    io,
+    net::IpAddr,
+    pin::Pin,
+    sync::{Arc, RwLock},
+    task::{Context, Poll},
+    time::Instant,
+};
+
+use futures::{channel::mpsc, Stream, StreamExt};
 use if_watch::IfEvent;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::behaviour::FromSwarm;
 use libp2p_swarm::{
-    dummy, ConnectionDenied, ConnectionId, ListenAddresses, NetworkBehaviour, THandler,
-    THandlerInEvent, THandlerOutEvent, ToSwarm,
+    behaviour::FromSwarm, dummy, ConnectionDenied, ConnectionId, ListenAddresses, NetworkBehaviour,
+    THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use smallvec::SmallVec;
-use std::collections::hash_map::{Entry, HashMap};
-use std::future::Future;
-use std::sync::{Arc, RwLock};
-use std::{cmp, fmt, io, net::IpAddr, pin::Pin, task::Context, task::Poll, time::Instant};
+
+use self::iface::InterfaceState;
+use crate::{
+    behaviour::{socket::AsyncSocket, timer::Builder},
+    Config,
+};
 
 /// An abstraction to allow for compatibility with various async runtimes.
 pub trait Provider: 'static {
@@ -68,11 +77,13 @@ pub trait Abort {
 /// The type of a [`Behaviour`] using the `async-io` implementation.
 #[cfg(feature = "async-io")]
 pub mod async_io {
-    use super::Provider;
-    use crate::behaviour::{socket::asio::AsyncUdpSocket, timer::asio::AsyncTimer, Abort};
+    use std::future::Future;
+
     use async_std::task::JoinHandle;
     use if_watch::smol::IfWatcher;
-    use std::future::Future;
+
+    use super::Provider;
+    use crate::behaviour::{socket::asio::AsyncUdpSocket, timer::asio::AsyncTimer, Abort};
 
     #[doc(hidden)]
     pub enum AsyncIo {}
@@ -104,12 +115,14 @@ pub mod async_io {
 /// The type of a [`Behaviour`] using the `tokio` implementation.
 #[cfg(feature = "tokio")]
 pub mod tokio {
-    use super::Provider;
-    use crate::behaviour::{socket::tokio::TokioUdpSocket, timer::tokio::TokioTimer, Abort};
-    use if_watch::tokio::IfWatcher;
     use std::future::Future;
+
+    use if_watch::tokio::IfWatcher;
     use tokio::task::JoinHandle;
 
+    use super::Provider;
+    use crate::behaviour::{socket::tokio::TokioUdpSocket, timer::tokio::TokioTimer, Abort};
+
     #[doc(hidden)]
     pub enum Tokio {}
 
@@ -170,7 +183,8 @@ where
     /// The current set of listen addresses.
     ///
     /// This is shared across all interface tasks using an [`RwLock`].
-    /// The [`Behaviour`] updates this upon new [`FromSwarm`] events where as [`InterfaceState`]s read from it to answer inbound mDNS queries.
+    /// The [`Behaviour`] updates this upon new [`FromSwarm`]
+    /// events where as [`InterfaceState`]s read from it to answer inbound mDNS queries.
     listen_addresses: Arc<RwLock<ListenAddresses>>,
 
     local_peer_id: PeerId,
diff --git a/protocols/mdns/src/behaviour/iface.rs b/protocols/mdns/src/behaviour/iface.rs
index 9302065cde2..873bb8a307b 100644
--- a/protocols/mdns/src/behaviour/iface.rs
+++ b/protocols/mdns/src/behaviour/iface.rs
@@ -21,27 +21,32 @@
 mod dns;
 mod query;
 
-use self::dns::{build_query, build_query_response, build_service_discovery_response};
-use self::query::MdnsPacket;
-use crate::behaviour::{socket::AsyncSocket, timer::Builder};
-use crate::Config;
-use futures::channel::mpsc;
-use futures::{SinkExt, StreamExt};
-use libp2p_core::Multiaddr;
-use libp2p_identity::PeerId;
-use libp2p_swarm::ListenAddresses;
-use socket2::{Domain, Socket, Type};
-use std::future::Future;
-use std::sync::{Arc, RwLock};
 use std::{
     collections::VecDeque,
+    future::Future,
     io,
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket},
     pin::Pin,
+    sync::{Arc, RwLock},
     task::{Context, Poll},
     time::{Duration, Instant},
 };
 
+use futures::{channel::mpsc, SinkExt, StreamExt};
+use libp2p_core::Multiaddr;
+use libp2p_identity::PeerId;
+use libp2p_swarm::ListenAddresses;
+use socket2::{Domain, Socket, Type};
+
+use self::{
+    dns::{build_query, build_query_response, build_service_discovery_response},
+    query::MdnsPacket,
+};
+use crate::{
+    behaviour::{socket::AsyncSocket, timer::Builder},
+    Config,
+};
+
 /// Initial interval for starting probe
 const INITIAL_TIMEOUT_INTERVAL: Duration = Duration::from_millis(500);
 
diff --git a/protocols/mdns/src/behaviour/iface/dns.rs b/protocols/mdns/src/behaviour/iface/dns.rs
index 39dbf08c731..35cba44f4af 100644
--- a/protocols/mdns/src/behaviour/iface/dns.rs
+++ b/protocols/mdns/src/behaviour/iface/dns.rs
@@ -20,12 +20,13 @@
 
 //! (M)DNS encoding and decoding on top of the `dns_parser` library.
 
-use crate::{META_QUERY_SERVICE, SERVICE_NAME};
+use std::{borrow::Cow, cmp, error, fmt, str, time::Duration};
+
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
-use rand::distributions::Alphanumeric;
-use rand::{thread_rng, Rng};
-use std::{borrow::Cow, cmp, error, fmt, str, time::Duration};
+use rand::{distributions::Alphanumeric, thread_rng, Rng};
+
+use crate::{META_QUERY_SERVICE, SERVICE_NAME};
 
 /// DNS TXT records can have up to 255 characters as a single string value.
 ///
@@ -293,7 +294,6 @@ fn generate_peer_name() -> Vec<u8> {
 /// Panics if `name` has a zero-length component or a component that is too long.
 /// This is fine considering that this function is not public and is only called in a controlled
 /// environment.
-///
 fn append_qname(out: &mut Vec<u8>, name: &[u8]) {
     debug_assert!(name.is_ascii());
 
@@ -394,10 +394,11 @@ impl error::Error for MdnsResponseError {}
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use hickory_proto::op::Message;
     use libp2p_identity as identity;
 
+    use super::*;
+
     #[test]
     fn build_query_correct() {
         let query = build_query();
diff --git a/protocols/mdns/src/behaviour/iface/query.rs b/protocols/mdns/src/behaviour/iface/query.rs
index 70b84816d0f..7762ac5d214 100644
--- a/protocols/mdns/src/behaviour/iface/query.rs
+++ b/protocols/mdns/src/behaviour/iface/query.rs
@@ -18,18 +18,23 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::dns;
-use crate::{META_QUERY_SERVICE_FQDN, SERVICE_NAME_FQDN};
+use std::{
+    fmt,
+    net::SocketAddr,
+    str,
+    time::{Duration, Instant},
+};
+
 use hickory_proto::{
     op::Message,
     rr::{Name, RData},
 };
 use libp2p_core::multiaddr::{Multiaddr, Protocol};
+use libp2p_identity::PeerId;
 use libp2p_swarm::_address_translation;
 
-use libp2p_identity::PeerId;
-use std::time::Instant;
-use std::{fmt, net::SocketAddr, str, time::Duration};
+use super::dns;
+use crate::{META_QUERY_SERVICE_FQDN, SERVICE_NAME_FQDN};
 
 /// A valid mDNS packet received by the service.
 #[derive(Debug)]
@@ -69,7 +74,8 @@ impl MdnsPacket {
             .iter()
             .any(|q| q.name().to_utf8() == META_QUERY_SERVICE_FQDN)
         {
-            // TODO: what if multiple questions, one with SERVICE_NAME and one with META_QUERY_SERVICE?
+            // TODO: what if multiple questions,
+            // one with SERVICE_NAME and one with META_QUERY_SERVICE?
             return Ok(Some(MdnsPacket::ServiceDiscovery(MdnsServiceDiscovery {
                 from,
                 query_id: packet.header().id(),
@@ -307,8 +313,7 @@ impl fmt::Debug for MdnsPeer {
 
 #[cfg(test)]
 mod tests {
-    use super::super::dns::build_query_response;
-    use super::*;
+    use super::{super::dns::build_query_response, *};
 
     #[test]
     fn test_create_mdns_peer() {
diff --git a/protocols/mdns/src/behaviour/socket.rs b/protocols/mdns/src/behaviour/socket.rs
index ebaad17e45f..cf11450fb4b 100644
--- a/protocols/mdns/src/behaviour/socket.rs
+++ b/protocols/mdns/src/behaviour/socket.rs
@@ -24,7 +24,8 @@ use std::{
     task::{Context, Poll},
 };
 
-/// Interface that must be implemented by the different runtimes to use the [`UdpSocket`] in async mode
+/// Interface that must be implemented by the different runtimes to use the [`UdpSocket`] in async
+/// mode
 #[allow(unreachable_pub)] // Users should not depend on this.
 pub trait AsyncSocket: Unpin + Send + 'static {
     /// Create the async socket from the [`std::net::UdpSocket`]
@@ -32,7 +33,8 @@ pub trait AsyncSocket: Unpin + Send + 'static {
     where
         Self: Sized;
 
-    /// Attempts to receive a single packet on the socket from the remote address to which it is connected.
+    /// Attempts to receive a single packet on the socket
+    /// from the remote address to which it is connected.
     fn poll_read(
         &mut self,
         _cx: &mut Context,
@@ -50,10 +52,11 @@ pub trait AsyncSocket: Unpin + Send + 'static {
 
 #[cfg(feature = "async-io")]
 pub(crate) mod asio {
-    use super::*;
     use async_io::Async;
     use futures::FutureExt;
 
+    use super::*;
+
     /// AsyncIo UdpSocket
     pub(crate) type AsyncUdpSocket = Async<UdpSocket>;
     impl AsyncSocket for AsyncUdpSocket {
@@ -92,9 +95,10 @@ pub(crate) mod asio {
 
 #[cfg(feature = "tokio")]
 pub(crate) mod tokio {
-    use super::*;
     use ::tokio::{io::ReadBuf, net::UdpSocket as TkUdpSocket};
 
+    use super::*;
+
     /// Tokio ASync Socket`
     pub(crate) type TokioUdpSocket = TkUdpSocket;
     impl AsyncSocket for TokioUdpSocket {
diff --git a/protocols/mdns/src/behaviour/timer.rs b/protocols/mdns/src/behaviour/timer.rs
index 5e284654676..5fdb1beffae 100644
--- a/protocols/mdns/src/behaviour/timer.rs
+++ b/protocols/mdns/src/behaviour/timer.rs
@@ -42,14 +42,16 @@ pub trait Builder: Send + Unpin + 'static {
 
 #[cfg(feature = "async-io")]
 pub(crate) mod asio {
-    use super::*;
-    use async_io::Timer as AsioTimer;
-    use futures::Stream;
     use std::{
         pin::Pin,
         task::{Context, Poll},
     };
 
+    use async_io::Timer as AsioTimer;
+    use futures::Stream;
+
+    use super::*;
+
     /// Async Timer
     pub(crate) type AsyncTimer = Timer<AsioTimer>;
     impl Builder for AsyncTimer {
@@ -83,14 +85,16 @@ pub(crate) mod asio {
 
 #[cfg(feature = "tokio")]
 pub(crate) mod tokio {
-    use super::*;
-    use ::tokio::time::{self, Instant as TokioInstant, Interval, MissedTickBehavior};
-    use futures::Stream;
     use std::{
         pin::Pin,
         task::{Context, Poll},
     };
 
+    use ::tokio::time::{self, Instant as TokioInstant, Interval, MissedTickBehavior};
+    use futures::Stream;
+
+    use super::*;
+
     /// Tokio wrapper
     pub(crate) type TokioTimer = Timer<Interval>;
     impl Builder for TokioTimer {
diff --git a/protocols/mdns/src/lib.rs b/protocols/mdns/src/lib.rs
index 4823d740272..a0086a0e2d5 100644
--- a/protocols/mdns/src/lib.rs
+++ b/protocols/mdns/src/lib.rs
@@ -31,21 +31,20 @@
 //! This crate provides a `Mdns` and `TokioMdns`, depending on the enabled features, which
 //! implements the `NetworkBehaviour` trait. This struct will automatically discover other
 //! libp2p nodes on the local network.
-//!
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-use std::net::{Ipv4Addr, Ipv6Addr};
-use std::time::Duration;
+use std::{
+    net::{Ipv4Addr, Ipv6Addr},
+    time::Duration,
+};
 
 mod behaviour;
-pub use crate::behaviour::{Behaviour, Event};
-
 #[cfg(feature = "async-io")]
 pub use crate::behaviour::async_io;
-
 #[cfg(feature = "tokio")]
 pub use crate::behaviour::tokio;
+pub use crate::behaviour::{Behaviour, Event};
 
 /// The DNS service name for all libp2p peers used to query for addresses.
 const SERVICE_NAME: &[u8] = b"_p2p._udp.local";
diff --git a/protocols/mdns/tests/use-async-std.rs b/protocols/mdns/tests/use-async-std.rs
index 549f70978af..df08b39af07 100644
--- a/protocols/mdns/tests/use-async-std.rs
+++ b/protocols/mdns/tests/use-async-std.rs
@@ -18,12 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.use futures::StreamExt;
 
+use std::time::Duration;
+
 use futures::future::Either;
-use libp2p_mdns::Event;
-use libp2p_mdns::{async_io::Behaviour, Config};
+use libp2p_mdns::{async_io::Behaviour, Config, Event};
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
diff --git a/protocols/mdns/tests/use-tokio.rs b/protocols/mdns/tests/use-tokio.rs
index cf0d9f4bed4..0ec90a52b90 100644
--- a/protocols/mdns/tests/use-tokio.rs
+++ b/protocols/mdns/tests/use-tokio.rs
@@ -17,11 +17,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.use futures::StreamExt;
+use std::time::Duration;
+
 use futures::future::Either;
 use libp2p_mdns::{tokio::Behaviour, Config, Event};
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
diff --git a/protocols/perf/src/bin/perf.rs b/protocols/perf/src/bin/perf.rs
index 9a4cfb8bcac..506455f081a 100644
--- a/protocols/perf/src/bin/perf.rs
+++ b/protocols/perf/src/bin/perf.rs
@@ -23,12 +23,13 @@ use std::{net::SocketAddr, str::FromStr};
 use anyhow::{bail, Result};
 use clap::Parser;
 use futures::StreamExt;
-use libp2p::core::{multiaddr::Protocol, upgrade, Multiaddr};
-use libp2p::identity::PeerId;
-use libp2p::swarm::{NetworkBehaviour, Swarm, SwarmEvent};
-use libp2p::SwarmBuilder;
-use libp2p_perf::{client, server};
-use libp2p_perf::{Final, Intermediate, Run, RunParams, RunUpdate};
+use libp2p::{
+    core::{multiaddr::Protocol, upgrade, Multiaddr},
+    identity::PeerId,
+    swarm::{NetworkBehaviour, Swarm, SwarmEvent},
+    SwarmBuilder,
+};
+use libp2p_perf::{client, server, Final, Intermediate, Run, RunParams, RunUpdate};
 use serde::{Deserialize, Serialize};
 use tracing_subscriber::EnvFilter;
 use web_time::{Duration, Instant};
diff --git a/protocols/perf/src/client.rs b/protocols/perf/src/client.rs
index 9f984a5bba1..7699bc85c17 100644
--- a/protocols/perf/src/client.rs
+++ b/protocols/perf/src/client.rs
@@ -21,11 +21,13 @@
 mod behaviour;
 mod handler;
 
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::{
+    convert::Infallible,
+    sync::atomic::{AtomicUsize, Ordering},
+};
 
 pub use behaviour::{Behaviour, Event};
 use libp2p_swarm::StreamUpgradeError;
-use std::convert::Infallible;
 
 static NEXT_RUN_ID: AtomicUsize = AtomicUsize::new(1);
 
diff --git a/protocols/perf/src/client/behaviour.rs b/protocols/perf/src/client/behaviour.rs
index 1b181557acc..86c85d61da9 100644
--- a/protocols/perf/src/client/behaviour.rs
+++ b/protocols/perf/src/client/behaviour.rs
@@ -32,10 +32,8 @@ use libp2p_swarm::{
     NetworkBehaviour, NotifyHandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 
-use crate::RunParams;
-use crate::{client::handler::Handler, RunUpdate};
-
 use super::{RunError, RunId};
+use crate::{client::handler::Handler, RunParams, RunUpdate};
 
 #[derive(Debug)]
 pub struct Event {
diff --git a/protocols/perf/src/client/handler.rs b/protocols/perf/src/client/handler.rs
index 85e864949f8..fc427d8134c 100644
--- a/protocols/perf/src/client/handler.rs
+++ b/protocols/perf/src/client/handler.rs
@@ -36,8 +36,10 @@ use libp2p_swarm::{
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
 };
 
-use crate::client::{RunError, RunId};
-use crate::{RunParams, RunUpdate};
+use crate::{
+    client::{RunError, RunId},
+    RunParams, RunUpdate,
+};
 
 #[derive(Debug)]
 pub struct Command {
diff --git a/protocols/perf/src/protocol.rs b/protocols/perf/src/protocol.rs
index f995bbe2d3b..d07c90fa951 100644
--- a/protocols/perf/src/protocol.rs
+++ b/protocols/perf/src/protocol.rs
@@ -18,14 +18,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures_timer::Delay;
 use std::time::Duration;
-use web_time::Instant;
 
 use futures::{
     future::{select, Either},
     AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, FutureExt, SinkExt, Stream, StreamExt,
 };
+use futures_timer::Delay;
+use web_time::Instant;
 
 use crate::{Final, Intermediate, Run, RunDuration, RunParams, RunUpdate};
 
diff --git a/protocols/perf/src/server/behaviour.rs b/protocols/perf/src/server/behaviour.rs
index 5408029e85d..22466bfe56a 100644
--- a/protocols/perf/src/server/behaviour.rs
+++ b/protocols/perf/src/server/behaviour.rs
@@ -31,8 +31,7 @@ use libp2p_swarm::{
     ConnectionId, FromSwarm, NetworkBehaviour, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 
-use crate::server::handler::Handler;
-use crate::Run;
+use crate::{server::handler::Handler, Run};
 
 #[derive(Debug)]
 pub struct Event {
diff --git a/protocols/perf/src/server/handler.rs b/protocols/perf/src/server/handler.rs
index c1363ae2380..a78485cd9b5 100644
--- a/protocols/perf/src/server/handler.rs
+++ b/protocols/perf/src/server/handler.rs
@@ -18,7 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::task::{Context, Poll};
+use std::{
+    convert::Infallible,
+    task::{Context, Poll},
+};
 
 use futures::FutureExt;
 use libp2p_core::upgrade::{DeniedUpgrade, ReadyUpgrade};
@@ -29,7 +32,6 @@ use libp2p_swarm::{
     },
     ConnectionHandler, ConnectionHandlerEvent, StreamProtocol, SubstreamProtocol,
 };
-use std::convert::Infallible;
 use tracing::error;
 
 use crate::Run;
diff --git a/protocols/ping/src/handler.rs b/protocols/ping/src/handler.rs
index 961716e934a..c7d65c64500 100644
--- a/protocols/ping/src/handler.rs
+++ b/protocols/ping/src/handler.rs
@@ -18,27 +18,29 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{protocol, PROTOCOL_NAME};
-use futures::future::{BoxFuture, Either};
-use futures::prelude::*;
-use futures_timer::Delay;
-use libp2p_core::upgrade::ReadyUpgrade;
-use libp2p_swarm::handler::{
-    ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
-};
-use libp2p_swarm::{
-    ConnectionHandler, ConnectionHandlerEvent, Stream, StreamProtocol, StreamUpgradeError,
-    SubstreamProtocol,
-};
-use std::collections::VecDeque;
-use std::convert::Infallible;
 use std::{
+    collections::VecDeque,
+    convert::Infallible,
     error::Error,
     fmt, io,
     task::{Context, Poll},
     time::Duration,
 };
 
+use futures::{
+    future::{BoxFuture, Either},
+    prelude::*,
+};
+use futures_timer::Delay;
+use libp2p_core::upgrade::ReadyUpgrade;
+use libp2p_swarm::{
+    handler::{ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound},
+    ConnectionHandler, ConnectionHandlerEvent, Stream, StreamProtocol, StreamUpgradeError,
+    SubstreamProtocol,
+};
+
+use crate::{protocol, PROTOCOL_NAME};
+
 /// The configuration for outbound pings.
 #[derive(Debug, Clone)]
 pub struct Config {
@@ -57,8 +59,7 @@ impl Config {
     /// These settings have the following effect:
     ///
     ///   * A ping is sent every 15 seconds on a healthy connection.
-    ///   * Every ping sent must yield a response within 20 seconds in order to
-    ///     be successful.
+    ///   * Every ping sent must yield a response within 20 seconds in order to be successful.
     pub fn new() -> Self {
         Self {
             timeout: Duration::from_secs(20),
diff --git a/protocols/ping/src/lib.rs b/protocols/ping/src/lib.rs
index 82f240cab6b..d48bcbc98ab 100644
--- a/protocols/ping/src/lib.rs
+++ b/protocols/ping/src/lib.rs
@@ -27,9 +27,11 @@
 //! # Usage
 //!
 //! The [`Behaviour`] struct implements the [`NetworkBehaviour`] trait.
-//! It will respond to inbound ping requests and periodically send outbound ping requests on every established connection.
+//! It will respond to inbound ping requests and periodically send outbound ping requests on every
+//! established connection.
 //!
-//! It is up to the user to implement a health-check / connection management policy based on the ping protocol.
+//! It is up to the user to implement a health-check / connection management policy based on the
+//! ping protocol.
 //!
 //! For example:
 //!
@@ -39,8 +41,10 @@
 //!
 //! Users should inspect emitted [`Event`]s and call APIs on [`Swarm`]:
 //!
-//! - [`Swarm::close_connection`](libp2p_swarm::Swarm::close_connection) to close a specific connection
-//! - [`Swarm::disconnect_peer_id`](libp2p_swarm::Swarm::disconnect_peer_id) to close all connections to a peer
+//! - [`Swarm::close_connection`](libp2p_swarm::Swarm::close_connection) to close a specific
+//!   connection
+//! - [`Swarm::disconnect_peer_id`](libp2p_swarm::Swarm::disconnect_peer_id) to close all
+//!   connections to a peer
 //!
 //! [`Swarm`]: libp2p_swarm::Swarm
 //! [`Transport`]: libp2p_core::Transport
@@ -50,22 +54,22 @@
 mod handler;
 mod protocol;
 
+use std::{
+    collections::VecDeque,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use handler::Handler;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+pub use handler::{Config, Failure};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
     behaviour::FromSwarm, ConnectionDenied, ConnectionId, NetworkBehaviour, THandler,
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use std::time::Duration;
-use std::{
-    collections::VecDeque,
-    task::{Context, Poll},
-};
 
 pub use self::protocol::PROTOCOL_NAME;
-pub use handler::{Config, Failure};
 
 /// A [`NetworkBehaviour`] that responds to inbound pings and
 /// periodically sends outbound pings on every established connection.
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
index 101c219aac4..5e84f55e090 100644
--- a/protocols/ping/src/protocol.rs
+++ b/protocols/ping/src/protocol.rs
@@ -18,10 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{io, time::Duration};
+
 use futures::prelude::*;
 use libp2p_swarm::StreamProtocol;
 use rand::{distributions, prelude::*};
-use std::{io, time::Duration};
 use web_time::Instant;
 
 pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0");
@@ -40,10 +41,10 @@ pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0"
 /// Successful pings report the round-trip time.
 ///
 /// > **Note**: The round-trip time of a ping may be subject to delays induced
-/// >           by the underlying transport, e.g. in the case of TCP there is
-/// >           Nagle's algorithm, delayed acks and similar configuration options
-/// >           which can affect latencies especially on otherwise low-volume
-/// >           connections.
+/// > by the underlying transport, e.g. in the case of TCP there is
+/// > Nagle's algorithm, delayed acks and similar configuration options
+/// > which can affect latencies especially on otherwise low-volume
+/// > connections.
 const PING_SIZE: usize = 32;
 
 /// Sends a ping and waits for the pong.
@@ -81,7 +82,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use futures::StreamExt;
     use libp2p_core::{
         multiaddr::multiaddr,
@@ -89,6 +89,8 @@ mod tests {
         Endpoint,
     };
 
+    use super::*;
+
     #[tokio::test]
     async fn ping_pong() {
         let mem_addr = multiaddr![Memory(thread_rng().gen::<u64>())];
diff --git a/protocols/ping/tests/ping.rs b/protocols/ping/tests/ping.rs
index 0752b1fced9..210f9435e4a 100644
--- a/protocols/ping/tests/ping.rs
+++ b/protocols/ping/tests/ping.rs
@@ -20,12 +20,12 @@
 
 //! Integration tests for the `Ping` network behaviour.
 
+use std::{num::NonZeroU8, time::Duration};
+
 use libp2p_ping as ping;
-use libp2p_swarm::dummy;
-use libp2p_swarm::{Swarm, SwarmEvent};
+use libp2p_swarm::{dummy, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use quickcheck::*;
-use std::{num::NonZeroU8, time::Duration};
 
 #[tokio::test]
 async fn ping_pong() {
diff --git a/protocols/relay/src/behaviour.rs b/protocols/relay/src/behaviour.rs
index e854ed2a1ff..968642b3f1f 100644
--- a/protocols/relay/src/behaviour.rs
+++ b/protocols/relay/src/behaviour.rs
@@ -22,27 +22,31 @@
 
 pub(crate) mod handler;
 pub(crate) mod rate_limiter;
-use crate::behaviour::handler::Handler;
-use crate::multiaddr_ext::MultiaddrExt;
-use crate::proto;
-use crate::protocol::{inbound_hop, outbound_stop};
+use std::{
+    collections::{hash_map, HashMap, HashSet, VecDeque},
+    num::NonZeroU32,
+    ops::Add,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use either::Either;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{ConnectedPoint, Endpoint, Multiaddr};
+use libp2p_core::{multiaddr::Protocol, transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::behaviour::{ConnectionClosed, FromSwarm};
 use libp2p_swarm::{
+    behaviour::{ConnectionClosed, FromSwarm},
     dummy, ConnectionDenied, ConnectionId, ExternalAddresses, NetworkBehaviour, NotifyHandler,
     THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use std::collections::{hash_map, HashMap, HashSet, VecDeque};
-use std::num::NonZeroU32;
-use std::ops::Add;
-use std::task::{Context, Poll};
-use std::time::Duration;
 use web_time::Instant;
 
+use crate::{
+    behaviour::handler::Handler,
+    multiaddr_ext::MultiaddrExt,
+    proto,
+    protocol::{inbound_hop, outbound_stop},
+};
+
 /// Configuration for the relay [`Behaviour`].
 ///
 /// # Panics
@@ -120,12 +124,14 @@ impl std::fmt::Debug for Config {
 impl Default for Config {
     fn default() -> Self {
         let reservation_rate_limiters = vec![
-            // For each peer ID one reservation every 2 minutes with up to 30 reservations per hour.
+            // For each peer ID one reservation every 2 minutes with up
+            // to 30 reservations per hour.
             rate_limiter::new_per_peer(rate_limiter::GenericRateLimiterConfig {
                 limit: NonZeroU32::new(30).expect("30 > 0"),
                 interval: Duration::from_secs(60 * 2),
             }),
-            // For each IP address one reservation every minute with up to 60 reservations per hour.
+            // For each IP address one reservation every minute with up
+            // to 60 reservations per hour.
             rate_limiter::new_per_ip(rate_limiter::GenericRateLimiterConfig {
                 limit: NonZeroU32::new(60).expect("60 > 0"),
                 interval: Duration::from_secs(60),
@@ -386,7 +392,8 @@ impl NetworkBehaviour for Behaviour {
                 );
 
                 let action = if
-                // Deny if it is a new reservation and exceeds `max_reservations_per_peer`.
+                // Deny if it is a new reservation and exceeds
+                // `max_reservations_per_peer`.
                 (!renewed
                     && self
                         .reservations
diff --git a/protocols/relay/src/behaviour/handler.rs b/protocols/relay/src/behaviour/handler.rs
index 92e45720f3f..0a4fe11c00a 100644
--- a/protocols/relay/src/behaviour/handler.rs
+++ b/protocols/relay/src/behaviour/handler.rs
@@ -18,32 +18,38 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::behaviour::CircuitId;
-use crate::copy_future::CopyFuture;
-use crate::protocol::{inbound_hop, outbound_stop};
-use crate::{proto, HOP_PROTOCOL_NAME, STOP_PROTOCOL_NAME};
+use std::{
+    collections::{HashMap, VecDeque},
+    fmt, io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 use bytes::Bytes;
 use either::Either;
-use futures::future::{BoxFuture, FutureExt, TryFutureExt};
-use futures::io::AsyncWriteExt;
-use futures::stream::{FuturesUnordered, StreamExt};
+use futures::{
+    future::{BoxFuture, FutureExt, TryFutureExt},
+    io::AsyncWriteExt,
+    stream::{FuturesUnordered, StreamExt},
+};
 use futures_timer::Delay;
-use libp2p_core::upgrade::ReadyUpgrade;
-use libp2p_core::{ConnectedPoint, Multiaddr};
+use libp2p_core::{upgrade::ReadyUpgrade, ConnectedPoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::handler::{
-    ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
-};
 use libp2p_swarm::{
+    handler::{ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound},
     ConnectionHandler, ConnectionHandlerEvent, ConnectionId, Stream, StreamProtocol,
     StreamUpgradeError, SubstreamProtocol,
 };
-use std::collections::{HashMap, VecDeque};
-use std::task::{Context, Poll};
-use std::time::Duration;
-use std::{fmt, io};
 use web_time::Instant;
 
+use crate::{
+    behaviour::CircuitId,
+    copy_future::CopyFuture,
+    proto,
+    protocol::{inbound_hop, outbound_stop},
+    HOP_PROTOCOL_NAME, STOP_PROTOCOL_NAME,
+};
+
 const MAX_CONCURRENT_STREAMS_PER_CONNECTION: usize = 10;
 const STREAM_TIMEOUT: Duration = Duration::from_secs(60);
 
diff --git a/protocols/relay/src/behaviour/rate_limiter.rs b/protocols/relay/src/behaviour/rate_limiter.rs
index 45b701c1b50..4b97c3d5090 100644
--- a/protocols/relay/src/behaviour/rate_limiter.rs
+++ b/protocols/relay/src/behaviour/rate_limiter.rs
@@ -18,18 +18,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    collections::{HashMap, VecDeque},
+    hash::Hash,
+    net::IpAddr,
+    num::NonZeroU32,
+    time::Duration,
+};
+
 use libp2p_core::multiaddr::{Multiaddr, Protocol};
 use libp2p_identity::PeerId;
-use std::collections::{HashMap, VecDeque};
-use std::hash::Hash;
-use std::net::IpAddr;
-use std::num::NonZeroU32;
-use std::time::Duration;
 use web_time::Instant;
 
 /// Allows rate limiting access to some resource based on the [`PeerId`] and
 /// [`Multiaddr`] of a remote peer.
-//
 // See [`new_per_peer`] and [`new_per_ip`] for precast implementations. Use
 // [`GenericRateLimiter`] to build your own, e.g. based on the autonomous system
 // number of a peers IP address.
@@ -170,9 +172,10 @@ impl<Id: Eq + PartialEq + Hash + Clone> GenericRateLimiter<Id> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use quickcheck::{QuickCheck, TestResult};
 
+    use super::*;
+
     #[test]
     fn first() {
         let id = 1;
diff --git a/protocols/relay/src/copy_future.rs b/protocols/relay/src/copy_future.rs
index c0039c29534..ae7ef22d648 100644
--- a/protocols/relay/src/copy_future.rs
+++ b/protocols/relay/src/copy_future.rs
@@ -24,16 +24,19 @@
 //!
 //! Inspired by [`futures::io::Copy`].
 
-use futures::future::Future;
-use futures::future::FutureExt;
-use futures::io::{AsyncBufRead, BufReader};
-use futures::io::{AsyncRead, AsyncWrite};
-use futures::ready;
+use std::{
+    io,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{
+    future::{Future, FutureExt},
+    io::{AsyncBufRead, AsyncRead, AsyncWrite, BufReader},
+    ready,
+};
 use futures_timer::Delay;
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
 
 pub(crate) struct CopyFuture<S, D> {
     src: BufReader<S>,
@@ -161,12 +164,13 @@ fn forward_data<S: AsyncBufRead + Unpin, D: AsyncWrite + Unpin>(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use futures::executor::block_on;
-    use futures::io::BufWriter;
-    use quickcheck::QuickCheck;
     use std::io::ErrorKind;
 
+    use futures::{executor::block_on, io::BufWriter};
+    use quickcheck::QuickCheck;
+
+    use super::*;
+
     #[test]
     fn quickcheck() {
         struct Connection {
@@ -356,13 +360,14 @@ mod tests {
             }
         }
 
-        // The source has two reads available, handing them out on `AsyncRead::poll_read` one by one.
+        // The source has two reads available, handing them out
+        // on `AsyncRead::poll_read` one by one.
         let mut source = BufReader::new(NeverEndingSource { read: vec![1, 2] });
 
         // The destination is wrapped by a `BufWriter` with a capacity of `3`, i.e. one larger than
         // the available reads of the source. Without an explicit `AsyncWrite::poll_flush` the two
-        // reads would thus never make it to the destination, but instead be stuck in the buffer of
-        // the `BufWrite`.
+        // reads would thus never make it to the destination,
+        // but instead be stuck in the buffer of the `BufWrite`.
         let mut destination = BufWriter::with_capacity(
             3,
             RecordingDestination {
diff --git a/protocols/relay/src/lib.rs b/protocols/relay/src/lib.rs
index eca3578d599..dba07015765 100644
--- a/protocols/relay/src/lib.rs
+++ b/protocols/relay/src/lib.rs
@@ -32,10 +32,10 @@ mod protocol;
 mod proto {
     #![allow(unreachable_pub)]
     include!("generated/mod.rs");
-    pub(crate) use self::message_v2::pb::mod_HopMessage::Type as HopMessageType;
     pub use self::message_v2::pb::mod_StopMessage::Type as StopMessageType;
     pub(crate) use self::message_v2::pb::{
-        HopMessage, Limit, Peer, Reservation, Status, StopMessage,
+        mod_HopMessage::Type as HopMessageType, HopMessage, Limit, Peer, Reservation, Status,
+        StopMessage,
     };
 }
 
diff --git a/protocols/relay/src/multiaddr_ext.rs b/protocols/relay/src/multiaddr_ext.rs
index 6991a8b9ded..7c06eb7eab0 100644
--- a/protocols/relay/src/multiaddr_ext.rs
+++ b/protocols/relay/src/multiaddr_ext.rs
@@ -1,5 +1,4 @@
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::Multiaddr;
+use libp2p_core::{multiaddr::Protocol, Multiaddr};
 
 pub(crate) trait MultiaddrExt {
     fn is_relayed(&self) -> bool;
diff --git a/protocols/relay/src/priv_client.rs b/protocols/relay/src/priv_client.rs
index fc9d28e66ed..7ac9b716700 100644
--- a/protocols/relay/src/priv_client.rs
+++ b/protocols/relay/src/priv_client.rs
@@ -23,33 +23,39 @@
 pub(crate) mod handler;
 pub(crate) mod transport;
 
-use crate::multiaddr_ext::MultiaddrExt;
-use crate::priv_client::handler::Handler;
-use crate::protocol::{self, inbound_stop};
+use std::{
+    collections::{hash_map, HashMap, VecDeque},
+    convert::Infallible,
+    io::{Error, ErrorKind, IoSlice},
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use bytes::Bytes;
 use either::Either;
-use futures::channel::mpsc::Receiver;
-use futures::future::{BoxFuture, FutureExt};
-use futures::io::{AsyncRead, AsyncWrite};
-use futures::ready;
-use futures::stream::StreamExt;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use futures::{
+    channel::mpsc::Receiver,
+    future::{BoxFuture, FutureExt},
+    io::{AsyncRead, AsyncWrite},
+    ready,
+    stream::StreamExt,
+};
+use libp2p_core::{multiaddr::Protocol, transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm};
-use libp2p_swarm::dial_opts::DialOpts;
 use libp2p_swarm::{
+    behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm},
+    dial_opts::DialOpts,
     dummy, ConnectionDenied, ConnectionHandler, ConnectionId, DialFailure, NetworkBehaviour,
     NotifyHandler, Stream, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use std::collections::{hash_map, HashMap, VecDeque};
-use std::convert::Infallible;
-use std::io::{Error, ErrorKind, IoSlice};
-use std::pin::Pin;
-use std::task::{Context, Poll};
 use transport::Transport;
 
+use crate::{
+    multiaddr_ext::MultiaddrExt,
+    priv_client::handler::Handler,
+    protocol::{self, inbound_stop},
+};
+
 /// The events produced by the client `Behaviour`.
 #[derive(Debug)]
 pub enum Event {
@@ -89,7 +95,8 @@ pub struct Behaviour {
 
     /// Stores the address of a pending or confirmed reservation.
     ///
-    /// This is indexed by the [`ConnectionId`] to a relay server and the address is the `/p2p-circuit` address we reserved on it.
+    /// This is indexed by the [`ConnectionId`] to a relay server and the address is the
+    /// `/p2p-circuit` address we reserved on it.
     reservation_addresses: HashMap<ConnectionId, (Multiaddr, ReservationStatus)>,
 
     /// Queue of actions to return when polled.
diff --git a/protocols/relay/src/priv_client/handler.rs b/protocols/relay/src/priv_client/handler.rs
index 77b7f94ae60..8f60b689ec8 100644
--- a/protocols/relay/src/priv_client/handler.rs
+++ b/protocols/relay/src/priv_client/handler.rs
@@ -18,29 +18,35 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::client::Connection;
-use crate::priv_client::transport;
-use crate::priv_client::transport::ToListenerMsg;
-use crate::protocol::{self, inbound_stop, outbound_hop};
-use crate::{priv_client, proto, HOP_PROTOCOL_NAME, STOP_PROTOCOL_NAME};
-use futures::channel::mpsc::Sender;
-use futures::channel::{mpsc, oneshot};
-use futures::future::FutureExt;
+use std::{
+    collections::VecDeque,
+    convert::Infallible,
+    fmt, io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{
+    channel::{mpsc, mpsc::Sender, oneshot},
+    future::FutureExt,
+};
 use futures_timer::Delay;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::upgrade::ReadyUpgrade;
-use libp2p_core::Multiaddr;
+use libp2p_core::{multiaddr::Protocol, upgrade::ReadyUpgrade, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::handler::{ConnectionEvent, FullyNegotiatedInbound};
 use libp2p_swarm::{
+    handler::{ConnectionEvent, FullyNegotiatedInbound},
     ConnectionHandler, ConnectionHandlerEvent, Stream, StreamProtocol, StreamUpgradeError,
     SubstreamProtocol,
 };
-use std::collections::VecDeque;
-use std::convert::Infallible;
-use std::task::{Context, Poll};
-use std::time::Duration;
-use std::{fmt, io};
+
+use crate::{
+    client::Connection,
+    priv_client,
+    priv_client::{transport, transport::ToListenerMsg},
+    proto,
+    protocol::{self, inbound_stop, outbound_hop},
+    HOP_PROTOCOL_NAME, STOP_PROTOCOL_NAME,
+};
 
 /// The maximum number of circuits being denied concurrently.
 ///
diff --git a/protocols/relay/src/priv_client/transport.rs b/protocols/relay/src/priv_client/transport.rs
index ec1e8ca5fb8..ed9faa946db 100644
--- a/protocols/relay/src/priv_client/transport.rs
+++ b/protocols/relay/src/priv_client/transport.rs
@@ -19,25 +19,35 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::multiaddr_ext::MultiaddrExt;
-use crate::priv_client::Connection;
-use crate::protocol::outbound_hop;
-use crate::protocol::outbound_hop::{ConnectError, ReserveError};
-use crate::RequestId;
-use futures::channel::mpsc;
-use futures::channel::oneshot;
-use futures::future::{ready, BoxFuture, FutureExt, Ready};
-use futures::sink::SinkExt;
-use futures::stream::SelectAll;
-use futures::stream::{Stream, StreamExt};
-use libp2p_core::multiaddr::{Multiaddr, Protocol};
-use libp2p_core::transport::{DialOpts, ListenerId, TransportError, TransportEvent};
+use std::{
+    collections::VecDeque,
+    pin::Pin,
+    task::{Context, Poll, Waker},
+};
+
+use futures::{
+    channel::{mpsc, oneshot},
+    future::{ready, BoxFuture, FutureExt, Ready},
+    sink::SinkExt,
+    stream::{SelectAll, Stream, StreamExt},
+};
+use libp2p_core::{
+    multiaddr::{Multiaddr, Protocol},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
+};
 use libp2p_identity::PeerId;
-use std::collections::VecDeque;
-use std::pin::Pin;
-use std::task::{Context, Poll, Waker};
 use thiserror::Error;
 
+use crate::{
+    multiaddr_ext::MultiaddrExt,
+    priv_client::Connection,
+    protocol::{
+        outbound_hop,
+        outbound_hop::{ConnectError, ReserveError},
+    },
+    RequestId,
+};
+
 /// A [`Transport`] enabling client relay capabilities.
 ///
 /// Note: The transport only handles listening and dialing on relayed [`Multiaddr`], and depends on
@@ -49,7 +59,8 @@ use thiserror::Error;
 /// 1. Establish relayed connections by dialing `/p2p-circuit` addresses.
 ///
 ///    ```
-///    # use libp2p_core::{Multiaddr, multiaddr::{Protocol}, Transport, transport::{DialOpts, PortUse}, connection::Endpoint};
+///    # use libp2p_core::{Multiaddr, multiaddr::{Protocol}, Transport,
+///    # transport::{DialOpts, PortUse}, connection::Endpoint};
 ///    # use libp2p_core::transport::memory::MemoryTransport;
 ///    # use libp2p_core::transport::choice::OrTransport;
 ///    # use libp2p_relay as relay;
@@ -307,8 +318,9 @@ pub(crate) struct Listener {
     queued_events: VecDeque<<Self as Stream>::Item>,
     /// Channel for messages from the behaviour [`Handler`][super::handler::Handler].
     from_behaviour: mpsc::Receiver<ToListenerMsg>,
-    /// The listener can be closed either manually with [`Transport::remove_listener`](libp2p_core::Transport) or if
-    /// the sender side of the `from_behaviour` channel is dropped.
+    /// The listener can be closed either manually with
+    /// [`Transport::remove_listener`](libp2p_core::Transport) or if the sender side of the
+    /// `from_behaviour` channel is dropped.
     is_closed: bool,
     waker: Option<Waker>,
 }
@@ -344,7 +356,8 @@ impl Stream for Listener {
             }
 
             if self.is_closed {
-                // Terminate the stream if the listener closed and all remaining events have been reported.
+                // Terminate the stream if the listener closed and
+                // all remaining events have been reported.
                 self.waker = None;
                 return Poll::Ready(None);
             }
diff --git a/protocols/relay/src/protocol.rs b/protocols/relay/src/protocol.rs
index b94151259cd..b1adeedaaf5 100644
--- a/protocols/relay/src/protocol.rs
+++ b/protocols/relay/src/protocol.rs
@@ -18,10 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
-use libp2p_swarm::StreamProtocol;
 use std::time::Duration;
 
+use libp2p_swarm::StreamProtocol;
+
+use crate::proto;
+
 pub(crate) mod inbound_hop;
 pub(crate) mod inbound_stop;
 pub(crate) mod outbound_hop;
diff --git a/protocols/relay/src/protocol/inbound_hop.rs b/protocols/relay/src/protocol/inbound_hop.rs
index 401c6258176..01280d70897 100644
--- a/protocols/relay/src/protocol/inbound_hop.rs
+++ b/protocols/relay/src/protocol/inbound_hop.rs
@@ -19,21 +19,18 @@
 // DEALINGS IN THE SOFTWARE.
 
 use std::time::Duration;
-use web_time::SystemTime;
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use either::Either;
 use futures::prelude::*;
-use thiserror::Error;
-
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_swarm::Stream;
+use thiserror::Error;
+use web_time::SystemTime;
 
-use crate::proto;
-use crate::proto::message_v2::pb::mod_HopMessage::Type;
-use crate::protocol::MAX_MESSAGE_SIZE;
+use crate::{proto, proto::message_v2::pb::mod_HopMessage::Type, protocol::MAX_MESSAGE_SIZE};
 
 #[derive(Debug, Error)]
 pub enum Error {
diff --git a/protocols/relay/src/protocol/inbound_stop.rs b/protocols/relay/src/protocol/inbound_stop.rs
index b698a5ff769..8994c2cff73 100644
--- a/protocols/relay/src/protocol/inbound_stop.rs
+++ b/protocols/relay/src/protocol/inbound_stop.rs
@@ -18,16 +18,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::proto;
-use crate::protocol::{self, MAX_MESSAGE_SIZE};
+use std::io;
+
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use futures::prelude::*;
 use libp2p_identity::PeerId;
 use libp2p_swarm::Stream;
-use std::io;
 use thiserror::Error;
 
+use crate::{
+    proto,
+    protocol::{self, MAX_MESSAGE_SIZE},
+};
+
 pub(crate) async fn handle_open_circuit(io: Stream) -> Result<Circuit, Error> {
     let mut substream = Framed::new(io, quick_protobuf_codec::Codec::new(MAX_MESSAGE_SIZE));
 
diff --git a/protocols/relay/src/protocol/outbound_hop.rs b/protocols/relay/src/protocol/outbound_hop.rs
index b349f8848be..216c6d115bf 100644
--- a/protocols/relay/src/protocol/outbound_hop.rs
+++ b/protocols/relay/src/protocol/outbound_hop.rs
@@ -18,22 +18,23 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::io;
-use std::time::Duration;
+use std::{io, time::Duration};
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use futures::prelude::*;
 use futures_timer::Delay;
-use thiserror::Error;
-use web_time::SystemTime;
-
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_swarm::Stream;
+use thiserror::Error;
+use web_time::SystemTime;
 
-use crate::protocol::{Limit, MAX_MESSAGE_SIZE};
-use crate::{proto, HOP_PROTOCOL_NAME};
+use crate::{
+    proto,
+    protocol::{Limit, MAX_MESSAGE_SIZE},
+    HOP_PROTOCOL_NAME,
+};
 
 #[derive(Debug, Error)]
 pub enum ConnectError {
diff --git a/protocols/relay/src/protocol/outbound_stop.rs b/protocols/relay/src/protocol/outbound_stop.rs
index 525ebc10821..272aa24eef6 100644
--- a/protocols/relay/src/protocol/outbound_stop.rs
+++ b/protocols/relay/src/protocol/outbound_stop.rs
@@ -18,19 +18,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::io;
-use std::time::Duration;
+use std::{io, time::Duration};
 
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use futures::prelude::*;
-use thiserror::Error;
-
 use libp2p_identity::PeerId;
 use libp2p_swarm::Stream;
+use thiserror::Error;
 
-use crate::protocol::MAX_MESSAGE_SIZE;
-use crate::{proto, STOP_PROTOCOL_NAME};
+use crate::{proto, protocol::MAX_MESSAGE_SIZE, STOP_PROTOCOL_NAME};
 
 #[derive(Debug, Error)]
 pub enum Error {
diff --git a/protocols/relay/tests/lib.rs b/protocols/relay/tests/lib.rs
index 2b28d5a50cd..125f0dbb4ad 100644
--- a/protocols/relay/tests/lib.rs
+++ b/protocols/relay/tests/lib.rs
@@ -18,26 +18,28 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::executor::LocalPool;
-use futures::future::FutureExt;
-use futures::io::{AsyncRead, AsyncWrite};
-use futures::stream::StreamExt;
-use futures::task::Spawn;
-use libp2p_core::multiaddr::{Multiaddr, Protocol};
-use libp2p_core::muxing::StreamMuxerBox;
-use libp2p_core::transport::choice::OrTransport;
-use libp2p_core::transport::{Boxed, MemoryTransport, Transport};
-use libp2p_core::upgrade;
+use std::{error::Error, time::Duration};
+
+use futures::{
+    executor::LocalPool,
+    future::FutureExt,
+    io::{AsyncRead, AsyncWrite},
+    stream::StreamExt,
+    task::Spawn,
+};
+use libp2p_core::{
+    multiaddr::{Multiaddr, Protocol},
+    muxing::StreamMuxerBox,
+    transport::{choice::OrTransport, Boxed, MemoryTransport, Transport},
+    upgrade,
+};
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use libp2p_ping as ping;
 use libp2p_plaintext as plaintext;
 use libp2p_relay as relay;
-use libp2p_swarm::dial_opts::DialOpts;
-use libp2p_swarm::{Config, DialError, NetworkBehaviour, Swarm, SwarmEvent};
+use libp2p_swarm::{dial_opts::DialOpts, Config, DialError, NetworkBehaviour, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use std::error::Error;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[test]
diff --git a/protocols/rendezvous/src/client.rs b/protocols/rendezvous/src/client.rs
index a794252ff0b..019b23c092b 100644
--- a/protocols/rendezvous/src/client.rs
+++ b/protocols/rendezvous/src/client.rs
@@ -18,24 +18,28 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::codec::Message::*;
-use crate::codec::{Cookie, ErrorCode, Message, Namespace, NewRegistration, Registration, Ttl};
-use futures::future::BoxFuture;
-use futures::future::FutureExt;
-use futures::stream::FuturesUnordered;
-use futures::stream::StreamExt;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr, PeerRecord};
+use std::{
+    collections::HashMap,
+    iter,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{
+    future::{BoxFuture, FutureExt},
+    stream::{FuturesUnordered, StreamExt},
+};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr, PeerRecord};
 use libp2p_identity::{Keypair, PeerId, SigningError};
 use libp2p_request_response::{OutboundRequestId, ProtocolSupport};
 use libp2p_swarm::{
     ConnectionDenied, ConnectionId, ExternalAddresses, FromSwarm, NetworkBehaviour, THandler,
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-use std::collections::HashMap;
-use std::iter;
-use std::task::{Context, Poll};
-use std::time::Duration;
+
+use crate::codec::{
+    Cookie, ErrorCode, Message, Message::*, Namespace, NewRegistration, Registration, Ttl,
+};
 
 pub struct Behaviour {
     inner: libp2p_request_response::Behaviour<crate::codec::Codec>,
@@ -47,12 +51,14 @@ pub struct Behaviour {
 
     /// Hold addresses of all peers that we have discovered so far.
     ///
-    /// Storing these internally allows us to assist the [`libp2p_swarm::Swarm`] in dialing by returning addresses from [`NetworkBehaviour::handle_pending_outbound_connection`].
+    /// Storing these internally allows us to assist the [`libp2p_swarm::Swarm`] in dialing by
+    /// returning addresses from [`NetworkBehaviour::handle_pending_outbound_connection`].
     discovered_peers: HashMap<(PeerId, Namespace), Vec<Multiaddr>>,
 
     registered_namespaces: HashMap<(PeerId, Namespace), Ttl>,
 
-    /// Tracks the expiry of registrations that we have discovered and stored in `discovered_peers` otherwise we have a memory leak.
+    /// Tracks the expiry of registrations that we have discovered and stored in `discovered_peers`
+    /// otherwise we have a memory leak.
     expiring_registrations: FuturesUnordered<BoxFuture<'static, (PeerId, Namespace)>>,
 
     external_addresses: ExternalAddresses,
@@ -81,8 +87,9 @@ impl Behaviour {
 
     /// Register our external addresses in the given namespace with the given rendezvous peer.
     ///
-    /// External addresses are either manually added via [`libp2p_swarm::Swarm::add_external_address`] or reported
-    /// by other [`NetworkBehaviour`]s via [`ToSwarm::ExternalAddrConfirmed`].
+    /// External addresses are either manually added via
+    /// [`libp2p_swarm::Swarm::add_external_address`] or reported by other [`NetworkBehaviour`]s
+    /// via [`ToSwarm::ExternalAddrConfirmed`].
     pub fn register(
         &mut self,
         namespace: Namespace,
diff --git a/protocols/rendezvous/src/codec.rs b/protocols/rendezvous/src/codec.rs
index cad3688e00b..60f9f14f332 100644
--- a/protocols/rendezvous/src/codec.rs
+++ b/protocols/rendezvous/src/codec.rs
@@ -18,16 +18,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::DEFAULT_TTL;
+use std::{fmt, io};
+
 use async_trait::async_trait;
-use asynchronous_codec::{BytesMut, Decoder, Encoder};
-use asynchronous_codec::{FramedRead, FramedWrite};
+use asynchronous_codec::{BytesMut, Decoder, Encoder, FramedRead, FramedWrite};
 use futures::{AsyncRead, AsyncWrite, SinkExt, StreamExt};
 use libp2p_core::{peer_record, signed_envelope, PeerRecord, SignedEnvelope};
 use libp2p_swarm::StreamProtocol;
 use quick_protobuf_codec::Codec as ProtobufCodec;
 use rand::RngCore;
-use std::{fmt, io};
+
+use crate::DEFAULT_TTL;
 
 pub type Ttl = u64;
 pub(crate) type Limit = u64;
@@ -54,7 +55,9 @@ pub struct Namespace(String);
 impl Namespace {
     /// Creates a new [`Namespace`] from a static string.
     ///
-    /// This will panic if the namespace is too long. We accepting panicking in this case because we are enforcing a `static lifetime which means this value can only be a constant in the program and hence we hope the developer checked that it is of an acceptable length.
+    /// This will panic if the namespace is too long. We accepting panicking in this case because we
+    /// are enforcing a `static lifetime which means this value can only be a constant in the
+    /// program and hence we hope the developer checked that it is of an acceptable length.
     pub fn from_static(value: &'static str) -> Self {
         if value.len() > crate::MAX_NAMESPACE {
             panic!("Namespace '{value}' is too long!")
@@ -109,7 +112,8 @@ pub struct Cookie {
 impl Cookie {
     /// Construct a new [`Cookie`] for a given namespace.
     ///
-    /// This cookie will only be valid for subsequent DISCOVER requests targeting the same namespace.
+    /// This cookie will only be valid for subsequent DISCOVER requests targeting the same
+    /// namespace.
     pub fn for_namespace(namespace: Namespace) -> Self {
         Self {
             id: rand::thread_rng().next_u64(),
diff --git a/protocols/rendezvous/src/lib.rs b/protocols/rendezvous/src/lib.rs
index 7c607085f20..221178728af 100644
--- a/protocols/rendezvous/src/lib.rs
+++ b/protocols/rendezvous/src/lib.rs
@@ -22,9 +22,10 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-pub use self::codec::{Cookie, ErrorCode, Namespace, NamespaceTooLong, Registration, Ttl};
 use libp2p_swarm::StreamProtocol;
 
+pub use self::codec::{Cookie, ErrorCode, Namespace, NamespaceTooLong, Registration, Ttl};
+
 mod codec;
 
 /// If unspecified, rendezvous nodes should assume a TTL of 2h.
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index 45a525d9573..8aafcfb48e3 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -18,25 +18,27 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::codec::{Cookie, ErrorCode, Message, Namespace, NewRegistration, Registration, Ttl};
-use crate::{MAX_TTL, MIN_TTL};
+use std::{
+    collections::{HashMap, HashSet},
+    iter,
+    task::{ready, Context, Poll},
+    time::Duration,
+};
+
 use bimap::BiMap;
-use futures::future::BoxFuture;
-use futures::stream::FuturesUnordered;
-use futures::{FutureExt, StreamExt};
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use futures::{future::BoxFuture, stream::FuturesUnordered, FutureExt, StreamExt};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::ProtocolSupport;
-use libp2p_swarm::behaviour::FromSwarm;
 use libp2p_swarm::{
-    ConnectionDenied, ConnectionId, NetworkBehaviour, THandler, THandlerInEvent, THandlerOutEvent,
-    ToSwarm,
+    behaviour::FromSwarm, ConnectionDenied, ConnectionId, NetworkBehaviour, THandler,
+    THandlerInEvent, THandlerOutEvent, ToSwarm,
+};
+
+use crate::{
+    codec::{Cookie, ErrorCode, Message, Namespace, NewRegistration, Registration, Ttl},
+    MAX_TTL, MIN_TTL,
 };
-use std::collections::{HashMap, HashSet};
-use std::iter;
-use std::task::{ready, Context, Poll};
-use std::time::Duration;
 
 pub struct Behaviour {
     inner: libp2p_request_response::Behaviour<crate::codec::Codec>,
@@ -534,10 +536,9 @@ pub struct CookieNamespaceMismatch;
 
 #[cfg(test)]
 mod tests {
-    use web_time::SystemTime;
-
     use libp2p_core::PeerRecord;
     use libp2p_identity as identity;
+    use web_time::SystemTime;
 
     use super::*;
 
@@ -792,7 +793,8 @@ mod tests {
                 .unwrap_err();
         }
 
-        /// Polls [`Registrations`] for at most `seconds` and panics if doesn't return an event within that time.
+        /// Polls [`Registrations`] for at most `seconds` and panics if doesn't
+        /// return an event within that time.
         async fn next_event_in_at_most(&mut self, seconds: u64) -> ExpiredRegistration {
             tokio::time::timeout(Duration::from_secs(seconds), self.next_event())
                 .await
diff --git a/protocols/rendezvous/tests/rendezvous.rs b/protocols/rendezvous/tests/rendezvous.rs
index d9200780ece..2305c2ef412 100644
--- a/protocols/rendezvous/tests/rendezvous.rs
+++ b/protocols/rendezvous/tests/rendezvous.rs
@@ -18,16 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::stream::FuturesUnordered;
-use futures::StreamExt;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::Multiaddr;
+use std::time::Duration;
+
+use futures::{stream::FuturesUnordered, StreamExt};
+use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_identity as identity;
 use libp2p_rendezvous as rendezvous;
 use libp2p_rendezvous::client::RegisterError;
 use libp2p_swarm::{DialError, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
@@ -471,9 +470,11 @@ async fn new_combined_node() -> Swarm<Combined> {
 }
 
 async fn new_impersonating_client() -> Swarm<rendezvous::client::Behaviour> {
-    // In reality, if Eve were to try and fake someones identity, she would obviously only know the public key.
-    // Due to the type-safe API of the `Rendezvous` behaviour and `PeerRecord`, we actually cannot construct a bad `PeerRecord` (i.e. one that is claims to be someone else).
-    // As such, the best we can do is hand eve a completely different keypair from what she is using to authenticate her connection.
+    // In reality, if Eve were to try and fake someones identity, she would obviously only know the
+    // public key. Due to the type-safe API of the `Rendezvous` behaviour and `PeerRecord`, we
+    // actually cannot construct a bad `PeerRecord` (i.e. one that is claims to be someone else).
+    // As such, the best we can do is hand eve a completely different keypair from what she is using
+    // to authenticate her connection.
     let someone_else = identity::Keypair::generate_ed25519();
     let mut eve = Swarm::new_ephemeral(move |_| rendezvous::client::Behaviour::new(someone_else));
     eve.listen().with_memory_addr_external().await;
diff --git a/protocols/request-response/src/cbor.rs b/protocols/request-response/src/cbor.rs
index a27d069e758..744d94cb961 100644
--- a/protocols/request-response/src/cbor.rs
+++ b/protocols/request-response/src/cbor.rs
@@ -37,19 +37,23 @@
 /// }
 ///
 /// let behaviour = cbor::Behaviour::<GreetRequest, GreetResponse>::new(
-///     [(StreamProtocol::new("/my-cbor-protocol"), ProtocolSupport::Full)],
-///     request_response::Config::default()
+///     [(
+///         StreamProtocol::new("/my-cbor-protocol"),
+///         ProtocolSupport::Full,
+///     )],
+///     request_response::Config::default(),
 /// );
 /// ```
 pub type Behaviour<Req, Resp> = crate::Behaviour<codec::Codec<Req, Resp>>;
 
 mod codec {
+    use std::{collections::TryReserveError, convert::Infallible, io, marker::PhantomData};
+
     use async_trait::async_trait;
     use cbor4ii::core::error::DecodeError;
     use futures::prelude::*;
     use libp2p_swarm::StreamProtocol;
     use serde::{de::DeserializeOwned, Serialize};
-    use std::{collections::TryReserveError, convert::Infallible, io, marker::PhantomData};
 
     /// Max request size in bytes
     const REQUEST_SIZE_MAXIMUM: u64 = 1024 * 1024;
@@ -168,13 +172,13 @@ mod codec {
 
 #[cfg(test)]
 mod tests {
-    use crate::cbor::codec::Codec;
-    use crate::Codec as _;
     use futures::AsyncWriteExt;
     use futures_ringbuf::Endpoint;
     use libp2p_swarm::StreamProtocol;
     use serde::{Deserialize, Serialize};
 
+    use crate::{cbor::codec::Codec, Codec as _};
+
     #[async_std::test]
     async fn test_codec() {
         let expected_request = TestRequest {
diff --git a/protocols/request-response/src/codec.rs b/protocols/request-response/src/codec.rs
index d26b729acae..d396a75ad7b 100644
--- a/protocols/request-response/src/codec.rs
+++ b/protocols/request-response/src/codec.rs
@@ -18,9 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::io;
+
 use async_trait::async_trait;
 use futures::prelude::*;
-use std::io;
 
 /// A `Codec` defines the request and response types
 /// for a request-response [`Behaviour`](crate::Behaviour) protocol or
diff --git a/protocols/request-response/src/handler.rs b/protocols/request-response/src/handler.rs
index dbd7a0708ce..133cff87f40 100644
--- a/protocols/request-response/src/handler.rs
+++ b/protocols/request-response/src/handler.rs
@@ -20,23 +20,6 @@
 
 pub(crate) mod protocol;
 
-pub use protocol::ProtocolSupport;
-
-use crate::codec::Codec;
-use crate::handler::protocol::Protocol;
-use crate::{InboundRequestId, OutboundRequestId, EMPTY_QUEUE_SHRINK_THRESHOLD};
-
-use futures::channel::mpsc;
-use futures::{channel::oneshot, prelude::*};
-use libp2p_swarm::handler::{
-    ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
-    ListenUpgradeError,
-};
-use libp2p_swarm::{
-    handler::{ConnectionHandler, ConnectionHandlerEvent, StreamUpgradeError},
-    SubstreamProtocol,
-};
-use smallvec::SmallVec;
 use std::{
     collections::VecDeque,
     fmt, io,
@@ -48,6 +31,25 @@ use std::{
     time::Duration,
 };
 
+use futures::{
+    channel::{mpsc, oneshot},
+    prelude::*,
+};
+use libp2p_swarm::{
+    handler::{
+        ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
+        FullyNegotiatedInbound, FullyNegotiatedOutbound, ListenUpgradeError, StreamUpgradeError,
+    },
+    SubstreamProtocol,
+};
+pub use protocol::ProtocolSupport;
+use smallvec::SmallVec;
+
+use crate::{
+    codec::Codec, handler::protocol::Protocol, InboundRequestId, OutboundRequestId,
+    EMPTY_QUEUE_SHRINK_THRESHOLD,
+};
+
 /// A connection handler for a request response [`Behaviour`](super::Behaviour) protocol.
 pub struct Handler<TCodec>
 where
diff --git a/protocols/request-response/src/json.rs b/protocols/request-response/src/json.rs
index 85e78e7ddda..9bd5b8c6df9 100644
--- a/protocols/request-response/src/json.rs
+++ b/protocols/request-response/src/json.rs
@@ -18,7 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-/// A request-response behaviour using [`serde_json`] for serializing and deserializing the messages.
+/// A request-response behaviour using [`serde_json`] for serializing and deserializing the
+/// messages.
 ///
 /// # Example
 ///
@@ -36,18 +37,22 @@
 /// }
 ///
 /// let behaviour = json::Behaviour::<GreetRequest, GreetResponse>::new(
-///     [(StreamProtocol::new("/my-json-protocol"), ProtocolSupport::Full)],
-///     request_response::Config::default()
+///     [(
+///         StreamProtocol::new("/my-json-protocol"),
+///         ProtocolSupport::Full,
+///     )],
+///     request_response::Config::default(),
 /// );
 /// ```
 pub type Behaviour<Req, Resp> = crate::Behaviour<codec::Codec<Req, Resp>>;
 
 mod codec {
+    use std::{io, marker::PhantomData};
+
     use async_trait::async_trait;
     use futures::prelude::*;
     use libp2p_swarm::StreamProtocol;
     use serde::{de::DeserializeOwned, Serialize};
-    use std::{io, marker::PhantomData};
 
     /// Max request size in bytes
     const REQUEST_SIZE_MAXIMUM: u64 = 1024 * 1024;
@@ -140,12 +145,13 @@ mod codec {
 
 #[cfg(test)]
 mod tests {
-    use crate::Codec;
     use futures::AsyncWriteExt;
     use futures_ringbuf::Endpoint;
     use libp2p_swarm::StreamProtocol;
     use serde::{Deserialize, Serialize};
 
+    use crate::Codec;
+
     #[async_std::test]
     async fn test_codec() {
         let expected_request = TestRequest {
diff --git a/protocols/request-response/src/lib.rs b/protocols/request-response/src/lib.rs
index e627f5668ff..052e1e87e2b 100644
--- a/protocols/request-response/src/lib.rs
+++ b/protocols/request-response/src/lib.rs
@@ -73,12 +73,18 @@ mod handler;
 #[cfg(feature = "json")]
 pub mod json;
 
-pub use codec::Codec;
-pub use handler::ProtocolSupport;
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    fmt, io,
+    sync::{atomic::AtomicU64, Arc},
+    task::{Context, Poll},
+    time::Duration,
+};
 
-use crate::handler::OutboundMessage;
+pub use codec::Codec;
 use futures::channel::oneshot;
 use handler::Handler;
+pub use handler::ProtocolSupport;
 use libp2p_core::{transport::PortUse, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_swarm::{
@@ -88,13 +94,8 @@ use libp2p_swarm::{
     PeerAddresses, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use smallvec::SmallVec;
-use std::{
-    collections::{HashMap, HashSet, VecDeque},
-    fmt, io,
-    sync::{atomic::AtomicU64, Arc},
-    task::{Context, Poll},
-    time::Duration,
-};
+
+use crate::handler::OutboundMessage;
 
 /// An inbound request or response.
 #[derive(Debug)]
@@ -353,8 +354,8 @@ where
     /// Pending events to return from `poll`.
     pending_events:
         VecDeque<ToSwarm<Event<TCodec::Request, TCodec::Response>, OutboundMessage<TCodec>>>,
-    /// The currently connected peers, their pending outbound and inbound responses and their known,
-    /// reachable addresses, if any.
+    /// The currently connected peers, their pending outbound and inbound responses and their
+    /// known, reachable addresses, if any.
     connected: HashMap<PeerId, SmallVec<[Connection; 2]>>,
     /// Externally managed addresses via `add_address` and `remove_address`.
     addresses: PeerAddresses,
@@ -367,7 +368,8 @@ impl<TCodec> Behaviour<TCodec>
 where
     TCodec: Codec + Default + Clone + Send + 'static,
 {
-    /// Creates a new `Behaviour` for the given protocols and configuration, using [`Default`] to construct the codec.
+    /// Creates a new `Behaviour` for the given protocols and configuration, using [`Default`] to
+    /// construct the codec.
     pub fn new<I>(protocols: I, cfg: Config) -> Self
     where
         I: IntoIterator<Item = (TCodec::Protocol, ProtocolSupport)>,
@@ -693,7 +695,8 @@ where
         }
     }
 
-    /// Preloads a new [`Handler`] with requests that are waiting to be sent to the newly connected peer.
+    /// Preloads a new [`Handler`] with requests that are
+    /// waiting to be sent to the newly connected peer.
     fn preload_new_handler(
         &mut self,
         handler: &mut Handler<TCodec>,
diff --git a/protocols/request-response/tests/error_reporting.rs b/protocols/request-response/tests/error_reporting.rs
index 19f323e169f..d1f26378a77 100644
--- a/protocols/request-response/tests/error_reporting.rs
+++ b/protocols/request-response/tests/error_reporting.rs
@@ -1,3 +1,5 @@
+use std::{io, iter, pin::pin, time::Duration};
+
 use anyhow::{bail, Result};
 use async_std::task::sleep;
 use async_trait::async_trait;
@@ -10,9 +12,6 @@ use libp2p_swarm_test::SwarmExt;
 use request_response::{
     Codec, InboundFailure, InboundRequestId, OutboundFailure, OutboundRequestId, ResponseChannel,
 };
-use std::pin::pin;
-use std::time::Duration;
-use std::{io, iter};
 use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
diff --git a/protocols/request-response/tests/peer_address.rs b/protocols/request-response/tests/peer_address.rs
index 0ed7ffe5551..603e2d09dc0 100644
--- a/protocols/request-response/tests/peer_address.rs
+++ b/protocols/request-response/tests/peer_address.rs
@@ -1,10 +1,11 @@
+use std::iter;
+
 use libp2p_core::ConnectedPoint;
 use libp2p_request_response as request_response;
 use libp2p_request_response::ProtocolSupport;
 use libp2p_swarm::{StreamProtocol, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use serde::{Deserialize, Serialize};
-use std::iter;
 use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
diff --git a/protocols/request-response/tests/ping.rs b/protocols/request-response/tests/ping.rs
index 827afae249c..e53fe99d6cf 100644
--- a/protocols/request-response/tests/ping.rs
+++ b/protocols/request-response/tests/ping.rs
@@ -20,6 +20,8 @@
 
 //! Integration tests for the `Behaviour`.
 
+use std::{io, iter};
+
 use futures::prelude::*;
 use libp2p_identity::PeerId;
 use libp2p_request_response as request_response;
@@ -28,7 +30,6 @@ use libp2p_swarm::{StreamProtocol, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use std::{io, iter};
 use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
diff --git a/protocols/stream/src/control.rs b/protocols/stream/src/control.rs
index 036d285b2a3..2149c6bca48 100644
--- a/protocols/stream/src/control.rs
+++ b/protocols/stream/src/control.rs
@@ -6,9 +6,6 @@ use std::{
     task::{Context, Poll},
 };
 
-use crate::AlreadyRegistered;
-use crate::{handler::NewStream, shared::Shared};
-
 use futures::{
     channel::{mpsc, oneshot},
     SinkExt as _, StreamExt as _,
@@ -16,6 +13,8 @@ use futures::{
 use libp2p_identity::PeerId;
 use libp2p_swarm::{Stream, StreamProtocol};
 
+use crate::{handler::NewStream, shared::Shared, AlreadyRegistered};
+
 /// A (remote) control for opening new streams and registration of inbound protocols.
 ///
 /// A [`Control`] can be cloned and thus allows for concurrent access.
@@ -31,13 +30,15 @@ impl Control {
 
     /// Attempt to open a new stream for the given protocol and peer.
     ///
-    /// In case we are currently not connected to the peer, we will attempt to make a new connection.
+    /// In case we are currently not connected to the peer,
+    /// we will attempt to make a new connection.
     ///
     /// ## Backpressure
     ///
     /// [`Control`]s support backpressure similarly to bounded channels:
     /// Each [`Control`] has a guaranteed slot for internal messages.
-    /// A single control will always open one stream at a time which is enforced by requiring `&mut self`.
+    /// A single control will always open one stream at a
+    /// time which is enforced by requiring `&mut self`.
     ///
     /// This backpressure mechanism breaks if you clone [`Control`]s excessively.
     pub async fn open_stream(
diff --git a/protocols/stream/src/handler.rs b/protocols/stream/src/handler.rs
index b7ec516d3b1..d626f48fb09 100644
--- a/protocols/stream/src/handler.rs
+++ b/protocols/stream/src/handler.rs
@@ -162,7 +162,8 @@ impl ConnectionHandler for Handler {
     }
 }
 
-/// Message from a [`Control`](crate::Control) to a [`ConnectionHandler`] to negotiate a new outbound stream.
+/// Message from a [`Control`](crate::Control) to
+/// a [`ConnectionHandler`] to negotiate a new outbound stream.
 #[derive(Debug)]
 pub(crate) struct NewStream {
     pub(crate) protocol: StreamProtocol,
diff --git a/protocols/stream/src/shared.rs b/protocols/stream/src/shared.rs
index 48aa6613d83..62d7b3cfe68 100644
--- a/protocols/stream/src/shared.rs
+++ b/protocols/stream/src/shared.rs
@@ -12,9 +12,11 @@ use rand::seq::IteratorRandom as _;
 use crate::{handler::NewStream, AlreadyRegistered, IncomingStreams};
 
 pub(crate) struct Shared {
-    /// Tracks the supported inbound protocols created via [`Control::accept`](crate::Control::accept).
+    /// Tracks the supported inbound protocols created via
+    /// [`Control::accept`](crate::Control::accept).
     ///
-    /// For each [`StreamProtocol`], we hold the [`mpsc::Sender`] corresponding to the [`mpsc::Receiver`] in [`IncomingStreams`].
+    /// For each [`StreamProtocol`], we hold the [`mpsc::Sender`] corresponding to the
+    /// [`mpsc::Receiver`] in [`IncomingStreams`].
     supported_inbound_protocols: HashMap<StreamProtocol, mpsc::Sender<(PeerId, Stream)>>,
 
     connections: HashMap<ConnectionId, PeerId>,
@@ -25,7 +27,8 @@ pub(crate) struct Shared {
 
     /// Sender for peers we want to dial.
     ///
-    /// We manage this through a channel to avoid locks as part of [`NetworkBehaviour::poll`](libp2p_swarm::NetworkBehaviour::poll).
+    /// We manage this through a channel to avoid locks as part of
+    /// [`NetworkBehaviour::poll`](libp2p_swarm::NetworkBehaviour::poll).
     dial_sender: mpsc::Sender<PeerId>,
 }
 
diff --git a/protocols/upnp/src/behaviour.rs b/protocols/upnp/src/behaviour.rs
index ee985042b68..cea8efb1e3f 100644
--- a/protocols/upnp/src/behaviour.rs
+++ b/protocols/upnp/src/behaviour.rs
@@ -32,7 +32,6 @@ use std::{
     time::Duration,
 };
 
-use crate::tokio::{is_addr_global, Gateway};
 use futures::{channel::oneshot, Future, StreamExt};
 use futures_timer::Delay;
 use igd_next::PortMappingProtocol;
@@ -46,6 +45,8 @@ use libp2p_swarm::{
     NetworkBehaviour, NewListenAddr, ToSwarm,
 };
 
+use crate::tokio::{is_addr_global, Gateway};
+
 /// The duration in seconds of a port mapping on the gateway.
 const MAPPING_DURATION: u32 = 3600;
 
@@ -286,8 +287,9 @@ impl NetworkBehaviour for Behaviour {
 
                 match &mut self.state {
                     GatewayState::Searching(_) => {
-                        // As the gateway is not yet available we add the mapping with `MappingState::Inactive`
-                        // so that when and if it becomes available we map it.
+                        // As the gateway is not yet available we add the mapping with
+                        // `MappingState::Inactive` so that when and if it
+                        // becomes available we map it.
                         self.mappings.insert(
                             Mapping {
                                 listener_id,
diff --git a/protocols/upnp/src/lib.rs b/protocols/upnp/src/lib.rs
index 8a74d7e8f63..d7a746f78df 100644
--- a/protocols/upnp/src/lib.rs
+++ b/protocols/upnp/src/lib.rs
@@ -24,7 +24,6 @@
 //! implements the [`libp2p_swarm::NetworkBehaviour`] trait.
 //! This struct will automatically try to map the ports externally to internal
 //! addresses on the gateway.
-//!
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
diff --git a/protocols/upnp/src/tokio.rs b/protocols/upnp/src/tokio.rs
index b2cad6fa5a7..67ef52f9608 100644
--- a/protocols/upnp/src/tokio.rs
+++ b/protocols/upnp/src/tokio.rs
@@ -20,7 +20,6 @@
 
 use std::{error::Error, net::IpAddr};
 
-use crate::behaviour::{GatewayEvent, GatewayRequest};
 use futures::{
     channel::{mpsc, oneshot},
     SinkExt, StreamExt,
@@ -28,8 +27,9 @@ use futures::{
 use igd_next::SearchOptions;
 
 pub use crate::behaviour::Behaviour;
+use crate::behaviour::{GatewayEvent, GatewayRequest};
 
-//TODO: remove when `IpAddr::is_global` stabilizes.
+// TODO: remove when `IpAddr::is_global` stabilizes.
 pub(crate) fn is_addr_global(addr: IpAddr) -> bool {
     match addr {
         IpAddr::V4(ip) => {
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000000..1e61bc16abf
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,10 @@
+# Imports
+reorder_imports  = true
+imports_granularity = "Crate"
+group_imports = "StdExternalCrate"
+
+# Docs
+wrap_comments = true
+comment_width = 100
+normalize_comments = true
+format_code_in_doc_comments = true
diff --git a/swarm-derive/src/lib.rs b/swarm-derive/src/lib.rs
index 258c0b976c8..41b909f329f 100644
--- a/swarm-derive/src/lib.rs
+++ b/swarm-derive/src/lib.rs
@@ -23,12 +23,12 @@
 
 mod syn_ext;
 
-use crate::syn_ext::RequireStrLit;
 use heck::ToUpperCamelCase;
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::punctuated::Punctuated;
-use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Meta, Token};
+use syn::{parse_macro_input, punctuated::Punctuated, Data, DataStruct, DeriveInput, Meta, Token};
+
+use crate::syn_ext::RequireStrLit;
 
 /// Generates a delegating `NetworkBehaviour` implementation for the struct this is used for. See
 /// the trait documentation for better description.
diff --git a/swarm-test/src/lib.rs b/swarm-test/src/lib.rs
index bcab6e5b700..0edf02473e6 100644
--- a/swarm-test/src/lib.rs
+++ b/swarm-test/src/lib.rs
@@ -18,27 +18,32 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{fmt::Debug, future::IntoFuture, time::Duration};
+
 use async_trait::async_trait;
-use futures::future::{BoxFuture, Either};
-use futures::{FutureExt, StreamExt};
+use futures::{
+    future::{BoxFuture, Either},
+    FutureExt, StreamExt,
+};
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::dial_opts::PeerCondition;
-use libp2p_swarm::{dial_opts::DialOpts, NetworkBehaviour, Swarm, SwarmEvent};
-use std::fmt::Debug;
-use std::future::IntoFuture;
-use std::time::Duration;
+use libp2p_swarm::{
+    dial_opts::{DialOpts, PeerCondition},
+    NetworkBehaviour, Swarm, SwarmEvent,
+};
 
-/// An extension trait for [`Swarm`] that makes it easier to set up a network of [`Swarm`]s for tests.
+/// An extension trait for [`Swarm`] that makes it
+/// easier to set up a network of [`Swarm`]s for tests.
 #[async_trait]
 pub trait SwarmExt {
     type NB: NetworkBehaviour;
 
     /// Create a new [`Swarm`] with an ephemeral identity and the `async-std` runtime.
     ///
-    /// The swarm will use a [`libp2p_core::transport::MemoryTransport`] together with a [`libp2p_plaintext::Config`] authentication layer and
-    /// [`libp2p_yamux::Config`] as the multiplexer. However, these details should not be relied upon by the test
-    /// and may change at any time.
+    /// The swarm will use a [`libp2p_core::transport::MemoryTransport`] together with a
+    /// [`libp2p_plaintext::Config`] authentication layer and [`libp2p_yamux::Config`] as the
+    /// multiplexer. However, these details should not be relied
+    /// upon by the test and may change at any time.
     #[cfg(feature = "async-std")]
     fn new_ephemeral(behaviour_fn: impl FnOnce(libp2p_identity::Keypair) -> Self::NB) -> Self
     where
@@ -46,19 +51,22 @@ pub trait SwarmExt {
 
     /// Create a new [`Swarm`] with an ephemeral identity and the `tokio` runtime.
     ///
-    /// The swarm will use a [`libp2p_core::transport::MemoryTransport`] together with a [`libp2p_plaintext::Config`] authentication layer and
-    /// [`libp2p_yamux::Config`] as the multiplexer. However, these details should not be relied upon by the test
-    /// and may change at any time.
+    /// The swarm will use a [`libp2p_core::transport::MemoryTransport`] together with a
+    /// [`libp2p_plaintext::Config`] authentication layer and [`libp2p_yamux::Config`] as the
+    /// multiplexer. However, these details should not be relied
+    /// upon by the test and may change at any time.
     #[cfg(feature = "tokio")]
     fn new_ephemeral_tokio(behaviour_fn: impl FnOnce(libp2p_identity::Keypair) -> Self::NB) -> Self
     where
         Self: Sized;
 
-    /// Establishes a connection to the given [`Swarm`], polling both of them until the connection is established.
+    /// Establishes a connection to the given [`Swarm`], polling both of them until the connection
+    /// is established.
     ///
     /// This will take addresses from the `other` [`Swarm`] via [`Swarm::external_addresses`].
     /// By default, this iterator will not yield any addresses.
-    /// To add listen addresses as external addresses, use [`ListenFuture::with_memory_addr_external`] or [`ListenFuture::with_tcp_addr_external`].
+    /// To add listen addresses as external addresses, use
+    /// [`ListenFuture::with_memory_addr_external`] or [`ListenFuture::with_tcp_addr_external`].
     async fn connect<T>(&mut self, other: &mut Swarm<T>)
     where
         T: NetworkBehaviour + Send,
@@ -66,10 +74,12 @@ pub trait SwarmExt {
 
     /// Dial the provided address and wait until a connection has been established.
     ///
-    /// In a normal test scenario, you should prefer [`SwarmExt::connect`] but that is not always possible.
-    /// This function only abstracts away the "dial and wait for `ConnectionEstablished` event" part.
+    /// In a normal test scenario, you should prefer [`SwarmExt::connect`] but that is not always
+    /// possible. This function only abstracts away the "dial and wait for
+    /// `ConnectionEstablished` event" part.
     ///
-    /// Because we don't have access to the other [`Swarm`], we can't guarantee that it makes progress.
+    /// Because we don't have access to the other [`Swarm`],
+    /// we can't guarantee that it makes progress.
     async fn dial_and_wait(&mut self, addr: Multiaddr) -> PeerId;
 
     /// Wait for specified condition to return `Some`.
@@ -78,7 +88,8 @@ pub trait SwarmExt {
         P: Fn(SwarmEvent<<Self::NB as NetworkBehaviour>::ToSwarm>) -> Option<E>,
         P: Send;
 
-    /// Listens for incoming connections, polling the [`Swarm`] until the transport is ready to accept connections.
+    /// Listens for incoming connections, polling the [`Swarm`] until the
+    /// transport is ready to accept connections.
     ///
     /// The first address is for the memory transport, the second one for the TCP transport.
     fn listen(&mut self) -> ListenFuture<&mut Self>;
@@ -102,17 +113,19 @@ pub trait SwarmExt {
 ///
 /// ## Number of events
 ///
-/// The number of events is configured via const generics based on the array size of the return type.
-/// This allows the compiler to infer how many events you are expecting based on how you use this function.
-/// For example, if you expect the first [`Swarm`] to emit 2 events, you should assign the first variable of the returned tuple value to an array of size 2.
-/// This works especially well if you directly pattern-match on the return value.
+/// The number of events is configured via const generics based on the array size of the return
+/// type. This allows the compiler to infer how many events you are expecting based on how you use
+/// this function. For example, if you expect the first [`Swarm`] to emit 2 events, you should
+/// assign the first variable of the returned tuple value to an array of size 2. This works
+/// especially well if you directly pattern-match on the return value.
 ///
 /// ## Type of event
 ///
 /// This function utilizes the [`TryIntoOutput`] trait.
 /// Similar as to the number of expected events, the type of event is inferred based on your usage.
 /// If you match against a [`SwarmEvent`], the first [`SwarmEvent`] will be returned.
-/// If you match against your [`NetworkBehaviour::ToSwarm`] type, [`SwarmEvent`]s which are not [`SwarmEvent::Behaviour`] will be skipped until the [`Swarm`] returns a behaviour event.
+/// If you match against your [`NetworkBehaviour::ToSwarm`] type, [`SwarmEvent`]s which are not
+/// [`SwarmEvent::Behaviour`] will be skipped until the [`Swarm`] returns a behaviour event.
 ///
 /// You can implement the [`TryIntoOutput`] for any other type to further customize this behaviour.
 ///
@@ -120,13 +133,16 @@ pub trait SwarmExt {
 ///
 /// This function is similar to joining two futures with two crucial differences:
 /// 1. As described above, it allows you to obtain more than a single event.
-/// 2. More importantly, it will continue to poll the [`Swarm`]s **even if they already has emitted all expected events**.
+/// 2. More importantly, it will continue to poll the [`Swarm`]s **even if they already has emitted
+///    all expected events**.
 ///
 /// Especially (2) is crucial for our usage of this function.
 /// If a [`Swarm`] is not polled, nothing within it makes progress.
-/// This can "starve" the other swarm which for example may wait for another message to be sent on a connection.
+/// This can "starve" the other swarm which for example may wait for another message to be sent on a
+/// connection.
 ///
-/// Using [`drive`] instead of [`futures::future::join`] ensures that a [`Swarm`] continues to be polled, even after it emitted its events.
+/// Using [`drive`] instead of [`futures::future::join`] ensures that a [`Swarm`] continues to be
+/// polled, even after it emitted its events.
 pub async fn drive<
     TBehaviour1,
     const NUM_EVENTS_SWARM_1: usize,
@@ -231,7 +247,12 @@ where
             behaviour_fn(identity),
             peer_id,
             libp2p_swarm::Config::with_async_std_executor()
-                .with_idle_connection_timeout(Duration::from_secs(5)), // Some tests need connections to be kept alive beyond what the individual behaviour configures.,
+                // Some tests need
+                // connections to be kept
+                // alive beyond what the
+                // individual behaviour
+                // configures.,
+                .with_idle_connection_timeout(Duration::from_secs(5)),
         )
     }
 
@@ -259,7 +280,11 @@ where
             behaviour_fn(identity),
             peer_id,
             libp2p_swarm::Config::with_tokio_executor()
-                .with_idle_connection_timeout(Duration::from_secs(5)), // Some tests need connections to be kept alive beyond what the individual behaviour configures.,
+                .with_idle_connection_timeout(Duration::from_secs(5)), /* Some tests need
+                                                                        * connections to be kept
+                                                                        * alive beyond what the
+                                                                        * individual behaviour
+                                                                        * configures., */
         )
     }
 
@@ -385,20 +410,24 @@ pub struct ListenFuture<S> {
 }
 
 impl<S> ListenFuture<S> {
-    /// Adds the memory address we are starting to listen on as an external address using [`Swarm::add_external_address`].
+    /// Adds the memory address we are starting to listen on as an external address using
+    /// [`Swarm::add_external_address`].
     ///
-    /// This is typically "safe" for tests because within a process, memory addresses are "globally" reachable.
-    /// However, some tests depend on which addresses are external and need this to be configurable so it is not a good default.
+    /// This is typically "safe" for tests because within a process, memory addresses are "globally"
+    /// reachable. However, some tests depend on which addresses are external and need this to
+    /// be configurable so it is not a good default.
     pub fn with_memory_addr_external(mut self) -> Self {
         self.add_memory_external = true;
 
         self
     }
 
-    /// Adds the TCP address we are starting to listen on as an external address using [`Swarm::add_external_address`].
+    /// Adds the TCP address we are starting to listen on as an external address using
+    /// [`Swarm::add_external_address`].
     ///
-    /// This is typically "safe" for tests because on the same machine, 127.0.0.1 is reachable for other [`Swarm`]s.
-    /// However, some tests depend on which addresses are external and need this to be configurable so it is not a good default.
+    /// This is typically "safe" for tests because on the same machine, 127.0.0.1 is reachable for
+    /// other [`Swarm`]s. However, some tests depend on which addresses are external and need
+    /// this to be configurable so it is not a good default.
     pub fn with_tcp_addr_external(mut self) -> Self {
         self.add_tcp_external = true;
 
diff --git a/swarm/benches/connection_handler.rs b/swarm/benches/connection_handler.rs
index 09340421f83..a5e47528308 100644
--- a/swarm/benches/connection_handler.rs
+++ b/swarm/benches/connection_handler.rs
@@ -1,3 +1,5 @@
+use std::{convert::Infallible, sync::atomic::AtomicUsize};
+
 use async_std::stream::StreamExt;
 use criterion::{criterion_group, criterion_main, Criterion};
 use libp2p_core::{
@@ -5,7 +7,6 @@ use libp2p_core::{
 };
 use libp2p_identity::PeerId;
 use libp2p_swarm::{ConnectionHandler, NetworkBehaviour, StreamProtocol};
-use std::{convert::Infallible, sync::atomic::AtomicUsize};
 use web_time::Duration;
 
 macro_rules! gen_behaviour {
@@ -82,7 +83,7 @@ benchmarks! {
         SpinningBehaviour20::bench().name(m).poll_count(500).protocols_per_behaviour(100),
     ];
 }
-//fn main() {}
+// fn main() {}
 
 trait BigBehaviour: Sized {
     fn behaviours(&mut self) -> &mut [SpinningBehaviour];
diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
index 35aed12fba5..8c8c5998f67 100644
--- a/swarm/src/behaviour.rs
+++ b/swarm/src/behaviour.rs
@@ -24,23 +24,22 @@ mod listen_addresses;
 mod peer_addresses;
 pub mod toggle;
 
-pub use external_addresses::ExternalAddresses;
-pub use listen_addresses::ListenAddresses;
-pub use peer_addresses::PeerAddresses;
+use std::task::{Context, Poll};
 
-use crate::connection::ConnectionId;
-use crate::dial_opts::DialOpts;
-use crate::listen_opts::ListenOpts;
-use crate::{
-    ConnectionDenied, ConnectionError, ConnectionHandler, DialError, ListenError, THandler,
-    THandlerInEvent, THandlerOutEvent,
-};
+pub use external_addresses::ExternalAddresses;
 use libp2p_core::{
     transport::{ListenerId, PortUse},
     ConnectedPoint, Endpoint, Multiaddr,
 };
 use libp2p_identity::PeerId;
-use std::{task::Context, task::Poll};
+pub use listen_addresses::ListenAddresses;
+pub use peer_addresses::PeerAddresses;
+
+use crate::{
+    connection::ConnectionId, dial_opts::DialOpts, listen_opts::ListenOpts, ConnectionDenied,
+    ConnectionError, ConnectionHandler, DialError, ListenError, THandler, THandlerInEvent,
+    THandlerOutEvent,
+};
 
 /// A [`NetworkBehaviour`] defines the behaviour of the local node on the network.
 ///
@@ -101,25 +100,25 @@ use std::{task::Context, task::Poll};
 /// #[behaviour(to_swarm = "Event")]
 /// # #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
 /// struct MyBehaviour {
-///   identify: identify::Behaviour,
-///   ping: ping::Behaviour,
+///     identify: identify::Behaviour,
+///     ping: ping::Behaviour,
 /// }
 ///
 /// enum Event {
-///   Identify(identify::Event),
-///   Ping(ping::Event),
+///     Identify(identify::Event),
+///     Ping(ping::Event),
 /// }
 ///
 /// impl From<identify::Event> for Event {
-///   fn from(event: identify::Event) -> Self {
-///     Self::Identify(event)
-///   }
+///     fn from(event: identify::Event) -> Self {
+///         Self::Identify(event)
+///     }
 /// }
 ///
 /// impl From<ping::Event> for Event {
-///   fn from(event: ping::Event) -> Self {
-///     Self::Ping(event)
-///   }
+///     fn from(event: ping::Event) -> Self {
+///         Self::Ping(event)
+///     }
 /// }
 /// ```
 pub trait NetworkBehaviour: 'static {
@@ -131,8 +130,8 @@ pub trait NetworkBehaviour: 'static {
 
     /// Callback that is invoked for every new inbound connection.
     ///
-    /// At this point in the connection lifecycle, only the remote's and our local address are known.
-    /// We have also already allocated a [`ConnectionId`].
+    /// At this point in the connection lifecycle, only the remote's and our local address are
+    /// known. We have also already allocated a [`ConnectionId`].
     ///
     /// Any error returned from this function will immediately abort the dial attempt.
     fn handle_pending_inbound_connection(
@@ -148,9 +147,10 @@ pub trait NetworkBehaviour: 'static {
     ///
     /// This is invoked once another peer has successfully dialed us.
     ///
-    /// At this point, we have verified their [`PeerId`] and we know, which particular [`Multiaddr`] succeeded in the dial.
-    /// In order to actually use this connection, this function must return a [`ConnectionHandler`].
-    /// Returning an error will immediately close the connection.
+    /// At this point, we have verified their [`PeerId`] and we know, which particular [`Multiaddr`]
+    /// succeeded in the dial. In order to actually use this connection, this function must
+    /// return a [`ConnectionHandler`]. Returning an error will immediately close the
+    /// connection.
     ///
     /// Note when any composed behaviour returns an error the connection will be closed and a
     /// [`FromSwarm::ListenFailure`] event will be emitted.
@@ -168,10 +168,14 @@ pub trait NetworkBehaviour: 'static {
     ///
     /// - The [`PeerId`], if known. Remember that we can dial without a [`PeerId`].
     /// - All addresses passed to [`DialOpts`] are passed in here too.
-    /// - The effective [`Role`](Endpoint) of this peer in the dial attempt. Typically, this is set to [`Endpoint::Dialer`] except if we are attempting a hole-punch.
-    /// - The [`ConnectionId`] identifying the future connection resulting from this dial, if successful.
+    /// - The effective [`Role`](Endpoint) of this peer in the dial attempt. Typically, this is set
+    ///   to [`Endpoint::Dialer`] except if we are attempting a hole-punch.
+    /// - The [`ConnectionId`] identifying the future connection resulting from this dial, if
+    ///   successful.
     ///
-    /// Note that the addresses returned from this function are only used for dialing if [`WithPeerIdWithAddresses::extend_addresses_through_behaviour`](crate::dial_opts::WithPeerIdWithAddresses::extend_addresses_through_behaviour) is set.
+    /// Note that the addresses returned from this function are only used for dialing if
+    /// [`WithPeerIdWithAddresses::extend_addresses_through_behaviour`](crate::dial_opts::WithPeerIdWithAddresses::extend_addresses_through_behaviour)
+    /// is set.
     ///
     /// Any error returned from this function will immediately abort the dial attempt.
     fn handle_pending_outbound_connection(
@@ -187,9 +191,10 @@ pub trait NetworkBehaviour: 'static {
     /// Callback that is invoked for every established outbound connection.
     ///
     /// This is invoked once we have successfully dialed a peer.
-    /// At this point, we have verified their [`PeerId`] and we know, which particular [`Multiaddr`] succeeded in the dial.
-    /// In order to actually use this connection, this function must return a [`ConnectionHandler`].
-    /// Returning an error will immediately close the connection.
+    /// At this point, we have verified their [`PeerId`] and we know, which particular [`Multiaddr`]
+    /// succeeded in the dial. In order to actually use this connection, this function must
+    /// return a [`ConnectionHandler`]. Returning an error will immediately close the
+    /// connection.
     ///
     /// Note when any composed behaviour returns an error the connection will be closed and a
     /// [`FromSwarm::DialFailure`] event will be emitted.
@@ -240,8 +245,9 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
     /// On failure, [`NetworkBehaviour::on_swarm_event`] with `DialFailure` is invoked.
     ///
     /// [`DialOpts`] provides access to the [`ConnectionId`] via [`DialOpts::connection_id`].
-    /// This [`ConnectionId`] will be used throughout the connection's lifecycle to associate events with it.
-    /// This allows a [`NetworkBehaviour`] to identify a connection that resulted out of its own dial request.
+    /// This [`ConnectionId`] will be used throughout the connection's lifecycle to associate
+    /// events with it. This allows a [`NetworkBehaviour`] to identify a connection that
+    /// resulted out of its own dial request.
     Dial { opts: DialOpts },
 
     /// Instructs the [`Swarm`](crate::Swarm) to listen on the provided address.
@@ -253,8 +259,8 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
     /// Instructs the `Swarm` to send an event to the handler dedicated to a
     /// connection with a peer.
     ///
-    /// If the `Swarm` is connected to the peer, the message is delivered to the [`ConnectionHandler`]
-    /// instance identified by the peer ID and connection ID.
+    /// If the `Swarm` is connected to the peer, the message is delivered to the
+    /// [`ConnectionHandler`] instance identified by the peer ID and connection ID.
     ///
     /// If the specified connection no longer exists, the event is silently dropped.
     ///
@@ -278,11 +284,12 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
     ///
     /// The emphasis on a **new** candidate is important.
     /// Protocols MUST take care to only emit a candidate once per "source".
-    /// For example, the observed address of a TCP connection does not change throughout its lifetime.
-    /// Thus, only one candidate should be emitted per connection.
+    /// For example, the observed address of a TCP connection does not change throughout its
+    /// lifetime. Thus, only one candidate should be emitted per connection.
     ///
-    /// This makes the report frequency of an address a meaningful data-point for consumers of this event.
-    /// This address will be shared with all [`NetworkBehaviour`]s via [`FromSwarm::NewExternalAddrCandidate`].
+    /// This makes the report frequency of an address a meaningful data-point for consumers of this
+    /// event. This address will be shared with all [`NetworkBehaviour`]s via
+    /// [`FromSwarm::NewExternalAddrCandidate`].
     ///
     /// This address could come from a variety of sources:
     /// - A protocol such as identify obtained it from a remote.
@@ -290,25 +297,32 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
     /// - We made an educated guess based on one of our listen addresses.
     NewExternalAddrCandidate(Multiaddr),
 
-    /// Indicates to the [`Swarm`](crate::Swarm) that the provided address is confirmed to be externally reachable.
+    /// Indicates to the [`Swarm`](crate::Swarm) that the provided address is confirmed to be
+    /// externally reachable.
     ///
-    /// This is intended to be issued in response to a [`FromSwarm::NewExternalAddrCandidate`] if we are indeed externally reachable on this address.
-    /// This address will be shared with all [`NetworkBehaviour`]s via [`FromSwarm::ExternalAddrConfirmed`].
+    /// This is intended to be issued in response to a [`FromSwarm::NewExternalAddrCandidate`] if
+    /// we are indeed externally reachable on this address. This address will be shared with
+    /// all [`NetworkBehaviour`]s via [`FromSwarm::ExternalAddrConfirmed`].
     ExternalAddrConfirmed(Multiaddr),
 
-    /// Indicates to the [`Swarm`](crate::Swarm) that we are no longer externally reachable under the provided address.
+    /// Indicates to the [`Swarm`](crate::Swarm) that we are no longer externally reachable under
+    /// the provided address.
     ///
     /// This expires an address that was earlier confirmed via [`ToSwarm::ExternalAddrConfirmed`].
-    /// This address will be shared with all [`NetworkBehaviour`]s via [`FromSwarm::ExternalAddrExpired`].
+    /// This address will be shared with all [`NetworkBehaviour`]s via
+    /// [`FromSwarm::ExternalAddrExpired`].
     ExternalAddrExpired(Multiaddr),
 
-    /// Instructs the `Swarm` to initiate a graceful close of one or all connections with the given peer.
+    /// Instructs the `Swarm` to initiate a graceful close of one or all connections with the given
+    /// peer.
     ///
-    /// Closing a connection via [`ToSwarm::CloseConnection`] will poll [`ConnectionHandler::poll_close`] to completion.
-    /// In most cases, stopping to "use" a connection is enough to have it closed.
-    /// The keep-alive algorithm will close a connection automatically once all [`ConnectionHandler`]s are idle.
+    /// Closing a connection via [`ToSwarm::CloseConnection`] will poll
+    /// [`ConnectionHandler::poll_close`] to completion. In most cases, stopping to "use" a
+    /// connection is enough to have it closed. The keep-alive algorithm will close a
+    /// connection automatically once all [`ConnectionHandler`]s are idle.
     ///
-    /// Use this command if you want to close a connection _despite_ it still being in use by one or more handlers.
+    /// Use this command if you want to close a connection _despite_ it still being in use by one
+    /// or more handlers.
     CloseConnection {
         /// The peer to disconnect.
         peer_id: PeerId,
@@ -316,7 +330,8 @@ pub enum ToSwarm<TOutEvent, TInEvent> {
         connection: CloseConnection,
     },
 
-    /// Reports external address of a remote peer to the [`Swarm`](crate::Swarm) and through that to other [`NetworkBehaviour`]s.
+    /// Reports external address of a remote peer to the [`Swarm`](crate::Swarm) and through that
+    /// to other [`NetworkBehaviour`]s.
     NewExternalAddrOfPeer { peer_id: PeerId, address: Multiaddr },
 }
 
@@ -440,8 +455,8 @@ pub enum FromSwarm<'a> {
     /// Informs the behaviour that an error
     /// happened on an incoming connection during its initial handshake.
     ///
-    /// This can include, for example, an error during the handshake of the encryption layer, or the
-    /// connection unexpectedly closed.
+    /// This can include, for example, an error during the handshake of the encryption layer, or
+    /// the connection unexpectedly closed.
     ListenFailure(ListenFailure<'a>),
     /// Informs the behaviour that a new listener was created.
     NewListener(NewListener),
@@ -455,11 +470,13 @@ pub enum FromSwarm<'a> {
     ListenerError(ListenerError<'a>),
     /// Informs the behaviour that a listener closed.
     ListenerClosed(ListenerClosed<'a>),
-    /// Informs the behaviour that we have discovered a new candidate for an external address for us.
+    /// Informs the behaviour that we have discovered a new candidate for an external address for
+    /// us.
     NewExternalAddrCandidate(NewExternalAddrCandidate<'a>),
     /// Informs the behaviour that an external address of the local node was confirmed.
     ExternalAddrConfirmed(ExternalAddrConfirmed<'a>),
-    /// Informs the behaviour that an external address of the local node expired, i.e. is no-longer confirmed.
+    /// Informs the behaviour that an external address of the local node expired, i.e. is no-longer
+    /// confirmed.
     ExternalAddrExpired(ExternalAddrExpired<'a>),
     /// Informs the behaviour that we have discovered a new external address for a remote peer.
     NewExternalAddrOfPeer(NewExternalAddrOfPeer<'a>),
@@ -559,7 +576,8 @@ pub struct ListenerClosed<'a> {
     pub reason: Result<(), &'a std::io::Error>,
 }
 
-/// [`FromSwarm`] variant that informs the behaviour about a new candidate for an external address for us.
+/// [`FromSwarm`] variant that informs the behaviour about a new candidate for an external address
+/// for us.
 #[derive(Debug, Clone, Copy)]
 pub struct NewExternalAddrCandidate<'a> {
     pub addr: &'a Multiaddr,
@@ -577,7 +595,8 @@ pub struct ExternalAddrExpired<'a> {
     pub addr: &'a Multiaddr,
 }
 
-/// [`FromSwarm`] variant that informs the behaviour that a new external address for a remote peer was detected.
+/// [`FromSwarm`] variant that informs the behaviour that a new external address for a remote peer
+/// was detected.
 #[derive(Clone, Copy, Debug)]
 pub struct NewExternalAddrOfPeer<'a> {
     pub peer_id: PeerId,
diff --git a/swarm/src/behaviour/either.rs b/swarm/src/behaviour/either.rs
index 7a51303e74d..b9a86e1b9d8 100644
--- a/swarm/src/behaviour/either.rs
+++ b/swarm/src/behaviour/either.rs
@@ -18,14 +18,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::behaviour::{self, NetworkBehaviour, ToSwarm};
-use crate::connection::ConnectionId;
-use crate::{ConnectionDenied, THandler, THandlerInEvent, THandlerOutEvent};
+use std::task::{Context, Poll};
+
 use either::Either;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use std::{task::Context, task::Poll};
+
+use crate::{
+    behaviour::{self, NetworkBehaviour, ToSwarm},
+    connection::ConnectionId,
+    ConnectionDenied, THandler, THandlerInEvent, THandlerOutEvent,
+};
 
 /// Implementation of [`NetworkBehaviour`] that can be either of two implementations.
 impl<L, R> NetworkBehaviour for Either<L, R>
diff --git a/swarm/src/behaviour/external_addresses.rs b/swarm/src/behaviour/external_addresses.rs
index 579f46fe486..ba2dd3eb890 100644
--- a/swarm/src/behaviour/external_addresses.rs
+++ b/swarm/src/behaviour/external_addresses.rs
@@ -1,6 +1,7 @@
-use crate::behaviour::{ExternalAddrConfirmed, ExternalAddrExpired, FromSwarm};
 use libp2p_core::Multiaddr;
 
+use crate::behaviour::{ExternalAddrConfirmed, ExternalAddrExpired, FromSwarm};
+
 /// The maximum number of local external addresses. When reached any
 /// further externally reported addresses are ignored. The behaviour always
 /// tracks all its listen addresses.
@@ -78,17 +79,20 @@ impl ExternalAddresses {
     }
 
     fn push_front(&mut self, addr: &Multiaddr) {
-        self.addresses.insert(0, addr.clone()); // We have at most `MAX_LOCAL_EXTERNAL_ADDRS` so this isn't very expensive.
+        // We have at most `MAX_LOCAL_EXTERNAL_ADDRS` so
+        // this isn't very expensive.
+        self.addresses.insert(0, addr.clone());
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_core::multiaddr::Protocol;
     use once_cell::sync::Lazy;
     use rand::Rng;
 
+    use super::*;
+
     #[test]
     fn new_external_addr_returns_correct_changed_value() {
         let mut addresses = ExternalAddresses::default();
diff --git a/swarm/src/behaviour/listen_addresses.rs b/swarm/src/behaviour/listen_addresses.rs
index 6076f5e7923..0c685d798c7 100644
--- a/swarm/src/behaviour/listen_addresses.rs
+++ b/swarm/src/behaviour/listen_addresses.rs
@@ -1,7 +1,9 @@
-use crate::behaviour::{ExpiredListenAddr, FromSwarm, NewListenAddr};
-use libp2p_core::Multiaddr;
 use std::collections::HashSet;
 
+use libp2p_core::Multiaddr;
+
+use crate::behaviour::{ExpiredListenAddr, FromSwarm, NewListenAddr};
+
 /// Utility struct for tracking the addresses a [`Swarm`](crate::Swarm) is listening on.
 #[derive(Debug, Default, Clone)]
 pub struct ListenAddresses {
@@ -32,10 +34,11 @@ impl ListenAddresses {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_core::{multiaddr::Protocol, transport::ListenerId};
     use once_cell::sync::Lazy;
 
+    use super::*;
+
     #[test]
     fn new_listen_addr_returns_correct_changed_value() {
         let mut addresses = ListenAddresses::default();
diff --git a/swarm/src/behaviour/peer_addresses.rs b/swarm/src/behaviour/peer_addresses.rs
index 1eeead56ca1..5aeae7741d5 100644
--- a/swarm/src/behaviour/peer_addresses.rs
+++ b/swarm/src/behaviour/peer_addresses.rs
@@ -1,12 +1,10 @@
-use crate::behaviour::FromSwarm;
-use crate::{DialError, DialFailure, NewExternalAddrOfPeer};
+use std::num::NonZeroUsize;
 
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
-
 use lru::LruCache;
 
-use std::num::NonZeroUsize;
+use crate::{behaviour::FromSwarm, DialError, DialFailure, NewExternalAddrOfPeer};
 
 /// Struct for tracking peers' external addresses of the [`Swarm`](crate::Swarm).
 #[derive(Debug)]
@@ -46,7 +44,6 @@ impl PeerAddresses {
     /// Appends address to the existing set if peer addresses already exist.
     /// Creates a new cache entry for peer_id if no addresses are present.
     /// Returns true if the newly added address was not previously in the cache.
-    ///
     pub fn add(&mut self, peer: PeerId, address: Multiaddr) -> bool {
         match prepare_addr(&peer, &address) {
             Ok(address) => {
@@ -98,17 +95,17 @@ impl Default for PeerAddresses {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::io;
 
-    use crate::ConnectionId;
     use libp2p_core::{
         multiaddr::Protocol,
         transport::{memory::MemoryTransportError, TransportError},
     };
-
     use once_cell::sync::Lazy;
 
+    use super::*;
+    use crate::ConnectionId;
+
     #[test]
     fn new_peer_addr_returns_correct_changed_value() {
         let mut cache = PeerAddresses::default();
diff --git a/swarm/src/behaviour/toggle.rs b/swarm/src/behaviour/toggle.rs
index 3dde364bf19..e70e6cf9896 100644
--- a/swarm/src/behaviour/toggle.rs
+++ b/swarm/src/behaviour/toggle.rs
@@ -18,22 +18,24 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::behaviour::FromSwarm;
-use crate::connection::ConnectionId;
-use crate::handler::{
-    AddressChange, ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
-    FullyNegotiatedInbound, FullyNegotiatedOutbound, ListenUpgradeError, SubstreamProtocol,
-};
-use crate::upgrade::SendWrapper;
-use crate::{
-    ConnectionDenied, NetworkBehaviour, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
-};
+use std::task::{Context, Poll};
+
 use either::Either;
 use futures::future;
-use libp2p_core::transport::PortUse;
-use libp2p_core::{upgrade::DeniedUpgrade, Endpoint, Multiaddr};
+use libp2p_core::{transport::PortUse, upgrade::DeniedUpgrade, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use std::{task::Context, task::Poll};
+
+use crate::{
+    behaviour::FromSwarm,
+    connection::ConnectionId,
+    handler::{
+        AddressChange, ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent,
+        DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound, ListenUpgradeError,
+        SubstreamProtocol,
+    },
+    upgrade::SendWrapper,
+    ConnectionDenied, NetworkBehaviour, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+};
 
 /// Implementation of `NetworkBehaviour` that can be either in the disabled or enabled state.
 ///
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 78c007fd71d..32cae54a5ef 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -23,42 +23,47 @@ mod error;
 pub(crate) mod pool;
 mod supported_protocols;
 
+use std::{
+    collections::{HashMap, HashSet},
+    fmt,
+    fmt::{Display, Formatter},
+    future::Future,
+    io, mem,
+    pin::Pin,
+    sync::atomic::{AtomicUsize, Ordering},
+    task::{Context, Poll, Waker},
+    time::Duration,
+};
+
 pub use error::ConnectionError;
 pub(crate) use error::{
     PendingConnectionError, PendingInboundConnectionError, PendingOutboundConnectionError,
 };
-use libp2p_core::transport::PortUse;
+use futures::{future::BoxFuture, stream, stream::FuturesUnordered, FutureExt, StreamExt};
+use futures_timer::Delay;
+use libp2p_core::{
+    connection::ConnectedPoint,
+    multiaddr::Multiaddr,
+    muxing::{StreamMuxerBox, StreamMuxerEvent, StreamMuxerExt, SubstreamBox},
+    transport::PortUse,
+    upgrade,
+    upgrade::{NegotiationError, ProtocolError},
+    Endpoint,
+};
+use libp2p_identity::PeerId;
 pub use supported_protocols::SupportedProtocols;
+use web_time::Instant;
 
-use crate::handler::{
-    AddressChange, ConnectionEvent, ConnectionHandler, DialUpgradeError, FullyNegotiatedInbound,
-    FullyNegotiatedOutbound, ListenUpgradeError, ProtocolSupport, ProtocolsChange, UpgradeInfoSend,
-};
-use crate::stream::ActiveStreamCounter;
-use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend};
 use crate::{
+    handler::{
+        AddressChange, ConnectionEvent, ConnectionHandler, DialUpgradeError,
+        FullyNegotiatedInbound, FullyNegotiatedOutbound, ListenUpgradeError, ProtocolSupport,
+        ProtocolsChange, UpgradeInfoSend,
+    },
+    stream::ActiveStreamCounter,
+    upgrade::{InboundUpgradeSend, OutboundUpgradeSend},
     ConnectionHandlerEvent, Stream, StreamProtocol, StreamUpgradeError, SubstreamProtocol,
 };
-use futures::future::BoxFuture;
-use futures::stream::FuturesUnordered;
-use futures::StreamExt;
-use futures::{stream, FutureExt};
-use futures_timer::Delay;
-use libp2p_core::connection::ConnectedPoint;
-use libp2p_core::multiaddr::Multiaddr;
-use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerEvent, StreamMuxerExt, SubstreamBox};
-use libp2p_core::upgrade;
-use libp2p_core::upgrade::{NegotiationError, ProtocolError};
-use libp2p_core::Endpoint;
-use libp2p_identity::PeerId;
-use std::collections::{HashMap, HashSet};
-use std::fmt::{Display, Formatter};
-use std::future::Future;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::task::Waker;
-use std::time::Duration;
-use std::{fmt, io, mem, pin::Pin, task::Context, task::Poll};
-use web_time::Instant;
 
 static NEXT_CONNECTION_ID: AtomicUsize = AtomicUsize::new(1);
 
@@ -72,7 +77,8 @@ impl ConnectionId {
     /// [`Swarm`](crate::Swarm) enforces that [`ConnectionId`]s are unique and not reused.
     /// This constructor does not, hence the _unchecked_.
     ///
-    /// It is primarily meant for allowing manual tests of [`NetworkBehaviour`](crate::NetworkBehaviour)s.
+    /// It is primarily meant for allowing manual tests of
+    /// [`NetworkBehaviour`](crate::NetworkBehaviour)s.
     pub fn new_unchecked(id: usize) -> Self {
         Self(id)
     }
@@ -147,8 +153,8 @@ where
     max_negotiating_inbound_streams: usize,
     /// Contains all upgrades that are waiting for a new outbound substream.
     ///
-    /// The upgrade timeout is already ticking here so this may fail in case the remote is not quick
-    /// enough in providing us with a new stream.
+    /// The upgrade timeout is already ticking here so this may fail in case the remote is not
+    /// quick enough in providing us with a new stream.
     requested_substreams: FuturesUnordered<
         SubstreamRequested<THandler::OutboundOpenInfo, THandler::OutboundProtocol>,
     >,
@@ -223,7 +229,8 @@ where
         self.handler.on_behaviour_event(event);
     }
 
-    /// Begins an orderly shutdown of the connection, returning a stream of final events and a `Future` that resolves when connection shutdown is complete.
+    /// Begins an orderly shutdown of the connection, returning a stream of final events and a
+    /// `Future` that resolves when connection shutdown is complete.
     pub(crate) fn close(
         self,
     ) -> (
@@ -320,7 +327,8 @@ where
                 }
             }
 
-            // In case the [`ConnectionHandler`] can not make any more progress, poll the negotiating outbound streams.
+            // In case the [`ConnectionHandler`] can not make any more progress, poll the
+            // negotiating outbound streams.
             match negotiating_out.poll_next_unpin(cx) {
                 Poll::Pending | Poll::Ready(None) => {}
                 Poll::Ready(Some((info, Ok(protocol)))) => {
@@ -368,7 +376,8 @@ where
             }
 
             // Check if the connection (and handler) should be shut down.
-            // As long as we're still negotiating substreams or have any active streams shutdown is always postponed.
+            // As long as we're still negotiating substreams or have
+            // any active streams shutdown is always postponed.
             if negotiating_in.is_empty()
                 && negotiating_out.is_empty()
                 && requested_substreams.is_empty()
@@ -419,7 +428,9 @@ where
                             stream_counter.clone(),
                         ));
 
-                        continue; // Go back to the top, handler can potentially make progress again.
+                        // Go back to the top,
+                        // handler can potentially make progress again.
+                        continue;
                     }
                 }
             }
@@ -436,7 +447,9 @@ where
                             stream_counter.clone(),
                         ));
 
-                        continue; // Go back to the top, handler can potentially make progress again.
+                        // Go back to the top,
+                        // handler can potentially make progress again.
+                        continue;
                     }
                 }
             }
@@ -451,10 +464,12 @@ where
                 for change in changes {
                     handler.on_connection_event(ConnectionEvent::LocalProtocolsChange(change));
                 }
-                continue; // Go back to the top, handler can potentially make progress again.
+                // Go back to the top, handler can potentially make progress again.
+                continue;
             }
 
-            return Poll::Pending; // Nothing can make progress, return `Pending`.
+            // Nothing can make progress, return `Pending`.
+            return Poll::Pending;
         }
     }
 
@@ -482,7 +497,8 @@ fn compute_new_shutdown(
 ) -> Option<Shutdown> {
     match (current_shutdown, handler_keep_alive) {
         (_, false) if idle_timeout == Duration::ZERO => Some(Shutdown::Asap),
-        (Shutdown::Later(_), false) => None, // Do nothing, i.e. let the shutdown timer continue to tick.
+        // Do nothing, i.e. let the shutdown timer continue to tick.
+        (Shutdown::Later(_), false) => None,
         (_, false) => {
             let now = Instant::now();
             let safe_keep_alive = checked_add_fraction(now, idle_timeout);
@@ -493,10 +509,12 @@ fn compute_new_shutdown(
     }
 }
 
-/// Repeatedly halves and adds the [`Duration`] to the [`Instant`] until [`Instant::checked_add`] succeeds.
+/// Repeatedly halves and adds the [`Duration`]
+/// to the [`Instant`] until [`Instant::checked_add`] succeeds.
 ///
-/// [`Instant`] depends on the underlying platform and has a limit of which points in time it can represent.
-/// The [`Duration`] computed by the this function may not be the longest possible that we can add to `now` but it will work.
+/// [`Instant`] depends on the underlying platform and has a limit of which points in time it can
+/// represent. The [`Duration`] computed by the this function may not be the longest possible that
+/// we can add to `now` but it will work.
 fn checked_add_fraction(start: Instant, mut duration: Duration) -> Duration {
     while start.checked_add(duration).is_none() {
         tracing::debug!(start=?start, duration=?duration, "start + duration cannot be presented, halving duration");
@@ -767,19 +785,23 @@ impl<T: AsRef<str>> std::hash::Hash for AsStrHashEq<T> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::dummy;
-    use futures::future;
-    use futures::AsyncRead;
-    use futures::AsyncWrite;
-    use libp2p_core::upgrade::{DeniedUpgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
-    use libp2p_core::StreamMuxer;
+    use std::{
+        convert::Infallible,
+        sync::{Arc, Weak},
+        time::Instant,
+    };
+
+    use futures::{future, AsyncRead, AsyncWrite};
+    use libp2p_core::{
+        upgrade::{DeniedUpgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo},
+        StreamMuxer,
+    };
     use quickcheck::*;
-    use std::convert::Infallible;
-    use std::sync::{Arc, Weak};
-    use std::time::Instant;
     use tracing_subscriber::EnvFilter;
 
+    use super::*;
+    use crate::dummy;
+
     #[test]
     fn max_negotiating_inbound_streams() {
         let _ = tracing_subscriber::fmt()
@@ -906,7 +928,8 @@ mod tests {
         );
         assert!(connection.handler.remote_removed.is_empty());
 
-        // Third, stop listening on a protocol it never advertised (we can't control what handlers do so this needs to be handled gracefully).
+        // Third, stop listening on a protocol it never advertised (we can't control what handlers
+        // do so this needs to be handled gracefully).
         connection.handler.remote_removes_support_for(&["/baz"]);
         let _ = connection.poll_noop_waker();
 
diff --git a/swarm/src/connection/error.rs b/swarm/src/connection/error.rs
index 33aa81c19a9..39e5a88fca6 100644
--- a/swarm/src/connection/error.rs
+++ b/swarm/src/connection/error.rs
@@ -18,11 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::transport::TransportError;
-use crate::Multiaddr;
-use crate::{ConnectedPoint, PeerId};
 use std::{fmt, io};
 
+use crate::{transport::TransportError, ConnectedPoint, Multiaddr, PeerId};
+
 /// Errors that can occur in the context of an established `Connection`.
 #[derive(Debug)]
 pub enum ConnectionError {
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index 7964ecbfa69..f42fd1f305c 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -18,41 +18,41 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-use crate::connection::{Connection, ConnectionId, PendingPoint};
-use crate::{
-    connection::{
-        Connected, ConnectionError, IncomingInfo, PendingConnectionError,
-        PendingInboundConnectionError, PendingOutboundConnectionError,
-    },
-    transport::TransportError,
-    ConnectedPoint, ConnectionHandler, Executor, Multiaddr, PeerId,
+use std::{
+    collections::HashMap,
+    convert::Infallible,
+    fmt,
+    num::{NonZeroU8, NonZeroUsize},
+    pin::Pin,
+    task::{Context, Poll, Waker},
 };
+
 use concurrent_dial::ConcurrentDial;
 use fnv::FnvHashMap;
-use futures::prelude::*;
-use futures::stream::SelectAll;
 use futures::{
     channel::{mpsc, oneshot},
     future::{poll_fn, BoxFuture, Either},
+    prelude::*,
     ready,
-    stream::FuturesUnordered,
+    stream::{FuturesUnordered, SelectAll},
 };
-use libp2p_core::connection::Endpoint;
-use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
-use libp2p_core::transport::PortUse;
-use std::convert::Infallible;
-use std::task::Waker;
-use std::{
-    collections::HashMap,
-    fmt,
-    num::{NonZeroU8, NonZeroUsize},
-    pin::Pin,
-    task::Context,
-    task::Poll,
+use libp2p_core::{
+    connection::Endpoint,
+    muxing::{StreamMuxerBox, StreamMuxerExt},
+    transport::PortUse,
 };
 use tracing::Instrument;
 use web_time::{Duration, Instant};
 
+use crate::{
+    connection::{
+        Connected, Connection, ConnectionError, ConnectionId, IncomingInfo, PendingConnectionError,
+        PendingInboundConnectionError, PendingOutboundConnectionError, PendingPoint,
+    },
+    transport::TransportError,
+    ConnectedPoint, ConnectionHandler, Executor, Multiaddr, PeerId,
+};
+
 mod concurrent_dial;
 mod task;
 
@@ -115,7 +115,8 @@ where
     /// See [`Connection::max_negotiating_inbound_streams`].
     max_negotiating_inbound_streams: usize,
 
-    /// How many [`task::EstablishedConnectionEvent`]s can be buffered before the connection is back-pressured.
+    /// How many [`task::EstablishedConnectionEvent`]s can be buffered before the connection is
+    /// back-pressured.
     per_connection_event_buffer_size: usize,
 
     /// The executor to use for running connection tasks. Can either be a global executor
@@ -247,13 +248,11 @@ pub(crate) enum PoolEvent<ToBehaviour> {
     ///
     /// A connection may close if
     ///
-    ///   * it encounters an error, which includes the connection being
-    ///     closed by the remote. In this case `error` is `Some`.
-    ///   * it was actively closed by [`EstablishedConnection::start_close`],
-    ///     i.e. a successful, orderly close.
-    ///   * it was actively closed by [`Pool::disconnect`], i.e.
-    ///     dropped without an orderly close.
-    ///
+    ///   * it encounters an error, which includes the connection being closed by the remote. In
+    ///     this case `error` is `Some`.
+    ///   * it was actively closed by [`EstablishedConnection::start_close`], i.e. a successful,
+    ///     orderly close.
+    ///   * it was actively closed by [`Pool::disconnect`], i.e. dropped without an orderly close.
     ConnectionClosed {
         id: ConnectionId,
         /// Information about the connection that errored.
diff --git a/swarm/src/connection/pool/concurrent_dial.rs b/swarm/src/connection/pool/concurrent_dial.rs
index 57e4b078098..99f0b385884 100644
--- a/swarm/src/connection/pool/concurrent_dial.rs
+++ b/swarm/src/connection/pool/concurrent_dial.rs
@@ -18,7 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{transport::TransportError, Multiaddr};
+use std::{
+    num::NonZeroU8,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{
     future::{BoxFuture, Future},
     ready,
@@ -26,11 +31,8 @@ use futures::{
 };
 use libp2p_core::muxing::StreamMuxerBox;
 use libp2p_identity::PeerId;
-use std::{
-    num::NonZeroU8,
-    pin::Pin,
-    task::{Context, Poll},
-};
+
+use crate::{transport::TransportError, Multiaddr};
 
 type Dial = BoxFuture<
     'static,
diff --git a/swarm/src/connection/pool/task.rs b/swarm/src/connection/pool/task.rs
index 3b808a30fd1..3a82e5c11d1 100644
--- a/swarm/src/connection/pool/task.rs
+++ b/swarm/src/connection/pool/task.rs
@@ -21,6 +21,15 @@
 
 //! Async functions driving pending and established connections in the form of a task.
 
+use std::{convert::Infallible, pin::Pin};
+
+use futures::{
+    channel::{mpsc, oneshot},
+    future::{poll_fn, Either, Future},
+    SinkExt, StreamExt,
+};
+use libp2p_core::muxing::StreamMuxerBox;
+
 use super::concurrent_dial::ConcurrentDial;
 use crate::{
     connection::{
@@ -30,14 +39,6 @@ use crate::{
     transport::TransportError,
     ConnectionHandler, Multiaddr, PeerId,
 };
-use futures::{
-    channel::{mpsc, oneshot},
-    future::{poll_fn, Either, Future},
-    SinkExt, StreamExt,
-};
-use libp2p_core::muxing::StreamMuxerBox;
-use std::convert::Infallible;
-use std::pin::Pin;
 
 /// Commands that can be sent to a task driving an established connection.
 #[derive(Debug)]
diff --git a/swarm/src/connection/supported_protocols.rs b/swarm/src/connection/supported_protocols.rs
index 124ec93d669..c167bf88649 100644
--- a/swarm/src/connection/supported_protocols.rs
+++ b/swarm/src/connection/supported_protocols.rs
@@ -1,7 +1,7 @@
-use crate::handler::ProtocolsChange;
-use crate::StreamProtocol;
 use std::collections::HashSet;
 
+use crate::{handler::ProtocolsChange, StreamProtocol};
+
 #[derive(Default, Clone, Debug)]
 pub struct SupportedProtocols {
     protocols: HashSet<StreamProtocol>,
diff --git a/swarm/src/dial_opts.rs b/swarm/src/dial_opts.rs
index 4f5b621327c..cdaaeb358b2 100644
--- a/swarm/src/dial_opts.rs
+++ b/swarm/src/dial_opts.rs
@@ -19,14 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::ConnectionId;
-use libp2p_core::connection::Endpoint;
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::PortUse;
-use libp2p_core::Multiaddr;
-use libp2p_identity::PeerId;
 use std::num::NonZeroU8;
 
+use libp2p_core::{connection::Endpoint, multiaddr::Protocol, transport::PortUse, Multiaddr};
+use libp2p_identity::PeerId;
+
+use crate::ConnectionId;
+
 macro_rules! fn_override_role {
     () => {
         /// Override role of local node on connection. I.e. execute the dial _as a
@@ -130,7 +129,8 @@ impl DialOpts {
     /// Get the [`ConnectionId`] of this dial attempt.
     ///
     /// All future events of this dial will be associated with this ID.
-    /// See [`DialFailure`](crate::DialFailure) and [`ConnectionEstablished`](crate::behaviour::ConnectionEstablished).
+    /// See [`DialFailure`](crate::DialFailure) and
+    /// [`ConnectionEstablished`](crate::behaviour::ConnectionEstablished).
     pub fn connection_id(&self) -> ConnectionId {
         self.connection_id
     }
@@ -324,8 +324,8 @@ impl WithoutPeerIdWithAddress {
 /// # use libp2p_identity::PeerId;
 /// #
 /// DialOpts::peer_id(PeerId::random())
-///    .condition(PeerCondition::Disconnected)
-///    .build();
+///     .condition(PeerCondition::Disconnected)
+///     .build();
 /// ```
 #[derive(Debug, Copy, Clone, Default)]
 pub enum PeerCondition {
diff --git a/swarm/src/dummy.rs b/swarm/src/dummy.rs
index b87ef32c8f7..5452c382cd4 100644
--- a/swarm/src/dummy.rs
+++ b/swarm/src/dummy.rs
@@ -1,19 +1,18 @@
-use crate::behaviour::{FromSwarm, NetworkBehaviour, ToSwarm};
-use crate::connection::ConnectionId;
-use crate::handler::{
-    ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
+use std::{
+    convert::Infallible,
+    task::{Context, Poll},
 };
+
+use libp2p_core::{transport::PortUse, upgrade::DeniedUpgrade, Endpoint, Multiaddr};
+use libp2p_identity::PeerId;
+
 use crate::{
+    behaviour::{FromSwarm, NetworkBehaviour, ToSwarm},
+    connection::ConnectionId,
+    handler::{ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound},
     ConnectionDenied, ConnectionHandlerEvent, StreamUpgradeError, SubstreamProtocol, THandler,
     THandlerInEvent, THandlerOutEvent,
 };
-use libp2p_core::transport::PortUse;
-use libp2p_core::upgrade::DeniedUpgrade;
-use libp2p_core::Endpoint;
-use libp2p_core::Multiaddr;
-use libp2p_identity::PeerId;
-use std::convert::Infallible;
-use std::task::{Context, Poll};
 
 /// Implementation of [`NetworkBehaviour`] that doesn't do anything.
 pub struct Behaviour;
@@ -61,7 +60,8 @@ impl NetworkBehaviour for Behaviour {
     fn on_swarm_event(&mut self, _event: FromSwarm) {}
 }
 
-/// An implementation of [`ConnectionHandler`] that neither handles any protocols nor does it keep the connection alive.
+/// An implementation of [`ConnectionHandler`] that neither handles any protocols nor does it keep
+/// the connection alive.
 #[derive(Clone)]
 pub struct ConnectionHandler;
 
diff --git a/swarm/src/executor.rs b/swarm/src/executor.rs
index a2abbbde6ef..db5ed6b2da4 100644
--- a/swarm/src/executor.rs
+++ b/swarm/src/executor.rs
@@ -1,14 +1,15 @@
 //! Provides executors for spawning background tasks.
-use futures::executor::ThreadPool;
 use std::{future::Future, pin::Pin};
 
+use futures::executor::ThreadPool;
+
 /// Implemented on objects that can run a `Future` in the background.
 ///
 /// > **Note**: While it may be tempting to implement this trait on types such as
-/// >           [`futures::stream::FuturesUnordered`], please note that passing an `Executor` is
-/// >           optional, and that `FuturesUnordered` (or a similar struct) will automatically
-/// >           be used as fallback by libp2p. The `Executor` trait should therefore only be
-/// >           about running `Future`s on a separate task.
+/// > [`futures::stream::FuturesUnordered`], please note that passing an `Executor` is
+/// > optional, and that `FuturesUnordered` (or a similar struct) will automatically
+/// > be used as fallback by libp2p. The `Executor` trait should therefore only be
+/// > about running `Future`s on a separate task.
 pub trait Executor {
     /// Run the given future in the background until it ends.
     #[track_caller]
diff --git a/swarm/src/handler.rs b/swarm/src/handler.rs
index 9e31592d68d..3d0407b4f70 100644
--- a/swarm/src/handler.rs
+++ b/swarm/src/handler.rs
@@ -34,9 +34,9 @@
 //! used protocol(s) determined by the associated types of the handlers.
 //!
 //! > **Note**: A [`ConnectionHandler`] handles one or more protocols in the context of a single
-//! >           connection with a remote. In order to handle a protocol that requires knowledge of
-//! >           the network as a whole, see the
-//! >           [`NetworkBehaviour`](crate::behaviour::NetworkBehaviour) trait.
+//! > connection with a remote. In order to handle a protocol that requires knowledge of
+//! > the network as a whole, see the
+//! > [`NetworkBehaviour`](crate::behaviour::NetworkBehaviour) trait.
 
 pub mod either;
 mod map_in;
@@ -46,8 +46,15 @@ mod one_shot;
 mod pending;
 mod select;
 
-use crate::connection::AsStrHashEq;
-pub use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend, SendWrapper, UpgradeInfoSend};
+use core::slice;
+use std::{
+    collections::{HashMap, HashSet},
+    error, fmt, io,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use libp2p_core::Multiaddr;
 pub use map_in::MapInEvent;
 pub use map_out::MapOutEvent;
 pub use one_shot::{OneShotHandler, OneShotHandlerConfig};
@@ -55,11 +62,8 @@ pub use pending::PendingConnectionHandler;
 pub use select::ConnectionHandlerSelect;
 use smallvec::SmallVec;
 
-use crate::StreamProtocol;
-use core::slice;
-use libp2p_core::Multiaddr;
-use std::collections::{HashMap, HashSet};
-use std::{error, fmt, io, task::Context, task::Poll, time::Duration};
+pub use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend, SendWrapper, UpgradeInfoSend};
+use crate::{connection::AsStrHashEq, StreamProtocol};
 
 /// A handler for a set of protocols used on a connection with a remote.
 ///
@@ -71,17 +75,17 @@ use std::{error, fmt, io, task::Context, task::Poll, time::Duration};
 /// Communication with a remote over a set of protocols is initiated in one of two ways:
 ///
 ///   1. Dialing by initiating a new outbound substream. In order to do so,
-///      [`ConnectionHandler::poll()`] must return an [`ConnectionHandlerEvent::OutboundSubstreamRequest`],
-///      providing an instance of [`libp2p_core::upgrade::OutboundUpgrade`] that is used to negotiate the
-///      protocol(s). Upon success, [`ConnectionHandler::on_connection_event`] is called with
+///      [`ConnectionHandler::poll()`] must return an
+///      [`ConnectionHandlerEvent::OutboundSubstreamRequest`], providing an instance of
+///      [`libp2p_core::upgrade::OutboundUpgrade`] that is used to negotiate the protocol(s). Upon
+///      success, [`ConnectionHandler::on_connection_event`] is called with
 ///      [`ConnectionEvent::FullyNegotiatedOutbound`] translating the final output of the upgrade.
 ///
-///   2. Listening by accepting a new inbound substream. When a new inbound substream
-///      is created on a connection, [`ConnectionHandler::listen_protocol`] is called
-///      to obtain an instance of [`libp2p_core::upgrade::InboundUpgrade`] that is used to
-///      negotiate the protocol(s). Upon success,
-///      [`ConnectionHandler::on_connection_event`] is called with [`ConnectionEvent::FullyNegotiatedInbound`]
-///      translating the final output of the upgrade.
+///   2. Listening by accepting a new inbound substream. When a new inbound substream is created on
+///      a connection, [`ConnectionHandler::listen_protocol`] is called to obtain an instance of
+///      [`libp2p_core::upgrade::InboundUpgrade`] that is used to negotiate the protocol(s). Upon
+///      success, [`ConnectionHandler::on_connection_event`] is called with
+///      [`ConnectionEvent::FullyNegotiatedInbound`] translating the final output of the upgrade.
 ///
 ///
 /// # Connection Keep-Alive
@@ -95,9 +99,13 @@ use std::{error, fmt, io, task::Context, task::Poll, time::Duration};
 /// When a connection is closed gracefully, the substreams used by the handler may still
 /// continue reading data until the remote closes its side of the connection.
 pub trait ConnectionHandler: Send + 'static {
-    /// A type representing the message(s) a [`NetworkBehaviour`](crate::behaviour::NetworkBehaviour) can send to a [`ConnectionHandler`] via [`ToSwarm::NotifyHandler`](crate::behaviour::ToSwarm::NotifyHandler)
+    /// A type representing the message(s) a
+    /// [`NetworkBehaviour`](crate::behaviour::NetworkBehaviour) can send to a [`ConnectionHandler`]
+    /// via [`ToSwarm::NotifyHandler`](crate::behaviour::ToSwarm::NotifyHandler)
     type FromBehaviour: fmt::Debug + Send + 'static;
-    /// A type representing message(s) a [`ConnectionHandler`] can send to a [`NetworkBehaviour`](crate::behaviour::NetworkBehaviour) via [`ConnectionHandlerEvent::NotifyBehaviour`].
+    /// A type representing message(s) a [`ConnectionHandler`] can send to a
+    /// [`NetworkBehaviour`](crate::behaviour::NetworkBehaviour) via
+    /// [`ConnectionHandlerEvent::NotifyBehaviour`].
     type ToBehaviour: fmt::Debug + Send + 'static;
     /// The inbound upgrade for the protocol(s) used by the handler.
     type InboundProtocol: InboundUpgradeSend;
@@ -112,9 +120,9 @@ pub trait ConnectionHandler: Send + 'static {
     /// substreams to negotiate the desired protocols.
     ///
     /// > **Note**: The returned `InboundUpgrade` should always accept all the generally
-    /// >           supported protocols, even if in a specific context a particular one is
-    /// >           not supported, (eg. when only allowing one substream at a time for a protocol).
-    /// >           This allows a remote to put the list of supported protocols in a cache.
+    /// > supported protocols, even if in a specific context a particular one is
+    /// > not supported, (eg. when only allowing one substream at a time for a protocol).
+    /// > This allows a remote to put the list of supported protocols in a cache.
     fn listen_protocol(&self) -> SubstreamProtocol<Self::InboundProtocol, Self::InboundOpenInfo>;
 
     /// Returns whether the connection should be kept alive.
@@ -127,15 +135,21 @@ pub trait ConnectionHandler: Send + 'static {
     /// - We are negotiating inbound or outbound streams.
     /// - There are active [`Stream`](crate::Stream)s on the connection.
     ///
-    /// The combination of the above means that _most_ protocols will not need to override this method.
-    /// This method is only invoked when all of the above are `false`, i.e. when the connection is entirely idle.
+    /// The combination of the above means that _most_ protocols will not need to override this
+    /// method. This method is only invoked when all of the above are `false`, i.e. when the
+    /// connection is entirely idle.
     ///
     /// ## Exceptions
     ///
-    /// - Protocols like [circuit-relay v2](https://github.com/libp2p/specs/blob/master/relay/circuit-v2.md) need to keep a connection alive beyond these circumstances and can thus override this method.
-    /// - Protocols like [ping](https://github.com/libp2p/specs/blob/master/ping/ping.md) **don't** want to keep a connection alive despite an active streams.
+    /// - Protocols like [circuit-relay v2](https://github.com/libp2p/specs/blob/master/relay/circuit-v2.md)
+    ///   need to keep a connection alive beyond these circumstances and can thus override this
+    ///   method.
+    /// - Protocols like [ping](https://github.com/libp2p/specs/blob/master/ping/ping.md) **don't**
+    ///   want to keep a connection alive despite an active streams.
     ///
-    /// In that case, protocol authors can use [`Stream::ignore_for_keep_alive`](crate::Stream::ignore_for_keep_alive) to opt-out a particular stream from the keep-alive algorithm.
+    /// In that case, protocol authors can use
+    /// [`Stream::ignore_for_keep_alive`](crate::Stream::ignore_for_keep_alive) to opt-out a
+    /// particular stream from the keep-alive algorithm.
     fn connection_keep_alive(&self) -> bool {
         false
     }
@@ -160,7 +174,8 @@ pub trait ConnectionHandler: Send + 'static {
     /// To signal completion, [`Poll::Ready(None)`] should be returned.
     ///
     /// Implementations MUST have a [`fuse`](futures::StreamExt::fuse)-like behaviour.
-    /// That is, [`Poll::Ready(None)`] MUST be returned on repeated calls to [`ConnectionHandler::poll_close`].
+    /// That is, [`Poll::Ready(None)`] MUST be returned on repeated calls to
+    /// [`ConnectionHandler::poll_close`].
     fn poll_close(&mut self, _: &mut Context<'_>) -> Poll<Option<Self::ToBehaviour>> {
         Poll::Ready(None)
     }
@@ -308,7 +323,8 @@ pub struct FullyNegotiatedInbound<IP: InboundUpgradeSend, IOI> {
     pub info: IOI,
 }
 
-/// [`ConnectionEvent`] variant that informs the handler about successful upgrade on a new outbound stream.
+/// [`ConnectionEvent`] variant that informs the handler about successful upgrade on a new outbound
+/// stream.
 ///
 /// The `protocol` field is the information that was previously passed to
 /// [`ConnectionHandlerEvent::OutboundSubstreamRequest`].
@@ -318,13 +334,15 @@ pub struct FullyNegotiatedOutbound<OP: OutboundUpgradeSend, OOI> {
     pub info: OOI,
 }
 
-/// [`ConnectionEvent`] variant that informs the handler about a change in the address of the remote.
+/// [`ConnectionEvent`] variant that informs the handler about a change in the address of the
+/// remote.
 #[derive(Debug)]
 pub struct AddressChange<'a> {
     pub new_address: &'a Multiaddr,
 }
 
-/// [`ConnectionEvent`] variant that informs the handler about a change in the protocols supported on the connection.
+/// [`ConnectionEvent`] variant that informs the handler about a change in the protocols supported
+/// on the connection.
 #[derive(Debug, Clone)]
 pub enum ProtocolsChange<'a> {
     Added(ProtocolsAdded<'a>),
@@ -373,9 +391,11 @@ impl<'a> ProtocolsChange<'a> {
         }))
     }
 
-    /// Compute the [`ProtocolsChange`] that results from removing `to_remove` from `existing_protocols`. Removes the protocols from `existing_protocols`.
+    /// Compute the [`ProtocolsChange`] that results from removing `to_remove` from
+    /// `existing_protocols`. Removes the protocols from `existing_protocols`.
     ///
-    /// Returns `None` if the change is a no-op, i.e. none of the protocols in `to_remove` are in `existing_protocols`.
+    /// Returns `None` if the change is a no-op, i.e. none of the protocols in `to_remove` are in
+    /// `existing_protocols`.
     pub(crate) fn remove(
         existing_protocols: &mut HashSet<StreamProtocol>,
         to_remove: HashSet<StreamProtocol>,
@@ -397,7 +417,8 @@ impl<'a> ProtocolsChange<'a> {
         }))
     }
 
-    /// Compute the [`ProtocolsChange`]s required to go from `existing_protocols` to `new_protocols`.
+    /// Compute the [`ProtocolsChange`]s required to go from `existing_protocols` to
+    /// `new_protocols`.
     pub(crate) fn from_full_sets<T: AsRef<str>>(
         existing_protocols: &mut HashMap<AsStrHashEq<T>, bool>,
         new_protocols: impl IntoIterator<Item = T>,
@@ -429,7 +450,8 @@ impl<'a> ProtocolsChange<'a> {
 
         let num_new_protocols = buffer.len();
         // Drain all protocols that we haven't visited.
-        // For existing protocols that are not in `new_protocols`, the boolean will be false, meaning we need to remove it.
+        // For existing protocols that are not in `new_protocols`, the boolean will be false,
+        // meaning we need to remove it.
         existing_protocols.retain(|p, &mut is_supported| {
             if !is_supported {
                 buffer.extend(StreamProtocol::try_from_owned(p.0.as_ref().to_owned()).ok());
diff --git a/swarm/src/handler/either.rs b/swarm/src/handler/either.rs
index a5aab9b5fee..1dc62e0eb2a 100644
--- a/swarm/src/handler/either.rs
+++ b/swarm/src/handler/either.rs
@@ -18,14 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::handler::{
-    ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, FullyNegotiatedInbound,
-    InboundUpgradeSend, ListenUpgradeError, SubstreamProtocol,
-};
-use crate::upgrade::SendWrapper;
+use std::task::{Context, Poll};
+
 use either::Either;
 use futures::future;
-use std::task::{Context, Poll};
+
+use crate::{
+    handler::{
+        ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, FullyNegotiatedInbound,
+        InboundUpgradeSend, ListenUpgradeError, SubstreamProtocol,
+    },
+    upgrade::SendWrapper,
+};
 
 impl<LIP, RIP, LIOI, RIOI>
     FullyNegotiatedInbound<Either<SendWrapper<LIP>, SendWrapper<RIP>>, Either<LIOI, RIOI>>
diff --git a/swarm/src/handler/map_in.rs b/swarm/src/handler/map_in.rs
index 9316ef4d2ce..55885b351bb 100644
--- a/swarm/src/handler/map_in.rs
+++ b/swarm/src/handler/map_in.rs
@@ -18,10 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    fmt::Debug,
+    marker::PhantomData,
+    task::{Context, Poll},
+};
+
 use crate::handler::{
     ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, SubstreamProtocol,
 };
-use std::{fmt::Debug, marker::PhantomData, task::Context, task::Poll};
 
 /// Wrapper around a protocol handler that turns the input event into something else.
 #[derive(Debug)]
diff --git a/swarm/src/handler/map_out.rs b/swarm/src/handler/map_out.rs
index f877bfa6f64..6d05551aeec 100644
--- a/swarm/src/handler/map_out.rs
+++ b/swarm/src/handler/map_out.rs
@@ -18,12 +18,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    fmt::Debug,
+    task::{Context, Poll},
+};
+
+use futures::ready;
+
 use crate::handler::{
     ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, SubstreamProtocol,
 };
-use futures::ready;
-use std::fmt::Debug;
-use std::task::{Context, Poll};
 
 /// Wrapper around a protocol handler that turns the output event into something else.
 #[derive(Debug)]
diff --git a/swarm/src/handler/multi.rs b/swarm/src/handler/multi.rs
index 5efcde5c2bb..73af1b1109e 100644
--- a/swarm/src/handler/multi.rs
+++ b/swarm/src/handler/multi.rs
@@ -21,14 +21,6 @@
 //! A [`ConnectionHandler`] implementation that combines multiple other [`ConnectionHandler`]s
 //! indexed by some key.
 
-use crate::handler::{
-    AddressChange, ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
-    FullyNegotiatedInbound, FullyNegotiatedOutbound, ListenUpgradeError, SubstreamProtocol,
-};
-use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend, UpgradeInfoSend};
-use crate::Stream;
-use futures::{future::BoxFuture, prelude::*, ready};
-use rand::Rng;
 use std::{
     cmp,
     collections::{HashMap, HashSet},
@@ -40,6 +32,19 @@ use std::{
     time::Duration,
 };
 
+use futures::{future::BoxFuture, prelude::*, ready};
+use rand::Rng;
+
+use crate::{
+    handler::{
+        AddressChange, ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent,
+        DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound, ListenUpgradeError,
+        SubstreamProtocol,
+    },
+    upgrade::{InboundUpgradeSend, OutboundUpgradeSend, UpgradeInfoSend},
+    Stream,
+};
+
 /// A [`ConnectionHandler`] for multiple [`ConnectionHandler`]s of the same type.
 #[derive(Clone)]
 pub struct MultiHandler<K, H> {
@@ -248,7 +253,8 @@ where
             return Poll::Pending;
         }
 
-        // Not always polling handlers in the same order should give anyone the chance to make progress.
+        // Not always polling handlers in the same order
+        // should give anyone the chance to make progress.
         let pos = rand::thread_rng().gen_range(0..self.handlers.len());
 
         for (k, h) in self.handlers.iter_mut().skip(pos) {
diff --git a/swarm/src/handler/one_shot.rs b/swarm/src/handler/one_shot.rs
index 7c84f4bb11a..29f2811522b 100644
--- a/swarm/src/handler/one_shot.rs
+++ b/swarm/src/handler/one_shot.rs
@@ -18,14 +18,23 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::handler::{
-    ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
-    FullyNegotiatedInbound, FullyNegotiatedOutbound, SubstreamProtocol,
+use std::{
+    error,
+    fmt::Debug,
+    task::{Context, Poll},
+    time::Duration,
 };
-use crate::upgrade::{InboundUpgradeSend, OutboundUpgradeSend};
-use crate::StreamUpgradeError;
+
 use smallvec::SmallVec;
-use std::{error, fmt::Debug, task::Context, task::Poll, time::Duration};
+
+use crate::{
+    handler::{
+        ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
+        FullyNegotiatedInbound, FullyNegotiatedOutbound, SubstreamProtocol,
+    },
+    upgrade::{InboundUpgradeSend, OutboundUpgradeSend},
+    StreamUpgradeError,
+};
 
 /// A [`ConnectionHandler`] that opens a new substream for each request.
 // TODO: Debug
@@ -71,7 +80,7 @@ where
     /// Returns a reference to the listen protocol configuration.
     ///
     /// > **Note**: If you modify the protocol, modifications will only applies to future inbound
-    /// >           substreams, not the ones already being negotiated.
+    /// > substreams, not the ones already being negotiated.
     pub fn listen_protocol_ref(&self) -> &SubstreamProtocol<TInbound, ()> {
         &self.listen_protocol
     }
@@ -79,7 +88,7 @@ where
     /// Returns a mutable reference to the listen protocol configuration.
     ///
     /// > **Note**: If you modify the protocol, modifications will only applies to future inbound
-    /// >           substreams, not the ones already being negotiated.
+    /// > substreams, not the ones already being negotiated.
     pub fn listen_protocol_mut(&mut self) -> &mut SubstreamProtocol<TInbound, ()> {
         &mut self.listen_protocol
     }
@@ -212,12 +221,12 @@ impl Default for OneShotHandlerConfig {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::convert::Infallible;
 
-    use futures::executor::block_on;
-    use futures::future::poll_fn;
+    use futures::{executor::block_on, future::poll_fn};
     use libp2p_core::upgrade::DeniedUpgrade;
-    use std::convert::Infallible;
+
+    use super::*;
 
     #[test]
     fn do_not_keep_idle_connection_alive() {
diff --git a/swarm/src/handler/pending.rs b/swarm/src/handler/pending.rs
index 656a38849d5..483c4b3d6e8 100644
--- a/swarm/src/handler/pending.rs
+++ b/swarm/src/handler/pending.rs
@@ -19,13 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    convert::Infallible,
+    task::{Context, Poll},
+};
+
+use libp2p_core::upgrade::PendingUpgrade;
+
 use crate::handler::{
     ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, FullyNegotiatedInbound,
     FullyNegotiatedOutbound, SubstreamProtocol,
 };
-use libp2p_core::upgrade::PendingUpgrade;
-use std::convert::Infallible;
-use std::task::{Context, Poll};
 
 /// Implementation of [`ConnectionHandler`] that returns a pending upgrade.
 #[derive(Clone, Debug)]
diff --git a/swarm/src/handler/select.rs b/swarm/src/handler/select.rs
index e049252d448..0f6dbe988ff 100644
--- a/swarm/src/handler/select.rs
+++ b/swarm/src/handler/select.rs
@@ -18,16 +18,23 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::handler::{
-    AddressChange, ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent, DialUpgradeError,
-    FullyNegotiatedInbound, FullyNegotiatedOutbound, InboundUpgradeSend, ListenUpgradeError,
-    OutboundUpgradeSend, StreamUpgradeError, SubstreamProtocol,
+use std::{
+    cmp,
+    task::{Context, Poll},
 };
-use crate::upgrade::SendWrapper;
+
 use either::Either;
 use futures::{future, ready};
 use libp2p_core::upgrade::SelectUpgrade;
-use std::{cmp, task::Context, task::Poll};
+
+use crate::{
+    handler::{
+        AddressChange, ConnectionEvent, ConnectionHandler, ConnectionHandlerEvent,
+        DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound, InboundUpgradeSend,
+        ListenUpgradeError, OutboundUpgradeSend, StreamUpgradeError, SubstreamProtocol,
+    },
+    upgrade::SendWrapper,
+};
 
 /// Implementation of [`ConnectionHandler`] that combines two protocols into one.
 #[derive(Debug, Clone)]
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 12280e99f07..639906a1a09 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -31,12 +31,11 @@
 //! Creating a `Swarm` requires three things:
 //!
 //!  1. A network identity of the local node in form of a [`PeerId`].
-//!  2. An implementation of the [`Transport`] trait. This is the type that
-//!     will be used in order to reach nodes on the network based on their
-//!     address. See the `transport` module for more information.
-//!  3. An implementation of the [`NetworkBehaviour`] trait. This is a state
-//!     machine that defines how the swarm should behave once it is connected
-//!     to a node.
+//!  2. An implementation of the [`Transport`] trait. This is the type that will be used in order to
+//!     reach nodes on the network based on their address. See the `transport` module for more
+//!     information.
+//!  3. An implementation of the [`NetworkBehaviour`] trait. This is a state machine that defines
+//!     how the swarm should behave once it is connected to a node.
 //!
 //! # Network Behaviour
 //!
@@ -51,7 +50,6 @@
 //! The [`ConnectionHandler`] trait defines how each active connection to a
 //! remote should behave: how to handle incoming substreams, which protocols
 //! are supported, when to open a new outbound substream, etc.
-//!
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
@@ -73,69 +71,55 @@ mod translation;
 /// Bundles all symbols required for the [`libp2p_swarm_derive::NetworkBehaviour`] macro.
 #[doc(hidden)]
 pub mod derive_prelude {
-    pub use crate::behaviour::AddressChange;
-    pub use crate::behaviour::ConnectionClosed;
-    pub use crate::behaviour::ConnectionEstablished;
-    pub use crate::behaviour::DialFailure;
-    pub use crate::behaviour::ExpiredListenAddr;
-    pub use crate::behaviour::ExternalAddrConfirmed;
-    pub use crate::behaviour::ExternalAddrExpired;
-    pub use crate::behaviour::FromSwarm;
-    pub use crate::behaviour::ListenFailure;
-    pub use crate::behaviour::ListenerClosed;
-    pub use crate::behaviour::ListenerError;
-    pub use crate::behaviour::NewExternalAddrCandidate;
-    pub use crate::behaviour::NewExternalAddrOfPeer;
-    pub use crate::behaviour::NewListenAddr;
-    pub use crate::behaviour::NewListener;
-    pub use crate::connection::ConnectionId;
-    pub use crate::ConnectionDenied;
-    pub use crate::ConnectionHandler;
-    pub use crate::ConnectionHandlerSelect;
-    pub use crate::DialError;
-    pub use crate::NetworkBehaviour;
-    pub use crate::THandler;
-    pub use crate::THandlerInEvent;
-    pub use crate::THandlerOutEvent;
-    pub use crate::ToSwarm;
     pub use either::Either;
     pub use futures::prelude as futures;
-    pub use libp2p_core::transport::{ListenerId, PortUse};
-    pub use libp2p_core::ConnectedPoint;
-    pub use libp2p_core::Endpoint;
-    pub use libp2p_core::Multiaddr;
+    pub use libp2p_core::{
+        transport::{ListenerId, PortUse},
+        ConnectedPoint, Endpoint, Multiaddr,
+    };
     pub use libp2p_identity::PeerId;
+
+    pub use crate::{
+        behaviour::{
+            AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, ExpiredListenAddr,
+            ExternalAddrConfirmed, ExternalAddrExpired, FromSwarm, ListenFailure, ListenerClosed,
+            ListenerError, NewExternalAddrCandidate, NewExternalAddrOfPeer, NewListenAddr,
+            NewListener,
+        },
+        connection::ConnectionId,
+        ConnectionDenied, ConnectionHandler, ConnectionHandlerSelect, DialError, NetworkBehaviour,
+        THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
+    };
 }
 
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    error, fmt, io,
+    num::{NonZeroU32, NonZeroU8, NonZeroUsize},
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
+
 pub use behaviour::{
     AddressChange, CloseConnection, ConnectionClosed, DialFailure, ExpiredListenAddr,
     ExternalAddrExpired, ExternalAddresses, FromSwarm, ListenAddresses, ListenFailure,
     ListenerClosed, ListenerError, NetworkBehaviour, NewExternalAddrCandidate,
     NewExternalAddrOfPeer, NewListenAddr, NotifyHandler, PeerAddresses, ToSwarm,
 };
-pub use connection::pool::ConnectionCounters;
-pub use connection::{ConnectionError, ConnectionId, SupportedProtocols};
+pub use connection::{pool::ConnectionCounters, ConnectionError, ConnectionId, SupportedProtocols};
+use connection::{
+    pool::{EstablishedConnection, Pool, PoolConfig, PoolEvent},
+    IncomingInfo, PendingConnectionError, PendingInboundConnectionError,
+    PendingOutboundConnectionError,
+};
+use dial_opts::{DialOpts, PeerCondition};
 pub use executor::Executor;
+use futures::{prelude::*, stream::FusedStream};
 pub use handler::{
     ConnectionHandler, ConnectionHandlerEvent, ConnectionHandlerSelect, OneShotHandler,
     OneShotHandlerConfig, StreamUpgradeError, SubstreamProtocol,
 };
-#[cfg(feature = "macros")]
-pub use libp2p_swarm_derive::NetworkBehaviour;
-pub use listen_opts::ListenOpts;
-pub use stream::Stream;
-pub use stream_protocol::{InvalidProtocol, StreamProtocol};
-
-use crate::behaviour::ExternalAddrConfirmed;
-use crate::handler::UpgradeInfoSend;
-use connection::pool::{EstablishedConnection, Pool, PoolConfig, PoolEvent};
-use connection::IncomingInfo;
-use connection::{
-    PendingConnectionError, PendingInboundConnectionError, PendingOutboundConnectionError,
-};
-use dial_opts::{DialOpts, PeerCondition};
-use futures::{prelude::*, stream::FusedStream};
-
 use libp2p_core::{
     connection::ConnectedPoint,
     muxing::StreamMuxerBox,
@@ -143,20 +127,18 @@ use libp2p_core::{
     Multiaddr, Transport,
 };
 use libp2p_identity::PeerId;
-
+#[cfg(feature = "macros")]
+pub use libp2p_swarm_derive::NetworkBehaviour;
+pub use listen_opts::ListenOpts;
 use smallvec::SmallVec;
-use std::collections::{HashMap, HashSet, VecDeque};
-use std::num::{NonZeroU32, NonZeroU8, NonZeroUsize};
-use std::time::Duration;
-use std::{
-    error, fmt, io,
-    pin::Pin,
-    task::{Context, Poll},
-};
+pub use stream::Stream;
+pub use stream_protocol::{InvalidProtocol, StreamProtocol};
 use tracing::Instrument;
 #[doc(hidden)]
 pub use translation::_address_translation;
 
+use crate::{behaviour::ExternalAddrConfirmed, handler::UpgradeInfoSend};
+
 /// Event generated by the [`NetworkBehaviour`] that the swarm will report back.
 type TBehaviourOutEvent<TBehaviour> = <TBehaviour as NetworkBehaviour>::ToSwarm;
 
@@ -219,8 +201,8 @@ pub enum SwarmEvent<TBehaviourOutEvent> {
         /// Identifier of the connection.
         connection_id: ConnectionId,
         /// Local connection address.
-        /// This address has been earlier reported with a [`NewListenAddr`](SwarmEvent::NewListenAddr)
-        /// event.
+        /// This address has been earlier reported with a
+        /// [`NewListenAddr`](SwarmEvent::NewListenAddr) event.
         local_addr: Multiaddr,
         /// Address used to send back data to the remote.
         send_back_addr: Multiaddr,
@@ -233,8 +215,8 @@ pub enum SwarmEvent<TBehaviourOutEvent> {
         /// Identifier of the connection.
         connection_id: ConnectionId,
         /// Local connection address.
-        /// This address has been earlier reported with a [`NewListenAddr`](SwarmEvent::NewListenAddr)
-        /// event.
+        /// This address has been earlier reported with a
+        /// [`NewListenAddr`](SwarmEvent::NewListenAddr) event.
         local_addr: Multiaddr,
         /// Address used to send back data to the remote.
         send_back_addr: Multiaddr,
@@ -308,7 +290,8 @@ pub enum SwarmEvent<TBehaviourOutEvent> {
 }
 
 impl<TBehaviourOutEvent> SwarmEvent<TBehaviourOutEvent> {
-    /// Extract the `TBehaviourOutEvent` from this [`SwarmEvent`] in case it is the `Behaviour` variant, otherwise fail.
+    /// Extract the `TBehaviourOutEvent` from this [`SwarmEvent`] in case it is the `Behaviour`
+    /// variant, otherwise fail.
     #[allow(clippy::result_large_err)]
     pub fn try_into_behaviour_event(self) -> Result<TBehaviourOutEvent, Self> {
         match self {
@@ -610,7 +593,8 @@ where
     /// Add a **confirmed** external address for the local node.
     ///
     /// This function should only be called with addresses that are guaranteed to be reachable.
-    /// The address is broadcast to all [`NetworkBehaviour`]s via [`FromSwarm::ExternalAddrConfirmed`].
+    /// The address is broadcast to all [`NetworkBehaviour`]s via
+    /// [`FromSwarm::ExternalAddrConfirmed`].
     pub fn add_external_address(&mut self, a: Multiaddr) {
         self.behaviour
             .on_swarm_event(FromSwarm::ExternalAddrConfirmed(ExternalAddrConfirmed {
@@ -621,7 +605,8 @@ where
 
     /// Remove an external address for the local node.
     ///
-    /// The address is broadcast to all [`NetworkBehaviour`]s via [`FromSwarm::ExternalAddrExpired`].
+    /// The address is broadcast to all [`NetworkBehaviour`]s via
+    /// [`FromSwarm::ExternalAddrExpired`].
     pub fn remove_external_address(&mut self, addr: &Multiaddr) {
         self.behaviour
             .on_swarm_event(FromSwarm::ExternalAddrExpired(ExternalAddrExpired { addr }));
@@ -630,7 +615,8 @@ where
 
     /// Add a new external address of a remote peer.
     ///
-    /// The address is broadcast to all [`NetworkBehaviour`]s via [`FromSwarm::NewExternalAddrOfPeer`].
+    /// The address is broadcast to all [`NetworkBehaviour`]s via
+    /// [`FromSwarm::NewExternalAddrOfPeer`].
     pub fn add_peer_address(&mut self, peer_id: PeerId, addr: Multiaddr) {
         self.behaviour
             .on_swarm_event(FromSwarm::NewExternalAddrOfPeer(NewExternalAddrOfPeer {
@@ -643,8 +629,9 @@ where
     ///
     /// Returns `Ok(())` if there was one or more established connections to the peer.
     ///
-    /// Closing a connection via [`Swarm::disconnect_peer_id`] will poll [`ConnectionHandler::poll_close`] to completion.
-    /// Use this function if you want to close a connection _despite_ it still being in use by one or more handlers.
+    /// Closing a connection via [`Swarm::disconnect_peer_id`] will poll
+    /// [`ConnectionHandler::poll_close`] to completion. Use this function if you want to close
+    /// a connection _despite_ it still being in use by one or more handlers.
     #[allow(clippy::result_unit_err)]
     pub fn disconnect_peer_id(&mut self, peer_id: PeerId) -> Result<(), ()> {
         let was_connected = self.pool.is_connected(peer_id);
@@ -660,7 +647,8 @@ where
     /// Attempt to gracefully close a connection.
     ///
     /// Closing a connection is asynchronous but this function will return immediately.
-    /// A [`SwarmEvent::ConnectionClosed`] event will be emitted once the connection is actually closed.
+    /// A [`SwarmEvent::ConnectionClosed`] event will be emitted
+    /// once the connection is actually closed.
     ///
     /// # Returns
     ///
@@ -1204,15 +1192,16 @@ where
         //
         // (1) is polled before (2) to prioritize local work over work coming from a remote.
         //
-        // (2) is polled before (3) to prioritize existing connections over upgrading new incoming connections.
+        // (2) is polled before (3) to prioritize existing connections
+        // over upgrading new incoming connections.
         loop {
             if let Some(swarm_event) = this.pending_swarm_events.pop_front() {
                 return Poll::Ready(swarm_event);
             }
 
             match this.pending_handler_event.take() {
-                // Try to deliver the pending event emitted by the [`NetworkBehaviour`] in the previous
-                // iteration to the connection handler(s).
+                // Try to deliver the pending event emitted by the [`NetworkBehaviour`] in the
+                // previous iteration to the connection handler(s).
                 Some((peer_id, handler, event)) => match handler {
                     PendingNotifyHandler::One(conn_id) => {
                         match this.pool.get_established(conn_id) {
@@ -1518,7 +1507,8 @@ impl Config {
 pub enum DialError {
     /// The peer identity obtained on the connection matches the local peer.
     LocalPeerId { endpoint: ConnectedPoint },
-    /// No addresses have been provided by [`NetworkBehaviour::handle_pending_outbound_connection`] and [`DialOpts`].
+    /// No addresses have been provided by [`NetworkBehaviour::handle_pending_outbound_connection`]
+    /// and [`DialOpts`].
     NoAddresses,
     /// The provided [`dial_opts::PeerCondition`] evaluated to false and thus
     /// the dial was aborted.
@@ -1688,7 +1678,8 @@ impl error::Error for ListenError {
 
 /// A connection was denied.
 ///
-/// To figure out which [`NetworkBehaviour`] denied the connection, use [`ConnectionDenied::downcast`].
+/// To figure out which [`NetworkBehaviour`] denied the connection, use
+/// [`ConnectionDenied::downcast`].
 #[derive(Debug)]
 pub struct ConnectionDenied {
     inner: Box<dyn error::Error + Send + Sync + 'static>,
@@ -1759,18 +1750,21 @@ impl NetworkInfo {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::test::{CallTraceBehaviour, MockBehaviour};
-    use libp2p_core::multiaddr::multiaddr;
-    use libp2p_core::transport::memory::MemoryTransportError;
-    use libp2p_core::transport::{PortUse, TransportEvent};
-    use libp2p_core::Endpoint;
-    use libp2p_core::{multiaddr, transport, upgrade};
+    use libp2p_core::{
+        multiaddr,
+        multiaddr::multiaddr,
+        transport,
+        transport::{memory::MemoryTransportError, PortUse, TransportEvent},
+        upgrade, Endpoint,
+    };
     use libp2p_identity as identity;
     use libp2p_plaintext as plaintext;
     use libp2p_yamux as yamux;
     use quickcheck::*;
 
+    use super::*;
+    use crate::test::{CallTraceBehaviour, MockBehaviour};
+
     // Test execution state.
     // Connection => Disconnecting => Connecting.
     enum State {
@@ -1842,8 +1836,9 @@ mod tests {
     /// Establishes multiple connections between two peers,
     /// after which one peer disconnects the other using [`Swarm::disconnect_peer_id`].
     ///
-    /// The test expects both behaviours to be notified via calls to [`NetworkBehaviour::on_swarm_event`]
-    /// with pairs of [`FromSwarm::ConnectionEstablished`] / [`FromSwarm::ConnectionClosed`]
+    /// The test expects both behaviours to be notified via calls to
+    /// [`NetworkBehaviour::on_swarm_event`] with pairs of [`FromSwarm::ConnectionEstablished`]
+    /// / [`FromSwarm::ConnectionClosed`]
     #[tokio::test]
     async fn test_swarm_disconnect() {
         let mut swarm1 = new_test_swarm(Config::with_tokio_executor());
@@ -1905,8 +1900,9 @@ mod tests {
     /// after which one peer disconnects the other
     /// using [`ToSwarm::CloseConnection`] returned by a [`NetworkBehaviour`].
     ///
-    /// The test expects both behaviours to be notified via calls to [`NetworkBehaviour::on_swarm_event`]
-    /// with pairs of [`FromSwarm::ConnectionEstablished`] / [`FromSwarm::ConnectionClosed`]
+    /// The test expects both behaviours to be notified via calls to
+    /// [`NetworkBehaviour::on_swarm_event`] with pairs of [`FromSwarm::ConnectionEstablished`]
+    /// / [`FromSwarm::ConnectionClosed`]
     #[tokio::test]
     async fn test_behaviour_disconnect_all() {
         let mut swarm1 = new_test_swarm(Config::with_tokio_executor());
@@ -1972,8 +1968,9 @@ mod tests {
     /// after which one peer closes a single connection
     /// using [`ToSwarm::CloseConnection`] returned by a [`NetworkBehaviour`].
     ///
-    /// The test expects both behaviours to be notified via calls to [`NetworkBehaviour::on_swarm_event`]
-    /// with pairs of [`FromSwarm::ConnectionEstablished`] / [`FromSwarm::ConnectionClosed`]
+    /// The test expects both behaviours to be notified via calls to
+    /// [`NetworkBehaviour::on_swarm_event`] with pairs of [`FromSwarm::ConnectionEstablished`]
+    /// / [`FromSwarm::ConnectionClosed`]
     #[tokio::test]
     async fn test_behaviour_disconnect_one() {
         let mut swarm1 = new_test_swarm(Config::with_tokio_executor());
@@ -2175,8 +2172,10 @@ mod tests {
         // Dialing the same address we're listening should result in three events:
         //
         // - The incoming connection notification (before we know the incoming peer ID).
-        // - The connection error for the dialing endpoint (once we've determined that it's our own ID).
-        // - The connection error for the listening endpoint (once we've determined that it's our own ID).
+        // - The connection error for the dialing endpoint (once we've determined that it's our own
+        //   ID).
+        // - The connection error for the listening endpoint (once we've determined that it's our
+        //   own ID).
         //
         // The last two can happen in any order.
 
@@ -2190,8 +2189,9 @@ mod tests {
         })
         .await;
 
-        swarm.listened_addrs.clear(); // This is a hack to actually execute the dial to ourselves which would otherwise be filtered.
-
+        // This is a hack to actually execute the dial
+        // to ourselves which would otherwise be filtered.
+        swarm.listened_addrs.clear();
         swarm.dial(local_address.clone()).unwrap();
 
         let mut got_dial_err = false;
@@ -2342,7 +2342,8 @@ mod tests {
 
         let string = format!("{error}");
 
-        // Unfortunately, we have some "empty" errors that lead to multiple colons without text but that is the best we can do.
+        // Unfortunately, we have some "empty" errors
+        // that lead to multiple colons without text but that is the best we can do.
         assert_eq!("Failed to negotiate transport protocol(s): [(/ip4/127.0.0.1/tcp/80: : No listener on the given port.)]", string)
     }
 }
diff --git a/swarm/src/listen_opts.rs b/swarm/src/listen_opts.rs
index 9c4d69a6fa0..1fcb33cd348 100644
--- a/swarm/src/listen_opts.rs
+++ b/swarm/src/listen_opts.rs
@@ -1,6 +1,7 @@
-use crate::ListenerId;
 use libp2p_core::Multiaddr;
 
+use crate::ListenerId;
+
 #[derive(Debug)]
 pub struct ListenOpts {
     id: ListenerId,
diff --git a/swarm/src/stream.rs b/swarm/src/stream.rs
index 871352f3c6a..d3936cb557a 100644
--- a/swarm/src/stream.rs
+++ b/swarm/src/stream.rs
@@ -1,6 +1,3 @@
-use futures::{AsyncRead, AsyncWrite};
-use libp2p_core::muxing::SubstreamBox;
-use libp2p_core::Negotiated;
 use std::{
     io::{IoSlice, IoSliceMut},
     pin::Pin,
@@ -8,6 +5,9 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::{AsyncRead, AsyncWrite};
+use libp2p_core::{muxing::SubstreamBox, Negotiated};
+
 /// Counter for the number of active streams on a connection.
 #[derive(Debug, Clone)]
 pub(crate) struct ActiveStreamCounter(Arc<()>);
diff --git a/swarm/src/stream_protocol.rs b/swarm/src/stream_protocol.rs
index f746429a3d7..abf8068238e 100644
--- a/swarm/src/stream_protocol.rs
+++ b/swarm/src/stream_protocol.rs
@@ -1,7 +1,10 @@
+use std::{
+    fmt,
+    hash::{Hash, Hasher},
+    sync::Arc,
+};
+
 use either::Either;
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::sync::Arc;
 
 /// Identifies a protocol for a stream.
 ///
@@ -39,7 +42,9 @@ impl StreamProtocol {
         }
 
         Ok(StreamProtocol {
-            inner: Either::Right(Arc::from(protocol)), // FIXME: Can we somehow reuse the allocation from the owned string?
+            // FIXME: Can we somehow reuse the
+            // allocation from the owned string?
+            inner: Either::Right(Arc::from(protocol)),
         })
     }
 }
diff --git a/swarm/src/test.rs b/swarm/src/test.rs
index a6cb7c4d4eb..59aadf7e3c7 100644
--- a/swarm/src/test.rs
+++ b/swarm/src/test.rs
@@ -18,19 +18,27 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::behaviour::{
-    ConnectionClosed, ConnectionEstablished, DialFailure, ExpiredListenAddr, ExternalAddrExpired,
-    FromSwarm, ListenerClosed, ListenerError, NewExternalAddrCandidate, NewListenAddr, NewListener,
+use std::{
+    collections::HashMap,
+    task::{Context, Poll},
 };
+
+use libp2p_core::{
+    multiaddr::Multiaddr,
+    transport::{ListenerId, PortUse},
+    ConnectedPoint, Endpoint,
+};
+use libp2p_identity::PeerId;
+
 use crate::{
+    behaviour::{
+        ConnectionClosed, ConnectionEstablished, DialFailure, ExpiredListenAddr,
+        ExternalAddrExpired, FromSwarm, ListenerClosed, ListenerError, NewExternalAddrCandidate,
+        NewListenAddr, NewListener,
+    },
     ConnectionDenied, ConnectionHandler, ConnectionId, NetworkBehaviour, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
-use libp2p_core::transport::PortUse;
-use libp2p_core::{multiaddr::Multiaddr, transport::ListenerId, ConnectedPoint, Endpoint};
-use libp2p_identity::PeerId;
-use std::collections::HashMap;
-use std::task::{Context, Poll};
 
 /// A `MockBehaviour` is a `NetworkBehaviour` that allows for
 /// the instrumentation of return values, without keeping
@@ -42,7 +50,8 @@ where
     TOutEvent: Send + 'static,
 {
     /// The prototype protocols handler that is cloned for every
-    /// invocation of [`NetworkBehaviour::handle_established_inbound_connection`] and [`NetworkBehaviour::handle_established_outbound_connection`]
+    /// invocation of [`NetworkBehaviour::handle_established_inbound_connection`] and
+    /// [`NetworkBehaviour::handle_established_outbound_connection`]
     pub(crate) handler_proto: THandler,
     /// The addresses to return from [`NetworkBehaviour::handle_established_outbound_connection`].
     pub(crate) addresses: HashMap<PeerId, Vec<Multiaddr>>,
@@ -266,8 +275,8 @@ where
             })
             .take(other_established);
 
-        // We are informed that there are `other_established` additional connections. Ensure that the
-        // number of previous connections is consistent with this
+        // We are informed that there are `other_established` additional connections. Ensure that
+        // the number of previous connections is consistent with this
         if let Some(&prev) = other_peer_connections.next() {
             if prev < other_established {
                 assert_eq!(
@@ -319,8 +328,8 @@ where
             })
             .take(remaining_established);
 
-        // We are informed that there are `other_established` additional connections. Ensure that the
-        // number of previous connections is consistent with this
+        // We are informed that there are `other_established` additional connections. Ensure that
+        // the number of previous connections is consistent with this
         if let Some(&prev) = other_closed_connections.next() {
             if prev < remaining_established {
                 assert_eq!(
diff --git a/swarm/src/upgrade.rs b/swarm/src/upgrade.rs
index f6c6648a373..ba40e5606bb 100644
--- a/swarm/src/upgrade.rs
+++ b/swarm/src/upgrade.rs
@@ -18,11 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::Stream;
-
 use futures::prelude::*;
 use libp2p_core::upgrade;
 
+use crate::Stream;
+
 /// Implemented automatically on all types that implement [`UpgradeInfo`](upgrade::UpgradeInfo)
 /// and `Send + 'static`.
 ///
@@ -65,7 +65,8 @@ pub trait OutboundUpgradeSend: UpgradeInfoSend {
     /// Equivalent to [`OutboundUpgrade::Future`](upgrade::OutboundUpgrade::Future).
     type Future: Future<Output = Result<Self::Output, Self::Error>> + Send + 'static;
 
-    /// Equivalent to [`OutboundUpgrade::upgrade_outbound`](upgrade::OutboundUpgrade::upgrade_outbound).
+    /// Equivalent to
+    /// [`OutboundUpgrade::upgrade_outbound`](upgrade::OutboundUpgrade::upgrade_outbound).
     fn upgrade_outbound(self, socket: Stream, info: Self::Info) -> Self::Future;
 }
 
@@ -126,7 +127,7 @@ where
 /// [`InboundUpgrade`](upgrade::InboundUpgrade).
 ///
 /// > **Note**: This struct is mostly an implementation detail of the library and normally
-/// >           doesn't need to be used directly.
+/// > doesn't need to be used directly.
 pub struct SendWrapper<T>(pub T);
 
 impl<T: UpgradeInfoSend> upgrade::UpgradeInfo for SendWrapper<T> {
diff --git a/swarm/tests/connection_close.rs b/swarm/tests/connection_close.rs
index 1d1a25eb84b..bc71216870a 100644
--- a/swarm/tests/connection_close.rs
+++ b/swarm/tests/connection_close.rs
@@ -1,16 +1,16 @@
-use libp2p_core::transport::PortUse;
-use libp2p_core::upgrade::DeniedUpgrade;
-use libp2p_core::{Endpoint, Multiaddr};
+use std::{
+    convert::Infallible,
+    task::{Context, Poll},
+};
+
+use libp2p_core::{transport::PortUse, upgrade::DeniedUpgrade, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
-use libp2p_swarm::handler::ConnectionEvent;
 use libp2p_swarm::{
-    ConnectionDenied, ConnectionHandler, ConnectionHandlerEvent, ConnectionId, FromSwarm,
-    NetworkBehaviour, SubstreamProtocol, Swarm, SwarmEvent, THandler, THandlerInEvent,
-    THandlerOutEvent, ToSwarm,
+    handler::ConnectionEvent, ConnectionDenied, ConnectionHandler, ConnectionHandlerEvent,
+    ConnectionId, FromSwarm, NetworkBehaviour, SubstreamProtocol, Swarm, SwarmEvent, THandler,
+    THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
 use libp2p_swarm_test::SwarmExt;
-use std::convert::Infallible;
-use std::task::{Context, Poll};
 
 #[async_std::test]
 async fn sends_remaining_events_to_behaviour_on_connection_close() {
diff --git a/swarm/tests/listener.rs b/swarm/tests/listener.rs
index 74b23cf3f7f..01d5784cfa5 100644
--- a/swarm/tests/listener.rs
+++ b/swarm/tests/listener.rs
@@ -15,7 +15,6 @@ use libp2p_swarm::{
     ListenerClosed, ListenerError, NetworkBehaviour, NewListenAddr, Swarm, SwarmEvent, THandler,
     THandlerInEvent, THandlerOutEvent, ToSwarm,
 };
-
 use libp2p_swarm_test::SwarmExt;
 
 #[async_std::test]
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 334d1b9d304..a1c8bc5ff73 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -18,6 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::fmt::Debug;
+
 use futures::StreamExt;
 use libp2p_core::{transport::PortUse, Endpoint, Multiaddr};
 use libp2p_identify as identify;
@@ -26,19 +28,18 @@ use libp2p_swarm::{
     behaviour::FromSwarm, dummy, ConnectionDenied, NetworkBehaviour, SwarmEvent, THandler,
     THandlerInEvent, THandlerOutEvent,
 };
-use std::fmt::Debug;
 
 /// Small utility to check that a type implements `NetworkBehaviour`.
 #[allow(dead_code)]
 fn require_net_behaviour<T: libp2p_swarm::NetworkBehaviour>() {}
 
 // TODO: doesn't compile
-/*#[test]
-fn empty() {
-    #[allow(dead_code)]
-    #[derive(NetworkBehaviour)]
-    struct Foo {}
-}*/
+// #[test]
+// fn empty() {
+// #[allow(dead_code)]
+// #[derive(NetworkBehaviour)]
+// struct Foo {}
+// }
 
 #[test]
 fn one_field() {
@@ -537,10 +538,10 @@ fn multiple_behaviour_attributes() {
 
 #[test]
 fn custom_out_event_no_type_parameters() {
+    use std::task::{Context, Poll};
+
     use libp2p_identity::PeerId;
     use libp2p_swarm::{ConnectionId, ToSwarm};
-    use std::task::Context;
-    use std::task::Poll;
 
     pub(crate) struct TemplatedBehaviour<T: 'static> {
         _data: T,
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index 7d92cc8ecfc..d47f1e464db 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -40,26 +40,26 @@
 //! On Unix systems, if no custom configuration is given, [trust-dns-resolver]
 //! will try to parse the `/etc/resolv.conf` file. This approach comes with a
 //! few caveats to be aware of:
-//!   1) This fails (panics even!) if `/etc/resolv.conf` does not exist. This is
-//!      the case on all versions of Android.
-//!   2) DNS configuration is only evaluated during startup. Runtime changes are
-//!      thus ignored.
-//!   3) DNS resolution is obviously done in process and consequently not using
-//!      any system APIs (like libc's `gethostbyname`). Again this is
-//!      problematic on platforms like Android, where there's a lot of
-//!      complexity hidden behind the system APIs.
+//!   1) This fails (panics even!) if `/etc/resolv.conf` does not exist. This is the case on all
+//!      versions of Android.
+//!   2) DNS configuration is only evaluated during startup. Runtime changes are thus ignored.
+//!   3) DNS resolution is obviously done in process and consequently not using any system APIs
+//!      (like libc's `gethostbyname`). Again this is problematic on platforms like Android, where
+//!      there's a lot of complexity hidden behind the system APIs.
 //!
 //! If the implementation requires different characteristics, one should
 //! consider providing their own implementation of [`Transport`] or use
 //! platform specific APIs to extract the host's DNS configuration (if possible)
 //! and provide a custom [`ResolverConfig`].
 //!
-//![trust-dns-resolver]: https://docs.rs/trust-dns-resolver/latest/trust_dns_resolver/#dns-over-tls-and-dns-over-https
+//! [trust-dns-resolver]: https://docs.rs/trust-dns-resolver/latest/trust_dns_resolver/#dns-over-tls-and-dns-over-https
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 #[cfg(feature = "async-std")]
 pub mod async_std {
+    use std::{io, sync::Arc};
+
     use async_std_resolver::AsyncStdResolver;
     use futures::FutureExt;
     use hickory_resolver::{
@@ -67,7 +67,6 @@ pub mod async_std {
         system_conf,
     };
     use parking_lot::Mutex;
-    use std::{io, sync::Arc};
 
     /// A `Transport` wrapper for performing DNS lookups when dialing `Multiaddr`esses
     /// using `async-std` for all async I/O.
@@ -116,9 +115,10 @@ pub mod async_std {
 
 #[cfg(feature = "tokio")]
 pub mod tokio {
+    use std::sync::Arc;
+
     use hickory_resolver::{system_conf, TokioAsyncResolver};
     use parking_lot::Mutex;
-    use std::sync::Arc;
 
     /// A `Transport` wrapper for performing DNS lookups when dialing `Multiaddr`esses
     /// using `tokio` for all async I/O.
@@ -146,18 +146,9 @@ pub mod tokio {
     }
 }
 
-use async_trait::async_trait;
-use futures::{future::BoxFuture, prelude::*};
-use libp2p_core::{
-    multiaddr::{Multiaddr, Protocol},
-    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
-};
-use parking_lot::Mutex;
-use smallvec::SmallVec;
-use std::io;
-use std::net::{Ipv4Addr, Ipv6Addr};
 use std::{
-    error, fmt, iter,
+    error, fmt, io, iter,
+    net::{Ipv4Addr, Ipv6Addr},
     ops::DerefMut,
     pin::Pin,
     str,
@@ -165,12 +156,24 @@ use std::{
     task::{Context, Poll},
 };
 
-pub use hickory_resolver::config::{ResolverConfig, ResolverOpts};
-pub use hickory_resolver::error::{ResolveError, ResolveErrorKind};
-use hickory_resolver::lookup::{Ipv4Lookup, Ipv6Lookup, TxtLookup};
-use hickory_resolver::lookup_ip::LookupIp;
-use hickory_resolver::name_server::ConnectionProvider;
-use hickory_resolver::AsyncResolver;
+use async_trait::async_trait;
+use futures::{future::BoxFuture, prelude::*};
+pub use hickory_resolver::{
+    config::{ResolverConfig, ResolverOpts},
+    error::{ResolveError, ResolveErrorKind},
+};
+use hickory_resolver::{
+    lookup::{Ipv4Lookup, Ipv6Lookup, TxtLookup},
+    lookup_ip::LookupIp,
+    name_server::ConnectionProvider,
+    AsyncResolver,
+};
+use libp2p_core::{
+    multiaddr::{Multiaddr, Protocol},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
+};
+use parking_lot::Mutex;
+use smallvec::SmallVec;
 
 /// The prefix for `dnsaddr` protocol TXT record lookups.
 const DNSADDR_PREFIX: &str = "_dnsaddr.";
@@ -191,7 +194,8 @@ const MAX_DNS_LOOKUPS: usize = 32;
 const MAX_TXT_RECORDS: usize = 16;
 
 /// A [`Transport`] for performing DNS lookups when dialing `Multiaddr`esses.
-/// You shouldn't need to use this type directly. Use [`tokio::Transport`] or [`async_std::Transport`] instead.
+/// You shouldn't need to use this type directly. Use [`tokio::Transport`] or
+/// [`async_std::Transport`] instead.
 #[derive(Debug)]
 pub struct Transport<T, R> {
     /// The underlying transport.
@@ -613,7 +617,6 @@ where
 
 #[cfg(all(test, any(feature = "tokio", feature = "async-std")))]
 mod tests {
-    use super::*;
     use futures::future::BoxFuture;
     use libp2p_core::{
         multiaddr::{Multiaddr, Protocol},
@@ -622,6 +625,8 @@ mod tests {
     };
     use libp2p_identity::PeerId;
 
+    use super::*;
+
     #[test]
     fn basic_resolve() {
         let _ = tracing_subscriber::fmt()
diff --git a/transports/noise/src/io.rs b/transports/noise/src/io.rs
index 9cd4cfed52a..84aad79d76b 100644
--- a/transports/noise/src/io.rs
+++ b/transports/noise/src/io.rs
@@ -22,11 +22,6 @@
 
 mod framed;
 pub(crate) mod handshake;
-use asynchronous_codec::Framed;
-use bytes::Bytes;
-use framed::{Codec, MAX_FRAME_LEN};
-use futures::prelude::*;
-use futures::ready;
 use std::{
     cmp::min,
     fmt, io,
@@ -34,6 +29,11 @@ use std::{
     task::{Context, Poll},
 };
 
+use asynchronous_codec::Framed;
+use bytes::Bytes;
+use framed::{Codec, MAX_FRAME_LEN};
+use futures::{prelude::*, ready};
+
 /// A noise session to a remote.
 ///
 /// `T` is the type of the underlying I/O resource.
diff --git a/transports/noise/src/io/framed.rs b/transports/noise/src/io/framed.rs
index 17254efb0a9..5aaad6f55e7 100644
--- a/transports/noise/src/io/framed.rs
+++ b/transports/noise/src/io/framed.rs
@@ -23,13 +23,14 @@
 //! Alongside a [`asynchronous_codec::Framed`] this provides a [Sink](futures::Sink)
 //! and [Stream](futures::Stream) for length-delimited Noise protocol messages.
 
-use super::handshake::proto;
-use crate::{protocol::PublicKey, Error};
+use std::{io, mem::size_of};
+
 use asynchronous_codec::{Decoder, Encoder};
 use bytes::{Buf, Bytes, BytesMut};
 use quick_protobuf::{BytesReader, MessageRead, MessageWrite, Writer};
-use std::io;
-use std::mem::size_of;
+
+use super::handshake::proto;
+use crate::{protocol::PublicKey, Error};
 
 /// Max. size of a noise message.
 const MAX_NOISE_MSG_LEN: usize = 65535;
@@ -170,7 +171,8 @@ impl Decoder for Codec<snow::TransportState> {
 
 /// Encrypts the given cleartext to `dst`.
 ///
-/// This is a standalone function to allow us reusing the `encrypt_buffer` and to use to across different session states of the noise protocol.
+/// This is a standalone function to allow us reusing the `encrypt_buffer` and to use to across
+/// different session states of the noise protocol.
 fn encrypt(
     cleartext: &[u8],
     dst: &mut BytesMut,
@@ -191,8 +193,9 @@ fn encrypt(
 
 /// Encrypts the given ciphertext.
 ///
-/// This is a standalone function so we can use it across different session states of the noise protocol.
-/// In case `ciphertext` does not contain enough bytes to decrypt the entire frame, `Ok(None)` is returned.
+/// This is a standalone function so we can use it across different session states of the noise
+/// protocol. In case `ciphertext` does not contain enough bytes to decrypt the entire frame,
+/// `Ok(None)` is returned.
 fn decrypt(
     ciphertext: &mut BytesMut,
     decrypt_fn: impl FnOnce(&[u8], &mut [u8]) -> Result<usize, snow::Error>,
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
index d8dfb9b802e..d4727b91420 100644
--- a/transports/noise/src/io/handshake.rs
+++ b/transports/noise/src/io/handshake.rs
@@ -23,21 +23,23 @@
 pub(super) mod proto {
     #![allow(unreachable_pub)]
     include!("../generated/mod.rs");
-    pub use self::payload::proto::NoiseExtensions;
-    pub use self::payload::proto::NoiseHandshakePayload;
+    pub use self::payload::proto::{NoiseExtensions, NoiseHandshakePayload};
 }
 
-use super::framed::Codec;
-use crate::io::Output;
-use crate::protocol::{KeypairIdentity, PublicKey, STATIC_KEY_DOMAIN};
-use crate::Error;
+use std::{collections::HashSet, io, mem};
+
 use asynchronous_codec::Framed;
 use futures::prelude::*;
 use libp2p_identity as identity;
 use multihash::Multihash;
 use quick_protobuf::MessageWrite;
-use std::collections::HashSet;
-use std::{io, mem};
+
+use super::framed::Codec;
+use crate::{
+    io::Output,
+    protocol::{KeypairIdentity, PublicKey, STATIC_KEY_DOMAIN},
+    Error,
+};
 
 //////////////////////////////////////////////////////////////////////////////
 // Internal
@@ -142,12 +144,16 @@ where
     }
 }
 
-/// Maps the provided [`Framed`] from the [`snow::HandshakeState`] into the [`snow::TransportState`].
+/// Maps the provided [`Framed`] from the [`snow::HandshakeState`] into the
+/// [`snow::TransportState`].
 ///
-/// This is a bit tricky because [`Framed`] cannot just be de-composed but only into its [`FramedParts`](asynchronous_codec::FramedParts).
-/// However, we need to retain the original [`FramedParts`](asynchronous_codec::FramedParts) because they contain the active read & write buffers.
+/// This is a bit tricky because [`Framed`] cannot just be de-composed but only into its
+/// [`FramedParts`](asynchronous_codec::FramedParts). However, we need to retain the original
+/// [`FramedParts`](asynchronous_codec::FramedParts) because they contain the active read & write
+/// buffers.
 ///
-/// Those are likely **not** empty because the remote may directly write to the stream again after the noise handshake finishes.
+/// Those are likely **not** empty because the remote may directly write to the stream again after
+/// the noise handshake finishes.
 fn map_into_transport<T>(
     framed: Framed<T, Codec<snow::HandshakeState>>,
 ) -> Result<(PublicKey, Framed<T, Codec<snow::TransportState>>), Error>
diff --git a/transports/noise/src/lib.rs b/transports/noise/src/lib.rs
index 2557e76e276..e05556744fe 100644
--- a/transports/noise/src/lib.rs
+++ b/transports/noise/src/lib.rs
@@ -21,14 +21,14 @@
 //! [Noise protocol framework][noise] support for libp2p.
 //!
 //! > **Note**: This crate is still experimental and subject to major breaking changes
-//! >           both on the API and the wire protocol.
+//! > both on the API and the wire protocol.
 //!
 //! This crate provides `libp2p_core::InboundUpgrade` and `libp2p_core::OutboundUpgrade`
 //! implementations for various noise handshake patterns (currently `IK`, `IX`, and `XX`)
 //! over a particular choice of Diffie–Hellman key agreement (currently only X25519).
 //!
 //! > **Note**: Only the `XX` handshake pattern is currently guaranteed to provide
-//! >           interoperability with other libp2p implementations.
+//! > interoperability with other libp2p implementations.
 //!
 //! All upgrades produce as output a pair, consisting of the remote's static public key
 //! and a `NoiseOutput` which represents the established cryptographic session with the
@@ -39,14 +39,16 @@
 //! Example:
 //!
 //! ```
-//! use libp2p_core::{Transport, upgrade, transport::MemoryTransport};
-//! use libp2p_noise as noise;
+//! use libp2p_core::{transport::MemoryTransport, upgrade, Transport};
 //! use libp2p_identity as identity;
+//! use libp2p_noise as noise;
 //!
 //! # fn main() {
 //! let id_keys = identity::Keypair::generate_ed25519();
 //! let noise = noise::Config::new(&id_keys).unwrap();
-//! let builder = MemoryTransport::default().upgrade(upgrade::Version::V1).authenticate(noise);
+//! let builder = MemoryTransport::default()
+//!     .upgrade(upgrade::Version::V1)
+//!     .authenticate(noise);
 //! // let transport = builder.multiplex(...);
 //! # }
 //! ```
@@ -58,22 +60,25 @@
 mod io;
 mod protocol;
 
-pub use io::Output;
+use std::{collections::HashSet, fmt::Write, pin::Pin};
 
-use crate::handshake::State;
-use crate::io::handshake;
-use crate::protocol::{noise_params_into_builder, AuthenticKeypair, Keypair, PARAMS_XX};
 use futures::prelude::*;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::UpgradeInfo;
+pub use io::Output;
+use libp2p_core::{
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    UpgradeInfo,
+};
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use multiaddr::Protocol;
 use multihash::Multihash;
 use snow::params::NoiseParams;
-use std::collections::HashSet;
-use std::fmt::Write;
-use std::pin::Pin;
+
+use crate::{
+    handshake::State,
+    io::handshake,
+    protocol::{noise_params_into_builder, AuthenticKeypair, Keypair, PARAMS_XX},
+};
 
 /// The configuration for the noise handshake.
 #[derive(Clone)]
diff --git a/transports/noise/src/protocol.rs b/transports/noise/src/protocol.rs
index 29d0c81e2e4..ca47ea0dfcd 100644
--- a/transports/noise/src/protocol.rs
+++ b/transports/noise/src/protocol.rs
@@ -20,7 +20,6 @@
 
 //! Components of a Noise protocol.
 
-use crate::Error;
 use libp2p_identity as identity;
 use once_cell::sync::Lazy;
 use rand::{Rng as _, SeedableRng};
@@ -28,6 +27,8 @@ use snow::params::NoiseParams;
 use x25519_dalek::{x25519, X25519_BASEPOINT_BYTES};
 use zeroize::Zeroize;
 
+use crate::Error;
+
 /// Prefix of static key signatures for domain separation.
 pub(crate) const STATIC_KEY_DOMAIN: &str = "noise-libp2p-static-key:";
 
diff --git a/transports/noise/tests/smoke.rs b/transports/noise/tests/smoke.rs
index 62b5d41d6b9..abc5a038f93 100644
--- a/transports/noise/tests/smoke.rs
+++ b/transports/noise/tests/smoke.rs
@@ -18,14 +18,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::io;
+
 use futures::prelude::*;
-use libp2p_core::transport::{MemoryTransport, Transport};
-use libp2p_core::upgrade;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
+use libp2p_core::{
+    transport::{MemoryTransport, Transport},
+    upgrade,
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+};
 use libp2p_identity as identity;
 use libp2p_noise as noise;
 use quickcheck::*;
-use std::io;
 use tracing_subscriber::EnvFilter;
 
 #[allow(dead_code)]
diff --git a/transports/noise/tests/webtransport_certhashes.rs b/transports/noise/tests/webtransport_certhashes.rs
index b3c924f8188..7fa28da0ebe 100644
--- a/transports/noise/tests/webtransport_certhashes.rs
+++ b/transports/noise/tests/webtransport_certhashes.rs
@@ -1,8 +1,9 @@
+use std::collections::HashSet;
+
 use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
 use libp2p_identity as identity;
 use libp2p_noise as noise;
 use multihash::Multihash;
-use std::collections::HashSet;
 
 const SHA_256_MH: u64 = 0x12;
 
diff --git a/transports/plaintext/src/error.rs b/transports/plaintext/src/error.rs
index 7480874a85e..2d352562528 100644
--- a/transports/plaintext/src/error.rs
+++ b/transports/plaintext/src/error.rs
@@ -18,9 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use std::error;
-use std::fmt;
-use std::io::Error as IoError;
+use std::{error, fmt, io::Error as IoError};
 
 #[derive(Debug)]
 pub enum Error {
diff --git a/transports/plaintext/src/handshake.rs b/transports/plaintext/src/handshake.rs
index ddd5f7f8a9b..38a56b84862 100644
--- a/transports/plaintext/src/handshake.rs
+++ b/transports/plaintext/src/handshake.rs
@@ -18,14 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::error::{DecodeError, Error};
-use crate::proto::Exchange;
-use crate::Config;
+use std::io::{Error as IoError, ErrorKind as IoErrorKind};
+
 use asynchronous_codec::{Framed, FramedParts};
 use bytes::Bytes;
 use futures::prelude::*;
 use libp2p_identity::{PeerId, PublicKey};
-use std::io::{Error as IoError, ErrorKind as IoErrorKind};
+
+use crate::{
+    error::{DecodeError, Error},
+    proto::Exchange,
+    Config,
+};
 
 pub(crate) async fn handshake<S>(socket: S, config: Config) -> Result<(S, PublicKey, Bytes), Error>
 where
diff --git a/transports/plaintext/src/lib.rs b/transports/plaintext/src/lib.rs
index 4a322d63fab..f841a859a62 100644
--- a/transports/plaintext/src/lib.rs
+++ b/transports/plaintext/src/lib.rs
@@ -22,22 +22,23 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-use crate::error::Error;
-
-use bytes::Bytes;
-use futures::future::BoxFuture;
-use futures::prelude::*;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::UpgradeInfo;
-use libp2p_identity as identity;
-use libp2p_identity::PeerId;
-use libp2p_identity::PublicKey;
 use std::{
     io, iter,
     pin::Pin,
     task::{Context, Poll},
 };
 
+use bytes::Bytes;
+use futures::{future::BoxFuture, prelude::*};
+use libp2p_core::{
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    UpgradeInfo,
+};
+use libp2p_identity as identity;
+use libp2p_identity::{PeerId, PublicKey};
+
+use crate::error::Error;
+
 mod error;
 mod handshake;
 mod proto {
diff --git a/transports/pnet/src/crypt_writer.rs b/transports/pnet/src/crypt_writer.rs
index 06f932fbe71..8b302089a1d 100644
--- a/transports/pnet/src/crypt_writer.rs
+++ b/transports/pnet/src/crypt_writer.rs
@@ -18,6 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{fmt, pin::Pin};
+
 use futures::{
     io::{self, AsyncWrite},
     ready,
@@ -25,7 +27,6 @@ use futures::{
 };
 use pin_project::pin_project;
 use salsa20::{cipher::StreamCipher, XSalsa20};
-use std::{fmt, pin::Pin};
 
 /// A writer that encrypts and forwards to an inner writer
 #[pin_project]
@@ -74,7 +75,8 @@ fn poll_flush_buf<W: AsyncWrite>(
                     // we made progress, so try again
                     written += n;
                 } else {
-                    // we got Ok but got no progress whatsoever, so bail out so we don't spin writing 0 bytes.
+                    // we got Ok but got no progress whatsoever,
+                    // so bail out so we don't spin writing 0 bytes.
                     ret = Poll::Ready(Err(io::Error::new(
                         io::ErrorKind::WriteZero,
                         "Failed to write buffered data",
diff --git a/transports/pnet/src/lib.rs b/transports/pnet/src/lib.rs
index 083ffff36a3..b27f9777c47 100644
--- a/transports/pnet/src/lib.rs
+++ b/transports/pnet/src/lib.rs
@@ -19,7 +19,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 //! Implementation of the [pnet](https://github.com/libp2p/specs/blob/master/pnet/Private-Networks-PSK-V1.md) protocol.
-//!
 //| The `pnet` protocol implements *Pre-shared Key Based Private Networks in libp2p*.
 //! Libp2p nodes configured with a pre-shared key can only communicate with other nodes with
 //! the same key.
@@ -27,15 +26,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 mod crypt_writer;
-use crypt_writer::CryptWriter;
-use futures::prelude::*;
-use pin_project::pin_project;
-use rand::RngCore;
-use salsa20::{
-    cipher::{KeyIvInit, StreamCipher},
-    Salsa20, XSalsa20,
-};
-use sha3::{digest::ExtendableOutput, Shake128};
 use std::{
     error,
     fmt::{self, Write},
@@ -47,6 +37,16 @@ use std::{
     task::{Context, Poll},
 };
 
+use crypt_writer::CryptWriter;
+use futures::prelude::*;
+use pin_project::pin_project;
+use rand::RngCore;
+use salsa20::{
+    cipher::{KeyIvInit, StreamCipher},
+    Salsa20, XSalsa20,
+};
+use sha3::{digest::ExtendableOutput, Shake128};
+
 const KEY_SIZE: usize = 32;
 const NONCE_SIZE: usize = 24;
 const WRITE_BUFFER_SIZE: usize = 1024;
@@ -319,9 +319,10 @@ impl fmt::Display for PnetError {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use quickcheck::*;
 
+    use super::*;
+
     impl Arbitrary for PreSharedKey {
         fn arbitrary(g: &mut Gen) -> PreSharedKey {
             let key = core::array::from_fn(|_| u8::arbitrary(g));
diff --git a/transports/pnet/tests/smoke.rs b/transports/pnet/tests/smoke.rs
index 79ffaeab447..ae4fcc4b3fc 100644
--- a/transports/pnet/tests/smoke.rs
+++ b/transports/pnet/tests/smoke.rs
@@ -1,10 +1,9 @@
 use std::time::Duration;
 
 use futures::{future, AsyncRead, AsyncWrite, StreamExt};
-use libp2p_core::transport::MemoryTransport;
-use libp2p_core::upgrade::Version;
-use libp2p_core::Transport;
-use libp2p_core::{multiaddr::Protocol, Multiaddr};
+use libp2p_core::{
+    multiaddr::Protocol, transport::MemoryTransport, upgrade::Version, Multiaddr, Transport,
+};
 use libp2p_pnet::{PnetConfig, PreSharedKey};
 use libp2p_swarm::{dummy, Config, NetworkBehaviour, Swarm, SwarmEvent};
 
diff --git a/transports/quic/src/config.rs b/transports/quic/src/config.rs
index 2456ed3e36f..c623632ddc6 100644
--- a/transports/quic/src/config.rs
+++ b/transports/quic/src/config.rs
@@ -18,11 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{sync::Arc, time::Duration};
+
 use quinn::{
     crypto::rustls::{QuicClientConfig, QuicServerConfig},
     MtuDiscoveryConfig, VarInt,
 };
-use std::{sync::Arc, time::Duration};
 
 /// Config for the transport.
 #[derive(Clone)]
diff --git a/transports/quic/src/connection.rs b/transports/quic/src/connection.rs
index 783258a0130..a7375a1ca6d 100644
--- a/transports/quic/src/connection.rs
+++ b/transports/quic/src/connection.rs
@@ -21,18 +21,18 @@
 mod connecting;
 mod stream;
 
-pub use connecting::Connecting;
-pub use stream::Stream;
-
-use crate::{ConnectionError, Error};
-
-use futures::{future::BoxFuture, FutureExt};
-use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
 use std::{
     pin::Pin,
     task::{Context, Poll},
 };
 
+pub use connecting::Connecting;
+use futures::{future::BoxFuture, FutureExt};
+use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
+pub use stream::Stream;
+
+use crate::{ConnectionError, Error};
+
 /// State for a single opened QUIC connection.
 pub struct Connection {
     /// Underlying connection.
diff --git a/transports/quic/src/connection/connecting.rs b/transports/quic/src/connection/connecting.rs
index f6e397b4d1e..0ce7f9041db 100644
--- a/transports/quic/src/connection/connecting.rs
+++ b/transports/quic/src/connection/connecting.rs
@@ -20,7 +20,11 @@
 
 //! Future that drives a QUIC connection until is has performed its TLS handshake.
 
-use crate::{Connection, ConnectionError, Error};
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
 
 use futures::{
     future::{select, Either, FutureExt, Select},
@@ -29,11 +33,8 @@ use futures::{
 use futures_timer::Delay;
 use libp2p_identity::PeerId;
 use quinn::rustls::pki_types::CertificateDer;
-use std::{
-    pin::Pin,
-    task::{Context, Poll},
-    time::Duration,
-};
+
+use crate::{Connection, ConnectionError, Error};
 
 /// A QUIC connection currently being negotiated.
 #[derive(Debug)]
diff --git a/transports/quic/src/hole_punching.rs b/transports/quic/src/hole_punching.rs
index a38d123a6a4..6f1961081d2 100644
--- a/transports/quic/src/hole_punching.rs
+++ b/transports/quic/src/hole_punching.rs
@@ -1,15 +1,14 @@
-use crate::{provider::Provider, Error};
-
-use futures::future::Either;
-
-use rand::{distributions, Rng};
-
-use std::convert::Infallible;
 use std::{
+    convert::Infallible,
     net::{SocketAddr, UdpSocket},
     time::Duration,
 };
 
+use futures::future::Either;
+use rand::{distributions, Rng};
+
+use crate::{provider::Provider, Error};
+
 pub(crate) async fn hole_puncher<P: Provider>(
     socket: UdpSocket,
     remote_addr: SocketAddr,
diff --git a/transports/quic/src/lib.rs b/transports/quic/src/lib.rs
index 7ae649b6914..9d97e6c4319 100644
--- a/transports/quic/src/lib.rs
+++ b/transports/quic/src/lib.rs
@@ -31,16 +31,20 @@
 //! # #[cfg(feature = "async-std")]
 //! # fn main() -> std::io::Result<()> {
 //! #
+//! use libp2p_core::{transport::ListenerId, Multiaddr, Transport};
 //! use libp2p_quic as quic;
-//! use libp2p_core::{Multiaddr, Transport, transport::ListenerId};
 //!
 //! let keypair = libp2p_identity::Keypair::generate_ed25519();
 //! let quic_config = quic::Config::new(&keypair);
 //!
 //! let mut quic_transport = quic::async_std::Transport::new(quic_config);
 //!
-//! let addr = "/ip4/127.0.0.1/udp/12345/quic-v1".parse().expect("address should be valid");
-//! quic_transport.listen_on(ListenerId::next(), addr).expect("listen error.");
+//! let addr = "/ip4/127.0.0.1/udp/12345/quic-v1"
+//!     .parse()
+//!     .expect("address should be valid");
+//! quic_transport
+//!     .listen_on(ListenerId::next(), addr)
+//!     .expect("listen error.");
 //! #
 //! # Ok(())
 //! # }
@@ -53,7 +57,6 @@
 //! Note that QUIC provides transport, security, and multiplexing in a single protocol.  Therefore,
 //! QUIC connections do not need to be upgraded. You will get a compile-time error if you try.
 //! Instead, you must pass all needed configuration into the constructor.
-//!
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
@@ -67,7 +70,6 @@ use std::net::SocketAddr;
 
 pub use config::Config;
 pub use connection::{Connecting, Connection, Stream};
-
 #[cfg(feature = "async-std")]
 pub use provider::async_std;
 #[cfg(feature = "tokio")]
diff --git a/transports/quic/src/provider.rs b/transports/quic/src/provider.rs
index 6f1122ee55f..fdf88b460e8 100644
--- a/transports/quic/src/provider.rs
+++ b/transports/quic/src/provider.rs
@@ -18,8 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::future::BoxFuture;
-use if_watch::IfEvent;
 use std::{
     io,
     net::{SocketAddr, UdpSocket},
@@ -27,6 +25,9 @@ use std::{
     time::Duration,
 };
 
+use futures::future::BoxFuture;
+use if_watch::IfEvent;
+
 #[cfg(feature = "async-std")]
 pub mod async_std;
 #[cfg(feature = "tokio")]
@@ -59,7 +60,8 @@ pub trait Provider: Unpin + Send + Sized + 'static {
     /// Sleep for specified amount of time.
     fn sleep(duration: Duration) -> BoxFuture<'static, ()>;
 
-    /// Sends data on the socket to the given address. On success, returns the number of bytes written.
+    /// Sends data on the socket to the given address. On success,
+    /// returns the number of bytes written.
     fn send_to<'a>(
         udp_socket: &'a UdpSocket,
         buf: &'a [u8],
diff --git a/transports/quic/src/provider/async_std.rs b/transports/quic/src/provider/async_std.rs
index a110058108c..b5c3ac917dc 100644
--- a/transports/quic/src/provider/async_std.rs
+++ b/transports/quic/src/provider/async_std.rs
@@ -18,7 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::{future::BoxFuture, FutureExt};
 use std::{
     io,
     net::UdpSocket,
@@ -26,6 +25,8 @@ use std::{
     time::Duration,
 };
 
+use futures::{future::BoxFuture, FutureExt};
+
 use crate::GenTransport;
 
 /// Transport with [`async-std`] runtime.
diff --git a/transports/quic/src/provider/tokio.rs b/transports/quic/src/provider/tokio.rs
index 9cb148d6ef2..83753faac01 100644
--- a/transports/quic/src/provider/tokio.rs
+++ b/transports/quic/src/provider/tokio.rs
@@ -18,7 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::{future::BoxFuture, FutureExt};
 use std::{
     io,
     net::{SocketAddr, UdpSocket},
@@ -26,6 +25,8 @@ use std::{
     time::Duration,
 };
 
+use futures::{future::BoxFuture, FutureExt};
+
 use crate::GenTransport;
 
 /// Transport with [`tokio`] runtime.
diff --git a/transports/quic/src/transport.rs b/transports/quic/src/transport.rs
index 057d0f978d7..63a65ce99cc 100644
--- a/transports/quic/src/transport.rs
+++ b/transports/quic/src/transport.rs
@@ -18,38 +18,41 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::config::{Config, QuinnConfig};
-use crate::hole_punching::hole_puncher;
-use crate::provider::Provider;
-use crate::{ConnectError, Connecting, Connection, Error};
-
-use futures::channel::oneshot;
-use futures::future::{BoxFuture, Either};
-use futures::ready;
-use futures::stream::StreamExt;
-use futures::{prelude::*, stream::SelectAll};
+use std::{
+    collections::{
+        hash_map::{DefaultHasher, Entry},
+        HashMap, HashSet,
+    },
+    fmt,
+    hash::{Hash, Hasher},
+    io,
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket},
+    pin::Pin,
+    task::{Context, Poll, Waker},
+    time::Duration,
+};
 
+use futures::{
+    channel::oneshot,
+    future::{BoxFuture, Either},
+    prelude::*,
+    ready,
+    stream::{SelectAll, StreamExt},
+};
 use if_watch::IfEvent;
-
-use libp2p_core::transport::{DialOpts, PortUse};
-use libp2p_core::Endpoint;
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
-    Transport,
+    transport::{DialOpts, ListenerId, PortUse, TransportError, TransportEvent},
+    Endpoint, Transport,
 };
 use libp2p_identity::PeerId;
 use socket2::{Domain, Socket, Type};
-use std::collections::hash_map::{DefaultHasher, Entry};
-use std::collections::{HashMap, HashSet};
-use std::hash::{Hash, Hasher};
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, UdpSocket};
-use std::time::Duration;
-use std::{fmt, io};
-use std::{
-    net::SocketAddr,
-    pin::Pin,
-    task::{Context, Poll, Waker},
+
+use crate::{
+    config::{Config, QuinnConfig},
+    hole_punching::hole_puncher,
+    provider::Provider,
+    ConnectError, Connecting, Connection, Error,
 };
 
 /// Implementation of the [`Transport`] trait for QUIC.
@@ -745,9 +748,10 @@ fn socketaddr_to_multiaddr(socket_addr: &SocketAddr, version: ProtocolVersion) -
 #[cfg(test)]
 #[cfg(any(feature = "async-std", feature = "tokio"))]
 mod tests {
-    use super::*;
     use futures::future::poll_fn;
 
+    use super::*;
+
     #[test]
     fn multiaddr_to_udp_conversion() {
         assert!(multiaddr_to_socketaddr(
diff --git a/transports/quic/tests/smoke.rs b/transports/quic/tests/smoke.rs
index 6a760f9997c..5fbef84649e 100644
--- a/transports/quic/tests/smoke.rs
+++ b/transports/quic/tests/smoke.rs
@@ -1,16 +1,31 @@
 #![cfg(any(feature = "async-std", feature = "tokio"))]
 
-use futures::channel::{mpsc, oneshot};
-use futures::future::BoxFuture;
-use futures::future::{poll_fn, Either};
-use futures::stream::StreamExt;
-use futures::{future, AsyncReadExt, AsyncWriteExt, FutureExt, SinkExt};
+use std::{
+    future::Future,
+    io,
+    num::NonZeroU8,
+    pin::Pin,
+    sync::{Arc, Mutex},
+    task::Poll,
+    time::Duration,
+};
+
+use futures::{
+    channel::{mpsc, oneshot},
+    future,
+    future::{poll_fn, BoxFuture, Either},
+    stream::StreamExt,
+    AsyncReadExt, AsyncWriteExt, FutureExt, SinkExt,
+};
 use futures_timer::Delay;
-use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt, SubstreamBox};
-use libp2p_core::transport::{Boxed, DialOpts, OrTransport, PortUse, TransportEvent};
-use libp2p_core::transport::{ListenerId, TransportError};
-use libp2p_core::Endpoint;
-use libp2p_core::{multiaddr::Protocol, upgrade, Multiaddr, Transport};
+use libp2p_core::{
+    multiaddr::Protocol,
+    muxing::{StreamMuxerBox, StreamMuxerExt, SubstreamBox},
+    transport::{
+        Boxed, DialOpts, ListenerId, OrTransport, PortUse, TransportError, TransportEvent,
+    },
+    upgrade, Endpoint, Multiaddr, Transport,
+};
 use libp2p_identity::PeerId;
 use libp2p_noise as noise;
 use libp2p_quic as quic;
@@ -18,15 +33,6 @@ use libp2p_tcp as tcp;
 use libp2p_yamux as yamux;
 use quic::Provider;
 use rand::RngCore;
-use std::future::Future;
-use std::io;
-use std::num::NonZeroU8;
-use std::task::Poll;
-use std::time::Duration;
-use std::{
-    pin::Pin,
-    sync::{Arc, Mutex},
-};
 use tracing_subscriber::EnvFilter;
 
 #[cfg(feature = "tokio")]
@@ -200,7 +206,8 @@ async fn wrapped_with_delay() {
 
 #[cfg(feature = "async-std")]
 #[async_std::test]
-#[ignore] // Transport currently does not validate PeerId. Enable once we make use of PeerId validation in rustls.
+#[ignore] // Transport currently does not validate PeerId.
+          // Enable once we make use of PeerId validation in rustls.
 async fn wrong_peerid() {
     use libp2p_identity::PeerId;
 
diff --git a/transports/quic/tests/stream_compliance.rs b/transports/quic/tests/stream_compliance.rs
index b0536473215..13c29f2caa0 100644
--- a/transports/quic/tests/stream_compliance.rs
+++ b/transports/quic/tests/stream_compliance.rs
@@ -1,10 +1,12 @@
-use futures::channel::oneshot;
-use futures::StreamExt;
-use libp2p_core::transport::{DialOpts, ListenerId, PortUse};
-use libp2p_core::{Endpoint, Transport};
-use libp2p_quic as quic;
 use std::time::Duration;
 
+use futures::{channel::oneshot, StreamExt};
+use libp2p_core::{
+    transport::{DialOpts, ListenerId, PortUse},
+    Endpoint, Transport,
+};
+use libp2p_quic as quic;
+
 #[async_std::test]
 async fn close_implies_flush() {
     let (alice, bob) = connected_peers().await;
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
index 4c4fa7c6b84..fefa18fb431 100644
--- a/transports/tcp/src/lib.rs
+++ b/transports/tcp/src/lib.rs
@@ -30,11 +30,15 @@
 
 mod provider;
 
-#[cfg(feature = "async-io")]
-pub use provider::async_io;
-
-#[cfg(feature = "tokio")]
-pub use provider::tokio;
+use std::{
+    collections::{HashSet, VecDeque},
+    io,
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, TcpListener},
+    pin::Pin,
+    sync::{Arc, RwLock},
+    task::{Context, Poll, Waker},
+    time::Duration,
+};
 
 use futures::{future::Ready, prelude::*, stream::SelectAll};
 use futures_timer::Delay;
@@ -43,17 +47,12 @@ use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
     transport::{DialOpts, ListenerId, PortUse, TransportError, TransportEvent},
 };
+#[cfg(feature = "async-io")]
+pub use provider::async_io;
+#[cfg(feature = "tokio")]
+pub use provider::tokio;
 use provider::{Incoming, Provider};
 use socket2::{Domain, Socket, Type};
-use std::{
-    collections::{HashSet, VecDeque},
-    io,
-    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, TcpListener},
-    pin::Pin,
-    sync::{Arc, RwLock},
-    task::{Context, Poll, Waker},
-    time::Duration,
-};
 
 /// The configuration for a TCP/IP transport capability for libp2p.
 #[derive(Clone, Debug)]
@@ -131,14 +130,11 @@ impl PortReuse {
 impl Config {
     /// Creates a new configuration for a TCP/IP transport:
     ///
-    ///   * Nagle's algorithm, i.e. `TCP_NODELAY`, is _enabled_.
-    ///     See [`Config::nodelay`].
-    ///   * Reuse of listening ports is _disabled_.
-    ///     See [`Config::port_reuse`].
-    ///   * No custom `IP_TTL` is set. The default of the OS TCP stack applies.
-    ///     See [`Config::ttl`].
-    ///   * The size of the listen backlog for new listening sockets is `1024`.
-    ///     See [`Config::listen_backlog`].
+    ///   * Nagle's algorithm, i.e. `TCP_NODELAY`, is _enabled_. See [`Config::nodelay`].
+    ///   * Reuse of listening ports is _disabled_. See [`Config::port_reuse`].
+    ///   * No custom `IP_TTL` is set. The default of the OS TCP stack applies. See [`Config::ttl`].
+    ///   * The size of the listen backlog for new listening sockets is `1024`. See
+    ///     [`Config::listen_backlog`].
     pub fn new() -> Self {
         Self {
             ttl: None,
@@ -241,8 +237,8 @@ where
     /// The configuration of port reuse when dialing.
     port_reuse: PortReuse,
     /// All the active listeners.
-    /// The [`ListenStream`] struct contains a stream that we want to be pinned. Since the `VecDeque`
-    /// can be resized, the only way is to use a `Pin<Box<>>`.
+    /// The [`ListenStream`] struct contains a stream that we want to be pinned. Since the
+    /// `VecDeque` can be resized, the only way is to use a `Pin<Box<>>`.
     listeners: SelectAll<ListenStream<T>>,
     /// Pending transport events to return from [`libp2p_core::Transport::poll`].
     pending_events:
@@ -465,7 +461,8 @@ where
     pause: Option<Delay>,
     /// Pending event to reported.
     pending_event: Option<<Self as Stream>::Item>,
-    /// The listener can be manually closed with [`Transport::remove_listener`](libp2p_core::Transport::remove_listener).
+    /// The listener can be manually closed with
+    /// [`Transport::remove_listener`](libp2p_core::Transport::remove_listener).
     is_closed: bool,
     /// The stream must be awaken after it has been closed to deliver the last event.
     close_listener_waker: Option<Waker>,
@@ -621,7 +618,8 @@ where
         }
 
         if self.is_closed {
-            // Terminate the stream if the listener closed and all remaining events have been reported.
+            // Terminate the stream if the listener closed
+            // and all remaining events have been reported.
             return Poll::Ready(None);
         }
 
@@ -705,13 +703,13 @@ fn ip_to_multiaddr(ip: IpAddr, port: u16) -> Multiaddr {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use futures::{
         channel::{mpsc, oneshot},
         future::poll_fn,
     };
-    use libp2p_core::Endpoint;
-    use libp2p_core::Transport as _;
+    use libp2p_core::{Endpoint, Transport as _};
+
+    use super::*;
 
     #[test]
     fn multiaddr_to_tcp_conversion() {
diff --git a/transports/tcp/src/provider.rs b/transports/tcp/src/provider.rs
index d94da7a6fc3..7a609d9f031 100644
--- a/transports/tcp/src/provider.rs
+++ b/transports/tcp/src/provider.rs
@@ -26,13 +26,18 @@ pub mod async_io;
 #[cfg(feature = "tokio")]
 pub mod tokio;
 
-use futures::future::BoxFuture;
-use futures::io::{AsyncRead, AsyncWrite};
-use futures::Stream;
+use std::{
+    fmt, io,
+    net::{SocketAddr, TcpListener, TcpStream},
+    task::{Context, Poll},
+};
+
+use futures::{
+    future::BoxFuture,
+    io::{AsyncRead, AsyncWrite},
+    Stream,
+};
 use if_watch::{IfEvent, IpNet};
-use std::net::{SocketAddr, TcpListener, TcpStream};
-use std::task::{Context, Poll};
-use std::{fmt, io};
 
 /// An incoming connection returned from [`Provider::poll_accept()`].
 pub struct Incoming<S> {
diff --git a/transports/tcp/src/provider/async_io.rs b/transports/tcp/src/provider/async_io.rs
index fe0abe42d54..4df9d928fbb 100644
--- a/transports/tcp/src/provider/async_io.rs
+++ b/transports/tcp/src/provider/async_io.rs
@@ -18,13 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::{Incoming, Provider};
+use std::{
+    io, net,
+    task::{Context, Poll},
+};
 
 use async_io::Async;
 use futures::future::{BoxFuture, FutureExt};
-use std::io;
-use std::net;
-use std::task::{Context, Poll};
+
+use super::{Incoming, Provider};
 
 /// A TCP [`Transport`](libp2p_core::Transport) that works with the `async-std` ecosystem.
 ///
@@ -40,9 +42,14 @@ use std::task::{Context, Poll};
 /// # async fn main() {
 /// let mut transport = tcp::async_io::Transport::new(tcp::Config::default());
 /// let id = ListenerId::next();
-/// transport.listen_on(id, "/ip4/127.0.0.1/tcp/0".parse().unwrap()).unwrap();
+/// transport
+///     .listen_on(id, "/ip4/127.0.0.1/tcp/0".parse().unwrap())
+///     .unwrap();
 ///
-/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx)).await.into_new_address().unwrap();
+/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx))
+///     .await
+///     .into_new_address()
+///     .unwrap();
 ///
 /// println!("Listening on {addr}");
 /// # }
diff --git a/transports/tcp/src/provider/tokio.rs b/transports/tcp/src/provider/tokio.rs
index ec2d098e3fb..a96c4dba858 100644
--- a/transports/tcp/src/provider/tokio.rs
+++ b/transports/tcp/src/provider/tokio.rs
@@ -18,16 +18,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use super::{Incoming, Provider};
+use std::{
+    io, net,
+    pin::Pin,
+    task::{Context, Poll},
+};
 
 use futures::{
     future::{BoxFuture, FutureExt},
     prelude::*,
 };
-use std::io;
-use std::net;
-use std::pin::Pin;
-use std::task::{Context, Poll};
+
+use super::{Incoming, Provider};
 
 /// A TCP [`Transport`](libp2p_core::Transport) that works with the `tokio` ecosystem.
 ///
@@ -42,9 +44,14 @@ use std::task::{Context, Poll};
 /// # #[tokio::main]
 /// # async fn main() {
 /// let mut transport = tcp::tokio::Transport::new(tcp::Config::default());
-/// let id = transport.listen_on(ListenerId::next(), "/ip4/127.0.0.1/tcp/0".parse().unwrap()).unwrap();
+/// let id = transport
+///     .listen_on(ListenerId::next(), "/ip4/127.0.0.1/tcp/0".parse().unwrap())
+///     .unwrap();
 ///
-/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx)).await.into_new_address().unwrap();
+/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx))
+///     .await
+///     .into_new_address()
+///     .unwrap();
 ///
 /// println!("Listening on {addr}");
 /// # }
diff --git a/transports/tls/src/certificate.rs b/transports/tls/src/certificate.rs
index 65b373bcf9b..3e7eeb22bf3 100644
--- a/transports/tls/src/certificate.rs
+++ b/transports/tls/src/certificate.rs
@@ -22,12 +22,12 @@
 //!
 //! This module handles generation, signing, and verification of certificates.
 
+use std::sync::Arc;
+
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use x509_parser::{prelude::*, signature_algorithm::SignatureAlgorithm};
 
-use std::sync::Arc;
-
 /// The libp2p Public Key Extension is a X.509 extension
 /// with the Object Identifier 1.3.6.1.4.1.53594.1.1,
 /// allocated by IANA to the libp2p project at Protocol Labs.
@@ -283,8 +283,8 @@ impl P2pCertificate<'_> {
         self.extension.public_key.to_peer_id()
     }
 
-    /// Verify the `signature` of the `message` signed by the private key corresponding to the public key stored
-    /// in the certificate.
+    /// Verify the `signature` of the `message` signed by the private key corresponding to the
+    /// public key stored in the certificate.
     pub fn verify_signature(
         &self,
         signature_scheme: rustls::SignatureScheme,
@@ -492,9 +492,10 @@ impl P2pCertificate<'_> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use hex_literal::hex;
 
+    use super::*;
+
     #[test]
     fn sanity_check() {
         let keypair = identity::Keypair::generate_ed25519();
diff --git a/transports/tls/src/lib.rs b/transports/tls/src/lib.rs
index 3aa66db12b3..57d7d69d4bd 100644
--- a/transports/tls/src/lib.rs
+++ b/transports/tls/src/lib.rs
@@ -29,14 +29,12 @@ pub mod certificate;
 mod upgrade;
 mod verifier;
 
-use certificate::AlwaysResolvesCert;
-use libp2p_identity::Keypair;
-use libp2p_identity::PeerId;
 use std::sync::Arc;
 
+use certificate::AlwaysResolvesCert;
 pub use futures_rustls::TlsStream;
-pub use upgrade::Config;
-pub use upgrade::UpgradeError;
+use libp2p_identity::{Keypair, PeerId};
+pub use upgrade::{Config, UpgradeError};
 
 const P2P_ALPN: [u8; 6] = *b"libp2p";
 
diff --git a/transports/tls/src/upgrade.rs b/transports/tls/src/upgrade.rs
index 1c61d265ea6..a6d81ab36c9 100644
--- a/transports/tls/src/upgrade.rs
+++ b/transports/tls/src/upgrade.rs
@@ -18,20 +18,22 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::certificate;
-use crate::certificate::P2pCertificate;
-use futures::future::BoxFuture;
-use futures::AsyncWrite;
-use futures::{AsyncRead, FutureExt};
+use std::{
+    net::{IpAddr, Ipv4Addr},
+    sync::Arc,
+};
+
+use futures::{future::BoxFuture, AsyncRead, AsyncWrite, FutureExt};
 use futures_rustls::TlsStream;
-use libp2p_core::upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade};
-use libp2p_core::UpgradeInfo;
+use libp2p_core::{
+    upgrade::{InboundConnectionUpgrade, OutboundConnectionUpgrade},
+    UpgradeInfo,
+};
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use rustls::{pki_types::ServerName, CommonState};
 
-use std::net::{IpAddr, Ipv4Addr};
-use std::sync::Arc;
+use crate::{certificate, certificate::P2pCertificate};
 
 #[derive(thiserror::Error, Debug)]
 pub enum UpgradeError {
@@ -102,8 +104,10 @@ where
 
     fn upgrade_outbound(self, socket: C, _: Self::Info) -> Self::Future {
         async move {
-            // Spec: In order to keep this flexibility for future versions, clients that only support the version of the handshake defined in this document MUST NOT send any value in the Server Name Indication.
-            // Setting `ServerName` to unspecified will disable the use of the SNI extension.
+            // Spec: In order to keep this flexibility for future versions, clients that only
+            // support the version of the handshake defined in this document MUST NOT send any value
+            // in the Server Name Indication. Setting `ServerName` to unspecified will
+            // disable the use of the SNI extension.
             let name = ServerName::IpAddress(rustls::pki_types::IpAddr::from(IpAddr::V4(
                 Ipv4Addr::UNSPECIFIED,
             )));
diff --git a/transports/tls/src/verifier.rs b/transports/tls/src/verifier.rs
index 65636cbe708..82b275bc7be 100644
--- a/transports/tls/src/verifier.rs
+++ b/transports/tls/src/verifier.rs
@@ -23,7 +23,8 @@
 //! This module handles a verification of a client/server certificate chain
 //! and signatures allegedly by the given certificates.
 
-use crate::certificate;
+use std::sync::Arc;
+
 use libp2p_identity::PeerId;
 use rustls::{
     client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
@@ -35,7 +36,8 @@ use rustls::{
     CertificateError, DigitallySignedStruct, DistinguishedName, OtherError, SignatureScheme,
     SupportedCipherSuite, SupportedProtocolVersion,
 };
-use std::sync::Arc;
+
+use crate::certificate;
 
 /// The protocol versions supported by this verifier.
 ///
@@ -67,8 +69,8 @@ pub(crate) struct Libp2pCertificateVerifier {
 ///
 /// - Exactly one certificate must be presented.
 /// - The certificate must be self-signed.
-/// - The certificate must have a valid libp2p extension that includes a
-///   signature of its public key.
+/// - The certificate must have a valid libp2p extension that includes a signature of its public
+///   key.
 impl Libp2pCertificateVerifier {
     pub(crate) fn new() -> Self {
         Self {
@@ -153,11 +155,11 @@ impl ServerCertVerifier for Libp2pCertificateVerifier {
 
 /// libp2p requires the following of X.509 client certificate chains:
 ///
-/// - Exactly one certificate must be presented. In particular, client
-///   authentication is mandatory in libp2p.
+/// - Exactly one certificate must be presented. In particular, client authentication is mandatory
+///   in libp2p.
 /// - The certificate must be self-signed.
-/// - The certificate must have a valid libp2p extension that includes a
-///   signature of its public key.
+/// - The certificate must have a valid libp2p extension that includes a signature of its public
+///   key.
 impl ClientCertVerifier for Libp2pCertificateVerifier {
     fn offer_client_auth(&self) -> bool {
         true
diff --git a/transports/tls/tests/smoke.rs b/transports/tls/tests/smoke.rs
index d488ae7846a..cf11f4c0b1d 100644
--- a/transports/tls/tests/smoke.rs
+++ b/transports/tls/tests/smoke.rs
@@ -1,10 +1,8 @@
+use std::time::Duration;
+
 use futures::{future, StreamExt};
-use libp2p_core::multiaddr::Protocol;
-use libp2p_core::transport::MemoryTransport;
-use libp2p_core::upgrade::Version;
-use libp2p_core::Transport;
+use libp2p_core::{multiaddr::Protocol, transport::MemoryTransport, upgrade::Version, Transport};
 use libp2p_swarm::{dummy, Config, Swarm, SwarmEvent};
-use std::time::Duration;
 
 #[tokio::test]
 async fn can_establish_connection() {
diff --git a/transports/uds/src/lib.rs b/transports/uds/src/lib.rs
index 5c57e255b4d..74e19476595 100644
--- a/transports/uds/src/lib.rs
+++ b/transports/uds/src/lib.rs
@@ -38,21 +38,24 @@
 ))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-use futures::stream::BoxStream;
+use std::{
+    collections::VecDeque,
+    io,
+    path::PathBuf,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{
     future::{BoxFuture, Ready},
     prelude::*,
+    stream::BoxStream,
 };
-use libp2p_core::transport::ListenerId;
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
-    transport::{DialOpts, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
     Transport,
 };
-use std::collections::VecDeque;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::{io, path::PathBuf};
 
 pub type Listener<T> = BoxStream<
     'static,
@@ -241,14 +244,16 @@ fn multiaddr_to_path(addr: &Multiaddr) -> Result<PathBuf, ()> {
 
 #[cfg(all(test, feature = "async-std"))]
 mod tests {
-    use super::{multiaddr_to_path, UdsConfig};
+    use std::{borrow::Cow, path::Path};
+
     use futures::{channel::oneshot, prelude::*};
     use libp2p_core::{
         multiaddr::{Multiaddr, Protocol},
         transport::{DialOpts, ListenerId, PortUse},
         Endpoint, Transport,
     };
-    use std::{borrow::Cow, path::Path};
+
+    use super::{multiaddr_to_path, UdsConfig};
 
     #[test]
     fn multiaddr_to_path_conversion() {
diff --git a/transports/webrtc-websys/src/connection.rs b/transports/webrtc-websys/src/connection.rs
index d0c6ccd2238..01c1a8b3b60 100644
--- a/transports/webrtc-websys/src/connection.rs
+++ b/transports/webrtc-websys/src/connection.rs
@@ -1,17 +1,15 @@
 //! A libp2p connection backed by an [RtcPeerConnection](https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection).
 
-use super::{Error, Stream};
-use crate::stream::DropListener;
-use futures::channel::mpsc;
-use futures::stream::FuturesUnordered;
-use futures::StreamExt;
+use std::{
+    pin::Pin,
+    task::{ready, Context, Poll, Waker},
+};
+
+use futures::{channel::mpsc, stream::FuturesUnordered, StreamExt};
 use js_sys::{Object, Reflect};
 use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
 use libp2p_webrtc_utils::Fingerprint;
 use send_wrapper::SendWrapper;
-use std::pin::Pin;
-use std::task::Waker;
-use std::task::{ready, Context, Poll};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::JsFuture;
 use web_sys::{
@@ -19,6 +17,9 @@ use web_sys::{
     RtcSessionDescriptionInit,
 };
 
+use super::{Error, Stream};
+use crate::stream::DropListener;
+
 /// A WebRTC Connection.
 ///
 /// All connections need to be [`Send`] which is why some fields are wrapped in [`SendWrapper`].
@@ -31,7 +32,8 @@ pub struct Connection {
     closed: bool,
     /// An [`mpsc::channel`] for all inbound data channels.
     ///
-    /// Because the browser's WebRTC API is event-based, we need to use a channel to obtain all inbound data channels.
+    /// Because the browser's WebRTC API is event-based, we need to use a channel to obtain all
+    /// inbound data channels.
     inbound_data_channels: SendWrapper<mpsc::Receiver<RtcDataChannel>>,
     /// A list of futures, which, once completed, signal that a [`Stream`] has been dropped.
     drop_listeners: FuturesUnordered<DropListener>,
@@ -43,7 +45,8 @@ pub struct Connection {
 impl Connection {
     /// Create a new inner WebRTC Connection
     pub(crate) fn new(peer_connection: RtcPeerConnection) -> Self {
-        // An ondatachannel Future enables us to poll for incoming data channel events in poll_incoming
+        // An ondatachannel Future enables us to poll for incoming data channel events in
+        // poll_incoming
         let (mut tx_ondatachannel, rx_ondatachannel) = mpsc::channel(4); // we may get more than one data channel opened on a single peer connection
 
         let ondatachannel_closure = Closure::new(move |ev: RtcDataChannelEvent| {
@@ -120,7 +123,8 @@ impl StreamMuxer for Connection {
                 Poll::Ready(Ok(stream))
             }
             None => {
-                // This only happens if the [`RtcPeerConnection::ondatachannel`] closure gets freed which means we are most likely shutting down the connection.
+                // This only happens if the [`RtcPeerConnection::ondatachannel`] closure gets freed
+                // which means we are most likely shutting down the connection.
                 tracing::debug!("`Sender` for inbound data channels has been dropped");
                 Poll::Ready(Err(Error::Connection("connection closed".to_owned())))
             }
diff --git a/transports/webrtc-websys/src/lib.rs b/transports/webrtc-websys/src/lib.rs
index 04fced4111b..07207eb0ae8 100644
--- a/transports/webrtc-websys/src/lib.rs
+++ b/transports/webrtc-websys/src/lib.rs
@@ -7,7 +7,9 @@ mod stream;
 mod transport;
 mod upgrade;
 
-pub use self::connection::Connection;
-pub use self::error::Error;
-pub use self::stream::Stream;
-pub use self::transport::{Config, Transport};
+pub use self::{
+    connection::Connection,
+    error::Error,
+    stream::Stream,
+    transport::{Config, Transport},
+};
diff --git a/transports/webrtc-websys/src/sdp.rs b/transports/webrtc-websys/src/sdp.rs
index 9e63fd92462..628043111ee 100644
--- a/transports/webrtc-websys/src/sdp.rs
+++ b/transports/webrtc-websys/src/sdp.rs
@@ -1,5 +1,6 @@
-use libp2p_webrtc_utils::Fingerprint;
 use std::net::SocketAddr;
+
+use libp2p_webrtc_utils::Fingerprint;
 use web_sys::{RtcSdpType, RtcSessionDescriptionInit};
 
 /// Creates the SDP answer used by the client.
diff --git a/transports/webrtc-websys/src/stream.rs b/transports/webrtc-websys/src/stream.rs
index 812aa5afbbf..ee0183b07f0 100644
--- a/transports/webrtc-websys/src/stream.rs
+++ b/transports/webrtc-websys/src/stream.rs
@@ -1,11 +1,15 @@
 //! The WebRTC [Stream] over the Connection
-use self::poll_data_channel::PollDataChannel;
+use std::{
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{AsyncRead, AsyncWrite};
 use send_wrapper::SendWrapper;
-use std::pin::Pin;
-use std::task::{Context, Poll};
 use web_sys::RtcDataChannel;
 
+use self::poll_data_channel::PollDataChannel;
+
 mod poll_data_channel;
 
 /// A stream over a WebRTC connection.
diff --git a/transports/webrtc-websys/src/stream/poll_data_channel.rs b/transports/webrtc-websys/src/stream/poll_data_channel.rs
index 3ec744342eb..2abe499afce 100644
--- a/transports/webrtc-websys/src/stream/poll_data_channel.rs
+++ b/transports/webrtc-websys/src/stream/poll_data_channel.rs
@@ -1,19 +1,23 @@
-use std::cmp::min;
-use std::io;
-use std::pin::Pin;
-use std::rc::Rc;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Mutex;
-use std::task::{Context, Poll};
+use std::{
+    cmp::min,
+    io,
+    pin::Pin,
+    rc::Rc,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Mutex,
+    },
+    task::{Context, Poll},
+};
 
 use bytes::BytesMut;
-use futures::task::AtomicWaker;
-use futures::{AsyncRead, AsyncWrite};
+use futures::{task::AtomicWaker, AsyncRead, AsyncWrite};
 use libp2p_webrtc_utils::MAX_MSG_LEN;
 use wasm_bindgen::prelude::*;
 use web_sys::{Event, MessageEvent, RtcDataChannel, RtcDataChannelEvent, RtcDataChannelState};
 
-/// [`PollDataChannel`] is a wrapper around [`RtcDataChannel`] which implements [`AsyncRead`] and [`AsyncWrite`].
+/// [`PollDataChannel`] is a wrapper around [`RtcDataChannel`] which implements [`AsyncRead`] and
+/// [`AsyncWrite`].
 #[derive(Debug, Clone)]
 pub(crate) struct PollDataChannel {
     /// The [`RtcDataChannel`] being wrapped.
@@ -25,7 +29,8 @@ pub(crate) struct PollDataChannel {
     /// Waker for when we are waiting for the DC to be opened.
     open_waker: Rc<AtomicWaker>,
 
-    /// Waker for when we are waiting to write (again) to the DC because we previously exceeded the [`MAX_MSG_LEN`] threshold.
+    /// Waker for when we are waiting to write (again) to the DC because we previously exceeded the
+    /// [`MAX_MSG_LEN`] threshold.
     write_waker: Rc<AtomicWaker>,
 
     /// Waker for when we are waiting for the DC to be closed.
@@ -33,9 +38,11 @@ pub(crate) struct PollDataChannel {
 
     /// Whether we've been overloaded with data by the remote.
     ///
-    /// This is set to `true` in case `read_buffer` overflows, i.e. the remote is sending us messages faster than we can read them.
-    /// In that case, we return an [`std::io::Error`] from [`AsyncRead`] or [`AsyncWrite`], depending which one gets called earlier.
-    /// Failing these will (very likely), cause the application developer to drop the stream which resets it.
+    /// This is set to `true` in case `read_buffer` overflows, i.e. the remote is sending us
+    /// messages faster than we can read them. In that case, we return an [`std::io::Error`]
+    /// from [`AsyncRead`] or [`AsyncWrite`], depending which one gets called earlier.
+    /// Failing these will (very likely),
+    /// cause the application developer to drop the stream which resets it.
     overloaded: Rc<AtomicBool>,
 
     // Store the closures for proper garbage collection.
@@ -83,7 +90,9 @@ impl PollDataChannel {
         inner.set_onclose(Some(on_close_closure.as_ref().unchecked_ref()));
 
         let new_data_waker = Rc::new(AtomicWaker::new());
-        let read_buffer = Rc::new(Mutex::new(BytesMut::new())); // We purposely don't use `with_capacity` so we don't eagerly allocate `MAX_READ_BUFFER` per stream.
+        // We purposely don't use `with_capacity`
+        // so we don't eagerly allocate `MAX_READ_BUFFER` per stream.
+        let read_buffer = Rc::new(Mutex::new(BytesMut::new()));
         let overloaded = Rc::new(AtomicBool::new(false));
 
         let on_message_closure = Closure::<dyn FnMut(_)>::new({
diff --git a/transports/webrtc-websys/src/transport.rs b/transports/webrtc-websys/src/transport.rs
index 836acb0b9f6..abf02520244 100644
--- a/transports/webrtc-websys/src/transport.rs
+++ b/transports/webrtc-websys/src/transport.rs
@@ -1,15 +1,18 @@
-use super::upgrade;
-use super::Connection;
-use super::Error;
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::future::FutureExt;
-use libp2p_core::multiaddr::Multiaddr;
-use libp2p_core::muxing::StreamMuxerBox;
-use libp2p_core::transport::DialOpts;
-use libp2p_core::transport::{Boxed, ListenerId, Transport as _, TransportError, TransportEvent};
+use libp2p_core::{
+    multiaddr::Multiaddr,
+    muxing::StreamMuxerBox,
+    transport::{Boxed, DialOpts, ListenerId, Transport as _, TransportError, TransportEvent},
+};
 use libp2p_identity::{Keypair, PeerId};
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
+
+use super::{upgrade, Connection, Error};
 
 /// Config for the [`Transport`].
 #[derive(Clone)]
diff --git a/transports/webrtc-websys/src/upgrade.rs b/transports/webrtc-websys/src/upgrade.rs
index d42f2e3ae18..b1de908ae82 100644
--- a/transports/webrtc-websys/src/upgrade.rs
+++ b/transports/webrtc-websys/src/upgrade.rs
@@ -1,13 +1,11 @@
-use super::Error;
-use crate::connection::RtcPeerConnection;
-use crate::error::AuthenticationError;
-use crate::sdp;
-use crate::Connection;
+use std::net::SocketAddr;
+
 use libp2p_identity::{Keypair, PeerId};
-use libp2p_webrtc_utils::noise;
-use libp2p_webrtc_utils::Fingerprint;
+use libp2p_webrtc_utils::{noise, Fingerprint};
 use send_wrapper::SendWrapper;
-use std::net::SocketAddr;
+
+use super::Error;
+use crate::{connection::RtcPeerConnection, error::AuthenticationError, sdp, Connection};
 
 /// Upgrades an outbound WebRTC connection by creating the data channel
 /// and conducting a Noise handshake
diff --git a/transports/webrtc/src/lib.rs b/transports/webrtc/src/lib.rs
index ea1e6a4d646..99f0c7da658 100644
--- a/transports/webrtc/src/lib.rs
+++ b/transports/webrtc/src/lib.rs
@@ -23,7 +23,7 @@
 //!
 //! # Overview
 //!
-//! ## ICE
+//!  ## ICE
 //!
 //! RFCs: 8839, 8445 See also:
 //! <https://tools.ietf.org/id/draft-ietf-rtcweb-sdp-08.html#rfc.section.5.2.3>
@@ -39,10 +39,9 @@
 //!
 //! The ICE workflow works as follows:
 //!
-//! - An "offerer" determines ways in which it could be accessible (either an
-//!   IP address or through a relay using a TURN server), which are called "candidates". It then
-//!   generates a small text payload in a format called SDP, that describes the request for a
-//!   connection.
+//! - An "offerer" determines ways in which it could be accessible (either an IP address or through
+//!   a relay using a TURN server), which are called "candidates". It then generates a small text
+//!   payload in a format called SDP, that describes the request for a connection.
 //! - The offerer sends this SDP-encoded message to the answerer. The medium through which this
 //!   exchange is done is out of scope of the ICE protocol.
 //! - The answerer then finds its own candidates, and generates an answer, again in the SDP format.
diff --git a/transports/webrtc/src/tokio/certificate.rs b/transports/webrtc/src/tokio/certificate.rs
index 81197af4132..7ff35d46bdd 100644
--- a/transports/webrtc/src/tokio/certificate.rs
+++ b/transports/webrtc/src/tokio/certificate.rs
@@ -100,9 +100,10 @@ enum Kind {
 
 #[cfg(all(test, feature = "pem"))]
 mod test {
-    use super::*;
     use rand::thread_rng;
 
+    use super::*;
+
     #[test]
     fn test_certificate_serialize_pem_and_from_pem() {
         let cert = Certificate::generate(&mut thread_rng()).unwrap();
diff --git a/transports/webrtc/src/tokio/connection.rs b/transports/webrtc/src/tokio/connection.rs
index 3bcc4c3193e..19232707e7f 100644
--- a/transports/webrtc/src/tokio/connection.rs
+++ b/transports/webrtc/src/tokio/connection.rs
@@ -18,26 +18,27 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::stream::FuturesUnordered;
+use std::{
+    pin::Pin,
+    sync::Arc,
+    task::{Context, Poll, Waker},
+};
+
 use futures::{
     channel::{
         mpsc,
         oneshot::{self, Sender},
     },
+    future::BoxFuture,
     lock::Mutex as FutMutex,
+    ready,
+    stream::FuturesUnordered,
     StreamExt,
-    {future::BoxFuture, ready},
 };
 use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
-use webrtc::data::data_channel::DataChannel as DetachedDataChannel;
-use webrtc::data_channel::RTCDataChannel;
-use webrtc::peer_connection::RTCPeerConnection;
-
-use std::task::Waker;
-use std::{
-    pin::Pin,
-    sync::Arc,
-    task::{Context, Poll},
+use webrtc::{
+    data::data_channel::DataChannel as DetachedDataChannel, data_channel::RTCDataChannel,
+    peer_connection::RTCPeerConnection,
 };
 
 use crate::tokio::{error::Error, stream, stream::Stream};
@@ -172,7 +173,9 @@ impl StreamMuxer for Connection {
                     "Sender-end of channel should be owned by `RTCPeerConnection`"
                 );
 
-                Poll::Pending // Return `Pending` without registering a waker: If the channel is closed, we don't need to be called anymore.
+                // Return `Pending` without registering a waker: If the channel is
+                // closed, we don't need to be called anymore.
+                Poll::Pending
             }
         }
     }
diff --git a/transports/webrtc/src/tokio/req_res_chan.rs b/transports/webrtc/src/tokio/req_res_chan.rs
index fb29e16db27..a733c86d5cc 100644
--- a/transports/webrtc/src/tokio/req_res_chan.rs
+++ b/transports/webrtc/src/tokio/req_res_chan.rs
@@ -18,16 +18,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::{
-    channel::{mpsc, oneshot},
-    SinkExt, StreamExt,
-};
-
 use std::{
     io,
     task::{Context, Poll},
 };
 
+use futures::{
+    channel::{mpsc, oneshot},
+    SinkExt, StreamExt,
+};
+
 pub(crate) fn new<Req, Res>(capacity: usize) -> (Sender<Req, Res>, Receiver<Req, Res>) {
     let (sender, receiver) = mpsc::channel(capacity);
 
diff --git a/transports/webrtc/src/tokio/sdp.rs b/transports/webrtc/src/tokio/sdp.rs
index 4be4c19f188..d9f869d4433 100644
--- a/transports/webrtc/src/tokio/sdp.rs
+++ b/transports/webrtc/src/tokio/sdp.rs
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-pub(crate) use libp2p_webrtc_utils::sdp::random_ufrag;
-use libp2p_webrtc_utils::sdp::render_description;
-use libp2p_webrtc_utils::Fingerprint;
 use std::net::SocketAddr;
+
+pub(crate) use libp2p_webrtc_utils::sdp::random_ufrag;
+use libp2p_webrtc_utils::{sdp::render_description, Fingerprint};
 use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
 
 /// Creates the SDP answer used by the client.
diff --git a/transports/webrtc/src/tokio/stream.rs b/transports/webrtc/src/tokio/stream.rs
index 4278a751e27..9d5a9faf440 100644
--- a/transports/webrtc/src/tokio/stream.rs
+++ b/transports/webrtc/src/tokio/stream.rs
@@ -40,8 +40,8 @@ pub struct Stream {
 pub(crate) type DropListener = libp2p_webrtc_utils::DropListener<Compat<PollDataChannel>>;
 
 impl Stream {
-    /// Returns a new `Substream` and a listener, which will notify the receiver when/if the substream
-    /// is dropped.
+    /// Returns a new `Substream` and a listener, which will notify the receiver when/if the
+    /// substream is dropped.
     pub(crate) fn new(data_channel: Arc<DataChannel>) -> (Self, DropListener) {
         let mut data_channel = PollDataChannel::new(data_channel).compat();
         data_channel.get_mut().set_read_buf_capacity(MAX_MSG_LEN);
diff --git a/transports/webrtc/src/tokio/transport.rs b/transports/webrtc/src/tokio/transport.rs
index 62049c8f59b..29fad180d93 100644
--- a/transports/webrtc/src/tokio/transport.rs
+++ b/transports/webrtc/src/tokio/transport.rs
@@ -18,6 +18,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    io,
+    net::{IpAddr, SocketAddr},
+    pin::Pin,
+    task::{Context, Poll, Waker},
+};
+
 use futures::{future::BoxFuture, prelude::*, stream::SelectAll};
 use if_watch::{tokio::IfWatcher, IfEvent};
 use libp2p_core::{
@@ -28,14 +35,6 @@ use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use webrtc::peer_connection::configuration::RTCConfiguration;
 
-use std::net::IpAddr;
-use std::{
-    io,
-    net::SocketAddr,
-    pin::Pin,
-    task::{Context, Poll, Waker},
-};
-
 use crate::tokio::{
     certificate::Certificate,
     connection::Connection,
@@ -60,8 +59,8 @@ impl Transport {
     ///
     /// ```
     /// use libp2p_identity as identity;
+    /// use libp2p_webrtc::tokio::{Certificate, Transport};
     /// use rand::thread_rng;
-    /// use libp2p_webrtc::tokio::{Transport, Certificate};
     ///
     /// let id_keys = identity::Keypair::generate_ed25519();
     /// let transport = Transport::new(id_keys, Certificate::generate(&mut thread_rng()).unwrap());
@@ -124,8 +123,8 @@ impl libp2p_core::Transport for Transport {
         dial_opts: DialOpts,
     ) -> Result<Self::Dial, TransportError<Self::Error>> {
         if dial_opts.role.is_listener() {
-            // TODO: As the listener of a WebRTC hole punch, we need to send a random UDP packet to the
-            // `addr`. See DCUtR specification below.
+            // TODO: As the listener of a WebRTC hole punch, we need to send a random UDP packet to
+            // the `addr`. See DCUtR specification below.
             //
             // https://github.com/libp2p/specs/blob/master/relay/DCUtR.md#the-protocol
             tracing::warn!("WebRTC hole punch is not yet supported");
@@ -426,11 +425,13 @@ fn parse_webrtc_listen_addr(addr: &Multiaddr) -> Option<SocketAddr> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::net::Ipv6Addr;
+
     use futures::future::poll_fn;
     use libp2p_core::Transport as _;
     use rand::thread_rng;
-    use std::net::Ipv6Addr;
+
+    use super::*;
 
     #[test]
     fn missing_webrtc_protocol() {
diff --git a/transports/webrtc/src/tokio/udp_mux.rs b/transports/webrtc/src/tokio/udp_mux.rs
index 7a8d960826d..dcb88592c9b 100644
--- a/transports/webrtc/src/tokio/udp_mux.rs
+++ b/transports/webrtc/src/tokio/udp_mux.rs
@@ -18,6 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+use std::{
+    collections::{HashMap, HashSet},
+    io,
+    io::ErrorKind,
+    net::SocketAddr,
+    sync::Arc,
+    task::{Context, Poll},
+};
+
 use async_trait::async_trait;
 use futures::{
     channel::oneshot,
@@ -31,16 +40,9 @@ use stun::{
 };
 use thiserror::Error;
 use tokio::{io::ReadBuf, net::UdpSocket};
-use webrtc::ice::udp_mux::{UDPMux, UDPMuxConn, UDPMuxConnParams, UDPMuxWriter};
-use webrtc::util::{Conn, Error};
-
-use std::{
-    collections::{HashMap, HashSet},
-    io,
-    io::ErrorKind,
-    net::SocketAddr,
-    sync::Arc,
-    task::{Context, Poll},
+use webrtc::{
+    ice::udp_mux::{UDPMux, UDPMuxConn, UDPMuxConnParams, UDPMuxWriter},
+    util::{Conn, Error},
 };
 
 use crate::tokio::req_res_chan;
@@ -303,8 +305,8 @@ impl UDPMuxNewAddr {
             if let Poll::Ready(Some((ufrag, response))) =
                 self.remove_conn_command.poll_next_unpin(cx)
             {
-                // Pion's ice implementation has both `RemoveConnByFrag` and `RemoveConn`, but since `conns`
-                // is keyed on `ufrag` their implementation is equivalent.
+                // Pion's ice implementation has both `RemoveConnByFrag` and `RemoveConn`, but since
+                // `conns` is keyed on `ufrag` their implementation is equivalent.
 
                 if let Some(removed_conn) = self.conns.remove(&ufrag) {
                     for address in removed_conn.get_addresses() {
@@ -336,8 +338,9 @@ impl UDPMuxNewAddr {
                             let conn = self.address_map.get(&addr);
 
                             let conn = match conn {
-                                // If we couldn't find the connection based on source address, see if
-                                // this is a STUN message and if so if we can find the connection based on ufrag.
+                                // If we couldn't find the connection based on source address, see
+                                // if this is a STUN message and if
+                                // so if we can find the connection based on ufrag.
                                 None if is_stun_message(read.filled()) => {
                                     match self.conn_from_stun_message(read.filled(), &addr) {
                                         Some(Ok(s)) => Some(s),
diff --git a/transports/webrtc/src/tokio/upgrade.rs b/transports/webrtc/src/tokio/upgrade.rs
index 4145a5e7510..9293a474084 100644
--- a/transports/webrtc/src/tokio/upgrade.rs
+++ b/transports/webrtc/src/tokio/upgrade.rs
@@ -18,27 +18,23 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use libp2p_webrtc_utils::{noise, Fingerprint};
+use std::{net::SocketAddr, sync::Arc, time::Duration};
 
-use futures::channel::oneshot;
-use futures::future::Either;
+use futures::{channel::oneshot, future::Either};
 use futures_timer::Delay;
 use libp2p_identity as identity;
 use libp2p_identity::PeerId;
-use std::{net::SocketAddr, sync::Arc, time::Duration};
-use webrtc::api::setting_engine::SettingEngine;
-use webrtc::api::APIBuilder;
-use webrtc::data::data_channel::DataChannel;
-use webrtc::data_channel::data_channel_init::RTCDataChannelInit;
-use webrtc::dtls_transport::dtls_role::DTLSRole;
-use webrtc::ice::network_type::NetworkType;
-use webrtc::ice::udp_mux::UDPMux;
-use webrtc::ice::udp_network::UDPNetwork;
-use webrtc::peer_connection::configuration::RTCConfiguration;
-use webrtc::peer_connection::RTCPeerConnection;
-
-use crate::tokio::sdp::random_ufrag;
-use crate::tokio::{error::Error, sdp, stream::Stream, Connection};
+use libp2p_webrtc_utils::{noise, Fingerprint};
+use webrtc::{
+    api::{setting_engine::SettingEngine, APIBuilder},
+    data::data_channel::DataChannel,
+    data_channel::data_channel_init::RTCDataChannelInit,
+    dtls_transport::dtls_role::DTLSRole,
+    ice::{network_type::NetworkType, udp_mux::UDPMux, udp_network::UDPNetwork},
+    peer_connection::{configuration::RTCConfiguration, RTCPeerConnection},
+};
+
+use crate::tokio::{error::Error, sdp, sdp::random_ufrag, stream::Stream, Connection};
 
 /// Creates a new outbound WebRTC connection.
 pub(crate) async fn outbound(
diff --git a/transports/webrtc/tests/smoke.rs b/transports/webrtc/tests/smoke.rs
index d606d66c41f..5f67c09d962 100644
--- a/transports/webrtc/tests/smoke.rs
+++ b/transports/webrtc/tests/smoke.rs
@@ -18,21 +18,30 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures::channel::mpsc;
-use futures::future::{BoxFuture, Either};
-use futures::stream::StreamExt;
-use futures::{future, ready, AsyncReadExt, AsyncWriteExt, FutureExt, SinkExt};
-use libp2p_core::muxing::{StreamMuxerBox, StreamMuxerExt};
-use libp2p_core::transport::{Boxed, DialOpts, ListenerId, PortUse, TransportEvent};
-use libp2p_core::{Endpoint, Multiaddr, Transport};
+use std::{
+    future::Future,
+    num::NonZeroU8,
+    pin::Pin,
+    task::{Context, Poll},
+    time::Duration,
+};
+
+use futures::{
+    channel::mpsc,
+    future,
+    future::{BoxFuture, Either},
+    ready,
+    stream::StreamExt,
+    AsyncReadExt, AsyncWriteExt, FutureExt, SinkExt,
+};
+use libp2p_core::{
+    muxing::{StreamMuxerBox, StreamMuxerExt},
+    transport::{Boxed, DialOpts, ListenerId, PortUse, TransportEvent},
+    Endpoint, Multiaddr, Transport,
+};
 use libp2p_identity::PeerId;
 use libp2p_webrtc as webrtc;
 use rand::{thread_rng, RngCore};
-use std::future::Future;
-use std::num::NonZeroU8;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
index 21789eeca66..72f4068610d 100644
--- a/transports/websocket-websys/src/lib.rs
+++ b/transports/websocket-websys/src/lib.rs
@@ -24,21 +24,25 @@
 
 mod web_context;
 
+use std::{
+    cmp::min,
+    pin::Pin,
+    rc::Rc,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Mutex,
+    },
+    task::{Context, Poll},
+};
+
 use bytes::BytesMut;
-use futures::task::AtomicWaker;
-use futures::{future::Ready, io, prelude::*};
+use futures::{future::Ready, io, prelude::*, task::AtomicWaker};
 use js_sys::Array;
-use libp2p_core::transport::DialOpts;
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
-    transport::{ListenerId, TransportError, TransportEvent},
+    transport::{DialOpts, ListenerId, TransportError, TransportEvent},
 };
 use send_wrapper::SendWrapper;
-use std::cmp::min;
-use std::rc::Rc;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Mutex;
-use std::{pin::Pin, task::Context, task::Poll};
 use wasm_bindgen::prelude::*;
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket};
 
@@ -62,7 +66,6 @@ use crate::web_context::WebContext;
 ///     .multiplex(yamux::Config::default())
 ///     .boxed();
 /// ```
-///
 #[derive(Default)]
 pub struct Transport {
     _private: (),
@@ -176,7 +179,8 @@ struct Inner {
     /// Waker for when we are waiting for the WebSocket to be opened.
     open_waker: Rc<AtomicWaker>,
 
-    /// Waker for when we are waiting to write (again) to the WebSocket because we previously exceeded the [`MAX_BUFFER`] threshold.
+    /// Waker for when we are waiting to write (again) to the WebSocket because we previously
+    /// exceeded the [`MAX_BUFFER`] threshold.
     write_waker: Rc<AtomicWaker>,
 
     /// Waker for when we are waiting for the WebSocket to be closed.
@@ -308,7 +312,9 @@ impl Connection {
             .expect("to have a window or worker context")
             .set_interval_with_callback_and_timeout_and_arguments(
                 on_buffered_amount_low_closure.as_ref().unchecked_ref(),
-                100, // Chosen arbitrarily and likely worth tuning. Due to low impact of the /ws transport, no further effort was invested at the time.
+                // Chosen arbitrarily and likely worth tuning. Due to low impact of the /ws
+                // transport, no further effort was invested at the time.
+                100,
                 &Array::new(),
             )
             .expect("to be able to set an interval");
@@ -434,7 +440,8 @@ impl AsyncWrite for Connection {
 
 impl Drop for Connection {
     fn drop(&mut self) {
-        // Unset event listeners, as otherwise they will be called by JS after the handlers have already been dropped.
+        // Unset event listeners, as otherwise they will be called by JS after the handlers have
+        // already been dropped.
         self.inner.socket.set_onclose(None);
         self.inner.socket.set_onerror(None);
         self.inner.socket.set_onopen(None);
@@ -458,9 +465,10 @@ impl Drop for Connection {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libp2p_identity::PeerId;
 
+    use super::*;
+
     #[test]
     fn extract_url() {
         let peer_id = PeerId::random();
diff --git a/transports/websocket/src/error.rs b/transports/websocket/src/error.rs
index 7dc22331bcd..efab95a7621 100644
--- a/transports/websocket/src/error.rs
+++ b/transports/websocket/src/error.rs
@@ -18,10 +18,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::tls;
-use libp2p_core::Multiaddr;
 use std::{error, fmt};
 
+use libp2p_core::Multiaddr;
+
+use crate::tls;
+
 /// Error in WebSockets.
 #[derive(Debug)]
 pub enum Error<E> {
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
index 259be6a68f8..3d2738cbc3c 100644
--- a/transports/websocket/src/framed.rs
+++ b/transports/websocket/src/framed.rs
@@ -18,11 +18,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{error::Error, quicksink, tls};
+use std::{
+    borrow::Cow,
+    collections::HashMap,
+    fmt, io, mem,
+    net::IpAddr,
+    ops::DerefMut,
+    pin::Pin,
+    sync::Arc,
+    task::{Context, Poll},
+};
+
 use either::Either;
 use futures::{future::BoxFuture, prelude::*, ready, stream::BoxStream};
-use futures_rustls::rustls::pki_types::ServerName;
-use futures_rustls::{client, server};
+use futures_rustls::{client, rustls::pki_types::ServerName, server};
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
     transport::{DialOpts, ListenerId, TransportError, TransportEvent},
@@ -33,12 +42,10 @@ use soketto::{
     connection::{self, CloseReason},
     handshake,
 };
-use std::borrow::Cow;
-use std::net::IpAddr;
-use std::{collections::HashMap, ops::DerefMut, sync::Arc};
-use std::{fmt, io, mem, pin::Pin, task::Context, task::Poll};
 use url::Url;
 
+use crate::{error::Error, quicksink, tls};
+
 /// Max. number of payload bytes of a single frame.
 const MAX_DATA_SIZE: usize = 256 * 1024 * 1024;
 
@@ -809,10 +816,12 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use libp2p_identity::PeerId;
     use std::io;
 
+    use libp2p_identity::PeerId;
+
+    use super::*;
+
     #[test]
     fn listen_addr() {
         let tcp_addr = "/ip4/0.0.0.0/tcp/2222".parse::<Multiaddr>().unwrap();
diff --git a/transports/websocket/src/lib.rs b/transports/websocket/src/lib.rs
index cbc923613dd..fbed8fddc66 100644
--- a/transports/websocket/src/lib.rs
+++ b/transports/websocket/src/lib.rs
@@ -27,6 +27,12 @@ pub mod framed;
 mod quicksink;
 pub mod tls;
 
+use std::{
+    io,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use error::Error;
 use framed::{Connection, Incoming};
 use futures::{future::BoxFuture, prelude::*, ready};
@@ -37,11 +43,6 @@ use libp2p_core::{
     Transport,
 };
 use rw_stream_sink::RwStreamSink;
-use std::{
-    io,
-    pin::Pin,
-    task::{Context, Poll},
-};
 
 /// A Websocket transport.
 ///
@@ -75,18 +76,28 @@ use std::{
 /// # #[async_std::main]
 /// # async fn main() {
 ///
-/// let mut transport = websocket::WsConfig::new(dns::async_std::Transport::system(
-///     tcp::async_io::Transport::new(tcp::Config::default()),
-/// ).await.unwrap());
+/// let mut transport = websocket::WsConfig::new(
+///     dns::async_std::Transport::system(tcp::async_io::Transport::new(tcp::Config::default()))
+///         .await
+///         .unwrap(),
+/// );
 ///
 /// let rcgen_cert = generate_simple_self_signed(vec!["localhost".to_string()]).unwrap();
 /// let priv_key = websocket::tls::PrivateKey::new(rcgen_cert.serialize_private_key_der());
 /// let cert = websocket::tls::Certificate::new(rcgen_cert.serialize_der().unwrap());
 /// transport.set_tls_config(websocket::tls::Config::new(priv_key, vec![cert]).unwrap());
 ///
-/// let id = transport.listen_on(ListenerId::next(), "/ip4/127.0.0.1/tcp/0/tls/ws".parse().unwrap()).unwrap();
+/// let id = transport
+///     .listen_on(
+///         ListenerId::next(),
+///         "/ip4/127.0.0.1/tcp/0/tls/ws".parse().unwrap(),
+///     )
+///     .unwrap();
 ///
-/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx)).await.into_new_address().unwrap();
+/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx))
+///     .await
+///     .into_new_address()
+///     .unwrap();
 /// println!("Listening on {addr}");
 ///
 /// # }
@@ -105,13 +116,20 @@ use std::{
 /// # #[async_std::main]
 /// # async fn main() {
 ///
-/// let mut transport = websocket::WsConfig::new(
-///     tcp::async_io::Transport::new(tcp::Config::default()),
-/// );
+/// let mut transport =
+///     websocket::WsConfig::new(tcp::async_io::Transport::new(tcp::Config::default()));
 ///
-/// let id = transport.listen_on(ListenerId::next(), "/ip4/127.0.0.1/tcp/0/ws".parse().unwrap()).unwrap();
+/// let id = transport
+///     .listen_on(
+///         ListenerId::next(),
+///         "/ip4/127.0.0.1/tcp/0/ws".parse().unwrap(),
+///     )
+///     .unwrap();
 ///
-/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx)).await.into_new_address().unwrap();
+/// let addr = future::poll_fn(|cx| Pin::new(&mut transport).poll(cx))
+///     .await
+///     .into_new_address()
+///     .unwrap();
 /// println!("Listening on {addr}");
 ///
 /// # }
@@ -283,7 +301,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::WsConfig;
     use futures::prelude::*;
     use libp2p_core::{
         multiaddr::Protocol,
@@ -293,6 +310,8 @@ mod tests {
     use libp2p_identity::PeerId;
     use libp2p_tcp as tcp;
 
+    use super::WsConfig;
+
     #[test]
     fn dialer_connects_to_listener_ipv4() {
         let a = "/ip4/127.0.0.1/tcp/0/ws".parse().unwrap();
diff --git a/transports/websocket/src/quicksink.rs b/transports/websocket/src/quicksink.rs
index 4f620536ea1..a0e2fb8b0f6 100644
--- a/transports/websocket/src/quicksink.rs
+++ b/transports/websocket/src/quicksink.rs
@@ -19,26 +19,28 @@
 // ```no_run
 // use async_std::io;
 // use futures::prelude::*;
+//
 // use crate::quicksink::Action;
 //
 // crate::quicksink::make_sink(io::stdout(), |mut stdout, action| async move {
 //     match action {
 //         Action::Send(x) => stdout.write_all(x).await?,
 //         Action::Flush => stdout.flush().await?,
-//         Action::Close => stdout.close().await?
+//         Action::Close => stdout.close().await?,
 //     }
 //     Ok::<_, io::Error>(stdout)
 // });
 // ```
 
-use futures::{ready, sink::Sink};
-use pin_project_lite::pin_project;
 use std::{
     future::Future,
     pin::Pin,
     task::{Context, Poll},
 };
 
+use futures::{ready, sink::Sink};
+use pin_project_lite::pin_project;
+
 /// Returns a `Sink` impl based on the initial value and the given closure.
 ///
 /// The closure will be applied to the initial value and an [`Action`] that
@@ -291,10 +293,11 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::quicksink::{make_sink, Action};
     use async_std::{io, task};
     use futures::{channel::mpsc, prelude::*};
 
+    use crate::quicksink::{make_sink, Action};
+
     #[test]
     fn smoke_test() {
         task::block_on(async {
diff --git a/transports/websocket/src/tls.rs b/transports/websocket/src/tls.rs
index 77090e21675..598dcc22765 100644
--- a/transports/websocket/src/tls.rs
+++ b/transports/websocket/src/tls.rs
@@ -18,9 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use futures_rustls::{rustls, TlsAcceptor, TlsConnector};
 use std::{fmt, io, sync::Arc};
 
+use futures_rustls::{rustls, TlsAcceptor, TlsConnector};
+
 /// TLS configuration.
 #[derive(Clone)]
 pub struct Config {
diff --git a/transports/webtransport-websys/src/connection.rs b/transports/webtransport-websys/src/connection.rs
index 956a66288af..75c8603864a 100644
--- a/transports/webtransport-websys/src/connection.rs
+++ b/transports/webtransport-websys/src/connection.rs
@@ -1,22 +1,29 @@
+use std::{
+    collections::HashSet,
+    future::poll_fn,
+    pin::Pin,
+    task::{ready, Context, Poll},
+};
+
 use futures::FutureExt;
-use libp2p_core::muxing::{StreamMuxer, StreamMuxerEvent};
-use libp2p_core::upgrade::OutboundConnectionUpgrade;
-use libp2p_core::UpgradeInfo;
+use libp2p_core::{
+    muxing::{StreamMuxer, StreamMuxerEvent},
+    upgrade::OutboundConnectionUpgrade,
+    UpgradeInfo,
+};
 use libp2p_identity::{Keypair, PeerId};
 use multihash::Multihash;
 use send_wrapper::SendWrapper;
-use std::collections::HashSet;
-use std::future::poll_fn;
-use std::pin::Pin;
-use std::task::{ready, Context, Poll};
 use wasm_bindgen_futures::JsFuture;
 use web_sys::ReadableStreamDefaultReader;
 
-use crate::bindings::{WebTransport, WebTransportBidirectionalStream};
-use crate::endpoint::Endpoint;
-use crate::fused_js_promise::FusedJsPromise;
-use crate::utils::{detach_promise, parse_reader_response, to_js_type};
-use crate::{Error, Stream};
+use crate::{
+    bindings::{WebTransport, WebTransportBidirectionalStream},
+    endpoint::Endpoint,
+    fused_js_promise::FusedJsPromise,
+    utils::{detach_promise, parse_reader_response, to_js_type},
+    Error, Stream,
+};
 
 /// An opened WebTransport connection.
 #[derive(Debug)]
diff --git a/transports/webtransport-websys/src/endpoint.rs b/transports/webtransport-websys/src/endpoint.rs
index 0bff1ed6186..fd209c51664 100644
--- a/transports/webtransport-websys/src/endpoint.rs
+++ b/transports/webtransport-websys/src/endpoint.rs
@@ -1,11 +1,14 @@
+use std::collections::HashSet;
+
 use js_sys::{Array, Uint8Array};
 use libp2p_identity::PeerId;
 use multiaddr::{Multiaddr, Protocol};
 use multihash::Multihash;
-use std::collections::HashSet;
 
-use crate::bindings::{WebTransportHash, WebTransportOptions};
-use crate::Error;
+use crate::{
+    bindings::{WebTransportHash, WebTransportOptions},
+    Error,
+};
 
 pub(crate) struct Endpoint {
     pub(crate) host: String,
@@ -149,9 +152,10 @@ impl Endpoint {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::str::FromStr;
 
+    use super::*;
+
     fn multihash_from_str(s: &str) -> Multihash<64> {
         let (_base, bytes) = multibase::decode(s).unwrap();
         Multihash::from_bytes(&bytes).unwrap()
diff --git a/transports/webtransport-websys/src/fused_js_promise.rs b/transports/webtransport-websys/src/fused_js_promise.rs
index 0ba846501c2..d3d3858a553 100644
--- a/transports/webtransport-websys/src/fused_js_promise.rs
+++ b/transports/webtransport-websys/src/fused_js_promise.rs
@@ -1,8 +1,11 @@
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{ready, Context, Poll},
+};
+
 use futures::FutureExt;
 use js_sys::Promise;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{ready, Context, Poll};
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::JsFuture;
 
diff --git a/transports/webtransport-websys/src/lib.rs b/transports/webtransport-websys/src/lib.rs
index dcb1010d986..126adc054a9 100644
--- a/transports/webtransport-websys/src/lib.rs
+++ b/transports/webtransport-websys/src/lib.rs
@@ -11,7 +11,9 @@ mod stream;
 mod transport;
 mod utils;
 
-pub use self::connection::Connection;
-pub use self::error::Error;
-pub use self::stream::Stream;
-pub use self::transport::{Config, Transport};
+pub use self::{
+    connection::Connection,
+    error::Error,
+    stream::Stream,
+    transport::{Config, Transport},
+};
diff --git a/transports/webtransport-websys/src/stream.rs b/transports/webtransport-websys/src/stream.rs
index ba4238ac814..b9d1669b6dc 100644
--- a/transports/webtransport-websys/src/stream.rs
+++ b/transports/webtransport-websys/src/stream.rs
@@ -1,16 +1,20 @@
+use std::{
+    io,
+    pin::Pin,
+    task::{ready, Context, Poll},
+};
+
 use futures::{AsyncRead, AsyncWrite, FutureExt};
 use js_sys::Uint8Array;
 use send_wrapper::SendWrapper;
-use std::io;
-use std::pin::Pin;
-use std::task::ready;
-use std::task::{Context, Poll};
 use web_sys::{ReadableStreamDefaultReader, WritableStreamDefaultWriter};
 
-use crate::bindings::WebTransportBidirectionalStream;
-use crate::fused_js_promise::FusedJsPromise;
-use crate::utils::{detach_promise, parse_reader_response, to_io_error, to_js_type};
-use crate::Error;
+use crate::{
+    bindings::WebTransportBidirectionalStream,
+    fused_js_promise::FusedJsPromise,
+    utils::{detach_promise, parse_reader_response, to_io_error, to_js_type},
+    Error,
+};
 
 /// A stream on a connection.
 #[derive(Debug)]
diff --git a/transports/webtransport-websys/src/transport.rs b/transports/webtransport-websys/src/transport.rs
index 6a9a9dad954..bad9509864e 100644
--- a/transports/webtransport-websys/src/transport.rs
+++ b/transports/webtransport-websys/src/transport.rs
@@ -1,17 +1,18 @@
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::future::FutureExt;
-use libp2p_core::muxing::StreamMuxerBox;
-use libp2p_core::transport::{
-    Boxed, DialOpts, ListenerId, Transport as _, TransportError, TransportEvent,
+use libp2p_core::{
+    muxing::StreamMuxerBox,
+    transport::{Boxed, DialOpts, ListenerId, Transport as _, TransportError, TransportEvent},
 };
 use libp2p_identity::{Keypair, PeerId};
 use multiaddr::Multiaddr;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
 
-use crate::endpoint::Endpoint;
-use crate::Connection;
-use crate::Error;
+use crate::{endpoint::Endpoint, Connection, Error};
 
 /// Config for the [`Transport`].
 pub struct Config {
diff --git a/transports/webtransport-websys/src/utils.rs b/transports/webtransport-websys/src/utils.rs
index 0b3550e5b5b..df59ee15161 100644
--- a/transports/webtransport-websys/src/utils.rs
+++ b/transports/webtransport-websys/src/utils.rs
@@ -1,7 +1,8 @@
+use std::io;
+
 use js_sys::{Promise, Reflect};
 use once_cell::sync::Lazy;
 use send_wrapper::SendWrapper;
-use std::io;
 use wasm_bindgen::{JsCast, JsValue};
 
 use crate::Error;
@@ -17,7 +18,6 @@ static DO_NOTHING: Lazy<SendWrapper<Closure>> = Lazy::new(|| {
 /// A promise always runs in the background, however if you don't await it,
 /// or specify a `catch` handler before you drop it, it might cause some side
 /// effects. This function avoids any side effects.
-//
 // Ref: https://github.com/typescript-eslint/typescript-eslint/blob/391a6702c0a9b5b3874a7a27047f2a721f090fb6/packages/eslint-plugin/docs/rules/no-floating-promises.md
 pub(crate) fn detach_promise(promise: Promise) {
     // Avoid having "floating" promise and ignore any errors.
@@ -50,7 +50,6 @@ where
 }
 
 /// Parse response from `ReadableStreamDefaultReader::read`.
-//
 // Ref: https://streams.spec.whatwg.org/#default-reader-prototype
 pub(crate) fn parse_reader_response(resp: &JsValue) -> Result<Option<JsValue>, JsValue> {
     let value = Reflect::get(resp, &JsValue::from_str("value"))?;
diff --git a/wasm-tests/webtransport-tests/src/lib.rs b/wasm-tests/webtransport-tests/src/lib.rs
index 4cf4375bf7a..207bdb03b91 100644
--- a/wasm-tests/webtransport-tests/src/lib.rs
+++ b/wasm-tests/webtransport-tests/src/lib.rs
@@ -1,17 +1,17 @@
 #![allow(unexpected_cfgs)]
+use std::{future::poll_fn, pin::Pin};
 
-use futures::channel::oneshot;
-use futures::{AsyncReadExt, AsyncWriteExt};
+use futures::{channel::oneshot, AsyncReadExt, AsyncWriteExt};
 use getrandom::getrandom;
-use libp2p_core::transport::{DialOpts, PortUse};
-use libp2p_core::{Endpoint, StreamMuxer, Transport as _};
+use libp2p_core::{
+    transport::{DialOpts, PortUse},
+    Endpoint, StreamMuxer, Transport as _,
+};
 use libp2p_identity::{Keypair, PeerId};
 use libp2p_noise as noise;
 use libp2p_webtransport_websys::{Config, Connection, Error, Stream, Transport};
 use multiaddr::{Multiaddr, Protocol};
 use multihash::Multihash;
-use std::future::poll_fn;
-use std::pin::Pin;
 use wasm_bindgen::JsCast;
 use wasm_bindgen_futures::{spawn_local, JsFuture};
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};

From d0590a7a71160dcf806d38813b74925d3217a98c Mon Sep 17 00:00:00 2001
From: maqi <qi.ma@maidsafe.net>
Date: Tue, 3 Dec 2024 21:42:56 +0800
Subject: [PATCH 416/455] feat(kad): make Distance private field public

make Distance private field (U256) public

So that some `network density` in Distance can be calculated as below:

```rust
let density = U256::MAX / U256::from(estimated_network_size);
let density_distance = Distance(estimated_distance);
```

Pull-Request: #5705.
---
 Cargo.lock                       | 2 +-
 Cargo.toml                       | 2 +-
 protocols/kad/CHANGELOG.md       | 5 +++++
 protocols/kad/Cargo.toml         | 2 +-
 protocols/kad/src/kbucket/key.rs | 4 ++--
 protocols/kad/src/lib.rs         | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4093d49504b..45f185d9780 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2844,7 +2844,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "arrayvec",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index dfa32628dbc..7f7b601ab82 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
-libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
+libp2p-kad = { version = "0.47.1", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 64049c7b60b..22af5fb5074 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.47.1
+
+- Expose Distance private field U256 to public.
+  See [PR 5705](https://github.com/libp2p/rust-libp2p/pull/5705).
+
 ## 0.47.0
 
 - Expose a kad query facility allowing specify num_results dynamicaly.
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 295414f6ddd..cd97c91b2bf 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.47.0"
+version = "0.47.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/kad/src/kbucket/key.rs b/protocols/kad/src/kbucket/key.rs
index 367dfa807d3..5b9590cb94c 100644
--- a/protocols/kad/src/kbucket/key.rs
+++ b/protocols/kad/src/kbucket/key.rs
@@ -35,7 +35,7 @@ use crate::record;
 
 construct_uint! {
     /// 256-bit unsigned integer.
-    pub(super) struct U256(4);
+    pub struct U256(4);
 }
 
 /// A `Key` in the DHT keyspace with preserved preimage.
@@ -193,7 +193,7 @@ impl AsRef<KeyBytes> for KeyBytes {
 
 /// A distance between two keys in the DHT keyspace.
 #[derive(Copy, Clone, PartialEq, Eq, Default, PartialOrd, Ord, Debug)]
-pub struct Distance(pub(super) U256);
+pub struct Distance(pub U256);
 
 impl Distance {
     /// Returns the integer part of the base 2 logarithm of the [`Distance`].
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index 8ab45665c9b..91983b9aaf7 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -67,7 +67,7 @@ pub use behaviour::{
     QueryResult, QueryStats, Quorum, RoutingUpdate, StoreInserts,
 };
 pub use kbucket::{
-    Distance as KBucketDistance, EntryView, KBucketRef, Key as KBucketKey, NodeStatus,
+    Distance as KBucketDistance, EntryView, KBucketRef, Key as KBucketKey, NodeStatus, U256,
 };
 use libp2p_swarm::StreamProtocol;
 pub use protocol::{ConnectionType, KadPeer};

From 1c3e82039a6a48414d62e8226bffc35206cf42e8 Mon Sep 17 00:00:00 2001
From: needsure <166317845+needsure@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:39:32 +0800
Subject: [PATCH 417/455] chore: fix some typos in comment

fix some typos in comment

Pull-Request: #5721.
---
 protocols/gossipsub/src/behaviour.rs | 2 +-
 swarm/src/dial_opts.rs               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index bb3eaaa9b5a..954e87ee470 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -2761,7 +2761,7 @@ where
                     | RpcOut::Prune(_)
                     | RpcOut::Subscribe(_)
                     | RpcOut::Unsubscribe(_) => {
-                        unreachable!("Channel for highpriority contorl messages is unbounded and should always be open.")
+                        unreachable!("Channel for highpriority control messages is unbounded and should always be open.")
                     }
                 }
 
diff --git a/swarm/src/dial_opts.rs b/swarm/src/dial_opts.rs
index cdaaeb358b2..f569a38df1c 100644
--- a/swarm/src/dial_opts.rs
+++ b/swarm/src/dial_opts.rs
@@ -338,7 +338,7 @@ pub enum PeerCondition {
     NotDialing,
     /// A combination of [`Disconnected`](PeerCondition::Disconnected) and
     /// [`NotDialing`](PeerCondition::NotDialing). A new dialing attempt is
-    /// iniated _only if_ the peer is both considered disconnected and there
+    /// initiated _only if_ the peer is both considered disconnected and there
     /// is currently no ongoing dialing attempt.
     #[default]
     DisconnectedAndNotDialing,

From 78e6f08cff260c159ea08ef3b3b8e5d207ab4b59 Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Tue, 10 Dec 2024 19:56:39 +0800
Subject: [PATCH 418/455] fix(libp2p): expose builder phase error

May close #4829 and #4824.
Export three error types `BehaviourError`, `TransportError`, `WebsocketError` with rename. Feature gated `WebsocketError`.
Exported at crate root as [suggested](https://github.com/libp2p/rust-libp2p/issues/4824#issuecomment-1803013514).

Pull-Request: #5726.
---
 libp2p/CHANGELOG.md         | 3 +++
 libp2p/src/builder.rs       | 4 ++++
 libp2p/src/builder/phase.rs | 5 +++++
 libp2p/src/lib.rs           | 7 ++++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index e383cfd0cdc..e86d633b5a7 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -3,6 +3,9 @@
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
 
+- Expose swarm builder phase errors.
+  See [PR 5726](https://github.com/libp2p/rust-libp2p/pull/5726).
+
 ## 0.54.1
 
 - Update individual crates.
diff --git a/libp2p/src/builder.rs b/libp2p/src/builder.rs
index 99c340a5e3e..ae4d0b0d4e4 100644
--- a/libp2p/src/builder.rs
+++ b/libp2p/src/builder.rs
@@ -4,6 +4,10 @@ mod phase;
 mod select_muxer;
 mod select_security;
 
+#[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
+pub use phase::WebsocketError;
+pub use phase::{BehaviourError, TransportError};
+
 /// Build a [`Swarm`](libp2p_swarm::Swarm) by combining an identity, a set of
 /// [`Transport`](libp2p_core::Transport)s and a
 /// [`NetworkBehaviour`](libp2p_swarm::NetworkBehaviour).
diff --git a/libp2p/src/builder/phase.rs b/libp2p/src/builder/phase.rs
index 6e3f41755ca..5bb0d948fc1 100644
--- a/libp2p/src/builder/phase.rs
+++ b/libp2p/src/builder/phase.rs
@@ -29,6 +29,11 @@ use swarm::*;
 use tcp::*;
 use websocket::*;
 
+pub use behaviour::BehaviourError;
+pub use other_transport::TransportError;
+#[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
+pub use websocket::WebsocketError;
+
 use super::{
     select_muxer::SelectMuxerUpgrade, select_security::SelectSecurityUpgrade, SwarmBuilder,
 };
diff --git a/libp2p/src/lib.rs b/libp2p/src/lib.rs
index 1ec1cc530fc..47e1142d0e9 100644
--- a/libp2p/src/lib.rs
+++ b/libp2p/src/lib.rs
@@ -148,12 +148,17 @@ pub mod bandwidth;
 #[cfg(doc)]
 pub mod tutorials;
 
+#[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
+pub use builder::WebsocketError as WebsocketBuilderError;
 pub use libp2p_identity as identity;
 pub use libp2p_identity::PeerId;
 pub use libp2p_swarm::{Stream, StreamProtocol};
 
 pub use self::{
-    builder::SwarmBuilder,
+    builder::{
+        BehaviourError as BehaviourBuilderError, SwarmBuilder,
+        TransportError as TransportBuilderError,
+    },
     core::{
         transport::TransportError,
         upgrade::{InboundUpgrade, OutboundUpgrade},

From 276ce84b28a5bb607b333d6fb8a382997f9ca64c Mon Sep 17 00:00:00 2001
From: Bastien Faivre <faivre.bast@gmail.com>
Date: Tue, 10 Dec 2024 14:56:52 +0100
Subject: [PATCH 419/455] feat(request-response): Add connection id to
 behaviour events

Closes #5716.

Added connection id to the events emitted by a request-response Behaviour and adapted the code accordingly.

Pull-Request: #5719.
---
 Cargo.lock                                    |  6 +-
 Cargo.toml                                    |  6 +-
 protocols/autonat/CHANGELOG.md                |  4 +
 protocols/autonat/Cargo.toml                  |  2 +-
 .../autonat/src/v1/behaviour/as_client.rs     |  2 +
 .../autonat/src/v1/behaviour/as_server.rs     |  2 +
 protocols/rendezvous/CHANGELOG.md             |  4 +
 protocols/rendezvous/Cargo.toml               |  2 +-
 protocols/rendezvous/src/server.rs            |  3 +
 protocols/request-response/CHANGELOG.md       |  5 ++
 protocols/request-response/Cargo.toml         |  2 +-
 protocols/request-response/src/lib.rs         | 81 ++++++++++++++-----
 .../request-response/tests/error_reporting.rs |  3 +
 protocols/request-response/tests/ping.rs      |  9 ++-
 14 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 45f185d9780..efa03d89d79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2611,7 +2611,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-autonat"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -3145,7 +3145,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-rendezvous"
-version = "0.15.0"
+version = "0.15.1"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -3174,7 +3174,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.27.1"
+version = "0.28.0"
 dependencies = [
  "anyhow",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 7f7b601ab82..964f0fea240 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,7 +74,7 @@ rust-version = "1.75.0"
 [workspace.dependencies]
 libp2p = { version = "0.54.2", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.4.2", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.13.2", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.1", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.1", path = "core" }
 libp2p-dcutr = { version = "0.12.1", path = "protocols/dcutr" }
@@ -95,8 +95,8 @@ libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.25.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.11.2", path = "transports/quic" }
 libp2p-relay = { version = "0.18.1", path = "protocols/relay" }
-libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.27.1", path = "protocols/request-response" }
+libp2p-rendezvous = { version = "0.15.1", path = "protocols/rendezvous" }
+libp2p-request-response = { version = "0.28.0", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.8", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.2", path = "swarm" }
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index 9b2bc4cb2ea..f946f59c9ef 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.13.2
+
+- Update to `libp2p-request-response` `v0.28.0`.
+
 ## 0.13.1
 
 - Verify that an incoming AutoNAT dial comes from a connected peer. See [PR 5597](https://github.com/libp2p/rust-libp2p/pull/5597).
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 92ca163d8ec..88564b18541 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
-version = "0.13.1"
+version = "0.13.2"
 authors = [
     "David Craven <david@craven.ch>",
     "Elena Frank <elena.frank@protonmail.com>",
diff --git a/protocols/autonat/src/v1/behaviour/as_client.rs b/protocols/autonat/src/v1/behaviour/as_client.rs
index 3377964373c..ca8daf6e1ac 100644
--- a/protocols/autonat/src/v1/behaviour/as_client.rs
+++ b/protocols/autonat/src/v1/behaviour/as_client.rs
@@ -112,6 +112,7 @@ impl HandleInnerEvent for AsClient<'_> {
                         request_id,
                         response,
                     },
+                ..
             } => {
                 tracing::debug!(?response, "Outbound dial-back request returned response");
 
@@ -154,6 +155,7 @@ impl HandleInnerEvent for AsClient<'_> {
                 peer,
                 error,
                 request_id,
+                ..
             } => {
                 tracing::debug!(
                     %peer,
diff --git a/protocols/autonat/src/v1/behaviour/as_server.rs b/protocols/autonat/src/v1/behaviour/as_server.rs
index 663f94122c7..32b4120c552 100644
--- a/protocols/autonat/src/v1/behaviour/as_server.rs
+++ b/protocols/autonat/src/v1/behaviour/as_server.rs
@@ -107,6 +107,7 @@ impl HandleInnerEvent for AsServer<'_> {
                         request,
                         channel,
                     },
+                ..
             } => {
                 let probe_id = self.probe_id.next();
                 if !self.connected.contains_key(&peer) {
@@ -183,6 +184,7 @@ impl HandleInnerEvent for AsServer<'_> {
                 peer,
                 error,
                 request_id,
+                ..
             } => {
                 tracing::debug!(
                     %peer,
diff --git a/protocols/rendezvous/CHANGELOG.md b/protocols/rendezvous/CHANGELOG.md
index 1ed9e5bc3b0..ca01538a76d 100644
--- a/protocols/rendezvous/CHANGELOG.md
+++ b/protocols/rendezvous/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.15.1
+
+- Update to `libp2p-request-response` `v0.28.0`.
+
 ## 0.15.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 5fa40c3785b..53a579918c5 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-rendezvous"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Rendezvous protocol for libp2p"
-version = "0.15.0"
+version = "0.15.1"
 authors = ["The COMIT guys <hello@comit.network>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/rendezvous/src/server.rs b/protocols/rendezvous/src/server.rs
index 8aafcfb48e3..1be7220cfcb 100644
--- a/protocols/rendezvous/src/server.rs
+++ b/protocols/rendezvous/src/server.rs
@@ -183,6 +183,7 @@ impl NetworkBehaviour for Behaviour {
                             libp2p_request_response::Message::Request {
                                 request, channel, ..
                             },
+                        ..
                     }) => {
                         if let Some((event, response)) =
                             handle_request(peer_id, request, &mut self.registrations)
@@ -202,6 +203,7 @@ impl NetworkBehaviour for Behaviour {
                         peer,
                         request_id,
                         error,
+                        ..
                     }) => {
                         tracing::warn!(
                             %peer,
@@ -217,6 +219,7 @@ impl NetworkBehaviour for Behaviour {
                     | ToSwarm::GenerateEvent(libp2p_request_response::Event::Message {
                         peer: _,
                         message: libp2p_request_response::Message::Response { .. },
+                        ..
                     })
                     | ToSwarm::GenerateEvent(libp2p_request_response::Event::OutboundFailure {
                         ..
diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md
index 9ed658fc90f..15cb0c91797 100644
--- a/protocols/request-response/CHANGELOG.md
+++ b/protocols/request-response/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.28.0
+
+- Add connection id to the events emitted by a request-response `Behaviour`.
+  See [PR 5719](https://github.com/libp2p/rust-libp2p/pull/5719).
+
 ## 0.27.1
 
 - Deprecate `void` crate.
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index b2e6fd0b0ac..48ef4c2c066 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-request-response"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Generic Request/Response Protocols"
-version = "0.27.1"
+version = "0.28.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/request-response/src/lib.rs b/protocols/request-response/src/lib.rs
index 052e1e87e2b..39a773d99b4 100644
--- a/protocols/request-response/src/lib.rs
+++ b/protocols/request-response/src/lib.rs
@@ -131,6 +131,8 @@ pub enum Event<TRequest, TResponse, TChannelResponse = TResponse> {
     Message {
         /// The peer who sent the message.
         peer: PeerId,
+        /// The connection used.
+        connection_id: ConnectionId,
         /// The incoming message.
         message: Message<TRequest, TResponse, TChannelResponse>,
     },
@@ -138,6 +140,8 @@ pub enum Event<TRequest, TResponse, TChannelResponse = TResponse> {
     OutboundFailure {
         /// The peer to whom the request was sent.
         peer: PeerId,
+        /// The connection used.
+        connection_id: ConnectionId,
         /// The (local) ID of the failed request.
         request_id: OutboundRequestId,
         /// The error that occurred.
@@ -147,6 +151,8 @@ pub enum Event<TRequest, TResponse, TChannelResponse = TResponse> {
     InboundFailure {
         /// The peer from whom the request was received.
         peer: PeerId,
+        /// The connection used.
+        connection_id: ConnectionId,
         /// The ID of the failed inbound request.
         request_id: InboundRequestId,
         /// The error that occurred.
@@ -159,6 +165,8 @@ pub enum Event<TRequest, TResponse, TChannelResponse = TResponse> {
     ResponseSent {
         /// The peer to whom the response was sent.
         peer: PeerId,
+        /// The connection used.
+        connection_id: ConnectionId,
         /// The ID of the inbound request whose response was sent.
         request_id: InboundRequestId,
     },
@@ -569,10 +577,10 @@ where
     fn remove_pending_outbound_response(
         &mut self,
         peer: &PeerId,
-        connection: ConnectionId,
+        connection_id: ConnectionId,
         request: OutboundRequestId,
     ) -> bool {
-        self.get_connection_mut(peer, connection)
+        self.get_connection_mut(peer, connection_id)
             .map(|c| c.pending_outbound_responses.remove(&request))
             .unwrap_or(false)
     }
@@ -585,10 +593,10 @@ where
     fn remove_pending_inbound_response(
         &mut self,
         peer: &PeerId,
-        connection: ConnectionId,
+        connection_id: ConnectionId,
         request: InboundRequestId,
     ) -> bool {
-        self.get_connection_mut(peer, connection)
+        self.get_connection_mut(peer, connection_id)
             .map(|c| c.pending_inbound_responses.remove(&request))
             .unwrap_or(false)
     }
@@ -598,11 +606,11 @@ where
     fn get_connection_mut(
         &mut self,
         peer: &PeerId,
-        connection: ConnectionId,
+        connection_id: ConnectionId,
     ) -> Option<&mut Connection> {
         self.connected
             .get_mut(peer)
-            .and_then(|connections| connections.iter_mut().find(|c| c.id == connection))
+            .and_then(|connections| connections.iter_mut().find(|c| c.id == connection_id))
     }
 
     fn on_address_change(
@@ -659,6 +667,7 @@ where
             self.pending_events
                 .push_back(ToSwarm::GenerateEvent(Event::InboundFailure {
                     peer: peer_id,
+                    connection_id,
                     request_id,
                     error: InboundFailure::ConnectionClosed,
                 }));
@@ -668,13 +677,21 @@ where
             self.pending_events
                 .push_back(ToSwarm::GenerateEvent(Event::OutboundFailure {
                     peer: peer_id,
+                    connection_id,
                     request_id,
                     error: OutboundFailure::ConnectionClosed,
                 }));
         }
     }
 
-    fn on_dial_failure(&mut self, DialFailure { peer_id, .. }: DialFailure) {
+    fn on_dial_failure(
+        &mut self,
+        DialFailure {
+            peer_id,
+            connection_id,
+            ..
+        }: DialFailure,
+    ) {
         if let Some(peer) = peer_id {
             // If there are pending outgoing requests when a dial failure occurs,
             // it is implied that we are not connected to the peer, since pending
@@ -687,6 +704,7 @@ where
                     self.pending_events
                         .push_back(ToSwarm::GenerateEvent(Event::OutboundFailure {
                             peer,
+                            connection_id,
                             request_id: request.request_id,
                             error: OutboundFailure::DialFailure,
                         }));
@@ -811,7 +829,7 @@ where
     fn on_connection_handler_event(
         &mut self,
         peer: PeerId,
-        connection: ConnectionId,
+        connection_id: ConnectionId,
         event: THandlerOutEvent<Self>,
     ) {
         match event {
@@ -819,7 +837,8 @@ where
                 request_id,
                 response,
             } => {
-                let removed = self.remove_pending_outbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_outbound_response(&peer, connection_id, request_id);
                 debug_assert!(
                     removed,
                     "Expect request_id to be pending before receiving response.",
@@ -830,13 +849,17 @@ where
                     response,
                 };
                 self.pending_events
-                    .push_back(ToSwarm::GenerateEvent(Event::Message { peer, message }));
+                    .push_back(ToSwarm::GenerateEvent(Event::Message {
+                        peer,
+                        connection_id,
+                        message,
+                    }));
             }
             handler::Event::Request {
                 request_id,
                 request,
                 sender,
-            } => match self.get_connection_mut(&peer, connection) {
+            } => match self.get_connection_mut(&peer, connection_id) {
                 Some(connection) => {
                     let inserted = connection.pending_inbound_responses.insert(request_id);
                     debug_assert!(inserted, "Expect id of new request to be unknown.");
@@ -848,14 +871,19 @@ where
                         channel,
                     };
                     self.pending_events
-                        .push_back(ToSwarm::GenerateEvent(Event::Message { peer, message }));
+                        .push_back(ToSwarm::GenerateEvent(Event::Message {
+                            peer,
+                            connection_id,
+                            message,
+                        }));
                 }
                 None => {
-                    tracing::debug!("Connection ({connection}) closed after `Event::Request` ({request_id}) has been emitted.");
+                    tracing::debug!("Connection ({connection_id}) closed after `Event::Request` ({request_id}) has been emitted.");
                 }
             },
             handler::Event::ResponseSent(request_id) => {
-                let removed = self.remove_pending_inbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_inbound_response(&peer, connection_id, request_id);
                 debug_assert!(
                     removed,
                     "Expect request_id to be pending before response is sent."
@@ -864,11 +892,13 @@ where
                 self.pending_events
                     .push_back(ToSwarm::GenerateEvent(Event::ResponseSent {
                         peer,
+                        connection_id,
                         request_id,
                     }));
             }
             handler::Event::ResponseOmission(request_id) => {
-                let removed = self.remove_pending_inbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_inbound_response(&peer, connection_id, request_id);
                 debug_assert!(
                     removed,
                     "Expect request_id to be pending before response is omitted.",
@@ -877,12 +907,14 @@ where
                 self.pending_events
                     .push_back(ToSwarm::GenerateEvent(Event::InboundFailure {
                         peer,
+                        connection_id,
                         request_id,
                         error: InboundFailure::ResponseOmission,
                     }));
             }
             handler::Event::OutboundTimeout(request_id) => {
-                let removed = self.remove_pending_outbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_outbound_response(&peer, connection_id, request_id);
                 debug_assert!(
                     removed,
                     "Expect request_id to be pending before request times out."
@@ -891,12 +923,14 @@ where
                 self.pending_events
                     .push_back(ToSwarm::GenerateEvent(Event::OutboundFailure {
                         peer,
+                        connection_id,
                         request_id,
                         error: OutboundFailure::Timeout,
                     }));
             }
             handler::Event::OutboundUnsupportedProtocols(request_id) => {
-                let removed = self.remove_pending_outbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_outbound_response(&peer, connection_id, request_id);
                 debug_assert!(
                     removed,
                     "Expect request_id to be pending before failing to connect.",
@@ -905,28 +939,33 @@ where
                 self.pending_events
                     .push_back(ToSwarm::GenerateEvent(Event::OutboundFailure {
                         peer,
+                        connection_id,
                         request_id,
                         error: OutboundFailure::UnsupportedProtocols,
                     }));
             }
             handler::Event::OutboundStreamFailed { request_id, error } => {
-                let removed = self.remove_pending_outbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_outbound_response(&peer, connection_id, request_id);
                 debug_assert!(removed, "Expect request_id to be pending upon failure");
 
                 self.pending_events
                     .push_back(ToSwarm::GenerateEvent(Event::OutboundFailure {
                         peer,
+                        connection_id,
                         request_id,
                         error: OutboundFailure::Io(error),
                     }))
             }
             handler::Event::InboundTimeout(request_id) => {
-                let removed = self.remove_pending_inbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_inbound_response(&peer, connection_id, request_id);
 
                 if removed {
                     self.pending_events
                         .push_back(ToSwarm::GenerateEvent(Event::InboundFailure {
                             peer,
+                            connection_id,
                             request_id,
                             error: InboundFailure::Timeout,
                         }));
@@ -938,12 +977,14 @@ where
                 }
             }
             handler::Event::InboundStreamFailed { request_id, error } => {
-                let removed = self.remove_pending_inbound_response(&peer, connection, request_id);
+                let removed =
+                    self.remove_pending_inbound_response(&peer, connection_id, request_id);
 
                 if removed {
                     self.pending_events
                         .push_back(ToSwarm::GenerateEvent(Event::InboundFailure {
                             peer,
+                            connection_id,
                             request_id,
                             error: InboundFailure::Io(error),
                         }));
diff --git a/protocols/request-response/tests/error_reporting.rs b/protocols/request-response/tests/error_reporting.rs
index d1f26378a77..2108b6006c5 100644
--- a/protocols/request-response/tests/error_reporting.rs
+++ b/protocols/request-response/tests/error_reporting.rs
@@ -566,6 +566,7 @@ async fn wait_request(
                         request,
                         channel,
                     },
+                ..
             }) => {
                 return Ok((peer, request_id, request, channel));
             }
@@ -600,6 +601,7 @@ async fn wait_inbound_failure(
                 peer,
                 request_id,
                 error,
+                ..
             }) => {
                 return Ok((peer, request_id, error));
             }
@@ -618,6 +620,7 @@ async fn wait_outbound_failure(
                 peer,
                 request_id,
                 error,
+                ..
             }) => {
                 return Ok((peer, request_id, error));
             }
diff --git a/protocols/request-response/tests/ping.rs b/protocols/request-response/tests/ping.rs
index e53fe99d6cf..94adedac2d7 100644
--- a/protocols/request-response/tests/ping.rs
+++ b/protocols/request-response/tests/ping.rs
@@ -65,6 +65,7 @@ async fn is_response_outbound() {
             peer,
             request_id: req_id,
             error: _error,
+            ..
         } => {
             assert_eq!(&offline_peer, &peer);
             assert_eq!(req_id, request_id1);
@@ -116,6 +117,7 @@ async fn ping_protocol() {
                         request_response::Message::Request {
                             request, channel, ..
                         },
+                    ..
                 }) => {
                     assert_eq!(&request, &expected_ping);
                     assert_eq!(&peer, &peer2_id);
@@ -157,6 +159,7 @@ async fn ping_protocol() {
                             request_id,
                             response,
                         },
+                    ..
                 } => {
                     count += 1;
                     assert_eq!(&response, &expected_pong);
@@ -205,7 +208,8 @@ async fn emits_inbound_connection_closed_failure() {
             event = swarm1.select_next_some() => match event {
                 SwarmEvent::Behaviour(request_response::Event::Message {
                     peer,
-                    message: request_response::Message::Request { request, channel, .. }
+                    message: request_response::Message::Request { request, channel, .. },
+                    ..
                 }) => {
                     assert_eq!(&request, &ping);
                     assert_eq!(&peer, &peer2_id);
@@ -270,7 +274,8 @@ async fn emits_inbound_connection_closed_if_channel_is_dropped() {
             event = swarm1.select_next_some() => {
                 if let SwarmEvent::Behaviour(request_response::Event::Message {
                     peer,
-                    message: request_response::Message::Request { request, channel, .. }
+                    message: request_response::Message::Request { request, channel, .. },
+                    ..
                 }) = event {
                     assert_eq!(&request, &ping);
                     assert_eq!(&peer, &peer2_id);

From bb9c3692bcea6c2b93d5459ef8db7e79426ca0a3 Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Wed, 11 Dec 2024 17:21:43 +0700
Subject: [PATCH 420/455] chore(ci): update Rust stable version

Update Rust stable version in our CI to the latest stable version 1.83.0.

Pull-Request: #5730.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aad5b39aec7..0a849da9c97 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-version: [
-          1.80.0, # current stable
+          1.83.0, # current stable
           beta,
         ]
     steps:

From 1e9bb4ce2fb3c839c289b26e2d9db9dad4392eb1 Mon Sep 17 00:00:00 2001
From: lfg2 <lfgtwo@proton.me>
Date: Wed, 11 Dec 2024 19:05:35 +0800
Subject: [PATCH 421/455] chore(roadmap): fix typo

Pull-Request: #5732.
---
 ROADMAP.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 0d422a6d385..a8df8242730 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -61,7 +61,7 @@ The project supports Wasm already today, though the developer experience is cumb
 Properly supporting Wasm opens rust-libp2p to a whole new set of use-cases.
 I would love for this to happen earlier.
 Though (a) I think we should prioritize improving existing functionality over new functionality and (b) we don't have high demand for this feature from the community.
-(One could argue that that demand follows this roadmap item and not the other way round.)
+(One could argue that the demand follows this roadmap item and not the other way round.)
 
 ### WebRTC in the browser via WASM
 

From 524afb4e90cc667263149879fed051c07f5b4b66 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Wed, 11 Dec 2024 20:15:03 +0800
Subject: [PATCH 422/455] chore(deps): upgrade uint to 0.10

This PR upgrade `uint` to `0.10`
https://github.com/paritytech/parity-common/blob/master/uint/CHANGELOG.md#0100---2024-09-11
(Skipping changelog as there's no changes in public APIs)

Pull-Request: #5699.
---
 Cargo.lock                       | 4 ++--
 protocols/kad/Cargo.toml         | 2 +-
 protocols/kad/src/kbucket.rs     | 4 ++--
 protocols/kad/src/kbucket/key.rs | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index efa03d89d79..c0b635584ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6379,9 +6379,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "uint"
-version = "0.9.5"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e"
 dependencies = [
  "byteorder",
  "crunchy",
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index cd97c91b2bf..dd93da2a01a 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -26,7 +26,7 @@ libp2p-identity = { workspace = true, features = ["rand"] }
 rand = "0.8"
 sha2 = "0.10.8"
 smallvec = "1.13.2"
-uint = "0.9"
+uint = "0.10"
 futures-timer = "3.0.3"
 web-time = { workspace = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 1c6d8857c9c..3f4b1281c3a 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -175,7 +175,7 @@ impl BucketIndex {
         let lower = usize::pow(2, rem);
         let upper = usize::pow(2, rem + 1);
         bytes[31 - quot] = rng.gen_range(lower..upper) as u8;
-        Distance(U256::from(bytes))
+        Distance(U256::from_big_endian(bytes.as_slice()))
     }
 }
 
@@ -650,7 +650,7 @@ mod tests {
     fn rand_distance() {
         fn prop(ix: u8) -> bool {
             let d = BucketIndex(ix as usize).rand_distance(&mut rand::thread_rng());
-            let n = U256::from(<[u8; 32]>::from(d.0));
+            let n = d.0;
             let b = U256::from(2);
             let e = U256::from(ix);
             let lower = b.pow(e);
diff --git a/protocols/kad/src/kbucket/key.rs b/protocols/kad/src/kbucket/key.rs
index 5b9590cb94c..ce14a3f779a 100644
--- a/protocols/kad/src/kbucket/key.rs
+++ b/protocols/kad/src/kbucket/key.rs
@@ -169,8 +169,8 @@ impl KeyBytes {
     where
         U: AsRef<KeyBytes>,
     {
-        let a = U256::from(self.0.as_slice());
-        let b = U256::from(other.as_ref().0.as_slice());
+        let a = U256::from_big_endian(self.0.as_slice());
+        let b = U256::from_big_endian(other.as_ref().0.as_slice());
         Distance(a ^ b)
     }
 
@@ -180,8 +180,8 @@ impl KeyBytes {
     ///
     /// `self xor other = distance <==> other = self xor distance`
     pub fn for_distance(&self, d: Distance) -> KeyBytes {
-        let key_int = U256::from(self.0.as_slice()) ^ d.0;
-        KeyBytes(GenericArray::from(<[u8; 32]>::from(key_int)))
+        let key_int = U256::from_big_endian(self.0.as_slice()) ^ d.0;
+        KeyBytes(GenericArray::from(key_int.to_big_endian()))
     }
 }
 

From cda1470dee3e29c040c53aa577317e1479ccf5c8 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Wed, 11 Dec 2024 20:35:44 +0800
Subject: [PATCH 423/455] fix: RUSTSEC-2024-0421 by upgrading idna

https://rustsec.org/advisories/RUSTSEC-2024-0421.html

Pull-Request: #5727.
---
 Cargo.lock                                  | 382 +++++++++++++++++---
 Cargo.toml                                  |   7 +-
 protocols/mdns/CHANGELOG.md                 |   5 +
 protocols/mdns/Cargo.toml                   |   4 +-
 protocols/mdns/src/behaviour/iface/query.rs |   8 +-
 transports/dns/CHANGELOG.md                 |   5 +
 transports/dns/Cargo.toml                   |   6 +-
 transports/dns/src/lib.rs                   |  15 +-
 8 files changed, 358 insertions(+), 74 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0b635584ef..15ea38544d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -410,6 +410,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "async-std"
 version = "1.12.0"
@@ -440,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "async-std-resolver"
-version = "0.24.0"
+version = "0.25.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0ed2b6671c13d2c28756c5a64e04759c1e0b5d3d7ac031f521c3561e21fbcb"
+checksum = "f42964492d88a2a555cc65d8ab30e5e1178c1776f40b2717643c1aebb4297a1a"
 dependencies = [
  "async-std",
  "async-trait",
@@ -1965,10 +1976,11 @@ checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
 
 [[package]]
 name = "hickory-proto"
-version = "0.24.1"
+version = "0.25.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
+checksum = "d063c0692ee669aa6d261988aa19ca5510f1cc40e4f211024f50c888499a35d7"
 dependencies = [
+ "async-recursion",
  "async-trait",
  "cfg-if",
  "data-encoding",
@@ -1976,12 +1988,12 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 0.4.0",
+ "idna",
  "ipnet",
  "once_cell",
  "rand 0.8.5",
  "socket2 0.5.7",
- "thiserror 1.0.63",
+ "thiserror 2.0.3",
  "tinyvec",
  "tokio",
  "tracing",
@@ -1990,21 +2002,21 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.1"
+version = "0.25.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
+checksum = "42bc352e4412fb657e795f79b4efcf2bd60b59ee5ca0187f3554194cd1107a27"
 dependencies = [
  "cfg-if",
  "futures-util",
  "hickory-proto",
  "ipconfig",
- "lru-cache",
+ "moka",
  "once_cell",
  "parking_lot",
  "rand 0.8.5",
  "resolv-conf",
  "smallvec",
- "thiserror 1.0.63",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
 ]
@@ -2230,6 +2242,124 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "identify-example"
 version = "0.1.0"
@@ -2243,22 +2373,23 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -2718,7 +2849,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.42.0"
+version = "0.42.1"
 dependencies = [
  "async-std",
  "async-std-resolver",
@@ -2878,7 +3009,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "async-io 2.3.3",
  "async-std",
@@ -3558,12 +3689,6 @@ dependencies = [
  "libsecp256k1-core",
 ]
 
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.3.8"
@@ -3576,6 +3701,12 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -3604,15 +3735,6 @@ dependencies = [
  "hashbrown 0.14.3",
 ]
 
-[[package]]
-name = "lru-cache"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
-dependencies = [
- "linked-hash-map",
-]
-
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -3746,6 +3868,26 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "moka"
+version = "0.12.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "once_cell",
+ "parking_lot",
+ "quanta",
+ "rustc_version",
+ "smallvec",
+ "tagptr",
+ "thiserror 1.0.63",
+ "triomphe",
+ "uuid",
+]
+
 [[package]]
 name = "multiaddr"
 version = "0.18.1"
@@ -4027,9 +4169,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
@@ -4545,6 +4687,21 @@ dependencies = [
  "syn 2.0.89",
 ]
 
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4723,6 +4880,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.4.1",
+]
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -5637,6 +5803,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -5840,6 +6012,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "tagptr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
+
 [[package]]
 name = "tempfile"
 version = "3.10.1"
@@ -6001,6 +6179,16 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -6332,6 +6520,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "triomphe"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
+
 [[package]]
 name = "try-lock"
 version = "0.2.4"
@@ -6398,27 +6592,12 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -6475,12 +6654,12 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna",
  "percent-encoding",
 ]
 
@@ -6490,6 +6669,18 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -7204,6 +7395,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -7306,6 +7509,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.32"
@@ -7326,6 +7553,27 @@ dependencies = [
  "syn 2.0.89",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
@@ -7345,3 +7593,25 @@ dependencies = [
  "quote",
  "syn 2.0.89",
 ]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 964f0fea240..e0feda0392a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,13 +78,13 @@ libp2p-autonat = { version = "0.13.2", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.1", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.1", path = "core" }
 libp2p-dcutr = { version = "0.12.1", path = "protocols/dcutr" }
-libp2p-dns = { version = "0.42.0", path = "transports/dns" }
+libp2p-dns = { version = "0.42.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
 libp2p-kad = { version = "0.47.1", path = "protocols/kad" }
-libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
+libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
@@ -115,10 +115,13 @@ libp2p-webtransport-websys = { version = "0.4.1", path = "transports/webtranspor
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
 
 # External dependencies
+async-std-resolver = { version = "0.25.0-alpha.4", default-features = false }
 asynchronous-codec = { version = "0.7.0" }
 futures = "0.3.30"
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
+hickory-proto = { version = "0.25.0-alpha.4", default-features = false }
+hickory-resolver = { version = "0.25.0-alpha.4", default-features = false }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md
index 67b1d669f60..61290703c34 100644
--- a/protocols/mdns/CHANGELOG.md
+++ b/protocols/mdns/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.46.1
+
+- Upgrade `hickory-proto`.
+  See [PR 5727](https://github.com/libp2p/rust-libp2p/pull/5727)
+
 ## 0.46.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 338501aa896..16436848efe 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-mdns"
 edition = "2021"
 rust-version = { workspace = true }
-version = "0.46.0"
+version = "0.46.1"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
@@ -24,7 +24,7 @@ smallvec = "1.13.2"
 socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { workspace = true, default-features = false, features = ["net", "time"], optional = true}
 tracing = { workspace = true }
-hickory-proto = { version = "0.24.1", default-features = false, features = ["mdns"] }
+hickory-proto = { workspace = true, features = ["mdns"] }
 
 [features]
 tokio = ["dep:tokio", "if-watch/tokio"]
diff --git a/protocols/mdns/src/behaviour/iface/query.rs b/protocols/mdns/src/behaviour/iface/query.rs
index 7762ac5d214..a2a2c200b3b 100644
--- a/protocols/mdns/src/behaviour/iface/query.rs
+++ b/protocols/mdns/src/behaviour/iface/query.rs
@@ -51,7 +51,7 @@ impl MdnsPacket {
     pub(crate) fn new_from_bytes(
         buf: &[u8],
         from: SocketAddr,
-    ) -> Result<Option<MdnsPacket>, hickory_proto::error::ProtoError> {
+    ) -> Result<Option<MdnsPacket>, hickory_proto::ProtoError> {
         let packet = Message::from_vec(buf)?;
 
         if packet.query().is_none() {
@@ -161,7 +161,7 @@ impl MdnsResponse {
                     return None;
                 }
 
-                let RData::PTR(record_value) = record.data()? else {
+                let RData::PTR(record_value) = record.data() else {
                     return None;
                 };
 
@@ -243,7 +243,7 @@ impl MdnsPeer {
                     return None;
                 }
 
-                if let Some(RData::TXT(ref txt)) = add_record.data() {
+                if let RData::TXT(ref txt) = add_record.data() {
                     Some(txt)
                 } else {
                     None
@@ -341,7 +341,7 @@ mod tests {
                     if record.name().to_utf8() != SERVICE_NAME_FQDN {
                         return None;
                     }
-                    let Some(RData::PTR(record_value)) = record.data() else {
+                    let RData::PTR(record_value) = record.data() else {
                         return None;
                     };
                     Some(record_value)
diff --git a/transports/dns/CHANGELOG.md b/transports/dns/CHANGELOG.md
index e4f951f157f..b46b0413403 100644
--- a/transports/dns/CHANGELOG.md
+++ b/transports/dns/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.42.1
+
+- Upgrade `async-std-resolver` and `hickory-resolver`.
+  See [PR 5727](https://github.com/libp2p/rust-libp2p/pull/5727)
+
 ## 0.42.0
 
 - Implement refactored `Transport`.
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 707b67fc935..2a12c34a383 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-dns"
 edition = "2021"
 rust-version = { workspace = true }
 description = "DNS transport implementation for libp2p"
-version = "0.42.0"
+version = "0.42.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -11,13 +11,13 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-std-resolver = { version = "0.24", optional = true }
+async-std-resolver = { workspace = true, features = ["system-config"], optional = true }
 async-trait = "0.1.80"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
 parking_lot = "0.12.3"
-hickory-resolver = { version = "0.24.1", default-features = false, features = ["system-config"] }
+hickory-resolver = { workspace = true, features = ["system-config"] }
 smallvec = "1.13.2"
 tracing = { workspace = true }
 
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index d47f1e464db..d777d54a5f2 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -117,12 +117,12 @@ pub mod async_std {
 pub mod tokio {
     use std::sync::Arc;
 
-    use hickory_resolver::{system_conf, TokioAsyncResolver};
+    use hickory_resolver::{system_conf, TokioResolver};
     use parking_lot::Mutex;
 
     /// A `Transport` wrapper for performing DNS lookups when dialing `Multiaddr`esses
     /// using `tokio` for all async I/O.
-    pub type Transport<T> = crate::Transport<T, TokioAsyncResolver>;
+    pub type Transport<T> = crate::Transport<T, TokioResolver>;
 
     impl<T> Transport<T> {
         /// Creates a new [`Transport`] from the OS's DNS configuration and defaults.
@@ -140,7 +140,7 @@ pub mod tokio {
         ) -> Transport<T> {
             Transport {
                 inner: Arc::new(Mutex::new(inner)),
-                resolver: TokioAsyncResolver::tokio(cfg, opts),
+                resolver: TokioResolver::tokio(cfg, opts),
             }
         }
     }
@@ -160,13 +160,12 @@ use async_trait::async_trait;
 use futures::{future::BoxFuture, prelude::*};
 pub use hickory_resolver::{
     config::{ResolverConfig, ResolverOpts},
-    error::{ResolveError, ResolveErrorKind},
+    {ResolveError, ResolveErrorKind},
 };
 use hickory_resolver::{
     lookup::{Ipv4Lookup, Ipv6Lookup, TxtLookup},
     lookup_ip::LookupIp,
     name_server::ConnectionProvider,
-    AsyncResolver,
 };
 use libp2p_core::{
     multiaddr::{Multiaddr, Protocol},
@@ -594,7 +593,7 @@ pub trait Resolver {
 }
 
 #[async_trait]
-impl<C> Resolver for AsyncResolver<C>
+impl<C> Resolver for hickory_resolver::Resolver<C>
 where
     C: ConnectionProvider,
 {
@@ -618,6 +617,7 @@ where
 #[cfg(all(test, any(feature = "tokio", feature = "async-std")))]
 mod tests {
     use futures::future::BoxFuture;
+    use hickory_resolver::proto::{ProtoError, ProtoErrorKind};
     use libp2p_core::{
         multiaddr::{Multiaddr, Protocol},
         transport::{PortUse, TransportError, TransportEvent},
@@ -750,7 +750,8 @@ mod tests {
                 .await
             {
                 Err(Error::ResolveError(e)) => match e.kind() {
-                    ResolveErrorKind::NoRecordsFound { .. } => {}
+                    ResolveErrorKind::Proto(ProtoError { kind, .. })
+                        if matches!(kind.as_ref(), ProtoErrorKind::NoRecordsFound { .. }) => {}
                     _ => panic!("Unexpected DNS error: {e:?}"),
                 },
                 Err(e) => panic!("Unexpected error: {e:?}"),

From 99544c40366d124a701c818582774265a341e440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 12 Dec 2024 16:15:34 +0000
Subject: [PATCH 424/455] deps(metrics-example): update opentelemetry to 0.27

this will help fix the `cargo deny` situation as `opentelemetry-otlp` `0.25` has `tokio` [locked to `~1.38.0`](https://crates.io/crates/opentelemetry-otlp/0.25.0/dependencies) :man_shrugging:
which then impedes us tfrom updating `netlink-sys`

Pull-Request: #5735.
---
 Cargo.lock                   | 45 ++++++++++++++++++------------------
 examples/metrics/Cargo.toml  |  8 +++----
 examples/metrics/src/main.rs | 22 ++++++++++--------
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 15ea38544d2..b50e0058a8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3806,13 +3806,13 @@ dependencies = [
  "axum",
  "futures",
  "libp2p",
- "opentelemetry 0.25.0",
+ "opentelemetry 0.27.1",
  "opentelemetry-otlp",
- "opentelemetry_sdk 0.25.0",
+ "opentelemetry_sdk 0.27.1",
  "prometheus-client",
  "tokio",
  "tracing",
- "tracing-opentelemetry 0.26.0",
+ "tracing-opentelemetry 0.28.0",
  "tracing-subscriber",
 ]
 
@@ -4247,16 +4247,16 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.25.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af"
+checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7"
 dependencies = [
  "futures-core",
  "futures-sink",
  "js-sys",
- "once_cell",
  "pin-project-lite",
  "thiserror 1.0.63",
+ "tracing",
 ]
 
 [[package]]
@@ -4277,30 +4277,31 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "596b1719b3cab83addb20bcbffdf21575279d9436d9ccccfe651a3bf0ab5ab06"
+checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76"
 dependencies = [
  "async-trait",
  "futures-core",
  "http 1.1.0",
- "opentelemetry 0.25.0",
+ "opentelemetry 0.27.1",
  "opentelemetry-proto",
- "opentelemetry_sdk 0.25.0",
+ "opentelemetry_sdk 0.27.1",
  "prost",
  "thiserror 1.0.63",
  "tokio",
  "tonic",
+ "tracing",
 ]
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c43620e8f93359eb7e627a3b16ee92d8585774986f24f2ab010817426c5ce61"
+checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6"
 dependencies = [
- "opentelemetry 0.25.0",
- "opentelemetry_sdk 0.25.0",
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
  "prost",
  "tonic",
 ]
@@ -4338,23 +4339,23 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.25.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82"
+checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8"
 dependencies = [
  "async-trait",
  "futures-channel",
  "futures-executor",
  "futures-util",
  "glob",
- "once_cell",
- "opentelemetry 0.25.0",
+ "opentelemetry 0.27.1",
  "percent-encoding",
  "rand 0.8.5",
  "serde_json",
  "thiserror 1.0.63",
  "tokio",
  "tokio-stream",
+ "tracing",
 ]
 
 [[package]]
@@ -6475,14 +6476,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.26.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eabc56d23707ad55ba2a0750fc24767125d5a0f51993ba41ad2c441cc7b8dea"
+checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053"
 dependencies = [
  "js-sys",
  "once_cell",
- "opentelemetry 0.25.0",
- "opentelemetry_sdk 0.25.0",
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
  "smallvec",
  "tracing",
  "tracing-core",
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
index 129b1abb1f3..ad2941e3761 100644
--- a/examples/metrics/Cargo.toml
+++ b/examples/metrics/Cargo.toml
@@ -12,13 +12,13 @@ release = false
 futures = { workspace = true }
 axum = "0.7"
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
-opentelemetry = { version = "0.25.0", features = ["metrics"] }
-opentelemetry-otlp = { version = "0.25.0", features = ["metrics"] }
-opentelemetry_sdk = { version = "0.25.0", features = ["rt-tokio", "metrics"] }
+opentelemetry = { version = "0.27.0", features = ["metrics"] }
+opentelemetry-otlp = { version = "0.27.0", features = ["metrics"] }
+opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio", "metrics"] }
 prometheus-client = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
-tracing-opentelemetry = "0.26.0"
+tracing-opentelemetry = "0.28.0"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/metrics/src/main.rs b/examples/metrics/src/main.rs
index 92aa90479fd..62e5b06251d 100644
--- a/examples/metrics/src/main.rs
+++ b/examples/metrics/src/main.rs
@@ -31,7 +31,9 @@ use libp2p::{
     swarm::{NetworkBehaviour, SwarmEvent},
     tcp, yamux,
 };
-use opentelemetry::{trace::TracerProvider, KeyValue};
+use opentelemetry::{trace::TracerProvider as _, KeyValue};
+use opentelemetry_otlp::SpanExporter;
+use opentelemetry_sdk::{runtime, trace::TracerProvider};
 use prometheus_client::registry::Registry;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 
@@ -92,14 +94,16 @@ async fn main() -> Result<(), Box<dyn Error>> {
 }
 
 fn setup_tracing() -> Result<(), Box<dyn Error>> {
-    let provider = opentelemetry_otlp::new_pipeline()
-        .tracing()
-        .with_exporter(opentelemetry_otlp::new_exporter().tonic())
-        .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
-            opentelemetry_sdk::Resource::new(vec![KeyValue::new("service.name", "libp2p")]),
-        ))
-        .install_batch(opentelemetry_sdk::runtime::Tokio)?;
-
+    let provider = TracerProvider::builder()
+        .with_batch_exporter(
+            SpanExporter::builder().with_tonic().build()?,
+            runtime::Tokio,
+        )
+        .with_resource(opentelemetry_sdk::Resource::new(vec![KeyValue::new(
+            "service.name",
+            "libp2p",
+        )]))
+        .build();
     tracing_subscriber::registry()
         .with(tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()))
         .with(

From 3c1f856e868fac094fe0fb0fa860c19fdff8c9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 12 Dec 2024 16:38:53 +0000
Subject: [PATCH 425/455] fix: update Cargo.lock

To finally address [RUSTSEC-2024-0384](https://rustsec.org/advisories/RUSTSEC-2024-0384).
Thanks  @hanabi1224 for submitting the [upstream update](https://github.com/rust-netlink/netlink-sys/pull/25) :heart:

Pull-Request: #5737.
---
 Cargo.lock | 493 ++++++++++++++++++++++-------------------------------
 1 file changed, 205 insertions(+), 288 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b50e0058a8d..18b579f6d2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,15 +87,16 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.7"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
@@ -282,65 +283,43 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.5.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
 dependencies = [
- "async-lock 2.7.0",
  "async-task",
  "concurrent-queue",
- "fastrand 1.9.0",
- "futures-lite 1.13.0",
+ "fastrand",
+ "futures-lite",
  "slab",
 ]
 
 [[package]]
 name = "async-fs"
-version = "1.6.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
 dependencies = [
- "async-lock 2.7.0",
- "autocfg",
+ "async-lock 3.1.0",
  "blocking",
- "futures-lite 1.13.0",
+ "futures-lite",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel 2.3.1",
  "async-executor",
- "async-io 1.13.0",
- "async-lock 2.7.0",
+ "async-io",
+ "async-lock 3.1.0",
  "blocking",
- "futures-lite 1.13.0",
+ "futures-lite",
  "once_cell",
 ]
 
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock 2.7.0",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
- "parking",
- "polling 2.8.0",
- "rustix 0.37.25",
- "slab",
- "socket2 0.4.9",
- "waker-fn",
-]
-
 [[package]]
 name = "async-io"
 version = "2.3.3"
@@ -351,10 +330,10 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.0.1",
+ "futures-lite",
  "parking",
- "polling 3.3.0",
- "rustix 0.38.31",
+ "polling",
+ "rustix",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -382,32 +361,31 @@ dependencies = [
 
 [[package]]
 name = "async-net"
-version = "1.7.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
+checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
 dependencies = [
- "async-io 1.13.0",
- "autocfg",
+ "async-io",
  "blocking",
- "futures-lite 1.13.0",
+ "futures-lite",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.7.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
+checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8"
 dependencies = [
- "async-io 1.13.0",
- "async-lock 2.7.0",
- "autocfg",
+ "async-channel 2.3.1",
+ "async-io",
+ "async-lock 3.1.0",
+ "async-signal",
  "blocking",
  "cfg-if",
- "event-listener 2.5.3",
- "futures-lite 1.13.0",
- "rustix 0.37.25",
- "signal-hook",
- "windows-sys 0.48.0",
+ "event-listener 5.3.1",
+ "futures-lite",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -421,24 +399,42 @@ dependencies = [
  "syn 2.0.89",
 ]
 
+[[package]]
+name = "async-signal"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+dependencies = [
+ "async-io",
+ "async-lock 2.7.0",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "async-std"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
 dependencies = [
  "async-attributes",
  "async-channel 1.9.0",
  "async-global-executor",
- "async-io 1.13.0",
- "async-lock 2.7.0",
+ "async-io",
+ "async-lock 3.1.0",
  "async-process",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite 1.13.0",
- "gloo-timers",
+ "futures-lite",
+ "gloo-timers 0.3.0",
  "kv-log-macro",
  "log",
  "memchr",
@@ -461,7 +457,7 @@ dependencies = [
  "futures-util",
  "hickory-resolver",
  "pin-utils",
- "socket2 0.5.7",
+ "socket2",
 ]
 
 [[package]]
@@ -739,17 +735,15 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.3.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
- "async-channel 1.9.0",
- "async-lock 2.7.0",
+ "async-channel 2.3.1",
  "async-task",
- "atomic-waker",
- "fastrand 1.9.0",
- "futures-lite 1.13.0",
- "log",
+ "futures-io",
+ "futures-lite",
+ "piper",
 ]
 
 [[package]]
@@ -811,9 +805,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 dependencies = [
  "serde",
 ]
@@ -1572,15 +1566,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -1648,9 +1633,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1673,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1683,15 +1668,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1701,40 +1686,29 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "1.13.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
 dependencies = [
- "fastrand 1.9.0",
+ "fastrand",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
  "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-lite"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
-dependencies = [
- "futures-core",
- "pin-project-lite",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1754,15 +1728,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
@@ -1770,15 +1744,15 @@ version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
- "gloo-timers",
+ "gloo-timers 0.2.6",
  "send_wrapper 0.4.0",
 ]
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1886,6 +1860,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -1992,7 +1978,7 @@ dependencies = [
  "ipnet",
  "once_cell",
  "rand 0.8.5",
- "socket2 0.5.7",
+ "socket2",
  "thiserror 2.0.3",
  "tinyvec",
  "tokio",
@@ -2236,7 +2222,7 @@ dependencies = [
  "http-body",
  "hyper",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -2404,22 +2390,26 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
+checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38"
 dependencies = [
- "async-io 2.3.3",
+ "async-io",
  "core-foundation",
  "fnv",
  "futures",
  "if-addrs",
  "ipnet",
  "log",
+ "netlink-packet-core",
+ "netlink-packet-route",
+ "netlink-proto",
+ "netlink-sys",
  "rtnetlink",
  "smol",
- "system-configuration",
+ "system-configuration 0.6.1",
  "tokio",
- "windows 0.51.1",
+ "windows",
 ]
 
 [[package]]
@@ -2473,15 +2463,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "integer-encoding"
 version = "3.0.4"
@@ -2541,24 +2522,13 @@ dependencies = [
  "web-time 1.1.0",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ipconfig"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.7",
+ "socket2",
  "widestring",
  "windows-sys 0.48.0",
  "winreg 0.50.0",
@@ -2605,10 +2575,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.31",
+ "rustix",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -2672,9 +2648,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libp2p"
@@ -3011,7 +2987,7 @@ dependencies = [
 name = "libp2p-mdns"
 version = "0.46.1"
 dependencies = [
- "async-io 2.3.3",
+ "async-io",
  "async-std",
  "data-encoding",
  "futures",
@@ -3026,7 +3002,7 @@ dependencies = [
  "libp2p-yamux",
  "rand 0.8.5",
  "smallvec",
- "socket2 0.5.7",
+ "socket2",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3239,7 +3215,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustls 0.23.11",
- "socket2 0.5.7",
+ "socket2",
  "thiserror 2.0.3",
  "tokio",
  "tracing",
@@ -3431,7 +3407,7 @@ dependencies = [
 name = "libp2p-tcp"
 version = "0.42.0"
 dependencies = [
- "async-io 2.3.3",
+ "async-io",
  "async-std",
  "futures",
  "futures-timer",
@@ -3439,7 +3415,7 @@ dependencies = [
  "libc",
  "libp2p-core",
  "libp2p-identity",
- "socket2 0.5.7",
+ "socket2",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3689,12 +3665,6 @@ dependencies = [
  "libsecp256k1-core",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.12"
@@ -3859,13 +3829,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3970,21 +3940,20 @@ dependencies = [
 
 [[package]]
 name = "netlink-packet-core"
-version = "0.4.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297"
+checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4"
 dependencies = [
  "anyhow",
  "byteorder",
- "libc",
  "netlink-packet-utils",
 ]
 
 [[package]]
 name = "netlink-packet-route"
-version = "0.12.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
+checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
 dependencies = [
  "anyhow",
  "bitflags 1.3.2",
@@ -4008,9 +3977,9 @@ dependencies = [
 
 [[package]]
 name = "netlink-proto"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
+checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21"
 dependencies = [
  "bytes",
  "futures",
@@ -4023,11 +3992,11 @@ dependencies = [
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
+checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23"
 dependencies = [
- "async-io 1.13.0",
+ "async-io",
  "bytes",
  "futures",
  "libc",
@@ -4035,17 +4004,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.4"
@@ -4408,9 +4366,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.1.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -4509,6 +4467,17 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
@@ -4553,22 +4522,6 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "polling"
 version = "3.3.0"
@@ -4578,7 +4531,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.31",
+ "rustix",
  "tracing",
  "windows-sys 0.48.0",
 ]
@@ -4757,7 +4710,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
 dependencies = [
- "async-io 2.3.3",
+ "async-io",
  "async-std",
  "bytes",
  "futures-io",
@@ -4796,7 +4749,7 @@ checksum = "cb7ad7bc932e4968523fa7d9c320ee135ff779de720e9350fee8728838551764"
 dependencies = [
  "libc",
  "once_cell",
- "socket2 0.5.7",
+ "socket2",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -5072,7 +5025,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 0.1.2",
- "system-configuration",
+ "system-configuration 0.5.1",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
@@ -5179,16 +5132,19 @@ dependencies = [
 
 [[package]]
 name = "rtnetlink"
-version = "0.10.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0"
+checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0"
 dependencies = [
  "async-global-executor",
  "futures",
  "log",
+ "netlink-packet-core",
  "netlink-packet-route",
+ "netlink-packet-utils",
  "netlink-proto",
- "nix 0.24.3",
+ "netlink-sys",
+ "nix",
  "thiserror 1.0.63",
  "tokio",
 ]
@@ -5278,20 +5234,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.37.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.31"
@@ -5301,7 +5243,7 @@ dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
+ "linux-raw-sys",
  "windows-sys 0.52.0",
 ]
 
@@ -5660,16 +5602,6 @@ dependencies = [
  "dirs",
 ]
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -5706,19 +5638,19 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smol"
-version = "1.3.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
+checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel 2.3.1",
  "async-executor",
  "async-fs",
- "async-io 1.13.0",
- "async-lock 2.7.0",
+ "async-io",
+ "async-lock 3.1.0",
  "async-net",
  "async-process",
  "blocking",
- "futures-lite 1.13.0",
+ "futures-lite",
 ]
 
 [[package]]
@@ -5747,16 +5679,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -5989,7 +5911,7 @@ dependencies = [
  "ntapi",
  "once_cell",
  "rayon",
- "windows 0.52.0",
+ "windows",
 ]
 
 [[package]]
@@ -6000,7 +5922,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.4.1",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
 ]
 
 [[package]]
@@ -6013,6 +5946,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tagptr"
 version = "0.2.0"
@@ -6026,8 +5969,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.1",
- "rustix 0.38.31",
+ "fastrand",
+ "rustix",
  "windows-sys 0.52.0",
 ]
 
@@ -6217,28 +6160,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6346,7 +6288,7 @@ dependencies = [
  "percent-encoding",
  "pin-project",
  "prost",
- "socket2 0.5.7",
+ "socket2",
  "tokio",
  "tokio-stream",
  "tower",
@@ -6730,12 +6672,6 @@ dependencies = [
  "atomic-waker",
 ]
 
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
 [[package]]
 name = "walkdir"
 version = "2.3.3"
@@ -7042,7 +6978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62bebbd40e7f8b630a0f1a74783dbfff1edfc0ccaae891c4689891156a8c4d8c"
 dependencies = [
  "log",
- "socket2 0.5.7",
+ "socket2",
  "thiserror 1.0.63",
  "tokio",
  "webrtc-util 0.8.1",
@@ -7114,7 +7050,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "nix 0.26.4",
+ "nix",
  "rand 0.8.5",
  "thiserror 1.0.63",
  "tokio",
@@ -7134,7 +7070,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "nix 0.26.4",
+ "nix",
  "portable-atomic",
  "rand 0.8.5",
  "thiserror 1.0.63",
@@ -7197,35 +7133,16 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-core 0.52.0",
+ "windows-core",
  "windows-targets 0.52.0",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"

From c4e4540d6c4306257740e073a5ef8855d2ab938b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 13 Dec 2024 11:50:47 +0000
Subject: [PATCH 426/455] chore: add Unicode V3 license to deny.toml

Add `Unicode` `v3` License to our `cargo.deny` file.
This is required because of the [`icu_collections`](https://crates.io/crates/icu_collections) dependency which is authored by The Unicode Consortium.
in my ignorance, seems to be safe as the Open Source Initiative [approves it](https://opensource.org/license/unicode-license-v3), and the main `deny.toml` has also [added it](https://github.com/EmbarkStudios/cargo-deny/pull/713/files#diff-1040309c64844eb1b6b63d8fd67938adbf9461f1b3c61f12cf738f064a02d3deR50).

Pull-Request: #5738.
---
 deny.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deny.toml b/deny.toml
index 5be86107edf..9e0e201527b 100644
--- a/deny.toml
+++ b/deny.toml
@@ -43,6 +43,7 @@ allow = [
     "MIT",
     "MPL-2.0",
     "Unlicense",
+    "Unicode-3.0",
 ]
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the

From be28c96ff66a059fa90299e2bdf9a5f09692e43d Mon Sep 17 00:00:00 2001
From: Sergey Melnychuk <8093171+sergey-melnychuk@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:25:22 +0100
Subject: [PATCH 427/455] chore(core): avoid unused props matching on
 connection.rs

Pull-Request: #5734.
---
 core/src/connection.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/src/connection.rs b/core/src/connection.rs
index d46a6cf81e6..91152b25728 100644
--- a/core/src/connection.rs
+++ b/core/src/connection.rs
@@ -138,11 +138,7 @@ impl ConnectedPoint {
     /// Returns true if the connection is relayed.
     pub fn is_relayed(&self) -> bool {
         match self {
-            ConnectedPoint::Dialer {
-                address,
-                role_override: _,
-                port_use: _,
-            } => address,
+            ConnectedPoint::Dialer { address, .. } => address,
             ConnectedPoint::Listener { local_addr, .. } => local_addr,
         }
         .iter()

From f4edafbbe2e6117e99348370b1a00e93cf6ad7f1 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Sat, 14 Dec 2024 03:28:53 +1100
Subject: [PATCH 428/455] feat(swarm): set default for idle-connection-timeout
 to 10s (#4967)

## Description

With the move to a global idle-connection-timeout, connections are being
closed much more aggressively. This causes problems in situations where,
e.g. an application wants to use a connection shortly after an event has
been emitted from the `Swarm`. With a default of 0 seconds, such a
connection is instantly considered idle and therefore closed, despite
the application wanting to use it again just moments later. Whilst it is
possible to structure application code to mitigate this, it is
unnecessarily complicated.

Additionally, connections being closed instantly if not in use is a
foot-gun for newcomers to the library.

From a technical point-of-view, instantly closing idle connections is
nice. In reality, it is an impractical default. Hence, we change this
default to 10s.

10 seconds is considered to be an acceptable default as it strikes a
balance between allowing some pause between network activity, yet frees
up resources that are (supposedly) no longer needed.

Resolves: #4912.
---
 examples/autonat/src/bin/autonat_client.rs    |  1 -
 examples/autonat/src/bin/autonat_server.rs    |  3 +--
 examples/browser-webrtc/src/main.rs           | 10 +---------
 examples/chat/src/main.rs                     |  1 -
 examples/dcutr/src/main.rs                    |  3 +--
 .../distributed-key-value-store/src/main.rs   |  3 +--
 examples/identify/src/main.rs                 |  3 +--
 examples/ipfs-kad/src/main.rs                 |  1 -
 examples/ipfs-private/src/main.rs             |  3 +--
 examples/metrics/src/main.rs                  |  3 +--
 examples/rendezvous/src/bin/rzv-discover.rs   |  1 -
 examples/rendezvous/src/bin/rzv-identify.rs   |  1 -
 examples/rendezvous/src/bin/rzv-register.rs   |  1 -
 examples/rendezvous/src/main.rs               |  1 -
 interop-tests/src/arch.rs                     | 10 ----------
 libp2p/CHANGELOG.md                           |  2 ++
 libp2p/Cargo.toml                             |  1 -
 libp2p/src/tutorials/ping.rs                  |  9 ---------
 protocols/kad/src/behaviour/test.rs           |  3 +--
 protocols/relay/tests/lib.rs                  |  5 +----
 swarm-test/CHANGELOG.md                       |  2 ++
 swarm-test/src/lib.rs                         | 15 ++------------
 swarm/CHANGELOG.md                            |  5 ++++-
 swarm/src/connection/pool.rs                  |  2 +-
 swarm/src/lib.rs                              | 20 ++++++++++++-------
 transports/tls/tests/smoke.rs                 |  4 +---
 26 files changed, 34 insertions(+), 79 deletions(-)

diff --git a/examples/autonat/src/bin/autonat_client.rs b/examples/autonat/src/bin/autonat_client.rs
index 80d7039eccb..768a2052c80 100644
--- a/examples/autonat/src/bin/autonat_client.rs
+++ b/examples/autonat/src/bin/autonat_client.rs
@@ -62,7 +62,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
             yamux::Config::default,
         )?
         .with_behaviour(|key| Behaviour::new(key.public()))?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
         .build();
 
     swarm.listen_on(
diff --git a/examples/autonat/src/bin/autonat_server.rs b/examples/autonat/src/bin/autonat_server.rs
index 83e456d8fda..f3bb6b6a439 100644
--- a/examples/autonat/src/bin/autonat_server.rs
+++ b/examples/autonat/src/bin/autonat_server.rs
@@ -20,7 +20,7 @@
 
 #![doc = include_str!("../../README.md")]
 
-use std::{error::Error, net::Ipv4Addr, time::Duration};
+use std::{error::Error, net::Ipv4Addr};
 
 use clap::Parser;
 use futures::StreamExt;
@@ -56,7 +56,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
             yamux::Config::default,
         )?
         .with_behaviour(|key| Behaviour::new(key.public()))?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
         .build();
 
     swarm.listen_on(
diff --git a/examples/browser-webrtc/src/main.rs b/examples/browser-webrtc/src/main.rs
index ec6be0c066d..52222dc882b 100644
--- a/examples/browser-webrtc/src/main.rs
+++ b/examples/browser-webrtc/src/main.rs
@@ -1,9 +1,6 @@
 #![allow(non_upper_case_globals)]
 
-use std::{
-    net::{Ipv4Addr, SocketAddr},
-    time::Duration,
-};
+use std::net::{Ipv4Addr, SocketAddr};
 
 use anyhow::Result;
 use axum::{
@@ -41,11 +38,6 @@ async fn main() -> anyhow::Result<()> {
             .map(|(peer_id, conn), _| (peer_id, StreamMuxerBox::new(conn))))
         })?
         .with_behaviour(|_| ping::Behaviour::default())?
-        .with_swarm_config(|cfg| {
-            cfg.with_idle_connection_timeout(
-                Duration::from_secs(u64::MAX), // Allows us to observe the pings.
-            )
-        })
         .build();
 
     let address_webrtc = Multiaddr::from(Ipv4Addr::UNSPECIFIED)
diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs
index cda1e90bd35..b0dcc767b6f 100644
--- a/examples/chat/src/main.rs
+++ b/examples/chat/src/main.rs
@@ -84,7 +84,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 mdns::tokio::Behaviour::new(mdns::Config::default(), key.public().to_peer_id())?;
             Ok(MyBehaviour { gossipsub, mdns })
         })?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
         .build();
 
     // Create a Gossipsub topic
diff --git a/examples/dcutr/src/main.rs b/examples/dcutr/src/main.rs
index 0ec1f2a321a..3f403d534e7 100644
--- a/examples/dcutr/src/main.rs
+++ b/examples/dcutr/src/main.rs
@@ -20,7 +20,7 @@
 
 #![doc = include_str!("../README.md")]
 
-use std::{error::Error, str::FromStr, time::Duration};
+use std::{error::Error, str::FromStr};
 
 use clap::Parser;
 use futures::{executor::block_on, future::FutureExt, stream::StreamExt};
@@ -105,7 +105,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 )),
                 dcutr: dcutr::Behaviour::new(keypair.public().to_peer_id()),
             })?
-            .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
             .build();
 
     swarm
diff --git a/examples/distributed-key-value-store/src/main.rs b/examples/distributed-key-value-store/src/main.rs
index 63944f2e9bd..3522c84c720 100644
--- a/examples/distributed-key-value-store/src/main.rs
+++ b/examples/distributed-key-value-store/src/main.rs
@@ -20,7 +20,7 @@
 
 #![doc = include_str!("../README.md")]
 
-use std::{error::Error, time::Duration};
+use std::error::Error;
 
 use futures::stream::StreamExt;
 use libp2p::{
@@ -68,7 +68,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 )?,
             })
         })?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
         .build();
 
     swarm.behaviour_mut().kademlia.set_mode(Some(Mode::Server));
diff --git a/examples/identify/src/main.rs b/examples/identify/src/main.rs
index 55d093c0399..3f08ac01e23 100644
--- a/examples/identify/src/main.rs
+++ b/examples/identify/src/main.rs
@@ -20,7 +20,7 @@
 
 #![doc = include_str!("../README.md")]
 
-use std::{error::Error, time::Duration};
+use std::error::Error;
 
 use futures::StreamExt;
 use libp2p::{core::multiaddr::Multiaddr, identify, noise, swarm::SwarmEvent, tcp, yamux};
@@ -45,7 +45,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 key.public(),
             ))
         })?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
         .build();
 
     // Tell the swarm to listen on all interfaces and a random, OS-assigned
diff --git a/examples/ipfs-kad/src/main.rs b/examples/ipfs-kad/src/main.rs
index c2df603fcc2..8d9a289bdd1 100644
--- a/examples/ipfs-kad/src/main.rs
+++ b/examples/ipfs-kad/src/main.rs
@@ -70,7 +70,6 @@ async fn main() -> Result<()> {
             let store = kad::store::MemoryStore::new(key.public().to_peer_id());
             kad::Behaviour::with_config(key.public().to_peer_id(), store, cfg)
         })?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
         .build();
 
     // Add the bootnodes to the local routing table. `libp2p-dns` built
diff --git a/examples/ipfs-private/src/main.rs b/examples/ipfs-private/src/main.rs
index 19d38c767e9..6d8f9beb75d 100644
--- a/examples/ipfs-private/src/main.rs
+++ b/examples/ipfs-private/src/main.rs
@@ -20,7 +20,7 @@
 
 #![doc = include_str!("../README.md")]
 
-use std::{env, error::Error, fs, path::Path, str::FromStr, time::Duration};
+use std::{env, error::Error, fs, path::Path, str::FromStr};
 
 use either::Either;
 use futures::prelude::*;
@@ -152,7 +152,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 ping: ping::Behaviour::new(ping::Config::new()),
             })
         })?
-        .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(60)))
         .build();
 
     println!("Subscribing to {gossipsub_topic:?}");
diff --git a/examples/metrics/src/main.rs b/examples/metrics/src/main.rs
index 62e5b06251d..6f6e9d08e31 100644
--- a/examples/metrics/src/main.rs
+++ b/examples/metrics/src/main.rs
@@ -20,7 +20,7 @@
 
 #![doc = include_str!("../README.md")]
 
-use std::{error::Error, time::Duration};
+use std::error::Error;
 
 use futures::StreamExt;
 use libp2p::{
@@ -54,7 +54,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
         )?
         .with_bandwidth_metrics(&mut metric_registry)
         .with_behaviour(|key| Behaviour::new(key.public()))?
-        .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
         .build();
 
     swarm.listen_on("/ip4/0.0.0.0/tcp/0".parse()?)?;
diff --git a/examples/rendezvous/src/bin/rzv-discover.rs b/examples/rendezvous/src/bin/rzv-discover.rs
index b133c82d158..bdf9aeafdab 100644
--- a/examples/rendezvous/src/bin/rzv-discover.rs
+++ b/examples/rendezvous/src/bin/rzv-discover.rs
@@ -53,7 +53,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
             rendezvous: rendezvous::client::Behaviour::new(key.clone()),
             ping: ping::Behaviour::new(ping::Config::new().with_interval(Duration::from_secs(1))),
         })?
-        .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(5)))
         .build();
 
     swarm.dial(rendezvous_point_address.clone()).unwrap();
diff --git a/examples/rendezvous/src/bin/rzv-identify.rs b/examples/rendezvous/src/bin/rzv-identify.rs
index ce4933a29a9..00e94627292 100644
--- a/examples/rendezvous/src/bin/rzv-identify.rs
+++ b/examples/rendezvous/src/bin/rzv-identify.rs
@@ -56,7 +56,6 @@ async fn main() {
             ping: ping::Behaviour::new(ping::Config::new().with_interval(Duration::from_secs(1))),
         })
         .unwrap()
-        .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(5)))
         .build();
 
     let _ = swarm.listen_on("/ip4/0.0.0.0/tcp/0".parse().unwrap());
diff --git a/examples/rendezvous/src/bin/rzv-register.rs b/examples/rendezvous/src/bin/rzv-register.rs
index 8ef2d30c880..f70eda5d55e 100644
--- a/examples/rendezvous/src/bin/rzv-register.rs
+++ b/examples/rendezvous/src/bin/rzv-register.rs
@@ -52,7 +52,6 @@ async fn main() {
             ping: ping::Behaviour::new(ping::Config::new().with_interval(Duration::from_secs(1))),
         })
         .unwrap()
-        .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(5)))
         .build();
 
     // In production the external address should be the publicly facing IP address of the rendezvous
diff --git a/examples/rendezvous/src/main.rs b/examples/rendezvous/src/main.rs
index 0f26f2c9934..a345d0faed9 100644
--- a/examples/rendezvous/src/main.rs
+++ b/examples/rendezvous/src/main.rs
@@ -55,7 +55,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
             rendezvous: rendezvous::server::Behaviour::new(rendezvous::server::Config::default()),
             ping: ping::Behaviour::new(ping::Config::new().with_interval(Duration::from_secs(1))),
         })?
-        .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(5)))
         .build();
 
     let _ = swarm.listen_on("/ip4/0.0.0.0/tcp/62649".parse().unwrap());
diff --git a/interop-tests/src/arch.rs b/interop-tests/src/arch.rs
index 87a508742dc..91fc69dc215 100644
--- a/interop-tests/src/arch.rs
+++ b/interop-tests/src/arch.rs
@@ -49,7 +49,6 @@ pub(crate) mod native {
                     .with_tokio()
                     .with_quic()
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/udp/0/quic-v1"),
             ),
@@ -62,7 +61,6 @@ pub(crate) mod native {
                         mplex::MplexConfig::default,
                     )?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0"),
             ),
@@ -75,7 +73,6 @@ pub(crate) mod native {
                         yamux::Config::default,
                     )?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0"),
             ),
@@ -88,7 +85,6 @@ pub(crate) mod native {
                         mplex::MplexConfig::default,
                     )?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0"),
             ),
@@ -101,7 +97,6 @@ pub(crate) mod native {
                         yamux::Config::default,
                     )?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0"),
             ),
@@ -111,7 +106,6 @@ pub(crate) mod native {
                     .with_websocket(tls::Config::new, mplex::MplexConfig::default)
                     .await?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0/ws"),
             ),
@@ -121,7 +115,6 @@ pub(crate) mod native {
                     .with_websocket(tls::Config::new, yamux::Config::default)
                     .await?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0/ws"),
             ),
@@ -131,7 +124,6 @@ pub(crate) mod native {
                     .with_websocket(noise::Config::new, mplex::MplexConfig::default)
                     .await?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0/ws"),
             ),
@@ -141,7 +133,6 @@ pub(crate) mod native {
                     .with_websocket(noise::Config::new, yamux::Config::default)
                     .await?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/tcp/0/ws"),
             ),
@@ -155,7 +146,6 @@ pub(crate) mod native {
                         ))
                     })?
                     .with_behaviour(behaviour_constructor)?
-                    .with_swarm_config(|c| c.with_idle_connection_timeout(Duration::from_secs(5)))
                     .build(),
                 format!("/ip4/{ip}/udp/0/webrtc-direct"),
             ),
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index e86d633b5a7..5fc21d366bc 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+- Update default for idle-connection-timeout to 10s.
+  See [PR 4967](https://github.com/libp2p/rust-libp2p/pull/4967).
 
 - Expose swarm builder phase errors.
   See [PR 5726](https://github.com/libp2p/rust-libp2p/pull/5726).
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 79f4b8fbb9a..3d44e0bc43c 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -142,7 +142,6 @@ clap = { version = "4.1.6", features = ["derive"] }
 tokio = { workspace = true, features = [ "io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
 
 libp2p-mplex = { workspace = true }
-libp2p-noise = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/libp2p/src/tutorials/ping.rs b/libp2p/src/tutorials/ping.rs
index f35fef8f488..ebaea29f33a 100644
--- a/libp2p/src/tutorials/ping.rs
+++ b/libp2p/src/tutorials/ping.rs
@@ -232,9 +232,6 @@
 //!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| {
-//!             cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
-//!         })
 //!         .build();
 //!
 //!     Ok(())
@@ -287,9 +284,6 @@
 //!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| {
-//!             cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
-//!         })
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned
@@ -335,9 +329,6 @@
 //!             yamux::Config::default,
 //!         )?
 //!         .with_behaviour(|_| ping::Behaviour::default())?
-//!         .with_swarm_config(|cfg| {
-//!             cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX))
-//!         })
 //!         .build();
 //!
 //!     // Tell the swarm to listen on all interfaces and a random, OS-assigned
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 82749ffb5fd..bf7af0128f0 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -64,8 +64,7 @@ fn build_node_with_config(cfg: Config) -> (Multiaddr, TestSwarm) {
         transport,
         behaviour,
         local_id,
-        swarm::Config::with_async_std_executor()
-            .with_idle_connection_timeout(Duration::from_secs(5)),
+        swarm::Config::with_async_std_executor(),
     );
 
     let address: Multiaddr = Protocol::Memory(random::<u64>()).into();
diff --git a/protocols/relay/tests/lib.rs b/protocols/relay/tests/lib.rs
index 125f0dbb4ad..3181e60db74 100644
--- a/protocols/relay/tests/lib.rs
+++ b/protocols/relay/tests/lib.rs
@@ -416,10 +416,7 @@ fn reuse_connection() {
         .with(Protocol::P2p(relay_peer_id))
         .with(Protocol::P2pCircuit);
 
-    // To reuse the connection, we need to ensure it is not shut down due to being idle.
-    let mut client = build_client_with_config(
-        Config::with_async_std_executor().with_idle_connection_timeout(Duration::from_secs(1)),
-    );
+    let mut client = build_client();
     let client_peer_id = *client.local_peer_id();
 
     client.dial(relay_addr).unwrap();
diff --git a/swarm-test/CHANGELOG.md b/swarm-test/CHANGELOG.md
index 5700460b3a6..1fd213e12f6 100644
--- a/swarm-test/CHANGELOG.md
+++ b/swarm-test/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Add `tokio` runtime support and make `tokio` and `async-std` runtimes optional behind features.
   See [PR 5551].
+  - Update default for idle-connection-timeout to 10s on `SwarmExt::new_ephemeral` methods.
+  See [PR 4967](https://github.com/libp2p/rust-libp2p/pull/4967).
 
 [PR 5551]: https://github.com/libp2p/rust-libp2p/pull/5551
 
diff --git a/swarm-test/src/lib.rs b/swarm-test/src/lib.rs
index 0edf02473e6..0bc417dd8b1 100644
--- a/swarm-test/src/lib.rs
+++ b/swarm-test/src/lib.rs
@@ -246,13 +246,7 @@ where
             transport,
             behaviour_fn(identity),
             peer_id,
-            libp2p_swarm::Config::with_async_std_executor()
-                // Some tests need
-                // connections to be kept
-                // alive beyond what the
-                // individual behaviour
-                // configures.,
-                .with_idle_connection_timeout(Duration::from_secs(5)),
+            libp2p_swarm::Config::with_async_std_executor(),
         )
     }
 
@@ -279,12 +273,7 @@ where
             transport,
             behaviour_fn(identity),
             peer_id,
-            libp2p_swarm::Config::with_tokio_executor()
-                .with_idle_connection_timeout(Duration::from_secs(5)), /* Some tests need
-                                                                        * connections to be kept
-                                                                        * alive beyond what the
-                                                                        * individual behaviour
-                                                                        * configures., */
+            libp2p_swarm::Config::with_tokio_executor(),
         )
     }
 
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
index 69446e62d07..f1ad994bd1b 100644
--- a/swarm/CHANGELOG.md
+++ b/swarm/CHANGELOG.md
@@ -5,10 +5,13 @@
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
-  
+
 - Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
   See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
+- Update default for idle-connection-timeout to 10s.
+  See [PR 4967](https://github.com/libp2p/rust-libp2p/pull/4967).
+
 ## 0.45.1
 
 - Update `libp2p-swarm-derive` to version `0.35.0`, see [PR 5545]
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
index f42fd1f305c..49cc774b2b7 100644
--- a/swarm/src/connection/pool.rs
+++ b/swarm/src/connection/pool.rs
@@ -989,7 +989,7 @@ impl PoolConfig {
             task_command_buffer_size: 32,
             per_connection_event_buffer_size: 7,
             dial_concurrency_factor: NonZeroU8::new(8).expect("8 > 0"),
-            idle_connection_timeout: Duration::ZERO,
+            idle_connection_timeout: Duration::from_secs(10),
             substream_upgrade_protocol_override: None,
             max_negotiating_inbound_streams: 128,
         }
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 639906a1a09..a20d58b97fc 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -1495,7 +1495,18 @@ impl Config {
 
     /// How long to keep a connection alive once it is idling.
     ///
-    /// Defaults to 0.
+    /// Defaults to 10s.
+    ///
+    /// Typically, you shouldn't _need_ to modify this default as connections will be kept alive whilst they are "in use" (see below).
+    /// Depending on the application's usecase, it may be desirable to keep connections alive despite them not being in use.
+    ///
+    /// A connection is considered idle if:
+    /// - There are no active inbound streams.
+    /// - There are no active outbounds streams.
+    /// - There are no pending outbound streams (i.e. all streams requested via [`ConnectionHandlerEvent::OutboundSubstreamRequest`] have completed).
+    /// - Every [`ConnectionHandler`] returns `false` from [`ConnectionHandler::connection_keep_alive`].
+    ///
+    /// Once all these conditions are true, the idle connection timeout starts ticking.
     pub fn with_idle_connection_timeout(mut self, timeout: Duration) -> Self {
         self.pool_config.idle_connection_timeout = timeout;
         self
@@ -1784,12 +1795,7 @@ mod tests {
             .boxed();
         let behaviour = CallTraceBehaviour::new(MockBehaviour::new(dummy::ConnectionHandler));
 
-        Swarm::new(
-            transport,
-            behaviour,
-            local_public_key.into(),
-            config.with_idle_connection_timeout(Duration::from_secs(5)),
-        )
+        Swarm::new(transport, behaviour, local_public_key.into(), config)
     }
 
     fn swarms_connected<TBehaviour>(
diff --git a/transports/tls/tests/smoke.rs b/transports/tls/tests/smoke.rs
index cf11f4c0b1d..e335f68a7e4 100644
--- a/transports/tls/tests/smoke.rs
+++ b/transports/tls/tests/smoke.rs
@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use futures::{future, StreamExt};
 use libp2p_core::{multiaddr::Protocol, transport::MemoryTransport, upgrade::Version, Transport};
 use libp2p_swarm::{dummy, Config, Swarm, SwarmEvent};
@@ -67,6 +65,6 @@ fn make_swarm() -> Swarm<dummy::Behaviour> {
         transport,
         dummy::Behaviour,
         identity.public().to_peer_id(),
-        Config::with_tokio_executor().with_idle_connection_timeout(Duration::from_secs(60)),
+        Config::with_tokio_executor(),
     )
 }

From 9f197c2a91a0f05c68f6b7983ea98ac0eda03a42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 16:54:01 +0000
Subject: [PATCH 429/455] chore(deps): bump golang.org/x/crypto from 0.21.0 to
 0.31.0 (#5736)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from
0.21.0 to 0.31.0. for the wasm webtransport tests
---
 .../webtransport-tests/echo-server/go.mod     | 12 ++++-----
 .../webtransport-tests/echo-server/go.sum     | 26 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/wasm-tests/webtransport-tests/echo-server/go.mod b/wasm-tests/webtransport-tests/echo-server/go.mod
index e2e0c6591ba..6ac311fcb68 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.mod
+++ b/wasm-tests/webtransport-tests/echo-server/go.mod
@@ -43,13 +43,13 @@ require (
 	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
-	golang.org/x/mod v0.15.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )
diff --git a/wasm-tests/webtransport-tests/echo-server/go.sum b/wasm-tests/webtransport-tests/echo-server/go.sum
index a9d53233159..b6fac448bd7 100644
--- a/wasm-tests/webtransport-tests/echo-server/go.sum
+++ b/wasm-tests/webtransport-tests/echo-server/go.sum
@@ -213,8 +213,8 @@ golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
 golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
@@ -225,8 +225,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -240,8 +240,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -253,6 +253,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -266,14 +268,14 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -287,8 +289,8 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From c8c1b802c4b2087452359479d06af5e60de54102 Mon Sep 17 00:00:00 2001
From: James Hiew <james@hiew.net>
Date: Fri, 13 Dec 2024 17:23:05 +0000
Subject: [PATCH 430/455] fix(identify): validate public key from remote peer

Related https://github.com/libp2p/rust-libp2p/issues/5706

Discard `Info` messages received from a remote peer that contain a public key that doesn't match their peer ID, and log a warning. Don't emit `identify::Received` events to the swarm containing whatever public key they sent.

Pull-Request: #5707.
---
 Cargo.lock                         |  2 +-
 Cargo.toml                         |  2 +-
 protocols/identify/CHANGELOG.md    |  4 ++
 protocols/identify/Cargo.toml      |  2 +-
 protocols/identify/src/handler.rs  | 97 ++++++++++++++++++------------
 protocols/identify/src/protocol.rs |  2 +-
 protocols/identify/tests/smoke.rs  | 43 +++++++++++++
 7 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 18b579f6d2c..271ab64b919 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2900,7 +2900,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.46.0"
+version = "0.46.1"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index e0feda0392a..c77768db311 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,7 @@ libp2p-dcutr = { version = "0.12.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
-libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
+libp2p-identify = { version = "0.46.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
 libp2p-kad = { version = "0.47.1", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" }
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index 9051c331bbc..2b136740156 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.46.1
+- Discard `Info`s received from remote peers that contain a public key that doesn't match their peer ID.
+  See [PR 5707](https://github.com/libp2p/rust-libp2p/pull/5707).
+
 ## 0.46.0
 
 - Make `identify::Config` fields private and add getter functions.
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index d7f6b6eca76..d2aeb74e626 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Nodes identification protocol for libp2p"
-version = "0.46.0"
+version = "0.46.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/identify/src/handler.rs b/protocols/identify/src/handler.rs
index cda49f992b8..6e5af290cd2 100644
--- a/protocols/identify/src/handler.rs
+++ b/protocols/identify/src/handler.rs
@@ -242,10 +242,17 @@ impl Handler {
         }
     }
 
-    fn handle_incoming_info(&mut self, info: &Info) {
+    /// If the public key matches the remote peer, handles the given `info` and returns `true`.
+    fn handle_incoming_info(&mut self, info: &Info) -> bool {
+        let derived_peer_id = info.public_key.to_peer_id();
+        if self.remote_peer_id != derived_peer_id {
+            return false;
+        }
+
         self.remote_info.replace(info.clone());
 
         self.update_supported_protocols_for_remote(info);
+        true
     }
 
     fn update_supported_protocols_for_remote(&mut self, remote_info: &Info) {
@@ -344,45 +351,61 @@ impl ConnectionHandler for Handler {
             return Poll::Ready(event);
         }
 
-        match self.active_streams.poll_unpin(cx) {
-            Poll::Ready(Ok(Ok(Success::ReceivedIdentify(remote_info)))) => {
-                self.handle_incoming_info(&remote_info);
-
-                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(Event::Identified(
-                    remote_info,
-                )));
-            }
-            Poll::Ready(Ok(Ok(Success::SentIdentifyPush(info)))) => {
-                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                    Event::IdentificationPushed(info),
-                ));
-            }
-            Poll::Ready(Ok(Ok(Success::SentIdentify))) => {
-                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                    Event::Identification,
-                ));
-            }
-            Poll::Ready(Ok(Ok(Success::ReceivedIdentifyPush(remote_push_info)))) => {
-                if let Some(mut info) = self.remote_info.clone() {
-                    info.merge(remote_push_info);
-                    self.handle_incoming_info(&info);
-
+        while let Poll::Ready(ready) = self.active_streams.poll_unpin(cx) {
+            match ready {
+                Ok(Ok(Success::ReceivedIdentify(remote_info))) => {
+                    if self.handle_incoming_info(&remote_info) {
+                        return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                            Event::Identified(remote_info),
+                        ));
+                    } else {
+                        tracing::warn!(
+                            %self.remote_peer_id,
+                            ?remote_info.public_key,
+                            derived_peer_id=%remote_info.public_key.to_peer_id(),
+                            "Discarding received identify message as public key does not match remote peer ID",
+                        );
+                    }
+                }
+                Ok(Ok(Success::SentIdentifyPush(info))) => {
                     return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                        Event::Identified(info),
+                        Event::IdentificationPushed(info),
                     ));
-                };
-            }
-            Poll::Ready(Ok(Err(e))) => {
-                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                    Event::IdentificationError(StreamUpgradeError::Apply(e)),
-                ));
-            }
-            Poll::Ready(Err(Timeout { .. })) => {
-                return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                    Event::IdentificationError(StreamUpgradeError::Timeout),
-                ));
+                }
+                Ok(Ok(Success::SentIdentify)) => {
+                    return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                        Event::Identification,
+                    ));
+                }
+                Ok(Ok(Success::ReceivedIdentifyPush(remote_push_info))) => {
+                    if let Some(mut info) = self.remote_info.clone() {
+                        info.merge(remote_push_info);
+
+                        if self.handle_incoming_info(&info) {
+                            return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                                Event::Identified(info),
+                            ));
+                        } else {
+                            tracing::warn!(
+                                %self.remote_peer_id,
+                                ?info.public_key,
+                                derived_peer_id=%info.public_key.to_peer_id(),
+                                "Discarding received identify message as public key does not match remote peer ID",
+                            );
+                        }
+                    }
+                }
+                Ok(Err(e)) => {
+                    return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                        Event::IdentificationError(StreamUpgradeError::Apply(e)),
+                    ));
+                }
+                Err(Timeout { .. }) => {
+                    return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
+                        Event::IdentificationError(StreamUpgradeError::Timeout),
+                    ));
+                }
             }
-            Poll::Pending => {}
         }
 
         Poll::Pending
diff --git a/protocols/identify/src/protocol.rs b/protocols/identify/src/protocol.rs
index 33aeedb7c4f..257ec1f88d2 100644
--- a/protocols/identify/src/protocol.rs
+++ b/protocols/identify/src/protocol.rs
@@ -39,7 +39,7 @@ pub const PUSH_PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/id/pus
 /// Identify information of a peer sent in protocol messages.
 #[derive(Debug, Clone)]
 pub struct Info {
-    /// The public key of the local peer.
+    /// The public key of the peer.
     pub public_key: PublicKey,
     /// Application-specific version of the protocol family used by the peer,
     /// e.g. `ipfs/1.0.0` or `polkadot/1.0.0`.
diff --git a/protocols/identify/tests/smoke.rs b/protocols/identify/tests/smoke.rs
index dd48b314173..0d2818df0a4 100644
--- a/protocols/identify/tests/smoke.rs
+++ b/protocols/identify/tests/smoke.rs
@@ -6,6 +6,7 @@ use std::{
 
 use futures::StreamExt;
 use libp2p_identify as identify;
+use libp2p_identity::Keypair;
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use tracing_subscriber::EnvFilter;
@@ -440,3 +441,45 @@ async fn configured_interval_starts_after_first_identify() {
 
     assert!(time_to_first_identify < identify_interval)
 }
+
+#[async_std::test]
+async fn reject_mismatched_public_key() {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .try_init();
+
+    let mut honest_swarm = Swarm::new_ephemeral(|identity| {
+        identify::Behaviour::new(
+            identify::Config::new("a".to_string(), identity.public())
+                .with_interval(Duration::from_secs(1)),
+        )
+    });
+    let mut spoofing_swarm = Swarm::new_ephemeral(|_unused_identity| {
+        let arbitrary_public_key = Keypair::generate_ed25519().public();
+        identify::Behaviour::new(
+            identify::Config::new("a".to_string(), arbitrary_public_key)
+                .with_interval(Duration::from_secs(1)),
+        )
+    });
+
+    honest_swarm.listen().with_memory_addr_external().await;
+    spoofing_swarm.connect(&mut honest_swarm).await;
+
+    spoofing_swarm
+        .wait(|event| {
+            matches!(event, SwarmEvent::Behaviour(identify::Event::Sent { .. })).then_some(())
+        })
+        .await;
+
+    let honest_swarm_events = futures::stream::poll_fn(|cx| honest_swarm.poll_next_unpin(cx))
+        .take(4)
+        .collect::<Vec<_>>()
+        .await;
+
+    assert!(
+        !honest_swarm_events
+            .iter()
+            .any(|e| matches!(e, SwarmEvent::Behaviour(identify::Event::Received { .. }))),
+        "should emit no received events as received public key won't match remote peer",
+    );
+}

From d7b66a741904420d74bdff652ca4406bb2e88504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Fri, 13 Dec 2024 19:16:36 +0000
Subject: [PATCH 431/455] deps(memory-connection-limits): update sysinfo to
 0.33

Pull-Request: #5739.
---
 Cargo.lock                                    | 129 +++++++++++++-----
 misc/memory-connection-limits/Cargo.toml      |   2 +-
 misc/memory-connection-limits/src/lib.rs      |   2 +-
 .../tests/max_percentage.rs                   |   2 +-
 4 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 271ab64b919..31df58e8ec4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1034,9 +1034,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -2409,7 +2409,7 @@ dependencies = [
  "smol",
  "system-configuration 0.6.1",
  "tokio",
- "windows",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -5901,17 +5901,16 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.30.12"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
+checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46"
 dependencies = [
- "cfg-if",
  "core-foundation-sys",
  "libc",
+ "memchr",
  "ntapi",
- "once_cell",
  "rayon",
- "windows",
+ "windows 0.57.0",
 ]
 
 [[package]]
@@ -7139,8 +7138,18 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-core",
- "windows-targets 0.52.0",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7149,7 +7158,50 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7167,7 +7219,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7187,17 +7239,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -7208,9 +7261,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7220,9 +7273,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7232,9 +7285,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7244,9 +7303,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7256,9 +7315,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -7268,9 +7327,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7280,9 +7339,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index f18cb09d193..2f6b6ea1544 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -14,7 +14,7 @@ memory-stats = { version = "1", features = ["always_use_statm"] }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid"] }
-sysinfo = "0.30"
+sysinfo = "0.33"
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/misc/memory-connection-limits/src/lib.rs b/misc/memory-connection-limits/src/lib.rs
index 0735464a67e..28fa5598481 100644
--- a/misc/memory-connection-limits/src/lib.rs
+++ b/misc/memory-connection-limits/src/lib.rs
@@ -100,7 +100,7 @@ impl Behaviour {
         use sysinfo::{RefreshKind, System};
 
         let system_memory_bytes = System::new_with_specifics(
-            RefreshKind::new().with_memory(MemoryRefreshKind::new().with_ram()),
+            RefreshKind::default().with_memory(MemoryRefreshKind::default().with_ram()),
         )
         .total_memory();
 
diff --git a/misc/memory-connection-limits/tests/max_percentage.rs b/misc/memory-connection-limits/tests/max_percentage.rs
index 51fe783b3c5..bdadad437b8 100644
--- a/misc/memory-connection-limits/tests/max_percentage.rs
+++ b/misc/memory-connection-limits/tests/max_percentage.rs
@@ -37,7 +37,7 @@ use util::*;
 fn max_percentage() {
     const CONNECTION_LIMIT: usize = 20;
     let system_info = sysinfo::System::new_with_specifics(
-        RefreshKind::new().with_memory(MemoryRefreshKind::new().with_ram()),
+        RefreshKind::default().with_memory(MemoryRefreshKind::default().with_ram()),
     );
 
     let mut network = Swarm::new_ephemeral(|_| TestBehaviour {

From 89af8700207a466527558f6780301eb28a9c3f6e Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Sat, 14 Dec 2024 01:28:35 +0100
Subject: [PATCH 432/455] feat(SwarmBuilder): add with_connection_timeout
 method

Small PR to be able to change the `connection_timeout` value given to the `TransportTimeout` when building the `Swarm` with a `SwarmBuilder`.

Pull-Request: #5575.
---
 libp2p/CHANGELOG.md               |  4 ++++
 libp2p/src/builder/phase/build.rs | 19 +++++++++++--------
 libp2p/src/builder/phase/swarm.rs |  4 ++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
index 5fc21d366bc..8b7bf0ff55f 100644
--- a/libp2p/CHANGELOG.md
+++ b/libp2p/CHANGELOG.md
@@ -1,7 +1,11 @@
 ## 0.54.2
 
+- Add `with_connection_timeout` on `SwarmBuilder` to allow configuration of the connection_timeout parameter.
+  See [PR 5575](https://github.com/libp2p/rust-libp2p/pull/5575).
+
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+
 - Update default for idle-connection-timeout to 10s.
   See [PR 4967](https://github.com/libp2p/rust-libp2p/pull/4967).
 
diff --git a/libp2p/src/builder/phase/build.rs b/libp2p/src/builder/phase/build.rs
index f9621da756b..d3138cb8b8d 100644
--- a/libp2p/src/builder/phase/build.rs
+++ b/libp2p/src/builder/phase/build.rs
@@ -1,4 +1,6 @@
-use libp2p_core::Transport;
+use std::time::Duration;
+
+use libp2p_core::{transport::timeout::TransportTimeout, Transport};
 use libp2p_swarm::Swarm;
 
 #[allow(unused_imports)]
@@ -9,20 +11,21 @@ pub struct BuildPhase<T, B> {
     pub(crate) behaviour: B,
     pub(crate) transport: T,
     pub(crate) swarm_config: libp2p_swarm::Config,
+    pub(crate) connection_timeout: Duration,
 }
 
-const CONNECTION_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
-
 impl<Provider, T: AuthenticatedMultiplexedTransport, B: libp2p_swarm::NetworkBehaviour>
     SwarmBuilder<Provider, BuildPhase<T, B>>
 {
+    /// Timeout of the [`TransportTimeout`] wrapping the transport.
+    pub fn with_connection_timeout(mut self, connection_timeout: Duration) -> Self {
+        self.phase.connection_timeout = connection_timeout;
+        self
+    }
+
     pub fn build(self) -> Swarm<B> {
         Swarm::new(
-            libp2p_core::transport::timeout::TransportTimeout::new(
-                self.phase.transport,
-                CONNECTION_TIMEOUT,
-            )
-            .boxed(),
+            TransportTimeout::new(self.phase.transport, self.phase.connection_timeout).boxed(),
             self.phase.behaviour,
             self.keypair.public().to_peer_id(),
             self.phase.swarm_config,
diff --git a/libp2p/src/builder/phase/swarm.rs b/libp2p/src/builder/phase/swarm.rs
index ee456ced927..e751ad672e4 100644
--- a/libp2p/src/builder/phase/swarm.rs
+++ b/libp2p/src/builder/phase/swarm.rs
@@ -1,6 +1,9 @@
 #[allow(unused_imports)]
 use super::*;
 
+#[allow(unused)] // used below but due to feature flag combinations, clippy gives an unnecessary warning.
+const DEFAULT_CONNECTION_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
+
 #[allow(dead_code)]
 pub struct SwarmPhase<T, B> {
     pub(crate) behaviour: B,
@@ -20,6 +23,7 @@ macro_rules! impl_with_swarm_config {
                         behaviour: self.phase.behaviour,
                         transport: self.phase.transport,
                         swarm_config: constructor($config),
+                        connection_timeout: DEFAULT_CONNECTION_TIMEOUT,
                     },
                     keypair: self.keypair,
                     phantom: std::marker::PhantomData,

From ebc01e6848d82843730edcf6984acb12f5f2d7c3 Mon Sep 17 00:00:00 2001
From: X6 <xep-c-6yrpa@proton.me>
Date: Sat, 14 Dec 2024 01:41:46 +0100
Subject: [PATCH 433/455] chore(core): use `matches!` in connection.rs

Pull-Request: #5740.
---
 core/src/connection.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/src/connection.rs b/core/src/connection.rs
index 91152b25728..8779f76c03c 100644
--- a/core/src/connection.rs
+++ b/core/src/connection.rs
@@ -121,18 +121,12 @@ impl ConnectedPoint {
 
     /// Returns true if we are `Dialer`.
     pub fn is_dialer(&self) -> bool {
-        match self {
-            ConnectedPoint::Dialer { .. } => true,
-            ConnectedPoint::Listener { .. } => false,
-        }
+        matches!(self, ConnectedPoint::Dialer { .. })
     }
 
     /// Returns true if we are `Listener`.
     pub fn is_listener(&self) -> bool {
-        match self {
-            ConnectedPoint::Dialer { .. } => false,
-            ConnectedPoint::Listener { .. } => true,
-        }
+        matches!(self, ConnectedPoint::Listener { .. })
     }
 
     /// Returns true if the connection is relayed.

From 577036a3e6c8b5f56bf6c8b02dc962033c056931 Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Sun, 15 Dec 2024 19:12:25 +0700
Subject: [PATCH 434/455] chore: fix format with nightly

Fix formatting with nightly.

Without nightly, some of our `rustfmt.toml` rules aren't applied because they are not stable yet (e.g. our `group_imports` rule).
Our CI didn't catch it yet because it doesn't check fmt on nightly. Will fix that in a follow-up PR.

Pull-Request: #5742.
---
 libp2p/src/builder/phase.rs |  7 +++----
 swarm/src/lib.rs            | 11 +++++++----
 transports/dns/src/lib.rs   |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libp2p/src/builder/phase.rs b/libp2p/src/builder/phase.rs
index 5bb0d948fc1..f8f1672f952 100644
--- a/libp2p/src/builder/phase.rs
+++ b/libp2p/src/builder/phase.rs
@@ -16,23 +16,22 @@ mod websocket;
 
 use bandwidth_logging::*;
 use bandwidth_metrics::*;
+pub use behaviour::BehaviourError;
 use behaviour::*;
 use build::*;
 use dns::*;
 use libp2p_core::{muxing::StreamMuxerBox, Transport};
 use libp2p_identity::Keypair;
+pub use other_transport::TransportError;
 use other_transport::*;
 use provider::*;
 use quic::*;
 use relay::*;
 use swarm::*;
 use tcp::*;
-use websocket::*;
-
-pub use behaviour::BehaviourError;
-pub use other_transport::TransportError;
 #[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
 pub use websocket::WebsocketError;
+use websocket::*;
 
 use super::{
     select_muxer::SelectMuxerUpgrade, select_security::SelectSecurityUpgrade, SwarmBuilder,
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index a20d58b97fc..91513c83559 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -1497,14 +1497,17 @@ impl Config {
     ///
     /// Defaults to 10s.
     ///
-    /// Typically, you shouldn't _need_ to modify this default as connections will be kept alive whilst they are "in use" (see below).
-    /// Depending on the application's usecase, it may be desirable to keep connections alive despite them not being in use.
+    /// Typically, you shouldn't _need_ to modify this default as connections will be kept alive
+    /// whilst they are "in use" (see below). Depending on the application's usecase, it may be
+    /// desirable to keep connections alive despite them not being in use.
     ///
     /// A connection is considered idle if:
     /// - There are no active inbound streams.
     /// - There are no active outbounds streams.
-    /// - There are no pending outbound streams (i.e. all streams requested via [`ConnectionHandlerEvent::OutboundSubstreamRequest`] have completed).
-    /// - Every [`ConnectionHandler`] returns `false` from [`ConnectionHandler::connection_keep_alive`].
+    /// - There are no pending outbound streams (i.e. all streams requested via
+    ///   [`ConnectionHandlerEvent::OutboundSubstreamRequest`] have completed).
+    /// - Every [`ConnectionHandler`] returns `false` from
+    ///   [`ConnectionHandler::connection_keep_alive`].
     ///
     /// Once all these conditions are true, the idle connection timeout starts ticking.
     pub fn with_idle_connection_timeout(mut self, timeout: Duration) -> Self {
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index d777d54a5f2..7e3cf5d3c37 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -160,7 +160,7 @@ use async_trait::async_trait;
 use futures::{future::BoxFuture, prelude::*};
 pub use hickory_resolver::{
     config::{ResolverConfig, ResolverOpts},
-    {ResolveError, ResolveErrorKind},
+    ResolveError, ResolveErrorKind,
 };
 use hickory_resolver::{
     lookup::{Ipv4Lookup, Ipv6Lookup, TxtLookup},

From df85cff8a5405d336c0719aeb4cab624be28407a Mon Sep 17 00:00:00 2001
From: Tristav <124001124+Pricstas@users.noreply.github.com>
Date: Sun, 15 Dec 2024 17:51:24 +0100
Subject: [PATCH 435/455] chore(docs): fix typos in documentation

Pull-Request: #5744.
---
 docs/coding-guidelines.md        | 2 +-
 protocols/gossipsub/CHANGELOG.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/coding-guidelines.md b/docs/coding-guidelines.md
index bacbfe9509e..473d7020fcf 100644
--- a/docs/coding-guidelines.md
+++ b/docs/coding-guidelines.md
@@ -236,7 +236,7 @@ Concurrency adds complexity. Concurrency adds overhead due to synchronization.
 Thus unless proven to be a bottleneck, don't make things concurrent. As an example
 the hierarchical `NetworkBehaviour` state machine runs sequentially. It is easy
 to debug as it runs sequentially. Thus far there has been no proof that
-shows a speed up when running it concurrently.
+shows a speed-up when running it concurrently.
 
 ## Use `async/await` for sequential execution only
 
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 0bfee4d3e91..e9663c4c39c 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -246,7 +246,7 @@
 
 - Move from `open-metrics-client` to `prometheus-client` (see [PR 2442]).
 
-- Emit gossip of all non empty topics (see [PR 2481]).
+- Emit gossip of all non-empty topics (see [PR 2481]).
 
 - Merge NetworkBehaviour's inject_\* paired methods (see [PR 2445]).
 

From 54d7f21a6ef33677f7794ac6336efdd899ead11f Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Mon, 16 Dec 2024 17:11:53 +0700
Subject: [PATCH 436/455] chore(ci): check rustfmt with nightly toolchain

Some of our rustfmt rules aren't stable yet. Thus our rustfmt CI check should run on nightly.

Pull-Request: #5743.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a849da9c97..8b3817a7aa9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -317,7 +317,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
 

From 3be7104b83106f876fc96aff9e8835addfc61291 Mon Sep 17 00:00:00 2001
From: stormshield-frb <144998884+stormshield-frb@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:43:57 +0100
Subject: [PATCH 437/455] fix(kad): improve memory allocation when iterating
 over kbuckets

Proposal to fix https://github.com/libp2p/rust-libp2p/issues/5712.

I have changed to `ClosestIter` structure to only allocate when `kbucket_size` is higher than `K_VALUE` and only once along the life of `ClosestIter`. I think I did not break anything but I would really like some experienced people with Kademlia to take a look (@guillaumemichel :wink:).

Pull-Request: #5715.
---
 protocols/kad/CHANGELOG.md     |   2 +
 protocols/kad/src/behaviour.rs |   2 +
 protocols/kad/src/kbucket.rs   | 109 ++++++++++++++++++++++-----------
 3 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 22af5fb5074..71ef499a179 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 - Expose Distance private field U256 to public.
   See [PR 5705](https://github.com/libp2p/rust-libp2p/pull/5705).
+- Fix systematic memory allocation when iterating over `KBuckets`.
+  See [PR 5715](https://github.com/libp2p/rust-libp2p/pull/5715).
 
 ## 0.47.0
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 988a16dc41f..1ba8b1e27af 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -434,6 +434,8 @@ impl Config {
     /// Sets the configuration for the k-buckets.
     ///
     /// * Default to K_VALUE.
+    ///
+    /// **WARNING**: setting a `size` higher that `K_VALUE` may imply additional memory allocations.
     pub fn set_kbucket_size(&mut self, size: NonZeroUsize) -> &mut Self {
         self.kbucket_config.set_bucket_size(size);
         self
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
index 3f4b1281c3a..f32c34e9bb7 100644
--- a/protocols/kad/src/kbucket.rs
+++ b/protocols/kad/src/kbucket.rs
@@ -77,6 +77,7 @@ use std::{collections::VecDeque, num::NonZeroUsize, time::Duration};
 use bucket::KBucket;
 pub use bucket::NodeStatus;
 pub use entry::*;
+use smallvec::SmallVec;
 use web_time::Instant;
 
 /// Maximum number of k-buckets.
@@ -282,11 +283,8 @@ where
             iter: None,
             table: self,
             buckets_iter: ClosestBucketsIter::new(distance),
-            fmap: move |b: &KBucket<TKey, _>| -> Vec<_> {
-                let mut vec = Vec::with_capacity(bucket_size);
-                vec.extend(b.iter().map(|(n, _)| n.key.clone()));
-                vec
-            },
+            fmap: |(n, _status): (&Node<TKey, TVal>, NodeStatus)| n.key.clone(),
+            bucket_size,
         }
     }
 
@@ -307,15 +305,11 @@ where
             iter: None,
             table: self,
             buckets_iter: ClosestBucketsIter::new(distance),
-            fmap: move |b: &KBucket<_, TVal>| -> Vec<_> {
-                b.iter()
-                    .take(bucket_size)
-                    .map(|(n, status)| EntryView {
-                        node: n.clone(),
-                        status,
-                    })
-                    .collect()
+            fmap: |(n, status): (&Node<TKey, TVal>, NodeStatus)| EntryView {
+                node: n.clone(),
+                status,
             },
+            bucket_size,
         }
     }
 
@@ -358,10 +352,12 @@ struct ClosestIter<'a, TTarget, TKey, TVal, TMap, TOut> {
     /// distance of the local key to the target.
     buckets_iter: ClosestBucketsIter,
     /// The iterator over the entries in the currently traversed bucket.
-    iter: Option<std::vec::IntoIter<TOut>>,
+    iter: Option<ClosestIterBuffer<TOut>>,
     /// The projection function / mapping applied on each bucket as
     /// it is encountered, producing the next `iter`ator.
     fmap: TMap,
+    /// The maximal number of nodes that a bucket can contain.
+    bucket_size: usize,
 }
 
 /// An iterator over the bucket indices, in the order determined by the `Distance` of
@@ -463,41 +459,80 @@ where
     TTarget: AsRef<KeyBytes>,
     TKey: Clone + AsRef<KeyBytes>,
     TVal: Clone,
-    TMap: Fn(&KBucket<TKey, TVal>) -> Vec<TOut>,
+    TMap: Fn((&Node<TKey, TVal>, NodeStatus)) -> TOut,
     TOut: AsRef<KeyBytes>,
 {
     type Item = TOut;
 
     fn next(&mut self) -> Option<Self::Item> {
         loop {
-            match &mut self.iter {
-                Some(iter) => match iter.next() {
-                    Some(k) => return Some(k),
-                    None => self.iter = None,
-                },
-                None => {
-                    if let Some(i) = self.buckets_iter.next() {
-                        let bucket = &mut self.table.buckets[i.get()];
-                        if let Some(applied) = bucket.apply_pending() {
-                            self.table.applied_pending.push_back(applied)
-                        }
-                        let mut v = (self.fmap)(bucket);
-                        v.sort_by(|a, b| {
-                            self.target
-                                .as_ref()
-                                .distance(a.as_ref())
-                                .cmp(&self.target.as_ref().distance(b.as_ref()))
-                        });
-                        self.iter = Some(v.into_iter());
-                    } else {
-                        return None;
-                    }
+            let (mut buffer, bucket_index) = if let Some(mut iter) = self.iter.take() {
+                if let Some(next) = iter.next() {
+                    self.iter = Some(iter);
+                    return Some(next);
                 }
+
+                let bucket_index = self.buckets_iter.next()?;
+
+                // Reusing the same buffer so if there were any allocation, it only happen once over
+                // a `ClosestIter` life.
+                iter.buffer.clear();
+
+                (iter.buffer, bucket_index)
+            } else {
+                let bucket_index = self.buckets_iter.next()?;
+
+                // Allocation only occurs if `kbucket_size` is greater than `K_VALUE`.
+                (SmallVec::with_capacity(self.bucket_size), bucket_index)
+            };
+
+            let bucket = &mut self.table.buckets[bucket_index.get()];
+            if let Some(applied) = bucket.apply_pending() {
+                self.table.applied_pending.push_back(applied)
             }
+
+            buffer.extend(
+                bucket
+                    .iter()
+                    .take(self.bucket_size)
+                    .map(|e| (self.fmap)(e))
+                    .map(Some),
+            );
+            buffer.sort_by(|a, b| {
+                let a = a.as_ref().expect("just initialized");
+                let b = b.as_ref().expect("just initialized");
+                self.target
+                    .as_ref()
+                    .distance(a.as_ref())
+                    .cmp(&self.target.as_ref().distance(b.as_ref()))
+            });
+
+            self.iter = Some(ClosestIterBuffer::new(buffer));
         }
     }
 }
 
+struct ClosestIterBuffer<TOut> {
+    buffer: SmallVec<[Option<TOut>; K_VALUE.get()]>,
+    index: usize,
+}
+
+impl<TOut> ClosestIterBuffer<TOut> {
+    fn new(buffer: SmallVec<[Option<TOut>; K_VALUE.get()]>) -> Self {
+        Self { buffer, index: 0 }
+    }
+}
+
+impl<TOut> Iterator for ClosestIterBuffer<TOut> {
+    type Item = TOut;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let entry = self.buffer.get_mut(self.index)?;
+        self.index += 1;
+        entry.take()
+    }
+}
+
 /// A reference to a bucket.
 pub struct KBucketRef<'a, TKey, TVal> {
     index: BucketIndex,

From 6a6fa1224cd80af70f388b9811fcac6d9abaa954 Mon Sep 17 00:00:00 2001
From: argentpapa <argentpapa@proton.me>
Date: Wed, 18 Dec 2024 02:41:07 +0800
Subject: [PATCH 438/455] chore(spellchecker): fix typos in comment

- use spellchecker, and check false positive manually

```
codespell  -L crate,COMIT,comit  -S CHANGELOG.md
```
- maybe we can add typo checker in github action ref: https://github.com/codespell-project/actions-codespell

Pull-Request: #5750.
---
 protocols/kad/src/behaviour/test.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index bf7af0128f0..467865dd225 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -1381,7 +1381,7 @@ fn network_behaviour_on_address_change() {
         port_use: PortUse::Reuse,
     };
 
-    // Mimick a connection being established.
+    // Mimic a connection being established.
     kademlia.on_swarm_event(FromSwarm::ConnectionEstablished(ConnectionEstablished {
         peer_id: remote_peer_id,
         connection_id,
@@ -1403,7 +1403,7 @@ fn network_behaviour_on_address_change() {
         .unwrap()
         .is_empty());
 
-    // Mimick the connection handler confirming the protocol for
+    // Mimic the connection handler confirming the protocol for
     // the test connection, so that the peer is added to the routing table.
     kademlia.on_connection_handler_event(
         remote_peer_id,

From 503b1360af01a3a6a7aa116c6d8f09018007002b Mon Sep 17 00:00:00 2001
From: Dzmitry Kalabuk <d.kalabuk@subsquid.io>
Date: Wed, 18 Dec 2024 08:53:13 +0300
Subject: [PATCH 439/455] chore: add SQD Network to notable users list

SQD Network uses Libp2p and gossipsub protocol in particular to organize a decentralized network of p2p workers that provide fast access to stored data.

Pull-Request: #5749.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d818c6ba7b4..24e88f62751 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,7 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 - [OpenMina](https://github.com/openmina/openmina) - In-browser Mina Rust implementation.
 - [rust-ipfs](https://github.com/rs-ipfs/rust-ipfs) - IPFS implementation in Rust.
 - [Safe Network](https://github.com/maidsafe/safe_network) - Safe Network implementation in Rust.
+- [SQD Network](https://github.com/subsquid/sqd-network) - A decentralized storage for Web3 data.
 - [Starcoin](https://github.com/starcoinorg/starcoin) - A smart contract blockchain network that scales by layering.
 - [Subspace](https://github.com/subspace/subspace) - Subspace Network reference implementation
 - [Substrate](https://github.com/paritytech/substrate) - Framework for blockchain innovation,

From bd710df61aa91c759885ae72d08303fc51896848 Mon Sep 17 00:00:00 2001
From: hopinheimer <48147533+hopinheimer@users.noreply.github.com>
Date: Mon, 23 Dec 2024 02:32:04 -0500
Subject: [PATCH 440/455] feat(mdns): emit `ToSwarm::NewExternalAddrOfPeer` on
 discovery

fixes #5104 and superseeds #5179

Pull-Request: #5753.
---
 Cargo.lock                      |   2 +-
 Cargo.toml                      |   2 +-
 protocols/mdns/CHANGELOG.md     |   5 +
 protocols/mdns/Cargo.toml       |   2 +-
 protocols/mdns/src/behaviour.rs | 178 ++++++++++++++++++--------------
 5 files changed, 111 insertions(+), 78 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 31df58e8ec4..43bcd4c8689 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2985,7 +2985,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.46.1"
+version = "0.46.2"
 dependencies = [
  "async-io",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index c77768db311..7a116949bcc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.46.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
 libp2p-kad = { version = "0.47.1", path = "protocols/kad" }
-libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" }
+libp2p-mdns = { version = "0.46.2", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md
index 61290703c34..98dc3d55454 100644
--- a/protocols/mdns/CHANGELOG.md
+++ b/protocols/mdns/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.46.2
+
+- Emit `ToSwarm::NewExternalAddrOfPeer` on discovery.
+  See [PR 5753](https://github.com/libp2p/rust-libp2p/pull/5753)
+
 ## 0.46.1
 
 - Upgrade `hickory-proto`.
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 16436848efe..618d41e9b9d 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-mdns"
 edition = "2021"
 rust-version = { workspace = true }
-version = "0.46.1"
+version = "0.46.2"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
diff --git a/protocols/mdns/src/behaviour.rs b/protocols/mdns/src/behaviour.rs
index b6dde8f4487..68e28cf3d63 100644
--- a/protocols/mdns/src/behaviour.rs
+++ b/protocols/mdns/src/behaviour.rs
@@ -24,7 +24,11 @@ mod timer;
 
 use std::{
     cmp,
-    collections::hash_map::{Entry, HashMap},
+    collections::{
+        hash_map::{Entry, HashMap},
+        VecDeque,
+    },
+    convert::Infallible,
     fmt,
     future::Future,
     io,
@@ -188,6 +192,9 @@ where
     listen_addresses: Arc<RwLock<ListenAddresses>>,
 
     local_peer_id: PeerId,
+
+    /// Pending behaviour events to be emitted.
+    pending_events: VecDeque<ToSwarm<Event, Infallible>>,
 }
 
 impl<P> Behaviour<P>
@@ -208,6 +215,7 @@ where
             closest_expiration: Default::default(),
             listen_addresses: Default::default(),
             local_peer_id,
+            pending_events: Default::default(),
         })
     }
 
@@ -304,93 +312,113 @@ where
         &mut self,
         cx: &mut Context<'_>,
     ) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
-        // Poll ifwatch.
-        while let Poll::Ready(Some(event)) = Pin::new(&mut self.if_watch).poll_next(cx) {
-            match event {
-                Ok(IfEvent::Up(inet)) => {
-                    let addr = inet.addr();
-                    if addr.is_loopback() {
-                        continue;
-                    }
-                    if addr.is_ipv4() && self.config.enable_ipv6
-                        || addr.is_ipv6() && !self.config.enable_ipv6
-                    {
-                        continue;
-                    }
-                    if let Entry::Vacant(e) = self.if_tasks.entry(addr) {
-                        match InterfaceState::<P::Socket, P::Timer>::new(
-                            addr,
-                            self.config.clone(),
-                            self.local_peer_id,
-                            self.listen_addresses.clone(),
-                            self.query_response_sender.clone(),
-                        ) {
-                            Ok(iface_state) => {
-                                e.insert(P::spawn(iface_state));
-                            }
-                            Err(err) => {
-                                tracing::error!("failed to create `InterfaceState`: {}", err)
+        loop {
+            // Check for pending events and emit them.
+            if let Some(event) = self.pending_events.pop_front() {
+                return Poll::Ready(event);
+            }
+
+            // Poll ifwatch.
+            while let Poll::Ready(Some(event)) = Pin::new(&mut self.if_watch).poll_next(cx) {
+                match event {
+                    Ok(IfEvent::Up(inet)) => {
+                        let addr = inet.addr();
+                        if addr.is_loopback() {
+                            continue;
+                        }
+                        if addr.is_ipv4() && self.config.enable_ipv6
+                            || addr.is_ipv6() && !self.config.enable_ipv6
+                        {
+                            continue;
+                        }
+                        if let Entry::Vacant(e) = self.if_tasks.entry(addr) {
+                            match InterfaceState::<P::Socket, P::Timer>::new(
+                                addr,
+                                self.config.clone(),
+                                self.local_peer_id,
+                                self.listen_addresses.clone(),
+                                self.query_response_sender.clone(),
+                            ) {
+                                Ok(iface_state) => {
+                                    e.insert(P::spawn(iface_state));
+                                }
+                                Err(err) => {
+                                    tracing::error!("failed to create `InterfaceState`: {}", err)
+                                }
                             }
                         }
                     }
-                }
-                Ok(IfEvent::Down(inet)) => {
-                    if let Some(handle) = self.if_tasks.remove(&inet.addr()) {
-                        tracing::info!(instance=%inet.addr(), "dropping instance");
+                    Ok(IfEvent::Down(inet)) => {
+                        if let Some(handle) = self.if_tasks.remove(&inet.addr()) {
+                            tracing::info!(instance=%inet.addr(), "dropping instance");
 
-                        handle.abort();
+                            handle.abort();
+                        }
                     }
+                    Err(err) => tracing::error!("if watch returned an error: {}", err),
                 }
-                Err(err) => tracing::error!("if watch returned an error: {}", err),
             }
-        }
-        // Emit discovered event.
-        let mut discovered = Vec::new();
-
-        while let Poll::Ready(Some((peer, addr, expiration))) =
-            self.query_response_receiver.poll_next_unpin(cx)
-        {
-            if let Some((_, _, cur_expires)) = self
-                .discovered_nodes
-                .iter_mut()
-                .find(|(p, a, _)| *p == peer && *a == addr)
+            // Emit discovered event.
+            let mut discovered = Vec::new();
+
+            while let Poll::Ready(Some((peer, addr, expiration))) =
+                self.query_response_receiver.poll_next_unpin(cx)
             {
-                *cur_expires = cmp::max(*cur_expires, expiration);
-            } else {
-                tracing::info!(%peer, address=%addr, "discovered peer on address");
-                self.discovered_nodes.push((peer, addr.clone(), expiration));
-                discovered.push((peer, addr));
+                if let Some((_, _, cur_expires)) = self
+                    .discovered_nodes
+                    .iter_mut()
+                    .find(|(p, a, _)| *p == peer && *a == addr)
+                {
+                    *cur_expires = cmp::max(*cur_expires, expiration);
+                } else {
+                    tracing::info!(%peer, address=%addr, "discovered peer on address");
+                    self.discovered_nodes.push((peer, addr.clone(), expiration));
+                    discovered.push((peer, addr.clone()));
+
+                    self.pending_events
+                        .push_back(ToSwarm::NewExternalAddrOfPeer {
+                            peer_id: peer,
+                            address: addr,
+                        });
+                }
             }
-        }
 
-        if !discovered.is_empty() {
-            let event = Event::Discovered(discovered);
-            return Poll::Ready(ToSwarm::GenerateEvent(event));
-        }
-        // Emit expired event.
-        let now = Instant::now();
-        let mut closest_expiration = None;
-        let mut expired = Vec::new();
-        self.discovered_nodes.retain(|(peer, addr, expiration)| {
-            if *expiration <= now {
-                tracing::info!(%peer, address=%addr, "expired peer on address");
-                expired.push((*peer, addr.clone()));
-                return false;
+            if !discovered.is_empty() {
+                let event = Event::Discovered(discovered);
+                // Push to the front of the queue so that the behavior event is reported before
+                // the individual discovered addresses.
+                self.pending_events
+                    .push_front(ToSwarm::GenerateEvent(event));
+                continue;
+            }
+            // Emit expired event.
+            let now = Instant::now();
+            let mut closest_expiration = None;
+            let mut expired = Vec::new();
+            self.discovered_nodes.retain(|(peer, addr, expiration)| {
+                if *expiration <= now {
+                    tracing::info!(%peer, address=%addr, "expired peer on address");
+                    expired.push((*peer, addr.clone()));
+                    return false;
+                }
+                closest_expiration =
+                    Some(closest_expiration.unwrap_or(*expiration).min(*expiration));
+                true
+            });
+            if !expired.is_empty() {
+                let event = Event::Expired(expired);
+                self.pending_events.push_back(ToSwarm::GenerateEvent(event));
+                continue;
+            }
+            if let Some(closest_expiration) = closest_expiration {
+                let mut timer = P::Timer::at(closest_expiration);
+                let _ = Pin::new(&mut timer).poll_next(cx);
+
+                self.closest_expiration = Some(timer);
             }
-            closest_expiration = Some(closest_expiration.unwrap_or(*expiration).min(*expiration));
-            true
-        });
-        if !expired.is_empty() {
-            let event = Event::Expired(expired);
-            return Poll::Ready(ToSwarm::GenerateEvent(event));
-        }
-        if let Some(closest_expiration) = closest_expiration {
-            let mut timer = P::Timer::at(closest_expiration);
-            let _ = Pin::new(&mut timer).poll_next(cx);
 
-            self.closest_expiration = Some(timer);
+            return Poll::Pending;
         }
-        Poll::Pending
     }
 }
 

From cddb7d6b7d1b85a3334a76a063a777b17f9f7d8e Mon Sep 17 00:00:00 2001
From: crStiv <cryptostiv7@gmail.com>
Date: Tue, 24 Dec 2024 00:34:31 +0100
Subject: [PATCH 441/455] fix: multiple typos of different importance

This pull request addresses several typos and minor grammatical inconsistencies found across multiple files in the repository. The fixes aim to improve clarity, readability, and maintain consistency in the project's documentation and workflows.

### Key Changes:
- **`.github/ISSUE_TEMPLATE/bug_report.yml`**:
- Fixed grammatical issues in descriptions and labels.
- **`.github/ISSUE_TEMPLATE/enhancement.yml`**:
- Corrected label text and standardized phrasing.
- **`.github/ISSUE_TEMPLATE/feature_request.yml`**:
- Improved label consistency and readability.
- **`.github/pull_request_template.md`**:
- Enhanced phrasing and corrected minor grammatical errors.
- **`.github/workflows/ci.yml`**:
- Adjusted text to ensure consistent phrasing and clarity in workflow steps.

These updates ensure a more professional and coherent presentation across the project documentation and workflows.

Pull-Request: #5756.
---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 8 ++++----
 .github/ISSUE_TEMPLATE/enhancement.yml     | 4 ++--
 .github/ISSUE_TEMPLATE/feature_request.yml | 4 ++--
 .github/pull_request_template.md           | 4 ++--
 .github/workflows/ci.yml                   | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 1a531e3646c..40131a47a17 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -9,7 +9,7 @@ body:
   - type: textarea
     attributes:
       label: Summary
-      description: Please provide a short summary of the bug, along with any information you feel relevant to replicate the bug.
+      description: Please provide a short summary of the bug, along with any information you feel is relevant to replicate the bug.
     validations:
       required: true
   - type: textarea
@@ -34,7 +34,7 @@ body:
   - type: textarea
     attributes:
       label:  Possible Solution
-      description: Suggest a fix/reason for the bug, or ideas how to implement the addition or change. 
+      description: Suggest a fix/reason for the bug, or ideas on how to implement the addition or change. 
     validations:
       required: false
   - type: textarea
@@ -45,11 +45,11 @@ body:
       required: false
   - type: dropdown
     attributes:
-      label: Would you like to work on fixing this bug ?
+      label: Would you like to work on fixing this bug?
       description: Any contribution towards fixing the bug is greatly appreciated. We are more than happy to provide help on the process.
       options:
         - "Yes"
         - "No"
         - Maybe
     validations:
-      required: true
\ No newline at end of file
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index ed7aeb644b3..05330cf071c 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -21,11 +21,11 @@ body:
       required: true
   - type: dropdown
     attributes:
-      label: Are you planning to do it yourself in a pull request ?
+      label: Are you planning to do it yourself in a pull request?
       description: Any contribution is greatly appreciated. We are more than happy to provide help on the process.
       options:
         - "Yes"
         - "No"
         - Maybe
     validations:
-      required: true
\ No newline at end of file
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 6fa3e638be8..45e1da2cad0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -32,11 +32,11 @@ body:
       required: false
   - type: dropdown
     attributes:
-      label: Are you planning to do it yourself in a pull request ?
+      label: Are you planning to do it yourself in a pull request?
       description: Any contribution is greatly appreciated. We are more than happy to provide help on the process.
       options:
         - "Yes"
         - "No"
         - Maybe
     validations:
-      required: true
\ No newline at end of file
+      required: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 90e8b2cda53..24eb1b75b2c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -6,7 +6,7 @@ This section will appear as the commit message after merging.
 Please craft it accordingly.
 For a quick primer on good commit messages, check out this blog post: https://cbea.ms/git-commit/
 
-Please include any relevant issues in here, for example:
+Please include any relevant issues here, for example:
 
 Related https://github.com/libp2p/rust-libp2p/issues/ABCD.
 Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
@@ -15,7 +15,7 @@ Fixes https://github.com/libp2p/rust-libp2p/issues/XYZ.
 ## Notes & open questions
 
 <!--
-Any notes, remarks or open questions you have to make about the PR which don't need to go into the final commit message.
+Any notes, remarks, or open questions you have to make about the PR that don't need to go into the final commit message.
 -->
 
 ## Change checklist
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b3817a7aa9..f8cff086990 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
 
           echo "CRATE_VERSION=$CRATE_VERSION" >> $GITHUB_ENV
 
-      - name: Enforce version in `workspace.dependencies` matches latest version
+      - name: Enforce version in `workspace.dependencies` matches the latest version
         if: env.CRATE != 'libp2p'
         run: |
           SPECIFIED_VERSION=$(tq "workspace.dependencies.$CRATE.version" --file ./Cargo.toml)
@@ -77,7 +77,7 @@ jobs:
 
           test "$CRATE_VERSION" = "$SPECIFIED_VERSION" || test "=$CRATE_VERSION" = "$SPECIFIED_VERSION"
 
-      - name: Enforce version in CHANGELOG.md matches version in manifest
+      - name: Enforce version in CHANGELOG.md matches the version in manifest
         run: |
           MANIFEST_PATH=$(cargo metadata --format-version=1 --no-deps | jq -e -r '.packages[] | select(.name == "'"$CRATE"'") | .manifest_path')
           DIR_TO_CRATE=$(dirname "$MANIFEST_PATH")

From 7590ab2de72758f8ae92adc59567191007514831 Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Tue, 24 Dec 2024 17:14:24 +0800
Subject: [PATCH 442/455] chore(deps): remove unused deps

Remove unused dependencies

(Not sure how to bump `libp2p-identity` and `libp2p-swarm-derive` versions in a PR)

Pull-Request: #5747.
---
 Cargo.lock                                    | 106 +++---------------
 Cargo.toml                                    |   2 +
 core/Cargo.toml                               |   5 +-
 examples/autonat/Cargo.toml                   |   1 -
 examples/autonatv2/Cargo.toml                 |   4 +-
 examples/chat/Cargo.toml                      |   2 -
 examples/dcutr/Cargo.toml                     |   1 -
 .../distributed-key-value-store/Cargo.toml    |   2 -
 examples/file-sharing/Cargo.toml              |   1 -
 examples/identify/Cargo.toml                  |   1 -
 examples/ipfs-kad/Cargo.toml                  |   3 -
 examples/ipfs-private/Cargo.toml              |   2 -
 examples/ping/Cargo.toml                      |   1 -
 examples/relay-server/Cargo.toml              |   1 -
 hole-punching-tests/Cargo.toml                |   2 +-
 identity/Cargo.toml                           |   1 -
 interop-tests/Cargo.toml                      |   1 -
 libp2p/Cargo.toml                             |   4 +-
 misc/keygen/Cargo.toml                        |   1 -
 misc/memory-connection-limits/Cargo.toml      |   2 -
 misc/multistream-select/Cargo.toml            |   1 -
 misc/server/Cargo.toml                        |   4 +-
 misc/server/src/config.rs                     |   2 +-
 misc/webrtc-utils/Cargo.toml                  |   1 -
 protocols/autonat/Cargo.toml                  |   3 +-
 protocols/dcutr/Cargo.toml                    |   5 -
 protocols/gossipsub/Cargo.toml                |   6 +-
 protocols/identify/Cargo.toml                 |   1 -
 protocols/kad/Cargo.toml                      |   1 -
 protocols/mdns/Cargo.toml                     |   4 -
 protocols/perf/Cargo.toml                     |   3 -
 protocols/ping/Cargo.toml                     |   2 -
 protocols/rendezvous/Cargo.toml               |   5 -
 protocols/request-response/Cargo.toml         |   5 -
 swarm-derive/Cargo.toml                       |   1 -
 swarm-test/Cargo.toml                         |   1 -
 swarm/Cargo.toml                              |   2 +-
 transports/noise/Cargo.toml                   |   2 -
 transports/plaintext/Cargo.toml               |   1 -
 transports/quic/Cargo.toml                    |   2 -
 transports/tcp/Cargo.toml                     |   2 -
 transports/tls/Cargo.toml                     |   1 -
 transports/webrtc-websys/Cargo.toml           |   2 +-
 transports/webrtc/Cargo.toml                  |   3 -
 transports/websocket-websys/Cargo.toml        |   1 -
 wasm-tests/webtransport-tests/Cargo.toml      |   2 +-
 46 files changed, 31 insertions(+), 175 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 43bcd4c8689..a0303989154 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -102,9 +102,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.1"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
@@ -158,12 +158,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "asn1-rs"
 version = "0.5.2"
@@ -543,7 +537,6 @@ dependencies = [
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -554,7 +547,6 @@ dependencies = [
  "cfg-if",
  "clap",
  "libp2p",
- "opentelemetry 0.21.0",
  "opentelemetry-jaeger",
  "opentelemetry_sdk 0.21.2",
  "rand 0.8.5",
@@ -891,11 +883,9 @@ dependencies = [
 name = "chat-example"
 version = "0.1.0"
 dependencies = [
- "async-trait",
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -1268,7 +1258,6 @@ dependencies = [
  "futures",
  "futures-timer",
  "libp2p",
- "log",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -1378,11 +1367,9 @@ dependencies = [
 name = "distributed-key-value-store-example"
 version = "0.1.0"
 dependencies = [
- "async-trait",
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -1479,6 +1466,16 @@ dependencies = [
  "syn 2.0.89",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.8.4"
@@ -1491,15 +1488,15 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
  "humantime",
- "is-terminal",
  "log",
- "regex",
- "termcolor",
 ]
 
 [[package]]
@@ -1597,7 +1594,6 @@ dependencies = [
  "libp2p",
  "serde",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -2052,7 +2048,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "either",
- "env_logger 0.10.2",
+ "env_logger 0.11.5",
  "futures",
  "libp2p",
  "redis",
@@ -2353,7 +2349,6 @@ dependencies = [
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -2495,7 +2490,6 @@ dependencies = [
  "anyhow",
  "axum",
  "console_error_panic_hook",
- "either",
  "futures",
  "futures-timer",
  "libp2p",
@@ -2539,13 +2533,10 @@ name = "ipfs-kad-example"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "async-trait",
  "clap",
- "env_logger 0.10.2",
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -2553,12 +2544,10 @@ dependencies = [
 name = "ipfs-private-example"
 version = "0.1.0"
 dependencies = [
- "async-trait",
  "either",
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -2624,7 +2613,6 @@ version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "clap",
- "libp2p-core",
  "libp2p-identity",
  "serde",
  "serde_json",
@@ -2657,9 +2645,7 @@ name = "libp2p"
 version = "0.54.2"
 dependencies = [
  "async-std",
- "async-trait",
  "bytes",
- "clap",
  "either",
  "futures",
  "futures-timer",
@@ -2722,7 +2708,6 @@ version = "0.13.2"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
- "bytes",
  "either",
  "futures",
  "futures-bounded",
@@ -2779,11 +2764,8 @@ dependencies = [
  "parking_lot",
  "pin-project",
  "quick-protobuf",
- "quickcheck-ext",
  "rand 0.8.5",
  "rw-stream-sink",
- "serde",
- "smallvec",
  "thiserror 2.0.3",
  "tracing",
  "unsigned-varint 0.8.0",
@@ -2795,17 +2777,13 @@ name = "libp2p-dcutr"
 version = "0.12.1"
 dependencies = [
  "asynchronous-codec",
- "clap",
  "either",
  "futures",
  "futures-bounded",
  "futures-timer",
  "libp2p-core",
- "libp2p-dns",
  "libp2p-identify",
  "libp2p-identity",
- "libp2p-noise",
- "libp2p-ping",
  "libp2p-plaintext",
  "libp2p-relay",
  "libp2p-swarm",
@@ -2815,7 +2793,6 @@ dependencies = [
  "lru",
  "quick-protobuf",
  "quick-protobuf-codec",
- "rand 0.8.5",
  "thiserror 2.0.3",
  "tokio",
  "tracing",
@@ -2875,14 +2852,11 @@ dependencies = [
  "futures",
  "futures-timer",
  "getrandom 0.2.15",
- "hex",
  "hex_fmt",
  "libp2p-core",
  "libp2p-identity",
- "libp2p-noise",
  "libp2p-swarm",
  "libp2p-swarm-test",
- "libp2p-yamux",
  "prometheus-client",
  "quick-protobuf",
  "quick-protobuf-codec",
@@ -2891,7 +2865,6 @@ dependencies = [
  "regex",
  "serde",
  "sha2 0.10.8",
- "smallvec",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -2912,7 +2885,6 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
- "lru",
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
@@ -2926,7 +2898,6 @@ name = "libp2p-identity"
 version = "0.2.10"
 dependencies = [
  "asn1_der",
- "base64 0.22.1",
  "bs58",
  "criterion",
  "ed25519-dalek",
@@ -2953,7 +2924,6 @@ dependencies = [
 name = "libp2p-kad"
 version = "0.47.1"
 dependencies = [
- "arrayvec",
  "async-std",
  "asynchronous-codec",
  "bytes",
@@ -2989,17 +2959,13 @@ version = "0.46.2"
 dependencies = [
  "async-io",
  "async-std",
- "data-encoding",
  "futures",
  "hickory-proto",
  "if-watch",
  "libp2p-core",
  "libp2p-identity",
- "libp2p-noise",
  "libp2p-swarm",
  "libp2p-swarm-test",
- "libp2p-tcp",
- "libp2p-yamux",
  "rand 0.8.5",
  "smallvec",
  "socket2",
@@ -3012,7 +2978,6 @@ dependencies = [
 name = "libp2p-memory-connection-limits"
 version = "0.3.1"
 dependencies = [
- "async-std",
  "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
@@ -3020,7 +2985,6 @@ dependencies = [
  "libp2p-swarm-derive",
  "libp2p-swarm-test",
  "memory-stats",
- "rand 0.8.5",
  "sysinfo",
  "tracing",
 ]
@@ -3085,7 +3049,6 @@ version = "0.45.1"
 dependencies = [
  "asynchronous-codec",
  "bytes",
- "curve25519-dalek",
  "futures",
  "futures_ringbuf",
  "libp2p-core",
@@ -3096,7 +3059,6 @@ dependencies = [
  "quick-protobuf",
  "quickcheck-ext",
  "rand 0.8.5",
- "sha2 0.10.8",
  "snow",
  "static_assertions",
  "thiserror 2.0.3",
@@ -3117,15 +3079,12 @@ dependencies = [
  "futures-timer",
  "libp2p",
  "libp2p-core",
- "libp2p-dns",
  "libp2p-identity",
- "libp2p-quic",
  "libp2p-swarm",
  "libp2p-swarm-test",
  "libp2p-tcp",
  "libp2p-tls",
  "libp2p-yamux",
- "rand 0.8.5",
  "serde",
  "serde_json",
  "thiserror 2.0.3",
@@ -3139,7 +3098,6 @@ dependencies = [
 name = "libp2p-ping"
 version = "0.45.1"
 dependencies = [
- "either",
  "futures",
  "futures-timer",
  "libp2p-core",
@@ -3150,7 +3108,6 @@ dependencies = [
  "rand 0.8.5",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "web-time 1.1.0",
 ]
 
@@ -3167,7 +3124,6 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "quickcheck-ext",
- "rand 0.8.5",
  "tracing",
  "tracing-subscriber",
 ]
@@ -3198,7 +3154,6 @@ name = "libp2p-quic"
 version = "0.11.2"
 dependencies = [
  "async-std",
- "bytes",
  "futures",
  "futures-timer",
  "if-watch",
@@ -3209,7 +3164,6 @@ dependencies = [
  "libp2p-tcp",
  "libp2p-tls",
  "libp2p-yamux",
- "parking_lot",
  "quickcheck",
  "quinn",
  "rand 0.8.5",
@@ -3260,15 +3214,10 @@ dependencies = [
  "futures",
  "futures-timer",
  "libp2p-core",
- "libp2p-identify",
  "libp2p-identity",
- "libp2p-noise",
- "libp2p-ping",
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-swarm-test",
- "libp2p-tcp",
- "libp2p-yamux",
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
@@ -3289,22 +3238,17 @@ dependencies = [
  "cbor4ii",
  "futures",
  "futures-bounded",
- "futures-timer",
  "futures_ringbuf",
  "libp2p-core",
  "libp2p-identity",
- "libp2p-noise",
  "libp2p-swarm",
  "libp2p-swarm-test",
- "libp2p-tcp",
- "libp2p-yamux",
  "rand 0.8.5",
  "serde",
  "serde_json",
  "smallvec",
  "tracing",
  "tracing-subscriber",
- "web-time 1.1.0",
 ]
 
 [[package]]
@@ -3315,11 +3259,9 @@ dependencies = [
  "base64 0.22.1",
  "clap",
  "futures",
- "futures-timer",
  "libp2p",
  "prometheus-client",
  "serde",
- "serde_derive",
  "serde_json",
  "tokio",
  "tracing",
@@ -3381,7 +3323,6 @@ name = "libp2p-swarm-derive"
 version = "0.35.0"
 dependencies = [
  "heck 0.5.0",
- "proc-macro2",
  "quote",
  "syn 2.0.89",
 ]
@@ -3399,7 +3340,6 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-tcp",
  "libp2p-yamux",
- "rand 0.8.5",
  "tracing",
 ]
 
@@ -3414,7 +3354,6 @@ dependencies = [
  "if-watch",
  "libc",
  "libp2p-core",
- "libp2p-identity",
  "socket2",
  "tokio",
  "tracing",
@@ -3427,7 +3366,6 @@ version = "0.5.0"
 dependencies = [
  "futures",
  "futures-rustls",
- "hex",
  "hex-literal",
  "libp2p-core",
  "libp2p-identity",
@@ -3473,7 +3411,6 @@ name = "libp2p-webrtc"
 version = "0.8.0-alpha"
 dependencies = [
  "async-trait",
- "bytes",
  "futures",
  "futures-timer",
  "hex",
@@ -3486,10 +3423,8 @@ dependencies = [
  "quickcheck",
  "rand 0.8.5",
  "rcgen",
- "serde",
  "stun 0.6.0",
  "thiserror 2.0.3",
- "tinytemplate",
  "tokio",
  "tokio-util",
  "tracing",
@@ -3514,7 +3449,6 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "sha2 0.10.8",
- "thiserror 2.0.3",
  "tinytemplate",
  "tracing",
 ]
@@ -3573,7 +3507,6 @@ dependencies = [
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-yamux",
- "parking_lot",
  "send_wrapper 0.6.0",
  "thiserror 2.0.3",
  "tracing",
@@ -3912,7 +3845,6 @@ dependencies = [
  "futures_ringbuf",
  "pin-project",
  "quickcheck-ext",
- "rand 0.8.5",
  "rw-stream-sink",
  "smallvec",
  "tracing",
@@ -4463,7 +4395,6 @@ dependencies = [
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -4976,7 +4907,6 @@ dependencies = [
  "futures",
  "libp2p",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 7a116949bcc..039281f5346 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -117,9 +117,11 @@ libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
 # External dependencies
 async-std-resolver = { version = "0.25.0-alpha.4", default-features = false }
 asynchronous-codec = { version = "0.7.0" }
+env_logger = "0.11"
 futures = "0.3.30"
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
+getrandom = "0.2"
 hickory-proto = { version = "0.25.0-alpha.4", default-features = false }
 hickory-resolver = { version = "0.25.0-alpha.4", default-features = false }
 multiaddr = "0.18.1"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 8ec0b0fc197..162800b96c2 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -26,8 +26,6 @@ pin-project = "1.1.5"
 quick-protobuf = "0.8"
 rand = "0.8"
 rw-stream-sink = { workspace = true }
-serde = { version = "1", optional = true, features = ["derive"] }
-smallvec = "1.13.2"
 thiserror = { workspace = true }
 tracing = { workspace = true }
 unsigned-varint = { workspace = true }
@@ -37,11 +35,10 @@ async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-mplex = { path = "../muxers/mplex" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 libp2p-noise = { path = "../transports/noise" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 multihash = { workspace = true, features = ["arb"] }
-quickcheck = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rand"] }
 
 [features]
-serde = ["multihash/serde-codec", "dep:serde", "libp2p-identity/serde"]
+serde = ["multihash/serde-codec", "libp2p-identity/serde"]
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
index 010b76623e0..7c06b48a105 100644
--- a/examples/autonat/Cargo.toml
+++ b/examples/autonat/Cargo.toml
@@ -13,7 +13,6 @@ tokio = { workspace = true, features = ["full"] }
 clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/autonatv2/Cargo.toml b/examples/autonatv2/Cargo.toml
index 6c862ee22e4..67e74d67a22 100644
--- a/examples/autonatv2/Cargo.toml
+++ b/examples/autonatv2/Cargo.toml
@@ -21,15 +21,13 @@ tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 rand = "0.8.5"
-opentelemetry = { version = "0.21.0", optional = true }
 opentelemetry_sdk = { version = "0.21.1", optional = true, features = ["rt-tokio"] }
 tracing-opentelemetry = { version = "0.22.0", optional = true }
 opentelemetry-jaeger = { version = "0.20.0", optional = true, features = ["rt-tokio"] }
 cfg-if = "1.0.0"
 
 [features]
-jaeger = ["opentelemetry", "opentelemetry_sdk", "tracing-opentelemetry", "opentelemetry-jaeger"]
-opentelemetry = ["dep:opentelemetry"]
+jaeger = ["opentelemetry_sdk", "tracing-opentelemetry", "opentelemetry-jaeger"]
 opentelemetry_sdk = ["dep:opentelemetry_sdk"]
 tracing-opentelemetry = ["dep:tracing-opentelemetry"]
 opentelemetry-jaeger = ["dep:opentelemetry-jaeger"]
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
index a1d32956825..031f84b6f95 100644
--- a/examples/chat/Cargo.toml
+++ b/examples/chat/Cargo.toml
@@ -10,10 +10,8 @@ release = false
 
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
-async-trait = "0.1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
index c1b4bbc6e7e..67edf04e2b0 100644
--- a/examples/dcutr/Cargo.toml
+++ b/examples/dcutr/Cargo.toml
@@ -13,7 +13,6 @@ clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
-log = "0.4"
 tokio = { workspace = true, features = ["macros", "net", "rt", "signal"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
index 3846e54c8d3..8e30dd2c75d 100644
--- a/examples/distributed-key-value-store/Cargo.toml
+++ b/examples/distributed-key-value-store/Cargo.toml
@@ -10,10 +10,8 @@ release = false
 
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
-async-trait = "0.1"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
index d098ce44317..021215c003b 100644
--- a/examples/file-sharing/Cargo.toml
+++ b/examples/file-sharing/Cargo.toml
@@ -14,7 +14,6 @@ tokio = { workspace = true, features = ["full"] }
 clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
index 8d12699afa7..c18f71a0386 100644
--- a/examples/identify/Cargo.toml
+++ b/examples/identify/Cargo.toml
@@ -12,7 +12,6 @@ release = false
 tokio = { version = "1.37.0", features = ["full"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["identify", "noise", "tcp", "tokio", "yamux"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
index 115c604269f..fa04da4edcf 100644
--- a/examples/ipfs-kad/Cargo.toml
+++ b/examples/ipfs-kad/Cargo.toml
@@ -10,13 +10,10 @@ release = false
 
 [dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-async-trait = "0.1"
 clap = { version = "4.5.6", features = ["derive"] }
-env_logger = "0.10"
 futures = { workspace = true }
 anyhow = "1.0.86"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
index 0813dba56e0..4dfe596d609 100644
--- a/examples/ipfs-private/Cargo.toml
+++ b/examples/ipfs-private/Cargo.toml
@@ -10,11 +10,9 @@ release = false
 
 [dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] }
-async-trait = "0.1"
 either = "1.12"
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index 633f043de56..acc3b2affed 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -12,7 +12,6 @@ release = false
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
 tokio = { workspace = true, features = ["full"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
index 7385cf6c033..3bdaf89b04f 100644
--- a/examples/relay-server/Cargo.toml
+++ b/examples/relay-server/Cargo.toml
@@ -13,7 +13,6 @@ clap = { version = "4.5.6", features = ["derive"] }
 tokio = { version = "1.37.0", features = ["full"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
-tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
index 79728f9535c..c4f36d2a990 100644
--- a/hole-punching-tests/Cargo.toml
+++ b/hole-punching-tests/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 
 [dependencies]
 anyhow = "1"
-env_logger = "0.10.2"
+env_logger = { workspace = true }
 futures = { workspace = true }
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = { workspace = true }
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
index cc41abb3e24..b13229c5826 100644
--- a/identity/Cargo.toml
+++ b/identity/Cargo.toml
@@ -41,7 +41,6 @@ rand = ["dep:rand", "ed25519-dalek?/rand_core"]
 
 [dev-dependencies]
 quickcheck = { workspace = true }
-base64 = "0.22.1"
 serde_json = "1.0"
 rmp-serde = "1.3"
 criterion = "0.5"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
index 0eb32bb4975..8f12275668d 100644
--- a/interop-tests/Cargo.toml
+++ b/interop-tests/Cargo.toml
@@ -13,7 +13,6 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 anyhow = "1"
-either = "1.11.0"
 futures = { workspace = true }
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
index 3d44e0bc43c..ae23dcf0db5 100644
--- a/libp2p/Cargo.toml
+++ b/libp2p/Cargo.toml
@@ -94,7 +94,7 @@ bytes = "1"
 either = "1.9.0"
 futures = { workspace = true }
 futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature
-getrandom = "0.2.3"     # Explicit dependency to be used in `wasm-bindgen` feature
+getrandom = { workspace = true } # Explicit dependency to be used in `wasm-bindgen` feature
 # TODO feature flag?
 rw-stream-sink = { workspace = true }
 
@@ -137,8 +137,6 @@ libp2p-websocket = { workspace = true, optional = true }
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
-async-trait = "0.1"
-clap = { version = "4.1.6", features = ["derive"] }
 tokio = { workspace = true, features = [ "io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
 
 libp2p-mplex = { workspace = true }
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
index 003993a512c..c5e96553a5c 100644
--- a/misc/keygen/Cargo.toml
+++ b/misc/keygen/Cargo.toml
@@ -17,7 +17,6 @@ clap = { version = "4.5.6", features = ["derive"] }
 zeroize = "1"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
-libp2p-core = { workspace = true }
 base64 = "0.22.1"
 libp2p-identity = { workspace = true }
 
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
index 2f6b6ea1544..2d04b6cf2ac 100644
--- a/misc/memory-connection-limits/Cargo.toml
+++ b/misc/memory-connection-limits/Cargo.toml
@@ -18,11 +18,9 @@ sysinfo = "0.33"
 tracing = { workspace = true }
 
 [dev-dependencies]
-async-std = { version = "1.12.0", features = ["attributes"] }
 libp2p-identify = { workspace = true }
 libp2p-swarm-derive = { path = "../../swarm-derive" }
 libp2p-swarm-test = { path = "../../swarm-test" }
-rand = "0.8.5"
 
 [lints]
 workspace = true
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index 1bbe3642477..d11ad4e2709 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -22,7 +22,6 @@ unsigned-varint = { workspace = true }
 async-std = { version = "1.6.2", features = ["attributes"] }
 futures_ringbuf = "0.4.0"
 quickcheck = { workspace = true }
-rand = "0.8"
 rw-stream-sink = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 0954e2f38d8..02da0adb9ef 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -14,7 +14,6 @@ license = "MIT"
 base64 = "0.22"
 clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
-futures-timer = "3"
 axum = "0.7"
 libp2p = { workspace = true, features = [
     "autonat",
@@ -34,8 +33,7 @@ libp2p = { workspace = true, features = [
     "websocket",
 ] }
 prometheus-client = { workspace = true }
-serde = "1.0.203"
-serde_derive = "1.0.125"
+serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing = { workspace = true }
diff --git a/misc/server/src/config.rs b/misc/server/src/config.rs
index 2e4b2746d09..8f8c71369b2 100644
--- a/misc/server/src/config.rs
+++ b/misc/server/src/config.rs
@@ -1,7 +1,7 @@
 use std::{error::Error, path::Path};
 
 use libp2p::Multiaddr;
-use serde_derive::Deserialize;
+use serde::Deserialize;
 
 #[derive(Clone, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
index 287388a49e7..2c50a2f8ab7 100644
--- a/misc/webrtc-utils/Cargo.toml
+++ b/misc/webrtc-utils/Cargo.toml
@@ -23,7 +23,6 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.10.8"
-thiserror = { workspace = true }
 tinytemplate = "1.2"
 tracing = { workspace = true }
 
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 88564b18541..8ef6f69d39a 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -18,7 +18,6 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-trait = { version = "0.1", optional = true }
 asynchronous-codec = { workspace = true }
-bytes = { version = "1", optional = true }
 either = { version = "1.9.0", optional = true }
 futures = { workspace = true }
 futures-bounded = { workspace = true, optional = true }
@@ -45,7 +44,7 @@ libp2p-swarm = { workspace = true, features = ["macros"] }
 [features]
 default = ["v1", "v2"]
 v1 = ["dep:libp2p-request-response", "dep:web-time", "dep:async-trait"]
-v2 = ["dep:bytes", "dep:either", "dep:futures-bounded", "dep:thiserror", "dep:rand_core"]
+v2 = ["dep:either", "dep:futures-bounded", "dep:thiserror", "dep:rand_core"]
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index a47f5400488..31acb42f2af 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -27,18 +27,13 @@ lru = "0.12.3"
 futures-bounded = { workspace = true }
 
 [dev-dependencies]
-clap = { version = "4.5.6", features = ["derive"] }
-libp2p-dns = { workspace = true, features = ["async-std"] }
 libp2p-identify = { workspace = true }
-libp2p-noise = { workspace = true }
-libp2p-ping = { workspace = true }
 libp2p-plaintext = { workspace = true }
 libp2p-relay = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
-rand = "0.8"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["rt", "macros"] }
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index c09286c8aa0..d48993b331e 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -23,7 +23,7 @@ either = "1.11"
 fnv = "1.0.7"
 futures = { workspace = true }
 futures-timer = "3.0.2"
-getrandom = "0.2.15"
+getrandom = { workspace = true }
 hex_fmt = "0.3.0"
 web-time = { workspace = true }
 libp2p-core = { workspace = true }
@@ -35,17 +35,13 @@ rand = "0.8"
 regex = "1.10.5"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
-smallvec = "1.13.2"
 tracing = { workspace = true }
 
 # Metrics dependencies
 prometheus-client = { workspace = true }
 
 [dev-dependencies]
-hex = "0.4.2"
 libp2p-core = { workspace = true }
-libp2p-yamux = { workspace = true }
-libp2p-noise = { workspace = true }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index d2aeb74e626..e5bb445b7a5 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -18,7 +18,6 @@ futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
-lru = "0.12.3"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.13.2"
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index dd93da2a01a..a9bc1a9a640 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -11,7 +11,6 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-arrayvec = "0.7.4"
 bytes = "1"
 either = "1.11"
 fnv = "1.0"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 618d41e9b9d..2348252dc57 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -13,7 +13,6 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.3.3", optional = true }
-data-encoding = "2.6.0"
 futures = { workspace = true }
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
@@ -32,10 +31,7 @@ async-io = ["dep:async-io", "dep:async-std", "if-watch/smol"]
 
 [dev-dependencies]
 async-std = { version = "1.9.0", features = ["attributes"] }
-libp2p-noise = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] }
-libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] }
-libp2p-yamux = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index cd499a8c949..645abc9bcfb 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -19,9 +19,7 @@ futures-timer = "3.0"
 web-time = { workspace = true }
 libp2p = { workspace = true, features = ["tokio", "tcp", "quic", "tls", "yamux", "dns"] }
 libp2p-core = { workspace = true }
-libp2p-dns = { workspace = true, features = ["tokio"] }
 libp2p-identity = { workspace = true, features = ["rand"] }
-libp2p-quic = { workspace = true, features = ["tokio"] }
 libp2p-swarm = { workspace = true, features = ["macros", "tokio"] }
 libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-tls = { workspace = true }
@@ -34,7 +32,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
 
 [dev-dependencies]
-rand = "0.8"
 libp2p-swarm-test = { path = "../../swarm-test" }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
index 0fad9678aec..83f3b6460c9 100644
--- a/protocols/ping/Cargo.toml
+++ b/protocols/ping/Cargo.toml
@@ -11,7 +11,6 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.11.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
 web-time = { workspace = true }
@@ -25,7 +24,6 @@ tracing = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = {workspace = true, features = ["rt", "macros"]}
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 53a579918c5..9521913cd30 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -29,12 +29,7 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 libp2p-swarm = { workspace = true, features = ["macros", "tokio"] }
-libp2p-noise = { workspace = true }
-libp2p-ping = { workspace = true }
-libp2p-identify = { workspace = true }
 libp2p-swarm-test = { path = "../../swarm-test" }
-libp2p-tcp = { workspace = true, features = ["tokio"] }
-libp2p-yamux = { workspace = true }
 rand = "0.8"
 tokio = { workspace = true, features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 48ef4c2c066..5cd711dd051 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -14,7 +14,6 @@ categories = ["network-programming", "asynchronous"]
 async-trait = "0.1"
 cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
 futures = { workspace = true }
-web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
@@ -23,7 +22,6 @@ serde = { version = "1.0", optional = true}
 serde_json = { version = "1.0.117", optional = true }
 smallvec = "1.13.2"
 tracing = { workspace = true }
-futures-timer = "3.0.3"
 futures-bounded = { workspace = true }
 
 [features]
@@ -33,9 +31,6 @@ cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
 [dev-dependencies]
 anyhow = "1.0.86"
 async-std = { version = "1.6.2", features = ["attributes"] }
-libp2p-noise = { workspace = true }
-libp2p-tcp = { workspace = true, features = ["async-io"] }
-libp2p-yamux = { workspace = true }
 rand = "0.8"
 libp2p-swarm-test = { path = "../../swarm-test" }
 futures_ringbuf = "0.4.0"
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
index 91c643a459d..febd2a6455a 100644
--- a/swarm-derive/Cargo.toml
+++ b/swarm-derive/Cargo.toml
@@ -17,7 +17,6 @@ proc-macro = true
 heck = "0.5"
 quote = "1.0"
 syn = { version = "2.0.66", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
-proc-macro2 = "1.0"
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
index 7ac7c900deb..4a0d5ee8c71 100644
--- a/swarm-test/Cargo.toml
+++ b/swarm-test/Cargo.toml
@@ -20,7 +20,6 @@ libp2p-swarm = { workspace = true }
 libp2p-tcp = { workspace = true }
 libp2p-yamux = { workspace = true }
 futures = { workspace = true }
-rand = "0.8.5"
 tracing = { workspace = true }
 futures-timer = "3.0.3"
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 4c3b8821ed6..cf027d96ec0 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.11.0"
 fnv = "1.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
-getrandom = { version = "0.2.15", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
+getrandom = { workspace = true, features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
 web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index 8824adcc50c..d0e2f9004ce 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -11,7 +11,6 @@ repository = "https://github.com/libp2p/rust-libp2p"
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = "1"
-curve25519-dalek = "4.1.2"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519"] }
@@ -20,7 +19,6 @@ multihash = { workspace = true }
 once_cell = "1.19.0"
 quick-protobuf = "0.8"
 rand = "0.8.3"
-sha2 = "0.10.8"
 static_assertions = "1"
 thiserror = { workspace = true }
 tracing = { workspace = true }
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index 47a3191baa9..9e1e5449158 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -23,7 +23,6 @@ quick-protobuf-codec = { workspace = true }
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["ed25519", "rand"] }
 quickcheck = { workspace = true }
-rand = "0.8"
 futures_ringbuf = "0.4.0"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 17d5014b974..5d709e122d2 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -10,14 +10,12 @@ license = "MIT"
 
 [dependencies]
 async-std = { version = "1.12.0", optional = true }
-bytes = "1.6.0"
 futures = { workspace = true }
 futures-timer = "3.0.3"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }
-parking_lot = "0.12.3"
 quinn = { version = "0.11.2", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.9", default-features = false }
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index 03e7fac491c..baa3b2f46dd 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -17,7 +17,6 @@ futures-timer = "3.0"
 if-watch = "3.2.0"
 libc = "0.2.155"
 libp2p-core = { workspace = true }
-libp2p-identity = { workspace = true }
 socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { workspace = true, default-features = false, features = ["net"], optional = true }
 tracing = { workspace = true }
@@ -28,7 +27,6 @@ async-io = ["dep:async-io", "if-watch/smol"]
 
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
-libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["full"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
index fce76e2aa79..7702a4361b1 100644
--- a/transports/tls/Cargo.toml
+++ b/transports/tls/Cargo.toml
@@ -28,7 +28,6 @@ features = ["ring", "std"] # Must enable this to allow for custom verification c
 
 
 [dev-dependencies]
-hex = "0.4.3"
 hex-literal = "0.4.1"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rsa", "secp256k1", "ecdsa", "rand"] }
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
index 4663913c849..6d42d74f610 100644
--- a/transports/webrtc-websys/Cargo.toml
+++ b/transports/webrtc-websys/Cargo.toml
@@ -14,7 +14,7 @@ publish = true
 [dependencies]
 bytes = "1"
 futures = { workspace = true }
-getrandom = { version = "0.2.15", features = ["js"] }
+getrandom = { workspace = true, features = ["js"] }
 hex = "0.4.3"
 js-sys = { version = "0.3" }
 libp2p-core = { workspace = true }
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index 4197a9419d8..f3d2e57147e 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -12,7 +12,6 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 async-trait = "0.1"
-bytes = "1"
 futures = { workspace = true }
 futures-timer = "3"
 hex = "0.4"
@@ -24,10 +23,8 @@ libp2p-webrtc-utils = { workspace = true }
 multihash = { workspace = true }
 rand = "0.8"
 rcgen = { workspace = true }
-serde = { version = "1.0", features = ["derive"] }
 stun = "0.6"
 thiserror = { workspace = true }
-tinytemplate = "1.2"
 tokio = { workspace = true, features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
 tracing = { workspace = true }
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
index 1e604ba0478..f33703c1884 100644
--- a/transports/websocket-websys/Cargo.toml
+++ b/transports/websocket-websys/Cargo.toml
@@ -16,7 +16,6 @@ futures = { workspace = true }
 js-sys = "0.3.69"
 libp2p-core = { workspace = true }
 tracing = { workspace = true }
-parking_lot = "0.12.3"
 send_wrapper = "0.6.0"
 thiserror = { workspace = true }
 wasm-bindgen = "0.2.90"
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
index d7db378ab1a..593743d1617 100644
--- a/wasm-tests/webtransport-tests/Cargo.toml
+++ b/wasm-tests/webtransport-tests/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 futures = { workspace = true }
-getrandom = { version = "0.2.15", features = ["js"] }
+getrandom = { workspace = true, features = ["js"] }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-noise = { workspace = true }

From c40338d7d1ec01e151ada22d4c050e729d44fa72 Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Tue, 24 Dec 2024 19:22:53 +0700
Subject: [PATCH 443/455] chore(mdns): revert version bump

Revert version bump of #5753, because libp2p-mdns-0.46.1 isn't released yet.

Pull-Request: #5762.
---
 Cargo.lock                  | 2 +-
 Cargo.toml                  | 2 +-
 protocols/mdns/CHANGELOG.md | 5 +----
 protocols/mdns/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0303989154..f8988953e9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2955,7 +2955,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.46.2"
+version = "0.46.1"
 dependencies = [
  "async-io",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 039281f5346..4e0652ce3d0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.46.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
 libp2p-kad = { version = "0.47.1", path = "protocols/kad" }
-libp2p-mdns = { version = "0.46.2", path = "protocols/mdns" }
+libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md
index 98dc3d55454..45a479bf4af 100644
--- a/protocols/mdns/CHANGELOG.md
+++ b/protocols/mdns/CHANGELOG.md
@@ -1,10 +1,7 @@
-## 0.46.2
+## 0.46.1
 
 - Emit `ToSwarm::NewExternalAddrOfPeer` on discovery.
   See [PR 5753](https://github.com/libp2p/rust-libp2p/pull/5753)
-
-## 0.46.1
-
 - Upgrade `hickory-proto`.
   See [PR 5727](https://github.com/libp2p/rust-libp2p/pull/5727)
 
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 2348252dc57..89d53c98a70 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-mdns"
 edition = "2021"
 rust-version = { workspace = true }
-version = "0.46.2"
+version = "0.46.1"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"

From 69cf073f7f2918591fb7c54e1320d1f02a49f262 Mon Sep 17 00:00:00 2001
From: Dzmitry Kalabuk <d.kalabuk@subsquid.io>
Date: Wed, 25 Dec 2024 09:07:53 +0300
Subject: [PATCH 444/455] deps(quic): update quinn to 0.11.6

Among other changes, it includes a fix for this issue which often reproduces with libp2p: https://github.com/quinn-rs/quinn/issues/1889

Pull-Request: #5757.
---
 Cargo.lock                 | 40 +++++++++++++++++++++++---------------
 transports/quic/Cargo.toml |  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8988953e9e..308c3c45e5c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -855,6 +855,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -4637,9 +4643,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.2"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "async-io",
  "async-std",
@@ -4648,36 +4654,41 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 1.1.0",
+ "rustc-hash",
  "rustls 0.23.11",
- "thiserror 1.0.63",
+ "socket2",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustc-hash 2.0.0",
+ "rustc-hash",
  "rustls 0.23.11",
+ "rustls-pki-types",
  "slab",
- "thiserror 1.0.63",
+ "thiserror 2.0.3",
  "tinyvec",
  "tracing",
+ "web-time 1.1.0",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.0"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7ad7bc932e4968523fa7d9c320ee135ff779de720e9350fee8728838551764"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
@@ -5134,12 +5145,6 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.0.0"
@@ -5232,6 +5237,9 @@ name = "rustls-pki-types"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+dependencies = [
+ "web-time 1.1.0",
+]
 
 [[package]]
 name = "rustls-webpki"
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index 5d709e122d2..bff0a024bd4 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -16,7 +16,7 @@ if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }
-quinn = { version = "0.11.2", default-features = false, features = ["rustls", "futures-io"] }
+quinn = { version = "0.11.6", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.9", default-features = false }
 thiserror = { workspace = true }

From 644d7d06269b095090b3cfb8abbec8a8692f6062 Mon Sep 17 00:00:00 2001
From: Krishang Shah <93703995+kamuik16@users.noreply.github.com>
Date: Fri, 27 Dec 2024 05:00:44 +0530
Subject: [PATCH 445/455] chore: introduce `libp2p-test-utils`

Fixes #4992

Based on the conversation in #4992.

Pull-Request: #5725.
---
 Cargo.lock                                    | 60 +++++++++++--------
 Cargo.toml                                    |  6 +-
 examples/autonatv2/Cargo.toml                 |  2 +-
 misc/multistream-select/Cargo.toml            |  2 +-
 misc/multistream-select/src/dialer_select.rs  | 14 ++---
 misc/test-utils/CHANGELOG.md                  |  4 ++
 misc/test-utils/Cargo.toml                    | 17 ++++++
 misc/test-utils/src/lib.rs                    | 15 +++++
 muxers/mplex/Cargo.toml                       |  2 +-
 muxers/mplex/benches/split_send_size.rs       |  5 +-
 muxers/mplex/src/io.rs                        | 10 +---
 protocols/autonat/Cargo.toml                  |  2 +-
 protocols/autonat/tests/autonatv2.rs          | 17 ++----
 protocols/dcutr/Cargo.toml                    |  2 +-
 protocols/dcutr/tests/lib.rs                  |  5 +-
 protocols/gossipsub/Cargo.toml                |  2 +-
 protocols/gossipsub/src/behaviour/tests.rs    |  5 +-
 protocols/gossipsub/tests/smoke.rs            |  5 +-
 protocols/identify/Cargo.toml                 |  2 +-
 protocols/identify/tests/smoke.rs             | 33 +++-------
 protocols/kad/Cargo.toml                      |  2 +-
 protocols/kad/src/behaviour/test.rs           |  4 +-
 protocols/kad/src/handler.rs                  |  5 +-
 protocols/kad/tests/client_mode.rs            | 17 ++----
 protocols/mdns/Cargo.toml                     |  2 +-
 protocols/mdns/tests/use-async-std.rs         | 17 ++----
 protocols/mdns/tests/use-tokio.rs             | 13 +---
 protocols/perf/Cargo.toml                     |  1 +
 protocols/perf/tests/lib.rs                   |  5 +-
 protocols/relay/Cargo.toml                    |  3 +-
 protocols/relay/tests/lib.rs                  | 29 +++------
 protocols/rendezvous/Cargo.toml               |  2 +-
 protocols/rendezvous/tests/rendezvous.rs      | 37 +++---------
 protocols/request-response/Cargo.toml         |  2 +-
 .../request-response/tests/error_reporting.rs | 30 +++-------
 .../request-response/tests/peer_address.rs    |  5 +-
 protocols/request-response/tests/ping.rs      |  5 +-
 protocols/stream/Cargo.toml                   |  2 +-
 protocols/stream/tests/lib.rs                 | 17 +++---
 rustfmt.toml                                  |  2 +-
 swarm/Cargo.toml                              |  2 +-
 swarm/src/connection.rs                       | 13 +---
 swarm/src/lib.rs                              |  4 +-
 transports/dns/Cargo.toml                     |  2 +-
 transports/dns/src/lib.rs                     |  4 +-
 transports/noise/Cargo.toml                   |  2 +-
 transports/noise/tests/smoke.rs               |  5 +-
 transports/plaintext/Cargo.toml               |  2 +-
 transports/plaintext/tests/smoke.rs           |  5 +-
 transports/quic/Cargo.toml                    |  2 +-
 transports/quic/tests/smoke.rs                | 41 ++++---------
 transports/tcp/Cargo.toml                     |  2 +-
 transports/tcp/src/lib.rs                     | 28 +++------
 transports/webrtc/Cargo.toml                  |  3 +-
 transports/webrtc/tests/smoke.rs              |  9 +--
 55 files changed, 192 insertions(+), 342 deletions(-)
 create mode 100644 misc/test-utils/CHANGELOG.md
 create mode 100644 misc/test-utils/Cargo.toml
 create mode 100644 misc/test-utils/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 308c3c45e5c..7a5497c5701 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2724,6 +2724,7 @@ dependencies = [
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
@@ -2731,7 +2732,6 @@ dependencies = [
  "thiserror 2.0.3",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "web-time 1.1.0",
 ]
 
@@ -2795,6 +2795,7 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-swarm-test",
  "libp2p-tcp",
+ "libp2p-test-utils",
  "libp2p-yamux",
  "lru",
  "quick-protobuf",
@@ -2802,7 +2803,6 @@ dependencies = [
  "thiserror 2.0.3",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "web-time 1.1.0",
 ]
 
@@ -2817,11 +2817,11 @@ dependencies = [
  "hickory-resolver",
  "libp2p-core",
  "libp2p-identity",
+ "libp2p-test-utils",
  "parking_lot",
  "smallvec",
  "tokio",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -2863,6 +2863,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "prometheus-client",
  "quick-protobuf",
  "quick-protobuf-codec",
@@ -2873,7 +2874,6 @@ dependencies = [
  "sha2 0.10.8",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "web-time 1.1.0",
 ]
 
@@ -2891,12 +2891,12 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
  "thiserror 2.0.3",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -2944,6 +2944,7 @@ dependencies = [
  "libp2p-noise",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "libp2p-yamux",
  "quick-protobuf",
  "quick-protobuf-codec",
@@ -2954,7 +2955,6 @@ dependencies = [
  "smallvec",
  "thiserror 2.0.3",
  "tracing",
- "tracing-subscriber",
  "uint",
  "web-time 1.1.0",
 ]
@@ -2972,12 +2972,12 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "rand 0.8.5",
  "smallvec",
  "socket2",
  "tokio",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -3028,13 +3028,13 @@ dependencies = [
  "libp2p-muxer-test-harness",
  "libp2p-plaintext",
  "libp2p-tcp",
+ "libp2p-test-utils",
  "nohash-hasher",
  "parking_lot",
  "quickcheck-ext",
  "rand 0.8.5",
  "smallvec",
  "tracing",
- "tracing-subscriber",
  "unsigned-varint 0.8.0",
 ]
 
@@ -3059,6 +3059,7 @@ dependencies = [
  "futures_ringbuf",
  "libp2p-core",
  "libp2p-identity",
+ "libp2p-test-utils",
  "multiaddr",
  "multihash",
  "once_cell",
@@ -3069,7 +3070,6 @@ dependencies = [
  "static_assertions",
  "thiserror 2.0.3",
  "tracing",
- "tracing-subscriber",
  "x25519-dalek",
  "zeroize",
 ]
@@ -3089,6 +3089,7 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-swarm-test",
  "libp2p-tcp",
+ "libp2p-test-utils",
  "libp2p-tls",
  "libp2p-yamux",
  "serde",
@@ -3127,11 +3128,11 @@ dependencies = [
  "futures_ringbuf",
  "libp2p-core",
  "libp2p-identity",
+ "libp2p-test-utils",
  "quick-protobuf",
  "quick-protobuf-codec",
  "quickcheck-ext",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -3168,6 +3169,7 @@ dependencies = [
  "libp2p-muxer-test-harness",
  "libp2p-noise",
  "libp2p-tcp",
+ "libp2p-test-utils",
  "libp2p-tls",
  "libp2p-yamux",
  "quickcheck",
@@ -3179,7 +3181,6 @@ dependencies = [
  "thiserror 2.0.3",
  "tokio",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -3198,6 +3199,7 @@ dependencies = [
  "libp2p-plaintext",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "libp2p-yamux",
  "quick-protobuf",
  "quick-protobuf-codec",
@@ -3206,7 +3208,6 @@ dependencies = [
  "static_assertions",
  "thiserror 2.0.3",
  "tracing",
- "tracing-subscriber",
  "web-time 1.1.0",
 ]
 
@@ -3224,13 +3225,13 @@ dependencies = [
  "libp2p-request-response",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
  "thiserror 2.0.3",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "web-time 1.1.0",
 ]
 
@@ -3249,12 +3250,12 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "rand 0.8.5",
  "serde",
  "serde_json",
  "smallvec",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -3284,10 +3285,10 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "rand 0.8.5",
  "tokio",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -3309,6 +3310,7 @@ dependencies = [
  "libp2p-plaintext",
  "libp2p-swarm-derive",
  "libp2p-swarm-test",
+ "libp2p-test-utils",
  "libp2p-yamux",
  "lru",
  "multistream-select",
@@ -3318,7 +3320,6 @@ dependencies = [
  "smallvec",
  "tokio",
  "tracing",
- "tracing-subscriber",
  "trybuild",
  "wasm-bindgen-futures",
  "web-time 1.1.0",
@@ -3360,9 +3361,16 @@ dependencies = [
  "if-watch",
  "libc",
  "libp2p-core",
+ "libp2p-test-utils",
  "socket2",
  "tokio",
  "tracing",
+]
+
+[[package]]
+name = "libp2p-test-utils"
+version = "0.1.0"
+dependencies = [
  "tracing-subscriber",
 ]
 
@@ -3424,6 +3432,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
+ "libp2p-test-utils",
  "libp2p-webrtc-utils",
  "multihash",
  "quickcheck",
@@ -3434,7 +3443,6 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-subscriber",
  "webrtc",
 ]
 
@@ -3849,12 +3857,12 @@ dependencies = [
  "bytes",
  "futures",
  "futures_ringbuf",
+ "libp2p-test-utils",
  "pin-project",
  "quickcheck-ext",
  "rw-stream-sink",
  "smallvec",
  "tracing",
- "tracing-subscriber",
  "unsigned-varint 0.8.0",
 ]
 
@@ -6293,9 +6301,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -6305,9 +6313,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6316,9 +6324,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -6373,9 +6381,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
diff --git a/Cargo.toml b/Cargo.toml
index 4e0652ce3d0..1819e68edf4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,7 @@ members = [
     "misc/quickcheck-ext",
     "misc/rw-stream-sink",
     "misc/server",
+    "misc/test-utils",
     "misc/webrtc-utils",
     "muxers/mplex",
     "muxers/test-harness",
@@ -113,6 +114,7 @@ libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.4.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
+libp2p-test-utils = { version = "0.1.0", path = "misc/test-utils" }
 
 # External dependencies
 async-std-resolver = { version = "0.25.0-alpha.4", default-features = false }
@@ -135,8 +137,8 @@ ring = "0.17.8"
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 thiserror = "2"
 tokio = { version = "1.38", default-features = false }
-tracing = "0.1.37"
-tracing-subscriber = "0.3"
+tracing = "0.1.41"
+tracing-subscriber = "0.3.19"
 unsigned-varint = { version = "0.8.0" }
 web-time = "1.1.0"
 
diff --git a/examples/autonatv2/Cargo.toml b/examples/autonatv2/Cargo.toml
index 67e74d67a22..d400c53e7fd 100644
--- a/examples/autonatv2/Cargo.toml
+++ b/examples/autonatv2/Cargo.toml
@@ -19,7 +19,7 @@ libp2p = { workspace = true, features = ["macros", "tokio", "tcp", "noise", "yam
 clap = { version = "4.4.18", features = ["derive"] }
 tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 rand = "0.8.5"
 opentelemetry_sdk = { version = "0.21.1", optional = true, features = ["rt-tokio"] }
 tracing-opentelemetry = { version = "0.22.0", optional = true }
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
index d11ad4e2709..66ab434b613 100644
--- a/misc/multistream-select/Cargo.toml
+++ b/misc/multistream-select/Cargo.toml
@@ -23,7 +23,7 @@ async-std = { version = "1.6.2", features = ["attributes"] }
 futures_ringbuf = "0.4.0"
 quickcheck = { workspace = true }
 rw-stream-sink = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/misc/multistream-select/src/dialer_select.rs b/misc/multistream-select/src/dialer_select.rs
index 1d13e94910d..bd537e7fc7b 100644
--- a/misc/multistream-select/src/dialer_select.rs
+++ b/misc/multistream-select/src/dialer_select.rs
@@ -214,9 +214,9 @@ mod tests {
         future::timeout,
         net::{TcpListener, TcpStream},
     };
+    use libp2p_test_utils::EnvFilter;
     use quickcheck::{Arbitrary, Gen, GenRange};
     use tracing::metadata::LevelFilter;
-    use tracing_subscriber::EnvFilter;
 
     use super::*;
     use crate::listener_select_proto;
@@ -275,13 +275,11 @@ mod tests {
             ListenerProtos(listen_protos): ListenerProtos,
             DialPayload(dial_payload): DialPayload,
         ) {
-            let _ = tracing_subscriber::fmt()
-                .with_env_filter(
-                    EnvFilter::builder()
-                        .with_default_directive(LevelFilter::DEBUG.into())
-                        .from_env_lossy(),
-                )
-                .try_init();
+            libp2p_test_utils::with_env_filter(
+                EnvFilter::builder()
+                    .with_default_directive(LevelFilter::DEBUG.into())
+                    .from_env_lossy(),
+            );
 
             async_std::task::block_on(async move {
                 let listener = TcpListener::bind("0.0.0.0:0").await.unwrap();
diff --git a/misc/test-utils/CHANGELOG.md b/misc/test-utils/CHANGELOG.md
new file mode 100644
index 00000000000..0b8ed3ab931
--- /dev/null
+++ b/misc/test-utils/CHANGELOG.md
@@ -0,0 +1,4 @@
+## 0.1.0
+
+- Introduce 'test-utils` crate.
+  See [PR 5725](https://github.com/libp2p/rust-libp2p/pull/5725).
\ No newline at end of file
diff --git a/misc/test-utils/Cargo.toml b/misc/test-utils/Cargo.toml
new file mode 100644
index 00000000000..438bcabcf2a
--- /dev/null
+++ b/misc/test-utils/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "libp2p-test-utils"
+version = "0.1.0"
+edition = "2021"
+authors = ["Krishang Shah <shahkrishang11@gmail.com>"]
+license = "MIT"
+repository = "https://github.com/libp2p/rust-libp2p"
+publish = false
+
+[package.metadata.release]
+release = false
+
+[dependencies]
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
+
+[lints]
+workspace = true
diff --git a/misc/test-utils/src/lib.rs b/misc/test-utils/src/lib.rs
new file mode 100644
index 00000000000..1155c79b614
--- /dev/null
+++ b/misc/test-utils/src/lib.rs
@@ -0,0 +1,15 @@
+pub use tracing_subscriber::EnvFilter;
+
+/// Initializes logging with the default environment filter (`RUST_LOG`).
+pub fn with_default_env_filter() {
+    with_env_filter(EnvFilter::from_default_env());
+}
+
+/// Initializes logging with a custom environment filter.
+/// Logs are written to standard error (`stderr`).
+pub fn with_env_filter(filter: impl Into<EnvFilter>) {
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(filter)
+        .with_writer(std::io::stderr)
+        .try_init();
+}
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
index 7f887c8b3b8..78650218f4b 100644
--- a/muxers/mplex/Cargo.toml
+++ b/muxers/mplex/Cargo.toml
@@ -32,7 +32,7 @@ libp2p-muxer-test-harness = { path = "../test-harness" }
 libp2p-plaintext = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 quickcheck = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [[bench]]
 name = "split_send_size"
diff --git a/muxers/mplex/benches/split_send_size.rs b/muxers/mplex/benches/split_send_size.rs
index b0dd4babff7..7a0e9780ca7 100644
--- a/muxers/mplex/benches/split_send_size.rs
+++ b/muxers/mplex/benches/split_send_size.rs
@@ -38,7 +38,6 @@ use libp2p_identity as identity;
 use libp2p_identity::PeerId;
 use libp2p_mplex as mplex;
 use libp2p_plaintext as plaintext;
-use tracing_subscriber::EnvFilter;
 
 type BenchTransport = transport::Boxed<(PeerId, muxing::StreamMuxerBox)>;
 
@@ -55,9 +54,7 @@ const BENCH_SIZES: [usize; 8] = [
 ];
 
 fn prepare(c: &mut Criterion) {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let payload: Vec<u8> = vec![1; 1024 * 1024];
 
diff --git a/muxers/mplex/src/io.rs b/muxers/mplex/src/io.rs
index ac93fd3865e..eeea4ce734f 100644
--- a/muxers/mplex/src/io.rs
+++ b/muxers/mplex/src/io.rs
@@ -1231,10 +1231,7 @@ mod tests {
 
     #[test]
     fn max_buffer_behaviour() {
-        use tracing_subscriber::EnvFilter;
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         fn prop(cfg: MplexConfig, overflow: NonZeroU8) {
             let mut r_buf = BytesMut::new();
@@ -1369,10 +1366,7 @@ mod tests {
 
     #[test]
     fn close_on_error() {
-        use tracing_subscriber::EnvFilter;
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         fn prop(cfg: MplexConfig, num_streams: NonZeroU8) {
             let num_streams = cmp::min(cfg.max_substreams, num_streams.get() as usize);
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 8ef6f69d39a..5f5d18562fd 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -37,7 +37,7 @@ thiserror = { workspace = true, optional = true }
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "rt", "sync"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 libp2p-identify = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["macros"] }
 
diff --git a/protocols/autonat/tests/autonatv2.rs b/protocols/autonat/tests/autonatv2.rs
index 49866a9adb5..1e278f5554f 100644
--- a/protocols/autonat/tests/autonatv2.rs
+++ b/protocols/autonat/tests/autonatv2.rs
@@ -11,13 +11,10 @@ use libp2p_swarm::{
 use libp2p_swarm_test::SwarmExt;
 use rand_core::OsRng;
 use tokio::sync::oneshot;
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn confirm_successful() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (mut alice, mut bob) = start_and_connect().await;
 
     let cor_server_peer = *alice.local_peer_id();
@@ -128,9 +125,7 @@ async fn confirm_successful() {
 
 #[tokio::test]
 async fn dial_back_to_unsupported_protocol() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (mut alice, mut bob) = bootstrap().await;
 
     let alice_peer_id = *alice.local_peer_id();
@@ -226,9 +221,7 @@ async fn dial_back_to_unsupported_protocol() {
 
 #[tokio::test]
 async fn dial_back_to_non_libp2p() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (mut alice, mut bob) = bootstrap().await;
     let alice_peer_id = *alice.local_peer_id();
 
@@ -314,9 +307,7 @@ async fn dial_back_to_non_libp2p() {
 
 #[tokio::test]
 async fn dial_back_to_not_supporting() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (mut alice, mut bob) = bootstrap().await;
     let alice_peer_id = *alice.local_peer_id();
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
index 31acb42f2af..7bc05671aa2 100644
--- a/protocols/dcutr/Cargo.toml
+++ b/protocols/dcutr/Cargo.toml
@@ -34,7 +34,7 @@ libp2p-swarm = { workspace = true, features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 tokio = { workspace = true, features = ["rt", "macros"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs
index a35c9a50cfe..ce7119cebcf 100644
--- a/protocols/dcutr/tests/lib.rs
+++ b/protocols/dcutr/tests/lib.rs
@@ -32,13 +32,10 @@ use libp2p_plaintext as plaintext;
 use libp2p_relay as relay;
 use libp2p_swarm::{Config, NetworkBehaviour, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn connect() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut relay = build_relay();
     let mut dst = build_client();
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index d48993b331e..298cdee21e9 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -44,7 +44,7 @@ prometheus-client = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm-test = { path = "../../swarm-test" }
 quickcheck = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time", "macros"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index eaa983d214d..bf3046da78b 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -4761,10 +4761,7 @@ fn test_limit_number_of_message_ids_inside_ihave() {
 
 #[test]
 fn test_iwant_penalties() {
-    // use tracing_subscriber::EnvFilter;
-    // let _ = tracing_subscriber::fmt()
-    // .with_env_filter(EnvFilter::from_default_env())
-    // .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let config = ConfigBuilder::default()
         .iwant_followup_time(Duration::from_secs(4))
         .build()
diff --git a/protocols/gossipsub/tests/smoke.rs b/protocols/gossipsub/tests/smoke.rs
index 85038665b4d..d5fec2c1985 100644
--- a/protocols/gossipsub/tests/smoke.rs
+++ b/protocols/gossipsub/tests/smoke.rs
@@ -31,7 +31,6 @@ use libp2p_swarm_test::SwarmExt as _;
 use quickcheck::{QuickCheck, TestResult};
 use rand::{seq::SliceRandom, SeedableRng};
 use tokio::{runtime::Runtime, time};
-use tracing_subscriber::EnvFilter;
 
 struct Graph {
     nodes: SelectAll<Swarm<gossipsub::Behaviour>>,
@@ -132,9 +131,7 @@ async fn build_node() -> Swarm<gossipsub::Behaviour> {
 
 #[test]
 fn multi_hop_propagation() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     fn prop(num_nodes: u8, seed: u64) -> TestResult {
         if !(2..=50).contains(&num_nodes) {
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index e5bb445b7a5..4ce2a0c1bd9 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -29,7 +29,7 @@ either = "1.12.0"
 async-std = { version = "1.6.2", features = ["attributes"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-swarm = { workspace = true, features = ["macros"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/identify/tests/smoke.rs b/protocols/identify/tests/smoke.rs
index 0d2818df0a4..a152bd75b19 100644
--- a/protocols/identify/tests/smoke.rs
+++ b/protocols/identify/tests/smoke.rs
@@ -9,13 +9,10 @@ use libp2p_identify as identify;
 use libp2p_identity::Keypair;
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
 async fn periodic_identify() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut swarm1 = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(
@@ -84,9 +81,7 @@ async fn periodic_identify() {
 }
 #[async_std::test]
 async fn only_emits_address_candidate_once_per_connection() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut swarm1 = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(
@@ -156,9 +151,7 @@ async fn only_emits_address_candidate_once_per_connection() {
 
 #[async_std::test]
 async fn emits_unique_listen_addresses() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut swarm1 = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(
@@ -228,9 +221,7 @@ async fn emits_unique_listen_addresses() {
 
 #[async_std::test]
 async fn hides_listen_addresses() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut swarm1 = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(
@@ -299,9 +290,7 @@ async fn hides_listen_addresses() {
 
 #[async_std::test]
 async fn identify_push() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut swarm1 = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(identify::Config::new("a".to_string(), identity.public()))
@@ -351,9 +340,7 @@ async fn identify_push() {
 
 #[async_std::test]
 async fn discover_peer_after_disconnect() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut swarm1 = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(identify::Config::new("a".to_string(), identity.public()))
@@ -404,9 +391,7 @@ async fn discover_peer_after_disconnect() {
 
 #[async_std::test]
 async fn configured_interval_starts_after_first_identify() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let identify_interval = Duration::from_secs(5);
 
@@ -444,9 +429,7 @@ async fn configured_interval_starts_after_first_identify() {
 
 #[async_std::test]
 async fn reject_mismatched_public_key() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut honest_swarm = Swarm::new_ephemeral(|identity| {
         identify::Behaviour::new(
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index a9bc1a9a640..9b8ec64205a 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -41,7 +41,7 @@ libp2p-swarm = { path = "../../swarm", features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [features]
 serde = ["dep:serde", "bytes/serde"]
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 467865dd225..ab8c980c30c 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -323,9 +323,7 @@ fn query_iter() {
 
 #[test]
 fn unresponsive_not_returned_direct() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     // Build one node. It contains fake addresses to non-existing nodes. We ask it to find a
     // random peer. We make sure that no fake address is returned.
 
diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
index 6b4e944e2b0..6837e3d499e 100644
--- a/protocols/kad/src/handler.rs
+++ b/protocols/kad/src/handler.rs
@@ -1068,7 +1068,6 @@ fn process_kad_response(event: KadResponseMsg, query_id: QueryId) -> HandlerEven
 #[cfg(test)]
 mod tests {
     use quickcheck::{Arbitrary, Gen};
-    use tracing_subscriber::EnvFilter;
 
     use super::*;
 
@@ -1083,9 +1082,7 @@ mod tests {
 
     #[test]
     fn compute_next_protocol_status_test() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         fn prop(now_supported: bool, current: Option<ProtocolStatus>) {
             let new = compute_new_protocol_status(now_supported, current);
diff --git a/protocols/kad/tests/client_mode.rs b/protocols/kad/tests/client_mode.rs
index 3275c525890..09e24c6f6ea 100644
--- a/protocols/kad/tests/client_mode.rs
+++ b/protocols/kad/tests/client_mode.rs
@@ -3,15 +3,12 @@ use libp2p_identity as identity;
 use libp2p_kad::{store::MemoryStore, Behaviour, Config, Event, Mode};
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use tracing_subscriber::EnvFilter;
 use Event::*;
 use MyBehaviourEvent::*;
 
 #[async_std::test]
 async fn server_gets_added_to_routing_table_by_client() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut client = Swarm::new_ephemeral(MyBehaviour::new);
     let mut server = Swarm::new_ephemeral(MyBehaviour::new);
@@ -41,9 +38,7 @@ async fn server_gets_added_to_routing_table_by_client() {
 
 #[async_std::test]
 async fn two_servers_add_each_other_to_routing_table() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut server1 = Swarm::new_ephemeral(MyBehaviour::new);
     let mut server2 = Swarm::new_ephemeral(MyBehaviour::new);
@@ -82,9 +77,7 @@ async fn two_servers_add_each_other_to_routing_table() {
 
 #[async_std::test]
 async fn adding_an_external_addresses_activates_server_mode_on_existing_connections() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut client = Swarm::new_ephemeral(MyBehaviour::new);
     let mut server = Swarm::new_ephemeral(MyBehaviour::new);
@@ -120,9 +113,7 @@ async fn adding_an_external_addresses_activates_server_mode_on_existing_connecti
 
 #[async_std::test]
 async fn set_client_to_server_mode() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut client = Swarm::new_ephemeral(MyBehaviour::new);
     client.behaviour_mut().kad.set_mode(Some(Mode::Client));
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
index 89d53c98a70..ba86a82d5bb 100644
--- a/protocols/mdns/Cargo.toml
+++ b/protocols/mdns/Cargo.toml
@@ -34,7 +34,7 @@ async-std = { version = "1.9.0", features = ["attributes"] }
 libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "time"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [[test]]
 name = "use-async-std"
diff --git a/protocols/mdns/tests/use-async-std.rs b/protocols/mdns/tests/use-async-std.rs
index df08b39af07..9ee2b7659ea 100644
--- a/protocols/mdns/tests/use-async-std.rs
+++ b/protocols/mdns/tests/use-async-std.rs
@@ -24,22 +24,17 @@ use futures::future::Either;
 use libp2p_mdns::{async_io::Behaviour, Config, Event};
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
 async fn test_discovery_async_std_ipv4() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     run_discovery_test(Config::default()).await
 }
 
 #[async_std::test]
 async fn test_discovery_async_std_ipv6() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let config = Config {
         enable_ipv6: true,
@@ -50,9 +45,7 @@ async fn test_discovery_async_std_ipv6() {
 
 #[async_std::test]
 async fn test_expired_async_std() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let config = Config {
         ttl: Duration::from_secs(1),
@@ -85,9 +78,7 @@ async fn test_expired_async_std() {
 
 #[async_std::test]
 async fn test_no_expiration_on_close_async_std() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let config = Config {
         ttl: Duration::from_secs(120),
         query_interval: Duration::from_secs(10),
diff --git a/protocols/mdns/tests/use-tokio.rs b/protocols/mdns/tests/use-tokio.rs
index 0ec90a52b90..a48f84217a3 100644
--- a/protocols/mdns/tests/use-tokio.rs
+++ b/protocols/mdns/tests/use-tokio.rs
@@ -23,22 +23,17 @@ use futures::future::Either;
 use libp2p_mdns::{tokio::Behaviour, Config, Event};
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt as _;
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn test_discovery_tokio_ipv4() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     run_discovery_test(Config::default()).await
 }
 
 #[tokio::test]
 async fn test_discovery_tokio_ipv6() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let config = Config {
         enable_ipv6: true,
@@ -49,9 +44,7 @@ async fn test_discovery_tokio_ipv6() {
 
 #[tokio::test]
 async fn test_expired_tokio() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let config = Config {
         ttl: Duration::from_secs(1),
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
index 645abc9bcfb..0b994447525 100644
--- a/protocols/perf/Cargo.toml
+++ b/protocols/perf/Cargo.toml
@@ -29,6 +29,7 @@ serde_json = "1.0"
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
 
 [dev-dependencies]
diff --git a/protocols/perf/tests/lib.rs b/protocols/perf/tests/lib.rs
index 017d475befd..c265b0e2e61 100644
--- a/protocols/perf/tests/lib.rs
+++ b/protocols/perf/tests/lib.rs
@@ -24,13 +24,10 @@ use libp2p_perf::{
 };
 use libp2p_swarm::{Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn perf() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let mut server = Swarm::new_ephemeral(|_| server::Behaviour::new());
     let server_peer_id = *server.local_peer_id();
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
index 6c2c7b90304..e7e447e7d16 100644
--- a/protocols/relay/Cargo.toml
+++ b/protocols/relay/Cargo.toml
@@ -36,8 +36,7 @@ libp2p-swarm = { workspace = true, features = ["macros", "async-std"] }
 libp2p-swarm-test = { workspace = true }
 libp2p-yamux = { workspace = true }
 quickcheck = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/relay/tests/lib.rs b/protocols/relay/tests/lib.rs
index 3181e60db74..da6f549c091 100644
--- a/protocols/relay/tests/lib.rs
+++ b/protocols/relay/tests/lib.rs
@@ -40,13 +40,10 @@ use libp2p_plaintext as plaintext;
 use libp2p_relay as relay;
 use libp2p_swarm::{dial_opts::DialOpts, Config, DialError, NetworkBehaviour, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use tracing_subscriber::EnvFilter;
 
 #[test]
 fn reservation() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
@@ -87,9 +84,7 @@ fn reservation() {
 
 #[test]
 fn new_reservation_to_same_relay_replaces_old() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
@@ -186,9 +181,7 @@ fn new_reservation_to_same_relay_replaces_old() {
 
 #[test]
 fn connect() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
@@ -272,9 +265,7 @@ async fn connection_established_to(
 
 #[test]
 fn handle_dial_failure() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
@@ -293,9 +284,7 @@ fn handle_dial_failure() {
 
 #[test]
 fn propagate_reservation_error_to_listener() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
@@ -342,9 +331,7 @@ fn propagate_reservation_error_to_listener() {
 
 #[test]
 fn propagate_connect_error_to_unknown_peer_to_dialer() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
@@ -398,9 +385,7 @@ fn propagate_connect_error_to_unknown_peer_to_dialer() {
 
 #[test]
 fn reuse_connection() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let mut pool = LocalPool::new();
 
     let relay_addr = Multiaddr::empty().with(Protocol::Memory(rand::random::<u64>()));
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
index 9521913cd30..104dc6ad1d4 100644
--- a/protocols/rendezvous/Cargo.toml
+++ b/protocols/rendezvous/Cargo.toml
@@ -32,7 +32,7 @@ libp2p-swarm = { workspace = true, features = ["macros", "tokio"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
 rand = "0.8"
 tokio = { workspace = true, features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/rendezvous/tests/rendezvous.rs b/protocols/rendezvous/tests/rendezvous.rs
index 2305c2ef412..98aa9dab62d 100644
--- a/protocols/rendezvous/tests/rendezvous.rs
+++ b/protocols/rendezvous/tests/rendezvous.rs
@@ -27,13 +27,10 @@ use libp2p_rendezvous as rendezvous;
 use libp2p_rendezvous::client::RegisterError;
 use libp2p_swarm::{DialError, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn given_successful_registration_then_successful_discovery() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice, mut bob], mut robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default()).await;
@@ -86,9 +83,7 @@ async fn given_successful_registration_then_successful_discovery() {
 
 #[tokio::test]
 async fn should_return_error_when_no_external_addresses() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let server = new_server(rendezvous::server::Config::default()).await;
     let mut client = Swarm::new_ephemeral(rendezvous::client::Behaviour::new);
@@ -103,9 +98,7 @@ async fn should_return_error_when_no_external_addresses() {
 
 #[tokio::test]
 async fn given_successful_registration_then_refresh_ttl() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice, mut bob], mut robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default()).await;
@@ -171,9 +164,7 @@ async fn given_successful_registration_then_refresh_ttl() {
 
 #[tokio::test]
 async fn given_successful_registration_then_refresh_external_addrs() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice], mut robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default()).await;
@@ -224,9 +215,7 @@ async fn given_successful_registration_then_refresh_external_addrs() {
 
 #[tokio::test]
 async fn given_invalid_ttl_then_unsuccessful_registration() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice], mut robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default()).await;
@@ -253,9 +242,7 @@ async fn given_invalid_ttl_then_unsuccessful_registration() {
 
 #[tokio::test]
 async fn discover_allows_for_dial_by_peer_id() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice, mut bob], robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default()).await;
@@ -310,9 +297,7 @@ async fn discover_allows_for_dial_by_peer_id() {
 
 #[tokio::test]
 async fn eve_cannot_register() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let mut robert = new_server(rendezvous::server::Config::default()).await;
     let mut eve = new_impersonating_client().await;
@@ -338,9 +323,7 @@ async fn eve_cannot_register() {
 // test if charlie can operate as client and server simultaneously
 #[tokio::test]
 async fn can_combine_client_and_server() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice], mut robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default()).await;
@@ -376,9 +359,7 @@ async fn can_combine_client_and_server() {
 
 #[tokio::test]
 async fn registration_on_clients_expire() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let namespace = rendezvous::Namespace::from_static("some-namespace");
     let ([mut alice, mut bob], robert) =
         new_server_with_connected_clients(rendezvous::server::Config::default().with_min_ttl(1))
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
index 5cd711dd051..cb78f536ae4 100644
--- a/protocols/request-response/Cargo.toml
+++ b/protocols/request-response/Cargo.toml
@@ -35,7 +35,7 @@ rand = "0.8"
 libp2p-swarm-test = { path = "../../swarm-test" }
 futures_ringbuf = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/protocols/request-response/tests/error_reporting.rs b/protocols/request-response/tests/error_reporting.rs
index 2108b6006c5..281701f5cc3 100644
--- a/protocols/request-response/tests/error_reporting.rs
+++ b/protocols/request-response/tests/error_reporting.rs
@@ -12,13 +12,10 @@ use libp2p_swarm_test::SwarmExt;
 use request_response::{
     Codec, InboundFailure, InboundRequestId, OutboundFailure, OutboundRequestId, ResponseChannel,
 };
-use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
 async fn report_outbound_failure_on_read_response() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (peer1_id, mut swarm1) = new_swarm();
     let (peer2_id, mut swarm2) = new_swarm();
@@ -72,10 +69,7 @@ async fn report_outbound_failure_on_read_response() {
 
 #[async_std::test]
 async fn report_outbound_failure_on_write_request() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
-
+    libp2p_test_utils::with_default_env_filter();
     let (peer1_id, mut swarm1) = new_swarm();
     let (_peer2_id, mut swarm2) = new_swarm();
 
@@ -115,9 +109,7 @@ async fn report_outbound_failure_on_write_request() {
 
 #[async_std::test]
 async fn report_outbound_timeout_on_read_response() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     // `swarm1` needs to have a bigger timeout to avoid racing
     let (peer1_id, mut swarm1) = new_swarm_with_timeout(Duration::from_millis(200));
@@ -162,9 +154,7 @@ async fn report_outbound_timeout_on_read_response() {
 
 #[async_std::test]
 async fn report_outbound_failure_on_max_streams() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     // `swarm2` will be able to handle only 1 stream per time.
     let swarm2_config = request_response::Config::default()
@@ -214,9 +204,7 @@ async fn report_outbound_failure_on_max_streams() {
 
 #[async_std::test]
 async fn report_inbound_failure_on_read_request() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (peer1_id, mut swarm1) = new_swarm();
     let (_peer2_id, mut swarm2) = new_swarm();
@@ -251,9 +239,7 @@ async fn report_inbound_failure_on_read_request() {
 
 #[async_std::test]
 async fn report_inbound_failure_on_write_response() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (peer1_id, mut swarm1) = new_swarm();
     let (peer2_id, mut swarm2) = new_swarm();
@@ -317,9 +303,7 @@ async fn report_inbound_failure_on_write_response() {
 
 #[async_std::test]
 async fn report_inbound_timeout_on_write_response() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     // `swarm2` needs to have a bigger timeout to avoid racing
     let (peer1_id, mut swarm1) = new_swarm_with_timeout(Duration::from_millis(100));
diff --git a/protocols/request-response/tests/peer_address.rs b/protocols/request-response/tests/peer_address.rs
index 603e2d09dc0..714091fc682 100644
--- a/protocols/request-response/tests/peer_address.rs
+++ b/protocols/request-response/tests/peer_address.rs
@@ -6,14 +6,11 @@ use libp2p_request_response::ProtocolSupport;
 use libp2p_swarm::{StreamProtocol, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use serde::{Deserialize, Serialize};
-use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
 #[cfg(feature = "cbor")]
 async fn dial_succeeds_after_adding_peers_address() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
     let config = request_response::Config::default();
diff --git a/protocols/request-response/tests/ping.rs b/protocols/request-response/tests/ping.rs
index 94adedac2d7..12458a0e5e7 100644
--- a/protocols/request-response/tests/ping.rs
+++ b/protocols/request-response/tests/ping.rs
@@ -30,14 +30,11 @@ use libp2p_swarm::{StreamProtocol, Swarm, SwarmEvent};
 use libp2p_swarm_test::SwarmExt;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use tracing_subscriber::EnvFilter;
 
 #[async_std::test]
 #[cfg(feature = "cbor")]
 async fn is_response_outbound() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let ping = Ping("ping".to_string().into_bytes());
     let offline_peer = PeerId::random();
 
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
index d9c9276cb12..adb7a797794 100644
--- a/protocols/stream/Cargo.toml
+++ b/protocols/stream/Cargo.toml
@@ -20,7 +20,7 @@ rand = "0.8"
 [dev-dependencies]
 libp2p-swarm-test = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/protocols/stream/tests/lib.rs b/protocols/stream/tests/lib.rs
index cd6caaced5e..425b49adfaf 100644
--- a/protocols/stream/tests/lib.rs
+++ b/protocols/stream/tests/lib.rs
@@ -5,23 +5,20 @@ use libp2p_identity::PeerId;
 use libp2p_stream as stream;
 use libp2p_swarm::{StreamProtocol, Swarm};
 use libp2p_swarm_test::SwarmExt as _;
+use libp2p_test_utils::EnvFilter;
 use stream::OpenStreamError;
 use tracing::level_filters::LevelFilter;
-use tracing_subscriber::EnvFilter;
 
 const PROTOCOL: StreamProtocol = StreamProtocol::new("/test");
 
 #[tokio::test]
 async fn dropping_incoming_streams_deregisters() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(
-            EnvFilter::builder()
-                .with_default_directive(LevelFilter::DEBUG.into())
-                .from_env()
-                .unwrap(),
-        )
-        .with_test_writer()
-        .try_init();
+    libp2p_test_utils::with_env_filter(
+        EnvFilter::builder()
+            .with_default_directive(LevelFilter::DEBUG.into())
+            .from_env()
+            .unwrap(),
+    );
 
     let mut swarm1 = Swarm::new_ephemeral(|_| stream::Behaviour::new());
     let mut swarm2 = Swarm::new_ephemeral(|_| stream::Behaviour::new());
diff --git a/rustfmt.toml b/rustfmt.toml
index 1e61bc16abf..fe1850ee986 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,5 +1,5 @@
 # Imports
-reorder_imports  = true
+reorder_imports = true
 imports_granularity = "Crate"
 group_imports = "StdExternalCrate"
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index cf027d96ec0..b7e0fd73b5e 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -55,7 +55,7 @@ criterion = { version = "0.5", features = ["async_tokio"] }
 once_cell = "1.19.0"
 trybuild = "1.0.95"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [[test]]
 name = "swarm_derive"
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
index 32cae54a5ef..a1c7b2a2f20 100644
--- a/swarm/src/connection.rs
+++ b/swarm/src/connection.rs
@@ -797,16 +797,13 @@ mod tests {
         StreamMuxer,
     };
     use quickcheck::*;
-    use tracing_subscriber::EnvFilter;
 
     use super::*;
     use crate::dummy;
 
     #[test]
     fn max_negotiating_inbound_streams() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         fn prop(max_negotiating_inbound_streams: u8) {
             let max_negotiating_inbound_streams: usize = max_negotiating_inbound_streams.into();
@@ -974,9 +971,7 @@ mod tests {
 
     #[test]
     fn checked_add_fraction_can_add_u64_max() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
         let start = Instant::now();
 
         let duration = checked_add_fraction(start, Duration::from_secs(u64::MAX));
@@ -986,9 +981,7 @@ mod tests {
 
     #[test]
     fn compute_new_shutdown_does_not_panic() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         #[derive(Debug)]
         struct ArbitraryShutdown(Shutdown);
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
index 91513c83559..f9c4c71c76f 100644
--- a/swarm/src/lib.rs
+++ b/swarm/src/lib.rs
@@ -2303,9 +2303,7 @@ mod tests {
 
     #[tokio::test]
     async fn aborting_pending_connection_surfaces_error() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         let mut dialer = new_test_swarm(Config::with_tokio_executor());
         let mut listener = new_test_swarm(Config::with_tokio_executor());
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
index 2a12c34a383..a07e795397b 100644
--- a/transports/dns/Cargo.toml
+++ b/transports/dns/Cargo.toml
@@ -25,7 +25,7 @@ tracing = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["rt", "time"] }
 async-std-crate = { package = "async-std", version = "1.6" }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [features]
 async-std = ["async-std-resolver"]
diff --git a/transports/dns/src/lib.rs b/transports/dns/src/lib.rs
index 7e3cf5d3c37..581942b8b7e 100644
--- a/transports/dns/src/lib.rs
+++ b/transports/dns/src/lib.rs
@@ -629,9 +629,7 @@ mod tests {
 
     #[test]
     fn basic_resolve() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         #[derive(Clone)]
         struct CustomTransport;
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
index d0e2f9004ce..a1b712dbdaf 100644
--- a/transports/noise/Cargo.toml
+++ b/transports/noise/Cargo.toml
@@ -34,7 +34,7 @@ snow = { version = "0.9.5", features = ["default-resolver"], default-features =
 [dev-dependencies]
 futures_ringbuf = "0.4.0"
 quickcheck = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/transports/noise/tests/smoke.rs b/transports/noise/tests/smoke.rs
index abc5a038f93..cd9702b1c2f 100644
--- a/transports/noise/tests/smoke.rs
+++ b/transports/noise/tests/smoke.rs
@@ -29,7 +29,6 @@ use libp2p_core::{
 use libp2p_identity as identity;
 use libp2p_noise as noise;
 use quickcheck::*;
-use tracing_subscriber::EnvFilter;
 
 #[allow(dead_code)]
 fn core_upgrade_compat() {
@@ -44,9 +43,7 @@ fn core_upgrade_compat() {
 
 #[test]
 fn xx() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     fn prop(mut messages: Vec<Message>) -> bool {
         messages.truncate(5);
         let server_id = identity::Keypair::generate_ed25519();
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
index 9e1e5449158..95f8f5af065 100644
--- a/transports/plaintext/Cargo.toml
+++ b/transports/plaintext/Cargo.toml
@@ -24,7 +24,7 @@ quick-protobuf-codec = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519", "rand"] }
 quickcheck = { workspace = true }
 futures_ringbuf = "0.4.0"
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/plaintext/tests/smoke.rs b/transports/plaintext/tests/smoke.rs
index f77f23d3ad3..ee8cec46c0b 100644
--- a/transports/plaintext/tests/smoke.rs
+++ b/transports/plaintext/tests/smoke.rs
@@ -23,13 +23,10 @@ use libp2p_core::upgrade::InboundConnectionUpgrade;
 use libp2p_identity as identity;
 use libp2p_plaintext as plaintext;
 use quickcheck::QuickCheck;
-use tracing_subscriber::EnvFilter;
 
 #[test]
 fn variable_msg_length() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     fn prop(msg: Vec<u8>) {
         let msg_to_send = msg.clone();
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
index bff0a024bd4..1c35b293049 100644
--- a/transports/quic/Cargo.toml
+++ b/transports/quic/Cargo.toml
@@ -43,7 +43,7 @@ libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
 quickcheck = "1"
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 [[test]]
 name = "stream_compliance"
diff --git a/transports/quic/tests/smoke.rs b/transports/quic/tests/smoke.rs
index 5fbef84649e..f0a8bd97d70 100644
--- a/transports/quic/tests/smoke.rs
+++ b/transports/quic/tests/smoke.rs
@@ -33,7 +33,6 @@ use libp2p_tcp as tcp;
 use libp2p_yamux as yamux;
 use quic::Provider;
 use rand::RngCore;
-use tracing_subscriber::EnvFilter;
 
 #[cfg(feature = "tokio")]
 #[tokio::test]
@@ -50,9 +49,7 @@ async fn async_std_smoke() {
 #[cfg(feature = "tokio")]
 #[tokio::test]
 async fn endpoint_reuse() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (_, mut a_transport) = create_default_transport::<quic::tokio::Provider>();
     let (_, mut b_transport) = create_default_transport::<quic::tokio::Provider>();
 
@@ -77,9 +74,7 @@ async fn endpoint_reuse() {
 #[cfg(feature = "async-std")]
 #[async_std::test]
 async fn ipv4_dial_ipv6() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (a_peer_id, mut a_transport) = create_default_transport::<quic::async_std::Provider>();
     let (b_peer_id, mut b_transport) = create_default_transport::<quic::async_std::Provider>();
 
@@ -99,9 +94,7 @@ async fn ipv4_dial_ipv6() {
 async fn wrapped_with_delay() {
     use libp2p_core::transport::DialOpts;
 
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     struct DialDelay(Arc<Mutex<Boxed<(PeerId, StreamMuxerBox)>>>);
 
@@ -271,9 +264,7 @@ async fn tcp_and_quic() {
 #[cfg(feature = "async-std")]
 #[test]
 fn concurrent_connections_and_streams_async_std() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     quickcheck::QuickCheck::new()
         .min_tests_passed(1)
@@ -284,9 +275,7 @@ fn concurrent_connections_and_streams_async_std() {
 #[cfg(feature = "tokio")]
 #[test]
 fn concurrent_connections_and_streams_tokio() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let rt = tokio::runtime::Runtime::new().unwrap();
     let _guard = rt.enter();
@@ -303,9 +292,7 @@ async fn draft_29_support() {
     use futures::{future::poll_fn, select};
     use libp2p_core::transport::TransportError;
 
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (_, mut a_transport) =
         create_transport::<quic::tokio::Provider>(|cfg| cfg.support_draft_29 = true);
@@ -380,9 +367,7 @@ async fn draft_29_support() {
 #[cfg(feature = "async-std")]
 #[async_std::test]
 async fn backpressure() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let max_stream_data = quic::Config::new(&generate_tls_keypair()).max_stream_data;
 
     let (mut stream_a, mut stream_b) = build_streams::<quic::async_std::Provider>().await;
@@ -406,9 +391,7 @@ async fn backpressure() {
 #[cfg(feature = "async-std")]
 #[async_std::test]
 async fn read_after_peer_dropped_stream() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (mut stream_a, mut stream_b) = build_streams::<quic::async_std::Provider>().await;
 
     let data = vec![0; 10];
@@ -428,9 +411,7 @@ async fn read_after_peer_dropped_stream() {
 #[async_std::test]
 #[should_panic]
 async fn write_after_peer_dropped_stream() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
     let (stream_a, mut stream_b) = build_streams::<quic::async_std::Provider>().await;
     drop(stream_a);
     futures_timer::Delay::new(Duration::from_millis(100)).await;
@@ -484,9 +465,7 @@ async fn test_local_listener_reuse() {
 }
 
 async fn smoke<P: Provider>() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (a_peer_id, mut a_transport) = create_default_transport::<P>();
     let (b_peer_id, mut b_transport) = create_default_transport::<P>();
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
index baa3b2f46dd..61c31e49639 100644
--- a/transports/tcp/Cargo.toml
+++ b/transports/tcp/Cargo.toml
@@ -28,7 +28,7 @@ async-io = ["dep:async-io", "if-watch/smol"]
 [dev-dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 tokio = { workspace = true, features = ["full"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+libp2p-test-utils = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
index fefa18fb431..5d3e46bcb09 100644
--- a/transports/tcp/src/lib.rs
+++ b/transports/tcp/src/lib.rs
@@ -762,9 +762,7 @@ mod tests {
 
     #[test]
     fn communicating_between_dialer_and_listener() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         async fn listener<T: Provider>(addr: Multiaddr, mut ready_tx: mpsc::Sender<Multiaddr>) {
             let mut tcp = Transport::<T>::default().boxed();
@@ -843,9 +841,7 @@ mod tests {
 
     #[test]
     fn wildcard_expansion() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         async fn listener<T: Provider>(addr: Multiaddr, mut ready_tx: mpsc::Sender<Multiaddr>) {
             let mut tcp = Transport::<T>::default().boxed();
@@ -923,9 +919,7 @@ mod tests {
 
     #[test]
     fn port_reuse_dialing() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         async fn listener<T: Provider>(
             addr: Multiaddr,
@@ -1042,9 +1036,7 @@ mod tests {
 
     #[test]
     fn port_reuse_listening() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         async fn listen_twice<T: Provider>(addr: Multiaddr) {
             let mut tcp = Transport::<T>::new(Config::new());
@@ -1098,9 +1090,7 @@ mod tests {
 
     #[test]
     fn listen_port_0() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         async fn listen<T: Provider>(addr: Multiaddr) -> Multiaddr {
             let mut tcp = Transport::<T>::default().boxed();
@@ -1135,9 +1125,7 @@ mod tests {
 
     #[test]
     fn listen_invalid_addr() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         fn test(addr: Multiaddr) {
             #[cfg(feature = "async-io")]
@@ -1158,9 +1146,7 @@ mod tests {
 
     #[test]
     fn test_remove_listener() {
-        let _ = tracing_subscriber::fmt()
-            .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-            .try_init();
+        libp2p_test_utils::with_default_env_filter();
 
         async fn cycle_listeners<T: Provider>() -> bool {
             let mut tcp = Transport::<T>::default().boxed();
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index f3d2e57147e..d010d4c1044 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -38,8 +38,7 @@ pem = ["webrtc?/pem"]
 libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["full"] }
 quickcheck = "1.0.3"
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-
+libp2p-test-utils = { workspace = true }
 
 [[test]]
 name = "smoke"
diff --git a/transports/webrtc/tests/smoke.rs b/transports/webrtc/tests/smoke.rs
index 5f67c09d962..e27e3cee672 100644
--- a/transports/webrtc/tests/smoke.rs
+++ b/transports/webrtc/tests/smoke.rs
@@ -42,13 +42,10 @@ use libp2p_core::{
 use libp2p_identity::PeerId;
 use libp2p_webrtc as webrtc;
 use rand::{thread_rng, RngCore};
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn smoke() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let (a_peer_id, mut a_transport) = create_transport();
     let (b_peer_id, mut b_transport) = create_transport();
@@ -65,9 +62,7 @@ async fn smoke() {
 // Note: This test should likely be ported to the muxer compliance test suite.
 #[test]
 fn concurrent_connections_and_streams_tokio() {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .try_init();
+    libp2p_test_utils::with_default_env_filter();
 
     let rt = tokio::runtime::Runtime::new().unwrap();
     let _guard = rt.enter();

From 0ad6c9aa28716bfa8386846721c9ae7df5c5abcc Mon Sep 17 00:00:00 2001
From: hopinheimer <48147533+hopinheimer@users.noreply.github.com>
Date: Fri, 27 Dec 2024 15:56:36 -0500
Subject: [PATCH 446/455] feat(gossipsub): implement gossipsub 1.2 beta

This PR implements gossipsub 1.2 beta bringing changes over from lighthouse
ref PR: https://github.com/sigp/lighthouse/pull/5422

Please include any relevant issues in here, for example:
https://github.com/libp2p/specs/pull/548

Pull-Request: #5697.
---
 Cargo.lock                                    |  10 +
 Cargo.toml                                    |   1 +
 protocols/gossipsub/CHANGELOG.md              |   3 +
 protocols/gossipsub/Cargo.toml                |   1 +
 protocols/gossipsub/src/behaviour.rs          | 198 ++++++++++----
 protocols/gossipsub/src/behaviour/tests.rs    | 246 +++++++++++++++++-
 .../gossipsub/src/generated/gossipsub/pb.rs   |  36 +++
 protocols/gossipsub/src/generated/rpc.proto   |   9 +-
 protocols/gossipsub/src/gossip_promises.rs    |   8 +
 protocols/gossipsub/src/handler.rs            |   2 +-
 protocols/gossipsub/src/metrics.rs            |  35 +++
 protocols/gossipsub/src/protocol.rs           |  30 ++-
 protocols/gossipsub/src/rpc.rs                |   2 +-
 protocols/gossipsub/src/types.rs              |  56 +++-
 14 files changed, 571 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7a5497c5701..5d9a22cf579 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1926,6 +1926,15 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashlink"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+dependencies = [
+ "hashbrown 0.14.3",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2858,6 +2867,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "getrandom 0.2.15",
+ "hashlink",
  "hex_fmt",
  "libp2p-core",
  "libp2p-identity",
diff --git a/Cargo.toml b/Cargo.toml
index 1819e68edf4..8c5c4c320c1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,6 +141,7 @@ tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 unsigned-varint = { version = "0.8.0" }
 web-time = "1.1.0"
+hashlink = "0.9.0"
 
 [patch.crates-io]
 
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index e9663c4c39c..5e18f284fc4 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 0.48.0
 
+- Introduce Gossipsub v1.2 [spec](https://github.com/libp2p/specs/blob/master/pubsub/gossipsub/gossipsub-v1.2.md).
+  See [PR 5697](https://github.com/libp2p/rust-libp2p/pull/5697)
+
 - Correct state inconsistencies with the mesh and fanout when unsubscribing.
   See [PR 5690](https://github.com/libp2p/rust-libp2p/pull/5690)
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index 298cdee21e9..328d4367204 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -24,6 +24,7 @@ fnv = "1.0.7"
 futures = { workspace = true }
 futures-timer = "3.0.2"
 getrandom = { workspace = true }
+hashlink = { workspace = true}
 hex_fmt = "0.3.0"
 web-time = { workspace = true }
 libp2p-core = { workspace = true }
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 954e87ee470..4643f2bd97f 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -30,6 +30,7 @@ use std::{
 
 use futures::FutureExt;
 use futures_timer::Delay;
+use hashlink::LinkedHashMap;
 use libp2p_core::{
     multiaddr::Protocol::{Ip4, Ip6},
     transport::PortUse,
@@ -63,8 +64,9 @@ use crate::{
     topic::{Hasher, Topic, TopicHash},
     transform::{DataTransform, IdentityTransform},
     types::{
-        ControlAction, Graft, IHave, IWant, Message, MessageAcceptance, MessageId, PeerConnections,
-        PeerInfo, PeerKind, Prune, RawMessage, RpcOut, Subscription, SubscriptionAction,
+        ControlAction, Graft, IDontWant, IHave, IWant, Message, MessageAcceptance, MessageId,
+        PeerConnections, PeerInfo, PeerKind, Prune, RawMessage, RpcOut, Subscription,
+        SubscriptionAction,
     },
     FailedMessages, PublishError, SubscriptionError, TopicScoreParams, ValidationError,
 };
@@ -72,6 +74,12 @@ use crate::{
 #[cfg(test)]
 mod tests;
 
+/// IDONTWANT cache capacity.
+const IDONTWANT_CAP: usize = 10_000;
+
+/// IDONTWANT timeout before removal.
+const IDONTWANT_TIMEOUT: Duration = Duration::new(3, 0);
+
 /// Determines if published messages should be signed or not.
 ///
 /// Without signing, a number of privacy preserving modes can be selected.
@@ -306,7 +314,7 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
 
     /// Stores optional peer score data together with thresholds, decay interval and gossip
     /// promises.
-    peer_score: Option<(PeerScore, PeerScoreThresholds, Delay, GossipPromises)>,
+    peer_score: Option<(PeerScore, PeerScoreThresholds, Delay)>,
 
     /// Counts the number of `IHAVE` received from each peer since the last heartbeat.
     count_received_ihave: HashMap<PeerId, usize>,
@@ -331,6 +339,9 @@ pub struct Behaviour<D = IdentityTransform, F = AllowAllSubscriptionFilter> {
 
     /// Tracks the numbers of failed messages per peer-id.
     failed_messages: HashMap<PeerId, FailedMessages>,
+
+    /// Tracks recently sent `IWANT` messages and checks if peers respond to them.
+    gossip_promises: GossipPromises,
 }
 
 impl<D, F> Behaviour<D, F>
@@ -464,6 +475,7 @@ where
             subscription_filter,
             data_transform,
             failed_messages: Default::default(),
+            gossip_promises: Default::default(),
         })
     }
 }
@@ -897,7 +909,7 @@ where
 
         let interval = Delay::new(params.decay_interval);
         let peer_score = PeerScore::new_with_message_delivery_time_callback(params, callback);
-        self.peer_score = Some((peer_score, threshold, interval, GossipPromises::default()));
+        self.peer_score = Some((peer_score, threshold, interval));
         Ok(())
     }
 
@@ -1161,7 +1173,7 @@ where
     }
 
     fn score_below_threshold_from_scores(
-        peer_score: &Option<(PeerScore, PeerScoreThresholds, Delay, GossipPromises)>,
+        peer_score: &Option<(PeerScore, PeerScoreThresholds, Delay)>,
         peer_id: &PeerId,
         threshold: impl Fn(&PeerScoreThresholds) -> f64,
     ) -> (bool, f64) {
@@ -1222,10 +1234,7 @@ where
                 return false;
             }
 
-            self.peer_score
-                .as_ref()
-                .map(|(_, _, _, promises)| !promises.contains(id))
-                .unwrap_or(true)
+            !self.gossip_promises.contains(id)
         };
 
         for (topic, ids) in ihave_msgs {
@@ -1272,13 +1281,11 @@ where
             iwant_ids_vec.truncate(iask);
             *iasked += iask;
 
-            if let Some((_, _, _, gossip_promises)) = &mut self.peer_score {
-                gossip_promises.add_promise(
-                    *peer_id,
-                    &iwant_ids_vec,
-                    Instant::now() + self.config.iwant_followup_time(),
-                );
-            }
+            self.gossip_promises.add_promise(
+                *peer_id,
+                &iwant_ids_vec,
+                Instant::now() + self.config.iwant_followup_time(),
+            );
             tracing::trace!(
                 peer=%peer_id,
                 "IHAVE: Asking for the following messages from peer: {:?}",
@@ -1642,14 +1649,15 @@ where
                 peer=%propagation_source,
                 "Rejecting message from blacklisted peer"
             );
-            if let Some((peer_score, .., gossip_promises)) = &mut self.peer_score {
+            self.gossip_promises
+                .reject_message(msg_id, &RejectReason::BlackListedPeer);
+            if let Some((peer_score, ..)) = &mut self.peer_score {
                 peer_score.reject_message(
                     propagation_source,
                     msg_id,
                     &raw_message.topic,
                     RejectReason::BlackListedPeer,
                 );
-                gossip_promises.reject_message(msg_id, &RejectReason::BlackListedPeer);
             }
             return false;
         }
@@ -1731,6 +1739,9 @@ where
         // Calculate the message id on the transformed data.
         let msg_id = self.config.message_id(&message);
 
+        // Broadcast IDONTWANT messages.
+        self.send_idontwant(&raw_message, &msg_id, propagation_source);
+
         // Check the validity of the message
         // Peers get penalized if this message is invalid. We don't add it to the duplicate cache
         // and instead continually penalize peers that repeatedly send this message.
@@ -1758,9 +1769,11 @@ where
 
         // Tells score that message arrived (but is maybe not fully validated yet).
         // Consider the message as delivered for gossip promises.
-        if let Some((peer_score, .., gossip_promises)) = &mut self.peer_score {
+        self.gossip_promises.message_delivered(&msg_id);
+
+        // Tells score that message arrived (but is maybe not fully validated yet).
+        if let Some((peer_score, ..)) = &mut self.peer_score {
             peer_score.validate_message(propagation_source, &msg_id, &message.topic);
-            gossip_promises.message_delivered(&msg_id);
         }
 
         // Add the message to our memcache
@@ -1802,12 +1815,14 @@ where
         raw_message: &RawMessage,
         reject_reason: RejectReason,
     ) {
-        if let Some((peer_score, .., gossip_promises)) = &mut self.peer_score {
-            if let Some(metrics) = self.metrics.as_mut() {
-                metrics.register_invalid_message(&raw_message.topic);
-            }
+        if let Some(metrics) = self.metrics.as_mut() {
+            metrics.register_invalid_message(&raw_message.topic);
+        }
 
-            if let Ok(message) = self.data_transform.inbound_transform(raw_message.clone()) {
+        let message = self.data_transform.inbound_transform(raw_message.clone());
+
+        match (&mut self.peer_score, message) {
+            (Some((peer_score, ..)), Ok(message)) => {
                 let message_id = self.config.message_id(&message);
 
                 peer_score.reject_message(
@@ -1817,13 +1832,22 @@ where
                     reject_reason,
                 );
 
-                gossip_promises.reject_message(&message_id, &reject_reason);
-            } else {
+                self.gossip_promises
+                    .reject_message(&message_id, &reject_reason);
+            }
+            (Some((peer_score, ..)), Err(_)) => {
                 // The message is invalid, we reject it ignoring any gossip promises. If a peer is
                 // advertising this message via an IHAVE and it's invalid it will be double
                 // penalized, one for sending us an invalid and again for breaking a promise.
                 peer_score.reject_invalid_message(propagation_source, &raw_message.topic);
             }
+            (None, Ok(message)) => {
+                // Valid transformation without peer scoring
+                let message_id = self.config.message_id(&message);
+                self.gossip_promises
+                    .reject_message(&message_id, &reject_reason);
+            }
+            (None, Err(_)) => {}
         }
     }
 
@@ -1890,7 +1914,7 @@ where
 
                     // if the mesh needs peers add the peer to the mesh
                     if !self.explicit_peers.contains(propagation_source)
-                        && matches!(peer.kind, PeerKind::Gossipsubv1_1 | PeerKind::Gossipsub)
+                        && peer.kind.is_gossipsub()
                         && !Self::score_below_threshold_from_scores(
                             &self.peer_score,
                             propagation_source,
@@ -1994,8 +2018,8 @@ where
 
     /// Applies penalties to peers that did not respond to our IWANT requests.
     fn apply_iwant_penalties(&mut self) {
-        if let Some((peer_score, .., gossip_promises)) = &mut self.peer_score {
-            for (peer, count) in gossip_promises.get_broken_promises() {
+        if let Some((peer_score, ..)) = &mut self.peer_score {
+            for (peer, count) in self.gossip_promises.get_broken_promises() {
                 peer_score.add_penalty(&peer, count);
                 if let Some(metrics) = self.metrics.as_mut() {
                     metrics.register_score_penalty(Penalty::BrokenPromise);
@@ -2216,7 +2240,7 @@ where
                 && peers.len() > 1
                 && self.peer_score.is_some()
             {
-                if let Some((_, thresholds, _, _)) = &self.peer_score {
+                if let Some((_, thresholds, _)) = &self.peer_score {
                     // Opportunistic grafting works as follows: we check the median score of peers
                     // in the mesh; if this score is below the opportunisticGraftThreshold, we
                     // select a few peers at random with score over the median.
@@ -2309,7 +2333,7 @@ where
         for (topic_hash, peers) in self.fanout.iter_mut() {
             let mut to_remove_peers = Vec::new();
             let publish_threshold = match &self.peer_score {
-                Some((_, thresholds, _, _)) => thresholds.publish_threshold,
+                Some((_, thresholds, _)) => thresholds.publish_threshold,
                 _ => 0.0,
             };
             for peer_id in peers.iter() {
@@ -2402,6 +2426,17 @@ where
         }
         self.failed_messages.shrink_to_fit();
 
+        // Flush stale IDONTWANTs.
+        for peer in self.connected_peers.values_mut() {
+            while let Some((_front, instant)) = peer.dont_send.front() {
+                if (*instant + IDONTWANT_TIMEOUT) >= Instant::now() {
+                    break;
+                } else {
+                    peer.dont_send.pop_front();
+                }
+            }
+        }
+
         tracing::debug!("Completed Heartbeat");
         if let Some(metrics) = self.metrics.as_mut() {
             let duration = u64::try_from(start.elapsed().as_millis()).unwrap_or(u64::MAX);
@@ -2557,6 +2592,49 @@ where
         }
     }
 
+    /// Helper function which sends an IDONTWANT message to mesh\[topic\] peers.
+    fn send_idontwant(
+        &mut self,
+        message: &RawMessage,
+        msg_id: &MessageId,
+        propagation_source: &PeerId,
+    ) {
+        let Some(mesh_peers) = self.mesh.get(&message.topic) else {
+            return;
+        };
+
+        let iwant_peers = self.gossip_promises.peers_for_message(msg_id);
+
+        let recipient_peers: Vec<PeerId> = mesh_peers
+            .iter()
+            .chain(iwant_peers.iter())
+            .filter(|peer_id| {
+                *peer_id != propagation_source && Some(*peer_id) != message.source.as_ref()
+            })
+            .cloned()
+            .collect();
+
+        for peer_id in recipient_peers {
+            let Some(peer) = self.connected_peers.get_mut(&peer_id) else {
+                tracing::error!(peer = %peer_id,
+                    "Could not IDONTWANT, peer doesn't exist in connected peer list");
+                continue;
+            };
+
+            // Only gossipsub 1.2 peers support IDONTWANT.
+            if peer.kind != PeerKind::Gossipsubv1_2 {
+                continue;
+            }
+
+            self.send_message(
+                peer_id,
+                RpcOut::IDontWant(IDontWant {
+                    message_ids: vec![msg_id.clone()],
+                }),
+            );
+        }
+    }
+
     /// Helper function which forwards a message to mesh\[topic\] peers.
     ///
     /// Returns true if at least one peer was messaged.
@@ -2612,13 +2690,23 @@ where
         }
 
         // forward the message to peers
-        for peer in recipient_peers.iter() {
-            let event = RpcOut::Forward {
-                message: message.clone(),
-                timeout: Delay::new(self.config.forward_queue_duration()),
-            };
-            tracing::debug!(%peer, message=%msg_id, "Sending message to peer");
-            self.send_message(*peer, event);
+        for peer_id in recipient_peers.iter() {
+            if let Some(peer) = self.connected_peers.get_mut(peer_id) {
+                if peer.dont_send.contains_key(msg_id) {
+                    tracing::debug!(%peer_id, message=%msg_id, "Peer doesn't want message");
+                    continue;
+                }
+
+                tracing::debug!(%peer_id, message=%msg_id, "Sending message to peer");
+
+                self.send_message(
+                    *peer_id,
+                    RpcOut::Forward {
+                        message: message.clone(),
+                        timeout: Delay::new(self.config.forward_queue_duration()),
+                    },
+                );
+            }
         }
         tracing::debug!("Completed forwarding message");
         true
@@ -2754,7 +2842,7 @@ where
                         failed_messages.non_priority += 1;
                         failed_messages.forward += 1;
                     }
-                    RpcOut::IWant(_) | RpcOut::IHave(_) => {
+                    RpcOut::IWant(_) | RpcOut::IHave(_) | RpcOut::IDontWant(_) => {
                         failed_messages.non_priority += 1;
                     }
                     RpcOut::Graft(_)
@@ -2914,7 +3002,7 @@ where
 
             // If metrics are enabled, register the disconnection of a peer based on its protocol.
             if let Some(metrics) = self.metrics.as_mut() {
-                metrics.peer_protocol_disconnected(connected_peer.kind.clone());
+                metrics.peer_protocol_disconnected(connected_peer.kind);
             }
 
             self.connected_peers.remove(&peer_id);
@@ -2994,6 +3082,7 @@ where
                 connections: vec![],
                 sender: Sender::new(self.config.connection_handler_queue_len()),
                 topics: Default::default(),
+                dont_send: LinkedHashMap::new(),
             });
         // Add the new connection
         connected_peer.connections.push(connection_id);
@@ -3020,6 +3109,7 @@ where
                 connections: vec![],
                 sender: Sender::new(self.config.connection_handler_queue_len()),
                 topics: Default::default(),
+                dont_send: LinkedHashMap::new(),
             });
         // Add the new connection
         connected_peer.connections.push(connection_id);
@@ -3041,7 +3131,7 @@ where
                 // We have identified the protocol this peer is using
 
                 if let Some(metrics) = self.metrics.as_mut() {
-                    metrics.peer_protocol_connected(kind.clone());
+                    metrics.peer_protocol_connected(kind);
                 }
 
                 if let PeerKind::NotSupported = kind {
@@ -3069,7 +3159,7 @@ where
             }
             HandlerEvent::MessageDropped(rpc) => {
                 // Account for this in the scoring logic
-                if let Some((peer_score, _, _, _)) = &mut self.peer_score {
+                if let Some((peer_score, _, _)) = &mut self.peer_score {
                     peer_score.failed_message_slow_peer(&propagation_source);
                 }
 
@@ -3177,6 +3267,24 @@ where
                             peers,
                             backoff,
                         }) => prune_msgs.push((topic_hash, peers, backoff)),
+                        ControlAction::IDontWant(IDontWant { message_ids }) => {
+                            let Some(peer) = self.connected_peers.get_mut(&propagation_source)
+                            else {
+                                tracing::error!(peer = %propagation_source,
+                                    "Could not handle IDONTWANT, peer doesn't exist in connected peer list");
+                                continue;
+                            };
+                            if let Some(metrics) = self.metrics.as_mut() {
+                                metrics.register_idontwant(message_ids.len());
+                            }
+                            for message_id in message_ids {
+                                peer.dont_send.insert(message_id, Instant::now());
+                                // Don't exceed capacity.
+                                if peer.dont_send.len() > IDONTWANT_CAP {
+                                    peer.dont_send.pop_front();
+                                }
+                            }
+                        }
                     }
                 }
                 if !ihave_msgs.is_empty() {
@@ -3202,7 +3310,7 @@ where
         }
 
         // update scores
-        if let Some((peer_score, _, delay, _)) = &mut self.peer_score {
+        if let Some((peer_score, _, delay)) = &mut self.peer_score {
             if delay.poll_unpin(cx).is_ready() {
                 peer_score.refresh_scores();
                 delay.reset(peer_score.params.decay_interval);
@@ -3329,7 +3437,7 @@ fn get_random_peers_dynamic(
         .iter()
         .filter(|(_, p)| p.topics.contains(topic_hash))
         .filter(|(peer_id, _)| f(peer_id))
-        .filter(|(_, p)| p.kind == PeerKind::Gossipsub || p.kind == PeerKind::Gossipsubv1_1)
+        .filter(|(_, p)| p.kind.is_gossipsub())
         .map(|(peer_id, _)| *peer_id)
         .collect::<Vec<PeerId>>();
 
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index bf3046da78b..f3d24897b0c 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -33,13 +33,7 @@ use crate::{
 };
 
 #[derive(Default, Debug)]
-struct InjectNodes<D, F>
-// TODO: remove trait bound Default when this issue is fixed:
-//  https://github.com/colin-kiegel/rust-derive-builder/issues/93
-where
-    D: DataTransform + Default + Clone + Send + 'static,
-    F: TopicSubscriptionFilter + Clone + Default + Send + 'static,
-{
+struct InjectNodes<D, F> {
     peer_no: usize,
     topics: Vec<String>,
     to_subscribe: bool,
@@ -49,6 +43,7 @@ where
     scoring: Option<(PeerScoreParams, PeerScoreThresholds)>,
     data_transform: D,
     subscription_filter: F,
+    peer_kind: Option<PeerKind>,
 }
 
 impl<D, F> InjectNodes<D, F>
@@ -96,7 +91,7 @@ where
 
         let empty = vec![];
         for i in 0..self.peer_no {
-            let (peer, receiver) = add_peer(
+            let (peer, receiver) = add_peer_with_addr_and_kind(
                 &mut gs,
                 if self.to_subscribe {
                     &topic_hashes
@@ -105,6 +100,8 @@ where
                 },
                 i < self.outbound,
                 i < self.explicit,
+                Multiaddr::empty(),
+                self.peer_kind.or(Some(PeerKind::Gossipsubv1_1)),
             );
             peers.push(peer);
             receivers.insert(peer, receiver);
@@ -153,6 +150,11 @@ where
         self.subscription_filter = subscription_filter;
         self
     }
+
+    fn peer_kind(mut self, peer_kind: PeerKind) -> Self {
+        self.peer_kind = Some(peer_kind);
+        self
+    }
 }
 
 fn inject_nodes<D, F>() -> InjectNodes<D, F>
@@ -235,10 +237,11 @@ where
     gs.connected_peers.insert(
         peer,
         PeerConnections {
-            kind: kind.clone().unwrap_or(PeerKind::Floodsub),
+            kind: kind.unwrap_or(PeerKind::Floodsub),
             connections: vec![connection_id],
             topics: Default::default(),
             sender,
+            dont_send: LinkedHashMap::new(),
         },
     );
 
@@ -625,6 +628,7 @@ fn test_join() {
                 connections: vec![connection_id],
                 topics: Default::default(),
                 sender,
+                dont_send: LinkedHashMap::new(),
             },
         );
         receivers.insert(random_peer, receiver);
@@ -1020,6 +1024,7 @@ fn test_get_random_peers() {
                 connections: vec![ConnectionId::new_unchecked(0)],
                 topics: topics.clone(),
                 sender: Sender::new(gs.config.connection_handler_queue_len()),
+                dont_send: LinkedHashMap::new(),
             },
         );
     }
@@ -4614,9 +4619,9 @@ fn test_ignore_too_many_messages_in_ihave() {
     let (peer, receiver) = add_peer(&mut gs, &topics, false, false);
     receivers.insert(peer, receiver);
 
-    // peer has 20 messages
+    // peer has 30 messages
     let mut seq = 0;
-    let message_ids: Vec<_> = (0..20)
+    let message_ids: Vec<_> = (0..30)
         .map(|_| random_message(&mut seq, &topics))
         .map(|msg| gs.data_transform.inbound_transform(msg).unwrap())
         .map(|msg| config.message_id(&msg))
@@ -4658,7 +4663,7 @@ fn test_ignore_too_many_messages_in_ihave() {
     gs.heartbeat();
     gs.handle_ihave(
         &peer,
-        vec![(topics[0].clone(), message_ids[10..20].to_vec())],
+        vec![(topics[0].clone(), message_ids[20..30].to_vec())],
     );
 
     // we sent 10 iwant messages ids via a IWANT rpc.
@@ -5266,6 +5271,194 @@ fn test_graft_without_subscribe() {
     let _ = gs.unsubscribe(&Topic::new(topic));
 }
 
+/// Test that a node sends IDONTWANT messages to the mesh peers
+/// that run Gossipsub v1.2.
+#[test]
+fn sends_idontwant() {
+    let (mut gs, peers, receivers, topic_hashes) = inject_nodes1()
+        .peer_no(5)
+        .topics(vec![String::from("topic1")])
+        .to_subscribe(true)
+        .gs_config(Config::default())
+        .explicit(1)
+        .peer_kind(PeerKind::Gossipsubv1_2)
+        .create_network();
+
+    let local_id = PeerId::random();
+
+    let message = RawMessage {
+        source: Some(peers[1]),
+        data: vec![12],
+        sequence_number: Some(0),
+        topic: topic_hashes[0].clone(),
+        signature: None,
+        key: None,
+        validated: true,
+    };
+    gs.handle_received_message(message.clone(), &local_id);
+    assert_eq!(
+        receivers
+            .into_iter()
+            .fold(0, |mut idontwants, (peer_id, c)| {
+                let non_priority = c.non_priority.get_ref();
+                while !non_priority.is_empty() {
+                    if let Ok(RpcOut::IDontWant(_)) = non_priority.try_recv() {
+                        assert_ne!(peer_id, peers[1]);
+                        idontwants += 1;
+                    }
+                }
+                idontwants
+            }),
+        3,
+        "IDONTWANT was not sent"
+    );
+}
+
+/// Test that a node doesn't send IDONTWANT messages to the mesh peers
+/// that don't run Gossipsub v1.2.
+#[test]
+fn doesnt_send_idontwant() {
+    let (mut gs, peers, receivers, topic_hashes) = inject_nodes1()
+        .peer_no(5)
+        .topics(vec![String::from("topic1")])
+        .to_subscribe(true)
+        .gs_config(Config::default())
+        .explicit(1)
+        .peer_kind(PeerKind::Gossipsubv1_1)
+        .create_network();
+
+    let local_id = PeerId::random();
+
+    let message = RawMessage {
+        source: Some(peers[1]),
+        data: vec![12],
+        sequence_number: Some(0),
+        topic: topic_hashes[0].clone(),
+        signature: None,
+        key: None,
+        validated: true,
+    };
+    gs.handle_received_message(message.clone(), &local_id);
+    assert_eq!(
+        receivers
+            .into_iter()
+            .fold(0, |mut idontwants, (peer_id, c)| {
+                let non_priority = c.non_priority.get_ref();
+                while !non_priority.is_empty() {
+                    if matches!(non_priority.try_recv(), Ok(RpcOut::IDontWant(_)) if peer_id != peers[1]) {
+                        idontwants += 1;
+                    }
+                }
+                idontwants
+            }),
+        0,
+        "IDONTWANT were sent"
+    );
+}
+
+/// Test that a node doesn't forward a messages to the mesh peers
+/// that sent IDONTWANT.
+#[test]
+fn doesnt_forward_idontwant() {
+    let (mut gs, peers, receivers, topic_hashes) = inject_nodes1()
+        .peer_no(4)
+        .topics(vec![String::from("topic1")])
+        .to_subscribe(true)
+        .gs_config(Config::default())
+        .explicit(1)
+        .peer_kind(PeerKind::Gossipsubv1_2)
+        .create_network();
+
+    let local_id = PeerId::random();
+
+    let raw_message = RawMessage {
+        source: Some(peers[1]),
+        data: vec![12],
+        sequence_number: Some(0),
+        topic: topic_hashes[0].clone(),
+        signature: None,
+        key: None,
+        validated: true,
+    };
+    let message = gs
+        .data_transform
+        .inbound_transform(raw_message.clone())
+        .unwrap();
+    let message_id = gs.config.message_id(&message);
+    let peer = gs.connected_peers.get_mut(&peers[2]).unwrap();
+    peer.dont_send.insert(message_id, Instant::now());
+
+    gs.handle_received_message(raw_message.clone(), &local_id);
+    assert_eq!(
+        receivers.into_iter().fold(0, |mut fwds, (peer_id, c)| {
+            let non_priority = c.non_priority.get_ref();
+            while !non_priority.is_empty() {
+                if let Ok(RpcOut::Forward { .. }) = non_priority.try_recv() {
+                    assert_ne!(peer_id, peers[2]);
+                    fwds += 1;
+                }
+            }
+            fwds
+        }),
+        2,
+        "IDONTWANT was not sent"
+    );
+}
+
+/// Test that a node parses an
+/// IDONTWANT message to the respective peer.
+#[test]
+fn parses_idontwant() {
+    let (mut gs, peers, _receivers, _topic_hashes) = inject_nodes1()
+        .peer_no(2)
+        .topics(vec![String::from("topic1")])
+        .to_subscribe(true)
+        .gs_config(Config::default())
+        .explicit(1)
+        .peer_kind(PeerKind::Gossipsubv1_2)
+        .create_network();
+
+    let message_id = MessageId::new(&[0, 1, 2, 3]);
+    let rpc = Rpc {
+        messages: vec![],
+        subscriptions: vec![],
+        control_msgs: vec![ControlAction::IDontWant(IDontWant {
+            message_ids: vec![message_id.clone()],
+        })],
+    };
+    gs.on_connection_handler_event(
+        peers[1],
+        ConnectionId::new_unchecked(0),
+        HandlerEvent::Message {
+            rpc,
+            invalid_messages: vec![],
+        },
+    );
+    let peer = gs.connected_peers.get_mut(&peers[1]).unwrap();
+    assert!(peer.dont_send.get(&message_id).is_some());
+}
+
+/// Test that a node clears stale IDONTWANT messages.
+#[test]
+fn clear_stale_idontwant() {
+    let (mut gs, peers, _receivers, _topic_hashes) = inject_nodes1()
+        .peer_no(4)
+        .topics(vec![String::from("topic1")])
+        .to_subscribe(true)
+        .gs_config(Config::default())
+        .explicit(1)
+        .peer_kind(PeerKind::Gossipsubv1_2)
+        .create_network();
+
+    let peer = gs.connected_peers.get_mut(&peers[2]).unwrap();
+    peer.dont_send
+        .insert(MessageId::new(&[1, 2, 3, 4]), Instant::now());
+    std::thread::sleep(Duration::from_secs(3));
+    gs.heartbeat();
+    let peer = gs.connected_peers.get_mut(&peers[2]).unwrap();
+    assert!(peer.dont_send.is_empty());
+}
+
 #[test]
 fn test_all_queues_full() {
     let gs_config = ConfigBuilder::default()
@@ -5289,6 +5482,7 @@ fn test_all_queues_full() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(2),
+            dont_send: LinkedHashMap::new(),
         },
     );
 
@@ -5323,6 +5517,7 @@ fn test_slow_peer_returns_failed_publish() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(2),
+            dont_send: LinkedHashMap::new(),
         },
     );
     let peer_id = PeerId::random();
@@ -5334,6 +5529,7 @@ fn test_slow_peer_returns_failed_publish() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(gs.config.connection_handler_queue_len()),
+            dont_send: LinkedHashMap::new(),
         },
     );
 
@@ -5386,7 +5582,6 @@ fn test_slow_peer_returns_failed_ihave_handling() {
     topics.insert(topic_hash.clone());
 
     let slow_peer_id = PeerId::random();
-    peers.push(slow_peer_id);
     gs.connected_peers.insert(
         slow_peer_id,
         PeerConnections {
@@ -5394,6 +5589,7 @@ fn test_slow_peer_returns_failed_ihave_handling() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(2),
+            dont_send: LinkedHashMap::new(),
         },
     );
     peers.push(slow_peer_id);
@@ -5409,9 +5605,11 @@ fn test_slow_peer_returns_failed_ihave_handling() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(gs.config.connection_handler_queue_len()),
+            dont_send: LinkedHashMap::new(),
         },
     );
 
+    // First message.
     let publish_data = vec![1; 59];
     let transformed = gs
         .data_transform
@@ -5431,6 +5629,22 @@ fn test_slow_peer_returns_failed_ihave_handling() {
         &slow_peer_id,
         vec![(topic_hash.clone(), vec![msg_id.clone()])],
     );
+
+    // Second message.
+    let publish_data = vec![2; 59];
+    let transformed = gs
+        .data_transform
+        .outbound_transform(&topic_hash, publish_data.clone())
+        .unwrap();
+    let raw_message = gs
+        .build_raw_message(topic_hash.clone(), transformed)
+        .unwrap();
+    let msg_id = gs.config.message_id(&Message {
+        source: raw_message.source,
+        data: publish_data,
+        sequence_number: raw_message.sequence_number,
+        topic: raw_message.topic.clone(),
+    });
     gs.handle_ihave(&slow_peer_id, vec![(topic_hash, vec![msg_id.clone()])]);
 
     gs.heartbeat();
@@ -5487,6 +5701,7 @@ fn test_slow_peer_returns_failed_iwant_handling() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(2),
+            dont_send: LinkedHashMap::new(),
         },
     );
     peers.push(slow_peer_id);
@@ -5502,6 +5717,7 @@ fn test_slow_peer_returns_failed_iwant_handling() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(gs.config.connection_handler_queue_len()),
+            dont_send: LinkedHashMap::new(),
         },
     );
 
@@ -5577,6 +5793,7 @@ fn test_slow_peer_returns_failed_forward() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(2),
+            dont_send: LinkedHashMap::new(),
         },
     );
     peers.push(slow_peer_id);
@@ -5592,6 +5809,7 @@ fn test_slow_peer_returns_failed_forward() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(gs.config.connection_handler_queue_len()),
+            dont_send: LinkedHashMap::new(),
         },
     );
 
@@ -5672,6 +5890,7 @@ fn test_slow_peer_is_downscored_on_publish() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(2),
+            dont_send: LinkedHashMap::new(),
         },
     );
     gs.peer_score.as_mut().unwrap().0.add_peer(slow_peer_id);
@@ -5684,6 +5903,7 @@ fn test_slow_peer_is_downscored_on_publish() {
             connections: vec![ConnectionId::new_unchecked(0)],
             topics: topics.clone(),
             sender: Sender::new(gs.config.connection_handler_queue_len()),
+            dont_send: LinkedHashMap::new(),
         },
     );
 
diff --git a/protocols/gossipsub/src/generated/gossipsub/pb.rs b/protocols/gossipsub/src/generated/gossipsub/pb.rs
index 9a074fd61fc..24ac80d2755 100644
--- a/protocols/gossipsub/src/generated/gossipsub/pb.rs
+++ b/protocols/gossipsub/src/generated/gossipsub/pb.rs
@@ -154,6 +154,7 @@ pub struct ControlMessage {
     pub iwant: Vec<gossipsub::pb::ControlIWant>,
     pub graft: Vec<gossipsub::pb::ControlGraft>,
     pub prune: Vec<gossipsub::pb::ControlPrune>,
+    pub idontwant: Vec<gossipsub::pb::ControlIDontWant>,
 }
 
 impl<'a> MessageRead<'a> for ControlMessage {
@@ -165,6 +166,7 @@ impl<'a> MessageRead<'a> for ControlMessage {
                 Ok(18) => msg.iwant.push(r.read_message::<gossipsub::pb::ControlIWant>(bytes)?),
                 Ok(26) => msg.graft.push(r.read_message::<gossipsub::pb::ControlGraft>(bytes)?),
                 Ok(34) => msg.prune.push(r.read_message::<gossipsub::pb::ControlPrune>(bytes)?),
+                Ok(42) => msg.idontwant.push(r.read_message::<gossipsub::pb::ControlIDontWant>(bytes)?),
                 Ok(t) => { r.read_unknown(bytes, t)?; }
                 Err(e) => return Err(e),
             }
@@ -180,6 +182,7 @@ impl MessageWrite for ControlMessage {
         + self.iwant.iter().map(|s| 1 + sizeof_len((s).get_size())).sum::<usize>()
         + self.graft.iter().map(|s| 1 + sizeof_len((s).get_size())).sum::<usize>()
         + self.prune.iter().map(|s| 1 + sizeof_len((s).get_size())).sum::<usize>()
+        + self.idontwant.iter().map(|s| 1 + sizeof_len((s).get_size())).sum::<usize>()
     }
 
     fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
@@ -187,6 +190,7 @@ impl MessageWrite for ControlMessage {
         for s in &self.iwant { w.write_with_tag(18, |w| w.write_message(s))?; }
         for s in &self.graft { w.write_with_tag(26, |w| w.write_message(s))?; }
         for s in &self.prune { w.write_with_tag(34, |w| w.write_message(s))?; }
+        for s in &self.idontwant { w.write_with_tag(42, |w| w.write_message(s))?; }
         Ok(())
     }
 }
@@ -331,6 +335,38 @@ impl MessageWrite for ControlPrune {
     }
 }
 
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct ControlIDontWant {
+    pub message_ids: Vec<Vec<u8>>,
+}
+
+impl<'a> MessageRead<'a> for ControlIDontWant {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(10) => msg.message_ids.push(r.read_bytes(bytes)?.to_owned()),
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for ControlIDontWant {
+    fn get_size(&self) -> usize {
+        0
+        + self.message_ids.iter().map(|s| 1 + sizeof_len((s).len())).sum::<usize>()
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        for s in &self.message_ids { w.write_with_tag(10, |w| w.write_bytes(&**s))?; }
+        Ok(())
+    }
+}
+
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Debug, Default, PartialEq, Clone)]
 pub struct PeerInfo {
diff --git a/protocols/gossipsub/src/generated/rpc.proto b/protocols/gossipsub/src/generated/rpc.proto
index 2ce12f3f37f..fe4d3bc9366 100644
--- a/protocols/gossipsub/src/generated/rpc.proto
+++ b/protocols/gossipsub/src/generated/rpc.proto
@@ -19,8 +19,8 @@ message Message {
 	optional bytes data = 2;
 	optional bytes seqno = 3;
 	required string topic = 4;
-  optional bytes signature = 5;
-  optional bytes key = 6;
+	optional bytes signature = 5;
+	optional bytes key = 6;
 }
 
 message ControlMessage {
@@ -28,6 +28,7 @@ message ControlMessage {
 	repeated ControlIWant iwant = 2;
 	repeated ControlGraft graft = 3;
 	repeated ControlPrune prune = 4;
+	repeated ControlIDontWant idontwant = 5;
 }
 
 message ControlIHave {
@@ -49,6 +50,10 @@ message ControlPrune {
 	optional uint64 backoff = 3; // gossipsub v1.1 backoff time (in seconds)
 }
 
+message ControlIDontWant {
+	repeated bytes message_ids = 1;
+}
+
 message PeerInfo {
 	optional bytes peer_id = 1;
 	optional bytes signed_peer_record = 2;
diff --git a/protocols/gossipsub/src/gossip_promises.rs b/protocols/gossipsub/src/gossip_promises.rs
index b64811bb062..284ba7cab01 100644
--- a/protocols/gossipsub/src/gossip_promises.rs
+++ b/protocols/gossipsub/src/gossip_promises.rs
@@ -41,6 +41,14 @@ impl GossipPromises {
         self.promises.contains_key(message)
     }
 
+    /// Get the peers we sent IWANT the input message id.
+    pub(crate) fn peers_for_message(&self, message_id: &MessageId) -> Vec<PeerId> {
+        self.promises
+            .get(message_id)
+            .map(|peers| peers.keys().copied().collect())
+            .unwrap_or_default()
+    }
+
     /// Track a promise to deliver a message from a list of [`MessageId`]s we are requesting.
     pub(crate) fn add_promise(&mut self, peer: PeerId, messages: &[MessageId], expires: Instant) {
         for message_id in messages {
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
index 2936182c3f8..e66b606896b 100644
--- a/protocols/gossipsub/src/handler.rs
+++ b/protocols/gossipsub/src/handler.rs
@@ -229,7 +229,7 @@ impl EnabledHandler {
             if let Some(peer_kind) = self.peer_kind.as_ref() {
                 self.peer_kind_sent = true;
                 return Poll::Ready(ConnectionHandlerEvent::NotifyBehaviour(
-                    HandlerEvent::PeerKind(peer_kind.clone()),
+                    HandlerEvent::PeerKind(*peer_kind),
                 ));
             }
         }
diff --git a/protocols/gossipsub/src/metrics.rs b/protocols/gossipsub/src/metrics.rs
index 2519da64b73..42dedc000b7 100644
--- a/protocols/gossipsub/src/metrics.rs
+++ b/protocols/gossipsub/src/metrics.rs
@@ -187,6 +187,12 @@ pub(crate) struct Metrics {
     /// topic. A very high metric might indicate an underperforming network.
     topic_iwant_msgs: Family<TopicHash, Counter>,
 
+    /// The number of times we have received an IDONTWANT control message.
+    idontwant_msgs: Counter,
+
+    /// The number of msg_id's we have received in every IDONTWANT control message.
+    idontwant_msgs_ids: Counter,
+
     /// The size of the priority queue.
     priority_queue_size: Histogram,
     /// The size of the non-priority queue.
@@ -324,6 +330,27 @@ impl Metrics {
             "topic_iwant_msgs",
             "Number of times we have decided an IWANT is required for this topic"
         );
+
+        let idontwant_msgs = {
+            let metric = Counter::default();
+            registry.register(
+                "idontwant_msgs",
+                "The number of times we have received an IDONTWANT control message",
+                metric.clone(),
+            );
+            metric
+        };
+
+        let idontwant_msgs_ids = {
+            let metric = Counter::default();
+            registry.register(
+                "idontwant_msgs_ids",
+                "The number of msg_id's we have received in every total of all IDONTWANT control message.",
+                metric.clone(),
+            );
+            metric
+        };
+
         let memcache_misses = {
             let metric = Counter::default();
             registry.register(
@@ -376,6 +403,8 @@ impl Metrics {
             heartbeat_duration,
             memcache_misses,
             topic_iwant_msgs,
+            idontwant_msgs,
+            idontwant_msgs_ids,
             priority_queue_size,
             non_priority_queue_size,
         }
@@ -574,6 +603,12 @@ impl Metrics {
         }
     }
 
+    /// Register receiving an IDONTWANT msg for this topic.
+    pub(crate) fn register_idontwant(&mut self, msgs: usize) {
+        self.idontwant_msgs.inc();
+        self.idontwant_msgs_ids.inc_by(msgs as u64);
+    }
+
     /// Observes a heartbeat duration.
     pub(crate) fn observe_heartbeat_duration(&mut self, millis: u64) {
         self.heartbeat_duration.observe(millis as f64);
diff --git a/protocols/gossipsub/src/protocol.rs b/protocols/gossipsub/src/protocol.rs
index e4272737342..7ee6d5c8245 100644
--- a/protocols/gossipsub/src/protocol.rs
+++ b/protocols/gossipsub/src/protocol.rs
@@ -35,14 +35,19 @@ use crate::{
     rpc_proto::proto,
     topic::TopicHash,
     types::{
-        ControlAction, Graft, IHave, IWant, MessageId, PeerInfo, PeerKind, Prune, RawMessage, Rpc,
-        Subscription, SubscriptionAction,
+        ControlAction, Graft, IDontWant, IHave, IWant, MessageId, PeerInfo, PeerKind, Prune,
+        RawMessage, Rpc, Subscription, SubscriptionAction,
     },
     ValidationError,
 };
 
 pub(crate) const SIGNING_PREFIX: &[u8] = b"libp2p-pubsub:";
 
+pub(crate) const GOSSIPSUB_1_2_0_PROTOCOL: ProtocolId = ProtocolId {
+    protocol: StreamProtocol::new("/meshsub/1.2.0"),
+    kind: PeerKind::Gossipsubv1_2,
+};
+
 pub(crate) const GOSSIPSUB_1_1_0_PROTOCOL: ProtocolId = ProtocolId {
     protocol: StreamProtocol::new("/meshsub/1.1.0"),
     kind: PeerKind::Gossipsubv1_1,
@@ -72,7 +77,11 @@ impl Default for ProtocolConfig {
         Self {
             max_transmit_size: 65536,
             validation_mode: ValidationMode::Strict,
-            protocol_ids: vec![GOSSIPSUB_1_1_0_PROTOCOL, GOSSIPSUB_1_0_0_PROTOCOL],
+            protocol_ids: vec![
+                GOSSIPSUB_1_2_0_PROTOCOL,
+                GOSSIPSUB_1_1_0_PROTOCOL,
+                GOSSIPSUB_1_0_0_PROTOCOL,
+            ],
         }
     }
 }
@@ -479,10 +488,25 @@ impl Decoder for GossipsubCodec {
                 }));
             }
 
+            let idontwant_msgs: Vec<ControlAction> = rpc_control
+                .idontwant
+                .into_iter()
+                .map(|idontwant| {
+                    ControlAction::IDontWant(IDontWant {
+                        message_ids: idontwant
+                            .message_ids
+                            .into_iter()
+                            .map(MessageId::from)
+                            .collect::<Vec<_>>(),
+                    })
+                })
+                .collect();
+
             control_msgs.extend(ihave_msgs);
             control_msgs.extend(iwant_msgs);
             control_msgs.extend(graft_msgs);
             control_msgs.extend(prune_msgs);
+            control_msgs.extend(idontwant_msgs);
         }
 
         Ok(Some(HandlerEvent::Message {
diff --git a/protocols/gossipsub/src/rpc.rs b/protocols/gossipsub/src/rpc.rs
index b5f05c7b2e5..41b338267e9 100644
--- a/protocols/gossipsub/src/rpc.rs
+++ b/protocols/gossipsub/src/rpc.rs
@@ -89,7 +89,7 @@ impl Sender {
             | RpcOut::Prune(_)
             | RpcOut::Subscribe(_)
             | RpcOut::Unsubscribe(_) => &self.priority_sender,
-            RpcOut::Forward { .. } | RpcOut::IHave(_) | RpcOut::IWant(_) => {
+            RpcOut::Forward { .. } | RpcOut::IHave(_) | RpcOut::IWant(_) | RpcOut::IDontWant(_) => {
                 &self.non_priority_sender
             }
         };
diff --git a/protocols/gossipsub/src/types.rs b/protocols/gossipsub/src/types.rs
index bcb1f279ae5..6681eca1d93 100644
--- a/protocols/gossipsub/src/types.rs
+++ b/protocols/gossipsub/src/types.rs
@@ -22,12 +22,14 @@
 use std::{collections::BTreeSet, fmt, fmt::Debug};
 
 use futures_timer::Delay;
+use hashlink::LinkedHashMap;
 use libp2p_identity::PeerId;
 use libp2p_swarm::ConnectionId;
 use prometheus_client::encoding::EncodeLabelValue;
 use quick_protobuf::MessageWrite;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
+use web_time::Instant;
 
 use crate::{rpc::Sender, rpc_proto::proto, TopicHash};
 
@@ -109,11 +111,15 @@ pub(crate) struct PeerConnections {
     pub(crate) topics: BTreeSet<TopicHash>,
     /// The rpc sender to the connection handler(s).
     pub(crate) sender: Sender,
+    /// Don't send messages.
+    pub(crate) dont_send: LinkedHashMap<MessageId, Instant>,
 }
 
 /// Describes the types of peers that can exist in the gossipsub context.
-#[derive(Debug, Clone, PartialEq, Hash, EncodeLabelValue, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Hash, EncodeLabelValue, Eq)]
 pub enum PeerKind {
+    /// A gossipsub 1.2 peer.
+    Gossipsubv1_2,
     /// A gossipsub 1.1 peer.
     Gossipsubv1_1,
     /// A gossipsub 1.0 peer.
@@ -149,6 +155,16 @@ pub struct RawMessage {
     pub validated: bool,
 }
 
+impl PeerKind {
+    /// Returns true if peer speaks any gossipsub version.
+    pub(crate) fn is_gossipsub(&self) -> bool {
+        matches!(
+            self,
+            Self::Gossipsubv1_2 | Self::Gossipsubv1_1 | Self::Gossipsub
+        )
+    }
+}
+
 impl RawMessage {
     /// Calculates the encoded length of this message (used for calculating metrics).
     pub fn raw_protobuf_len(&self) -> usize {
@@ -246,6 +262,9 @@ pub enum ControlAction {
     Graft(Graft),
     /// The node has been removed from the mesh - Prune control message.
     Prune(Prune),
+    /// The node requests us to not forward message ids (peer_id + sequence _number) - IDontWant
+    /// control message.
+    IDontWant(IDontWant),
 }
 
 /// Node broadcasts known messages per topic - IHave control message.
@@ -282,6 +301,13 @@ pub struct Prune {
     pub(crate) backoff: Option<u64>,
 }
 
+/// The node requests us to not forward message ids - IDontWant control message.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct IDontWant {
+    /// A list of known message ids.
+    pub(crate) message_ids: Vec<MessageId>,
+}
+
 /// A Gossipsub RPC message sent.
 #[derive(Debug)]
 pub enum RpcOut {
@@ -303,6 +329,9 @@ pub enum RpcOut {
     IHave(IHave),
     /// Send a IWant control message.
     IWant(IWant),
+    /// The node requests us to not forward message ids (peer_id + sequence _number) - IDontWant
+    /// control message.
+    IDontWant(IDontWant),
 }
 
 impl RpcOut {
@@ -363,6 +392,7 @@ impl From<RpcOut> for proto::RPC {
                     iwant: vec![],
                     graft: vec![],
                     prune: vec![],
+                    idontwant: vec![],
                 }),
             },
             RpcOut::IWant(IWant { message_ids }) => proto::RPC {
@@ -375,6 +405,7 @@ impl From<RpcOut> for proto::RPC {
                     }],
                     graft: vec![],
                     prune: vec![],
+                    idontwant: vec![],
                 }),
             },
             RpcOut::Graft(Graft { topic_hash }) => proto::RPC {
@@ -387,6 +418,7 @@ impl From<RpcOut> for proto::RPC {
                         topic_id: Some(topic_hash.into_string()),
                     }],
                     prune: vec![],
+                    idontwant: vec![],
                 }),
             },
             RpcOut::Prune(Prune {
@@ -413,9 +445,23 @@ impl From<RpcOut> for proto::RPC {
                                 .collect(),
                             backoff,
                         }],
+                        idontwant: vec![],
                     }),
                 }
             }
+            RpcOut::IDontWant(IDontWant { message_ids }) => proto::RPC {
+                publish: Vec::new(),
+                subscriptions: Vec::new(),
+                control: Some(proto::ControlMessage {
+                    ihave: vec![],
+                    iwant: vec![],
+                    graft: vec![],
+                    prune: vec![],
+                    idontwant: vec![proto::ControlIDontWant {
+                        message_ids: message_ids.into_iter().map(|msg_id| msg_id.0).collect(),
+                    }],
+                }),
+            },
         }
     }
 }
@@ -474,6 +520,7 @@ impl From<Rpc> for proto::RPC {
             iwant: Vec::new(),
             graft: Vec::new(),
             prune: Vec::new(),
+            idontwant: Vec::new(),
         };
 
         let empty_control_msg = rpc.control_msgs.is_empty();
@@ -522,6 +569,12 @@ impl From<Rpc> for proto::RPC {
                     };
                     control.prune.push(rpc_prune);
                 }
+                ControlAction::IDontWant(IDontWant { message_ids }) => {
+                    let rpc_idontwant = proto::ControlIDontWant {
+                        message_ids: message_ids.into_iter().map(|msg_id| msg_id.0).collect(),
+                    };
+                    control.idontwant.push(rpc_idontwant);
+                }
             }
         }
 
@@ -560,6 +613,7 @@ impl PeerKind {
             Self::Floodsub => "Floodsub",
             Self::Gossipsub => "Gossipsub v1.0",
             Self::Gossipsubv1_1 => "Gossipsub v1.1",
+            Self::Gossipsubv1_2 => "Gossipsub v1.2",
         }
     }
 }

From 1ab46587d4178c00d12f336c15be73e8ae41602f Mon Sep 17 00:00:00 2001
From: hanabi1224 <harlowmoo@gmail.com>
Date: Sat, 28 Dec 2024 06:26:22 +0800
Subject: [PATCH 447/455] chore(deps): update Cargo.lock

- run `cargo update`
- lock `webrtc-ice = "=0.10.0"` to not break webrtc smoke tests
- fix `cargo clippy` warnings
- update `deny.toml` accordingly

Pull-Request: #5755.
---
 Cargo.lock                               | 1714 +++++++++++-----------
 transports/webrtc/Cargo.toml             |    3 +-
 wasm-tests/webtransport-tests/src/lib.rs |   32 +-
 3 files changed, 888 insertions(+), 861 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5d9a22cf579..e6f00ab4c9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.20.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -29,9 +29,9 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher",
@@ -54,9 +54,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -66,18 +66,18 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anes"
@@ -87,9 +87,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -108,55 +108,55 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arbitrary"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "asn1-rs"
@@ -170,23 +170,23 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "time",
 ]
 
 [[package]]
 name = "asn1-rs"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
 dependencies = [
- "asn1-rs-derive 0.5.0",
+ "asn1-rs-derive 0.5.1",
  "asn1-rs-impl 0.2.0",
  "displaydoc",
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -204,13 +204,13 @@ dependencies = [
 
 [[package]]
 name = "asn1-rs-derive"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
  "synstructure 0.13.1",
 ]
 
@@ -233,7 +233,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -270,7 +270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
  "concurrent-queue",
- "event-listener-strategy 0.5.2",
+ "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
 ]
@@ -294,21 +294,21 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
 dependencies = [
- "async-lock 3.1.0",
+ "async-lock",
  "blocking",
  "futures-lite",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
  "async-channel 2.3.1",
  "async-executor",
  "async-io",
- "async-lock 3.1.0",
+ "async-lock",
  "blocking",
  "futures-lite",
  "once_cell",
@@ -316,11 +316,11 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
- "async-lock 3.1.0",
+ "async-lock",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
@@ -330,26 +330,17 @@ dependencies = [
  "rustix",
  "slab",
  "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
-dependencies = [
- "event-listener 2.5.3",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.1.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 3.1.0",
- "event-listener-strategy 0.3.0",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
  "pin-project-lite",
 ]
 
@@ -366,20 +357,21 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
 dependencies = [
  "async-channel 2.3.1",
  "async-io",
- "async-lock 3.1.0",
+ "async-lock",
  "async-signal",
+ "async-task",
  "blocking",
  "cfg-if",
  "event-listener 5.3.1",
  "futures-lite",
  "rustix",
- "windows-sys 0.52.0",
+ "tracing",
 ]
 
 [[package]]
@@ -390,17 +382,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.5"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
 dependencies = [
  "async-io",
- "async-lock 2.7.0",
+ "async-lock",
  "atomic-waker",
  "cfg-if",
  "futures-core",
@@ -408,7 +400,7 @@ dependencies = [
  "rustix",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -421,7 +413,7 @@ dependencies = [
  "async-channel 1.9.0",
  "async-global-executor",
  "async-io",
- "async-lock 3.1.0",
+ "async-lock",
  "async-process",
  "crossbeam-utils",
  "futures-channel",
@@ -456,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -467,30 +459,30 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.4.0"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -508,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "attohttpc"
@@ -518,16 +510,16 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2"
 dependencies = [
- "http 0.2.9",
+ "http 0.2.12",
  "log",
  "url",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "autonat-example"
@@ -558,15 +550,15 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.5"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -582,9 +574,9 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper 1.0.0",
+ "sync_wrapper",
  "tokio",
- "tower",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -592,20 +584,20 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "http-body-util",
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -613,17 +605,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.68"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -685,9 +677,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "blake2"
@@ -754,7 +746,7 @@ dependencies = [
  "rust-embed",
  "tokio",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tower-http",
  "tracing",
  "tracing-subscriber",
@@ -775,9 +767,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.6.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
+checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8"
 dependencies = [
  "memchr",
  "serde",
@@ -785,9 +777,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byteorder"
@@ -821,20 +813,20 @@ dependencies = [
 
 [[package]]
 name = "cbor4ii"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b4c883b9cc4757b061600d39001d4d0232bece4a3174696cf8f58a14db107d"
+checksum = "472931dd4dfcc785075b09be910147f9c6258883fc4591d0dac6116392b2daa6"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
 dependencies = [
- "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -897,9 +889,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -908,15 +900,15 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
  "half",
@@ -935,9 +927,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.6"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -945,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.6"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -957,33 +949,33 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1014,15 +1006,15 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.4"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1045,27 +1037,27 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc"
-version = "3.0.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
  "crc-catalog",
 ]
 
 [[package]]
 name = "crc-catalog"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "criterion"
@@ -1080,7 +1072,7 @@ dependencies = [
  "criterion-plot",
  "futures",
  "is-terminal",
- "itertools",
+ "itertools 0.10.5",
  "num-traits",
  "once_cell",
  "oorandom",
@@ -1102,47 +1094,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
  "cast",
- "itertools",
+ "itertools 0.10.5",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset 0.9.0",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
@@ -1152,9 +1139,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -1221,13 +1208,13 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek-derive"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -1238,9 +1225,9 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.13"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
+checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -1248,9 +1235,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
+checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f"
 dependencies = [
  "data-encoding",
  "syn 1.0.109",
@@ -1271,9 +1258,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.7"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1300,7 +1287,7 @@ version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs 0.6.2",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -1340,33 +1327,34 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "4.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -1387,9 +1375,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "ecdsa"
-version = "0.16.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
  "digest 0.10.7",
@@ -1401,9 +1389,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
  "signature",
@@ -1426,9 +1414,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elliptic-curve"
@@ -1453,30 +1441,30 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "enum-as-inner"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -1494,9 +1482,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1513,12 +1501,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1527,17 +1515,6 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "event-listener"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
 [[package]]
 name = "event-listener"
 version = "5.3.1"
@@ -1551,19 +1528,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.3.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160"
-dependencies = [
- "event-listener 3.1.0",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
  "event-listener 5.3.1",
  "pin-project-lite",
@@ -1571,9 +1538,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "ff"
@@ -1587,9 +1554,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.1"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "file-sharing-example"
@@ -1609,6 +1576,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1694,14 +1667,13 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.0.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "fastrand",
  "futures-core",
  "futures-io",
- "memchr",
  "parking",
  "pin-project-lite",
 ]
@@ -1714,7 +1686,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -1724,7 +1696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.11",
+ "rustls 0.23.20",
  "rustls-pki-types",
 ]
 
@@ -1817,9 +1789,9 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
  "opaque-debug",
  "polyval",
@@ -1827,9 +1799,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -1839,15 +1811,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.11"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -1887,17 +1859,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
- "http 1.1.0",
- "indexmap 2.2.1",
+ "http 1.2.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1906,9 +1878,13 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
 
 [[package]]
 name = "hashbrown"
@@ -1918,12 +1894,22 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
  "allocator-api2",
+ "equivalent",
+ "foldhash",
 ]
 
 [[package]]
@@ -1932,26 +1918,26 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
-name = "heck"
-version = "0.5.0"
+name = "hermit-abi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hex"
@@ -1990,7 +1976,7 @@ dependencies = [
  "once_cell",
  "rand 0.8.5",
  "socket2",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tinyvec",
  "tokio",
  "tracing",
@@ -2013,7 +1999,7 @@ dependencies = [
  "rand 0.8.5",
  "resolv-conf",
  "smallvec",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
 ]
@@ -2063,7 +2049,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "either",
- "env_logger 0.11.5",
+ "env_logger 0.11.6",
  "futures",
  "libp2p",
  "redis",
@@ -2086,9 +2072,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -2097,9 +2083,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -2108,44 +2094,44 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http 1.2.0",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-range-header"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe"
+checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c"
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -2155,15 +2141,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "h2",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "httparse",
  "httpdate",
@@ -2176,26 +2162,27 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.26.0"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "hyper",
  "hyper-util",
- "rustls 0.22.4",
+ "rustls 0.23.20",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service",
+ "webpki-roots 0.26.7",
 ]
 
 [[package]]
 name = "hyper-timeout"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
  "hyper",
  "hyper-util",
@@ -2222,14 +2209,14 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "hyper",
  "pin-project-lite",
@@ -2354,7 +2341,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -2417,9 +2404,9 @@ dependencies = [
  "netlink-sys",
  "rtnetlink",
  "smol",
- "system-configuration 0.6.1",
+ "system-configuration",
  "tokio",
- "windows 0.52.0",
+ "windows 0.53.0",
 ]
 
 [[package]]
@@ -2432,7 +2419,7 @@ dependencies = [
  "attohttpc",
  "bytes",
  "futures",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body-util",
  "hyper",
  "hyper-util",
@@ -2455,12 +2442,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -2490,8 +2477,8 @@ dependencies = [
  "log",
  "rand 0.8.5",
  "rtcp",
- "rtp",
- "thiserror 1.0.63",
+ "rtp 0.9.0",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
@@ -2540,7 +2527,7 @@ dependencies = [
  "socket2",
  "widestring",
  "windows-sys 0.48.0",
- "winreg 0.50.0",
+ "winreg",
 ]
 
 [[package]]
@@ -2568,19 +2555,19 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys 0.48.0",
+ "hermit-abi 0.4.0",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2598,26 +2585,36 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
@@ -2645,15 +2642,15 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libp2p"
@@ -2700,7 +2697,7 @@ dependencies = [
  "multiaddr",
  "pin-project",
  "rw-stream-sink",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing-subscriber",
 ]
@@ -2738,7 +2735,7 @@ dependencies = [
  "quick-protobuf-codec",
  "rand 0.8.5",
  "rand_core 0.6.4",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
  "web-time 1.1.0",
@@ -2781,9 +2778,9 @@ dependencies = [
  "quick-protobuf",
  "rand 0.8.5",
  "rw-stream-sink",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
  "web-time 1.1.0",
 ]
 
@@ -2809,7 +2806,7 @@ dependencies = [
  "lru",
  "quick-protobuf",
  "quick-protobuf-codec",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
  "web-time 1.1.0",
@@ -2849,7 +2846,7 @@ dependencies = [
  "quick-protobuf-codec",
  "rand 0.8.5",
  "smallvec",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
 ]
 
@@ -2905,7 +2902,7 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
 ]
 
@@ -2931,7 +2928,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "zeroize",
 ]
@@ -2963,7 +2960,7 @@ dependencies = [
  "serde",
  "sha2 0.10.8",
  "smallvec",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "uint",
  "web-time 1.1.0",
@@ -3045,7 +3042,7 @@ dependencies = [
  "rand 0.8.5",
  "smallvec",
  "tracing",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -3078,7 +3075,7 @@ dependencies = [
  "rand 0.8.5",
  "snow",
  "static_assertions",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "x25519-dalek",
  "zeroize",
@@ -3104,7 +3101,7 @@ dependencies = [
  "libp2p-yamux",
  "serde",
  "serde_json",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -3186,9 +3183,9 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustls 0.23.11",
+ "rustls 0.23.20",
  "socket2",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
 ]
@@ -3216,7 +3213,7 @@ dependencies = [
  "quickcheck-ext",
  "rand 0.8.5",
  "static_assertions",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "web-time 1.1.0",
 ]
@@ -3239,7 +3236,7 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
  "web-time 1.1.0",
@@ -3339,9 +3336,9 @@ dependencies = [
 name = "libp2p-swarm-derive"
 version = "0.35.0"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -3397,9 +3394,9 @@ dependencies = [
  "libp2p-yamux",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.23.11",
+ "rustls 0.23.20",
  "rustls-webpki 0.101.7",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "x509-parser 0.16.0",
  "yasna",
@@ -3448,12 +3445,13 @@ dependencies = [
  "quickcheck",
  "rand 0.8.5",
  "rcgen",
- "stun 0.6.0",
- "thiserror 2.0.3",
+ "stun 0.7.0",
+ "thiserror 2.0.9",
  "tokio",
  "tokio-util",
  "tracing",
  "webrtc",
+ "webrtc-ice",
 ]
 
 [[package]]
@@ -3490,7 +3488,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-webrtc-utils",
  "send_wrapper 0.6.0",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3514,10 +3512,10 @@ dependencies = [
  "rcgen",
  "rw-stream-sink",
  "soketto",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "url",
- "webpki-roots 0.25.2",
+ "webpki-roots 0.25.4",
 ]
 
 [[package]]
@@ -3532,7 +3530,7 @@ dependencies = [
  "libp2p-noise",
  "libp2p-yamux",
  "send_wrapper 0.6.0",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "wasm-bindgen",
  "web-sys",
@@ -3552,7 +3550,7 @@ dependencies = [
  "multihash",
  "once_cell",
  "send_wrapper 0.6.0",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3568,10 +3566,20 @@ dependencies = [
  "futures",
  "libp2p-core",
  "libp2p-muxer-test-harness",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tracing",
  "yamux 0.12.1",
- "yamux 0.13.3",
+ "yamux 0.13.4",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
 ]
 
 [[package]]
@@ -3624,9 +3632,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "litemap"
@@ -3636,9 +3644,9 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -3646,20 +3654,20 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 dependencies = [
  "value-bag",
 ]
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -3679,24 +3687,25 @@ dependencies = [
 
 [[package]]
 name = "matchit"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67827e6ea8ee8a7c4a72227ef4fc08957040acffdb5f122733b24fa12daff41b"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "md-5"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
+ "cfg-if",
  "digest 0.10.7",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
@@ -3707,23 +3716,14 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memory-stats"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f79cf9964c5c9545493acda1263f1912f8d2c56c8a2ffee2606cb960acaacc"
+checksum = "c73f5c649995a115e1a0220b35e4df0a1294500477f97a91d0660fb5abeb574a"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3751,9 +3751,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -3761,9 +3761,9 @@ dependencies = [
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -3777,11 +3777,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
@@ -3810,16 +3810,16 @@ dependencies = [
  "rustc_version",
  "smallvec",
  "tagptr",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "triomphe",
  "uuid",
 ]
 
 [[package]]
 name = "multiaddr"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070"
+checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961"
 dependencies = [
  "arrayref",
  "byteorder",
@@ -3830,7 +3830,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "static_assertions",
- "unsigned-varint 0.7.2",
+ "unsigned-varint",
  "url",
 ]
 
@@ -3847,16 +3847,16 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.19.1"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492"
+checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d"
 dependencies = [
  "arbitrary",
  "core2",
  "quickcheck",
  "rand 0.8.5",
  "serde",
- "unsigned-varint 0.7.2",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -3873,16 +3873,15 @@ dependencies = [
  "rw-stream-sink",
  "smallvec",
  "tracing",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -3928,7 +3927,7 @@ dependencies = [
  "anyhow",
  "byteorder",
  "paste",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3942,7 +3941,7 @@ dependencies = [
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -3969,7 +3968,7 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset 0.7.1",
+ "memoffset",
  "pin-utils",
 ]
 
@@ -4010,11 +4009,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -4027,11 +4025,10 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
@@ -4050,15 +4047,15 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "object"
-version = "0.31.1"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -4074,11 +4071,11 @@ dependencies = [
 
 [[package]]
 name = "oid-registry"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs 0.6.2",
 ]
 
 [[package]]
@@ -4089,23 +4086,23 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
-version = "11.1.3"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -4122,7 +4119,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -4133,9 +4130,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -4151,11 +4148,11 @@ checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a"
 dependencies = [
  "futures-core",
  "futures-sink",
- "indexmap 2.2.1",
+ "indexmap 2.7.0",
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "urlencoding",
 ]
 
@@ -4169,7 +4166,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
@@ -4197,12 +4194,12 @@ checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76"
 dependencies = [
  "async-trait",
  "futures-core",
- "http 1.1.0",
+ "http 1.2.0",
  "opentelemetry 0.27.1",
  "opentelemetry-proto",
  "opentelemetry_sdk 0.27.1",
  "prost",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "tonic",
  "tracing",
@@ -4243,10 +4240,10 @@ dependencies = [
  "glob",
  "once_cell",
  "opentelemetry 0.21.0",
- "ordered-float 4.2.0",
+ "ordered-float 4.6.0",
  "percent-encoding",
  "rand 0.8.5",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
 ]
@@ -4266,12 +4263,18 @@ dependencies = [
  "percent-encoding",
  "rand 0.8.5",
  "serde_json",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tracing",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "ordered-float"
 version = "2.10.1"
@@ -4283,9 +4286,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.2.0"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
 dependencies = [
  "num-traits",
 ]
@@ -4338,30 +4341,30 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pem"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "serde",
 ]
 
@@ -4382,29 +4385,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -4445,15 +4448,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -4464,31 +4467,32 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
 
 [[package]]
 name = "polling"
-version = "3.3.0"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4504,9 +4508,9 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4516,9 +4520,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -4528,15 +4532,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "primeorder"
-version = "0.13.2"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
  "elliptic-curve",
 ]
@@ -4552,9 +4559,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa"
+checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca"
 dependencies = [
  "dtoa",
  "itoa",
@@ -4570,14 +4577,14 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "prost"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
+checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -4585,22 +4592,22 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
+checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "quanta"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+checksum = "773ce68d0bb9bc7ef20be3536ffe94e223e1f365bd374108b2659fac0c65cfe6"
 dependencies = [
  "crossbeam-utils",
  "libc",
@@ -4636,8 +4643,8 @@ dependencies = [
  "futures",
  "quick-protobuf",
  "quickcheck-ext",
- "thiserror 2.0.3",
- "unsigned-varint 0.8.0",
+ "thiserror 2.0.9",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -4673,9 +4680,9 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.11",
+ "rustls 0.23.20",
  "socket2",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
 ]
@@ -4691,10 +4698,10 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash",
- "rustls 0.23.11",
+ "rustls 0.23.20",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
  "tinyvec",
  "tracing",
  "web-time 1.1.0",
@@ -4711,14 +4718,14 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -4800,7 +4807,7 @@ version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -4857,43 +4864,34 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom 0.2.15",
- "redox_syscall 0.2.16",
- "thiserror 1.0.63",
+ "libredox",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.4",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4907,13 +4905,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.4"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4924,9 +4922,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relay-server-example"
@@ -4952,9 +4950,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "7fe060fe50f524be480214aba758c71f99f90ee8c83c5a36b5e9e1d568eb4eb3"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4962,7 +4960,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -4977,24 +4975,26 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.22.4",
+ "quinn",
+ "rustls 0.23.20",
  "rustls-pemfile",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
+ "tower 0.5.2",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.26.1",
- "winreg 0.52.0",
+ "webpki-roots 0.26.7",
+ "windows-registry",
 ]
 
 [[package]]
@@ -5080,12 +5080,12 @@ dependencies = [
 
 [[package]]
 name = "rtcp"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3677908cadfbecb4cc1da9a56a32524fae4ebdfa7c2ea93886e1b1e846488cb9"
+checksum = "33648a781874466a62d89e265fee9f17e32bc7d05a256e6cca41bf97eadcd8aa"
 dependencies = [
  "bytes",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "webrtc-util 0.8.1",
 ]
 
@@ -5104,7 +5104,7 @@ dependencies = [
  "netlink-proto",
  "netlink-sys",
  "nix",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -5117,15 +5117,28 @@ dependencies = [
  "bytes",
  "rand 0.8.5",
  "serde",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
+ "webrtc-util 0.8.1",
+]
+
+[[package]]
+name = "rtp"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47fca9bd66ae0b1f3f649b8f5003d6176433d7293b78b0fce7e1031816bdd99d"
+dependencies = [
+ "bytes",
+ "rand 0.8.5",
+ "serde",
+ "thiserror 1.0.69",
  "webrtc-util 0.8.1",
 ]
 
 [[package]]
 name = "rust-embed"
-version = "8.4.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a"
+checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5134,23 +5147,23 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.4.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4"
+checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
 dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.89",
+ "syn 2.0.92",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.4.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32"
+checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
 dependencies = [
  "globset",
  "sha2 0.10.8",
@@ -5159,21 +5172,21 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
@@ -5189,22 +5202,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.11"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring 0.17.8",
@@ -5214,47 +5227,32 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.8",
- "rustls-pki-types",
- "rustls-webpki 0.102.5",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.11"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
  "once_cell",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.5",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 dependencies = [
  "web-time 1.1.0",
 ]
@@ -5271,9 +5269,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring 0.17.8",
  "rustls-pki-types",
@@ -5282,9 +5280,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "rw-stream-sink"
@@ -5298,9 +5296,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "salsa20"
@@ -5322,11 +5320,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5343,23 +5341,23 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "sdp"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4653054c30ebce63658762eb0d64e27673868a95564474811ae6c220cf767640"
+checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand 0.8.5",
  "substring",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -5379,11 +5377,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -5392,9 +5390,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5402,9 +5400,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "send_wrapper"
@@ -5423,41 +5421,42 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
- "indexmap 2.2.1",
+ "indexmap 2.7.0",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
  "serde",
@@ -5471,14 +5470,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -5497,9 +5496,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -5542,9 +5541,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -5558,20 +5557,26 @@ dependencies = [
  "dirs",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "signature"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -5579,9 +5584,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -5602,7 +5607,7 @@ dependencies = [
  "async-executor",
  "async-fs",
  "async-io",
- "async-lock 3.1.0",
+ "async-lock",
  "async-net",
  "async-process",
  "blocking",
@@ -5611,9 +5616,9 @@ dependencies = [
 
 [[package]]
 name = "smol_str"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
 dependencies = [
  "serde",
 ]
@@ -5637,9 +5642,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -5647,9 +5652,9 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
+checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5674,9 +5679,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der",
@@ -5719,30 +5724,30 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -5758,7 +5763,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.8",
  "subtle",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util 0.8.1",
@@ -5766,21 +5771,21 @@ dependencies = [
 
 [[package]]
 name = "stun"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b"
+checksum = "ea256fb46a13f9204e9dee9982997b2c3097db175a9fddaa8350310d03c4d5a3"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "crc",
  "lazy_static",
  "md-5",
  "rand 0.8.5",
  "ring 0.17.8",
  "subtle",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "url",
- "webrtc-util 0.9.0",
+ "webrtc-util 0.10.0",
 ]
 
 [[package]]
@@ -5794,9 +5799,9 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -5811,9 +5816,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.89"
+version = "2.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5822,15 +5827,12 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "synstructure"
@@ -5852,14 +5854,14 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.33.0"
+version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46"
+checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5869,36 +5871,15 @@ dependencies = [
  "windows 0.57.0",
 ]
 
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys 0.5.0",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "core-foundation",
- "system-configuration-sys 0.6.0",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -5917,23 +5898,30 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
 
+[[package]]
+name = "target-triple"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078"
+
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -5947,8 +5935,8 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "futures",
- "http 1.1.0",
- "indexmap 2.2.1",
+ "http 1.2.0",
+ "indexmap 2.7.0",
  "parking_lot",
  "paste",
  "reqwest",
@@ -5958,7 +5946,7 @@ dependencies = [
  "stringmatch",
  "strum",
  "thirtyfour-macros",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "url",
@@ -5972,54 +5960,54 @@ checksum = "b72d056365e368fc57a56d0cec9e41b02fb4a3474a61c8735262b1cfebe67425"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.63",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.9",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6049,9 +6037,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -6070,9 +6058,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6100,9 +6088,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -6139,7 +6127,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -6154,20 +6142,19 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
+ "rustls 0.23.20",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6176,9 +6163,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6190,9 +6177,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.11"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -6202,20 +6189,20 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.7"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.2.1",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -6234,7 +6221,7 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "h2",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -6246,7 +6233,7 @@ dependencies = [
  "socket2",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -6272,16 +6259,32 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-http"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "http-body-util",
  "http-range-header",
@@ -6299,15 +6302,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -6329,7 +6332,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -6426,29 +6429,30 @@ checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.96"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a5f13f11071020bb12de7a16b925d2d58636175c20c11dc5f96cb64bb6c9b3"
+checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4"
 dependencies = [
  "glob",
  "serde",
  "serde_derive",
  "serde_json",
+ "target-triple",
  "termcolor",
  "toml",
 ]
 
 [[package]]
 name = "turn"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f4fcb97da0426e8146fe0e9b78cc13120161087256198701d12d9df77f7701"
+checksum = "ffb2ac4f331064513ad510b7a36edc0df555bd61672986607f7c9ff46f98f415"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -6456,18 +6460,19 @@ dependencies = [
  "log",
  "md-5",
  "rand 0.8.5",
- "ring 0.16.20",
+ "ring 0.17.8",
  "stun 0.5.1",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
+ "tokio-util",
  "webrtc-util 0.8.1",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "uint"
@@ -6483,24 +6488,21 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -6512,12 +6514,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "unsigned-varint"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
-
 [[package]]
 name = "unsigned-varint"
 version = "0.8.0"
@@ -6581,15 +6577,15 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom 0.2.15",
 ]
@@ -6602,9 +6598,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 
 [[package]]
 name = "vcpkg"
@@ -6614,9 +6610,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "waitgroup"
@@ -6629,9 +6625,9 @@ dependencies = [
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -6660,9 +6656,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6671,36 +6667,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6708,30 +6704,29 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "c61d44563646eb934577f2772656c7ad5e9c90fac78aa8013d776fcdaf24625d"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
  "scoped-tls",
@@ -6742,13 +6737,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "54171416ce73aa0b9c377b51cc3cb542becee1cd678204812e8392e5b0e4a031"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -6764,9 +6759,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6794,15 +6789,15 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.25.2"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.1"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -6827,15 +6822,15 @@ dependencies = [
  "regex",
  "ring 0.16.20",
  "rtcp",
- "rtp",
- "rustls 0.21.11",
+ "rtp 0.9.0",
+ "rustls 0.21.12",
  "sdp",
  "serde",
  "serde_json",
  "sha2 0.10.8",
  "smol_str",
  "stun 0.5.1",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -6853,13 +6848,13 @@ dependencies = [
 
 [[package]]
 name = "webrtc-data"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a45d2461d0e0bf93f181e30eb0b40df32b8bf3efb89c53cebb1990e603e2067d"
+checksum = "e8c08e648e10572b9edbe741074e0f4d3cb221aa7cdf9a814ee71606de312f33"
 dependencies = [
  "bytes",
  "log",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util 0.8.1",
@@ -6889,13 +6884,13 @@ dependencies = [
  "rand_core 0.6.4",
  "rcgen",
  "ring 0.16.20",
- "rustls 0.21.11",
+ "rustls 0.21.12",
  "sec1",
  "serde",
  "sha1",
  "sha2 0.10.8",
  "subtle",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util 0.8.1",
  "x25519-dalek",
@@ -6916,7 +6911,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun 0.5.1",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -6928,35 +6923,35 @@ dependencies = [
 
 [[package]]
 name = "webrtc-mdns"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bebbd40e7f8b630a0f1a74783dbfff1edfc0ccaae891c4689891156a8c4d8c"
+checksum = "ce981f93104a8debb3563bb0cedfe4aa2f351fdf6b53f346ab50009424125c08"
 dependencies = [
  "log",
  "socket2",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util 0.8.1",
 ]
 
 [[package]]
 name = "webrtc-media"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfde3c7b9450b67d466bb2f02c6d9ff9514d33535eb9994942afd1f828839d1"
+checksum = "280017b6b9625ef7329146332518b339c3cceff231cc6f6a9e0e6acab25ca4af"
 dependencies = [
  "byteorder",
  "bytes",
  "rand 0.8.5",
- "rtp",
- "thiserror 1.0.63",
+ "rtp 0.10.0",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "webrtc-sctp"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1af6116b7f9703560c3ad0b32f67220b171bb1b59633b03563db8404d0e482ea"
+checksum = "df75ec042002fe995194712cbeb2029107a60a7eab646f1b789eb1be94d0e367"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -6964,7 +6959,7 @@ dependencies = [
  "crc",
  "log",
  "rand 0.8.5",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util 0.8.1",
 ]
@@ -6984,10 +6979,10 @@ dependencies = [
  "hmac 0.12.1",
  "log",
  "rtcp",
- "rtp",
+ "rtp 0.9.0",
  "sha1",
  "subtle",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util 0.8.1",
 ]
@@ -7007,16 +7002,16 @@ dependencies = [
  "log",
  "nix",
  "rand 0.8.5",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
 
 [[package]]
 name = "webrtc-util"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e"
+checksum = "1438a8fd0d69c5775afb4a71470af92242dbd04059c61895163aa3c1ef933375"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -7028,7 +7023,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand 0.8.5",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -7053,9 +7048,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -7075,11 +7070,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7090,11 +7085,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538"
 dependencies = [
- "windows-core 0.52.0",
+ "windows-core 0.53.0",
  "windows-targets 0.52.6",
 ]
 
@@ -7110,10 +7105,11 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd"
 dependencies = [
+ "windows-result 0.1.2",
  "windows-targets 0.52.6",
 ]
 
@@ -7125,7 +7121,7 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-result",
+ "windows-result 0.1.2",
  "windows-targets 0.52.6",
 ]
 
@@ -7137,7 +7133,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -7148,7 +7144,18 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-strings",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7160,6 +7167,25 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -7178,6 +7204,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -7301,9 +7336,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -7318,16 +7353,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -7366,7 +7391,7 @@ dependencies = [
  "oid-registry 0.6.1",
  "ring 0.16.20",
  "rusticata-macros",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -7376,22 +7401,22 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs 0.6.2",
  "data-encoding",
  "der-parser 9.0.0",
  "lazy_static",
  "nom",
- "oid-registry 0.7.0",
+ "oid-registry 0.7.1",
  "rusticata-macros",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "time",
 ]
 
 [[package]]
 name = "xml-rs"
-version = "0.8.17"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eee6bf5926be7cf998d7381a9a23d833fd493f6a8034658a9505a4dc4b20444"
+checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432"
 
 [[package]]
 name = "xmltree"
@@ -7419,9 +7444,9 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028"
+checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4"
 dependencies = [
  "futures",
  "log",
@@ -7462,28 +7487,29 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
  "synstructure 0.13.1",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -7503,7 +7529,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
  "synstructure 0.13.1",
 ]
 
@@ -7524,7 +7550,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
 
 [[package]]
@@ -7546,5 +7572,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.92",
 ]
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
index d010d4c1044..d43be5720d4 100644
--- a/transports/webrtc/Cargo.toml
+++ b/transports/webrtc/Cargo.toml
@@ -23,12 +23,13 @@ libp2p-webrtc-utils = { workspace = true }
 multihash = { workspace = true }
 rand = "0.8"
 rcgen = { workspace = true }
-stun = "0.6"
+stun = "0.7"
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["net"], optional = true }
 tokio-util = { version = "0.7", features = ["compat"], optional = true }
 tracing = { workspace = true }
 webrtc = { version = "0.9.0", optional = true }
+webrtc-ice = "=0.10.0" # smoke tests only work with this version
 
 [features]
 tokio = ["dep:tokio", "dep:tokio-util", "dep:webrtc", "if-watch/tokio"]
diff --git a/wasm-tests/webtransport-tests/src/lib.rs b/wasm-tests/webtransport-tests/src/lib.rs
index 207bdb03b91..0ff838b49e5 100644
--- a/wasm-tests/webtransport-tests/src/lib.rs
+++ b/wasm-tests/webtransport-tests/src/lib.rs
@@ -20,7 +20,7 @@ use web_sys::{window, Response};
 wasm_bindgen_test_configure!(run_in_browser);
 
 #[wasm_bindgen_test]
-async fn single_conn_single_stream() {
+pub async fn single_conn_single_stream() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -28,7 +28,7 @@ async fn single_conn_single_stream() {
 }
 
 #[wasm_bindgen_test]
-async fn single_conn_single_stream_incoming() {
+pub async fn single_conn_single_stream_incoming() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = incoming_stream(&mut conn).await;
 
@@ -36,7 +36,7 @@ async fn single_conn_single_stream_incoming() {
 }
 
 #[wasm_bindgen_test]
-async fn single_conn_multiple_streams() {
+pub async fn single_conn_multiple_streams() {
     let mut conn = new_connection_to_echo_server().await;
     let mut tasks = Vec::new();
     let mut streams = Vec::new();
@@ -59,7 +59,7 @@ async fn single_conn_multiple_streams() {
 }
 
 #[wasm_bindgen_test]
-async fn multiple_conn_multiple_streams() {
+pub async fn multiple_conn_multiple_streams() {
     let mut tasks = Vec::new();
     let mut conns = Vec::new();
 
@@ -90,7 +90,7 @@ async fn multiple_conn_multiple_streams() {
 }
 
 #[wasm_bindgen_test]
-async fn multiple_conn_multiple_streams_sequential() {
+pub async fn multiple_conn_multiple_streams_sequential() {
     for _ in 0..10 {
         let mut conn = new_connection_to_echo_server().await;
 
@@ -107,7 +107,7 @@ async fn multiple_conn_multiple_streams_sequential() {
 }
 
 #[wasm_bindgen_test]
-async fn read_leftovers() {
+pub async fn read_leftovers() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -130,7 +130,7 @@ async fn read_leftovers() {
 }
 
 #[wasm_bindgen_test]
-async fn allow_read_after_closing_writer() {
+pub async fn allow_read_after_closing_writer() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -156,7 +156,7 @@ async fn allow_read_after_closing_writer() {
 }
 
 #[wasm_bindgen_test]
-async fn poll_outbound_error_after_connection_close() {
+pub async fn poll_outbound_error_after_connection_close() {
     let mut conn = new_connection_to_echo_server().await;
 
     // Make sure that poll_outbound works well before closing the connection
@@ -174,7 +174,7 @@ async fn poll_outbound_error_after_connection_close() {
 }
 
 #[wasm_bindgen_test]
-async fn poll_inbound_error_after_connection_close() {
+pub async fn poll_inbound_error_after_connection_close() {
     let mut conn = new_connection_to_echo_server().await;
 
     // Make sure that poll_inbound works well before closing the connection
@@ -192,7 +192,7 @@ async fn poll_inbound_error_after_connection_close() {
 }
 
 #[wasm_bindgen_test]
-async fn read_error_after_connection_drop() {
+pub async fn read_error_after_connection_drop() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -207,7 +207,7 @@ async fn read_error_after_connection_drop() {
 }
 
 #[wasm_bindgen_test]
-async fn read_error_after_connection_close() {
+pub async fn read_error_after_connection_close() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -225,7 +225,7 @@ async fn read_error_after_connection_close() {
 }
 
 #[wasm_bindgen_test]
-async fn write_error_after_connection_drop() {
+pub async fn write_error_after_connection_drop() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -240,7 +240,7 @@ async fn write_error_after_connection_drop() {
 }
 
 #[wasm_bindgen_test]
-async fn write_error_after_connection_close() {
+pub async fn write_error_after_connection_close() {
     let mut conn = new_connection_to_echo_server().await;
     let mut stream = create_stream(&mut conn).await;
 
@@ -258,7 +258,7 @@ async fn write_error_after_connection_close() {
 }
 
 #[wasm_bindgen_test]
-async fn connect_without_peer_id() {
+pub async fn connect_without_peer_id() {
     let mut addr = fetch_server_addr().await;
     let keypair = Keypair::generate_ed25519();
 
@@ -280,7 +280,7 @@ async fn connect_without_peer_id() {
 }
 
 #[wasm_bindgen_test]
-async fn error_on_unknown_peer_id() {
+pub async fn error_on_unknown_peer_id() {
     let mut addr = fetch_server_addr().await;
     let keypair = Keypair::generate_ed25519();
 
@@ -306,7 +306,7 @@ async fn error_on_unknown_peer_id() {
 }
 
 #[wasm_bindgen_test]
-async fn error_on_unknown_certhash() {
+pub async fn error_on_unknown_certhash() {
     let mut addr = fetch_server_addr().await;
     let keypair = Keypair::generate_ed25519();
 

From e1d02ca0d9458ab4e0afccac91be9221d92294f8 Mon Sep 17 00:00:00 2001
From: hopinheimer <48147533+hopinheimer@users.noreply.github.com>
Date: Sun, 29 Dec 2024 16:29:15 -0500
Subject: [PATCH 448/455] feat(gossipsub): Allow setting a size threshold for
 IDONTWANT messages

This PR adds configurable parameter that sets minimum message size for which `IDONTWANT` messages would be send. This is an optimisation trick, discussion regarding the same can be found [here](https://github.com/sigp/lighthouse/issues/6437)

Pull-Request: #5770.
---
 protocols/gossipsub/CHANGELOG.md           |  2 +
 protocols/gossipsub/src/behaviour.rs       |  7 +++-
 protocols/gossipsub/src/behaviour/tests.rs | 44 +++++++++++++++++++++-
 protocols/gossipsub/src/config.rs          | 27 +++++++++++++
 4 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 5e18f284fc4..d5054bea945 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## 0.48.0
+- Add configurable `idontwant_message_size_threshold` parameter.
+  See [PR 5770](https://github.com/libp2p/rust-libp2p/pull/5770)
 
 - Introduce Gossipsub v1.2 [spec](https://github.com/libp2p/specs/blob/master/pubsub/gossipsub/gossipsub-v1.2.md).
   See [PR 5697](https://github.com/libp2p/rust-libp2p/pull/5697)
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 4643f2bd97f..4de314d7423 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -1739,8 +1739,10 @@ where
         // Calculate the message id on the transformed data.
         let msg_id = self.config.message_id(&message);
 
-        // Broadcast IDONTWANT messages.
-        self.send_idontwant(&raw_message, &msg_id, propagation_source);
+        // Broadcast IDONTWANT messages
+        if raw_message.raw_protobuf_len() > self.config.idontwant_message_size_threshold() {
+            self.send_idontwant(&raw_message, &msg_id, propagation_source);
+        }
 
         // Check the validity of the message
         // Peers get penalized if this message is invalid. We don't add it to the duplicate cache
@@ -1757,6 +1759,7 @@ where
             self.mcache.observe_duplicate(&msg_id, propagation_source);
             return;
         }
+
         tracing::debug!(
             message=%msg_id,
             "Put message in duplicate_cache and resolve promises"
diff --git a/protocols/gossipsub/src/behaviour/tests.rs b/protocols/gossipsub/src/behaviour/tests.rs
index f3d24897b0c..bed74ecdce7 100644
--- a/protocols/gossipsub/src/behaviour/tests.rs
+++ b/protocols/gossipsub/src/behaviour/tests.rs
@@ -5288,7 +5288,7 @@ fn sends_idontwant() {
 
     let message = RawMessage {
         source: Some(peers[1]),
-        data: vec![12],
+        data: vec![12u8; 1024],
         sequence_number: Some(0),
         topic: topic_hashes[0].clone(),
         signature: None,
@@ -5314,6 +5314,48 @@ fn sends_idontwant() {
     );
 }
 
+#[test]
+fn doesnt_sends_idontwant_for_lower_message_size() {
+    let (mut gs, peers, receivers, topic_hashes) = inject_nodes1()
+        .peer_no(5)
+        .topics(vec![String::from("topic1")])
+        .to_subscribe(true)
+        .gs_config(Config::default())
+        .explicit(1)
+        .peer_kind(PeerKind::Gossipsubv1_2)
+        .create_network();
+
+    let local_id = PeerId::random();
+
+    let message = RawMessage {
+        source: Some(peers[1]),
+        data: vec![12],
+        sequence_number: Some(0),
+        topic: topic_hashes[0].clone(),
+        signature: None,
+        key: None,
+        validated: true,
+    };
+
+    gs.handle_received_message(message.clone(), &local_id);
+    assert_eq!(
+        receivers
+            .into_iter()
+            .fold(0, |mut idontwants, (peer_id, c)| {
+                let non_priority = c.non_priority.get_ref();
+                while !non_priority.is_empty() {
+                    if let Ok(RpcOut::IDontWant(_)) = non_priority.try_recv() {
+                        assert_ne!(peer_id, peers[1]);
+                        idontwants += 1;
+                    }
+                }
+                idontwants
+            }),
+        0,
+        "IDONTWANT was sent"
+    );
+}
+
 /// Test that a node doesn't send IDONTWANT messages to the mesh peers
 /// that don't run Gossipsub v1.2.
 #[test]
diff --git a/protocols/gossipsub/src/config.rs b/protocols/gossipsub/src/config.rs
index d53908ad267..7bd6c9c583d 100644
--- a/protocols/gossipsub/src/config.rs
+++ b/protocols/gossipsub/src/config.rs
@@ -98,6 +98,7 @@ pub struct Config {
     connection_handler_queue_len: usize,
     connection_handler_publish_duration: Duration,
     connection_handler_forward_duration: Duration,
+    idontwant_message_size_threshold: usize,
 }
 
 impl Config {
@@ -371,6 +372,16 @@ impl Config {
     pub fn forward_queue_duration(&self) -> Duration {
         self.connection_handler_forward_duration
     }
+
+    // The message size threshold for which IDONTWANT messages are sent.
+    // Sending IDONTWANT messages for small messages can have a negative effect to the overall
+    // traffic and CPU load. This acts as a lower bound cutoff for the message size to which
+    // IDONTWANT won't be sent to peers. Only works if the peers support Gossipsub1.2
+    // (see https://github.com/libp2p/specs/blob/master/pubsub/gossipsub/gossipsub-v1.2.md#idontwant-message)
+    // default is 1kB
+    pub fn idontwant_message_size_threshold(&self) -> usize {
+        self.idontwant_message_size_threshold
+    }
 }
 
 impl Default for Config {
@@ -443,6 +454,7 @@ impl Default for ConfigBuilder {
                 connection_handler_queue_len: 5000,
                 connection_handler_publish_duration: Duration::from_secs(5),
                 connection_handler_forward_duration: Duration::from_secs(1),
+                idontwant_message_size_threshold: 1000,
             },
             invalid_protocol: false,
         }
@@ -829,6 +841,17 @@ impl ConfigBuilder {
         self
     }
 
+    // The message size threshold for which IDONTWANT messages are sent.
+    // Sending IDONTWANT messages for small messages can have a negative effect to the overall
+    // traffic and CPU load. This acts as a lower bound cutoff for the message size to which
+    // IDONTWANT won't be sent to peers. Only works if the peers support Gossipsub1.2
+    // (see https://github.com/libp2p/specs/blob/master/pubsub/gossipsub/gossipsub-v1.2.md#idontwant-message)
+    // default is 1kB
+    pub fn idontwant_message_size_threshold(&mut self, size: usize) -> &mut Self {
+        self.config.idontwant_message_size_threshold = size;
+        self
+    }
+
     /// Constructs a [`Config`] from the given configuration and validates the settings.
     pub fn build(&self) -> Result<Config, ConfigBuilderError> {
         // check all constraints on config
@@ -899,6 +922,10 @@ impl std::fmt::Debug for Config {
             "published_message_ids_cache_time",
             &self.published_message_ids_cache_time,
         );
+        let _ = builder.field(
+            "idontwant_message_size_threhold",
+            &self.idontwant_message_size_threshold,
+        );
         builder.finish()
     }
 }

From 5841277b3e5498e7126f0fb5347f027039071d51 Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Thu, 2 Jan 2025 21:35:44 +0700
Subject: [PATCH 449/455] chore(kad): revert version bump

Revert version bump, because `libp2p-kad-0.47.0` isn't released yet.

Pull-Request: #5776.
---
 Cargo.lock                 |  2 +-
 Cargo.toml                 |  2 +-
 protocols/kad/CHANGELOG.md | 11 ++++-------
 protocols/kad/Cargo.toml   |  2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6f00ab4c9f..c73e12ed86d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2935,7 +2935,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.47.1"
+version = "0.47.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 8c5c4c320c1..61266bd5827 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.46.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
-libp2p-kad = { version = "0.47.1", path = "protocols/kad" }
+libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 71ef499a179..0793c964fd8 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -1,10 +1,3 @@
-## 0.47.1
-
-- Expose Distance private field U256 to public.
-  See [PR 5705](https://github.com/libp2p/rust-libp2p/pull/5705).
-- Fix systematic memory allocation when iterating over `KBuckets`.
-  See [PR 5715](https://github.com/libp2p/rust-libp2p/pull/5715).
-
 ## 0.47.0
 
 - Expose a kad query facility allowing specify num_results dynamicaly.
@@ -15,6 +8,10 @@
   See [PR 5645](https://github.com/libp2p/rust-libp2p/pull/5645).
 - Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
   See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+- Expose Distance private field U256 to public.
+  See [PR 5705](https://github.com/libp2p/rust-libp2p/pull/5705).
+- Fix systematic memory allocation when iterating over `KBuckets`.
+  See [PR 5715](https://github.com/libp2p/rust-libp2p/pull/5715).
 
 ## 0.46.2
 
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
index 9b8ec64205a..757c0aed189 100644
--- a/protocols/kad/Cargo.toml
+++ b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.47.1"
+version = "0.47.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From a14776ea7778b7ec17057b8a6cd1711d64131ceb Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Thu, 2 Jan 2025 21:46:07 +0700
Subject: [PATCH 450/455] chore(autonat): revert version bump

Revert version bump, `libp2p-autonat-v0.13.1` isn't released yet.

Pull-Request: #5777.
---
 Cargo.lock                     | 2 +-
 Cargo.toml                     | 2 +-
 protocols/autonat/CHANGELOG.md | 6 +-----
 protocols/autonat/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c73e12ed86d..f7597208662 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2716,7 +2716,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-autonat"
-version = "0.13.2"
+version = "0.13.1"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 61266bd5827..17ac1f3dadc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ rust-version = "1.75.0"
 [workspace.dependencies]
 libp2p = { version = "0.54.2", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.4.2", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.13.2", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.1", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.1", path = "core" }
 libp2p-dcutr = { version = "0.12.1", path = "protocols/dcutr" }
diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
index f946f59c9ef..75a40b8c5ad 100644
--- a/protocols/autonat/CHANGELOG.md
+++ b/protocols/autonat/CHANGELOG.md
@@ -1,13 +1,9 @@
-## 0.13.2
-
-- Update to `libp2p-request-response` `v0.28.0`.
-
 ## 0.13.1
 
 - Verify that an incoming AutoNAT dial comes from a connected peer. See [PR 5597](https://github.com/libp2p/rust-libp2p/pull/5597).
-
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+- Update to `libp2p-request-response` `v0.28.0`.
 
 ## 0.13.0
 
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
index 5f5d18562fd..8ad4492fbff 100644
--- a/protocols/autonat/Cargo.toml
+++ b/protocols/autonat/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
-version = "0.13.2"
+version = "0.13.1"
 authors = [
     "David Craven <david@craven.ch>",
     "Elena Frank <elena.frank@protonmail.com>",

From f7f9e137960a3e57d14f05fdf41ce5a64c0deae6 Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Thu, 2 Jan 2025 22:02:25 +0700
Subject: [PATCH 451/455] chore(server): revert version bump

Revert version bump, `libp2p-server-v0.12.6` isn't released yet.

Pull-Request: #5780.
---
 Cargo.lock               |  2 +-
 Cargo.toml               |  2 +-
 misc/server/CHANGELOG.md | 20 +++++---------------
 misc/server/Cargo.toml   |  2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f7597208662..8df2890b494 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3267,7 +3267,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-server"
-version = "0.12.8"
+version = "0.12.6"
 dependencies = [
  "axum",
  "base64 0.22.1",
diff --git a/Cargo.toml b/Cargo.toml
index 17ac1f3dadc..8030d400320 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -98,7 +98,7 @@ libp2p-quic = { version = "0.11.2", path = "transports/quic" }
 libp2p-relay = { version = "0.18.1", path = "protocols/relay" }
 libp2p-rendezvous = { version = "0.15.1", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.28.0", path = "protocols/request-response" }
-libp2p-server = { version = "0.12.8", path = "misc/server" }
+libp2p-server = { version = "0.12.6", path = "misc/server" }
 libp2p-stream = { version = "0.2.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.45.2", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
index fe48de0f553..53341baa9ab 100644
--- a/misc/server/CHANGELOG.md
+++ b/misc/server/CHANGELOG.md
@@ -1,25 +1,15 @@
-## 0.12.8
-
-### Changed
-
-- Remove deprecated [`libp2p-lookup`](https://github.com/mxinden/libp2p-lookup) from Dockerfile.
-  See [PR 5610](https://github.com/libp2p/rust-libp2p/pull/5610).
-
-## 0.12.7
+## 0.12.6
 
 ### Changed
 
+- Stop using kad default protocol.
+  See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122)
 - Use periodic and automatic bootstrap of Kademlia.
   See [PR 4838](https://github.com/libp2p/rust-libp2p/pull/4838).
 - Update to [`libp2p-identify` `v0.45.0`](protocols/identify/CHANGELOG.md#0450).
   See [PR 4981](https://github.com/libp2p/rust-libp2p/pull/4981).
-
-## 0.12.6
-
-### Changed
-
-- Stop using kad default protocol.
-  See [PR 5122](https://github.com/libp2p/rust-libp2p/pull/5122)
+- Remove deprecated [`libp2p-lookup`](https://github.com/mxinden/libp2p-lookup) from Dockerfile.
+  See [PR 5610](https://github.com/libp2p/rust-libp2p/pull/5610).
 
 ## 0.12.5
 
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
index 02da0adb9ef..b2b3d33ca1e 100644
--- a/misc/server/Cargo.toml
+++ b/misc/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-server"
-version = "0.12.8"
+version = "0.12.6"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2021"
 repository = "https://github.com/libp2p/rust-libp2p"

From 2f9294c5d6fd62a2dd0daefc9fce526ffc52217f Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Thu, 2 Jan 2025 22:13:02 +0700
Subject: [PATCH 452/455] chore(identify): revert version bump

Revert version bump, `libp2p-identify-v0.46.0` isn't released yet.

Pull-Request: #5778.
---
 Cargo.lock                      | 2 +-
 Cargo.toml                      | 2 +-
 protocols/identify/CHANGELOG.md | 6 ++----
 protocols/identify/Cargo.toml   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8df2890b494..8b7ef2022a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2886,7 +2886,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.46.1"
+version = "0.46.0"
 dependencies = [
  "async-std",
  "asynchronous-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 8030d400320..657a347d45e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -82,7 +82,7 @@ libp2p-dcutr = { version = "0.12.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.42.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.45.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.48.0", path = "protocols/gossipsub" }
-libp2p-identify = { version = "0.46.1", path = "protocols/identify" }
+libp2p-identify = { version = "0.46.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.10" }
 libp2p-kad = { version = "0.47.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" }
diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md
index 2b136740156..e9f7b017574 100644
--- a/protocols/identify/CHANGELOG.md
+++ b/protocols/identify/CHANGELOG.md
@@ -1,11 +1,9 @@
-## 0.46.1
-- Discard `Info`s received from remote peers that contain a public key that doesn't match their peer ID.
-  See [PR 5707](https://github.com/libp2p/rust-libp2p/pull/5707).
-
 ## 0.46.0
 
 - Make `identify::Config` fields private and add getter functions.
   See [PR 5663](https://github.com/libp2p/rust-libp2p/pull/5663).
+- Discard `Info`s received from remote peers that contain a public key that doesn't match their peer ID.
+  See [PR 5707](https://github.com/libp2p/rust-libp2p/pull/5707).
 
 ## 0.45.1
 
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
index 4ce2a0c1bd9..9c4f8ea3707 100644
--- a/protocols/identify/Cargo.toml
+++ b/protocols/identify/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Nodes identification protocol for libp2p"
-version = "0.46.1"
+version = "0.46.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

From fd3f7c400b39e8a7d5913d53dc151db58781c3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Thu, 2 Jan 2025 15:26:24 +0000
Subject: [PATCH 453/455] chore(ci): add Zlib to deny.toml

Similar to https://github.com/libp2p/rust-libp2p/pull/5738,  [`foldhash`](https://crates.io/crates/foldhash) is the dependency that requires it. It was introduced by `hashbrown` which is dependency of a lot of crates [here](https://github.com/rust-lang/hashbrown/pull/563).
`hashbrown` is MIT, and Zlib is also an Open Source Initiative [approved license](https://opensource.org/license/zlib).

If you prefer we can also do as the upstream `cargo-deny` do and just add `foldhash` [to the exceptions](https://github.com/EmbarkStudios/cargo-deny/pull/618/files#diff-1040309c64844eb1b6b63d8fd67938adbf9461f1b3c61f12cf738f064a02d3deR56) but I can't see any advantage to it.
Cc @hanabi1224

Pull-Request: #5769.
---
 deny.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deny.toml b/deny.toml
index 9e0e201527b..47487553028 100644
--- a/deny.toml
+++ b/deny.toml
@@ -44,6 +44,7 @@ allow = [
     "MPL-2.0",
     "Unlicense",
     "Unicode-3.0",
+    "Zlib",
 ]
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the

From 02040ffd79fab078d94cf6bbc000f02a647a95b0 Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Thu, 2 Jan 2025 23:48:57 +0700
Subject: [PATCH 454/455] chore(allow-block-list): revert version bump

Revert version bump, `libp2p-allow-block-list-v0.4.1` isn't released yet.

Pull-Request: #5779.
---
 Cargo.lock                         | 2 +-
 Cargo.toml                         | 2 +-
 misc/allow-block-list/CHANGELOG.md | 7 ++-----
 misc/allow-block-list/Cargo.toml   | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b7ef2022a3..091b1b8dede 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2704,7 +2704,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-allow-block-list"
-version = "0.4.2"
+version = "0.4.1"
 dependencies = [
  "async-std",
  "libp2p-core",
diff --git a/Cargo.toml b/Cargo.toml
index 657a347d45e..b8186584487 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,7 +74,7 @@ rust-version = "1.75.0"
 
 [workspace.dependencies]
 libp2p = { version = "0.54.2", path = "libp2p" }
-libp2p-allow-block-list = { version = "0.4.2", path = "misc/allow-block-list" }
+libp2p-allow-block-list = { version = "0.4.1", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.4.1", path = "misc/connection-limits" }
 libp2p-core = { version = "0.42.1", path = "core" }
diff --git a/misc/allow-block-list/CHANGELOG.md b/misc/allow-block-list/CHANGELOG.md
index b5ffd7f0495..e7f68f6f8fe 100644
--- a/misc/allow-block-list/CHANGELOG.md
+++ b/misc/allow-block-list/CHANGELOG.md
@@ -1,13 +1,10 @@
-## 0.4.2
-
-- Deprecate `void` crate.
-  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
-
 ## 0.4.1
 
 - Add getters & setters for the allowed/blocked peers.
   Return a `bool` for every "insert/remove" function, informing if a change was performed.
   See [PR 5572](https://github.com/libp2p/rust-libp2p/pull/5572).
+- Deprecate `void` crate.
+  See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
 
 ## 0.4.0
 
diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml
index 66ee3ef9124..c169be87056 100644
--- a/misc/allow-block-list/Cargo.toml
+++ b/misc/allow-block-list/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-allow-block-list"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Allow/block list connection management for libp2p."
-version = "0.4.2"
+version = "0.4.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]

From 40550dc8895872d6028236050786ffdab435c16b Mon Sep 17 00:00:00 2001
From: DrHuangMHT <DrHuangMHT@outlook.com>
Date: Sat, 4 Jan 2025 02:51:48 +0800
Subject: [PATCH 455/455] chore(kad): remove default constructor for
 ProtocolConfig

Remove items that were deprecated in #5122.

Pull-Request: #5774.
---
 protocols/kad/CHANGELOG.md     |  2 ++
 protocols/kad/src/behaviour.rs | 23 -----------------------
 protocols/kad/src/protocol.rs  | 28 +---------------------------
 3 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index 0793c964fd8..0c6e460afcd 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -12,6 +12,8 @@
   See [PR 5705](https://github.com/libp2p/rust-libp2p/pull/5705).
 - Fix systematic memory allocation when iterating over `KBuckets`.
   See [PR 5715](https://github.com/libp2p/rust-libp2p/pull/5715).
+- Remove deprecated default constructor for `ProtocolConfig`.
+  See [PR 5774](https://github.com/libp2p/rust-libp2p/pull/5774).
 
 ## 0.46.2
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 1ba8b1e27af..04ebe7d8174 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -238,29 +238,6 @@ impl Config {
         }
     }
 
-    /// Returns the default configuration.
-    #[deprecated(note = "Use `Config::new` instead")]
-    #[allow(clippy::should_implement_trait)]
-    pub fn default() -> Self {
-        Default::default()
-    }
-
-    /// Sets custom protocol names.
-    ///
-    /// Kademlia nodes only communicate with other nodes using the same protocol
-    /// name. Using custom name(s) therefore allows to segregate the DHT from
-    /// others, if that is desired.
-    ///
-    /// More than one protocol name can be supplied. In this case the node will
-    /// be able to talk to other nodes supporting any of the provided names.
-    /// Multiple names must be used with caution to avoid network partitioning.
-    #[deprecated(note = "Use `Config::new` instead")]
-    #[allow(deprecated)]
-    pub fn set_protocol_names(&mut self, names: Vec<StreamProtocol>) -> &mut Self {
-        self.protocol_config.set_protocol_names(names);
-        self
-    }
-
     /// Sets the timeout for a single query.
     ///
     /// > **Note**: A single query usually comprises at least as many requests
diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs
index 9d0d69b670e..059b6ae6fd1 100644
--- a/protocols/kad/src/protocol.rs
+++ b/protocols/kad/src/protocol.rs
@@ -26,7 +26,7 @@
 //! to poll the underlying transport for incoming messages, and the `Sink` component
 //! is used to send messages to remote peers.
 
-use std::{io, iter, marker::PhantomData, time::Duration};
+use std::{io, marker::PhantomData, time::Duration};
 
 use asynchronous_codec::{Decoder, Encoder, Framed};
 use bytes::BytesMut;
@@ -156,43 +156,17 @@ impl ProtocolConfig {
         }
     }
 
-    /// Returns the default configuration.
-    #[deprecated(note = "Use `ProtocolConfig::new` instead")]
-    #[allow(clippy::should_implement_trait)]
-    pub fn default() -> Self {
-        Default::default()
-    }
-
     /// Returns the configured protocol name.
     pub fn protocol_names(&self) -> &[StreamProtocol] {
         &self.protocol_names
     }
 
-    /// Modifies the protocol names used on the wire. Can be used to create incompatibilities
-    /// between networks on purpose.
-    #[deprecated(note = "Use `ProtocolConfig::new` instead")]
-    pub fn set_protocol_names(&mut self, names: Vec<StreamProtocol>) {
-        self.protocol_names = names;
-    }
-
     /// Modifies the maximum allowed size of a single Kademlia packet.
     pub fn set_max_packet_size(&mut self, size: usize) {
         self.max_packet_size = size;
     }
 }
 
-impl Default for ProtocolConfig {
-    /// Returns the default configuration.
-    ///
-    /// Deprecated: use `ProtocolConfig::new` instead.
-    fn default() -> Self {
-        ProtocolConfig {
-            protocol_names: iter::once(DEFAULT_PROTO_NAME).collect(),
-            max_packet_size: DEFAULT_MAX_PACKET_SIZE,
-        }
-    }
-}
-
 impl UpgradeInfo for ProtocolConfig {
     type Info = StreamProtocol;
     type InfoIter = std::vec::IntoIter<Self::Info>;