Merge branch 'master' into dependabot/cargo/redis-0.23.4

libp2p · Nov 28, 2023 · b534616 · b534616
2 parents e434677 + dfce3cc
commit b534616
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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.4", default-features = false, features = ["tokio-comp"] }
 tokio = { version = "1.34.0", features = ["full"] }
-serde = { version = "1.0.192", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
 either = "1.9.0"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
@@ -15,7 +15,7 @@ release = false
 [dependencies]
 clap = { version = "4.4.8", features = ["derive"] }
 zeroize = "1"
-serde = { version = "1.0.192", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 serde_json = "1.0.108"
 libp2p-core = { workspace = true }
 base64 = "0.21.5"

diff --git 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"] }
 prometheus-client = { workspace = true }
-serde = "1.0.192"
+serde = "1.0.193"
 serde_derive = "1.0.125"
 serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }

diff --git a/muxers/yamux/CHANGELOG.md b/muxers/yamux/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.45.1
+
+- Deprecate `WindowUpdateMode::on_receive`.
+  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).
+
 ## 0.45.0
 
 - Migrate to `{In,Out}boundConnectionUpgrade` traits.

diff --git a/muxers/yamux/src/lib.rs b/muxers/yamux/src/lib.rs
@@ -231,7 +231,9 @@ impl WindowUpdateMode {
     /// > size must be tuned appropriately for the desired
     /// > throughput and level of tolerance for (temporarily)
     /// > slow receivers.
+    #[deprecated(note = "Use `WindowUpdateMode::on_read` instead.")]
     pub fn on_receive() -> Self {
+        #[allow(deprecated)]
         WindowUpdateMode(yamux::WindowUpdateMode::OnReceive)
     }
 

diff --git 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.0"
+lru = "0.12.1"
 futures-bounded = { workspace = true }
 
 [dev-dependencies]

diff --git 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.0"
+lru = "0.12.1"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.11.2"

diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
@@ -13,9 +13,9 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.2.0", optional = true }
-data-encoding = "2.4.0"
+data-encoding = "2.5.0"
 futures = "0.3.29"
-if-watch = "3.1.0"
+if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }

diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
@@ -13,7 +13,7 @@ async-std = { version = "1.12.0", optional = true }
 bytes = "1.5.0"
 futures = "0.3.29"
 futures-timer = "3.0.2"
-if-watch = "3.1.0"
+if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }

diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-io = { version = "2.2.0", optional = true }
 futures = "0.3.29"
 futures-timer = "3.0"
-if-watch = "3.1.0"
+if-watch = "3.2.0"
 libc = "0.2.150"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
@@ -16,7 +16,7 @@ bytes = "1"
 futures = "0.3"
 futures-timer = "3"
 hex = "0.4"
-if-watch = "3.1"
+if-watch = "3.2"
 libp2p-core = { workspace = true }
 libp2p-noise = { workspace = true }
 libp2p-identity = { workspace = true }

diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
@@ -21,7 +21,7 @@ pin-project-lite = "0.2.13"
 rw-stream-sink = { workspace = true }
 soketto = "0.7.0"
 tracing = "0.1.37"
-url = "2.4"
+url = "2.5"
 webpki-roots = "0.25"
 
 [dev-dependencies]