diff --git a/Cargo.lock b/Cargo.lock index c6b5bf76f..6665ed5ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -230,21 +230,25 @@ dependencies = [ [[package]] name = "async-tls" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634" +checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52" dependencies = [ - "futures 0.3.5", + "futures-core", + "futures-io", "rustls", "webpki", - "webpki-roots 0.19.0", + "webpki-roots", ] [[package]] name = "atomic" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f46ca51dca4837f1520754d1c8c36636356b81553d928dc9c177025369a06e" +checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" +dependencies = [ + "autocfg 1.0.1", +] [[package]] name = "atomic-option" @@ -2805,14 +2809,14 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.25.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.29.0" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "atomic", "bytes 0.5.6", "futures 0.3.5", "lazy_static", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "libp2p-core-derive", "libp2p-dns", "libp2p-gossipsub", @@ -2823,46 +2827,13 @@ dependencies = [ "libp2p-tcp", "libp2p-websocket", "multihash", - "parity-multiaddr 0.9.1", - "parking_lot 0.10.2", + "parity-multiaddr 0.9.3", + "parking_lot 0.11.0", "pin-project", "smallvec 1.4.2", "wasm-timer", ] -[[package]] -name = "libp2p-core" -version = "0.21.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" -dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", - "either", - "fnv", - "futures 0.3.5", - "futures-timer", - "lazy_static", - "libsecp256k1", - "log 0.4.11", - "multihash", - "multistream-select 0.8.2 (git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f)", - "parity-multiaddr 0.9.1", - "parking_lot 0.10.2", - "pin-project", - "prost", - "prost-build", - "rand 0.7.3", - "ring", - "rw-stream-sink", - "sha2 0.8.2", - "smallvec 1.4.2", - "thiserror", - "unsigned-varint 0.4.0", - "void", - "zeroize", -] - [[package]] name = "libp2p-core" version = "0.22.1" @@ -2880,7 +2851,7 @@ dependencies = [ "libsecp256k1", "log 0.4.11", "multihash", - "multistream-select 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select 0.8.2", "parity-multiaddr 0.9.2", "parking_lot 0.10.2", "pin-project", @@ -2897,10 +2868,43 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-core" +version = "0.22.2" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "either", + "fnv", + "futures 0.3.5", + "futures-timer", + "lazy_static", + "libsecp256k1", + "log 0.4.11", + "multihash", + "multistream-select 0.8.3", + "parity-multiaddr 0.9.3", + "parking_lot 0.11.0", + "pin-project", + "prost", + "prost-build", + "rand 0.7.3", + "ring", + "rw-stream-sink", + "sha2 0.9.1", + "smallvec 1.4.2", + "thiserror", + "unsigned-varint 0.5.1", + "void", + "zeroize", +] + [[package]] name = "libp2p-core-derive" version = "0.20.2" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "quote", "syn", @@ -2908,18 +2912,18 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.21.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.22.0" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "futures 0.3.5", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "log 0.4.11", ] [[package]] name = "libp2p-gossipsub" -version = "0.22.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.22.1" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "base64 0.12.3", "byteorder", @@ -2928,7 +2932,7 @@ dependencies = [ "futures 0.3.5", "futures_codec", "hex_fmt", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "libp2p-swarm", "log 0.4.11", "prost", @@ -2943,10 +2947,10 @@ dependencies = [ [[package]] name = "libp2p-identify" version = "0.22.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "futures 0.3.5", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "libp2p-swarm", "log 0.4.11", "prost", @@ -2957,48 +2961,48 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.21.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.23.0" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "bytes 0.5.6", "fnv", "futures 0.3.5", "futures_codec", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "log 0.4.11", - "parking_lot 0.10.2", - "unsigned-varint 0.4.0", + "parking_lot 0.11.0", + "unsigned-varint 0.5.1", ] [[package]] name = "libp2p-noise" -version = "0.23.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.24.1" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "bytes 0.5.6", - "curve25519-dalek 2.1.0", + "curve25519-dalek 3.0.0", "futures 0.3.5", "lazy_static", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "log 0.4.11", "prost", "prost-build", "rand 0.7.3", - "sha2 0.8.2", + "sha2 0.9.1", "snow", "static_assertions", - "x25519-dalek", + "x25519-dalek 1.1.0", "zeroize", ] [[package]] name = "libp2p-swarm" version = "0.22.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "either", "futures 0.3.5", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "log 0.4.11", "rand 0.7.3", "smallvec 1.4.2", @@ -3008,14 +3012,14 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.21.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.22.0" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "futures 0.3.5", "futures-timer", "get_if_addrs", "ipnet", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "log 0.4.11", "socket2", "tokio 0.2.22", @@ -3023,13 +3027,13 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.22.0" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.23.1" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "async-tls", "either", "futures 0.3.5", - "libp2p-core 0.21.0", + "libp2p-core 0.22.2", "log 0.4.11", "quicksink", "rustls", @@ -3037,7 +3041,7 @@ dependencies = [ "soketto", "url 2.1.1", "webpki", - "webpki-roots 0.18.0", + "webpki-roots", ] [[package]] @@ -3426,7 +3430,8 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.8.2" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5" dependencies = [ "bytes 0.5.6", "futures 0.3.5", @@ -3438,16 +3443,15 @@ dependencies = [ [[package]] name = "multistream-select" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9157e87afbc2ef0d84cc0345423d715f445edde00141c93721c162de35a05e5" +version = "0.8.3" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "bytes 0.5.6", "futures 0.3.5", "log 0.4.11", "pin-project", "smallvec 1.4.2", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", ] [[package]] @@ -3720,8 +3724,9 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.1" -source = "git+https://github.com/sigp/rust-libp2p?rev=03f998022ce2f566a6c6e6c4206bc0ce4d45109f#03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257" dependencies = [ "arrayref", "bs58", @@ -3737,9 +3742,8 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2165a93382a93de55868dcbfa11e4a8f99676a9164eee6a2b4a9479ad319c257" +version = "0.9.3" +source = "git+https://github.com/sigp/rust-libp2p?rev=5a9f0819af3990cfefad528e957297af596399b4#5a9f0819af3990cfefad528e957297af596399b4" dependencies = [ "arrayref", "bs58", @@ -3749,7 +3753,7 @@ dependencies = [ "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", "url 2.1.1", ] @@ -5148,7 +5152,7 @@ dependencies = [ "rustc_version", "sha2 0.9.1", "subtle 2.3.0", - "x25519-dalek", + "x25519-dalek 0.6.0", ] [[package]] @@ -6210,10 +6214,6 @@ name = "unsigned-varint" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5" -dependencies = [ - "bytes 0.5.6", - "futures_codec", -] [[package]] name = "unsigned-varint" @@ -6619,18 +6619,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" +checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" dependencies = [ "webpki", ] @@ -6772,6 +6763,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088" +dependencies = [ + "curve25519-dalek 3.0.0", + "rand_core 0.5.1", + "zeroize", +] + [[package]] name = "xml-rs" version = "0.8.3" diff --git a/beacon_node/eth2_libp2p/Cargo.toml b/beacon_node/eth2_libp2p/Cargo.toml index e3f961508..5241208a9 100644 --- a/beacon_node/eth2_libp2p/Cargo.toml +++ b/beacon_node/eth2_libp2p/Cargo.toml @@ -42,7 +42,7 @@ regex = "1.3.9" [dependencies.libp2p] #version = "0.23.0" git = "https://github.com/sigp/rust-libp2p" -rev = "03f998022ce2f566a6c6e6c4206bc0ce4d45109f" +rev = "5a9f0819af3990cfefad528e957297af596399b4" default-features = false features = ["websocket", "identify", "mplex", "noise", "gossipsub", "dns", "tcp-tokio"]