From 2023ae59a365e74f0aef14362dd03423edb28e9a Mon Sep 17 00:00:00 2001 From: brenodt <54450520+brenodt@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:09:42 -0300 Subject: [PATCH 1/5] deps(if-watch): bump if-watch to latest to resolve system-configuration deprecation issue on ios --- Cargo.toml | 8 ++++---- protocols/mdns/CHANGELOG.md | 4 ++++ protocols/mdns/Cargo.toml | 4 ++-- transports/quic/CHANGELOG.md | 3 +++ transports/quic/Cargo.toml | 4 ++-- transports/tcp/CHANGELOG.md | 3 +++ transports/tcp/Cargo.toml | 4 ++-- transports/webrtc/CHANGELOG.md | 3 +++ transports/webrtc/Cargo.toml | 4 ++-- 9 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7a116949bcc..c3308508a58 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.3", 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" } @@ -93,7 +93,7 @@ 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" } libp2p-pnet = { version = "0.25.0", path = "transports/pnet" } -libp2p-quic = { version = "0.11.2", path = "transports/quic" } +libp2p-quic = { version = "0.11.3", 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" } @@ -102,11 +102,11 @@ 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" } -libp2p-tcp = { version = "0.42.0", path = "transports/tcp" } +libp2p-tcp = { version = "0.42.1", 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.1", path = "protocols/upnp" } -libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" } +libp2p-webrtc = { version = "0.8.1-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.1", path = "transports/websocket" } diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md index 98dc3d55454..1d74f6d72a6 100644 --- a/protocols/mdns/CHANGELOG.md +++ b/protocols/mdns/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.46.3 + +- Update `if-watch` to 3.2.1 + ## 0.46.2 - Emit `ToSwarm::NewExternalAddrOfPeer` on discovery. diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 618d41e9b9d..e47ae6c607f 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.3" description = "Implementation of the libp2p mDNS discovery method" authors = ["Parity Technologies "] license = "MIT" @@ -15,7 +15,7 @@ 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" +if-watch = "3.2.1" libp2p-core = { workspace = true } libp2p-swarm = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md index 238cbebe6cf..8173d700d75 100644 --- a/transports/quic/CHANGELOG.md +++ b/transports/quic/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.11.3 +- Update `if-watch` to 3.2.1 + ## 0.11.2 - Deprecate `void` crate. diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 17d5014b974..10d92dc9127 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-quic" -version = "0.11.2" +version = "0.11.3" authors = ["Parity Technologies "] edition = "2021" rust-version = { workspace = true } @@ -13,7 +13,7 @@ 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" +if-watch = "3.2.1" libp2p-core = { workspace = true } libp2p-tls = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md index 107d0d13ece..7edeb147da6 100644 --- a/transports/tcp/CHANGELOG.md +++ b/transports/tcp/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.42.1 +- Update `if-watch` to 3.2.1 + ## 0.42.0 - Implement refactored `Transport`. diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 03e7fac491c..11ffb5db8ed 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.42.0" +version = "0.42.1" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] async-io = { version = "2.3.3", optional = true } futures = { workspace = true } futures-timer = "3.0" -if-watch = "3.2.0" +if-watch = "3.2.1" libc = "0.2.155" libp2p-core = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/webrtc/CHANGELOG.md b/transports/webrtc/CHANGELOG.md index 90d4ce83df3..e00f0352db3 100644 --- a/transports/webrtc/CHANGELOG.md +++ b/transports/webrtc/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.8.1-alpha +- Update `if-watch` to 3.2.1 + ## 0.8.0-alpha - Implement refactored `Transport`. diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index 4197a9419d8..514dad395b8 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-webrtc" -version = "0.8.0-alpha" +version = "0.8.1-alpha" authors = ["Parity Technologies "] description = "WebRTC transport for libp2p" repository = "https://github.com/libp2p/rust-libp2p" @@ -16,7 +16,7 @@ bytes = "1" futures = { workspace = true } futures-timer = "3" hex = "0.4" -if-watch = "3.2" +if-watch = "3.2.1" libp2p-core = { workspace = true } libp2p-noise = { workspace = true } libp2p-identity = { workspace = true } From a2ac9f1244b29167c62d5f91ede012e7979847bb Mon Sep 17 00:00:00 2001 From: brenodt <54450520+brenodt@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:28:45 -0300 Subject: [PATCH 2/5] chore(release): bump version to 0.54.3 --- libp2p/CHANGELOG.md | 8 +++++++- libp2p/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md index 8b7bf0ff55f..22fe8833136 100644 --- a/libp2p/CHANGELOG.md +++ b/libp2p/CHANGELOG.md @@ -1,4 +1,10 @@ -## 0.54.2 +## 0.54.3 + +- Update individual crates. + - Update to [`libp2p-mdns` `0.46.3`](protocols/mdns/CHANGELOG.md#0463). + - Update to [`libp2p-quic` `0.11.3`](transports/quic/CHANGELOG.md#0113). + - Update to [`libp2p-tcp` `0.42.1`](transports/tcp/CHANGELOG.md#0421). + - Update to [`libp2p-webrtc` `0.8.1-alpha`](transports/webrtc/CHANGELOG.md#081-alpha). - 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). diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index 3d44e0bc43c..aa6dd4964f3 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.2" +version = "0.54.3" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" From ea98400c54f1c6ae893d96408048bcd0ad58441f Mon Sep 17 00:00:00 2001 From: brenodt <54450520+brenodt@users.noreply.github.com> Date: Thu, 26 Dec 2024 14:09:03 -0300 Subject: [PATCH 3/5] revert: unnecessary version bumps, remove changelog entries --- libp2p/CHANGELOG.md | 8 +------- libp2p/Cargo.toml | 2 +- protocols/mdns/CHANGELOG.md | 4 ---- protocols/mdns/Cargo.toml | 2 +- transports/quic/CHANGELOG.md | 3 --- transports/quic/Cargo.toml | 2 +- transports/tcp/CHANGELOG.md | 3 --- transports/webrtc/CHANGELOG.md | 3 --- 8 files changed, 4 insertions(+), 23 deletions(-) diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md index 22fe8833136..8b7bf0ff55f 100644 --- a/libp2p/CHANGELOG.md +++ b/libp2p/CHANGELOG.md @@ -1,10 +1,4 @@ -## 0.54.3 - -- Update individual crates. - - Update to [`libp2p-mdns` `0.46.3`](protocols/mdns/CHANGELOG.md#0463). - - Update to [`libp2p-quic` `0.11.3`](transports/quic/CHANGELOG.md#0113). - - Update to [`libp2p-tcp` `0.42.1`](transports/tcp/CHANGELOG.md#0421). - - Update to [`libp2p-webrtc` `0.8.1-alpha`](transports/webrtc/CHANGELOG.md#081-alpha). +## 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). diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index aa6dd4964f3..3d44e0bc43c 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.3" +version = "0.54.2" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md index 1d74f6d72a6..98dc3d55454 100644 --- a/protocols/mdns/CHANGELOG.md +++ b/protocols/mdns/CHANGELOG.md @@ -1,7 +1,3 @@ -## 0.46.3 - -- Update `if-watch` to 3.2.1 - ## 0.46.2 - Emit `ToSwarm::NewExternalAddrOfPeer` on discovery. diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index e47ae6c607f..788ed3128fd 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.3" +version = "0.46.2" description = "Implementation of the libp2p mDNS discovery method" authors = ["Parity Technologies "] license = "MIT" diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md index 8173d700d75..238cbebe6cf 100644 --- a/transports/quic/CHANGELOG.md +++ b/transports/quic/CHANGELOG.md @@ -1,6 +1,3 @@ -## 0.11.3 -- Update `if-watch` to 3.2.1 - ## 0.11.2 - Deprecate `void` crate. diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 10d92dc9127..d74be7c6129 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-quic" -version = "0.11.3" +version = "0.11.2" authors = ["Parity Technologies "] edition = "2021" rust-version = { workspace = true } diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md index 7edeb147da6..107d0d13ece 100644 --- a/transports/tcp/CHANGELOG.md +++ b/transports/tcp/CHANGELOG.md @@ -1,6 +1,3 @@ -## 0.42.1 -- Update `if-watch` to 3.2.1 - ## 0.42.0 - Implement refactored `Transport`. diff --git a/transports/webrtc/CHANGELOG.md b/transports/webrtc/CHANGELOG.md index e00f0352db3..90d4ce83df3 100644 --- a/transports/webrtc/CHANGELOG.md +++ b/transports/webrtc/CHANGELOG.md @@ -1,6 +1,3 @@ -## 0.8.1-alpha -- Update `if-watch` to 3.2.1 - ## 0.8.0-alpha - Implement refactored `Transport`. From 528723d034e24053a5b794b327d74094d560d2b6 Mon Sep 17 00:00:00 2001 From: brenodt <54450520+brenodt@users.noreply.github.com> Date: Thu, 26 Dec 2024 14:12:12 -0300 Subject: [PATCH 4/5] revert: mdns and quic versions in workspace toml file --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c3308508a58..43b266e308a 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.3", 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" } @@ -93,7 +93,7 @@ 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" } libp2p-pnet = { version = "0.25.0", path = "transports/pnet" } -libp2p-quic = { version = "0.11.3", path = "transports/quic" } +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" } From 2ffce257449083a5a34526f30989bdff2824318a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Sun, 12 Jan 2025 20:13:46 +0000 Subject: [PATCH 5/5] update if-watch --- Cargo.toml | 5 +++-- protocols/mdns/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- transports/tcp/Cargo.toml | 4 ++-- transports/webrtc/Cargo.toml | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 83fd19dcd8b..c7071744b6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,11 +103,11 @@ 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" } -libp2p-tcp = { version = "0.42.1", path = "transports/tcp" } +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.1", path = "protocols/upnp" } -libp2p-webrtc = { version = "0.8.1-alpha", path = "transports/webrtc" } +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.1", path = "transports/websocket" } @@ -124,6 +124,7 @@ futures = "0.3.30" futures-bounded = { version = "0.2.4" } futures-rustls = { version = "0.26.0", default-features = false } getrandom = "0.2" +if-watch = "3.2.1" 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/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index acae48b4462..e8fee81e98d 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.3", optional = true } futures = { workspace = true } -if-watch = "3.2.1" +if-watch = { workspace = true } libp2p-core = { workspace = true } libp2p-swarm = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 306d035e3f2..c0d4f17a916 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 } futures = { workspace = true } futures-timer = "3.0.3" -if-watch = "3.2.1" +if-watch = { workspace = true } libp2p-core = { workspace = true } libp2p-tls = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 30c119ffaff..2e2e64aa75f 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.42.1" +version = "0.42.0" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] async-io = { version = "2.3.3", optional = true } futures = { workspace = true } futures-timer = "3.0" -if-watch = "3.2.1" +if-watch = { workspace = true } libc = "0.2.155" libp2p-core = { workspace = true } socket2 = { version = "0.5.7", features = ["all"] } diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index 5e9cf07797c..41dec91ba43 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-webrtc" -version = "0.8.1-alpha" +version = "0.8.0-alpha" authors = ["Parity Technologies "] description = "WebRTC transport for libp2p" repository = "https://github.com/libp2p/rust-libp2p" @@ -15,7 +15,7 @@ async-trait = "0.1" futures = { workspace = true } futures-timer = "3" hex = "0.4" -if-watch = "3.2.1" +if-watch = { workspace = true } libp2p-core = { workspace = true } libp2p-noise = { workspace = true } libp2p-identity = { workspace = true }