From 9ed09a73ddd91d53808c29211a7d862f64ce1a1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 08:08:16 +0000 Subject: [PATCH 1/5] build(deps): Update prost-build requirement from 0.10 to 0.11 Updates the requirements on [prost-build](https://github.com/tokio-rs/prost) to permit the latest version. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](https://github.com/tokio-rs/prost/compare/v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: prost-build dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- core/Cargo.toml | 2 +- misc/prost-codec/Cargo.toml | 2 +- protocols/autonat/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/floodsub/Cargo.toml | 2 +- protocols/gossipsub/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/kad/Cargo.toml | 2 +- protocols/relay/Cargo.toml | 2 +- protocols/rendezvous/Cargo.toml | 2 +- transports/noise/Cargo.toml | 2 +- transports/plaintext/Cargo.toml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index 386dff09669..bcdbce6d568 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -56,7 +56,7 @@ rmp-serde = "1.0" serde_json = "1.0" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" [features] default = [ "secp256k1", "ecdsa" ] diff --git a/misc/prost-codec/Cargo.toml b/misc/prost-codec/Cargo.toml index 02969651acc..16421b05d7f 100644 --- a/misc/prost-codec/Cargo.toml +++ b/misc/prost-codec/Cargo.toml @@ -18,4 +18,4 @@ thiserror = "1.0" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } [dev-dependencies] -prost-build = "0.10" +prost-build = "0.11" diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index 44f3c2b894d..87baec66ba8 100644 --- a/protocols/autonat/Cargo.toml +++ b/protocols/autonat/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"] categories = ["network-programming", "asynchronous"] [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" [dependencies] async-trait = "0.1" diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index 6f8c4c284fd..9376c990a46 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -26,7 +26,7 @@ thiserror = "1.0" void = "1" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" [dev-dependencies] env_logger = "0.8.3" diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index d240ef66d07..328a9a29978 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -22,4 +22,4 @@ rand = "0.7" smallvec = "1.6.1" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index da97500808d..c81cf8d6d15 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -45,4 +45,4 @@ hex = "0.4.2" derive_builder = "0.11.1" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index 1b3341df3f8..a31b3ee3960 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -37,4 +37,4 @@ libp2p = { path = "../..", default-features = false, features = [ ]} [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index f33697f2e32..7bc214c24e5 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -40,7 +40,7 @@ libp2p-yamux = { path = "../../muxers/yamux" } quickcheck = "0.9.0" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" [features] serde = ["_serde", "bytes/serde"] diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 817025842f8..14499c1ada1 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -30,7 +30,7 @@ thiserror = "1.0" void = "1" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" [dev-dependencies] env_logger = "0.9.0" diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index 745285b91bd..e4b277513cd 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -34,4 +34,4 @@ rand = "0.8" tokio = { version = "1.15", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] } [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml index 171a89a4715..49c300af45c 100644 --- a/transports/noise/Cargo.toml +++ b/transports/noise/Cargo.toml @@ -36,4 +36,4 @@ quickcheck = "0.9.0" sodiumoxide = "0.2.5" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml index c8cd9395da0..703d92c3740 100644 --- a/transports/plaintext/Cargo.toml +++ b/transports/plaintext/Cargo.toml @@ -26,4 +26,4 @@ quickcheck = "0.9.0" rand = "0.7" [build-dependencies] -prost-build = "0.10" +prost-build = "0.11" From 6482b2d91ecda28cf0971788a58fcaa42c99dbfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 08:08:41 +0000 Subject: [PATCH 2/5] build(deps): Update prost requirement from 0.10 to 0.11 Updates the requirements on [prost](https://github.com/tokio-rs/prost) to permit the latest version. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](https://github.com/tokio-rs/prost/compare/v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: prost dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- core/Cargo.toml | 2 +- misc/prost-codec/Cargo.toml | 2 +- protocols/autonat/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/floodsub/Cargo.toml | 2 +- protocols/gossipsub/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/kad/Cargo.toml | 2 +- protocols/relay/Cargo.toml | 2 +- protocols/rendezvous/Cargo.toml | 2 +- transports/noise/Cargo.toml | 2 +- transports/plaintext/Cargo.toml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index 386dff09669..ac22603ff28 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -28,7 +28,7 @@ multistream-select = { version = "0.11", path = "../misc/multistream-select" } p256 = { version = "0.10.0", default-features = false, features = ["ecdsa"], optional = true } parking_lot = "0.12.0" pin-project = "1.0.0" -prost = "0.10" +prost = "0.11" rand = "0.8" rw-stream-sink = { version = "0.3.0", path = "../misc/rw-stream-sink" } sha2 = "0.10.0" diff --git a/misc/prost-codec/Cargo.toml b/misc/prost-codec/Cargo.toml index 02969651acc..34f05badf3a 100644 --- a/misc/prost-codec/Cargo.toml +++ b/misc/prost-codec/Cargo.toml @@ -13,7 +13,7 @@ categories = ["asynchronous"] [dependencies] asynchronous-codec = { version = "0.6" } bytes = { version = "1" } -prost = "0.10" +prost = "0.11" thiserror = "1.0" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index 44f3c2b894d..e9786fa34ac 100644 --- a/protocols/autonat/Cargo.toml +++ b/protocols/autonat/Cargo.toml @@ -23,7 +23,7 @@ libp2p-swarm = { version = "0.38.0", path = "../../swarm" } libp2p-request-response = { version = "0.20.0", path = "../request-response" } log = "0.4" rand = "0.8" -prost = "0.10" +prost = "0.11" [dev-dependencies] async-std = { version = "1.10", features = ["attributes"] } diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index 6f8c4c284fd..955d9c6b524 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -21,7 +21,7 @@ libp2p-core = { version = "0.35.0", path = "../../core" } libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4" prost-codec = { version = "0.1", path = "../../misc/prost-codec" } -prost = "0.10" +prost = "0.11" thiserror = "1.0" void = "1" diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index d240ef66d07..94724a10980 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.1" libp2p-core = { version = "0.35.0", path = "../../core", default-features = false } libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4" -prost = "0.10" +prost = "0.11" rand = "0.7" smallvec = "1.6.1" diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index da97500808d..ab91f270470 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -24,7 +24,7 @@ log = "0.4.11" sha2 = "0.10.0" base64 = "0.13.0" smallvec = "1.6.1" -prost = "0.10" +prost = "0.11" hex_fmt = "0.3.0" regex = "1.5.5" serde = { version = "1", optional = true, features = ["derive"] } diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index 1b3341df3f8..40699f2d857 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -19,7 +19,7 @@ libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4.1" lru = "0.7.2" prost-codec = { version = "0.1", path = "../../misc/prost-codec" } -prost = "0.10" +prost = "0.11" smallvec = "1.6.1" thiserror = "1.0" void = "1.0" diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index f33697f2e32..6e4ad7e0a2e 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -20,7 +20,7 @@ futures = "0.3.1" log = "0.4" libp2p-core = { version = "0.35.0", path = "../../core", default-features = false } libp2p-swarm = { version = "0.38.0", path = "../../swarm" } -prost = "0.10" +prost = "0.11" rand = "0.7.2" sha2 = "0.10.0" smallvec = "1.6.1" diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 817025842f8..a27e5f500c8 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -22,7 +22,7 @@ libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4" pin-project = "1" prost-codec = { version = "0.1", path = "../../misc/prost-codec" } -prost = "0.10" +prost = "0.11" rand = "0.8.4" smallvec = "1.6.1" static_assertions = "1" diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index 745285b91bd..ce326a8a02a 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] asynchronous-codec = "0.6" libp2p-core = { version = "0.35.0", path = "../../core", default-features = false } libp2p-swarm = { version = "0.38.0", path = "../../swarm" } -prost = "0.10" +prost = "0.11" void = "1" log = "0.4" futures = { version = "0.3", default-features = false, features = ["std"] } diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml index 171a89a4715..e60ab134e22 100644 --- a/transports/noise/Cargo.toml +++ b/transports/noise/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3.1" lazy_static = "1.2" libp2p-core = { version = "0.35.0", path = "../../core", default-features = false } log = "0.4" -prost = "0.10" +prost = "0.11" rand = "0.8.3" sha2 = "0.10.0" static_assertions = "1" diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml index c8cd9395da0..2a7db37dc80 100644 --- a/transports/plaintext/Cargo.toml +++ b/transports/plaintext/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.1" asynchronous-codec = "0.6" libp2p-core = { version = "0.35.0", path = "../../core", default-features = false } log = "0.4.8" -prost = "0.10" +prost = "0.11" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } void = "1.0.2" From e058b38db11cf08c1e851032306d621694a45a24 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Thu, 4 Aug 2022 11:42:09 +0900 Subject: [PATCH 3/5] misc/prost-codec: Bump version --- misc/prost-codec/CHANGELOG.md | 5 +++++ misc/prost-codec/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/relay/Cargo.toml | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 misc/prost-codec/CHANGELOG.md diff --git a/misc/prost-codec/CHANGELOG.md b/misc/prost-codec/CHANGELOG.md new file mode 100644 index 00000000000..af426fb1955 --- /dev/null +++ b/misc/prost-codec/CHANGELOG.md @@ -0,0 +1,5 @@ +# 0.2.0 [unreleased] + +- Update to prost(-build) `v0.11`. See [PR 2788]. + +[PR 2788]: https://github.com/libp2p/rust-libp2p/pull/2788/ \ No newline at end of file diff --git a/misc/prost-codec/Cargo.toml b/misc/prost-codec/Cargo.toml index 958c1e89f2a..f4d1e90f844 100644 --- a/misc/prost-codec/Cargo.toml +++ b/misc/prost-codec/Cargo.toml @@ -3,7 +3,7 @@ name = "prost-codec" edition = "2021" rust-version = "1.56.1" description = "Asynchronous de-/encoding of Protobuf structs using asynchronous-codec, unsigned-varint and prost." -version = "0.1.0" +version = "0.2.0" authors = ["Max Inden "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index 6fca8ea3296..3193df1bbe0 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -20,7 +20,7 @@ instant = "0.1.11" libp2p-core = { version = "0.35.0", path = "../../core" } libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4" -prost-codec = { version = "0.1", path = "../../misc/prost-codec" } +prost-codec = { version = "0.2", path = "../../misc/prost-codec" } prost = "0.11" thiserror = "1.0" void = "1" diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index 30e340c307c..9db09cd1bf2 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -18,7 +18,7 @@ libp2p-core = { version = "0.35.0", path = "../../core", default-features = fals libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4.1" lru = "0.7.2" -prost-codec = { version = "0.1", path = "../../misc/prost-codec" } +prost-codec = { version = "0.2", path = "../../misc/prost-codec" } prost = "0.11" smallvec = "1.6.1" thiserror = "1.0" diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 5aeb106214b..4a7396f938b 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -21,7 +21,7 @@ libp2p-core = { version = "0.35.0", path = "../../core", default-features = fals libp2p-swarm = { version = "0.38.0", path = "../../swarm" } log = "0.4" pin-project = "1" -prost-codec = { version = "0.1", path = "../../misc/prost-codec" } +prost-codec = { version = "0.2", path = "../../misc/prost-codec" } prost = "0.11" rand = "0.8.4" smallvec = "1.6.1" From b00a2bca5f5611ca2f7adc246793975ef5d4a63c Mon Sep 17 00:00:00 2001 From: Max Inden Date: Tue, 16 Aug 2022 15:24:21 +0900 Subject: [PATCH 4/5] .github: Install protoc --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e97069e3a9..56a06164818 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,9 @@ jobs: with: access_token: ${{ github.token }} + - name: Install Protoc + uses: arduino/setup-protoc@v1 + - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@6720f05bc48b77f96918929a9019fb2203ff71f8 # v2.0.0 @@ -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 }} @@ -113,6 +119,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 @@ -139,6 +148,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 From ece8c147eb5bb78f7a76781481f9a10793775211 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Tue, 16 Aug 2022 15:28:38 +0900 Subject: [PATCH 5/5] .github/: Install protoc for intra doc check --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56a06164818..c1509406f8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,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