Add optional compression to gossipsub (#100)

* Update rustls requirement from 0.18.0 to 0.19.0 (#1852) Updates the requirements on [rustls](https://github.com/ctz/rustls) to permit the latest version. - [Release notes](https://github.com/ctz/rustls/releases) - [Changelog](https://github.com/ctz/rustls/blob/main/OLDCHANGES.md) - [Commits](rustls/rustls@v/0.18.0...v/0.19.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Prepare libp2p-websocket-0.26.1 * Update top-level libp2p-websocket patch version. * [request-response] Refine success & error reporting for inbound requests. (#1867) * Refine error reporting for inbound request handling. At the moment one can neither get confirmation when a response has been sent on the underlying transport, nor is one aware of response omissions. The latter was originally intended as a feature for support of one-way protocols, which seems like a bad idea in hindsight. The lack of notification for sent responses may prohibit implementation of some request-response protocols that need to ensure a happens-before relation between sending a response and a subsequent request, besides uses for collecting statistics. Even with these changes, there is no active notification for failed inbound requests as a result of connections unexpectedly closing, as is the case for outbound requests. Instead, for pending inbound requests this scenario can be identified if necessary by the absense of both `InboundFailure` and `ResponseSent` events for a particular previously received request. Interest in this situation is not expected to be common and would otherwise require explicitly tracking all inbound requests in the `RequestResponse` behaviour, which would be a pity. `RequestResponse::send_response` now also synchronously returns an error if the inbound upgrade handling the request has been aborted, due to timeout or closing of the connection, giving more options for graceful error handling for inbound requests. As an aside, the `Throttled` wrapper now no longer emits inbound or outbound error events occurring in the context of sending credit requests or responses. This is in addition to not emitting `ResponseSent` events for ACK responses of credit grants. * Update protocols/request-response/src/lib.rs Co-authored-by: Max Inden <[email protected]> * Address some minor clippy warnings. (#1868) * Track pending credit request IDs. In order to avoid emitting events relating to credit grants or acks on the public API. The public API should only emit events relating to the actual requests and responses sent by client code. * Small cleanup * Cleanup * Update versions and changelogs. * Unreleased Co-authored-by: Max Inden <[email protected]> * core/benches: Add rudimentary benchmark for PeerId::from_bytes and clone (#1875) * core: Add rudimentary benchmark for PeerId::from_bytes and clone * .github/workflow: Include benchmarks To ensure changes through pull requests won't make benchmarks fail to compile or run, run them as part of CI. * [mdns] Split response packets if necessary. (#1877) * [mdns] Split response packets. Prevent MDNS response packets becoming too large by creating multi-packet responses. Also skip addresses that don't fit into a TXT record or contain invalid characters. * Update protocols/mdns/src/dns.rs Co-authored-by: Max Inden <[email protected]> * Refactor response packet construction. * Update mdns changelog. Co-authored-by: Max Inden <[email protected]> * core/benches: Add PeerId sort_vec benchmark (#1878) * Prepare v0.32 (#1879) * [websocket] Update minimum async-tls patch version. (#1881) * Update minimum async-tls patch version. After the upgrade to rustls 0.19, this is the minimum version required to build. * Prepare libp2p patch. * Update async-tls requirement from 0.10.2 to 0.11.0 (#1884) * Update async-tls requirement from 0.10.2 to 0.11.0 Updates the requirements on [async-tls](https://github.com/async-std/async-tls) to permit the latest version. - [Release notes](https://github.com/async-std/async-tls/releases) - [Commits](async-rs/async-tls@v0.10.2...v0.11.0) Signed-off-by: dependabot[bot] <[email protected]> * *: Prepare release Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Inden <[email protected]> * rename generic types + add default types + update documentation links * fix broken intra links * fix tests * type annotation in example * fix doc example * Add compression to gossipsub * Add snappy compression to the smoke tests * Stack allocated PeerId (#1874) * Stack allocate PeerId. * Update stuff. * Upgrade rusttls to fix build. * Remove unnecessary manual implementations. * Remove PeerId::into_bytes. * Remove bytes dependency. * Perform some cleanup. * Use Into<kbucket::Key<K>>. * Update versions and changelogs. * Fix PR link. * Fix benchmarks. Co-authored-by: Roman S. Borschel <[email protected]> * Remove copy and adjust validation ordering Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roman S. Borschel <[email protected]> Co-authored-by: Roman Borschel <[email protected]> Co-authored-by: Max Inden <[email protected]> Co-authored-by: blacktemplar <[email protected]> Co-authored-by: David Craven <[email protected]>
libp2p · mxinden · Jan 7, 2021 · May 19, 2020 · May 19, 2020 · May 22, 2020
commit 23d7d04f5d98f5424b6220ecc5147473e47a3724
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -140,6 +140,41 @@ jobs:
         command: clippy
         args: -- -A clippy::mutable_key_type -A clippy::type_complexity
 
+  run-benchmarks:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Cancel Previous Runs
+      uses: styfle/[email protected]
+      with:
+        access_token: ${{ github.token }}
+
+    - uses: actions/checkout@v2
+
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+
+    - name: Cache CARGO_HOME
+      uses: actions/cache@v2
+      with:
+        path: ~/.cargo
+        key: cargo-home-${{ hashFiles('Cargo.toml') }}
+
+    - name: Cache cargo build
+      uses: actions/cache@v2
+      with:
+        path: target
+        key: cargo-build-target-${{ hashFiles('Cargo.toml') }}
+
+    - name: Run cargo bench
+      uses: actions-rs/cargo@v1
+      with:
+        command: bench
+        args: --workspace
+
   integration-test:
     name: Integration tests
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,10 +23,26 @@
 - [`parity-multiaddr` CHANGELOG](misc/multiaddr/CHANGELOG.md)
 - [`libp2p-core-derive` CHANGELOG](misc/core-derive/CHANGELOG.md)
 
-# Version 0.32.0 [unreleased]
+# Version 0.33.0 [unreleased]
+
+- Update `libp2p-core` and all dependent crates.
+
+# Version 0.32.2 [2020-12-10]
+
+- Update `libp2p-websocket`.
+
+# Version 0.32.1 [2020-12-09]
+
+- Update minimum patch version of `libp2p-websocket`.
+
+# Version 0.32.0 [2020-12-08]
+
+- Update `libp2p-request-response`.
 
 - Update to `libp2p-mdns-0.26`.
 
+- Update `libp2p-websocket` minimum patch version.
+
 # Version 0.31.2 [2020-12-02]
 
 - Bump minimum `libp2p-core` patch version.

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p"
 edition = "2018"
 description = "Peer-to-peer networking library"
-version = "0.32.0"
+version = "0.33.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -61,34 +61,34 @@ atomic = "0.5.0"
 bytes = "0.5"
 futures = "0.3.1"
 lazy_static = "1.2"
-libp2p-core = { version = "0.25.2", path = "core" }
+libp2p-core = { version = "0.26.0", path = "core" }
 libp2p-core-derive = { version = "0.21.0", path = "misc/core-derive" }
-libp2p-floodsub = { version = "0.25.0", path = "protocols/floodsub", optional = true }
-libp2p-gossipsub = { version = "0.25.0", path = "./protocols/gossipsub", optional = true }
-libp2p-identify = { version = "0.25.0", path = "protocols/identify", optional = true }
-libp2p-kad = { version = "0.26.0", path = "protocols/kad", optional = true }
-libp2p-mplex = { version = "0.25.0", path = "muxers/mplex", optional = true }
-libp2p-noise = { version = "0.27.0", path = "protocols/noise", optional = true }
-libp2p-ping = { version = "0.25.0", path = "protocols/ping", optional = true }
-libp2p-plaintext = { version = "0.25.0", path = "protocols/plaintext", optional = true }
+libp2p-floodsub = { version = "0.26.0", path = "protocols/floodsub", optional = true }
+libp2p-gossipsub = { version = "0.26.0", path = "./protocols/gossipsub", optional = true }
+libp2p-identify = { version = "0.26.0", path = "protocols/identify", optional = true }
+libp2p-kad = { version = "0.27.0", path = "protocols/kad", optional = true }
+libp2p-mplex = { version = "0.26.0", path = "muxers/mplex", optional = true }
+libp2p-noise = { version = "0.28.0", path = "protocols/noise", optional = true }
+libp2p-ping = { version = "0.26.0", path = "protocols/ping", optional = true }
+libp2p-plaintext = { version = "0.26.0", path = "protocols/plaintext", optional = true }
 libp2p-pnet = { version = "0.19.2", path = "protocols/pnet", optional = true }
-libp2p-request-response = { version = "0.6.0", path = "protocols/request-response", optional = true }
-libp2p-swarm = { version = "0.25.0", path = "swarm" }
-libp2p-uds = { version = "0.25.0", path = "transports/uds", optional = true }
-libp2p-wasm-ext = { version = "0.25.0", path = "transports/wasm-ext", optional = true }
-libp2p-yamux = { version = "0.28.0", path = "muxers/yamux", optional = true }
+libp2p-request-response = { version = "0.8.0", path = "protocols/request-response", optional = true }
+libp2p-swarm = { version = "0.26.0", path = "swarm" }
+libp2p-uds = { version = "0.26.0", path = "transports/uds", optional = true }
+libp2p-wasm-ext = { version = "0.26.0", path = "transports/wasm-ext", optional = true }
+libp2p-yamux = { version = "0.29.0", path = "muxers/yamux", optional = true }
 multiaddr = { package = "parity-multiaddr", version = "0.10.0", path = "misc/multiaddr" }
 parking_lot = "0.11.0"
 pin-project = "1.0.0"
 smallvec = "1.0"
 wasm-timer = "0.2.4"
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
-libp2p-deflate = { version = "0.25.0", path = "protocols/deflate", optional = true }
-libp2p-dns = { version = "0.25.0", path = "transports/dns", optional = true }
-libp2p-mdns = { version = "0.26.0", path = "protocols/mdns", optional = true }
-libp2p-tcp = { version = "0.25.1", path = "transports/tcp", optional = true }
-libp2p-websocket = { version = "0.26.0", path = "transports/websocket", optional = true }
+libp2p-deflate = { version = "0.26.0", path = "protocols/deflate", optional = true }
+libp2p-dns = { version = "0.26.0", path = "transports/dns", optional = true }
+libp2p-mdns = { version = "0.27.0", path = "protocols/mdns", optional = true }
+libp2p-tcp = { version = "0.26.0", path = "transports/tcp", optional = true }
+libp2p-websocket = { version = "0.27.0", path = "transports/websocket", optional = true }
 
 [dev-dependencies]
 async-std = "1.6.2"

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.26.0 [unreleased]
+
+- Make `PeerId` be `Copy`, including small `PeerId` API changes.
+  [PR 1874](https://github.com/libp2p/rust-libp2p/pull/1874/).
+
 # 0.25.2 [2020-12-02]
 
 - Require `multistream-select-0.9.1`.

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-core"
 edition = "2018"
 description = "Core traits and structs of libp2p"
-version = "0.25.2"
+version = "0.26.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -12,7 +12,6 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asn1_der = "0.6.1"
 bs58 = "0.4.0"
-bytes = "0.5"
 ed25519-dalek = "1.0.1"
 either = "1.5"
 fnv = "1.0"
@@ -41,6 +40,7 @@ ring = { version = "0.16.9", features = ["alloc", "std"], default-features = fal
 
 [dev-dependencies]
 async-std = "1.6.2"
+criterion = "0.3"
 libp2p-mplex = { path = "../muxers/mplex" }
 libp2p-noise = { path = "../protocols/noise" }
 libp2p-tcp = { path = "../transports/tcp", features = ["async-std"] }
@@ -54,3 +54,7 @@ prost-build = "0.6"
 [features]
 default = ["secp256k1"]
 secp256k1 = ["libsecp256k1"]
+
+[[bench]]
+name = "peer_id"
+harness = false
diff --git a/core/benches/peer_id.rs b/core/benches/peer_id.rs
@@ -0,0 +1,68 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use libp2p_core::{identity, PeerId};
+
+fn from_bytes(c: &mut Criterion) {
+    let peer_id_bytes = identity::Keypair::generate_ed25519()
+        .public()
+        .into_peer_id()
+        .to_bytes();
+
+    c.bench_function("from_bytes", |b| {
+        b.iter(|| {
+            black_box(PeerId::from_bytes(&peer_id_bytes).unwrap());
+        })
+    });
+}
+
+fn clone(c: &mut Criterion) {
+    let peer_id = identity::Keypair::generate_ed25519()
+        .public()
+        .into_peer_id();
+
+    c.bench_function("clone", |b| {
+        b.iter(|| {
+            black_box(peer_id.clone());
+        })
+    });
+}
+
+fn sort_vec(c: &mut Criterion) {
+    let peer_ids: Vec<_> = (0..100)
+        .map(|_| {
+            identity::Keypair::generate_ed25519()
+                .public()
+                .into_peer_id()
+        })
+        .collect();
+
+    c.bench_function("sort_vec", |b| {
+        b.iter(|| {
+            let mut peer_ids = peer_ids.clone();
+            peer_ids.sort_unstable();
+            black_box(peer_ids);
+        })
+    });
+}
+
+criterion_group!(peer_id, from_bytes, clone, sort_vec);
+criterion_main!(peer_id);
diff --git a/core/src/network/peer.rs b/core/src/network/peer.rs
@@ -555,7 +555,7 @@ where
         }
 
         self.network.pool.add(connection, connected)
-            .map(|_id| ConnectedPeer {
+            .map(move |_id| ConnectedPeer {
                 network: self.network,
                 peer_id: self.peer_id,
             })