transports/quic: Adapt QuicMuxer to upstream StreamMuxer changes

.cargo/config.toml

@@ -1,3 +1,3 @@
 [alias]
 # Temporary solution to have clippy config in a single place until https://github.com/rust-lang/rust-clippy/blob/master/doc/roadmap-2021.md#lintstoml-configuration is shipped.
-custom-clippy = "clippy -- -A clippy::type_complexity -A clippy::pedantic -D warnings"
+custom-clippy = "clippy --all-features --all-targets -- -A clippy::type_complexity -A clippy::pedantic -D warnings"

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# This file contains revisions that are to be ignored by git when running `git blame`.
+#
+# This does NOT work automatically, you first need to tell Git about this file.
+# To do so, run `git config --global blame.ignoreRevsFile .git-blame-ignore-revs`.
+# You may want to run this without `--global` if you have a different naming convention for this file in other repositories.
+# 
+# Format with rustfmt
+f701b24ec0f99be49444a6e7de950c66b01b2f3f

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ about: Create a bug report for rust-libp2p.
 
 <!-- Thank you for filing a bug report! -->
 
-<!-- For security related issues please reach out to security@ipfs.io. Please do not file a public issue on GitHub. -->
+<!-- For security related issues please reach out to security@libp2p.io. Please do not file a public issue on GitHub. -->
 
 ## Summary
 

.github/workflows/cargo-audit.yml

@@ -2,14 +2,7 @@ name: cargo audit
 on:
   schedule:
     - cron: '0 0 * * *'
-  push:
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-  pull_request:
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
+
 jobs:
   audit:
     runs-on: ubuntu-latest

.github/workflows/cargo-deny-pr.yml

@@ -0,0 +1,22 @@
+name: cargo deny
+on:
+  push:
+    paths:
+      - '**/Cargo.toml'
+  pull_request:
+    paths:
+      - '**/Cargo.toml'
+jobs:
+  cargo-deny:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        checks:
+          - advisories
+          - bans licenses sources
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: EmbarkStudios/cargo-deny-action@v1
+      with:
+        command: check ${{ matrix.checks }}

.github/workflows/ci.yml

@@ -24,9 +24,12 @@ jobs:
       with:
         access_token: ${{ github.token }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+
     - uses: actions/checkout@v3
 
-    - uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # v1.4.0
+    - uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
       with:
         key: ${{ matrix.args }}
 
@@ -56,6 +59,9 @@ jobs:
       with:
         access_token: ${{ github.token }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+
     - uses: actions/checkout@v3
 
     - name: Install Rust ${{ matrix.toolchain }}
@@ -72,7 +78,7 @@ jobs:
     - name: Install CMake
       run: sudo apt-get install -y cmake
 
-    - uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # v1.4.0
+    - uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
       with:
         key: ${{ matrix.toolchain }}
 
@@ -91,6 +97,9 @@ jobs:
       with:
         access_token: ${{ github.token }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+
     - uses: actions/checkout@v3
 
     - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
@@ -99,7 +108,7 @@ jobs:
         toolchain: stable
         override: true
 
-    - uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # v1.4.0
+    - uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
 
     - name: Check rustdoc links
       run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items --all-features
@@ -113,6 +122,9 @@ jobs:
       with:
         access_token: ${{ github.token }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+
     - uses: actions/checkout@v3
 
     - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
@@ -122,7 +134,7 @@ jobs:
         override: true
         components: clippy
 
-    - uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # v1.4.0
+    - uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
 
     - name: Run cargo clippy
       uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
@@ -139,6 +151,9 @@ jobs:
       with:
         access_token: ${{ github.token }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+
     - uses: actions/checkout@v3
 
     - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
@@ -147,7 +162,7 @@ jobs:
         toolchain: stable
         override: true
 
-    - uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # v1.4.0
+    - uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0
 
     - name: Run ipfs-kad example
       run: RUST_LOG=libp2p_swarm=debug,libp2p_kad=trace,libp2p_tcp=debug cargo run --example ipfs-kad

.github/workflows/interop-test.yml

@@ -0,0 +1,27 @@
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+name: Interoperability Testing
+
+jobs:
+  # NOTE: during a pull request run, github creates a merge commit referenced in `github.sha`
+  # that merge commit is not a regular commit. You won't find it with a regular `git checkout SHA` and
+  # tools like `go get repo@SHA` won't find it.
+  #
+  # As a workaround, we generate a path to the actual pull request's commit, it looks like:
+  # `github.com/external-org/go-libp2p@latest-commit-on-their-branch`
+  run-ping-interop-cross-version:
+    uses: "libp2p/test-plans/.github/workflows/run-composition.yml@master"
+    with:
+      composition_file: "ping/_compositions/rust-cross-versions.toml"
+      custom_git_target: github.com/${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
+      custom_git_reference: ${{ github.event.pull_request.head.sha || github.sha }}
+  run-ping-interop-cross-implementation:
+    uses: "libp2p/test-plans/.github/workflows/run-composition.yml@master"
+    with:
+      composition_file: "ping/_compositions/go-rust-interop-latest.toml"
+      custom_git_target: github.com/${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
+      custom_git_reference: ${{ github.event.pull_request.head.sha || github.sha }}
+      custom_interop_target: rust

CHANGELOG.md

@@ -43,10 +43,38 @@
 
 # `libp2p` facade crate
 
-# 0.47.0 [unreleased]
+# 0.48.0
+
+- Update to [`libp2p-core` `v0.36.0`](core/CHANGELOG.md#0360).
+
+- Update to [`libp2p-swarm-derive` `v0.30.0`](swarm-derive/CHANGELOG.md#0300).
+
+- Update to [`libp2p-dcutr` `v0.6.0`](protocols/dcutr/CHANGELOG.md#060).
+
+- Update to [`libp2p-rendezvous` `v0.9.0`](protocols/rendezvous/CHANGELOG.md#090).
+
+- Update to [`libp2p-ping` `v0.39.0`](protocols/ping/CHANGELOG.md#0390).
+
+- Update to [`libp2p-identify` `v0.39.0`](protocols/identify/CHANGELOG.md#0390).
+
+- Update to [`libp2p-floodsub` `v0.39.0`](protocols/floodsub/CHANGELOG.md#0390).
+
+- Update to [`libp2p-relay` `v0.12.0`](protocols/relay/CHANGELOG.md#0120).
+
+- Update to [`libp2p-metrics` `v0.9.0`](misc/metrics/CHANGELOG.md#090).
+
+- Update to [`libp2p-kad` `v0.40.0`](protocols/kad/CHANGELOG.md#0400).
+
+- Update to [`libp2p-autonat` `v0.7.0`](protocols/autonat/CHANGELOG.md#070).
+
+- Update to [`libp2p-request-response` `v0.21.0`](protocols/request-response/CHANGELOG.md#0210).
+
+# 0.47.0
 
 - Update to [`libp2p-dcutr` `v0.5.0`](protocols/dcutr/CHANGELOG.md#050).
 
+- Update to [`libp2p-derive` `v0.29.0`](swarm-derive/CHANGELOG.md#0290).
+
 - Update to [`libp2p-rendezvous` `v0.8.0`](protocols/rendezvous/CHANGELOG.md#080).
 
 - Update to [`libp2p-ping` `v0.38.0`](protocols/ping/CHANGELOG.md#0380).

Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.60.0"
 description = "Peer-to-peer networking library"
-version = "0.47.0"
+version = "0.48.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -16,10 +16,10 @@ default = [
     "deflate",
     "dns-async-std",
     "floodsub",
-    "gossipsub",
     "identify",
     "kad",
-    "mdns",
+    "gossipsub",
+    "mdns-async-io",
     "mplex",
     "noise",
     "ping",
@@ -29,6 +29,7 @@ default = [
     "relay",
     "request-response",
     "rendezvous",
+    "rsa",
     "secp256k1",
     "tcp-async-io",
     "uds",
@@ -47,7 +48,8 @@ identify = ["dep:libp2p-identify", "libp2p-metrics?/identify"]
 kad = ["dep:libp2p-kad", "libp2p-metrics?/kad"]
 gossipsub = ["dep:libp2p-gossipsub", "libp2p-metrics?/gossipsub"]
 metrics = ["dep:libp2p-metrics"]
-mdns = ["dep:libp2p-mdns"]
+mdns-async-io = ["dep:libp2p-mdns", "libp2p-mdns?/async-io"]
+mdns-tokio = ["dep:libp2p-mdns", "libp2p-mdns?/tokio"]
 mplex = ["dep:libp2p-mplex"]
 noise = ["dep:libp2p-noise"]
 ping = ["dep:libp2p-ping", "libp2p-metrics?/ping"]
@@ -66,6 +68,7 @@ wasm-ext-websocket = ["wasm-ext", "libp2p-wasm-ext?/websocket"]
 websocket = ["dep:libp2p-websocket"]
 yamux = ["dep:libp2p-yamux"]
 secp256k1 = ["libp2p-core/secp256k1"]
+rsa = ["libp2p-core/rsa"]
 serde = ["libp2p-core/serde", "libp2p-kad?/serde", "libp2p-gossipsub?/serde"]
 
 [package.metadata.docs.rs]
@@ -79,42 +82,42 @@ 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-autonat = { version = "0.6.0", path = "protocols/autonat", optional = true }
-libp2p-core = { version = "0.34.0", path = "core",  default-features = false }
-libp2p-dcutr = { version = "0.5.0", path = "protocols/dcutr",  optional = true }
-libp2p-floodsub = { version = "0.38.0", path = "protocols/floodsub", optional = true }
-libp2p-identify = { version = "0.38.0", path = "protocols/identify", optional = true }
-libp2p-kad = { version = "0.39.0", path = "protocols/kad", optional = true }
-libp2p-metrics = { version = "0.8.0", path = "misc/metrics", optional = true }
-libp2p-mplex = { version = "0.34.0", path = "muxers/mplex", optional = true }
-libp2p-noise = { version = "0.37.0", path = "transports/noise", optional = true }
-libp2p-ping = { version = "0.38.0", path = "protocols/ping", optional = true }
-libp2p-plaintext = { version = "0.34.0", path = "transports/plaintext", optional = true }
+libp2p-autonat = { version = "0.7.0", path = "protocols/autonat", optional = true }
+libp2p-core = { version = "0.36.0", path = "core",  default-features = false }
+libp2p-dcutr = { version = "0.6.0", path = "protocols/dcutr",  optional = true }
+libp2p-floodsub = { version = "0.39.0", path = "protocols/floodsub", optional = true }
+libp2p-identify = { version = "0.39.0", path = "protocols/identify", optional = true }
+libp2p-kad = { version = "0.40.0", path = "protocols/kad", optional = true }
+libp2p-metrics = { version = "0.9.0", path = "misc/metrics", optional = true }
+libp2p-mplex = { version = "0.36.0", path = "muxers/mplex", optional = true }
+libp2p-noise = { version = "0.39.0", path = "transports/noise", optional = true }
+libp2p-ping = { version = "0.39.0", path = "protocols/ping", optional = true }
+libp2p-plaintext = { version = "0.36.0", path = "transports/plaintext", optional = true }
 libp2p-pnet = { version = "0.22.0", path = "transports/pnet", optional = true }
-libp2p-relay = { version = "0.11.0", path = "protocols/relay", optional = true }
-libp2p-rendezvous = { version = "0.8.0", path = "protocols/rendezvous", optional = true }
-libp2p-request-response = { version = "0.20.0", path = "protocols/request-response", optional = true }
-libp2p-swarm = { version = "0.38.0", path = "swarm" }
-libp2p-swarm-derive = { version = "0.28.0", path = "swarm-derive" }
-libp2p-uds = { version = "0.33.0", path = "transports/uds", optional = true }
-libp2p-wasm-ext = { version = "0.34.0", path = "transports/wasm-ext", default-features = false, optional = true }
-libp2p-yamux = { version = "0.38.0", path = "muxers/yamux", optional = true }
+libp2p-relay = { version = "0.12.0", path = "protocols/relay", optional = true }
+libp2p-rendezvous = { version = "0.9.0", path = "protocols/rendezvous", optional = true }
+libp2p-request-response = { version = "0.21.0", path = "protocols/request-response", optional = true }
+libp2p-swarm = { version = "0.39.0", path = "swarm" }
+libp2p-swarm-derive = { version = "0.30.0", path = "swarm-derive" }
+libp2p-uds = { version = "0.35.0", path = "transports/uds", optional = true }
+libp2p-wasm-ext = { version = "0.36.0", path = "transports/wasm-ext", default-features = false, optional = true }
+libp2p-yamux = { version = "0.40.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.34.0", path = "transports/deflate", optional = true }
-libp2p-dns = { version = "0.34.0", path = "transports/dns", optional = true, default-features = false }
-libp2p-mdns = { version = "0.39.0", path = "protocols/mdns", optional = true }
+libp2p-deflate = { version = "0.36.0", path = "transports/deflate", optional = true }
+libp2p-dns = { version = "0.36.0", path = "transports/dns", optional = true, default-features = false }
+libp2p-mdns = { version = "0.40.0", path = "protocols/mdns", optional = true, default-features = false }
 libp2p-quic = { version = "0.7.0", path = "transports/quic", optional = true }
-libp2p-tcp = { version = "0.34.0", path = "transports/tcp", default-features = false, optional = true }
-libp2p-websocket = { version = "0.36.0", path = "transports/websocket", optional = true }
+libp2p-tcp = { version = "0.36.0", path = "transports/tcp", default-features = false, optional = true }
+libp2p-websocket = { version = "0.38.0", path = "transports/websocket", optional = true }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-libp2p-gossipsub = { version = "0.40.0", path = "protocols/gossipsub", optional = true }
+libp2p-gossipsub = { version = "0.41.0", path = "protocols/gossipsub", optional = true }
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
@@ -164,7 +167,7 @@ required-features = ["floodsub"]
 
 [[example]]
 name = "chat-tokio"
-required-features = ["tcp-tokio", "mdns"]
+required-features = ["tcp-tokio", "mdns-tokio"]
 
 [[example]]
 name = "file-sharing"

README.md

@@ -2,6 +2,8 @@
 
 <a href="http://libp2p.io/"><img src="https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square" /></a>
 [![dependency status](https://deps.rs/repo/github/libp2p/rust-libp2p/status.svg?style=flat-square)](https://deps.rs/repo/github/libp2p/rust-libp2p)
+[![Crates.io](https://img.shields.io/crates/v/libp2p.svg)](https://crates.io/crates/libp2p)
+[![docs.rs](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/libp2p)
 
 This repository is the central place for Rust development of the [libp2p](https://libp2p.io) spec.
 
@@ -12,7 +14,7 @@ This repository is the central place for Rust development of the [libp2p](https:
 - The **[examples](examples)** folder contains small binaries showcasing the
   many protocols in this repository.
 
-- For **security related issues** please reach out to security@ipfs.io. Please
+- For **security related issues** please reach out to security@libp2p.io. Please
   do not file a public issue on GitHub.
 
 - To **report bugs, suggest improvements or request new features** please open a

SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+By default we provide security patches for the latest released version only. On request we patch older versions.
+
+## Reporting a Vulnerability
+
+Please reach out to security@libp2p.io. Please do not file a public issue on GitHub.

clippy.toml

@@ -0,0 +1,3 @@
+disallowed-methods = [
+  { path = "futures::channel::mpsc::unbounded", reason = "does not enforce backpressure" },
+]