small rfks

Author: erhant

compute/src/node/diagnostic.rs

@@ -18,7 +18,7 @@ impl DriaComputeNode {
 
     /// Peer refresh simply reports the peer count to the user.
     pub(crate) async fn handle_diagnostic_refresh(&self) {
-        let mut diagnostics = vec!["Diagnostics:".to_string()];
+        let mut diagnostics = vec![format!("Diagnostics (v{}):", DRIA_COMPUTE_NODE_VERSION)];
 
         // print peer counts
         match self.p2p.peer_counts().await {
@@ -55,9 +55,6 @@ impl DriaComputeNode {
                 .join(", ")
         ));
 
-        // print version
-        diagnostics.push(format!("Version: v{}", DRIA_COMPUTE_NODE_VERSION));
-
         log::info!("{}", diagnostics.join("\n  "));
 
         // check liveness of the node w.r.t last ping-pong time

p2p/src/network.rs

@@ -45,6 +45,7 @@ impl DriaNetworkType {
     pub fn get_static_bootstrap_nodes(&self) -> Vec<Multiaddr> {
         match self {
              DriaNetworkType::Community => [
+              // "/ip4/18.205.158.27/tcp/4001/p2p/16Uiu2HAmB2GFG8oYa7DuivXYEsMUPiiKQ6yq9haQHRHHjJrn7FHo",
                  "/ip4/44.206.245.139/tcp/4001/p2p/16Uiu2HAm4q3LZU2T9kgjKK4ysy6KZYKLq8KiXQyae4RHdF7uqSt4",
                  "/ip4/18.234.39.91/tcp/4001/p2p/16Uiu2HAmJqegPzwuGKWzmb5m3RdSUJ7NhEGWB5jNCd3ca9zdQ9dU",
                  "/ip4/54.242.44.217/tcp/4001/p2p/16Uiu2HAmR2sAoh9F8jT9AZup9y79Mi6NEFVUbwRvahqtWamfabkz",
@@ -62,6 +63,7 @@ impl DriaNetworkType {
     pub fn get_static_relay_nodes(&self) -> Vec<Multiaddr> {
         match self {
              DriaNetworkType::Community => [
+              // "/ip4/3.88.84.50/tcp/4001/p2p/16Uiu2HAmN35mw5MMf3SCUt3TpEU6WnBvjYJQ4ZZeKHRHEkSc4RPq",
                  "/ip4/34.201.33.141/tcp/4001/p2p/16Uiu2HAkuXiV2CQkC9eJgU6cMnJ9SMARa85FZ6miTkvn5fuHNufa",
                  "/ip4/18.232.93.227/tcp/4001/p2p/16Uiu2HAmHeGKhWkXTweHJTA97qwP81ww1W2ntGaebeZ25ikDhd4z",
                  "/ip4/54.157.219.194/tcp/4001/p2p/16Uiu2HAm7A5QVSy5FwrXAJdNNsdfNAcaYahEavyjnFouaEi22dcq",
@@ -74,15 +76,30 @@ impl DriaNetworkType {
          .collect()
     }
 
+    /// Static RPC Peer IDs.
+    #[inline(always)]
+    pub fn get_static_rpc_nodes(&self) -> Vec<Multiaddr> {
+        match self {
+            DriaNetworkType::Community => [
+                // "/ip4/104.28.54.97/tcp/4001/p2p/16Uiu2HAmEcBQRQy4CVCnQ144rnvagKa1fS5uAguwq9S2DRiRmAWE",
+            ]
+            .iter(),
+            DriaNetworkType::Pro => [].iter(),
+            DriaNetworkType::Test => [].iter(),
+        }
+        .map(|s: &&str| s.parse().expect("could not parse static rpc address"))
+        .collect()
+    }
+
     /// Static RPC Peer IDs.
     #[inline(always)]
     pub fn get_static_rpc_peer_ids(&self) -> Vec<PeerId> {
-        // match self {
-        //     DriaNetworkType::Community => [].iter(),
-        //     DriaNetworkType::Pro => [].iter(),
-        // }
-        // .filter_map(|s| s.parse().ok())
-        // .collect()
-        vec![]
+        match self {
+            DriaNetworkType::Community => [].iter(),
+            DriaNetworkType::Pro => [].iter(),
+            DriaNetworkType::Test => [].iter(),
+        }
+        .map(|s: &&str| s.parse().expect("could not parse static rpc peer ids"))
+        .collect()
     }
 }

p2p/src/nodes.rs

@@ -84,6 +84,7 @@ impl DriaNodes {
             .extend(self.network.get_static_bootstrap_nodes());
         self.relay_nodes
             .extend(self.network.get_static_relay_nodes());
+        self.rpc_nodes.extend(self.network.get_static_rpc_nodes());
         self.rpc_peerids
             .extend(self.network.get_static_rpc_peer_ids());