diff --git a/Cargo.lock b/Cargo.lock index e2029372f..7740e097b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2189,23 +2189,6 @@ dependencies = [ "tokio 1.41.0", ] -[[package]] -name = "libp2p-tokio-socks5" -version = "0.7.1" -source = "git+https://github.com/mwcproject/rust-libp2p-tokio-socks5?branch=master#ca17cd3886755a4c2b261faab4da13bf0d262ba7" -dependencies = [ - "data-encoding", - "futures 0.3.31", - "futures-timer", - "if-addrs", - "ipnet", - "log", - "mwc-libp2p", - "socket2 0.3.19", - "tokio 0.2.25", - "tokio-socks", -] - [[package]] name = "libp2p-yamux" version = "0.30.1" @@ -2584,6 +2567,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "mwc-libp2p-tokio-socks5" +version = "0.7.1" +source = "git+https://github.com/mwcproject/rust-libp2p-tokio-socks5?branch=master#a1f0efd7074b655ff88db310d55fb7be0ef2c164" +dependencies = [ + "data-encoding", + "futures 0.3.31", + "futures-timer", + "if-addrs", + "ipnet", + "log", + "mwc-libp2p", + "socket2 0.3.19", + "tokio 0.2.25", + "tokio-socks", +] + [[package]] name = "mwc_api" version = "5.3.3" @@ -2718,10 +2718,10 @@ dependencies = [ "enum_primitive", "futures 0.3.31", "lazy_static", - "libp2p-tokio-socks5", "log", "lru-cache", "mwc-libp2p", + "mwc-libp2p-tokio-socks5", "mwc_chain", "mwc_core", "mwc_pool", diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 01985ce18..261b060d4 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -27,7 +27,7 @@ chrono = { version = "0.4.11", features = ["serde"] } futures = "0.3" #libp2p-tokio-socks5 = { path = "../../rust-libp2p-tokio-socks5" } #libp2p = { path = "../../rust-libp2p", default-features = false, features = [ "noise", "yamux", "mplex", "dns", "tcp-tokio", "ping", "gossipsub"] } -libp2p-tokio-socks5 = { git = "https://github.com/mwcproject/rust-libp2p-tokio-socks5", version = "0.7.1", branch = "master"} +mwc-libp2p-tokio-socks5 = { git = "https://github.com/mwcproject/rust-libp2p-tokio-socks5", version = "0.7.1", branch = "master"} mwc-libp2p = { git = "https://github.com/mwcproject/rust-libp2p", branch = "master", version="0.35.2", default-features = false, features = [ "noise", "yamux", "mplex", "dns", "tcp-tokio", "ping", "gossipsub"]} lazy_static = "1" async-std = "1.9" diff --git a/p2p/src/libp2p_connection.rs b/p2p/src/libp2p_connection.rs index 291d3917b..5dfa5d241 100644 --- a/p2p/src/libp2p_connection.rs +++ b/p2p/src/libp2p_connection.rs @@ -16,7 +16,6 @@ //! the peer-to-peer server, the blockchain and the transaction pool) and acts //! as a facade. -use libp2p_tokio_socks5::Socks5TokioTcpConfig; use mwc_libp2p::core::Multiaddr; use mwc_libp2p::{ core::{ @@ -32,6 +31,7 @@ use mwc_libp2p::{ yamux::YamuxConfig, PeerId, Swarm, Transport, }; +use mwc_libp2p_tokio_socks5::Socks5TokioTcpConfig; use mwc_libp2p::gossipsub::{ self, GossipsubEvent, IdentTopic as Topic, MessageAuthenticity, MessageId, ValidationMode,