Change MultiAddr to Multiaddr

eval-exec · eval-exec · commit 37719bde6ce3 · 2025-11-04T11:22:10.000+08:00
Signed-off-by: Eval EXEC &lt;execvy@gmail.com&gt;
diff --git a/.github/workflows/ci_integration_tests_macos.yaml b/.github/workflows/ci_integration_tests_macos.yaml
@@ -54,7 +54,7 @@ jobs:
     runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
-      - run: brew install tor
+      - run: brew install tor go
       - run: |
           if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
               devtools/ci/ci_main.sh
diff --git a/.github/workflows/ci_integration_tests_windows.yaml b/.github/workflows/ci_integration_tests_windows.yaml
@@ -67,6 +67,7 @@ jobs:
           scoop bucket add extras
           scoop install llvm
           scoop install tor
+          scoop install go
       - run: |
           if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
               devtools/ci/ci_main.sh
diff --git a/.github/workflows/ci_linters_ubuntu.yaml b/.github/workflows/ci_linters_ubuntu.yaml
@@ -57,7 +57,7 @@ jobs:
           components: rustfmt, clippy
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.20.14'
+          go-version: 1.20
       - run: cargo fmt --all -- --check
       - run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y
       - run: |
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -35,6 +35,7 @@ bloom-filters.workspace = true
 ckb-spawn.workspace = true
 bitflags.workspace = true
 p2p = { workspace = true, default-features = false }
+url.workspace = true
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 p2p = { workspace = true, default-features = false, features = [
diff --git a/network/fuzz/fuzz_targets/fuzz_peer_store.rs b/network/fuzz/fuzz_targets/fuzz_peer_store.rs
@@ -3,11 +3,11 @@
 use libfuzzer_sys::fuzz_target;
 
 use ckb_network::{
-    multiaddr::MultiAddr, peer_store::types::BannedAddr, peer_store::PeerStore, Flags, PeerId,
+    multiaddr::Multiaddr, peer_store::types::BannedAddr, peer_store::PeerStore, Flags, PeerId,
 };
 use ckb_network_fuzz::BufManager;
 
-fn new_multi_addr(data: &mut BufManager) -> (MultiAddr, Flags) {
+fn new_multi_addr(data: &mut BufManager) -> (Multiaddr, Flags) {
     let flags = data.get();
     let addr_flag = data.get::<u8>();
 
diff --git a/network/src/address.rs b/network/src/address.rs
@@ -1,15 +1,15 @@
-use p2p::multiaddr::{MultiAddr, Protocol};
+use p2p::multiaddr::{Multiaddr, Protocol};
 
 #[derive(Default, Clone, Debug)]
 pub struct NetworkAddresses {
-    pub regular_addresses: Vec<MultiAddr>,
+    pub regular_addresses: Vec<Multiaddr>,
 
     // onion addresses can't be solved by multiaddr_to_socketaddr or socketaddr_to_multiaddr
-    pub onion_addresses: Vec<MultiAddr>,
+    pub onion_addresses: Vec<Multiaddr>,
 }
 
 impl NetworkAddresses {
-    pub fn push(&mut self, address: MultiAddr) {
+    pub fn push(&mut self, address: Multiaddr) {
         if address
             .iter()
             .any(|proto| matches!(proto, Protocol::Onion3(_)))
@@ -21,7 +21,7 @@ impl NetworkAddresses {
     }
 
     // contains
-    pub fn contains(&self, address: &MultiAddr) -> bool {
+    pub fn contains(&self, address: &Multiaddr) -> bool {
         self.regular_addresses.contains(address) || self.onion_addresses.contains(address)
     }
 
@@ -38,9 +38,9 @@ impl NetworkAddresses {
 
 // implement iter() for NetworkAddresses, don't take ownership
 impl<'a> IntoIterator for &'a NetworkAddresses {
-    type Item = &'a MultiAddr;
+    type Item = &'a Multiaddr;
     type IntoIter =
-        std::iter::Chain<std::slice::Iter<'a, MultiAddr>, std::slice::Iter<'a, MultiAddr>>;
+        std::iter::Chain<std::slice::Iter<'a, Multiaddr>, std::slice::Iter<'a, Multiaddr>>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.regular_addresses
@@ -49,9 +49,9 @@ impl<'a> IntoIterator for &'a NetworkAddresses {
     }
 }
 
-// convert Vec<MultiAddr> to NetworkAddresses
-impl From<Vec<MultiAddr>> for NetworkAddresses {
-    fn from(addresses: Vec<MultiAddr>) -> Self {
+// convert Vec<Multiaddr> to NetworkAddresses
+impl From<Vec<Multiaddr>> for NetworkAddresses {
+    fn from(addresses: Vec<Multiaddr>) -> Self {
         let mut regular_addresses = Vec::new();
         let mut onion_addresses = Vec::new();
         for address in addresses {
@@ -71,8 +71,8 @@ impl From<Vec<MultiAddr>> for NetworkAddresses {
     }
 }
 
-// convert NetworkAddresses to Vec<MultiAddr>
-impl From<NetworkAddresses> for Vec<MultiAddr> {
+// convert NetworkAddresses to Vec<Multiaddr>
+impl From<NetworkAddresses> for Vec<Multiaddr> {
     fn from(addresses: NetworkAddresses) -> Self {
         let mut result = addresses.regular_addresses;
         result.extend(addresses.onion_addresses);
diff --git a/network/src/lib.rs b/network/src/lib.rs
@@ -56,7 +56,7 @@ pub type ProtocolVersion = String;
 
 /// Observe listen port occupancy
 pub async fn observe_listen_port_occupancy(
-    _addrs: &[multiaddr::MultiAddr],
+    _addrs: &[multiaddr::Multiaddr],
 ) -> Result<(), std::io::Error> {
     #[cfg(target_os = "linux")]
     {
diff --git a/network/src/network.rs b/network/src/network.rs
@@ -339,11 +339,11 @@ impl NetworkState {
     }
 
     pub(crate) fn public_addrs(&self, count: usize) -> Vec<Multiaddr> {
-        if self.public_addrs.read().len() <= count {
-            return self.public_addrs.read().iter().cloned().collect();
+        let public_addrs = self.public_addrs.read();
+        if public_addrs.len() <= count {
+            return public_addrs.iter().cloned().collect();
         } else {
-            self.public_addrs
-                .read()
+            public_addrs
                 .iter()
                 .cloned()
                 .choose_multiple(&mut rand::thread_rng(), count)
@@ -1059,12 +1059,11 @@ impl NetworkService {
                             p2p::service::SocketState::Dial => {
                                 let domain = socket2::Domain::for_address(addr);
                                 if socket_ref.domain()? == domain {
-                                    let should_bind_socket = !(proxy_config_enable
-                                        && matches!(ctxt.state, p2p::service::SocketState::Dial));
-                                    if should_bind_socket {
-                                        socket_ref.bind(&addr.into())?;
-                                    } else {
+                                    if proxy_config_enable {
                                         // skip bind if proxy enabled
+                                        debug!("skip bind since proxy is enabled");
+                                    } else {
+                                        socket_ref.bind(&addr.into())?;
                                     }
                                 }
                                 Ok(socket)
diff --git a/network/src/peer_store/addr_manager.rs b/network/src/peer_store/addr_manager.rs
@@ -1,5 +1,6 @@
 //! Address manager
 use crate::peer_store::{base_addr, types::AddrInfo};
+use ckb_logger::debug;
 use p2p::{
     multiaddr::{Multiaddr, Protocol},
     utils::multiaddr_to_socketaddr,
@@ -81,7 +82,7 @@ impl AddrManager {
                             addr_infos.push(addr_info);
                         } else {
                             debug!(
-                                "addr {:?} is not connectable or not onion address",
+                                "addr {:?} is not connectable and not an onion address",
                                 addr_info.addr
                             );
                         }
diff --git a/network/src/peer_store/peer_store_db.rs b/network/src/peer_store/peer_store_db.rs
@@ -9,7 +9,7 @@ use crate::{
     },
 };
 use ckb_logger::{debug, error};
-use p2p::multiaddr::MultiAddr;
+use p2p::multiaddr::Multiaddr;
 use std::path::Path;
 use std::{
     fs::{File, OpenOptions, copy, create_dir_all, remove_file, rename},
@@ -82,7 +82,7 @@ impl BanList {
 impl Anchors {
     /// Load address list from disk
     pub fn load<R: Read>(r: R) -> Result<Self, Error> {
-        let addrs: Vec<MultiAddr> = serde_json::from_reader(r).map_err(PeerStoreError::Serde)?;
+        let addrs: Vec<Multiaddr> = serde_json::from_reader(r).map_err(PeerStoreError::Serde)?;
         let mut anchors = Anchors::default();
         addrs.into_iter().for_each(|addr| anchors.add(addr));
         Ok(anchors)
diff --git a/network/src/protocols/identify/protocol.rs b/network/src/protocols/identify/protocol.rs
@@ -74,7 +74,7 @@ impl<'a> IdentifyMessage<'a> {
                 Ok(multi_addr) => {
                     listen_addrs.push(multi_addr);
                 }
-                Err(err) => warn!("failed to decode listen_addr to MultiAddr: {}", err),
+                Err(err) => warn!("failed to decode listen_addr to Multiaddr: {}", err),
             }
         }
 
diff --git a/network/src/proxy.rs b/network/src/proxy.rs
@@ -1,4 +1,4 @@
-use ckb_app_config::Url;
+use url::Url;
 
 pub(crate) fn check_proxy_url(proxy_url: &str) -> Result<(), String> {
     let parsed_url = Url::parse(proxy_url).map_err(|e| e.to_string())?;
@@ -9,6 +9,9 @@ pub(crate) fn check_proxy_url(proxy_url: &str) -> Result<(), String> {
     if scheme.ne("socks5") {
         return Err(format!("CKB doesn't support proxy scheme: {}", scheme));
     }
+    if parsed_url.port().is_none() {
+        return Err(format!("missing port in proxy url: {}", proxy_url));
+    }
     Ok(())
 }
 
diff --git a/network/src/services/outbound_peer.rs b/network/src/services/outbound_peer.rs
@@ -8,7 +8,7 @@ use ckb_systemtime::unix_time_as_millis;
 use futures::{Future, StreamExt};
 use p2p::runtime::{Interval, MissedTickBehavior};
 use p2p::{
-    multiaddr::{MultiAddr, Protocol},
+    multiaddr::{Multiaddr, Protocol},
     service::ServiceControl,
 };
 use rand::prelude::IteratorRandom;
@@ -131,7 +131,7 @@ impl OutboundPeerService {
             paddrs
         };
 
-        let peers: Box<dyn Iterator<Item = MultiAddr>> = if self.try_identify_count > 3 {
+        let peers: Box<dyn Iterator<Item = Multiaddr>> = if self.try_identify_count > 3 {
             self.try_identify_count = 0;
             let len = self.network_state.bootnodes.len();
             if len < count {
diff --git a/resource/ckb.toml b/resource/ckb.toml
@@ -135,7 +135,7 @@ support_protocols = ["Ping", "Discovery", "Identify", "Feeler", "DisconnectMessa
 # [network.onion]
 ### Enable or disable listening on the Onion network.
 ### When set to true, CKB will accept incoming connections over Tor.
-### You can get the onion listening address in log, or by get_node_info RPC
+### You can get the onion listening address in log, or by local_node_info RPC
 # listen_on_onion = true
 
 ### The onion service will proxy incoming traffic to `p2p_listen_address`.
diff --git a/test/src/specs/tor/mod.rs b/test/src/specs/tor/mod.rs
@@ -158,7 +158,7 @@ impl TorServer {
         };
 
         let hashed_password = hashed_password_untrim.trim();
-        info!("got Tor hashed password *** : {}", password, hashed_password);
+        info!("Got Tor hashed password: {}", hashed_password);
         hashed_password.to_string()
     }
 }
diff --git a/test/src/specs/tor/tor_connect.rs b/test/src/specs/tor/tor_connect.rs
@@ -66,7 +66,7 @@ impl Spec for TorConnect {
                             info!("node0 mined a block, node0's tip: {}-{}", tip.number(), tip.hash());
                         }
                         recv(stop_rx) -> _ => {
-                            info!("node0 stoped mine");
+                            info!("node0 stopped mine");
                             return;
                         }
                     };
@@ -87,7 +87,7 @@ impl Spec for TorConnect {
         );
         node2.connect_onion(node0);
         info!(
-            "node0 {} and node1 {} connected, node0 {} and node2 {} conencted",
+            "node0 {} and node1 {} connected, node0 {} and node2 {} connected",
             node0.get_onion_public_addr().unwrap(),
             node1.get_onion_public_addr().unwrap(),
             node0.get_onion_public_addr().unwrap(),
@@ -145,7 +145,7 @@ impl Spec for TorConnect {
         let ticker = ckb_channel::tick(std::time::Duration::from_secs(1));
         ckb_channel::select! {
             recv(ticker) -> _ => {
-                [node0,node1,node2].iter().enumerate().for_each(|( i,_node )|
+                [node0, node1, node2].iter().enumerate().for_each(|(i, _node)|
                     {
                 let tip = node1.rpc_client().get_tip_block_number();
                     info!("node{} tip: {}", i,tip);
diff --git a/test/src/specs/tor/tor_hash_password.rs b/test/src/specs/tor/tor_hash_password.rs
@@ -65,6 +65,6 @@ impl Spec for TorHashPasswordConnect {
         assert!(self.tor_server.lock().controller_password.is_some());
         info!("waiting tor bootstrap.... ");
         self.tor_server.lock().tor_wait_bootstrap_done();
-        info!("tor tor bootstrap done");
+        info!("tor bootstrap done");
     }
 }
diff --git a/test/src/specs/tor/tor_reconnect.rs b/test/src/specs/tor/tor_reconnect.rs
@@ -93,7 +93,7 @@ impl TorReconnect {
         );
         node2.connect_onion(node0);
         info!(
-            "node0 {} and node1 {} connected, node0 {} and node2 {} conencted",
+            "node0 {} and node1 {} connected, node0 {} and node2 {} connected",
             node0.get_onion_public_addr().unwrap(),
             node1.get_onion_public_addr().unwrap(),
             node0.get_onion_public_addr().unwrap(),
@@ -151,7 +151,7 @@ impl TorReconnect {
         let ticker = ckb_channel::tick(std::time::Duration::from_secs(1));
         ckb_channel::select! {
             recv(ticker) -> _ => {
-                [node0,node1,node2].iter().enumerate().for_each(|( i,_node )|
+                [node0, node1, node2].iter().enumerate().for_each(|(i, _node)|
                     {
                 let tip = node1.rpc_client().get_tip_block_number();
                     info!("node{} tip: {}", i,tip);
diff --git a/util/app-config/src/configs/network.rs b/util/app-config/src/configs/network.rs
@@ -136,7 +136,7 @@ pub struct OnionConfig {
     pub p2p_listen_address: Option<String>,
     // path to store onion private key, default is ./data/network/onion_private_key
     pub onion_private_key_path: Option<String>,
-    // tor controller url, example: 127.0.0.1:9050
+    // tor controller url, example: 127.0.0.1:9051
     #[serde(default = "default_tor_controller")]
     pub tor_controller: String,
     // tor controller hashed password
diff --git a/util/launcher/src/lib.rs b/util/launcher/src/lib.rs
@@ -3,7 +3,7 @@
 //! ckb launcher is helps to launch ckb node.
 
 use ckb_app_config::{
-    BlockAssemblerConfig, ExitCode, RpcConfig, RpcModule, RunArgs, SupportProtocol, Url,
+    BlockAssemblerConfig, ExitCode, RpcConfig, RpcModule, RunArgs, SupportProtocol,
 };
 use ckb_async_runtime::Handle;
 use ckb_block_filter::filter::BlockFilter as BlockFilterService;
@@ -13,8 +13,7 @@ use ckb_channel::Receiver;
 use ckb_constant::consensus::ENABLED_SCRIPT_HASH_TYPE;
 use ckb_jsonrpc_types::ScriptHashType;
 use ckb_light_client_protocol_server::LightClientProtocol;
-use ckb_logger::internal::warn;
-use ckb_logger::{error, info};
+use ckb_logger::{error, info, warn};
 use ckb_network::Error;
 use ckb_network::{
     CKBProtocol, Flags, NetworkController, NetworkService, NetworkState, SupportProtocols,
@@ -282,40 +281,15 @@ impl Launcher {
             return Ok(());
         }
         let onion_config = self.args.config.network.onion.clone();
-        let onion_server: String = {
-            match (
-                onion_config.onion_server,
-                self.args.config.network.proxy.proxy_url.clone(),
-            ) {
-                (Some(onion_server), _) => {
-                    info!("CKB use {} as onion server", onion_server);
-                    onion_server
-                }
-                (None, Some(proxy_url)) => {
-                    let parsed_proxy_url = Url::parse(&proxy_url)
-                        .map_err(|err| Error::Config(format!("parse proxy_url failed: {}", err)))?;
-                    match (parsed_proxy_url.host_str(), parsed_proxy_url.port()) {
-                        (Some(host), Some(port)) => format!("{}:{}", host, port),
-                        _ => {
-                            error!(
-                                "CKB tried to use the proxy url: {} as onion server, but failed to parse it",
-                                proxy_url,
-                            );
-                            return Err(Error::Config(format!(
-                                "Failed to parse proxy url: {}",
-                                proxy_url
-                            )));
-                        }
-                    }
-                }
-                _ => {
-                    info!(
-                        "Neither onion_server nor proxy_url is set in the config file, CKB won't listen on the onion hidden network"
-                    );
-                    return Ok(());
-                }
-            }
-        };
+
+        if onion_config.onion_server.is_none() && self.args.config.network.proxy.proxy_url.is_none()
+        {
+            info!(
+                "Neither onion_server nor proxy_url is set in the config file, CKB won't listen on the onion hidden network"
+            );
+            return Ok(());
+        }
+
         let p2p_listen_address: SocketAddr = {
             match onion_config.p2p_listen_address {
                 Some(p2p_listen_address) => {
@@ -391,7 +365,6 @@ impl Launcher {
         }
 
         let onion_service_config: OnionServiceConfig = OnionServiceConfig {
-            onion_server,
             onion_private_key_path: onion_config.onion_private_key_path.unwrap_or(
                 self.args
                     .config
diff --git a/util/logger-service/src/lib.rs b/util/logger-service/src/lib.rs
diff --git a/util/onion/src/lib.rs b/util/onion/src/lib.rs
diff --git a/util/onion/src/onion_service.rs b/util/onion/src/onion_service.rs
diff --git a/util/onion/src/tor_controller.rs b/util/onion/src/tor_controller.rs

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ pub type ProtocolVersion = String;`
`56`	`56`
`57`	`57`	`/// Observe listen port occupancy`
`58`	`58`	`pub async fn observe_listen_port_occupancy(`
`59`		`- _addrs: &[multiaddr::MultiAddr],`
	`59`	`+ _addrs: &[multiaddr::Multiaddr],`
`60`	`60`	`) -> Result<(), std::io::Error> {`
`61`	`61`	`#[cfg(target_os = "linux")]`
`62`	`62`	`{`