From e519af9012500c6d67f480cded9db3f49957515e Mon Sep 17 00:00:00 2001 From: Age Manning Date: Thu, 18 Nov 2021 05:08:42 +0000 Subject: [PATCH] Update Lighthouse Dependencies (#2818) ## Issue Addressed Updates lighthouse dependencies to resolve audit issues in out-dated deps. --- Cargo.lock | 470 +++++++++--------- Cargo.toml | 1 + account_manager/Cargo.toml | 2 +- beacon_node/beacon_chain/Cargo.toml | 2 +- beacon_node/client/Cargo.toml | 2 +- beacon_node/eth1/Cargo.toml | 2 +- beacon_node/genesis/Cargo.toml | 2 +- beacon_node/http_api/Cargo.toml | 4 +- beacon_node/http_metrics/Cargo.toml | 4 +- beacon_node/lighthouse_network/Cargo.toml | 4 +- .../lighthouse_network/src/behaviour/mod.rs | 11 +- beacon_node/lighthouse_network/src/service.rs | 10 +- .../lighthouse_network/tests/common/mod.rs | 6 +- beacon_node/network/Cargo.toml | 2 +- beacon_node/timer/Cargo.toml | 2 +- boot_node/Cargo.toml | 2 +- common/eth2/Cargo.toml | 3 +- common/hashset_delay/Cargo.toml | 2 +- common/monitoring_api/Cargo.toml | 2 +- common/task_executor/Cargo.toml | 2 +- common/warp_utils/Cargo.toml | 4 +- lighthouse/environment/Cargo.toml | 2 +- slasher/service/Cargo.toml | 2 +- testing/eth1_test_rig/Cargo.toml | 2 +- testing/simulator/Cargo.toml | 2 +- testing/web3signer_tests/Cargo.toml | 4 +- validator_client/Cargo.toml | 6 +- 27 files changed, 286 insertions(+), 271 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77e3fc822..3831fbcf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "gimli", ] @@ -84,7 +84,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures 0.2.1", "ctr", @@ -150,24 +150,24 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" +checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" [[package]] name = "arbitrary" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577b08a4acd7b99869f863c50011b01eb73424ccc798ecd996f2e24817adfca7" +checksum = "510c76ecefdceada737ea728f4f9a84bd2e1ef29f1ba555e560940fe279954de" dependencies = [ "derive_arbitrary", ] [[package]] name = "arc-swap" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6df5aef5c5830360ce5218cecb8f018af3438af5686ae945094affc86fdec63" +checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" [[package]] name = "arrayref" @@ -183,9 +183,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "asn1_der" @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "atomic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" dependencies = [ "autocfg 1.0.1", ] @@ -262,13 +262,13 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.62" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091bcdf2da9950f96aa522681ce805e6857f6ca8df73833d35736ab2dc78e152" +checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -377,9 +377,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" @@ -602,15 +602,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" [[package]] name = "cfg-if" @@ -624,7 +618,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures 0.1.5", "zeroize", @@ -721,7 +715,7 @@ dependencies = [ "slot_clock", "store", "task_executor", - "time 0.3.4", + "time 0.3.5", "timer", "tokio", "toml", @@ -758,7 +752,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen", ] @@ -814,7 +808,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -859,7 +853,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -869,7 +863,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -880,7 +874,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "lazy_static", "memoffset", @@ -893,7 +887,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -956,11 +950,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" +checksum = "377c9b002a72a0b2c1a18c62e2f3864bdfea4a015e3683a96e24aa45dd6c02d1" dependencies = [ - "nix", + "nix 0.22.2", "winapi", ] @@ -1049,9 +1043,8 @@ dependencies = [ [[package]] name = "darwin-libproc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" +version = "0.2.0" +source = "git+https://github.com/agemanning/darwin-libproc?rev=73d1587cb363c00737652fdc987f1bcbaf153ef7#73d1587cb363c00737652fdc987f1bcbaf153ef7" dependencies = [ "darwin-libproc-sys", "libc", @@ -1060,12 +1053,8 @@ dependencies = [ [[package]] name = "darwin-libproc-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" -dependencies = [ - "libc", -] +version = "0.2.0" +source = "git+https://github.com/agemanning/darwin-libproc?rev=73d1587cb363c00737652fdc987f1bcbaf153ef7#73d1587cb363c00737652fdc987f1bcbaf153ef7" [[package]] name = "data-encoding" @@ -1171,7 +1160,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1205,7 +1194,7 @@ checksum = "8a4968631f2eb03ef8dff74fe355440bcf4bd1c514c4326325fc739640c4ec53" dependencies = [ "aes", "aes-gcm", - "arrayvec 0.7.1", + "arrayvec 0.7.2", "digest", "enr", "fnv", @@ -1328,7 +1317,7 @@ version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1862,7 +1851,7 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crc32fast", "libc", "libz-sys", @@ -1992,13 +1981,13 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +checksum = "d383f0425d991a05e564c2f3ec150bd6dde863179c131dd60d8aa73a05434461" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.20.1", + "webpki 0.22.0", ] [[package]] @@ -2077,7 +2066,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", @@ -2090,7 +2079,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.10.2+wasi-snapshot-preview1", ] @@ -2107,9 +2096,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "git-version" @@ -2403,9 +2392,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.14" +version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" +checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" dependencies = [ "bytes", "futures-channel", @@ -2457,9 +2446,9 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a83ec4af652890ac713ffd8dc859e650420a5ef47f7b9be29b6664ab50fbc8" +checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" dependencies = [ "if-addrs-sys", "libc", @@ -2527,9 +2516,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" +checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ "serde", ] @@ -2555,22 +2544,13 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "input_buffer" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" -dependencies = [ - "bytes", -] - [[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2654,7 +2634,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3e8e491ed22bc161583a1c77e42313672c483eba6bd9d7afec0f1131d0b9ce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", "sha2", @@ -2732,9 +2712,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.105" +version = "0.2.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" +checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" [[package]] name = "libflate" @@ -2764,15 +2744,18 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.40.0-rc.3" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7ebded4becafc3eee99d2021a29d9a82efd77723f1febccfb2ca2d800be9e5" +checksum = "782229f90bf7d5b12ee3ee08f7e160ba99f0d75eee7d118d9c1a688b13f6e64a" dependencies = [ "atomic", "bytes", "futures", + "futures-timer", + "getrandom 0.2.3", + "instant", "lazy_static", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "libp2p-dns", "libp2p-gossipsub", "libp2p-identify", @@ -2787,8 +2770,8 @@ dependencies = [ "multiaddr", "parking_lot", "pin-project 1.0.8", + "rand 0.7.3", "smallvec", - "wasm-timer", ] [[package]] @@ -2820,16 +2803,16 @@ dependencies = [ "sha2", "smallvec", "thiserror", - "unsigned-varint 0.7.0", + "unsigned-varint 0.7.1", "void", "zeroize", ] [[package]] name = "libp2p-core" -version = "0.30.0-rc.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d1d6f1eb6db73ef794543aa2701cb512675d56f3ce75cf936fd3a1649f5bbf2" +checksum = "bef22d9bba1e8bcb7ec300073e6802943fe8abb8190431842262b5f1c30abba1" dependencies = [ "asn1_der", "bs58", @@ -2854,19 +2837,19 @@ dependencies = [ "sha2", "smallvec", "thiserror", - "unsigned-varint 0.7.0", + "unsigned-varint 0.7.1", "void", "zeroize", ] [[package]] name = "libp2p-dns" -version = "0.30.0-rc.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3756d04f91224c95ca24d2894e6b180f5465f1ed0f03d070f77bfd74c527b9" +checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" dependencies = [ "futures", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "log", "smallvec", "trust-dns-resolver", @@ -2874,9 +2857,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.33.0-rc.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d02524892b942932f1aa59f729ecc1781ed0680379e6752d5e6e373791f4bd16" +checksum = "98942284cc1a91f24527a8b1e5bc06f7dd22fc6cee5be3d9bf5785bf902eb934" dependencies = [ "asynchronous-codec", "base64 0.13.0", @@ -2884,44 +2867,48 @@ dependencies = [ "bytes", "fnv", "futures", + "futures-timer", "hex_fmt", - "libp2p-core 0.30.0-rc.2", + "instant", + "libp2p-core 0.30.0", "libp2p-swarm", "log", + "open-metrics-client", + "pin-project 1.0.8", "prost 0.9.0", "prost-build 0.9.0", "rand 0.7.3", "regex", "sha2", "smallvec", - "unsigned-varint 0.7.0", - "wasm-timer", + "unsigned-varint 0.7.1", ] [[package]] name = "libp2p-identify" -version = "0.31.0-rc.2" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed451536ea0c9cf4e3a7ae5ab9451bb52bcbfae83f92009cbdc803b06eedaac" +checksum = "ec6d59e3f88435a83797fc3734f18385f6f54e0fe081e12543573364687c7db5" dependencies = [ "futures", - "libp2p-core 0.30.0-rc.2", + "futures-timer", + "libp2p-core 0.30.0", "libp2p-swarm", "log", "lru", "prost 0.9.0", "prost-build 0.9.0", "smallvec", - "wasm-timer", ] [[package]] name = "libp2p-metrics" -version = "0.1.0-rc.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d8a654f4b4da33d2dd1fa4e060c7ac09e34b01882b08aa114176a40ec371c6" +checksum = "d59f3be49edeecff13ef0d0dc28295ba4a33910611715f04236325d08e4119e0" dependencies = [ - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", + "libp2p-gossipsub", "libp2p-identify", "libp2p-swarm", "open-metrics-client", @@ -2929,33 +2916,33 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.30.0-rc.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f221b185fa4e0b49510699e886072a646e31214d1b76d03d3220f5cd48f603" +checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "log", "nohash-hasher", "parking_lot", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.0", + "unsigned-varint 0.7.1", ] [[package]] name = "libp2p-noise" -version = "0.33.0-rc.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce91ef34c441d507745b137d51f00a49fb83a3229ec560ecb1c0fe7fde5a65b" +checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" dependencies = [ "bytes", "curve25519-dalek", "futures", "lazy_static", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "log", "prost 0.9.0", "prost-build 0.9.0", @@ -2969,25 +2956,26 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.31.0-rc.2" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4f04c710ce6500e8fc3cfda3d7a7423caa99cbfd0e09f2ff29cb8bdcdef660" +checksum = "cb84d40627cd109bbbf43da9269d4ef75903f42356c88d98b2b55c47c430c792" dependencies = [ "either", "futures", - "libp2p-core 0.30.0-rc.2", + "futures-timer", + "instant", + "libp2p-core 0.30.0", "log", "rand 0.7.3", "smallvec", "void", - "wasm-timer", ] [[package]] name = "libp2p-swarm-derive" -version = "0.25.0-rc.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4d34b88c742b903813bb1fc5b87cc42f9da29314c9eba35abb2eb5d31a0588" +checksum = "7dd93a7dad9b61c39797572e4fb4fdba8415d6348b4e745b3d4cb008f84331ab" dependencies = [ "quote", "syn", @@ -2995,16 +2983,16 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0-rc.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0431b74198d05004a706b78fd5f7d217d15fbacd2b8e4d116ade24d5510992b3" +checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" dependencies = [ "futures", "futures-timer", "if-addrs", "ipnet", "libc", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "log", "socket2 0.4.2", "tokio", @@ -3012,30 +3000,30 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.31.0-rc.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262e768479476a4b8ac4eb2714a4cdcaf642edf3a515ba10f30751dbd0c4353c" +checksum = "fa92005fbd67695715c821e1acfe4d7be9fd2d88738574e93d645c49ec2831c8" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "log", "quicksink", "rw-stream-sink", - "soketto 0.7.0", + "soketto 0.7.1", "url", "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.34.0-rc.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2569b1509317a854e124c4e9266415195def3184c865423e01c39ed0cf07351" +checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" dependencies = [ "futures", - "libp2p-core 0.30.0-rc.2", + "libp2p-core 0.30.0", "parking_lot", "thiserror", "yamux", @@ -3323,7 +3311,7 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3529,7 +3517,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.0", + "unsigned-varint 0.7.1", "url", ] @@ -3543,7 +3531,7 @@ dependencies = [ "generic-array", "multihash-derive", "sha2", - "unsigned-varint 0.7.0", + "unsigned-varint 0.7.1", ] [[package]] @@ -3568,9 +3556,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multipart" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4" +checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" dependencies = [ "buf_redux", "httparse", @@ -3578,7 +3566,7 @@ dependencies = [ "mime", "mime_guess", "quick-error", - "rand 0.7.3", + "rand 0.8.4", "safemem", "tempfile", "twoway", @@ -3595,7 +3583,7 @@ dependencies = [ "log", "pin-project 1.0.8", "smallvec", - "unsigned-varint 0.7.0", + "unsigned-varint 0.7.1", ] [[package]] @@ -3660,13 +3648,26 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188" +checksum = "77d9f3521ea8e0641a153b3cddaf008dcbf26acd4ed739a2517295e0760d12c7" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "nix" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba" +dependencies = [ + "bitflags", + "cc", + "cfg-if", "libc", "memoffset", ] @@ -3708,9 +3709,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg 1.0.1", "num-integer", @@ -3828,12 +3829,12 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.37" +version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc6b9e4403633698352880b22cbe2f0e45dd0177f6fabe4585536e56a3e4f75" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -3848,18 +3849,18 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.16.0+1.1.1l" +version = "300.0.2+3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" +checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.68" +version = "0.9.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c571f25d3f66dd427e417cebf73dbe2361d6125cf6e3a70d143fdf97c9f5150" +checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73" dependencies = [ "autocfg 1.0.1", "cc", @@ -3916,7 +3917,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ - "arrayvec 0.7.1", + "arrayvec 0.7.2", "bitvec 0.20.4", "byte-slice-cast 1.2.0", "impl-trait-for-tuples", @@ -3953,7 +3954,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", @@ -3963,9 +3964,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" [[package]] name = "pbkdf2" @@ -4096,9 +4097,9 @@ checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" [[package]] name = "platforms" -version = "0.2.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" +checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "plotters" @@ -4145,7 +4146,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures 0.2.1", "opaque-debug", "universal-hash", @@ -4269,7 +4270,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fnv", "lazy_static", "memchr", @@ -4403,14 +4404,14 @@ checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754" [[package]] name = "psutil" version = "3.2.1" -source = "git+https://github.com/sigp/rust-psutil?rev=3b42f01273b446128b572aa4fdb9b08f5da5f1d7#3b42f01273b446128b572aa4fdb9b08f5da5f1d7" +source = "git+https://github.com/sigp/rust-psutil?rev=b3e44bc7ec5d545b8cb8ad4e3dffe074b6e6336b#b3e44bc7ec5d545b8cb8ad4e3dffe074b6e6336b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "darwin-libproc", "derive_more", "glob", "mach", - "nix", + "nix 0.21.2", "num_cpus", "once_cell", "platforms", @@ -4839,8 +4840,20 @@ dependencies = [ "base64 0.13.0", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac4581f0fc0e0efd529d069e8189ec7b90b8e7680e21beb35141bdc45f36040" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -4947,6 +4960,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "secp256k1" version = "0.20.3" @@ -4967,9 +4990,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ "bitflags", "core-foundation", @@ -5067,9 +5090,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.68" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3" dependencies = [ "itoa", "ryu", @@ -5118,7 +5141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures 0.2.1", "digest", "opaque-debug", @@ -5131,7 +5154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures 0.2.1", "digest", "opaque-debug", @@ -5342,9 +5365,9 @@ dependencies = [ [[package]] name = "sloggers" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffcb984e952de7fdb085aa7bebcd4575e9d0c79630640a359a38578f0c18fd3" +checksum = "e20d36cb80da75a9c5511872f15247ddad14ead8c1dd97a86b56d1be9f5d4a0e" dependencies = [ "chrono", "libc", @@ -5359,6 +5382,8 @@ dependencies = [ "slog-stdlog", "slog-term", "trackable", + "winapi", + "windows-acl", ] [[package]] @@ -5407,7 +5432,7 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "winapi", ] @@ -5439,9 +5464,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083624472e8817d44d02c0e55df043737ff11f279af924abdf93845717c2b75c" +checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.0", "bytes", @@ -5666,7 +5691,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "rand 0.8.4", "redox_syscall", @@ -5769,9 +5794,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99beeb0daeac2bd1e86ac2c21caddecb244b39a093594da1a661ec2060c7aedd" +checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" dependencies = [ "libc", ] @@ -5836,9 +5861,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -5851,9 +5876,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.12.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" +checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" dependencies = [ "autocfg 1.0.1", "bytes", @@ -5881,9 +5906,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" +checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" dependencies = [ "proc-macro2", "quote", @@ -5906,16 +5931,16 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", ] [[package]] name = "tokio-stream" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite 0.2.7", @@ -5925,9 +5950,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b" +checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" dependencies = [ "futures-util", "log", @@ -5938,9 +5963,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", @@ -5973,7 +5998,7 @@ version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite 0.2.7", "tracing-attributes", @@ -6000,16 +6025,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.8", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.2" @@ -6103,7 +6118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner", "futures-channel", @@ -6127,7 +6142,7 @@ version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lazy_static", @@ -6149,19 +6164,19 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24" +checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" dependencies = [ "base64 0.13.0", "byteorder", "bytes", "http", "httparse", - "input_buffer", "log", "rand 0.8.4", "sha-1", + "thiserror", "url", "utf-8", ] @@ -6326,9 +6341,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f" +checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ "asynchronous-codec", "bytes", @@ -6483,11 +6498,12 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.0" -source = "git+https://github.com/macladson/warp?rev=dfa259e#dfa259e19b7490e6bc4bf247e8b76f671d29a0eb" +version = "0.3.2" +source = "git+https://github.com/macladson/warp?rev=7e75acc#7e75acc368229a46a236a8c991bf251fe7fe50ef" dependencies = [ "bytes", - "futures", + "futures-channel", + "futures-util", "headers", "http", "hyper", @@ -6508,7 +6524,6 @@ dependencies = [ "tokio-util", "tower-service", "tracing", - "tracing-futures", ] [[package]] @@ -6546,7 +6561,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -6571,7 +6586,7 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -6630,21 +6645,6 @@ dependencies = [ "quote", ] -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "web-sys" version = "0.3.55" @@ -6736,12 +6736,22 @@ dependencies = [ ] [[package]] -name = "webpki-roots" -version = "0.21.1" +name = "webpki" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "webpki", + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +dependencies = [ + "webpki 0.22.0", ] [[package]] @@ -6879,18 +6889,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" +checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" +checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 63a417fe6..a7789fa0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,3 +91,4 @@ eth2_ssz_derive = { path = "consensus/ssz_derive" } tree_hash = { path = "consensus/tree_hash" } tree_hash_derive = { path = "consensus/tree_hash_derive" } fixed-hash = { git = "https://github.com/paritytech/parity-common", rev="df638ab0885293d21d656dc300d39236b69ce57d" } +warp = { git = "https://github.com/macladson/warp", rev ="7e75acc" } diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml index 3c602f45c..c14c47787 100644 --- a/account_manager/Cargo.toml +++ b/account_manager/Cargo.toml @@ -15,7 +15,7 @@ directory = { path = "../common/directory" } eth2_wallet = { path = "../crypto/eth2_wallet" } eth2_wallet_manager = { path = "../common/eth2_wallet_manager" } validator_dir = { path = "../common/validator_dir" } -tokio = { version = "1.10.0", features = ["full"] } +tokio = { version = "1.14.0", features = ["full"] } eth2_keystore = { path = "../crypto/eth2_keystore" } account_utils = { path = "../common/account_utils" } slashing_protection = { path = "../validator_client/slashing_protection" } diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index 2a91c5b18..4951473f0 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -35,7 +35,7 @@ eth2_ssz_derive = "0.3.0" state_processing = { path = "../../consensus/state_processing" } tree_hash = "0.4.0" types = { path = "../../consensus/types" } -tokio = "1.10.0" +tokio = "1.14.0" eth1 = { path = "../eth1" } futures = "0.3.7" genesis = { path = "../genesis" } diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml index f8d3356e2..165904a4c 100644 --- a/beacon_node/client/Cargo.toml +++ b/beacon_node/client/Cargo.toml @@ -21,7 +21,7 @@ serde = "1.0.116" serde_derive = "1.0.116" error-chain = "0.12.4" slog = { version = "2.5.2", features = ["max_level_trace"] } -tokio = "1.10.0" +tokio = "1.14.0" dirs = "3.0.1" eth1 = { path = "../eth1" } eth2 = { path = "../../common/eth2" } diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml index 47082088c..7103d1b48 100644 --- a/beacon_node/eth1/Cargo.toml +++ b/beacon_node/eth1/Cargo.toml @@ -24,7 +24,7 @@ eth2_ssz_derive = "0.3.0" tree_hash = "0.4.0" parking_lot = "0.11.0" slog = "2.5.2" -tokio = { version = "1.10.0", features = ["full"] } +tokio = { version = "1.14.0", features = ["full"] } state_processing = { path = "../../consensus/state_processing" } lighthouse_metrics = { path = "../../common/lighthouse_metrics"} lazy_static = "1.4.0" diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml index c80ef1978..337aea8b2 100644 --- a/beacon_node/genesis/Cargo.toml +++ b/beacon_node/genesis/Cargo.toml @@ -19,6 +19,6 @@ merkle_proof = { path = "../../consensus/merkle_proof" } eth2_ssz = "0.4.0" eth2_hashing = "0.2.0" tree_hash = "0.4.0" -tokio = { version = "1.10.0", features = ["full"] } +tokio = { version = "1.14.0", features = ["full"] } slog = "2.5.2" int_to_bytes = { path = "../../consensus/int_to_bytes" } diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml index 770dc3efb..9afbf1597 100644 --- a/beacon_node/http_api/Cargo.toml +++ b/beacon_node/http_api/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" autotests = false # using a single test binary compiles faster [dependencies] -warp = { git = "https://github.com/macladson/warp", rev ="dfa259e", features = ["tls"] } +warp = { version = "0.3.2", features = ["tls"] } serde = { version = "1.0.116", features = ["derive"] } -tokio = { version = "1.10.0", features = ["macros","sync"] } +tokio = { version = "1.14.0", features = ["macros","sync"] } tokio-stream = { version = "0.1.3", features = ["sync"] } types = { path = "../../consensus/types" } hex = "0.4.2" diff --git a/beacon_node/http_metrics/Cargo.toml b/beacon_node/http_metrics/Cargo.toml index 97df28639..c300aaa8e 100644 --- a/beacon_node/http_metrics/Cargo.toml +++ b/beacon_node/http_metrics/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -warp = { git = "https://github.com/macladson/warp", rev ="dfa259e" } +warp = "0.3.2" serde = { version = "1.0.116", features = ["derive"] } slog = "2.5.2" beacon_chain = { path = "../beacon_chain" } @@ -20,7 +20,7 @@ warp_utils = { path = "../../common/warp_utils" } malloc_utils = { path = "../../common/malloc_utils" } [dev-dependencies] -tokio = { version = "1.10.0", features = ["sync"] } +tokio = { version = "1.14.0", features = ["sync"] } reqwest = { version = "0.11.0", features = ["json"] } environment = { path = "../../lighthouse/environment" } types = { path = "../../consensus/types" } diff --git a/beacon_node/lighthouse_network/Cargo.toml b/beacon_node/lighthouse_network/Cargo.toml index 435d9d9d1..1ad3b436d 100644 --- a/beacon_node/lighthouse_network/Cargo.toml +++ b/beacon_node/lighthouse_network/Cargo.toml @@ -16,7 +16,7 @@ eth2_ssz = "0.4.0" eth2_ssz_derive = "0.3.0" slog = { version = "2.5.2", features = ["max_level_trace"] } lighthouse_version = { path = "../../common/lighthouse_version" } -tokio = { version = "1.10.0", features = ["time", "macros"] } +tokio = { version = "1.14.0", features = ["time", "macros"] } futures = "0.3.7" error-chain = "0.12.4" dirs = "3.0.1" @@ -40,7 +40,7 @@ strum = { version = "0.21.0", features = ["derive"] } superstruct = "0.2.0" [dependencies.libp2p] -version = "0.40.0-rc.3" +version = "0.41.0" default-features = false features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns-tokio", "tcp-tokio"] diff --git a/beacon_node/lighthouse_network/src/behaviour/mod.rs b/beacon_node/lighthouse_network/src/behaviour/mod.rs index 86ca6f253..2f6bc6309 100644 --- a/beacon_node/lighthouse_network/src/behaviour/mod.rs +++ b/beacon_node/lighthouse_network/src/behaviour/mod.rs @@ -26,7 +26,8 @@ use libp2p::{ }, identify::{Identify, IdentifyConfig, IdentifyEvent}, swarm::{ - AddressScore, DialPeerCondition, NetworkBehaviour, NetworkBehaviourAction as NBAction, + dial_opts::{DialOpts, PeerCondition}, + AddressScore, NetworkBehaviour, NetworkBehaviourAction as NBAction, NetworkBehaviourEventProcess, PollParameters, }, NetworkBehaviour, PeerId, @@ -232,6 +233,7 @@ impl Behaviour { let mut gossipsub = Gossipsub::new_with_subscription_filter_and_transform( MessageAuthenticity::Anonymous, config.gs_config.clone(), + None, // No metrics for the time being filter, snappy_transform, ) @@ -1071,9 +1073,10 @@ impl Behaviour { match event { InternalBehaviourMessage::DialPeer(peer_id) => { let handler = self.new_handler(); - return Poll::Ready(NBAction::DialPeer { - peer_id, - condition: DialPeerCondition::Disconnected, + return Poll::Ready(NBAction::Dial { + opts: DialOpts::peer_id(peer_id) + .condition(PeerCondition::Disconnected) + .build(), handler, }); } diff --git a/beacon_node/lighthouse_network/src/service.rs b/beacon_node/lighthouse_network/src/service.rs index a42fe5381..24da3e355 100644 --- a/beacon_node/lighthouse_network/src/service.rs +++ b/beacon_node/lighthouse_network/src/service.rs @@ -185,10 +185,10 @@ impl Service { }; // helper closure for dialing peers - let mut dial_addr = |mut multiaddr: Multiaddr| { + let mut dial = |mut multiaddr: Multiaddr| { // strip the p2p protocol if it exists strip_peer_id(&mut multiaddr); - match Swarm::dial_addr(&mut swarm, multiaddr.clone()) { + match Swarm::dial(&mut swarm, multiaddr.clone()) { Ok(()) => debug!(log, "Dialing libp2p peer"; "address" => %multiaddr), Err(err) => debug!( log, @@ -199,7 +199,7 @@ impl Service { // attempt to connect to user-input libp2p nodes for multiaddr in &config.libp2p_nodes { - dial_addr(multiaddr.clone()); + dial(multiaddr.clone()); } // attempt to connect to any specified boot-nodes @@ -219,7 +219,7 @@ impl Service { .read() .is_connected_or_dialing(&bootnode_enr.peer_id()) { - dial_addr(multiaddr.clone()); + dial(multiaddr.clone()); } } } @@ -230,7 +230,7 @@ impl Service { .iter() .any(|proto| matches!(proto, Protocol::Tcp(_))) { - dial_addr(multiaddr.clone()); + dial(multiaddr.clone()); } } diff --git a/beacon_node/lighthouse_network/tests/common/mod.rs b/beacon_node/lighthouse_network/tests/common/mod.rs index 9055da05b..3d3a4d577 100644 --- a/beacon_node/lighthouse_network/tests/common/mod.rs +++ b/beacon_node/lighthouse_network/tests/common/mod.rs @@ -160,7 +160,7 @@ pub async fn build_full_mesh( for (i, node) in nodes.iter_mut().enumerate().take(n) { for (j, multiaddr) in multiaddrs.iter().enumerate().skip(i) { if i != j { - match libp2p::Swarm::dial_addr(&mut node.swarm, multiaddr.clone()) { + match libp2p::Swarm::dial(&mut node.swarm, multiaddr.clone()) { Ok(()) => debug!(log, "Connected"), Err(_) => error!(log, "Failed to connect"), }; @@ -209,7 +209,7 @@ pub async fn build_node_pair( _ = joined => {} } - match libp2p::Swarm::dial_addr(&mut sender.swarm, receiver_multiaddr.clone()) { + match libp2p::Swarm::dial(&mut sender.swarm, receiver_multiaddr.clone()) { Ok(()) => { debug!(log, "Sender dialed receiver"; "address" => format!("{:?}", receiver_multiaddr)) } @@ -231,7 +231,7 @@ pub async fn build_linear(rt: Weak, log: slog::Logger, n: usize) -> Vec .map(|x| get_enr(x).multiaddr()[1].clone()) .collect(); for i in 0..n - 1 { - match libp2p::Swarm::dial_addr(&mut nodes[i].swarm, multiaddrs[i + 1].clone()) { + match libp2p::Swarm::dial(&mut nodes[i].swarm, multiaddrs[i + 1].clone()) { Ok(()) => debug!(log, "Connected"), Err(_) => error!(log, "Failed to connect"), }; diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index 4c06880f3..f9d086701 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -27,7 +27,7 @@ eth2_ssz = "0.4.0" eth2_ssz_types = "0.2.1" futures = "0.3.7" error-chain = "0.12.4" -tokio = { version = "1.10.0", features = ["full"] } +tokio = { version = "1.14.0", features = ["full"] } tokio-stream = "0.1.3" smallvec = "1.6.1" rand = "0.7.3" diff --git a/beacon_node/timer/Cargo.toml b/beacon_node/timer/Cargo.toml index 42df097fb..e67f52d92 100644 --- a/beacon_node/timer/Cargo.toml +++ b/beacon_node/timer/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] beacon_chain = { path = "../beacon_chain" } slot_clock = { path = "../../common/slot_clock" } -tokio = { version = "1.10.0", features = ["full"] } +tokio = { version = "1.14.0", features = ["full"] } slog = "2.5.2" task_executor = { path = "../../common/task_executor" } diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml index bd21b11a8..520cb0639 100644 --- a/boot_node/Cargo.toml +++ b/boot_node/Cargo.toml @@ -12,7 +12,7 @@ lighthouse_network = { path = "../beacon_node/lighthouse_network" } types = { path = "../consensus/types" } eth2_ssz = "0.4.0" slog = "2.5.2" -tokio = "1.10.0" +tokio = "1.14.0" log = "0.4.11" slog-term = "2.6.0" logging = { path = "../common/logging" } diff --git a/common/eth2/Cargo.toml b/common/eth2/Cargo.toml index b22cfc28f..899749973 100644 --- a/common/eth2/Cargo.toml +++ b/common/eth2/Cargo.toml @@ -28,8 +28,9 @@ store = { path = "../../beacon_node/store", optional = true } [target.'cfg(target_os = "linux")'.dependencies] # TODO: update psutil once fix is merged: https://github.com/rust-psutil/rust-psutil/pull/93 +# TODO: Even once the above PR is corrected, there are sub-dependencies that need to be updated. # psutil = { version = "3.2.0", optional = true } -psutil = { git = "https://github.com/sigp/rust-psutil", rev = "3b42f01273b446128b572aa4fdb9b08f5da5f1d7", optional = true } +psutil = { git = "https://github.com/sigp/rust-psutil", rev = "b3e44bc7ec5d545b8cb8ad4e3dffe074b6e6336b", optional = true } procinfo = { version = "0.4.2", optional = true } [features] diff --git a/common/hashset_delay/Cargo.toml b/common/hashset_delay/Cargo.toml index 8e7d35f5d..a416b43f8 100644 --- a/common/hashset_delay/Cargo.toml +++ b/common/hashset_delay/Cargo.toml @@ -9,4 +9,4 @@ futures = "0.3.7" tokio-util = { version = "0.6.2", features = ["time"] } [dev-dependencies] -tokio = { version = "1.10.0", features = ["time", "rt-multi-thread", "macros"] } +tokio = { version = "1.14.0", features = ["time", "rt-multi-thread", "macros"] } diff --git a/common/monitoring_api/Cargo.toml b/common/monitoring_api/Cargo.toml index 0a645b852..7812e5ada 100644 --- a/common/monitoring_api/Cargo.toml +++ b/common/monitoring_api/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] reqwest = { version = "0.11.0", features = ["json","stream"] } task_executor = { path = "../task_executor" } -tokio = "1.10.0" +tokio = "1.14.0" eth2 = {path = "../eth2"} serde_json = "1.0.58" serde = "1.0.116" diff --git a/common/task_executor/Cargo.toml b/common/task_executor/Cargo.toml index 7a6ae269c..db5c2e7b0 100644 --- a/common/task_executor/Cargo.toml +++ b/common/task_executor/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Sigma Prime "] edition = "2018" [dependencies] -tokio = { version = "1.10.0", features = ["rt"] } +tokio = { version = "1.14.0", features = ["rt"] } slog = "2.5.2" futures = "0.3.7" exit-future = "0.2.0" diff --git a/common/warp_utils/Cargo.toml b/common/warp_utils/Cargo.toml index dcd6bebc6..f99d7773b 100644 --- a/common/warp_utils/Cargo.toml +++ b/common/warp_utils/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -warp = { git = "https://github.com/macladson/warp", rev ="dfa259e" } +warp = "0.3.2" eth2 = { path = "../eth2" } types = { path = "../../consensus/types" } beacon_chain = { path = "../../beacon_node/beacon_chain" } state_processing = { path = "../../consensus/state_processing" } safe_arith = { path = "../../consensus/safe_arith" } serde = { version = "1.0.116", features = ["derive"] } -tokio = { version = "1.10.0", features = ["sync"] } +tokio = { version = "1.14.0", features = ["sync"] } headers = "0.3.2" lighthouse_metrics = { path = "../lighthouse_metrics" } lazy_static = "1.4.0" diff --git a/lighthouse/environment/Cargo.toml b/lighthouse/environment/Cargo.toml index a0d8d534c..29fb17303 100644 --- a/lighthouse/environment/Cargo.toml +++ b/lighthouse/environment/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -tokio = { version = "1.10.0", features = ["macros", "rt", "rt-multi-thread", "signal" ] } +tokio = { version = "1.14.0", features = ["macros", "rt", "rt-multi-thread", "signal" ] } slog = { version = "2.5.2", features = ["max_level_trace"] } sloggers = "2.0.2" types = { path = "../../consensus/types" } diff --git a/slasher/service/Cargo.toml b/slasher/service/Cargo.toml index 071e0da5c..9aef23f4d 100644 --- a/slasher/service/Cargo.toml +++ b/slasher/service/Cargo.toml @@ -14,5 +14,5 @@ slog = "2.5.2" slot_clock = { path = "../../common/slot_clock" } state_processing = { path = "../../consensus/state_processing" } task_executor = { path = "../../common/task_executor" } -tokio = { version = "1.10.0", features = ["full"] } +tokio = { version = "1.14.0", features = ["full"] } types = { path = "../../consensus/types" } diff --git a/testing/eth1_test_rig/Cargo.toml b/testing/eth1_test_rig/Cargo.toml index 2fdf7bf7b..a04f63f37 100644 --- a/testing/eth1_test_rig/Cargo.toml +++ b/testing/eth1_test_rig/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -tokio = { version = "1.10.0", features = ["time"] } +tokio = { version = "1.14.0", features = ["time"] } web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } types = { path = "../../consensus/types"} serde_json = "1.0.58" diff --git a/testing/simulator/Cargo.toml b/testing/simulator/Cargo.toml index 66efa3189..78919c8e7 100644 --- a/testing/simulator/Cargo.toml +++ b/testing/simulator/Cargo.toml @@ -12,7 +12,7 @@ eth1 = {path = "../../beacon_node/eth1"} types = { path = "../../consensus/types" } parking_lot = "0.11.0" futures = "0.3.7" -tokio = "1.10.0" +tokio = "1.14.0" eth1_test_rig = { path = "../eth1_test_rig" } env_logger = "0.9.0" clap = "2.33.3" diff --git a/testing/web3signer_tests/Cargo.toml b/testing/web3signer_tests/Cargo.toml index c5d901534..16a4b1b10 100644 --- a/testing/web3signer_tests/Cargo.toml +++ b/testing/web3signer_tests/Cargo.toml @@ -13,7 +13,7 @@ build = "build.rs" eth2_keystore = { path = "../../crypto/eth2_keystore" } types = { path = "../../consensus/types" } tempfile = "3.1.0" -tokio = { version = "1.10.0", features = ["rt-multi-thread", "macros"] } +tokio = { version = "1.14.0", features = ["rt-multi-thread", "macros"] } reqwest = { version = "0.11.0", features = ["json","stream"] } url = "2.2.2" validator_client = { path = "../../validator_client" } @@ -29,7 +29,7 @@ serde_yaml = "0.8.13" eth2_network_config = { path = "../../common/eth2_network_config" } [build-dependencies] -tokio = { version = "1.10.0", features = ["rt-multi-thread", "macros"] } +tokio = { version = "1.14.0", features = ["rt-multi-thread", "macros"] } reqwest = { version = "0.11.0", features = ["json","stream"] } serde_json = "1.0.58" zip = "0.5.13" diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index d1b212cc7..d48443b5c 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -9,7 +9,7 @@ name = "validator_client" path = "src/lib.rs" [dev-dependencies] -tokio = { version = "1.10.0", features = ["time", "rt-multi-thread", "macros"] } +tokio = { version = "1.14.0", features = ["time", "rt-multi-thread", "macros"] } [dependencies] tree_hash = "0.4.0" @@ -23,7 +23,7 @@ serde_derive = "1.0.116" bincode = "1.3.1" serde_json = "1.0.58" slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } -tokio = { version = "1.10.0", features = ["time"] } +tokio = { version = "1.14.0", features = ["time"] } futures = "0.3.7" dirs = "3.0.1" directory = { path = "../common/directory" } @@ -43,7 +43,7 @@ eth2_keystore = { path = "../crypto/eth2_keystore" } account_utils = { path = "../common/account_utils" } lighthouse_version = { path = "../common/lighthouse_version" } warp_utils = { path = "../common/warp_utils" } -warp = { git = "https://github.com/macladson/warp", rev ="dfa259e" } +warp = "0.3.2" hyper = "0.14.4" eth2_serde_utils = "0.1.0" libsecp256k1 = "0.6.0"