Merge branch 'sigp-gossipsub' of github.com:jxs/rust-libp2p into report-lowscore-peers

jxs · jxs · commit f592a86c9688 · 2025-08-13T16:32:06.000+01:00
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,3 +1,6 @@
+merge_queue:
+  max_parallel_checks: 1
+
 pull_request_rules:
   - name: Ask to resolve conflict
     conditions:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -85,7 +85,7 @@ libp2p-floodsub = { version = "0.47.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.50.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.47.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.12" }
-libp2p-kad = { version = "0.48.1", path = "protocols/kad" }
+libp2p-kad = { version = "0.49.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.48.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.5.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.17.0", path = "misc/metrics" }
@@ -112,7 +112,7 @@ libp2p-upnp = { version = "0.5.0", path = "protocols/upnp" }
 libp2p-webrtc = { version = "0.9.0-alpha.1", path = "transports/webrtc" }
 libp2p-webrtc-utils = { version = "0.4.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0", path = "transports/webrtc-websys" }
-libp2p-websocket = { version = "0.45.1", path = "transports/websocket" }
+libp2p-websocket = { version = "0.45.2", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.5.0", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.5.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.47.0", path = "muxers/yamux" }
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { workspace = true, features = ["full"] }
 futures = { workspace = true }
-libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
+libp2p = { version = "0.56", features = ["tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git 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"] }
 either = "1.12"
 futures = { workspace = true }
-libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
+libp2p = { version = "0.56", features = ["tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [lints]
diff --git a/misc/metrics/src/kad.rs b/misc/metrics/src/kad.rs
@@ -318,7 +318,6 @@ struct GetRecordResult {
 #[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum GetRecordError {
     NotFound,
-    QuorumFailed,
     Timeout,
 }
 
@@ -328,9 +327,6 @@ impl From<&libp2p_kad::GetRecordError> for GetRecordResult {
             libp2p_kad::GetRecordError::NotFound { .. } => GetRecordResult {
                 error: GetRecordError::NotFound,
             },
-            libp2p_kad::GetRecordError::QuorumFailed { .. } => GetRecordResult {
-                error: GetRecordError::QuorumFailed,
-            },
             libp2p_kad::GetRecordError::Timeout { .. } => GetRecordResult {
                 error: GetRecordError::Timeout,
             },
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 0.50.0
 
+- Relax `Behaviour::with_metrics` requirements, do not require DataTransform and TopicSubscriptionFilter to also impl Default
+  See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/6097)
+
 - Remove `Rpc` from the public API.
   See [PR 6091](https://github.com/libp2p/rust-libp2p/pull/6091)
 
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
@@ -28,23 +28,23 @@ getrandom = { workspace = true }
 hashlink = { workspace = true }
 hex_fmt = "0.3.0"
 web-time = { workspace = true }
-libp2p-core = { workspace = true }
-libp2p-identity = { workspace = true, features = ["rand"] }
-libp2p-swarm = { workspace = true }
+# Libp2p crates, updated to use crates.io versions so that we can use this gossipsub fork with
+# crates.io libp2p
+libp2p-core = "0.43"
+libp2p-identity = { version = "0.2", features = ["rand"] }
+libp2p-swarm = "0.47"
 quick-protobuf = "0.8"
-quick-protobuf-codec = { workspace = true }
+quick-protobuf-codec = "0.3.1"
 rand = "0.8"
 regex = "1.10.5"
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 tracing = { workspace = true }
 
-# Metrics dependencies
-prometheus-client = { workspace = true, optional = true }
+prometheus-client = { version = "0.23", optional = true }
 
 [dev-dependencies]
-libp2p-core = { workspace = true }
-libp2p-swarm-test = { path = "../../swarm-test" }
+libp2p-swarm-test = { version = "0.6.0", features = ["tokio"] }
 quickcheck = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time", "macros"] }
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
@@ -362,18 +362,6 @@ where
             D::default(),
         )
     }
-
-    /// Allow the [`Behaviour`] to also record metrics.
-    /// Metrics can be evaluated by passing a reference to a [`Registry`].
-    #[cfg(feature = "metrics")]
-    pub fn with_metrics(
-        mut self,
-        metrics_registry: &mut Registry,
-        metrics_config: MetricsConfig,
-    ) -> Self {
-        self.metrics = Some(Metrics::new(metrics_registry, metrics_config));
-        self
-    }
 }
 
 impl<D, F> Behaviour<D, F>
@@ -471,6 +459,18 @@ where
             gossip_promises: Default::default(),
         })
     }
+
+    /// Allow the [`Behaviour`] to also record metrics.
+    /// Metrics can be evaluated by passing a reference to a [`Registry`].
+    #[cfg(feature = "metrics")]
+    pub fn with_metrics(
+        mut self,
+        metrics_registry: &mut Registry,
+        metrics_config: MetricsConfig,
+    ) -> Self {
+        self.metrics = Some(Metrics::new(metrics_registry, metrics_config));
+        self
+    }
 }
 
 impl<D, F> Behaviour<D, F>
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.49.0
+
+- Remove no longer constructed GetRecordError::QuorumFailed.
+  See [PR 6106](https://github.com/libp2p/rust-libp2p/pull/6106)
+
 ## 0.48.1
 
 - Implement `Copy` for `QueryStats` and `ProgressStep`
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition.workspace = true
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.48.1"
+version = "0.49.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
@@ -2951,12 +2951,6 @@ pub enum GetRecordError {
         key: record::Key,
         closest_peers: Vec<PeerId>,
     },
-    #[error("the quorum failed; needed {quorum} peers")]
-    QuorumFailed {
-        key: record::Key,
-        records: Vec<PeerRecord>,
-        quorum: NonZeroUsize,
-    },
     #[error("the request timed out")]
     Timeout { key: record::Key },
 }
@@ -2965,7 +2959,6 @@ impl GetRecordError {
     /// Gets the key of the record for which the operation failed.
     pub fn key(&self) -> &record::Key {
         match self {
-            GetRecordError::QuorumFailed { key, .. } => key,
             GetRecordError::Timeout { key, .. } => key,
             GetRecordError::NotFound { key, .. } => key,
         }
@@ -2975,7 +2968,6 @@ impl GetRecordError {
     /// consuming the error.
     pub fn into_key(self) -> record::Key {
         match self {
-            GetRecordError::QuorumFailed { key, .. } => key,
             GetRecordError::Timeout { key, .. } => key,
             GetRecordError::NotFound { key, .. } => key,
         }
diff --git a/transports/websocket/CHANGELOG.md b/transports/websocket/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.2
+
+- feat(websocket): support `/tls/sni/<hostname>/ws` multiaddrs in the WebSocket transport
+  See [PR 6041](https://github.com/your-username/rust-libp2p/pull/6041)
+
 ## 0.45.1
 - Rename types to match naming convention in [discussion 2174](https://github.com/libp2p/rust-libp2p/discussions/2174).
   See [PR 5873](https://github.com/libp2p/rust-libp2p/pull/5873).
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-websocket"
 edition.workspace = true
 rust-version = { workspace = true }
 description = "WebSocket transport 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/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
@@ -508,7 +508,7 @@ 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, server_name) = loop {
+    let (host_port, mut server_name) = loop {
         match (ip, tcp) {
             (Some(Protocol::Ip4(ip)), Some(Protocol::Tcp(port))) => {
                 let server_name = ServerName::IpAddress(IpAddr::V4(ip).into());
@@ -531,6 +531,8 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
         }
     };
 
+    // Will hold a value if the multiaddr carries `/tls/sni/<host>`.
+    let mut sni_override: Option<ServerName<'static>> = None;
     // Now consume the `Ws` / `Wss` protocol from the end of the address,
     // preserving the trailing `P2p` protocol that identifies the remote,
     // if any.
@@ -540,6 +542,13 @@ 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)) => match protocols.pop() {
+                Some(Protocol::Sni(domain)) => match protocols.pop() {
+                    Some(Protocol::Tls) => {
+                        sni_override = Some(tls::dns_name_ref(&domain)?);
+                        break (true, path.into_owned());
+                    }
+                    _ => return Err(Error::InvalidMultiaddr(addr)),
+                },
                 Some(Protocol::Tls) => break (true, path.into_owned()),
                 Some(p) => {
                     protocols.push(p);
@@ -559,6 +568,9 @@ fn parse_ws_dial_addr<T>(addr: Multiaddr) -> Result<WsAddress, Error<T>> {
         None => protocols,
     };
 
+    if let Some(name) = sni_override {
+        server_name = name;
+    }
     Ok(WsAddress {
         host_port,
         server_name,
@@ -1013,5 +1025,49 @@ mod tests {
         // 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();
+
+        // Check `/tls/sni/.../ws` with `/dns4`
+        let addr = "/dns4/example.com/tcp/2222/tls/sni/example.com/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/sni/.../ws` with `/ip4`
+        let addr = "/ip4/127.0.0.1/tcp/2222/tls/sni/example.test/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, "example.test".try_into().unwrap());
+        assert_eq!(info.tcp_addr, "/ip4/127.0.0.1/tcp/2222".parse().unwrap());
+
+        // Check `/tls/sni/.../ws` with trailing `/p2p`
+        let addr = format!("/dns4/example.com/tcp/2222/tls/sni/example.com/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()
+        );
+
+        // Negative: `/tls/sni/...` *without* `/ws` → error
+        let bad = "/dns4/example.com/tcp/2222/tls/sni/example.com"
+            .parse::<Multiaddr>()
+            .unwrap();
+        parse_ws_dial_addr::<io::Error>(bad).unwrap_err();
     }
 }
