fix(vn/ui): committee bucket information

sdbondi · Aug 14, 2023 · e707f17 · e707f17
1 parent ac8ddb9
commit e707f17
Show file tree

Hide file tree

Showing 44 changed files with 711 additions and 490 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_indexer_web_ui/src/utils/json_rpc.tsx b/applications/tari_indexer_web_ui/src/utils/json_rpc.tsx
@@ -61,7 +61,7 @@ async function getCommsStats() {
   return await jsonRpc('get_comms_stats');
 }
 async function getAllVns(epoch: number) {
-  return await jsonRpc('get_all_vns', epoch);
+  return await jsonRpc('get_network_validators', {epoch});
 }
 async function getConnections() {
   return await jsonRpc('get_connections');

diff --git a/applications/tari_validator_node/Cargo.toml b/applications/tari_validator_node/Cargo.toml
@@ -46,6 +46,7 @@ clap = { version = "3.2.5", features = ["env"] }
 config = "0.13.0"
 futures = { version = "^0.3.1" }
 include_dir = "0.7.2"
+indexmap = "2.0.0"
 json5 = "0.2.2"
 libsqlite3-sys = { version = "0.25", features = ["bundled"] }
 lmdb-zero = "0.4.4"

diff --git a/applications/tari_validator_node/src/json_rpc/handlers.rs b/applications/tari_validator_node/src/json_rpc/handlers.rs
@@ -28,6 +28,7 @@ use axum_jrpc::{
     JsonRpcExtractor,
     JsonRpcResponse,
 };
+use indexmap::IndexMap;
 use log::*;
 use serde::Serialize;
 use serde_json::{self as json, json};
@@ -54,10 +55,12 @@ use tari_state_store_sqlite::SqliteStateStore;
 use tari_validator_node_client::types::{
     AddPeerRequest,
     AddPeerResponse,
+    CommitteeShardInfo,
     DryRunTransactionFinalizeResult,
     GetCommitteeRequest,
     GetEpochManagerStatsResponse,
     GetIdentityResponse,
+    GetNetworkCommitteeResponse,
     GetRecentTransactionsResponse,
     GetShardKey,
     GetStateRequest,
@@ -533,10 +536,29 @@ impl JsonRpcHandlers {
                 ),
             )
         })?;
+        let committee_shard = if is_valid {
+            self.epoch_manager
+                .get_local_committee_shard(current_epoch)
+                .await
+                .map(Some)
+                .map_err(|err| {
+                    JsonRpcResponse::error(
+                        answer_id,
+                        JsonRpcError::new(
+                            JsonRpcErrorReason::InternalError,
+                            format!("Could not get committee shard:{}", err),
+                            json::Value::Null,
+                        ),
+                    )
+                })?
+        } else {
+            None
+        };
         let response = GetEpochManagerStatsResponse {
             current_epoch,
             current_block_height,
             is_valid,
+            committee_shard,
         };
         Ok(JsonRpcResponse::success(answer_id, response))
     }
@@ -637,6 +659,54 @@ impl JsonRpcHandlers {
         }
     }
 
+    pub async fn get_network_committees(&self, value: JsonRpcExtractor) -> JrpcResult {
+        let answer_id = value.get_answer_id();
+        let current_epoch = self
+            .epoch_manager
+            .current_epoch()
+            .await
+            .map_err(internal_error(answer_id))?;
+        let num_committees = self
+            .epoch_manager
+            .get_num_committees(current_epoch)
+            .await
+            .map_err(internal_error(answer_id))?;
+
+        let mut validators = self
+            .epoch_manager
+            .get_all_validator_nodes(current_epoch)
+            .await
+            .map_err(internal_error(answer_id))?;
+
+        validators.sort_by(|vn_a, vn_b| vn_b.committee_bucket.cmp(&vn_a.committee_bucket));
+        // Group by bucket, IndexMap used to preserve ordering
+        let mut validators_per_bucket = IndexMap::with_capacity(validators.len());
+        for validator in validators {
+            validators_per_bucket
+                .entry(
+                    validator
+                        .committee_bucket
+                        .expect("validator committee bucket must have been populated within valid epoch"),
+                )
+                .or_insert_with(Vec::new)
+                .push(validator);
+        }
+
+        let committees = validators_per_bucket
+            .into_iter()
+            .map(|(bucket, validators)| CommitteeShardInfo {
+                bucket,
+                shard_range: bucket.to_shard_range(num_committees),
+                validators,
+            })
+            .collect();
+
+        Ok(JsonRpcResponse::success(answer_id, GetNetworkCommitteeResponse {
+            current_epoch,
+            committees,
+        }))
+    }
+
     pub async fn get_all_vns(&self, value: JsonRpcExtractor) -> JrpcResult {
         let answer_id = value.get_answer_id();
         let epoch: u64 = value.parse_params()?;

diff --git a/applications/tari_validator_node/src/json_rpc/server.rs b/applications/tari_validator_node/src/json_rpc/server.rs
@@ -79,6 +79,7 @@ async fn handler(Extension(handlers): Extension<Arc<JsonRpcHandlers>>, value: Js
         "get_shard_key" => handlers.get_shard_key(value).await,
         "get_committee" => handlers.get_committee(value).await,
         "get_all_vns" => handlers.get_all_vns(value).await,
+        "get_network_committees" => handlers.get_network_committees(value).await,
         "get_fees" => handlers.get_validator_fees(value).await,
         // Comms
         "add_peer" => handlers.add_peer(value).await,

diff --git a/applications/tari_validator_node_web_ui/package-lock.json b/applications/tari_validator_node_web_ui/package-lock.json
diff --git a/applications/tari_validator_node_web_ui/package.json b/applications/tari_validator_node_web_ui/package.json
@@ -52,6 +52,7 @@
     ]
   },
   "devDependencies": {
-    "@types/mermaid": "^9.2.0"
+    "@types/mermaid": "^9.2.0",
+    "prettier": "3.0.1"
   }
 }