Merge branch 'libp2p:master' into master

Author: jkcomment

.github/workflows/ci.yml

@@ -20,13 +20,13 @@ jobs:
     steps:
 
     - name: Cancel Previous Runs
-      uses: styfle/[email protected]
+      uses: styfle/cancel-workflow-action@a40b8845c0683271d9f53dfcb887a7e181d3918b # 0.9.1
       with:
         access_token: ${{ github.token }}
 
     - uses: actions/[email protected]
 
-    - uses: Swatinem/[email protected]
+    - uses: Swatinem/rust-cache@842ef286fff290e445b90b4002cc9807c3669641 # v1.3.0
       with:
         key: ${{ matrix.args }}
 
@@ -44,35 +44,38 @@ jobs:
         include:
           - toolchain: wasm32-unknown-unknown
             args: "--features wasm-bindgen"
-    container:
-      image: rust
-      env:
-        CC: clang-11
+    env:
+      CC: clang-11
+    defaults:
+      run:
+        shell: bash
     steps:
 
     - name: Cancel Previous Runs
-      uses: styfle/[email protected]
+      uses: styfle/cancel-workflow-action@a40b8845c0683271d9f53dfcb887a7e181d3918b # 0.9.1
       with:
         access_token: ${{ github.token }}
 
     - uses: actions/[email protected]
 
     - name: Install Rust ${{ matrix.toolchain }}
-      uses: actions-rs/[email protected]
+      uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
       with:
         toolchain: stable
         target: ${{ matrix.toolchain }}
         override: true
 
     - name: Install a recent version of clang
       run: |
-        apt-get update
-        apt-get install -y clang-11
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
+        sudo apt-get update
+        sudo apt-get install -y clang-11
 
     - name: Install CMake
-      run: apt-get install -y cmake
+      run: sudo apt-get install -y cmake
 
-    - uses: Swatinem/[email protected]
+    - uses: Swatinem/rust-cache@842ef286fff290e445b90b4002cc9807c3669641 # v1.3.0
       with:
         key: ${{ matrix.toolchain }}
 
@@ -89,39 +92,39 @@ jobs:
     steps:
 
     - name: Cancel Previous Runs
-      uses: styfle/[email protected]
+      uses: styfle/cancel-workflow-action@a40b8845c0683271d9f53dfcb887a7e181d3918b # 0.9.1
       with:
         access_token: ${{ github.token }}
 
     - uses: actions/[email protected]
 
-    - uses: Swatinem/[email protected]
+    - uses: Swatinem/rust-cache@842ef286fff290e445b90b4002cc9807c3669641 # v1.3.0
 
     - name: Check rustdoc links
-      run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items
+      run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items --all-features
 
   check-clippy:
     runs-on: ubuntu-18.04
     steps:
 
     - name: Cancel Previous Runs
-      uses: styfle/[email protected]
+      uses: styfle/cancel-workflow-action@a40b8845c0683271d9f53dfcb887a7e181d3918b # 0.9.1
       with:
         access_token: ${{ github.token }}
 
     - uses: actions/[email protected]
 
-    - uses: actions-rs/[email protected]
+    - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
       with:
         profile: minimal
         toolchain: stable
         override: true
         components: clippy
 
-    - uses: Swatinem/[email protected]
+    - uses: Swatinem/rust-cache@842ef286fff290e445b90b4002cc9807c3669641 # v1.3.0
 
     - name: Run cargo clippy
-      uses: actions-rs/[email protected]
+      uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
       with:
         command: custom-clippy # cargo alias to allow reuse of config locally
 
@@ -133,13 +136,13 @@ jobs:
     steps:
 
     - name: Cancel Previous Runs
-      uses: styfle/[email protected]
+      uses: styfle/cancel-workflow-action@a40b8845c0683271d9f53dfcb887a7e181d3918b # 0.9.1
       with:
         access_token: ${{ github.token }}
 
     - uses: actions/[email protected]
 
-    - uses: Swatinem/[email protected]
+    - uses: Swatinem/rust-cache@842ef286fff290e445b90b4002cc9807c3669641 # v1.3.0
 
     - name: Run ipfs-kad example
       run: RUST_LOG=libp2p_swarm=debug,libp2p_kad=trace,libp2p_tcp=debug cargo run --example ipfs-kad
@@ -149,13 +152,13 @@ jobs:
     steps:
 
     - name: Cancel Previous Runs
-      uses: styfle/[email protected].0
+      uses: styfle/cancel-workflow-action@a40b8845c0683271d9f53dfcb887a7e181d3918b # 0.9.1
       with:
         access_token: ${{ github.token }}
 
     - uses: actions/[email protected]
 
-    - uses: actions-rs/[email protected]
+    - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
       with:
         profile: minimal
         toolchain: stable

CHANGELOG.md

@@ -42,33 +42,100 @@
 
 # `libp2p` facade crate
 
-## Version 0.42.0 [unreleased]
+## Version 0.43.0 [2022-02-22]
 
 - Update individual crates.
+  - Update to `libp2p-autonat` [`v0.2.0`](protocols/autonat/CHANGELOG.md#020-2022-02-22).
+  - Update to `libp2p-core` [`v0.32.0`](core/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-deflate` [`v0.32.0`](transports/deflate/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-dns` [`v0.32.0`](transports/dns/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-floodsub` [`v0.34.0`](protocols/floodsub/CHANGELOG.md#0340-2022-02-22).
+  - Update to `libp2p-gossipsub` [`v0.36.0`](protocols/gossipsub/CHANGELOG.md#0360-2022-02-22).
+  - Update to `libp2p-identify` [`v0.34.0`](protocols/identify/CHANGELOG.md#0340-2022-02-22).
+  - Update to `libp2p-kad` [`v0.35.0`](protocols/kad/CHANGELOG.md#0350-2022-02-22).
+  - Update to `libp2p-mdns` [`v0.35.0`](protocols/mdns/CHANGELOG.md#0350-2022-02-22).
+  - Update to `libp2p-metrics` [`v0.4.0`](misc/metrics/CHANGELOG.md#040-2022-02-22).
+  - Update to `libp2p-mplex` [`v0.32.0`](muxers/mplex/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-noise` [`v0.35.0`](transports/noise/CHANGELOG.md#0350-2022-02-22).
+  - Update to `libp2p-ping` [`v0.34.0`](protocols/ping/CHANGELOG.md#0340-2022-02-22).
+  - Update to `libp2p-plaintext` [`v0.32.0`](transports/plaintext/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-relay` [`v0.7.0`](protocols/relay/CHANGELOG.md#070-2022-02-22).
+  - Update to `libp2p-rendezvous` [`v0.4.0`](protocols/rendezvous/CHANGELOG.md#040-2022-02-22).
+  - Update to `libp2p-request-response` [`v0.16.0`](protocols/request-response/CHANGELOG.md#0160-2022-02-22).
+  - Update to `libp2p-swarm` [`v0.34.0`](swarm/CHANGELOG.md#0340-2022-02-22).
+  - Update to `libp2p-derive` [`v0.27.0`](swarm-derive/CHANGELOG.md#0270-2022-02-22).
+  - Update to `libp2p-tcp` [`v0.32.0`](transports/tcp/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-uds` [`v0.32.0`](transports/uds/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-wasm-ext` [`v0.32.0`](transports/wasm-ext/CHANGELOG.md#0320-2022-02-22).
+  - Update to `libp2p-websocket` [`v0.34.0`](transports/websocket/CHANGELOG.md#0340-2022-02-22).
+  - Update to `libp2p-yamux` [`v0.36.0`](muxers/yamux/CHANGELOG.md#0360-2022-02-22).
+
+- Update to `parking_lot` `v0.12.0`. See [PR 2463].
+
+- Drop support for gossipsub in the wasm32-unknown-unknown target (see [PR 2506]).
+
+[PR 2506]: https://github.com/libp2p/rust-libp2p/pull/2506
+[PR 2463]: https://github.com/libp2p/rust-libp2p/pull/2463/
+
+## Version 0.42.1 [2022-02-02]
+
+- Update individual crates.
+  - `libp2p-relay`
+      - [v0.6.1](protocols/relay/CHANGELOG.md#061-2022-02-02)
+  - `libp2p-tcp`
+      - [v0.31.1](transports/tcp/CHANGELOG.md#0311-2022-02-02)
+
+## Version 0.42.0 [2022-01-27]
+
+- Update individual crates.
+    - `libp2p-autonat`
+      - [v0.1.0](protocols/autonat/CHANGELOG.md#010-2022-01-27)
     - `libp2p-core`
+      - [v0.31.0](core/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-deflate`
+      - [v0.31.0](transports/deflate/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-dns`
+      - [v0.31.0](transports/dns/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-floodsub`
+      - [v0.33.0](protocols/floodsub/CHANGELOG.md#0330-2022-01-27)
     - `libp2p-gossipsub`
+      - [v0.35.0](protocols/gossipsub/CHANGELOG.md#0350-2022-01-27)
     - `libp2p-identify`
+      - [v0.33.0](protocols/identify/CHANGELOG.md#0330-2022-01-27)
     - `libp2p-kad`
-    - `libp2p-mdns`
+      - [v0.34.0](protocols/kad/CHANGELOG.md#0340-2022-01-27)
+    - `libp2p-mdns` (breaking compatibility with previous versions)
+      - [v0.34.0](protocols/mdns/CHANGELOG.md#0340-2022-01-27)
     - `libp2p-metrics`
+      - [v0.3.0](misc/metrics/CHANGELOG.md#030-2022-01-27)
     - `libp2p-mplex`
+      - [v0.31.0](muxers/mplex/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-noise`
+      - [v0.34.0](transports/noise/CHANGELOG.md#0340-2022-01-27)
     - `libp2p-ping`
+      - [v0.33.0](protocols/ping/CHANGELOG.md#0330-2022-01-27)
     - `libp2p-plaintext`
+      - [v0.31.0](transports/plaintext/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-relay`
+      - [v0.6.0](protocols/relay/CHANGELOG.md#060-2022-01-27)
     - `libp2p-rendezvous`
+      - [v0.3.0](protocols/rendezvous/CHANGELOG.md#030-2022-01-27)
     - `libp2p-request-response`
+      - [v0.15.0](protocols/request-response/CHANGELOG.md#0150-2022-01-27)
     - `libp2p-swarm-derive`
+      - [v0.26.1](swarm-derive/CHANGELOG.md#0261-2022-01-27)
     - `libp2p-swarm`
+      - [v0.33.0](swarm/CHANGELOG.md#0330-2022-01-27)
     - `libp2p-tcp`
+      - [v0.31.0](transports/tcp/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-uds`
+      - [v0.31.0](transports/uds/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-wasm-ext`
+      - [v0.31.0](transports/wasm-ext/CHANGELOG.md#0310-2022-01-27)
     - `libp2p-websocket`
+      - [v0.33.0](transports/websocket/CHANGELOG.md#0330-2022-01-27)
     - `libp2p-yamux`
-    - `libp2p-mdns` (breaking compatibility with previous versions)
+      - [v0.35.0](muxers/yamux/CHANGELOG.md#0350-2022-01-27)
 
 - Migrate to Rust edition 2021 (see [PR 2339]).
 

Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Peer-to-peer networking library"
-version = "0.42.0"
+version = "0.43.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -12,6 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [features]
 default = [
+    "autonat",
     "deflate",
     "dns-async-std",
     "floodsub",
@@ -34,6 +35,8 @@ default = [
     "websocket",
     "yamux",
 ]
+autonat = ["libp2p-autonat"]
+dcutr = ["libp2p-dcutr", "libp2p-metrics/dcutr"]
 deflate = ["libp2p-deflate"]
 dns-async-std = ["libp2p-dns", "libp2p-dns/async-std"]
 dns-tokio = ["libp2p-dns", "libp2p-dns/tokio"]
@@ -48,18 +51,19 @@ noise = ["libp2p-noise"]
 ping = ["libp2p-ping", "libp2p-metrics/ping"]
 plaintext = ["libp2p-plaintext"]
 pnet = ["libp2p-pnet"]
-relay = ["libp2p-relay"]
+relay = ["libp2p-relay", "libp2p-metrics/relay"]
 request-response = ["libp2p-request-response"]
 rendezvous = ["libp2p-rendezvous"]
 tcp-async-io = ["libp2p-tcp", "libp2p-tcp/async-io"]
 tcp-tokio = ["libp2p-tcp", "libp2p-tcp/tokio"]
 uds = ["libp2p-uds"]
-wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "parking_lot/wasm-bindgen", "getrandom/js", "rand/wasm-bindgen"]
+wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js", "rand/wasm-bindgen"]
 wasm-ext = ["libp2p-wasm-ext"]
 wasm-ext-websocket = ["wasm-ext", "libp2p-wasm-ext/websocket"]
 websocket = ["libp2p-websocket"]
 yamux = ["libp2p-yamux"]
 secp256k1 = ["libp2p-core/secp256k1"]
+serde = ["libp2p-core/serde", "libp2p-kad/serde", "libp2p-gossipsub/serde"]
 
 [package.metadata.docs.rs]
 all-features = true
@@ -72,44 +76,49 @@ 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
 lazy_static = "1.2"
-libp2p-core = { version = "0.31.0", path = "core",  default-features = false }
-libp2p-floodsub = { version = "0.33.0", path = "protocols/floodsub", optional = true }
-libp2p-gossipsub = { version = "0.35.0", path = "./protocols/gossipsub", optional = true }
-libp2p-identify = { version = "0.33.0", path = "protocols/identify", optional = true }
-libp2p-kad = { version = "0.34.0", path = "protocols/kad", optional = true }
-libp2p-metrics = { version = "0.3.0", path = "misc/metrics", optional = true }
-libp2p-mplex = { version = "0.31.0", path = "muxers/mplex", optional = true }
-libp2p-noise = { version = "0.34.0", path = "transports/noise", optional = true }
-libp2p-ping = { version = "0.33.0", path = "protocols/ping", optional = true }
-libp2p-plaintext = { version = "0.31.0", path = "transports/plaintext", optional = true }
+
+libp2p-autonat = { version = "0.2.0", path = "protocols/autonat", optional = true }
+libp2p-core = { version = "0.32.0", path = "core",  default-features = false }
+libp2p-dcutr = { version = "0.1.0", path = "protocols/dcutr",  optional = true }
+libp2p-floodsub = { version = "0.34.0", path = "protocols/floodsub", optional = true }
+libp2p-identify = { version = "0.34.0", path = "protocols/identify", optional = true }
+libp2p-kad = { version = "0.35.0", path = "protocols/kad", optional = true }
+libp2p-metrics = { version = "0.4.0", path = "misc/metrics", optional = true }
+libp2p-mplex = { version = "0.32.0", path = "muxers/mplex", optional = true }
+libp2p-noise = { version = "0.35.0", path = "transports/noise", optional = true }
+libp2p-ping = { version = "0.34.0", path = "protocols/ping", optional = true }
+libp2p-plaintext = { version = "0.32.0", path = "transports/plaintext", optional = true }
 libp2p-pnet = { version = "0.22.0", path = "transports/pnet", optional = true }
-libp2p-relay = { version = "0.6.0", path = "protocols/relay", optional = true }
-libp2p-rendezvous = { version = "0.3.0", path = "protocols/rendezvous", optional = true }
-libp2p-request-response = { version = "0.15.0", path = "protocols/request-response", optional = true }
-libp2p-swarm = { version = "0.33.0", path = "swarm" }
-libp2p-swarm-derive = { version = "0.26.1", path = "swarm-derive" }
-libp2p-uds = { version = "0.31.0", path = "transports/uds", optional = true }
-libp2p-wasm-ext = { version = "0.31.0", path = "transports/wasm-ext", default-features = false, optional = true }
-libp2p-yamux = { version = "0.35.0", path = "muxers/yamux", optional = true }
-multiaddr = { version = "0.13.0" }
-parking_lot = "0.11.0"
+libp2p-relay = { version = "0.7.0", path = "protocols/relay", optional = true }
+libp2p-rendezvous = { version = "0.4.0", path = "protocols/rendezvous", optional = true }
+libp2p-request-response = { version = "0.16.0", path = "protocols/request-response", optional = true }
+libp2p-swarm = { version = "0.34.0", path = "swarm" }
+libp2p-swarm-derive = { version = "0.27.0", path = "swarm-derive" }
+libp2p-uds = { version = "0.32.0", path = "transports/uds", optional = true }
+libp2p-wasm-ext = { version = "0.32.0", path = "transports/wasm-ext", default-features = false, optional = true }
+libp2p-yamux = { version = "0.36.0", path = "muxers/yamux", optional = true }
+multiaddr = { version = "0.14.0" }
+parking_lot = "0.12.0"
 pin-project = "1.0.0"
 rand = "0.7.3" # Explicit dependency to be used in `wasm-bindgen` feature
 smallvec = "1.6.1"
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
-libp2p-deflate = { version = "0.31.0", path = "transports/deflate", optional = true }
-libp2p-dns = { version = "0.31.0", path = "transports/dns", optional = true, default-features = false }
-libp2p-mdns = { version = "0.34.0", path = "protocols/mdns", optional = true }
-libp2p-tcp = { version = "0.31.0", path = "transports/tcp", default-features = false, optional = true }
-libp2p-websocket = { version = "0.33.0", path = "transports/websocket", optional = true }
+libp2p-deflate = { version = "0.32.0", path = "transports/deflate", optional = true }
+libp2p-dns = { version = "0.32.0", path = "transports/dns", optional = true, default-features = false }
+libp2p-mdns = { version = "0.35.0", path = "protocols/mdns", optional = true }
+libp2p-tcp = { version = "0.32.0", path = "transports/tcp", default-features = false, optional = true }
+libp2p-websocket = { version = "0.34.0", path = "transports/websocket", optional = true }
+
+[target.'cfg(not(target_os = "unknown"))'.dependencies]
+libp2p-gossipsub = { version = "0.36.0", path = "protocols/gossipsub", optional = true }
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
 async-trait = "0.1"
 env_logger = "0.9.0"
 structopt = "0.3.21"
-tokio = { version = "1.0.1", features = ["io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
+tokio = { version = "1.15", features = ["io-util", "io-std", "macros", "rt", "rt-multi-thread"] }
 
 [workspace]
 members = [
@@ -119,6 +128,8 @@ members = [
     "misc/peer-id-generator",
     "muxers/mplex",
     "muxers/yamux",
+    "protocols/dcutr",
+    "protocols/autonat",
     "protocols/floodsub",
     "protocols/gossipsub",
     "protocols/rendezvous",

README.md

@@ -24,6 +24,9 @@ This repository is the central place for Rust development of the [libp2p](https:
 - For **discussions and questions related to multiple libp2p implementations**
   please use the libp2p _Discourse_ forum https://discuss.libp2p.io.
 
+- For general project updates and discussions join the [biweekly libp2p Community
+  Calls](https://discuss.libp2p.io/t/libp2p-community-calls/1157).
+
 ## Repository Structure
 
 The main components of this repository are structured as follows:
@@ -40,7 +43,7 @@ The main components of this repository are structured as follows:
     Multiplexing protocols are (mandatory) `Transport` upgrades.
 
   * `swarm/`: The implementation of `libp2p-swarm` building on `libp2p-core`
-    with the central interfaces `NetworkBehaviour` and `ProtocolsHandler` used
+    with the central interfaces `NetworkBehaviour` and `ConnectionHandler` used
     to implement application protocols (see `protocols/`).
 
   * `protocols/`: Implementations of application protocols based on the