ghostchain/ghost-eye
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

dot spinner for all non-existent balances

Browse Source 
Signed-off-by: Uncle Stretch <uncle.stretch@ghostchain.io>
This commit is contained in:
Uncle Stretch 2025-01-20 14:57:18 +03:00
parent 9e77dd816d
commit f9233c6291
Signed by: str3tch
GPG Key ID: 84F3190747EE79AA
7 changed files with 100 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/action.rs
View File

@ -32,7 +32,7 @@ pub enum Action {
ClosePopup, ClosePopup,
BalanceRequest([u8; 32], bool), BalanceRequest([u8; 32], bool),
BalanceResponse([u8; 32], SystemAccount), BalanceResponse([u8; 32], Option<SystemAccount>),
BalanceSetActive(Option<SystemAccount>), BalanceSetActive(Option<SystemAccount>),
RenameAccount(String), RenameAccount(String),
@ -118,5 +118,5 @@ pub enum Action {
GetExistentialDeposit, GetExistentialDeposit,
SetExistentialDeposit(u128), SetExistentialDeposit(u128),
SetTotalIssuance(u128), SetTotalIssuance(Option<u128>),
} }

36
src/components/validator/stash_details.rs
View File

@ -8,6 +8,7 @@ use ratatui::{
}; };
use super::{PartialComponent, Component, CurrentTab}; use super::{PartialComponent, Component, CurrentTab};
use crate::widgets::DotSpinner;
use crate::{ use crate::{
action::Action, action::Action,
config::Config, config::Config,
@ -17,9 +18,9 @@ use crate::{
pub struct StashDetails { pub struct StashDetails {
palette: StylePalette, palette: StylePalette,
is_bonded: bool, is_bonded: bool,
free_balance: u128, free_balance: Option<u128>,
staked_total: u128, staked_total: Option<u128>,
staked_active: u128, staked_active: Option<u128>,
stash_account_id: [u8; 32], stash_account_id: [u8; 32],
} }
@ -37,17 +38,22 @@ impl StashDetails {
Self { Self {
palette: StylePalette::default(), palette: StylePalette::default(),
is_bonded: false, is_bonded: false,
free_balance: 0, free_balance: None,
staked_total: 0, staked_total: None,
staked_active: 0, staked_active: None,
stash_account_id: [0u8; 32], stash_account_id: [0u8; 32],
} }
} }
fn prepare_u128(&self, value: u128) -> String { fn prepare_u128(&self, maybe_value: Option<u128>) -> String {
let value = value as f64 / 10f64.powi(18); match maybe_value {
let after = Self::DECIMALS; Some(value) => {
format!("{:.after$}{}", value, Self::TICKER) let value = value as f64 / 10f64.powi(18);
let after = Self::DECIMALS;
format!("{:.after$}{}", value, Self::TICKER)
},
None => format!("{}{}", DotSpinner::default().to_string(), Self::TICKER)
}
} }
fn is_bonded_to_string(&self) -> String { fn is_bonded_to_string(&self) -> String {
@ -83,13 +89,13 @@ impl Component for StashDetails {
Action::SetStashAccount(account_id) => self.stash_account_id = account_id, Action::SetStashAccount(account_id) => self.stash_account_id = account_id,
Action::SetBondedAmount(is_bonded) => self.is_bonded = is_bonded, Action::SetBondedAmount(is_bonded) => self.is_bonded = is_bonded,
Action::SetStakedAmountRatio(total, active) => { Action::SetStakedAmountRatio(total, active) => {
self.staked_total = total; self.staked_total = Some(total);
self.staked_active = active; self.staked_active = Some(active);
}, },
Action::BalanceResponse(account_id, balance) if account_id == self.stash_account_id => { Action::BalanceResponse(account_id, maybe_balance) if account_id == self.stash_account_id => {
self.free_balance = balance.free self.free_balance = maybe_balance.map(|balance| balance.free
.saturating_sub(balance.frozen) .saturating_sub(balance.frozen)
.saturating_sub(balance.reserved); .saturating_sub(balance.reserved));
}, },
_ => {} _ => {}
}; };

38
src/components/wallet/accounts.rs
View File

@ -15,18 +15,17 @@ use ratatui::{
}, },
Frame Frame
}; };
use subxt::{ use subxt::ext::sp_core::{
ext::sp_core::{ Pair as PairT,
Pair as PairT, sr25519::Pair,
sr25519::Pair, crypto::{Ss58Codec, Ss58AddressFormat, AccountId32},
crypto::{Ss58Codec, Ss58AddressFormat, AccountId32},
},
}; };
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use super::{PartialComponent, Component, CurrentTab}; use super::{PartialComponent, Component, CurrentTab};
use crate::types::{SystemAccount, ActionLevel}; use crate::types::{SystemAccount, ActionLevel};
use crate::widgets::DotSpinner;
use crate::{ use crate::{
action::Action, action::Action,
config::Config, config::Config,
@ -59,6 +58,9 @@ impl Default for Accounts {
} }
impl Accounts { impl Accounts {
const TICKER: &str = " CSPR";
const DECIMALS: usize = 3;
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
is_active: false, is_active: false,
@ -353,9 +355,15 @@ impl Accounts {
self.set_used_account(i); self.set_used_account(i);
} }
fn prepare_u128(&self, value: u128, after: usize, ticker: Option<&str>) -> String { fn prepare_u128(&self, maybe_value: Option<u128>) -> String {
let value = value as f64 / 10f64.powi(18); match maybe_value {
format!("{:.after$}{}", value, ticker.unwrap_or_default()) Some(value) => {
let value = value as f64 / 10f64.powi(18);
let after = Self::DECIMALS;
format!("{:.after$}{}", value, Self::TICKER)
}
None => format!("{}{}", DotSpinner::default().to_string(), Self::TICKER)
}
} }
} }
@ -402,9 +410,12 @@ impl Component for Accounts {
match action { match action {
Action::NewAccount(name) => self.create_new_account(name), Action::NewAccount(name) => self.create_new_account(name),
Action::UpdateAccountName(new_name) => self.rename_account(new_name), Action::UpdateAccountName(new_name) => self.rename_account(new_name),
Action::BalanceResponse(account_id, balance) => { Action::BalanceResponse(account_id, maybe_balance) => {
if self.wallet_keys.iter().any(|wallet| wallet.account_id == account_id) { if self.wallet_keys.iter().any(|wallet| wallet.account_id == account_id) {
let _ = self.balances.insert(account_id, balance); let _ = match maybe_balance {
Some(balance) => self.balances.insert(account_id, balance),
None => self.balances.remove(&account_id),
};
if let Some(index) = self.table_state.selected() { if let Some(index) = self.table_state.selected() {
if self.wallet_keys[index].account_id == account_id { if self.wallet_keys[index].account_id == account_id {
self.set_balance_active(index); self.set_balance_active(index);
@ -445,12 +456,11 @@ impl Component for Accounts {
.map(|info| { .map(|info| {
let balance = self.balances let balance = self.balances
.get(&info.account_id) .get(&info.account_id)
.map(|b| b.free) .map(|b| b.free);
.unwrap_or_default();
Row::new(vec![ Row::new(vec![
Cell::from(Text::from(info.name.clone()).alignment(Alignment::Left)), Cell::from(Text::from(info.name.clone()).alignment(Alignment::Left)),
Cell::from(Text::from(info.address.clone()).alignment(Alignment::Center)), Cell::from(Text::from(info.address.clone()).alignment(Alignment::Center)),
Cell::from(Text::from(self.prepare_u128(balance, 2, Some(" CSPR"))).alignment(Alignment::Right)), Cell::from(Text::from(self.prepare_u128(balance)).alignment(Alignment::Right)),
]) ])
}), }),
[ [

19
src/components/wallet/address_book.rs
View File

@ -53,6 +53,9 @@ impl Default for AddressBook {
} }
impl AddressBook { impl AddressBook {
const TICKER: &str = " CSPR";
const DECIMALS: usize = 3;
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
is_active: false, is_active: false,
@ -305,13 +308,14 @@ impl AddressBook {
self.scroll_state = self.scroll_state.position(i); self.scroll_state = self.scroll_state.position(i);
} }
fn prepare_u128(&self, maybe_value: Option<u128>, ticker: Option<&str>, after: usize) -> String { fn prepare_u128(&self, maybe_value: Option<u128>) -> String {
match maybe_value { match maybe_value {
Some(value) => { Some(value) => {
let value = value as f64 / 10f64.powi(18); let value = value as f64 / 10f64.powi(18);
format!("{:.after$}{}", value, ticker.unwrap_or_default()) let after = Self::DECIMALS;
format!("{:.after$}{}", value, Self::TICKER)
}, },
None => DotSpinner::default().to_string(), None => format!("{}{}", DotSpinner::default().to_string(), Self::TICKER)
} }
} }
} }
@ -360,9 +364,12 @@ impl Component for AddressBook {
self.rename_record(new_name), self.rename_record(new_name),
Action::NewAddressBookRecord(name, address) => Action::NewAddressBookRecord(name, address) =>
self.add_new_record(name, address), self.add_new_record(name, address),
Action::BalanceResponse(account_id, balance) => { Action::BalanceResponse(account_id, maybe_balance) => {
if self.address_book.iter().any(|record| record.account_id == account_id) { if self.address_book.iter().any(|record| record.account_id == account_id) {
let _ = self.balances.insert(account_id, balance); let _ = match maybe_balance {
Some(balance) => self.balances.insert(account_id, balance),
None => self.balances.remove(&account_id),
};
} }
}, },
_ => {} _ => {}
@ -407,7 +414,7 @@ impl Component for AddressBook {
Row::new(vec![ Row::new(vec![
Cell::from(Text::from(info.name.clone()).alignment(Alignment::Left)), Cell::from(Text::from(info.name.clone()).alignment(Alignment::Left)),
Cell::from(Text::from(info.address.clone()).alignment(Alignment::Center)), Cell::from(Text::from(info.address.clone()).alignment(Alignment::Center)),
Cell::from(Text::from(self.prepare_u128(balance, Some(" CSPR"), 2)).alignment(Alignment::Right)), Cell::from(Text::from(self.prepare_u128(balance)).alignment(Alignment::Right)),
]) ])
}), }),
[ [

46
src/components/wallet/balance.rs
View File

@ -32,7 +32,8 @@ impl Default for Balance {
} }
impl Balance { impl Balance {
const DECIMALS_FOR_BALANCE: usize = 5; const TICKER: &str = " CSPR";
const DECIMALS: usize = 6;
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
@ -46,13 +47,14 @@ impl Balance {
} }
} }
fn prepare_u128(&self, maybe_value: Option<u128>, ticker: Option<&str>, after: usize) -> String { fn prepare_u128(&self, maybe_value: Option<u128>) -> String {
match maybe_value { match maybe_value {
Some(value) => { Some(value) => {
let value = value as f64 / 10f64.powi(18); let value = value as f64 / 10f64.powi(18);
format!("{:.after$}{}", value, ticker.unwrap_or_default()) let after = Self::DECIMALS;
format!("{:.after$}{}", value, Self::TICKER)
}, },
None => DotSpinner::default().to_string() None => format!("{}{}", DotSpinner::default().to_string(), Self::TICKER)
} }
} }
} }
@ -84,15 +86,15 @@ impl Component for Balance {
Action::BalanceSetActive(maybe_balance) => { Action::BalanceSetActive(maybe_balance) => {
match maybe_balance { match maybe_balance {
Some(balance) => { Some(balance) => {
self.transferable_balance = Some(balance.free); self.total_balance = Some(balance.free);
self.locked_balance = Some(balance.reserved); self.locked_balance = Some(balance.reserved);
self.bonded_balance = Some(balance.frozen); self.bonded_balance = Some(balance.frozen);
self.nonce = Some(balance.nonce);
let total_balance = balance.free let transferable = balance.free
.saturating_add(balance.reserved) .saturating_add(balance.reserved)
.saturating_add(balance.frozen); .saturating_add(balance.frozen);
self.total_balance = Some(total_balance); self.transferable_balance = Some(transferable);
self.nonce = Some(balance.nonce);
}, },
None => { None => {
self.transferable_balance = None; self.transferable_balance = None;
@ -117,38 +119,26 @@ impl Component for Balance {
[ [
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("nonce: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("nonce: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.nonce
self.nonce.map(|n| n as u128), .map(|n| n.to_string())
None, .unwrap_or(DotSpinner::default().to_string())
0)).alignment(Alignment::Right)), ).alignment(Alignment::Right)),
]), ]),
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("account: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("account: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.prepare_u128(self.total_balance)).alignment(Alignment::Right)),
self.total_balance,
Some(" CSPR"),
Self::DECIMALS_FOR_BALANCE)).alignment(Alignment::Right)),
]), ]),
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("free: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("free: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.prepare_u128(self.transferable_balance)).alignment(Alignment::Right))
self.transferable_balance,
Some(" CSPR"),
Self::DECIMALS_FOR_BALANCE)).alignment(Alignment::Right))
]), ]),
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("locked: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("locked: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.prepare_u128(self.locked_balance)).alignment(Alignment::Right)),
self.locked_balance,
Some(" CSPR"),
Self::DECIMALS_FOR_BALANCE)).alignment(Alignment::Right)),
]), ]),
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("bonded: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("bonded: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.prepare_u128(self.bonded_balance)).alignment(Alignment::Right)),
self.bonded_balance,
Some(" CSPR"),
Self::DECIMALS_FOR_BALANCE)).alignment(Alignment::Right)),
]), ]),
], ],
[ [

32
src/components/wallet/overview.rs
View File

@ -10,7 +10,7 @@ use super::{Component, PartialComponent, CurrentTab};
use crate::{ use crate::{
action::Action, action::Action,
config::Config, config::Config,
palette::StylePalette, palette::StylePalette, widgets::DotSpinner,
}; };
#[derive(Debug)] #[derive(Debug)]
@ -28,7 +28,8 @@ impl Default for Overview {
} }
impl Overview { impl Overview {
const DECIMALS_FOR_BALANCE: usize = 6; const TICKER: &str = " CSPR";
const DECIMALS: usize = 6;
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
@ -39,9 +40,15 @@ impl Overview {
} }
} }
fn prepare_u128(&self, value: u128, after: usize) -> String { fn prepare_u128(&self, maybe_value: Option<u128>) -> String {
let value = value as f64 / 10f64.powi(18); match maybe_value {
format!("{:.after$}", value) Some(value) => {
let value = value as f64 / 10f64.powi(18);
let after = Self::DECIMALS;
format!("{:.after$}{}", value, Self::TICKER)
},
None => format!("{}{}", DotSpinner::default().to_string(), Self::TICKER)
}
} }
} }
@ -70,7 +77,7 @@ impl Component for Overview {
fn update(&mut self, action: Action) -> Result<Option<Action>> { fn update(&mut self, action: Action) -> Result<Option<Action>> {
match action { match action {
Action::SetExistentialDeposit(ed) => self.existential_balance = Some(ed), Action::SetExistentialDeposit(ed) => self.existential_balance = Some(ed),
Action::SetTotalIssuance(issuance) => self.total_issuance = Some(issuance), Action::SetTotalIssuance(maybe_issuance) => self.total_issuance = maybe_issuance,
_ => {} _ => {}
}; };
Ok(None) Ok(None)
@ -85,25 +92,16 @@ impl Component for Overview {
[ [
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("total supply: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("total supply: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.prepare_u128(self.total_issuance)).alignment(Alignment::Right)),
self.total_issuance.unwrap_or_default(),
Self::DECIMALS_FOR_BALANCE,
)).alignment(Alignment::Center)),
Cell::from(Text::from("CSPR".to_string()).alignment(Alignment::Right)),
]), ]),
Row::new(vec![ Row::new(vec![
Cell::from(Text::from("min deposit: ".to_string()).alignment(Alignment::Left)), Cell::from(Text::from("min deposit: ".to_string()).alignment(Alignment::Left)),
Cell::from(Text::from(self.prepare_u128( Cell::from(Text::from(self.prepare_u128(self.existential_balance)).alignment(Alignment::Right)),
self.existential_balance.unwrap_or_default(),
Self::DECIMALS_FOR_BALANCE,
)).alignment(Alignment::Center)),
Cell::from(Text::from("CSPR".to_string()).alignment(Alignment::Right)),
]), ]),
], ],
[ [
Constraint::Max(15), Constraint::Max(15),
Constraint::Min(0), Constraint::Min(0),
Constraint::Length(5),
] ]
) )
.block(Block::bordered() .block(Block::bordered()

21
src/network/predefined_calls.rs
View File

@ -111,10 +111,9 @@ pub async fn get_total_issuance(
action_tx: &UnboundedSender<Action>, action_tx: &UnboundedSender<Action>,
api: &OnlineClient<CasperConfig>, api: &OnlineClient<CasperConfig>,
) -> Result<()> { ) -> Result<()> {
let total_issuance = super::raw_calls::balances::total_issuance(api, None) let maybe_total_issuance = super::raw_calls::balances::total_issuance(api, None)
.await? .await?;
.unwrap_or_default(); action_tx.send(Action::SetTotalIssuance(maybe_total_issuance))?;
action_tx.send(Action::SetTotalIssuance(total_issuance))?;
Ok(()) Ok(())
} }
@ -133,21 +132,15 @@ pub async fn get_balance(
account_id: &[u8; 32], account_id: &[u8; 32],
) -> Result<()> { ) -> Result<()> {
let maybe_balance = super::raw_calls::system::balance(api, None, account_id) let maybe_balance = super::raw_calls::system::balance(api, None, account_id)
.await?; .await?
.map(|balance| SystemAccount {
let balance = match maybe_balance {
Some(balance) => {
SystemAccount {
nonce: balance.nonce, nonce: balance.nonce,
free: balance.data.free, free: balance.data.free,
reserved: balance.data.reserved, reserved: balance.data.reserved,
frozen: balance.data.frozen, frozen: balance.data.frozen,
} }
}, );
None => SystemAccount::default(), action_tx.send(Action::BalanceResponse(*account_id, maybe_balance))?;
};
action_tx.send(Action::BalanceResponse(*account_id, balance))?;
Ok(()) Ok(())
} }