Merge branch 'master' into 2680-explore

Author: thomaseizinger

Cargo.lock

@@ -11,43 +11,44 @@ members = [
     "examples/ping-example",
     "examples/rendezvous",
     "identity",
+    "interop-tests",
+    "misc/allow-block-list",
+    "misc/connection-limits",
+    "misc/keygen",
     "misc/metrics",
     "misc/multistream-select",
-    "misc/rw-stream-sink",
-    "misc/keygen",
     "misc/quick-protobuf-codec",
     "misc/quickcheck-ext",
+    "misc/rw-stream-sink",
     "muxers/mplex",
-    "muxers/yamux",
     "muxers/test-harness",
-    "protocols/dcutr",
+    "muxers/yamux",
     "protocols/autonat",
+    "protocols/dcutr",
     "protocols/floodsub",
     "protocols/gossipsub",
-    "protocols/rendezvous",
     "protocols/identify",
     "protocols/kad",
     "protocols/mdns",
     "protocols/perf",
     "protocols/ping",
     "protocols/relay",
+    "protocols/rendezvous",
     "protocols/request-response",
     "swarm",
     "swarm-derive",
-    "interop-tests",
     "swarm-test",
     "transports/deflate",
     "transports/dns",
     "transports/noise",
-    "transports/tls",
     "transports/plaintext",
     "transports/pnet",
     "transports/quic",
     "transports/tcp",
+    "transports/tls",
     "transports/uds",
-    "transports/websocket",
     "transports/wasm-ext",
     "transports/webrtc",
-    "interop-tests"
+    "transports/websocket",
 ]
 resolver = "2"

Cargo.toml

@@ -10,7 +10,9 @@ anyhow = "1"
 either = "1.8.0"
 env_logger = "0.10.0"
 futures = "0.3.27"
-libp2p = { path = "../libp2p", features = ["websocket", "quic",  "mplex", "yamux", "tcp", "tokio", "ping", "noise", "tls", "dns", "rsa", "macros", "webrtc"] }
+libp2p = { path = "../libp2p", features = ["websocket", "mplex", "yamux", "tcp", "tokio", "ping", "noise", "tls", "dns", "rsa", "macros"] }
+libp2p-quic = { path = "../transports/quic", features = ["tokio"] }
+libp2p-webrtc = { path = "../transports/webrtc", features = ["tokio"] }
 log = "0.4"
 rand = "0.8.5"
 redis = { version = "0.22.1", default-features = false, features = ["tokio-comp"] }

interop-tests/Cargo.toml

@@ -13,9 +13,11 @@ use libp2p::swarm::{keep_alive, NetworkBehaviour, SwarmEvent};
 use libp2p::tls::TlsStream;
 use libp2p::websocket::WsConfig;
 use libp2p::{
-    identity, mplex, noise, ping, quic, swarm::SwarmBuilder, tcp, tls, webrtc, yamux,
-    InboundUpgradeExt, Multiaddr, OutboundUpgradeExt, PeerId, Transport as _,
+    identity, mplex, noise, ping, swarm::SwarmBuilder, tcp, tls, yamux, InboundUpgradeExt,
+    Multiaddr, OutboundUpgradeExt, PeerId, Transport as _,
 };
+use libp2p_quic as quic;
+use libp2p_webrtc as webrtc;
 use redis::AsyncCommands;
 
 #[tokio::main]

interop-tests/src/bin/ping.rs

@@ -1,3 +1,20 @@
+# 0.52.2 - unreleased
+
+- Introduce `libp2p::connection_limits` module.
+  See [PR 3386].
+
+- Deprecate the `quic` and `webrtc` feature.
+  These two crates are only in alpha state.
+  To properly communicate this to users, we want them to add the dependency directly which makes the `alpha` version visible.
+  See [PR 3580].
+
+- Introduce `libp2p::allow_block_list` module and deprecate `libp2p::Swarm::ban_peer_id`.
+  See [PR 3590].
+
+[PR 3386]: https://github.com/libp2p/rust-libp2p/pull/3386
+[PR 3580]: https://github.com/libp2p/rust-libp2p/pull/3580
+[PR 3590]: https://github.com/libp2p/rust-libp2p/pull/3590
+
 # 0.51.1
 
 - Depend on `libp2p-tls` `v0.1.0`.

libp2p/CHANGELOG.md

@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.65.0"
 description = "Peer-to-peer networking library"
-version = "0.51.1"
+version = "0.51.2"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -96,7 +96,9 @@ futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` featu
 getrandom = "0.2.3" # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.11" # Explicit dependency to be used in `wasm-bindgen` feature
 
+libp2p-allow-block-list = { version = "0.1.0", path = "../misc/allow-block-list" }
 libp2p-autonat = { version = "0.10.0", path = "../protocols/autonat", optional = true }
+libp2p-connection-limits = { version = "0.1.0", path = "../misc/connection-limits" }
 libp2p-core = { version = "0.39.0", path = "../core" }
 libp2p-dcutr = { version = "0.9.0", path = "../protocols/dcutr", optional = true }
 libp2p-floodsub = { version = "0.42.0", path = "../protocols/floodsub", optional = true }

libp2p/Cargo.toml

@@ -40,10 +40,14 @@ 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")]
 #[doc(inline)]
 pub use libp2p_autonat as autonat;
 #[doc(inline)]
+pub use libp2p_connection_limits as connection_limits;
+#[doc(inline)]
 pub use libp2p_core as core;
 #[cfg(feature = "dcutr")]
 #[doc(inline)]
@@ -95,8 +99,12 @@ pub use libp2p_plaintext as plaintext;
 pub use libp2p_pnet as pnet;
 #[cfg(feature = "quic")]
 #[cfg(not(target_arch = "wasm32"))]
-#[doc(inline)]
-pub use libp2p_quic as quic;
+#[deprecated(
+    note = "`quic` is only in alpha status. Please depend on `libp2p-quic` directly and don't ues the `quic` feature of `libp2p`."
+)]
+pub mod quic {
+    pub use libp2p_quic::*;
+}
 #[cfg(feature = "relay")]
 #[doc(inline)]
 pub use libp2p_relay as relay;
@@ -129,8 +137,12 @@ pub use libp2p_wasm_ext as wasm_ext;
 #[cfg(feature = "webrtc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "webrtc")))]
 #[cfg(not(target_arch = "wasm32"))]
-#[doc(inline)]
-pub use libp2p_webrtc as webrtc;
+#[deprecated(
+    note = "`webrtc` is only in alpha status. Please depend on `libp2p-webrtc` directly and don't ues the `webrtc` feature of `libp2p`."
+)]
+pub mod webrtc {
+    pub use libp2p_webrtc::*;
+}
 #[cfg(feature = "websocket")]
 #[cfg(not(target_arch = "wasm32"))]
 #[doc(inline)]

libp2p/src/lib.rs

@@ -0,0 +1,3 @@
+# 0.1.0 - unreleased
+
+- Initial release.

misc/allow-block-list/CHANGELOG.md

@@ -0,0 +1,21 @@
+[package]
+name = "libp2p-allow-block-list"
+edition = "2021"
+rust-version = "1.62.0"
+description = "Allow/block list connection management for libp2p."
+version = "0.1.0"
+license = "MIT"
+repository = "https://github.com/libp2p/rust-libp2p"
+keywords = ["peer-to-peer", "libp2p", "networking"]
+categories = ["network-programming", "asynchronous"]
+
+[dependencies]
+libp2p-core = { version = "0.39.0", path = "../../core" }
+libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
+libp2p-identity = { version = "0.1.0", path = "../../identity", features = ["peerid"] }
+void = "1"
+
+[dev-dependencies]
+async-std = { version = "1.12.0", features = ["attributes"] }
+libp2p-swarm-derive = { path = "../../swarm-derive" }
+libp2p-swarm-test = { path = "../../swarm-test" }