dft

PolyhedraZK · Oct 8, 2024 · 86950b7 · 86950b7
1 parent 0d9a1a8
commit 86950b7
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/src/cfg/mod.rs b/src/cfg/mod.rs
@@ -1,6 +1,5 @@
 use chaindev::{beacon_ddev::HostExpression, NodeID};
 use clap::{Args, Parser, Subcommand};
-use ruc::*;
 use std::env;
 
 #[derive(Parser, Debug)]

diff --git a/src/common.rs b/src/common.rs
@@ -147,3 +147,13 @@ impl NodePorts for Ports {
         self.cl_vc_rpc
     }
 }
+
+/// Return: "enode,enode,enode"
+pub fn el_get_bootnodes(rpc_endpoints: &[&str]) -> Result<String> {
+    todo!()
+}
+
+/// Return: "enr,enr,enr"
+pub fn cl_get_bootnodes(rpc_endpoints: &[&str]) -> Result<String> {
+    todo!()
+}
diff --git a/src/dev.rs b/src/dev.rs
@@ -187,7 +187,24 @@ impl NodeCmdGenerator<Node<Ports>, EnvMeta<CustomInfo, Node<Ports>>> for CmdGene
         let ext_ip = &e.host_ip;
         let local_ip = &e.host_ip;
 
-        let online_nodes = e.nodes_should_be_online.iter().take(3);
+        let online_nodes = e
+            .nodes_should_be_online
+            .iter()
+            .copied()
+            .take(3)
+            .collect::<Vec<_>>();
+        let (el_rpc_endpoints, cl_bn_rpc_endpoints): (Vec<_>, Vec<_>) = e
+            .nodes
+            .values()
+            .chain(e.bootstraps.values())
+            .filter(|n| online_nodes.contains(&n.id))
+            .map(|n| {
+                (
+                    format!("http://{}:{}", &e.host_ip, n.ports.el_rpc),
+                    format!("http://{}:{}", &e.host_ip, n.ports.cl_bn_rpc),
+                )
+            })
+            .unzip();
 
         let el_cmd = if GETH_MARK == mark {
             let geth = &e.custom_data.el_geth_bin;
@@ -200,7 +217,12 @@ impl NodeCmdGenerator<Node<Ports>, EnvMeta<CustomInfo, Node<Ports>>> for CmdGene
             let el_engine_port = n.ports.el_engine_api;
             let el_metric_port = n.ports.el_metric;
 
-            let el_bootnodes = ""; // TODO HTTP REQ
+            let el_rpc_endpoints = el_rpc_endpoints
+                .iter()
+                .map(|i| i.as_str())
+                .collect::<Vec<_>>();
+            let el_bootnodes =
+                info!(el_get_bootnodes(&el_rpc_endpoints)).unwrap_or_default();
 
             let el_gc_mode = if matches!(n.kind, NodeKind::ArchiveNode) {
                 "archive"
@@ -244,7 +266,7 @@ fi
             let cmd_run_part_1 = if el_bootnodes.is_empty() {
                 String::new()
             } else {
-                format!(" --bootnodes={el_bootnodes}")
+                format!(" --bootnodes='{el_bootnodes}'")
             };
 
             let cmd_run_part_2 = format!(" >>{el_dir}/{EL_LOG_NAME} 2>&1 ");
@@ -256,7 +278,15 @@ fi
             pnk!(Err(eg!("The fucking world is over!")))
         };
 
-        let cl_bn_cmd = format!("");
+        let cl_bn_cmd = {
+            let cl_bn_rpc_endpoints = cl_bn_rpc_endpoints
+                .iter()
+                .map(|i| i.as_str())
+                .collect::<Vec<_>>();
+
+            format!("")
+        };
+
         let cl_vc_cmd = format!("");
 
         format!(