diff --git a/Cargo.lock b/Cargo.lock index a529b490604..71c56ab3add 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,9 +83,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aead" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922b33332f54fc0ad13fa3e514601e8d30fb54e1f3eadc36643f6526db645621" +checksum = "6e3e798aa0c8239776f54415bc06f3d74b1850f3f830b45c35cfc80556973f70" dependencies = [ "generic-array 0.14.4", ] @@ -114,7 +114,7 @@ dependencies = [ "cipher 0.3.0", "ctr", "ghash", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -157,9 +157,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "arbitrary" @@ -870,9 +870,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" [[package]] name = "cfg-if" @@ -1222,7 +1222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -1232,7 +1232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -1242,7 +1242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -1336,7 +1336,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.4.0", + "subtle 2.4.1", "zeroize", ] @@ -1555,9 +1555,9 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "discv5" -version = "0.1.0-beta.6" +version = "0.1.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e28f2a50af946c29ce33d0c5ad9c33d2df172176d57c4b4b40295a9cfcf07ae" +checksum = "7ea68ad7b3b04274980a33fd1579517540b9d341dfe634b17b6b49fa972cfb86" dependencies = [ "aes", "aes-gcm", @@ -1569,7 +1569,7 @@ dependencies = [ "hex", "hkdf", "lazy_static", - "libp2p-core 0.28.3", + "libp2p-core", "lru", "lru_time_cache", "parking_lot", @@ -1673,7 +1673,7 @@ dependencies = [ "group", "pkcs8", "rand_core 0.6.3", - "subtle 2.4.0", + "subtle 2.4.1", "zeroize", ] @@ -2185,7 +2185,7 @@ checksum = "72a4d941a5b7c2a75222e2d44fcdf634a67133d9db31e177ae5ff6ecda852bfe" dependencies = [ "bitvec 0.20.4", "rand_core 0.6.3", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -2572,7 +2572,7 @@ checksum = "61b3c1e8b4f1ca07e6605ea1be903a5f6956aec5c8a67fd44d56076631675ed8" dependencies = [ "ff", "rand_core 0.6.3", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -3061,9 +3061,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", ] @@ -3363,7 +3363,7 @@ dependencies = [ "bytes 1.0.1", "futures", "lazy_static", - "libp2p-core 0.29.0", + "libp2p-core", "libp2p-dns", "libp2p-gossipsub", "libp2p-identify", @@ -3381,40 +3381,6 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "libp2p-core" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9" -dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", - "either", - "fnv", - "futures", - "futures-timer", - "lazy_static", - "libsecp256k1 0.3.5", - "log", - "multihash 0.13.2", - "multistream-select", - "parity-multiaddr", - "parking_lot", - "pin-project 1.0.7", - "prost 0.7.0", - "prost-build 0.7.0", - "rand 0.7.3", - "ring", - "rw-stream-sink", - "sha2 0.9.5", - "smallvec", - "thiserror", - "unsigned-varint 0.7.0", - "void", - "zeroize", -] - [[package]] name = "libp2p-core" version = "0.29.0" @@ -3432,12 +3398,12 @@ dependencies = [ "libsecp256k1 0.5.0", "log", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", "parking_lot", "pin-project 1.0.7", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", @@ -3456,7 +3422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ff08b3196b85a17f202d80589e93b1660a574af67275706657fdc762e42c32" dependencies = [ "futures", - "libp2p-core 0.29.0", + "libp2p-core", "log", "smallvec", "trust-dns-resolver", @@ -3475,11 +3441,11 @@ dependencies = [ "fnv", "futures", "hex_fmt", - "libp2p-core 0.29.0", + "libp2p-core", "libp2p-swarm", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "regex", "sha2 0.9.5", @@ -3495,11 +3461,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7b61f6cf07664fb97016c318c4d4512b3dd4cc07238607f3f0163245f99008e" dependencies = [ "futures", - "libp2p-core 0.29.0", + "libp2p-core", "libp2p-swarm", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "smallvec", "wasm-timer", ] @@ -3513,7 +3479,7 @@ dependencies = [ "asynchronous-codec", "bytes 1.0.1", "futures", - "libp2p-core 0.29.0", + "libp2p-core", "log", "nohash-hasher", "parking_lot", @@ -3532,10 +3498,10 @@ dependencies = [ "curve25519-dalek", "futures", "lazy_static", - "libp2p-core 0.29.0", + "libp2p-core", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.8.4", "sha2 0.9.5", "snow", @@ -3552,7 +3518,7 @@ checksum = "7083861341e1555467863b4cd802bea1e8c4787c0f7b5110097d0f1f3248f9a9" dependencies = [ "either", "futures", - "libp2p-core 0.29.0", + "libp2p-core", "log", "rand 0.7.3", "smallvec", @@ -3581,7 +3547,7 @@ dependencies = [ "if-addrs", "ipnet", "libc", - "libp2p-core 0.29.0", + "libp2p-core", "log", "socket2 0.4.0", "tokio 1.8.1", @@ -3596,7 +3562,7 @@ dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core 0.29.0", + "libp2p-core", "log", "quicksink", "rw-stream-sink", @@ -3612,7 +3578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "214cc0dd9c37cbed27f0bb1eba0c41bbafdb93a8be5e9d6ae1e6b4b42cd044bf" dependencies = [ "futures", - "libp2p-core 0.29.0", + "libp2p-core", "parking_lot", "thiserror", "yamux", @@ -3630,7 +3596,7 @@ dependencies = [ "hmac-drbg 0.2.0", "rand 0.7.3", "sha2 0.8.2", - "subtle 2.4.0", + "subtle 2.4.1", "typenum", ] @@ -3661,7 +3627,7 @@ checksum = "4ee11012b293ea30093c129173cac4335513064094619f4639a25b310fd33c11" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.4.0", + "subtle 2.4.1", ] [[package]] @@ -4021,7 +3987,7 @@ dependencies = [ "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -4029,19 +3995,6 @@ dependencies = [ "url", ] -[[package]] -name = "multihash" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.4", - "multihash-derive", - "sha2 0.9.5", - "unsigned-varint 0.5.1", -] - [[package]] name = "multihash" version = "0.14.0" @@ -4413,24 +4366,6 @@ dependencies = [ "types", ] -[[package]] -name = "parity-multiaddr" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58341485071825827b7f03cf7efd1cb21e6a709bea778fb50227fd45d2f361b4" -dependencies = [ - "arrayref", - "bs58", - "byteorder", - "data-encoding", - "multihash 0.13.2", - "percent-encoding", - "serde", - "static_assertions", - "unsigned-varint 0.7.0", - "url", -] - [[package]] name = "parity-scale-codec" version = "1.3.7" @@ -4822,16 +4757,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prost" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" -dependencies = [ - "bytes 1.0.1", - "prost-derive 0.7.0", -] - [[package]] name = "prost" version = "0.8.0" @@ -4839,25 +4764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ "bytes 1.0.1", - "prost-derive 0.8.0", -] - -[[package]] -name = "prost-build" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" -dependencies = [ - "bytes 1.0.1", - "heck", - "itertools 0.9.0", - "log", - "multimap", - "petgraph", - "prost 0.7.0", - "prost-types 0.7.0", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -4872,25 +4779,12 @@ dependencies = [ "log", "multimap", "petgraph", - "prost 0.8.0", - "prost-types 0.8.0", + "prost", + "prost-types", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" -dependencies = [ - "anyhow", - "itertools 0.9.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.8.0" @@ -4904,16 +4798,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" -dependencies = [ - "bytes 1.0.1", - "prost 0.7.0", -] - [[package]] name = "prost-types" version = "0.8.0" @@ -4921,7 +4805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ "bytes 1.0.1", - "prost 0.8.0", + "prost", ] [[package]] @@ -6133,7 +6017,7 @@ dependencies = [ "ring", "rustc_version 0.3.3", "sha2 0.9.5", - "subtle 2.4.0", + "subtle 2.4.1", "x25519-dalek", ] @@ -6370,9 +6254,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "superstruct" @@ -6409,9 +6293,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ "proc-macro2", "quote", @@ -7147,15 +7031,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.0", + "subtle 2.4.1", ] -[[package]] -name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" - [[package]] name = "unsigned-varint" version = "0.6.0" diff --git a/beacon_node/eth2_libp2p/Cargo.toml b/beacon_node/eth2_libp2p/Cargo.toml index 52210c009bd..d0fa690a23d 100644 --- a/beacon_node/eth2_libp2p/Cargo.toml +++ b/beacon_node/eth2_libp2p/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Sigma Prime "] edition = "2018" [dependencies] -discv5 = { version = "0.1.0-beta.6", features = ["libp2p"] } +discv5 = { version = "0.1.0-beta.7", features = ["libp2p"] } unsigned-varint = { version = "0.6.0", features = ["codec"] } types = { path = "../../consensus/types" } hashset_delay = { path = "../../common/hashset_delay" }