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

Update libp2p (#1865)

Browse Source 
Updates libp2p to the latest version. 

This adds tokio 0.3 support and brings back yamux support. 

This also updates some discv5 configuration parameters for leaner discovery queries
This commit is contained in:
Age Manning 2020-11-06 04:14:14 +00:00
parent 4c4dad9fb5
commit e2ae5010a6
7 changed files with 272 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
Cargo.lock generated
View File

@ -161,9 +161,9 @@ checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.14" version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -193,9 +193,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.33" version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
[[package]] [[package]]
name = "arbitrary" name = "arbitrary"
@ -321,9 +321,9 @@ dependencies = [
[[package]] [[package]]
name = "base-x" name = "base-x"
version = "0.2.6" version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" checksum = "c2734baf8ed08920ccecce1b48a2dfce4ac74a973144add031163bd21a1c5dab"
[[package]] [[package]]
name = "base64" name = "base64"
@ -422,7 +422,7 @@ dependencies = [
"futures 0.3.7", "futures 0.3.7",
"genesis", "genesis",
"hex", "hex",
"hyper 0.13.8", "hyper 0.13.9",
"lighthouse_version", "lighthouse_version",
"logging", "logging",
"node_test_rig", "node_test_rig",
@ -725,12 +725,6 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "c_linked_list"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
[[package]] [[package]]
name = "cached_tree_hash" name = "cached_tree_hash"
version = "0.1.0" version = "0.1.0"
@ -962,9 +956,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
[[package]] [[package]]
name = "core-foundation" name = "core-foundation"
version = "0.7.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -972,9 +966,9 @@ dependencies = [
[[package]] [[package]]
name = "core-foundation-sys" name = "core-foundation-sys"
version = "0.7.0" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
[[package]] [[package]]
name = "cpuid-bool" name = "cpuid-bool"
@ -1170,9 +1164,9 @@ dependencies = [
[[package]] [[package]]
name = "csv" name = "csv"
version = "1.1.3" version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279" checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
dependencies = [ dependencies = [
"bstr", "bstr",
"csv-core", "csv-core",
@ -1263,7 +1257,7 @@ dependencies = [
"hex", "hex",
"reqwest", "reqwest",
"serde_json", "serde_json",
"sha2 0.9.1", "sha2 0.9.2",
"tree_hash", "tree_hash",
"types", "types",
] ]
@ -1388,7 +1382,7 @@ dependencies = [
"parking_lot 0.11.0", "parking_lot 0.11.0",
"rand 0.7.3", "rand 0.7.3",
"rlp", "rlp",
"sha2 0.9.1", "sha2 0.9.2",
"smallvec 1.4.2", "smallvec 1.4.2",
"socket2", "socket2",
"tokio 0.2.22", "tokio 0.2.22",
@ -1420,7 +1414,7 @@ dependencies = [
"parking_lot 0.11.0", "parking_lot 0.11.0",
"rand 0.7.3", "rand 0.7.3",
"rlp", "rlp",
"sha2 0.9.1", "sha2 0.9.2",
"smallvec 1.4.2", "smallvec 1.4.2",
"socket2", "socket2",
"tokio 0.2.22", "tokio 0.2.22",
@ -1466,7 +1460,7 @@ dependencies = [
"ed25519", "ed25519",
"rand 0.7.3", "rand 0.7.3",
"serde", "serde",
"sha2 0.9.1", "sha2 0.9.2",
"zeroize", "zeroize",
] ]
@ -1672,7 +1666,7 @@ dependencies = [
"lazy_static", "lazy_static",
"ring", "ring",
"rustc-hex", "rustc-hex",
"sha2 0.9.1", "sha2 0.9.2",
"wasm-bindgen-test", "wasm-bindgen-test",
] ]
@ -1699,7 +1693,7 @@ dependencies = [
"hex", "hex",
"num-bigint-dig", "num-bigint-dig",
"ring", "ring",
"sha2 0.9.1", "sha2 0.9.2",
"zeroize", "zeroize",
] ]
@ -1719,7 +1713,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
"sha2 0.9.1", "sha2 0.9.2",
"tempfile", "tempfile",
"uuid", "uuid",
"zeroize", "zeroize",
@ -1752,7 +1746,7 @@ dependencies = [
"regex", "regex",
"serde", "serde",
"serde_derive", "serde_derive",
"sha2 0.9.1", "sha2 0.9.2",
"slog", "slog",
"slog-async", "slog-async",
"slog-term", "slog-term",
@ -2169,12 +2163,6 @@ dependencies = [
"pin-project 0.4.27", "pin-project 0.4.27",
] ]
[[package]]
name = "gcc"
version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
[[package]] [[package]]
name = "generator" name = "generator"
version = "0.6.23" version = "0.6.23"
@ -2231,28 +2219,6 @@ dependencies = [
"types", "types",
] ]
[[package]]
name = "get_if_addrs"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7"
dependencies = [
"c_linked_list",
"get_if_addrs-sys",
"libc",
"winapi 0.2.8",
]
[[package]]
name = "get_if_addrs-sys"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48"
dependencies = [
"gcc",
"libc",
]
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.1.15" version = "0.1.15"
@ -2664,9 +2630,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "0.13.8" version = "0.13.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
dependencies = [ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"futures-channel", "futures-channel",
@ -2678,7 +2644,7 @@ dependencies = [
"httparse", "httparse",
"httpdate", "httpdate",
"itoa", "itoa",
"pin-project 0.4.27", "pin-project 1.0.1",
"socket2", "socket2",
"tokio 0.2.22", "tokio 0.2.22",
"tower-service", "tower-service",
@ -2706,7 +2672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
dependencies = [ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"hyper 0.13.8", "hyper 0.13.9",
"native-tls", "native-tls",
"tokio 0.2.22", "tokio 0.2.22",
"tokio-tls 0.3.1", "tokio-tls 0.3.1",
@ -2734,6 +2700,27 @@ dependencies = [
"unicode-normalization", "unicode-normalization",
] ]
[[package]]
name = "if-addrs"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48"
dependencies = [
"if-addrs-sys",
"libc",
"winapi 0.3.9",
]
[[package]]
name = "if-addrs-sys"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea"
dependencies = [
"cc",
"libc",
]
[[package]] [[package]]
name = "igd" name = "igd"
version = "0.11.1" version = "0.11.1"
@ -2890,7 +2877,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"ecdsa", "ecdsa",
"elliptic-curve", "elliptic-curve",
"sha2 0.9.1", "sha2 0.9.2",
] ]
[[package]] [[package]]
@ -3017,14 +3004,14 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]] [[package]]
name = "libp2p" name = "libp2p"
version = "0.29.0" version = "0.30.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"atomic", "atomic",
"bytes 0.5.6", "bytes 0.5.6",
"futures 0.3.7", "futures 0.3.7",
"lazy_static", "lazy_static",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"libp2p-core-derive", "libp2p-core-derive",
"libp2p-dns", "libp2p-dns",
"libp2p-gossipsub", "libp2p-gossipsub",
@ -3034,10 +3021,11 @@ dependencies = [
"libp2p-swarm", "libp2p-swarm",
"libp2p-tcp", "libp2p-tcp",
"libp2p-websocket", "libp2p-websocket",
"libp2p-yamux",
"multihash", "multihash",
"parity-multiaddr 0.9.3 (git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669)", "parity-multiaddr 0.9.3 (git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a)",
"parking_lot 0.11.0", "parking_lot 0.11.0",
"pin-project 0.4.27", "pin-project 1.0.1",
"smallvec 1.4.2", "smallvec 1.4.2",
"wasm-timer", "wasm-timer",
] ]
@ -3059,7 +3047,7 @@ dependencies = [
"libsecp256k1", "libsecp256k1",
"log 0.4.11", "log 0.4.11",
"multihash", "multihash",
"multistream-select 0.8.4", "multistream-select 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-multiaddr 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-multiaddr 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.10.2", "parking_lot 0.10.2",
"pin-project 0.4.27", "pin-project 0.4.27",
@ -3078,8 +3066,8 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-core" name = "libp2p-core"
version = "0.22.2" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"asn1_der", "asn1_der",
"bs58", "bs58",
@ -3092,16 +3080,16 @@ dependencies = [
"libsecp256k1", "libsecp256k1",
"log 0.4.11", "log 0.4.11",
"multihash", "multihash",
"multistream-select 0.8.3", "multistream-select 0.8.4 (git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a)",
"parity-multiaddr 0.9.3 (git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669)", "parity-multiaddr 0.9.3 (git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a)",
"parking_lot 0.11.0", "parking_lot 0.11.0",
"pin-project 0.4.27", "pin-project 1.0.1",
"prost", "prost",
"prost-build", "prost-build",
"rand 0.7.3", "rand 0.7.3",
"ring", "ring",
"rw-stream-sink", "rw-stream-sink",
"sha2 0.9.1", "sha2 0.9.2",
"smallvec 1.4.2", "smallvec 1.4.2",
"thiserror", "thiserror",
"unsigned-varint 0.5.1", "unsigned-varint 0.5.1",
@ -3112,7 +3100,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-core-derive" name = "libp2p-core-derive"
version = "0.20.2" version = "0.20.2"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"quote", "quote",
"syn", "syn",
@ -3120,33 +3108,33 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-dns" name = "libp2p-dns"
version = "0.22.0" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"futures 0.3.7", "futures 0.3.7",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"log 0.4.11", "log 0.4.11",
] ]
[[package]] [[package]]
name = "libp2p-gossipsub" name = "libp2p-gossipsub"
version = "0.22.1" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"base64 0.12.3", "base64 0.13.0",
"byteorder", "byteorder",
"bytes 0.5.6", "bytes 0.5.6",
"fnv", "fnv",
"futures 0.3.7", "futures 0.3.7",
"futures_codec", "futures_codec",
"hex_fmt", "hex_fmt",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"libp2p-swarm", "libp2p-swarm",
"log 0.4.11", "log 0.4.11",
"prost", "prost",
"prost-build", "prost-build",
"rand 0.7.3", "rand 0.7.3",
"sha2 0.9.1", "sha2 0.9.2",
"smallvec 1.4.2", "smallvec 1.4.2",
"unsigned-varint 0.5.1", "unsigned-varint 0.5.1",
"wasm-timer", "wasm-timer",
@ -3154,11 +3142,11 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-identify" name = "libp2p-identify"
version = "0.22.0" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"futures 0.3.7", "futures 0.3.7",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"libp2p-swarm", "libp2p-swarm",
"log 0.4.11", "log 0.4.11",
"prost", "prost",
@ -3169,34 +3157,36 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-mplex" name = "libp2p-mplex"
version = "0.23.0" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"fnv",
"futures 0.3.7", "futures 0.3.7",
"futures_codec", "futures_codec",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"log 0.4.11", "log 0.4.11",
"nohash-hasher",
"parking_lot 0.11.0", "parking_lot 0.11.0",
"rand 0.7.3",
"smallvec 1.4.2",
"unsigned-varint 0.5.1", "unsigned-varint 0.5.1",
] ]
[[package]] [[package]]
name = "libp2p-noise" name = "libp2p-noise"
version = "0.24.1" version = "0.26.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"curve25519-dalek", "curve25519-dalek",
"futures 0.3.7", "futures 0.3.7",
"lazy_static", "lazy_static",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"log 0.4.11", "log 0.4.11",
"prost", "prost",
"prost-build", "prost-build",
"rand 0.7.3", "rand 0.7.3",
"sha2 0.9.1", "sha2 0.9.2",
"snow", "snow",
"static_assertions", "static_assertions",
"x25519-dalek", "x25519-dalek",
@ -3205,12 +3195,12 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-swarm" name = "libp2p-swarm"
version = "0.22.0" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"either", "either",
"futures 0.3.7", "futures 0.3.7",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"log 0.4.11", "log 0.4.11",
"rand 0.7.3", "rand 0.7.3",
"smallvec 1.4.2", "smallvec 1.4.2",
@ -3220,14 +3210,14 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-tcp" name = "libp2p-tcp"
version = "0.22.0" version = "0.24.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"futures 0.3.7", "futures 0.3.7",
"futures-timer", "futures-timer",
"get_if_addrs", "if-addrs",
"ipnet", "ipnet",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"log 0.4.11", "log 0.4.11",
"socket2", "socket2",
"tokio 0.2.22", "tokio 0.2.22",
@ -3235,13 +3225,13 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-websocket" name = "libp2p-websocket"
version = "0.23.1" version = "0.25.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"async-tls", "async-tls",
"either", "either",
"futures 0.3.7", "futures 0.3.7",
"libp2p-core 0.22.2", "libp2p-core 0.24.0",
"log 0.4.11", "log 0.4.11",
"quicksink", "quicksink",
"rustls", "rustls",
@ -3252,6 +3242,18 @@ dependencies = [
"webpki-roots", "webpki-roots",
] ]
[[package]]
name = "libp2p-yamux"
version = "0.27.0"
source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [
"futures 0.3.7",
"libp2p-core 0.24.0",
"parking_lot 0.11.0",
"thiserror",
"yamux",
]
[[package]] [[package]]
name = "libsecp256k1" name = "libsecp256k1"
version = "0.3.5" version = "0.3.5"
@ -3628,8 +3630,8 @@ dependencies = [
"blake2b_simd", "blake2b_simd",
"blake2s_simd", "blake2s_simd",
"digest 0.9.0", "digest 0.9.0",
"sha-1 0.9.1", "sha-1 0.9.2",
"sha2 0.9.1", "sha2 0.9.2",
"sha3", "sha3",
"unsigned-varint 0.5.1", "unsigned-varint 0.5.1",
] ]
@ -3658,19 +3660,6 @@ dependencies = [
"twoway", "twoway",
] ]
[[package]]
name = "multistream-select"
version = "0.8.3"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669"
dependencies = [
"bytes 0.5.6",
"futures 0.3.7",
"log 0.4.11",
"pin-project 0.4.27",
"smallvec 1.4.2",
"unsigned-varint 0.5.1",
]
[[package]] [[package]]
name = "multistream-select" name = "multistream-select"
version = "0.8.4" version = "0.8.4"
@ -3685,11 +3674,24 @@ dependencies = [
"unsigned-varint 0.5.1", "unsigned-varint 0.5.1",
] ]
[[package]]
name = "multistream-select"
version = "0.8.4"
source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [
"bytes 0.5.6",
"futures 0.3.7",
"log 0.4.11",
"pin-project 1.0.1",
"smallvec 1.4.2",
"unsigned-varint 0.5.1",
]
[[package]] [[package]]
name = "native-tls" name = "native-tls"
version = "0.2.4" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
@ -3727,9 +3729,9 @@ dependencies = [
"fnv", "fnv",
"futures 0.3.7", "futures 0.3.7",
"genesis", "genesis",
"get_if_addrs",
"hashset_delay", "hashset_delay",
"hex", "hex",
"if-addrs",
"igd", "igd",
"itertools 0.9.0", "itertools 0.9.0",
"lazy_static", "lazy_static",
@ -3797,6 +3799,12 @@ dependencies = [
"validator_dir", "validator_dir",
] ]
[[package]]
name = "nohash-hasher"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]] [[package]]
name = "nom" name = "nom"
version = "2.2.1" version = "2.2.1"
@ -3805,9 +3813,9 @@ checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff"
[[package]] [[package]]
name = "num-bigint" name = "num-bigint"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0" checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
dependencies = [ dependencies = [
"autocfg 1.0.1", "autocfg 1.0.1",
"num-integer", "num-integer",
@ -3986,7 +3994,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-multiaddr" name = "parity-multiaddr"
version = "0.9.3" version = "0.9.3"
source = "git+https://github.com/sigp/rust-libp2p?rev=8c6ce6eb1228de568568f6cd72fb134dea5f9669#8c6ce6eb1228de568568f6cd72fb134dea5f9669" source = "git+https://github.com/sigp/rust-libp2p?rev=de104a80c48f6e61bd7bdac8e17f809477fb4c4a#de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"bs58", "bs58",
@ -4759,7 +4767,7 @@ dependencies = [
"futures-util", "futures-util",
"http 0.2.1", "http 0.2.1",
"http-body 0.3.1", "http-body 0.3.1",
"hyper 0.13.8", "hyper 0.13.9",
"hyper-tls 0.4.3", "hyper-tls 0.4.3",
"ipnet", "ipnet",
"js-sys", "js-sys",
@ -4970,7 +4978,7 @@ checksum = "10e7e75e27e8cd47e4be027d4b9fdc0b696116f981c22de21ca7bad63a9cb33a"
dependencies = [ dependencies = [
"hmac 0.8.1", "hmac 0.8.1",
"pbkdf2 0.4.0", "pbkdf2 0.4.0",
"sha2 0.9.1", "sha2 0.9.2",
] ]
[[package]] [[package]]
@ -4981,7 +4989,7 @@ checksum = "3437654bbbe34054a268b3859fe41f871215069b39f0aef78808d85c37100696"
dependencies = [ dependencies = [
"hmac 0.9.0", "hmac 0.9.0",
"pbkdf2 0.5.0", "pbkdf2 0.5.0",
"sha2 0.9.1", "sha2 0.9.2",
] ]
[[package]] [[package]]
@ -5014,9 +5022,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "0.4.4" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
dependencies = [ dependencies = [
"bitflags 1.2.1", "bitflags 1.2.1",
"core-foundation", "core-foundation",
@ -5027,9 +5035,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework-sys" name = "security-framework-sys"
version = "0.4.3" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -5150,12 +5158,12 @@ dependencies = [
[[package]] [[package]]
name = "sha-1" name = "sha-1"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c"
dependencies = [ dependencies = [
"block-buffer 0.9.0", "block-buffer 0.9.0",
"cfg-if 0.1.10", "cfg-if 1.0.0",
"cpuid-bool", "cpuid-bool",
"digest 0.9.0", "digest 0.9.0",
"opaque-debug 0.3.0", "opaque-debug 0.3.0",
@ -5181,12 +5189,12 @@ dependencies = [
[[package]] [[package]]
name = "sha2" name = "sha2"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8"
dependencies = [ dependencies = [
"block-buffer 0.9.0", "block-buffer 0.9.0",
"cfg-if 0.1.10", "cfg-if 1.0.0",
"cpuid-bool", "cpuid-bool",
"digest 0.9.0", "digest 0.9.0",
"opaque-debug 0.3.0", "opaque-debug 0.3.0",
@ -5431,7 +5439,7 @@ dependencies = [
"rand_core 0.5.1", "rand_core 0.5.1",
"ring", "ring",
"rustc_version", "rustc_version",
"sha2 0.9.1", "sha2 0.9.2",
"subtle 2.3.0", "subtle 2.3.0",
"x25519-dalek", "x25519-dalek",
] ]
@ -5461,7 +5469,7 @@ dependencies = [
"httparse", "httparse",
"log 0.4.11", "log 0.4.11",
"rand 0.7.3", "rand 0.7.3",
"sha-1 0.9.1", "sha-1 0.9.2",
] ]
[[package]] [[package]]
@ -5756,18 +5764,18 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.21" version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.21" version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -6319,9 +6327,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-subscriber" name = "tracing-subscriber"
version = "0.2.14" version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2810660b9d5b18895d140caba6401765749a6a162e5d0736cfc44ea50db9d79d" checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401"
dependencies = [ dependencies = [
"ansi_term 0.12.1", "ansi_term 0.12.1",
"chrono", "chrono",
@ -6406,7 +6414,7 @@ dependencies = [
"input_buffer", "input_buffer",
"log 0.4.11", "log 0.4.11",
"rand 0.7.3", "rand 0.7.3",
"sha-1 0.9.1", "sha-1 0.9.2",
"url 2.1.1", "url 2.1.1",
"utf-8", "utf-8",
] ]
@ -6652,7 +6660,7 @@ dependencies = [
"exit-future", "exit-future",
"futures 0.3.7", "futures 0.3.7",
"hex", "hex",
"hyper 0.13.8", "hyper 0.13.9",
"libc", "libc",
"libsecp256k1", "libsecp256k1",
"lighthouse_version", "lighthouse_version",
@ -6769,7 +6777,7 @@ dependencies = [
"futures 0.3.7", "futures 0.3.7",
"headers", "headers",
"http 0.2.1", "http 0.2.1",
"hyper 0.13.8", "hyper 0.13.9",
"log 0.4.11", "log 0.4.11",
"mime 0.3.16", "mime 0.3.16",
"mime_guess", "mime_guess",
@ -7149,6 +7157,20 @@ dependencies = [
"linked-hash-map", "linked-hash-map",
] ]
[[package]]
name = "yamux"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c"
dependencies = [
"futures 0.3.7",
"log 0.4.11",
"nohash-hasher",
"parking_lot 0.11.0",
"rand 0.7.3",
"static_assertions",
]
[[package]] [[package]]
name = "zeroize" name = "zeroize"
version = "1.1.1" version = "1.1.1"

4
beacon_node/eth2_libp2p/Cargo.toml
View File

@ -42,9 +42,9 @@ regex = "1.3.9"
[dependencies.libp2p] [dependencies.libp2p]
#version = "0.23.0" #version = "0.23.0"
git = "https://github.com/sigp/rust-libp2p" git = "https://github.com/sigp/rust-libp2p"
rev = "8c6ce6eb1228de568568f6cd72fb134dea5f9669" rev = "de104a80c48f6e61bd7bdac8e17f809477fb4c4a"
default-features = false default-features = false
features = ["websocket", "identify", "mplex", "noise", "gossipsub", "dns", "tcp-tokio"] features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns", "tcp-tokio"]
[dev-dependencies] [dev-dependencies]
tokio = { version = "0.2.22", features = ["full"] } tokio = { version = "0.2.22", features = ["full"] }

6
beacon_node/eth2_libp2p/src/config.rs
View File

@ -149,13 +149,13 @@ impl Default for Config {
let discv5_config = Discv5ConfigBuilder::new() let discv5_config = Discv5ConfigBuilder::new()
.enable_packet_filter() .enable_packet_filter()
.session_cache_capacity(1000) .session_cache_capacity(1000)
.request_timeout(Duration::from_secs(4)) .request_timeout(Duration::from_secs(1))
.query_peer_timeout(Duration::from_secs(2))
.query_timeout(Duration::from_secs(30))
.request_retries(1) .request_retries(1)
.enr_peer_update_min(10) .enr_peer_update_min(10)
.query_parallelism(5) .query_parallelism(5)
.disable_report_discovered_peers() .disable_report_discovered_peers()
.query_timeout(Duration::from_secs(30))
.query_peer_timeout(Duration::from_secs(2))
.ip_limit() // limits /24 IP's in buckets. .ip_limit() // limits /24 IP's in buckets.
.ping_interval(Duration::from_secs(300)) .ping_interval(Duration::from_secs(300))
.build(); .build();

79
beacon_node/eth2_libp2p/src/rpc/handler.rs
View File

@ -176,31 +176,6 @@ enum InboundState<TSpec: EthSpec> {
Poisoned, Poisoned,
} }
impl<TSpec: EthSpec> InboundState<TSpec> {
/// Sends the given items over the underlying substream, if the state allows it, and returns the
/// final state.
fn send_items(
self,
pending_items: &mut Vec<RPCCodedResponse<TSpec>>,
remaining_chunks: u64,
) -> Self {
if let InboundState::Idle(substream) = self {
// only send on Idle
if !pending_items.is_empty() {
// take the items that we need to send
let to_send = std::mem::replace(pending_items, vec![]);
let fut = process_inbound_substream(substream, remaining_chunks, to_send).boxed();
InboundState::Busy(Box::pin(fut))
} else {
// nothing to do, keep waiting for responses
InboundState::Idle(substream)
}
} else {
self
}
}
}
/// State of an outbound substream. Either waiting for a response, or in the process of sending. /// State of an outbound substream. Either waiting for a response, or in the process of sending.
pub enum OutboundSubstreamState<TSpec: EthSpec> { pub enum OutboundSubstreamState<TSpec: EthSpec> {
/// A request has been sent, and we are awaiting a response. This future is driven in the /// A request has been sent, and we are awaiting a response. This future is driven in the
@ -626,9 +601,22 @@ where
// drive inbound streams that need to be processed // drive inbound streams that need to be processed
let mut substreams_to_remove = Vec::new(); // Closed substreams that need to be removed let mut substreams_to_remove = Vec::new(); // Closed substreams that need to be removed
for (id, info) in self.inbound_substreams.iter_mut() { for (id, info) in self.inbound_substreams.iter_mut() {
loop {
match std::mem::replace(&mut info.state, InboundState::Poisoned) { match std::mem::replace(&mut info.state, InboundState::Poisoned) {
state @ InboundState::Idle(..) if !deactivated => { InboundState::Idle(substream) if !deactivated => {
info.state = state.send_items(&mut info.pending_items, info.remaining_chunks); if !info.pending_items.is_empty() {
let to_send = std::mem::replace(&mut info.pending_items, vec![]);
let fut = process_inbound_substream(
substream,
info.remaining_chunks,
to_send,
)
.boxed();
info.state = InboundState::Busy(Box::pin(fut));
} else {
info.state = InboundState::Idle(substream);
break;
}
} }
InboundState::Idle(mut substream) => { InboundState::Idle(mut substream) => {
// handler is deactivated, close the stream and mark it for removal // handler is deactivated, close the stream and mark it for removal
@ -647,7 +635,8 @@ where
proto: info.protocol, proto: info.protocol,
}); });
} }
if info.pending_items.last().map(|l| l.close_after()) == Some(false) { if info.pending_items.last().map(|l| l.close_after()) == Some(false)
{
// if the request was still active, report back to cancel it // if the request was still active, report back to cancel it
self.pending_errors.push(HandlerErr::Inbound { self.pending_errors.push(HandlerErr::Inbound {
id: *id, id: *id,
@ -657,10 +646,11 @@ where
} }
} }
} }
break;
} }
InboundState::Busy(mut fut) => { InboundState::Busy(mut fut) => {
// first check if sending finished // first check if sending finished
let state = match fut.poll_unpin(cx) { match fut.poll_unpin(cx) {
Poll::Ready((substream, errors, remove, new_remaining_chunks)) => { Poll::Ready((substream, errors, remove, new_remaining_chunks)) => {
info.remaining_chunks = new_remaining_chunks; info.remaining_chunks = new_remaining_chunks;
// report any error // report any error
@ -677,20 +667,35 @@ where
self.inbound_substreams_delay.remove(delay_key); self.inbound_substreams_delay.remove(delay_key);
} }
} }
InboundState::Idle(substream)
} // The stream may be currently idle. Attempt to process more
Poll::Pending => InboundState::Busy(fut), // elements
};
info.state = if !deactivated { if !deactivated && !info.pending_items.is_empty() {
// if the last batch finished, send more. let to_send =
state.send_items(&mut info.pending_items, info.remaining_chunks) std::mem::replace(&mut info.pending_items, vec![]);
let fut = process_inbound_substream(
substream,
info.remaining_chunks,
to_send,
)
.boxed();
info.state = InboundState::Busy(Box::pin(fut));
} else { } else {
state info.state = InboundState::Idle(substream);
break;
}
}
Poll::Pending => {
info.state = InboundState::Busy(fut);
break;
}
}; };
} }
InboundState::Poisoned => unreachable!("Poisoned inbound substream"), InboundState::Poisoned => unreachable!("Poisoned inbound substream"),
} }
} }
}
// remove closed substreams // remove closed substreams
for inbound_id in substreams_to_remove { for inbound_id in substreams_to_remove {

21
beacon_node/eth2_libp2p/src/service.rs
View File

@ -9,7 +9,7 @@ use crate::EnrExt;
use crate::{NetworkConfig, NetworkGlobals, PeerAction}; use crate::{NetworkConfig, NetworkGlobals, PeerAction};
use futures::prelude::*; use futures::prelude::*;
use libp2p::core::{ use libp2p::core::{
identity::Keypair, multiaddr::Multiaddr, muxing::StreamMuxerBox, transport::boxed::Boxed, identity::Keypair, multiaddr::Multiaddr, muxing::StreamMuxerBox, transport::Boxed,
}; };
use libp2p::{ use libp2p::{
core, noise, core, noise,
@ -20,7 +20,6 @@ use slog::{crit, debug, info, o, trace, warn};
use ssz::Decode; use ssz::Decode;
use std::fs::File; use std::fs::File;
use std::io::prelude::*; use std::io::prelude::*;
use std::io::{Error, ErrorKind};
use std::pin::Pin; use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
@ -323,9 +322,7 @@ impl<TSpec: EthSpec> Service<TSpec> {
/// The implementation supports TCP/IP, WebSockets over TCP/IP, noise as the encryption layer, and /// The implementation supports TCP/IP, WebSockets over TCP/IP, noise as the encryption layer, and
/// mplex as the multiplexing layer. /// mplex as the multiplexing layer.
fn build_transport( fn build_transport(local_private_key: Keypair) -> std::io::Result<Boxed<(PeerId, StreamMuxerBox)>> {
local_private_key: Keypair,
) -> Result<Boxed<(PeerId, StreamMuxerBox), Error>, Error> {
let transport = libp2p::tcp::TokioTcpConfig::new().nodelay(true); let transport = libp2p::tcp::TokioTcpConfig::new().nodelay(true);
let transport = libp2p::dns::DnsConfig::new(transport)?; let transport = libp2p::dns::DnsConfig::new(transport)?;
#[cfg(feature = "libp2p-websocket")] #[cfg(feature = "libp2p-websocket")]
@ -333,15 +330,21 @@ fn build_transport(
let trans_clone = transport.clone(); let trans_clone = transport.clone();
transport.or_transport(libp2p::websocket::WsConfig::new(trans_clone)) transport.or_transport(libp2p::websocket::WsConfig::new(trans_clone))
}; };
// mplex config
let mut mplex_config = libp2p::mplex::MplexConfig::new();
mplex_config.max_buffer_len(256);
mplex_config.max_buffer_len_behaviour(libp2p::mplex::MaxBufferBehaviour::Block);
// Authentication // Authentication
Ok(transport Ok(transport
.upgrade(core::upgrade::Version::V1) .upgrade(core::upgrade::Version::V1)
.authenticate(generate_noise_config(&local_private_key)) .authenticate(generate_noise_config(&local_private_key))
.multiplex(libp2p::mplex::MplexConfig::new()) .multiplex(core::upgrade::SelectUpgrade::new(
.map(|(peer, muxer), _| (peer, core::muxing::StreamMuxerBox::new(muxer))) libp2p::yamux::Config::default(),
mplex_config,
))
.timeout(Duration::from_secs(10)) .timeout(Duration::from_secs(10))
.timeout(Duration::from_secs(10))
.map_err(|err| Error::new(ErrorKind::Other, err))
.boxed()) .boxed())
} }

2
beacon_node/network/Cargo.toml
View File

@ -40,4 +40,4 @@ igd = "0.11.1"
itertools = "0.9.0" itertools = "0.9.0"
num_cpus = "1.13.0" num_cpus = "1.13.0"
lru_cache = { path = "../../common/lru_cache" } lru_cache = { path = "../../common/lru_cache" }
get_if_addrs = "0.5.3" if-addrs = "0.6.4"

2
beacon_node/network/src/nat.rs
View File

@ -4,7 +4,7 @@
//! - UPnP //! - UPnP
use crate::{NetworkConfig, NetworkMessage}; use crate::{NetworkConfig, NetworkMessage};
use get_if_addrs::get_if_addrs; use if_addrs::get_if_addrs;
use slog::{debug, info, warn}; use slog::{debug, info, warn};
use std::net::{IpAddr, SocketAddr, SocketAddrV4}; use std::net::{IpAddr, SocketAddr, SocketAddrV4};
use tokio::sync::mpsc; use tokio::sync::mpsc;