cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

update libp2p (#3233)

Browse Source 
## Issue Addressed
na

## Proposed Changes
Updates libp2p to https://github.com/libp2p/rust-libp2p/pull/2662

## Additional Info
From comments on the relevant PRs listed, we should pay attention at peer management consistency, but I don't think anything weird will happen.
This is running in prater tok and sin
This commit is contained in:
Divma 2022-06-07 02:35:55 +00:00
parent 54cf94ea59
commit 58e223e429
2 changed files with 169 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
Cargo.lock generated
View File

@ -202,15 +202,6 @@ dependencies = [
"pin-project-lite 0.2.8",
]
[[package]]
name = "atomic"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
dependencies = [
"autocfg 1.1.0",
]
[[package]]
name = "attohttpc"
version = "0.10.1"
@ -1466,9 +1457,9 @@ dependencies = [
[[package]]
name = "enum-as-inner"
version = "0.3.4"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4"
checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
dependencies = [
"heck 0.4.0",
"proc-macro2",
@ -2599,7 +2590,7 @@ dependencies = [
"httpdate",
"itoa 1.0.1",
"pin-project-lite 0.2.8",
"socket2 0.4.4",
"socket2",
"tokio",
"tower-service",
"tracing",
@ -2766,14 +2757,14 @@ dependencies = [
[[package]]
name = "ipconfig"
version = "0.2.2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
dependencies = [
"socket2 0.3.19",
"widestring",
"socket2",
"widestring 0.5.1",
"winapi",
"winreg 0.6.2",
"winreg 0.7.0",
]
[[package]]
@ -3003,18 +2994,17 @@ dependencies = [
[[package]]
name = "libp2p"
version = "0.43.0"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e8570e25fa03d4385405dbeaf540ba00e3ee50942f03d84e1a8928a029f35f9"
checksum = "f3541a9b837ea166d91b6f54e9e3264ac94f0af7f7b51a78dadd52912e7bdba6"
dependencies = [
"atomic",
"bytes",
"futures",
"futures-timer",
"getrandom 0.2.6",
"instant",
"lazy_static",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"libp2p-dns",
"libp2p-gossipsub",
"libp2p-identify",
@ -3056,11 +3046,11 @@ dependencies = [
"multistream-select 0.10.4",
"parking_lot 0.11.2",
"pin-project 1.0.10",
"prost",
"prost-build",
"prost 0.9.0",
"prost-build 0.9.0",
"rand 0.8.5",
"ring",
"rw-stream-sink",
"rw-stream-sink 0.2.1",
"sha2 0.9.9",
"smallvec",
"thiserror",
@ -3071,9 +3061,9 @@ dependencies = [
[[package]]
name = "libp2p-core"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9164ec41455856e8187addc870bb4fe1ea2ee28e1a9244831d449a2429b32c1a"
checksum = "42d46fca305dee6757022e2f5a4f6c023315084d0ed7441c3ab244e76666d979"
dependencies = [
"asn1_der",
"bs58",
@ -3091,11 +3081,11 @@ dependencies = [
"multistream-select 0.11.0",
"parking_lot 0.12.0",
"pin-project 1.0.10",
"prost",
"prost-build",
"prost 0.10.4",
"prost-build 0.10.4",
"rand 0.8.5",
"ring",
"rw-stream-sink",
"rw-stream-sink 0.3.0",
"sha2 0.10.2",
"smallvec",
"thiserror",
@ -3106,22 +3096,23 @@ dependencies = [
[[package]]
name = "libp2p-dns"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7838647d33978b77f943687412f4a39e74234c8342cbfdad14282b465b272cb4"
checksum = "fbb462ec3a51fab457b4b44ac295e8b0a4b04dc175127e615cf996b1f0f1a268"
dependencies = [
"futures",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"parking_lot 0.12.0",
"smallvec",
"trust-dns-resolver",
]
[[package]]
name = "libp2p-gossipsub"
version = "0.36.0"
version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f62943fba0b0dae02b87868620c52a581c54ec9fb04b5e195cf20313fc510c3"
checksum = "c9be947d8cea8e6b469201314619395826896d2c051053c3723910ba98e68e04"
dependencies = [
"asynchronous-codec",
"base64",
@ -3131,12 +3122,12 @@ dependencies = [
"futures",
"hex_fmt",
"instant",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"libp2p-swarm",
"log",
"prometheus-client",
"prost",
"prost-build",
"prost 0.10.4",
"prost-build 0.10.4",
"rand 0.7.3",
"regex",
"sha2 0.10.2",
@ -3147,28 +3138,31 @@ dependencies = [
[[package]]
name = "libp2p-identify"
version = "0.34.0"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f219b4d4660fe3a04bf5fe6b5970902b7c1918e25b2536be8c70efc480f88f8"
checksum = "40ad878c9b15bbc629b0c0cef57f59e8b37fa3f4f0e5ce11ff2bca42aae62e38"
dependencies = [
"asynchronous-codec",
"futures",
"futures-timer",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"libp2p-swarm",
"log",
"lru",
"prost",
"prost-build",
"prost 0.10.4",
"prost-build 0.10.4",
"prost-codec",
"smallvec",
"thiserror",
]
[[package]]
name = "libp2p-metrics"
version = "0.4.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29e4e5e4c5aa567fe1ee3133afe088dc2d2fd104e20c5c2c5c2649f75129677"
checksum = "adc4357140141ba9739eee71b20aa735351c0fc642635b2bffc7f57a6b5c1090"
dependencies = [
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"libp2p-gossipsub",
"libp2p-identify",
"libp2p-swarm",
@ -3177,14 +3171,14 @@ dependencies = [
[[package]]
name = "libp2p-mplex"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160"
checksum = "5ff9c893f2367631a711301d703c47432af898c9bb8253bea0e2c051a13f7640"
dependencies = [
"asynchronous-codec",
"bytes",
"futures",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"nohash-hasher",
"parking_lot 0.12.0",
@ -3195,18 +3189,18 @@ dependencies = [
[[package]]
name = "libp2p-noise"
version = "0.35.0"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef"
checksum = "cf2cee1dad1c83325bbd182a8e94555778699cec8a9da00086efb7522c4c15ad"
dependencies = [
"bytes",
"curve25519-dalek 3.2.0",
"futures",
"lazy_static",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"prost",
"prost-build",
"prost 0.10.4",
"prost-build 0.10.4",
"rand 0.8.5",
"sha2 0.10.2",
"snow",
@ -3217,33 +3211,33 @@ dependencies = [
[[package]]
name = "libp2p-plaintext"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe"
checksum = "db007e737adc5d28b2e03223b0210164928ad742591127130796a72aa8eaf54f"
dependencies = [
"asynchronous-codec",
"bytes",
"futures",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"prost",
"prost-build",
"prost 0.10.4",
"prost-build 0.10.4",
"unsigned-varint 0.7.1",
"void",
]
[[package]]
name = "libp2p-swarm"
version = "0.34.0"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53ab2d4eb8ef2966b10fdf859245cdd231026df76d3c6ed2cf9e418a8f688ec9"
checksum = "e8863c7e17641622969ffeab84e338481a8c75e4bce40f18f27822127e975f4b"
dependencies = [
"either",
"fnv",
"futures",
"futures-timer",
"instant",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"pin-project 1.0.10",
"rand 0.7.3",
@ -3264,34 +3258,35 @@ dependencies = [
[[package]]
name = "libp2p-tcp"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c"
checksum = "4f4933e38ef21b50698aefc87799c24f2a365c9d3f6cf50471f3f6a0bc410892"
dependencies = [
"futures",
"futures-timer",
"if-addrs 0.7.0",
"ipnet",
"libc",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"socket2 0.4.4",
"socket2",
"tokio",
]
[[package]]
name = "libp2p-websocket"
version = "0.34.0"
version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37"
checksum = "39d398fbb29f432c4128fabdaac2ed155c3bcaf1b9bd40eeeb10a471eefacbf5"
dependencies = [
"either",
"futures",
"futures-rustls",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"log",
"parking_lot 0.12.0",
"quicksink",
"rw-stream-sink",
"rw-stream-sink 0.3.0",
"soketto",
"url",
"webpki-roots",
@ -3299,12 +3294,12 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517"
checksum = "8fe653639ad74877c759720febb0cbcbf4caa221adde4eed2d3126ce5c6f381f"
dependencies = [
"futures",
"libp2p-core 0.32.0",
"libp2p-core 0.33.0",
"parking_lot 0.12.0",
"thiserror",
"yamux",
@ -4578,9 +4573,9 @@ dependencies = [
[[package]]
name = "prometheus-client"
version = "0.15.1"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34"
checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825"
dependencies = [
"dtoa",
"itoa 1.0.1",
@ -4606,7 +4601,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [
"bytes",
"prost-derive",
"prost-derive 0.9.0",
]
[[package]]
name = "prost"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
dependencies = [
"bytes",
"prost-derive 0.10.1",
]
[[package]]
@ -4622,13 +4627,48 @@ dependencies = [
"log",
"multimap",
"petgraph",
"prost",
"prost-types",
"prost 0.9.0",
"prost-types 0.9.0",
"regex",
"tempfile",
"which",
]
[[package]]
name = "prost-build"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
dependencies = [
"bytes",
"cfg-if",
"cmake",
"heck 0.4.0",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost 0.10.4",
"prost-types 0.10.1",
"regex",
"tempfile",
"which",
]
[[package]]
name = "prost-codec"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007"
dependencies = [
"asynchronous-codec",
"bytes",
"prost 0.10.4",
"thiserror",
"unsigned-varint 0.7.1",
]
[[package]]
name = "prost-derive"
version = "0.9.0"
@ -4642,6 +4682,19 @@ dependencies = [
"syn",
]
[[package]]
name = "prost-derive"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
dependencies = [
"anyhow",
"itertools",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "prost-types"
version = "0.9.0"
@ -4649,7 +4702,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes",
"prost",
"prost 0.9.0",
]
[[package]]
name = "prost-types"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
dependencies = [
"bytes",
"prost 0.10.4",
]
[[package]]
@ -5152,6 +5215,17 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "rw-stream-sink"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04"
dependencies = [
"futures",
"pin-project 1.0.10",
"static_assertions",
]
[[package]]
name = "ryu"
version = "1.0.9"
@ -5779,17 +5853,6 @@ dependencies = [
"subtle",
]
[[package]]
name = "socket2"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [
"cfg-if",
"libc",
"winapi",
]
[[package]]
name = "socket2"
version = "0.4.4"
@ -6242,7 +6305,7 @@ dependencies = [
"parking_lot 0.12.0",
"pin-project-lite 0.2.8",
"signal-hook-registry",
"socket2 0.4.4",
"socket2",
"tokio-macros",
"winapi",
]
@ -6467,9 +6530,9 @@ dependencies = [
[[package]]
name = "trust-dns-proto"
version = "0.20.4"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31"
checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
dependencies = [
"async-trait",
"cfg-if",
@ -6492,9 +6555,9 @@ dependencies = [
[[package]]
name = "trust-dns-resolver"
version = "0.20.4"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a"
checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
dependencies = [
"cfg-if",
"futures-util",
@ -6502,7 +6565,7 @@ dependencies = [
"lazy_static",
"log",
"lru-cache",
"parking_lot 0.11.2",
"parking_lot 0.12.0",
"resolv-conf",
"smallvec",
"thiserror",
@ -7150,6 +7213,12 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
[[package]]
name = "widestring"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
[[package]]
name = "winapi"
version = "0.3.9"
@ -7189,7 +7258,7 @@ checksum = "177b1723986bcb4c606058e77f6e8614b51c7f9ad2face6f6fd63dd5c8b3cec3"
dependencies = [
"field-offset",
"libc",
"widestring",
"widestring 0.4.3",
"winapi",
]
@ -7238,9 +7307,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
[[package]]
name = "winreg"
version = "0.6.2"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
dependencies = [
"winapi",
]

4
beacon_node/lighthouse_network/Cargo.toml
View File

@ -38,11 +38,11 @@ directory = { path = "../../common/directory" }
regex = "1.5.5"
strum = { version = "0.24.0", features = ["derive"] }
superstruct = "0.5.0"
prometheus-client = "0.15.0"
prometheus-client = "0.16.0"
unused_port = { path = "../../common/unused_port" }
[dependencies.libp2p]
version = "0.43.0"
version = "0.45.0"
default-features = false
features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns-tokio", "tcp-tokio", "plaintext", "secp256k1"]