diff --git a/Cargo.lock b/Cargo.lock index a7b33f393..68f2c7f8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -475,7 +475,6 @@ dependencies = [ "itertools 0.10.5", "kate-recovery", "libp2p", - "libp2p-quic", "mockall", "multihash 0.14.0", "num", @@ -2997,9 +2996,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libp2p" -version = "0.52.2" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4894076bfa3051e4f1725747308861af1e6641213640aeeb784f583e40e7d9" +checksum = "32d07d1502a027366d55afe187621c2d7895dc111a3df13b35fed698049681d7" dependencies = [ "bytes", "futures", @@ -3019,6 +3018,7 @@ dependencies = [ "libp2p-metrics", "libp2p-noise", "libp2p-ping", + "libp2p-quic", "libp2p-relay", "libp2p-swarm", "libp2p-tcp", @@ -3243,12 +3243,12 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.43.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87945db2b3f977af09b62b9aa0a5f3e4870995a577ecd845cdeba94cdf6bbca7" +checksum = "71ce70757f2c0d82e9a3ef738fb10ea0723d16cec37f078f719e2c247704c1bb" dependencies = [ "bytes", - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0", "futures", "libp2p-core", "libp2p-identity", @@ -3286,9 +3286,9 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.9.2-alpha" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb614a60b5cef499aec647b5514efbd89df7740b0e27e90577c95e6b556f7c6" +checksum = "4cb763e88f9a043546bfebd3575f340e7dd3d6c1b2cf2629600ec8965360c63a" dependencies = [ "bytes", "futures", @@ -3404,9 +3404,9 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec63209ec17ffb354a5fdfde7c36f14d168367c5f115fdb5a177a342414d5a55" +checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61" dependencies = [ "futures", "futures-rustls", @@ -3415,8 +3415,8 @@ dependencies = [ "rcgen", "ring", "rustls 0.21.6", + "rustls-webpki", "thiserror", - "webpki", "x509-parser", "yasna", ] @@ -7398,7 +7398,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "digest 0.10.7", "rand 0.8.5", "static_assertions", diff --git a/Cargo.toml b/Cargo.toml index fd46d1796..3fc99ee87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,8 +42,7 @@ futures = { version = "0.3.15", default-features = false, features = ["std", "as hex = "0.4" hyper = { version = "0.14.23", features = ["full", "http1"] } itertools = "0.10.5" -libp2p = { version = "0.52.2", features = ["kad", "identify", "ping", "mdns", "autonat", "relay", "dcutr", "noise", "yamux", "dns", "metrics", "tokio", "macros"] } -libp2p-quic = { version = "0.9.2-alpha", features = ["tokio"] } +libp2p = { version = "0.52.3", features = ["kad", "identify", "ping", "mdns", "autonat", "relay", "dcutr", "noise", "yamux", "dns", "metrics", "tokio", "macros", "quic"] } mockall = "0.11.3" multihash = { version = "0.14.0", default-features = false, features = ["blake3", "sha3"] } num = "0.4.0" diff --git a/src/network/mod.rs b/src/network/mod.rs index 6b2bf5720..c59434ae0 100644 --- a/src/network/mod.rs +++ b/src/network/mod.rs @@ -13,11 +13,11 @@ use libp2p::{ multiaddr::Protocol, noise::Config as NoiseConfig, ping::{Behaviour as Ping, Config as PingConfig}, + quic::{tokio::Transport as TokioQuic, Config as QuicConfig}, relay::{self, client::Behaviour as RelayClient}, swarm::{NetworkBehaviour, SwarmBuilder}, Multiaddr, PeerId, Transport, }; -use libp2p_quic::{tokio::Transport as TokioQuic, Config as QuicConfig}; use mem_store::{MemoryStore, MemoryStoreConfig}; use multihash::{self, Hasher}; use tokio::sync::mpsc::{self, Sender};