From 6d7fd0473ef15acc8b6e1485a872967c6bb5824b Mon Sep 17 00:00:00 2001 From: Diva M Date: Wed, 26 Jul 2023 18:15:28 -0500 Subject: [PATCH] restore libp2p version to published crates + cargo update for bug fixes --- Cargo.lock | 168 +++++++++------------- beacon_node/lighthouse_network/Cargo.toml | 3 +- 2 files changed, 68 insertions(+), 103 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b148a4997bd..db8ffaaa8c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1682,7 +1682,7 @@ dependencies = [ "hex", "hkdf", "lazy_static", - "libp2p-core 0.40.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core", "libp2p-identity", "lru 0.7.8", "more-asserts", @@ -3897,8 +3897,9 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.52.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +version = "0.52.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38039ba2df4f3255842050845daef4a004cc1f26da03dbc645535088b51910ef" dependencies = [ "bytes", "futures", @@ -3907,7 +3908,7 @@ dependencies = [ "instant", "libp2p-allow-block-list", "libp2p-connection-limits", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-dns", "libp2p-gossipsub", "libp2p-identify", @@ -3927,9 +3928,10 @@ dependencies = [ [[package]] name = "libp2p-allow-block-list" version = "0.2.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311" dependencies = [ - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "libp2p-swarm", "void", @@ -3937,10 +3939,11 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" -version = "0.2.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58" dependencies = [ - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "libp2p-swarm", "void", @@ -3961,40 +3964,13 @@ dependencies = [ "log", "multiaddr 0.18.0", "multihash 0.19.0", - "multistream-select 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select", "once_cell", "parking_lot 0.12.1", "pin-project", "quick-protobuf", "rand 0.8.5", - "rw-stream-sink 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 1.11.0", - "thiserror", - "unsigned-varint 0.7.1", - "void", -] - -[[package]] -name = "libp2p-core" -version = "0.40.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" -dependencies = [ - "either", - "fnv", - "futures", - "futures-timer", - "instant", - "libp2p-identity", - "log", - "multiaddr 0.18.0", - "multihash 0.19.0", - "multistream-select 0.13.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", - "once_cell", - "parking_lot 0.12.1", - "pin-project", - "quick-protobuf", - "rand 0.8.5", - "rw-stream-sink 0.4.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "rw-stream-sink", "smallvec 1.11.0", "thiserror", "unsigned-varint 0.7.1", @@ -4004,10 +3980,11 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.40.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd4394c81c0c06d7b4a60f3face7e8e8a9b246840f98d2c80508d0721b032147" dependencies = [ "futures", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "log", "parking_lot 0.12.1", @@ -4018,7 +3995,8 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.45.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e378da62e8c9251f6e885ed173a561663f29b251e745586cf6ae6150b295c37" dependencies = [ "asynchronous-codec", "base64 0.21.2", @@ -4031,7 +4009,7 @@ dependencies = [ "getrandom 0.2.10", "hex_fmt", "instant", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "libp2p-swarm", "log", @@ -4049,13 +4027,14 @@ dependencies = [ [[package]] name = "libp2p-identify" version = "0.43.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a29675a32dbcc87790db6cf599709e64308f1ae9d5ecea2d259155889982db8" dependencies = [ "asynchronous-codec", "either", "futures", "futures-timer", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "libp2p-swarm", "log", @@ -4069,9 +4048,9 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2874d9c6575f1d7a151022af5c42bb0ffdcdfbafe0a6fd039de870b384835a2" +checksum = "a38d6012784fe4cc14e6d443eb415b11fc7c456dc15d9f0d90d9b70bc7ac3ec1" dependencies = [ "asn1_der", "bs58 0.5.0", @@ -4092,12 +4071,13 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.44.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a" dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "libp2p-swarm", "log", @@ -4112,10 +4092,11 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.13.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3787ea81798dcc5bf1d8b40a8e8245cf894b168d04dd70aa48cb3ff2fff141d2" dependencies = [ "instant", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-gossipsub", "libp2p-identify", "libp2p-identity", @@ -4127,12 +4108,13 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.43.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87945db2b3f977af09b62b9aa0a5f3e4870995a577ecd845cdeba94cdf6bbca7" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "log", "multiaddr 0.18.0", @@ -4151,12 +4133,13 @@ dependencies = [ [[package]] name = "libp2p-plaintext" version = "0.40.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37266c683a757df713f7dcda0cdcb5ad4681355ffa1b37b77c113c176a531195" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "log", "quick-protobuf", @@ -4165,19 +4148,20 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.43.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +version = "0.43.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43106820057e0f65c77b01a3873593f66e676da4e40c70c3a809b239109f1d30" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", "log", - "multistream-select 0.13.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "multistream-select", "once_cell", "rand 0.8.5", "smallvec 1.11.0", @@ -4188,7 +4172,8 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" version = "0.33.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" dependencies = [ "heck", "proc-macro-warning", @@ -4200,13 +4185,14 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.40.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09bfdfb6f945c5c014b87872a0bdb6e0aef90e92f380ef57cd9013f118f9289d" dependencies = [ "futures", "futures-timer", "if-watch", "libc", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "log", "socket2 0.5.3", @@ -4216,17 +4202,18 @@ dependencies = [ [[package]] name = "libp2p-websocket" version = "0.42.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956d981ebc84abc3377e5875483c06d94ff57bc6b25f725047f9fd52592f72d4" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "libp2p-identity", "log", "parking_lot 0.12.1", "quicksink", - "rw-stream-sink 0.4.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "rw-stream-sink", "soketto", "url", "webpki-roots 0.23.1", @@ -4235,10 +4222,11 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.44.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a9b42ab6de15c6f076d8fb11dc5f48d899a10b55a2e16b12be9012a05287b0" dependencies = [ "futures", - "libp2p-core 0.40.0 (git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a)", + "libp2p-core", "log", "thiserror", "yamux", @@ -4305,9 +4293,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.10" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e6ab01971eb092ffe6a7d42f49f9ff42662f17604681e2843ad65077ba47dc" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -4922,19 +4910,6 @@ dependencies = [ "unsigned-varint 0.7.1", ] -[[package]] -name = "multistream-select" -version = "0.13.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" -dependencies = [ - "bytes", - "futures", - "log", - "pin-project", - "smallvec 1.11.0", - "unsigned-varint 0.7.1", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -5996,7 +5971,8 @@ dependencies = [ [[package]] name = "quick-protobuf-codec" version = "0.2.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" dependencies = [ "asynchronous-codec", "bytes", @@ -6508,7 +6484,7 @@ checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", - "rustls-webpki 0.101.1", + "rustls-webpki 0.101.2", "sct 0.7.0", ] @@ -6533,9 +6509,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.1" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" dependencies = [ "ring", "untrusted", @@ -6558,16 +6534,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "rw-stream-sink" -version = "0.4.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=58e2afa50da8de9abb28cc96eb76e2753074514a#58e2afa50da8de9abb28cc96eb76e2753074514a" -dependencies = [ - "futures", - "pin-project", - "static_assertions", -] - [[package]] name = "ryu" version = "1.0.15" @@ -6779,9 +6745,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.175" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] @@ -6819,9 +6785,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", @@ -6830,9 +6796,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", diff --git a/beacon_node/lighthouse_network/Cargo.toml b/beacon_node/lighthouse_network/Cargo.toml index b8bae3b4cef..f71845fed25 100644 --- a/beacon_node/lighthouse_network/Cargo.toml +++ b/beacon_node/lighthouse_network/Cargo.toml @@ -46,8 +46,7 @@ delay_map = "0.3.0" void = "1" [dependencies.libp2p] -git = "https://github.com/sigp/rust-libp2p" -rev = "58e2afa50da8de9abb28cc96eb76e2753074514a" +version = "0.52" default-features = false features = ["websocket", "identify", "yamux", "noise", "gossipsub", "dns", "tcp", "tokio", "plaintext", "secp256k1", "macros", "ecdsa"]