Add proxy support for ckb

Signed-off-by: Eval EXEC <[email protected]>
nervosnetwork · Dec 2, 2024 · 6b72857 · 6b72857
1 parent d6afaa3
commit 6b72857
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -34,10 +34,10 @@ serde_json = "1.0"
 bloom-filters = "0.1"
 ckb-spawn = { path = "../util/spawn", version = "= 0.120.0-pre" }
 bitflags = "1.0"
-p2p = { git="https://github.com/eval-exec/tentacle.git", branch="exec/proxy", package = "tentacle", default-features = false }
+p2p = { path = "/home/exec/Projects/github.com/nervosnetwork/tentacle/tentacle", package = "tentacle", default-features = false }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-p2p = { git="https://github.com/eval-exec/tentacle.git", branch="exec/proxy", package = "tentacle", default-features = false, features = [
+p2p = { path = "/home/exec/Projects/github.com/nervosnetwork/tentacle/tentacle", package = "tentacle", default-features = false, features = [
     "upnp",
     "parking_lot",
     "openssl-vendored",
@@ -48,7 +48,7 @@ p2p = { git="https://github.com/eval-exec/tentacle.git", branch="exec/proxy", pa
 socket2 = "0.5"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-p2p = { git="https://github.com/eval-exec/tentacle.git", branch="exec/proxy", package = "tentacle", default-features = false, features = [
+p2p = { path = "/home/exec/Projects/github.com/nervosnetwork/tentacle/tentacle", package = "tentacle", default-features = false, features = [
     "wasm-timer",
 ] }
 idb = "0.6"

diff --git a/network/src/network.rs b/network/src/network.rs
@@ -28,6 +28,7 @@ use ckb_systemtime::{Duration, Instant};
 use ckb_util::{Condvar, Mutex, RwLock};
 use futures::{channel::mpsc::Sender, Future};
 use ipnetwork::IpNetwork;
+use p2p::service::ProxyConfig;
 use p2p::{
     async_trait,
     builder::ServiceBuilder,
@@ -1015,6 +1016,14 @@ impl NetworkService {
                                 };
                                 init.transform(TransportType::Tcp);
                                 service_builder = service_builder.tcp_config(bind_fn);
+
+                                if config.proxy_config.enable {
+                                    let proxy_config = Some(ProxyConfig {
+                                        proxy_url: config.proxy_config.proxy_url.clone(),
+                                    });
+                                    service_builder =
+                                        service_builder.tcp_proxy_config(proxy_config);
+                                }
                             }
                         }
                         TransportType::Ws => {

diff --git a/util/app-config/Cargo.toml b/util/app-config/Cargo.toml
@@ -22,8 +22,8 @@ ckb-pow = { path = "../../pow", version = "= 0.120.0-pre" }
 ckb-resource = { path = "../../resource", version = "= 0.120.0-pre" }
 ckb-build-info = { path = "../build-info", version = "= 0.120.0-pre" }
 ckb-types = { path = "../types", version = "= 0.120.0-pre" }
-secio = { version = "0.6", package = "tentacle-secio" }
-multiaddr = { version = "0.3.0", package = "tentacle-multiaddr" }
+secio = { path="/home/exec/Projects/github.com/nervosnetwork/tentacle/secio", package = "tentacle-secio" }
+multiaddr = { path="/home/exec/Projects/github.com/nervosnetwork/tentacle/multiaddr", package = "tentacle-multiaddr" }
 rand = "0.8"
 sentry = { version = "0.34.0", optional = true }
 ckb-systemtime = { path = "../systemtime", version = "= 0.120.0-pre" }

diff --git a/util/app-config/src/configs/network.rs b/util/app-config/src/configs/network.rs
@@ -92,6 +92,16 @@ pub struct Config {
     #[cfg(target_family = "wasm")]
     #[serde(skip)]
     pub secret_key: [u8; 32],
+
+    #[serde(default)]
+    pub proxy_config: ProxyConfig,
+}
+
+/// Proxy related config options
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
+pub struct ProxyConfig {
+    pub enable: bool,
+    pub proxy_url: String,
 }
 
 /// Chain synchronization config options.