{
- let host = ip.clone().unwrap_or(DEFAULT_NODES_RPC_HOST.to_string());
- Ok(Self {
- endpoint: format!("https://{host}:{port}"),
- })
- }
-
- pub async fn update_node_info(&self, node_info: &mut NodeInstanceInfo) {
- match self.node_info().await {
- Ok((peer_id, bin_version)) => {
- node_info.peer_id = Some(peer_id);
- node_info.bin_version = Some(bin_version);
- }
- Err(err) => logging::log!(
- "Failed to get basic info from running node using RPC endpoint {}: {err:?}",
- self.endpoint
- ),
- }
- }
-
- async fn node_info(&self) -> Result<(String, String), RpcClientError> {
- logging::log!(
- "Sending RPC query to get node's basic info: {} ...",
- self.endpoint
- );
-
- let mut client = SafeNodeClient::connect(self.endpoint.clone()).await?;
- let response = client.node_info(Request::new(NodeInfoRequest {})).await?;
- let node_info = response.get_ref();
-
- let peer_id = bs58::encode(&node_info.peer_id).into_string();
-
- Ok((peer_id, node_info.bin_version.clone()))
- }
-}
diff --git a/src/nodes_list_view.rs b/src/nodes_list_view.rs
index 41f9f3d..0981655 100644
--- a/src/nodes_list_view.rs
+++ b/src/nodes_list_view.rs
@@ -213,21 +213,15 @@ fn NodeInstanceView(
}}
- "RPC API Port: "
+ "Node metrics Port: "
{move || {
info.get()
- .rpc_api_port
+ .metrics_port
.map_or("unknown".to_string(), |v| v.to_string())
}}
-
- "Node metrics Port: "
- {move || {
- info.get().metrics_port.map_or("unknown".to_string(), |v| v.to_string())
- }}
-
"Store cost: "
{move || {
diff --git a/src/server_api.rs b/src/server_api.rs
index bb4899d..5c146cd 100644
--- a/src/server_api.rs
+++ b/src/server_api.rs
@@ -30,7 +30,6 @@ pub struct NodesInstancesInfo {
#[server(ListNodeInstances, "/api", "Url", "/list_nodes")]
pub async fn nodes_instances() -> Result {
let context = expect_context::();
- *context.server_api_hit.lock().await = true;
let latest_bin_version = context.latest_bin_version.lock().await.clone();
let containers = context.docker_client.get_containers_list(true).await?;
@@ -65,15 +64,14 @@ pub async fn nodes_instances() -> Result {
#[server(CreateNodeInstance, "/api", "Url", "/create_node")]
pub async fn create_node_instance(
port: u16,
- rpc_api_port: u16,
metrics_port: u16,
rewards_addr: String,
) -> Result {
let context = expect_context::();
- logging::log!("Creating new node container with port {port}, RPC API port {rpc_api_port} ...");
+ logging::log!("Creating new node container with port {port} ...");
let container_id = context
.docker_client
- .create_new_container(port, rpc_api_port, metrics_port, rewards_addr.clone())
+ .create_new_container(port, metrics_port, rewards_addr.clone())
.await?;
logging::log!("New node container Id: {container_id} ...");
@@ -118,7 +116,18 @@ pub async fn start_node_instance(container_id: ContainerId) -> Result<(), Server
.db_client
.update_node_status(&container_id, NodeStatus::Restarting)
.await;
- context.docker_client.start_container(&container_id).await?;
+
+ let (version, peer_id) = context.docker_client.start_container(&container_id).await?;
+ context
+ .db_client
+ .update_node_metadata_fields(
+ &container_id,
+ &[
+ ("bin_version", &version.unwrap_or_default()),
+ ("peer_id", &peer_id.unwrap_or_default()),
+ ],
+ )
+ .await;
Ok(())
}