Merge branch 'master' into fix-gossipsub-mesh-fanout-inconsistencies

libp2p · Nov 27, 2024 · e867e60 · e867e60
2 parents 88403f6 + c9c44b1
commit e867e60
Show file tree

Hide file tree

Showing 26 changed files with 144 additions and 121 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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/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/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/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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"