feat: minor adjustments to formatting and information display

Author: devwckd

cli/src/cli/agent.rs

@@ -1,5 +1,5 @@
 use tabled::Table;
-use torus_client::client::TorusClient;
+use torus_client::{client::TorusClient, subxt::utils::AccountId32};
 
 use crate::{
     cli::CliCtx,
@@ -37,6 +37,7 @@ pub enum AgentCliSubCommand {
 
 #[derive(tabled::Tabled)]
 struct AgentInfo {
+    address: String,
     name: String,
     metadata: String,
     url: String,
@@ -46,13 +47,15 @@ struct AgentInfo {
 
 impl AgentInfo {
     fn new(
+        address: String,
         name: Vec<u8>,
         metadata: Vec<u8>,
         url: Vec<u8>,
         last_update_block: u64,
         registration_block: u64,
     ) -> Self {
         Self {
+            address,
             name: String::from_utf8_lossy(&name[..]).to_string(),
             metadata: String::from_utf8_lossy(&metadata[..]).to_string(),
             url: String::from_utf8_lossy(&url[..]).to_string(),
@@ -67,39 +70,7 @@ pub async fn info(ctx: &CliCtx, account: String) -> anyhow::Result<()> {
 
     println!("Fetching agent data...");
 
-    let agent_info = if ctx.is_testnet() {
-        let client = TorusClient::for_testnet().await?;
-        client
-            .torus0()
-            .storage()
-            .agents_get(&account)
-            .await?
-            .map(|agent| {
-                AgentInfo::new(
-                    agent.name.0,
-                    agent.metadata.0,
-                    agent.url.0,
-                    agent.last_update_block,
-                    agent.registration_block,
-                )
-            })
-    } else {
-        let client = TorusClient::for_mainnet().await?;
-        client
-            .torus0()
-            .storage()
-            .agents_get(&account)
-            .await?
-            .map(|agent| {
-                AgentInfo::new(
-                    agent.name.0,
-                    agent.metadata.0,
-                    agent.url.0,
-                    agent.last_update_block,
-                    agent.registration_block,
-                )
-            })
-    };
+    let agent_info = get_agent_info(ctx, &account).await?;
 
     if let Some(agent_info) = agent_info {
         let table = Table::kv(std::iter::once(agent_info));
@@ -136,7 +107,7 @@ pub async fn register(
                 name.as_bytes().to_vec(),
                 url.as_bytes().to_vec(),
                 metadata.as_bytes().to_vec(),
-                keypair,
+                keypair.clone(),
             )
             .await?;
     } else {
@@ -148,12 +119,61 @@ pub async fn register(
                 name.as_bytes().to_vec(),
                 url.as_bytes().to_vec(),
                 metadata.as_bytes().to_vec(),
-                keypair,
+                keypair.clone(),
             )
             .await?;
     };
 
+    let agent_info = get_agent_info(ctx, &keypair.account()).await?;
+    let Some(agent_info) = agent_info else {
+        println!("Something went wrong...");
+        return Ok(());
+    };
+
     println!("Agent registered successfully!");
 
+    let table = Table::kv(std::iter::once(agent_info));
+    println!("{table}");
+
     Ok(())
 }
+
+async fn get_agent_info(ctx: &CliCtx, account: &AccountId32) -> anyhow::Result<Option<AgentInfo>> {
+    let agent_info = if ctx.is_testnet() {
+        let client = TorusClient::for_testnet().await?;
+        client
+            .torus0()
+            .storage()
+            .agents_get(account)
+            .await?
+            .map(|agent| {
+                AgentInfo::new(
+                    agent.key.to_string(),
+                    agent.name.0,
+                    agent.metadata.0,
+                    agent.url.0,
+                    agent.last_update_block,
+                    agent.registration_block,
+                )
+            })
+    } else {
+        let client = TorusClient::for_mainnet().await?;
+        client
+            .torus0()
+            .storage()
+            .agents_get(account)
+            .await?
+            .map(|agent| {
+                AgentInfo::new(
+                    agent.key.to_string(),
+                    agent.name.0,
+                    agent.metadata.0,
+                    agent.url.0,
+                    agent.last_update_block,
+                    agent.registration_block,
+                )
+            })
+    };
+
+    Ok(agent_info)
+}

cli/src/cli/balance.rs

@@ -12,6 +12,7 @@ use torus_client::{
 use crate::{
     cli::CliCtx,
     store::{get_account, get_key},
+    util::torus,
 };
 
 #[derive(clap::Args)]
@@ -65,10 +66,10 @@ pub async fn check(ctx: &CliCtx, key: String) -> anyhow::Result<()> {
     .unwrap_or((0, 0, 0));
 
     let mut table = Table::new(vec![
-        (("free".to_string()), data.0.to_string()),
+        (("free".to_string()), torus(data.0)),
         (
             ("reserved (stake + others)".to_string()),
-            (data.1 + data.2).to_string(),
+            torus(data.1 + data.2),
         ),
     ]);
     table.with(Remove::row(FirstRow));
@@ -89,7 +90,7 @@ pub async fn transfer(
 
     let target = AccountId32::from_str(&target)?;
 
-    ctx.confirm(&format!("transfer {amount} to {target}"))?;
+    ctx.confirm(&format!("transfer {} to {target}", torus(amount)))?;
 
     println!("Transfering...");
 

cli/src/cli/namespace.rs

@@ -7,6 +7,7 @@ use torus_client::{
 use crate::{
     cli::CliCtx,
     store::{get_account, get_key},
+    util::torus,
 };
 
 #[derive(clap::Args)]
@@ -94,7 +95,9 @@ pub async fn register(ctx: &CliCtx, key: String, path: String) -> anyhow::Result
     };
 
     ctx.confirm(&format!(
-        "register namespace {path} for a fee of {fee} and deposit of {deposit}"
+        "register namespace {path} for a fee of {} and deposit of {}",
+        torus(fee),
+        torus(deposit),
     ))?;
 
     println!("Registering namespace...");

cli/src/cli/stake.rs

@@ -9,6 +9,7 @@ use torus_client::{
 use crate::{
     cli::CliCtx,
     store::{get_account, get_key},
+    util::torus,
 };
 
 #[derive(clap::Parser)]
@@ -65,12 +66,14 @@ pub enum StakeCliSubCommand {
 #[derive(tabled::Tabled)]
 struct StakingEntry {
     target: String,
-    amount: u128,
+    amount: String,
 }
 
 pub async fn given(ctx: &CliCtx, key: String) -> anyhow::Result<()> {
     let account = get_account(&key)?;
 
+    println!("Fetching given stake...");
+
     let staking = if ctx.is_testnet() {
         let client = TorusClient::for_testnet().await?;
         client
@@ -91,15 +94,22 @@ pub async fn given(ctx: &CliCtx, key: String) -> anyhow::Result<()> {
             .await?
     };
 
-    let staking = staking
-        .into_iter()
+    let mut entries = staking
+        .iter()
         .map(|((_, target), amount)| StakingEntry {
             target: target.to_string(),
-            amount,
-        });
+            amount: torus(*amount),
+        })
+        .collect::<Vec<_>>();
 
-    let table = Table::new(staking);
+    let sum = staking.iter().map(|(_, amount)| *amount).sum::<u128>();
 
+    entries.push(StakingEntry {
+        target: "".to_string(),
+        amount: torus(sum),
+    });
+
+    let table = Table::new(entries);
     println!("{table}");
 
     Ok(())
@@ -108,12 +118,14 @@ pub async fn given(ctx: &CliCtx, key: String) -> anyhow::Result<()> {
 #[derive(tabled::Tabled)]
 struct StakedEntry {
     source: String,
-    amount: u128,
+    amount: String,
 }
 
 pub async fn received(ctx: &CliCtx, key: String) -> anyhow::Result<()> {
     let account = get_account(&key)?;
 
+    println!("Fetching received stake...");
+
     let staked = if ctx.is_testnet() {
         let client = TorusClient::for_testnet().await?;
         client
@@ -134,13 +146,22 @@ pub async fn received(ctx: &CliCtx, key: String) -> anyhow::Result<()> {
             .await?
     };
 
-    let staked = staked.into_iter().map(|((_, source), amount)| StakedEntry {
-        source: source.to_string(),
-        amount,
-    });
+    let mut entries = staked
+        .iter()
+        .map(|((_, target), amount)| StakedEntry {
+            source: target.to_string(),
+            amount: torus(*amount),
+        })
+        .collect::<Vec<_>>();
 
-    let table = Table::new(staked);
+    let sum = staked.iter().map(|(_, amount)| *amount).sum::<u128>();
+
+    entries.push(StakedEntry {
+        source: "".to_string(),
+        amount: torus(sum),
+    });
 
+    let table = Table::new(entries);
     println!("{table}");
 
     Ok(())
@@ -152,7 +173,7 @@ pub async fn add(ctx: &CliCtx, key: String, target: String, amount: u128) -> any
 
     let target = AccountId32::from_str(&target)?;
 
-    ctx.confirm(&format!("add {amount} stake to {target}"))?;
+    ctx.confirm(&format!("add {} stake to {target}", torus(amount)))?;
 
     println!("Staking...");
 
@@ -183,7 +204,7 @@ pub async fn remove(ctx: &CliCtx, key: String, target: String, amount: u128) ->
 
     let target = AccountId32::from_str(&target)?;
 
-    ctx.confirm(&format!("remove {amount} stake from {target}"))?;
+    ctx.confirm(&format!("remove {} stake from {target}", torus(amount)))?;
 
     println!("Unstaking...");
 
@@ -222,7 +243,8 @@ pub async fn transfer(
     let target = AccountId32::from_str(&target)?;
 
     ctx.confirm(&format!(
-        "transfer {amount} stake from {source} to {target}"
+        "transfer {} stake from {source} to {target}",
+        torus(amount)
     ))?;
 
     println!("Transfering stake...");

cli/src/keypair.rs

@@ -15,6 +15,7 @@ use torus_client::subxt::{
 use crate::store::Key;
 
 #[allow(clippy::large_enum_variant)]
+#[derive(Clone)]
 pub enum Keypair {
     ED25519(ed25519::Pair),
     SR25519(sr25519::Pair),

cli/src/main.rs

@@ -1,6 +1,7 @@
 mod cli;
 mod keypair;
 mod store;
+mod util;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {

cli/src/util.rs

@@ -0,0 +1,3 @@
+pub fn torus(amount: u128) -> String {
+    format!("{:.5}", amount as u128 / 10u128.pow(18))
+}