From 3927b649cb2b232ef1c282889f4bca5c8ca2339e Mon Sep 17 00:00:00 2001 From: Max Inden Date: Fri, 15 Jan 2021 10:55:42 +0100 Subject: [PATCH] *: Update to libp2p v0.34.0 (#7888) * *: Update to libp2p v0.34.0 * client/network: Update bytes, unsigned-varint and asynchronous-codec * client: Update to prost v0.7 --- substrate/Cargo.lock | 289 +++++++++--------- substrate/bin/node/browser-testing/Cargo.toml | 2 +- .../client/authority-discovery/Cargo.toml | 6 +- substrate/client/cli/Cargo.toml | 2 +- substrate/client/network-gossip/Cargo.toml | 2 +- substrate/client/network/Cargo.toml | 16 +- .../protocol/generic_proto/upgrade/legacy.rs | 2 +- .../generic_proto/upgrade/notifications.rs | 2 +- substrate/client/network/test/Cargo.toml | 2 +- substrate/client/peerset/Cargo.toml | 2 +- substrate/client/telemetry/Cargo.toml | 2 +- .../primitives/consensus/common/Cargo.toml | 2 +- substrate/utils/browser/Cargo.toml | 2 +- 13 files changed, 162 insertions(+), 169 deletions(-) diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 4d334f5f25..c42127aead 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -298,19 +298,6 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" -[[package]] -name = "async-tls" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400" -dependencies = [ - "futures-core", - "futures-io", - "rustls 0.19.0", - "webpki", - "webpki-roots", -] - [[package]] name = "async-trait" version = "0.1.41" @@ -322,6 +309,19 @@ dependencies = [ "syn", ] +[[package]] +name = "asynchronous-codec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" +dependencies = [ + "bytes 1.0.1", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite 0.2.0", +] + [[package]] name = "atomic" version = "0.5.0" @@ -423,7 +423,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "which", + "which 3.1.1", ] [[package]] @@ -602,6 +602,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + [[package]] name = "cache-padded" version = "1.1.1" @@ -947,7 +953,7 @@ dependencies = [ "clap", "criterion-plot", "csv", - "itertools 0.9.0", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -969,7 +975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" dependencies = [ "cast", - "itertools 0.9.0", + "itertools", ] [[package]] @@ -1888,6 +1894,17 @@ dependencies = [ "syn", ] +[[package]] +name = "futures-rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +dependencies = [ + "futures-io", + "rustls 0.19.0", + "webpki", +] + [[package]] name = "futures-sink" version = "0.3.9" @@ -1940,18 +1957,6 @@ dependencies = [ "slab", ] -[[package]] -name = "futures_codec" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" -dependencies = [ - "bytes 0.5.6", - "futures 0.3.9", - "memchr", - "pin-project 0.4.27", -] - [[package]] name = "gcc" version = "0.3.55" @@ -2541,15 +2546,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.9.0" @@ -2841,12 +2837,12 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e17c636b5fe5ff900ccc2840b643074bfac321551d821243a781d0d46f06588" +checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a" dependencies = [ "atomic", - "bytes 0.5.6", + "bytes 1.0.1", "futures 0.3.9", "lazy_static", "libp2p-core", @@ -2879,9 +2875,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cb706da14c064dce54d8864ade6836b3486b51689300da74eeb7053aa4551e" +checksum = "dad04d3cef6c1df366a6ab58c9cf8b06497699e335d83ac2174783946ff847d6" dependencies = [ "asn1_der", "bs58", @@ -2906,7 +2902,7 @@ dependencies = [ "sha2 0.9.2", "smallvec 1.5.0", "thiserror", - "unsigned-varint", + "unsigned-varint 0.6.0", "void", "zeroize", ] @@ -2923,9 +2919,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3257a41f376aa23f237231971fee7e350e4d8353cfcf233aef34d6d6b638f0c" +checksum = "935893c0e5b6ca6ef60d5225aab9182f97c8c5671df2fa9dee8f4ed72a90e6eb" dependencies = [ "flate2", "futures 0.3.9", @@ -2934,9 +2930,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e09bab25af01326b4ed9486d31325911437448edda30bc57681502542d49f20" +checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3" dependencies = [ "futures 0.3.9", "libp2p-core", @@ -2945,9 +2941,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd8cdd5ef1dd0b7346975477216d752de976b92e43051bc8bd808c372ea6cec" +checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f" dependencies = [ "cuckoofilter", "fnv", @@ -2963,35 +2959,35 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d489531aa9d4ba8726a08b3b74e21c2e10a518ad266ebca98d79040123ab0036" +checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee" dependencies = [ + "asynchronous-codec", "base64 0.13.0", "byteorder", - "bytes 0.5.6", + "bytes 1.0.1", "fnv", "futures 0.3.9", - "futures_codec", "hex_fmt", "libp2p-core", "libp2p-swarm", "log", - "lru_time_cache", "prost", "prost-build", "rand 0.7.3", + "regex", "sha2 0.9.2", "smallvec 1.5.0", - "unsigned-varint", + "unsigned-varint 0.6.0", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43bc51a9bc3780288c526615ba0f5f8216820ea6dcc02b89e8daee526c5fccb" +checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e" dependencies = [ "futures 0.3.9", "libp2p-core", @@ -3005,16 +3001,16 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a226956b49438a10f3206480b8faf5e61fc445c349ea9d9cc37766a83745fa9a" +checksum = "456f5de8e283d7800ca848b9b9a4e2a578b790bd8ae582b885e831353cf0e5df" dependencies = [ "arrayvec 0.5.2", - "bytes 0.5.6", + "asynchronous-codec", + "bytes 1.0.1", "either", "fnv", "futures 0.3.9", - "futures_codec", "libp2p-core", "libp2p-swarm", "log", @@ -3023,17 +3019,17 @@ dependencies = [ "rand 0.7.3", "sha2 0.9.2", "smallvec 1.5.0", - "uint 0.8.5", - "unsigned-varint", + "uint", + "unsigned-varint 0.6.0", "void", "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9e12688e8f14008c950c1efde587cb44dbf316fa805f419cd4e524991236f5" +checksum = "b974db63233fc0e199f4ede7794294aae285c96f4b6010f853eac4099ef08590" dependencies = [ "async-io", "data-encoding", @@ -3052,29 +3048,29 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3200fbe6608e623bd9efa459cc8bafa0e4efbb0a2dfcdd0e1387ff4181264b" +checksum = "2705dc94b01ab9e3779b42a09bbf3712e637ed213e875c30face247291a85af0" dependencies = [ - "bytes 0.5.6", + "asynchronous-codec", + "bytes 1.0.1", "futures 0.3.9", - "futures_codec", "libp2p-core", "log", "nohash-hasher", "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.5.0", - "unsigned-varint", + "unsigned-varint 0.6.0", ] [[package]] name = "libp2p-noise" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0580e0d18019d254c9c349c03ff7b22e564b6f2ada70c045fc39738e144f2139" +checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "curve25519-dalek 3.0.0", "futures 0.3.9", "lazy_static", @@ -3092,9 +3088,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b2ec86a18cbf09d7df440e7786a2409640c774e476e9a3b4d031382c3d7588" +checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c" dependencies = [ "futures 0.3.9", "libp2p-core", @@ -3107,18 +3103,18 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7b1bdcbe46a3a2159c231601ed29645282653c0a96ce3a2ad8352c9fbe6800" +checksum = "48e8c1ec305c9949351925cdc7196b9570f4330477f5e47fbf5bb340b57e26ed" dependencies = [ - "bytes 0.5.6", + "asynchronous-codec", + "bytes 1.0.1", "futures 0.3.9", - "futures_codec", "libp2p-core", "log", "prost", "prost-build", - "unsigned-varint", + "unsigned-varint 0.6.0", "void", ] @@ -3138,12 +3134,12 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620e2950decbf77554b5aed3824f7d0e2c04923f28c70f9bff1a402c47ef6b1e" +checksum = "d37637a4b33b5390322ccc068a33897d0aa541daf4fec99f6a7efbf37295346e" dependencies = [ "async-trait", - "bytes 0.5.6", + "bytes 1.0.1", "futures 0.3.9", "libp2p-core", "libp2p-swarm", @@ -3152,15 +3148,15 @@ dependencies = [ "minicbor", "rand 0.7.3", "smallvec 1.5.0", - "unsigned-varint", + "unsigned-varint 0.6.0", "wasm-timer", ] [[package]] name = "libp2p-swarm" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf5894ee1ee63a38aa58d58a16e3dcf7ede6b59ea7b22302c00c1a41d7aec41" +checksum = "22ea8c69839a0e593c8c6a24282cb234d48ac37be4153183f4914e00f5303e75" dependencies = [ "either", "futures 0.3.9", @@ -3174,15 +3170,16 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2113a7dab2b502c55fe290910cd7399a2aa04fe70a2f5a415a87a1db600c0e" +checksum = "3dbd3d7076a478ac5a6aca55e74bdc250ac539b95de09b9d09915e0b8d01a6b2" dependencies = [ - "async-std", + "async-io", "futures 0.3.9", "futures-timer 3.0.2", - "if-addrs", + "if-watch", "ipnet", + "libc", "libp2p-core", "log", "socket2", @@ -3190,9 +3187,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af05fe92c2a3aa320bc82a308ddb7b33bef3b060154c5a4b9fb0b01f15385fc0" +checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487" dependencies = [ "async-std", "futures 0.3.9", @@ -3202,9 +3199,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cd44ea05a4523f40183f60ab6e6a80e400a5ddfc98b0df1c55edeb85576cd9" +checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd" dependencies = [ "futures 0.3.9", "js-sys", @@ -3216,29 +3213,27 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270c80528e21089ea25b41dd1ab8fd834bdf093ebee422fed3b68699a857a083" +checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22" dependencies = [ - "async-tls", "either", "futures 0.3.9", + "futures-rustls", "libp2p-core", "log", "quicksink", - "rustls 0.19.0", "rw-stream-sink", "soketto", "url 2.2.0", - "webpki", "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36799de9092c35782f080032eddbc8de870f94a0def87cf9f8883efccd5cacf0" +checksum = "490b8b27fc40fe35212df1b6a3d14bffaa4117cbff956fdc2892168a371102ad" dependencies = [ "futures 0.3.9", "libp2p-core", @@ -3378,12 +3373,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "lru_time_cache" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebac060fafad3adedd0c66a80741a92ff4bc8e94a273df2ba3770ab206f2e29a" - [[package]] name = "mach" version = "0.3.2" @@ -3605,7 +3594,7 @@ dependencies = [ "generic-array 0.14.4", "multihash-derive", "sha2 0.9.2", - "unsigned-varint", + "unsigned-varint 0.5.1", ] [[package]] @@ -3630,16 +3619,16 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multistream-select" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda822043bba2d6da31c4e14041f9794f8fb130a5959289038d0b809d8888614" +checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "futures 0.3.9", "log", "pin-project 1.0.2", "smallvec 1.5.0", - "unsigned-varint", + "unsigned-varint 0.6.0", ] [[package]] @@ -5225,9 +5214,9 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180cd097078b337d2ba6400c6a67b181b38b611273cb1d8d12f3d8d5d8eaaacb" +checksum = "8bfda2e46fc5e14122649e2645645a81ee5844e0fb2e727ef560cc71a8b2d801" dependencies = [ "arrayref", "bs58", @@ -5237,7 +5226,7 @@ dependencies = [ "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.6.0", "url 2.2.0", ] @@ -5721,7 +5710,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "uint 0.9.0", + "uint", ] [[package]] @@ -5794,40 +5783,40 @@ dependencies = [ [[package]] name = "prost" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212" +checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "prost-derive", ] [[package]] name = "prost-build" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" +checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "heck", - "itertools 0.8.2", + "itertools", "log", "multimap", "petgraph", "prost", "prost-types", "tempfile", - "which", + "which 4.0.2", ] [[package]] name = "prost-derive" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" +checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", - "itertools 0.8.2", + "itertools", "proc-macro2", "quote", "syn", @@ -5835,11 +5824,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" +checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "prost", ] @@ -7147,9 +7136,10 @@ dependencies = [ "assert_matches", "async-std", "async-trait", + "asynchronous-codec", "bitflags", "bs58", - "bytes 0.5.6", + "bytes 1.0.1", "derive_more", "either", "erased-serde", @@ -7157,7 +7147,6 @@ dependencies = [ "fork-tree", "futures 0.3.9", "futures-timer 3.0.2", - "futures_codec", "hex", "ip_network", "libp2p", @@ -7194,7 +7183,7 @@ dependencies = [ "substrate-test-runtime-client", "tempfile", "thiserror", - "unsigned-varint", + "unsigned-varint 0.6.0", "void", "wasm-timer", "zeroize", @@ -9826,18 +9815,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -[[package]] -name = "uint" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" -dependencies = [ - "byteorder", - "crunchy", - "rustc-hex", - "static_assertions", -] - [[package]] name = "uint" version = "0.9.0" @@ -9910,11 +9887,17 @@ name = "unsigned-varint" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" + +[[package]] +name = "unsigned-varint" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" dependencies = [ - "bytes 0.5.6", + "asynchronous-codec", + "bytes 1.0.1", "futures-io", "futures-util", - "futures_codec", ] [[package]] @@ -10409,6 +10392,16 @@ dependencies = [ "libc", ] +[[package]] +name = "which" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +dependencies = [ + "libc", + "thiserror", +] + [[package]] name = "winapi" version = "0.2.8" @@ -10535,6 +10528,6 @@ checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b" dependencies = [ "cc", "glob", - "itertools 0.9.0", + "itertools", "libc", ] diff --git a/substrate/bin/node/browser-testing/Cargo.toml b/substrate/bin/node/browser-testing/Cargo.toml index db64da19a1..e098ea3e64 100644 --- a/substrate/bin/node/browser-testing/Cargo.toml +++ b/substrate/bin/node/browser-testing/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] futures-timer = "3.0.2" -libp2p = { version = "0.33.0", default-features = false } +libp2p = { version = "0.34.0", default-features = false } jsonrpc-core = "15.0.0" serde = "1.0.106" serde_json = "1.0.48" diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml index e42e822eba..d2ba2cf415 100644 --- a/substrate/client/authority-discovery/Cargo.toml +++ b/substrate/client/authority-discovery/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -prost-build = "0.6.1" +prost-build = "0.7" [dependencies] async-trait = "0.1" @@ -23,10 +23,10 @@ derive_more = "0.99.2" either = "1.5.3" futures = "0.3.9" futures-timer = "3.0.1" -libp2p = { version = "0.33.0", default-features = false, features = ["kad"] } +libp2p = { version = "0.34.0", default-features = false, features = ["kad"] } log = "0.4.8" prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"} -prost = "0.6.1" +prost = "0.7" rand = "0.7.2" sc-client-api = { version = "2.0.0", path = "../api" } sc-network = { version = "0.8.0", path = "../network" } diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml index bff80147ac..32299e6e5f 100644 --- a/substrate/client/cli/Cargo.toml +++ b/substrate/client/cli/Cargo.toml @@ -19,7 +19,7 @@ regex = "1.4.2" tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] } futures = "0.3.9" fdlimit = "0.2.1" -libp2p = "0.33.0" +libp2p = "0.34.0" parity-scale-codec = "1.3.6" hex = "0.4.2" rand = "0.7.3" diff --git a/substrate/client/network-gossip/Cargo.toml b/substrate/client/network-gossip/Cargo.toml index 9ad591d0af..b0120e306a 100644 --- a/substrate/client/network-gossip/Cargo.toml +++ b/substrate/client/network-gossip/Cargo.toml @@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] futures = "0.3.9" futures-timer = "3.0.1" -libp2p = { version = "0.33.0", default-features = false } +libp2p = { version = "0.34.0", default-features = false } log = "0.4.8" lru = "0.6.1" prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" } diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml index 2251746de9..9c0fab84a8 100644 --- a/substrate/client/network/Cargo.toml +++ b/substrate/client/network/Cargo.toml @@ -14,14 +14,14 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -prost-build = "0.6.1" +prost-build = "0.7" [dependencies] async-trait = "0.1" async-std = "1.6.5" bitflags = "1.2.0" bs58 = "0.4.0" -bytes = "0.5.0" +bytes = "1" codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] } derive_more = "0.99.2" either = "1.5.3" @@ -30,7 +30,7 @@ fnv = "1.0.6" fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" } futures = "0.3.9" futures-timer = "3.0.2" -futures_codec = "0.4.0" +asynchronous-codec = "0.5" hex = "0.4.0" ip_network = "0.3.4" linked-hash-map = "0.5.2" @@ -40,7 +40,7 @@ nohash-hasher = "0.2.0" parking_lot = "0.11.1" pin-project = "0.4.6" prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" } -prost = "0.6.1" +prost = "0.7" rand = "0.7.2" sc-block-builder = { version = "0.8.0", path = "../block-builder" } sc-client-api = { version = "2.0.0", path = "../api" } @@ -57,19 +57,19 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" } sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" } sp-utils = { version = "2.0.0", path = "../../primitives/utils" } thiserror = "1" -unsigned-varint = { version = "0.5.0", features = ["futures", "futures-codec"] } +unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] } void = "1.0.2" wasm-timer = "0.2" zeroize = "1.2.0" [dependencies.libp2p] -version = "0.33.0" +version = "0.34.0" default-features = false -features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"] +features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"] [dev-dependencies] assert_matches = "1.3" -libp2p = { version = "0.33.0", default-features = false } +libp2p = { version = "0.34.0", default-features = false } quickcheck = "0.9.0" rand = "0.7.2" sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" } diff --git a/substrate/client/network/src/protocol/generic_proto/upgrade/legacy.rs b/substrate/client/network/src/protocol/generic_proto/upgrade/legacy.rs index 307bfd7ad6..6a5ceb5571 100644 --- a/substrate/client/network/src/protocol/generic_proto/upgrade/legacy.rs +++ b/substrate/client/network/src/protocol/generic_proto/upgrade/legacy.rs @@ -19,7 +19,7 @@ use crate::config::ProtocolId; use bytes::BytesMut; use futures::prelude::*; -use futures_codec::Framed; +use asynchronous_codec::Framed; use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade::ProtocolName}; use parking_lot::RwLock; use std::{collections::VecDeque, io, pin::Pin, sync::Arc, vec::IntoIter as VecIntoIter}; diff --git a/substrate/client/network/src/protocol/generic_proto/upgrade/notifications.rs b/substrate/client/network/src/protocol/generic_proto/upgrade/notifications.rs index 13f2e26907..29561bafd7 100644 --- a/substrate/client/network/src/protocol/generic_proto/upgrade/notifications.rs +++ b/substrate/client/network/src/protocol/generic_proto/upgrade/notifications.rs @@ -38,7 +38,7 @@ use bytes::BytesMut; use futures::prelude::*; -use futures_codec::Framed; +use asynchronous_codec::Framed; use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade}; use log::error; use std::{borrow::Cow, convert::Infallible, io, iter, mem, pin::Pin, task::{Context, Poll}}; diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml index 537e3378db..20265f7680 100644 --- a/substrate/client/network/test/Cargo.toml +++ b/substrate/client/network/test/Cargo.toml @@ -20,7 +20,7 @@ parking_lot = "0.11.1" futures = "0.3.9" futures-timer = "3.0.1" rand = "0.7.2" -libp2p = { version = "0.33.0", default-features = false } +libp2p = { version = "0.34.0", default-features = false } sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" } sc-consensus = { version = "0.8.0", path = "../../consensus/common" } sc-client-api = { version = "2.0.0", path = "../../api" } diff --git a/substrate/client/peerset/Cargo.toml b/substrate/client/peerset/Cargo.toml index b2cedbc773..1ebb6bde52 100644 --- a/substrate/client/peerset/Cargo.toml +++ b/substrate/client/peerset/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] futures = "0.3.9" -libp2p = { version = "0.33.0", default-features = false } +libp2p = { version = "0.34.0", default-features = false } sp-utils = { version = "2.0.0", path = "../../primitives/utils"} log = "0.4.8" serde_json = "1.0.41" diff --git a/substrate/client/telemetry/Cargo.toml b/substrate/client/telemetry/Cargo.toml index 3d253c5114..8c517574ff 100644 --- a/substrate/client/telemetry/Cargo.toml +++ b/substrate/client/telemetry/Cargo.toml @@ -19,7 +19,7 @@ parking_lot = "0.11.1" futures = "0.3.9" futures-timer = "3.0.1" wasm-timer = "0.2.5" -libp2p = { version = "0.33.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] } +libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] } log = "0.4.8" pin-project = "0.4.6" rand = "0.7.2" diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml index 78dc3a8508..a9d2d92998 100644 --- a/substrate/primitives/consensus/common/Cargo.toml +++ b/substrate/primitives/consensus/common/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] thiserror = "1.0.21" -libp2p = { version = "0.33.0", default-features = false } +libp2p = { version = "0.34.0", default-features = false } log = "0.4.8" sp-core = { path= "../../core", version = "2.0.0"} sp-inherents = { version = "2.0.0", path = "../../inherents" } diff --git a/substrate/utils/browser/Cargo.toml b/substrate/utils/browser/Cargo.toml index c8b2ac9574..7380a30818 100644 --- a/substrate/utils/browser/Cargo.toml +++ b/substrate/utils/browser/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] futures = { version = "0.3", features = ["compat"] } futures01 = { package = "futures", version = "0.1.29" } log = "0.4.8" -libp2p-wasm-ext = { version = "0.26", features = ["websocket"] } +libp2p-wasm-ext = { version = "0.27", features = ["websocket"] } console_error_panic_hook = "0.1.6" console_log = "0.2.0" js-sys = "0.3.34"