Merge pull request #1286 from nervosnetwork/copilot/fix-graph-nodes-rpc-onion-addresses

fix: include onion3 addresses when storing remote node announcements in graph

Author: quake

crates/fiber-lib/src/fiber/tests/utils.rs

@@ -1,7 +1,53 @@
+use std::str::FromStr;
+
 use tempfile::NamedTempFile;
+use tentacle::multiaddr::Multiaddr;
 
 use crate::utils::encrypt_decrypt_file::decrypt_from_file;
 use crate::utils::encrypt_decrypt_file::encrypt_to_file;
+use crate::utils::is_addr_reachable;
+
+#[test]
+fn test_is_addr_reachable_with_onion3_address() {
+    let onion3_addr = Multiaddr::from_str(
+        "/onion3/vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd:8228",
+    )
+    .expect("valid onion3 multiaddr");
+    assert!(
+        is_addr_reachable(&onion3_addr),
+        "onion3 address should be considered reachable"
+    );
+}
+
+#[test]
+fn test_is_addr_reachable_with_private_ip() {
+    let private_addr =
+        Multiaddr::from_str("/ip4/192.168.1.1/tcp/8228").expect("valid private ip multiaddr");
+    assert!(
+        !is_addr_reachable(&private_addr),
+        "private IP address should not be considered reachable"
+    );
+}
+
+#[test]
+fn test_is_addr_reachable_with_public_ip() {
+    let public_addr =
+        Multiaddr::from_str("/ip4/1.1.1.1/tcp/8228").expect("valid public ip multiaddr");
+    assert!(
+        is_addr_reachable(&public_addr),
+        "public IP address should be considered reachable"
+    );
+}
+
+#[test]
+fn test_is_addr_reachable_with_dns4_address() {
+    let dns4_addr =
+        Multiaddr::from_str("/dns4/example.com/tcp/8228").expect("valid dns4 multiaddr");
+    assert!(
+        is_addr_reachable(&dns4_addr),
+        "dns4 address should be considered reachable"
+    );
+}
 
 #[test]
 fn test_encrypt_and_decrypt_success() {

crates/fiber-lib/src/utils/mod.rs

@@ -13,12 +13,18 @@ use tentacle::utils::{is_reachable, multiaddr_to_socketaddr};
 ///
 /// For DNS-based addresses (`Dns4`/`Dns6`), we treat them as always reachable
 /// because a DNS name implies a publicly resolvable endpoint.
+///
+/// For Tor onion addresses (`Onion3`), we treat them as always reachable
+/// because they are publicly accessible via the Tor network.
 pub(crate) fn is_addr_reachable(addr: &Multiaddr) -> bool {
-    let has_dns = addr
-        .iter()
-        .any(|proto| matches!(proto, Protocol::Dns4(_) | Protocol::Dns6(_)));
+    let has_public_protocol = addr.iter().any(|proto| {
+        matches!(
+            proto,
+            Protocol::Dns4(_) | Protocol::Dns6(_) | Protocol::Onion3(_)
+        )
+    });
 
-    if has_dns {
+    if has_public_protocol {
         return true;
     }