diff --git a/Cargo.toml b/Cargo.toml index 7df200a..cf175ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "ghost-eye" authors = ["str3tch "] description = "Application for interacting with Casper/Ghost nodes that are exposing RPC only to the localhost" -version = "0.3.20" +version = "0.3.21" edition = "2021" [dependencies] diff --git a/src/action.rs b/src/action.rs index fe07df4..5334622 100644 --- a/src/action.rs +++ b/src/action.rs @@ -59,6 +59,7 @@ pub enum Action { ValidateFrom([u8; 32], u32), ChillFrom([u8; 32]), UnbondFrom([u8; 32], u128), + RebondFrom([u8; 32], u128), EventLog(String, ActionLevel, ActionTarget), NewBestBlock(u32), diff --git a/src/components/validator/mod.rs b/src/components/validator/mod.rs index 05a2937..5f87e3f 100644 --- a/src/components/validator/mod.rs +++ b/src/components/validator/mod.rs @@ -27,6 +27,7 @@ mod rotate_popup; mod validate_popup; mod chill_popup; mod unbond_popup; +mod rebond_popup; use stash_details::StashDetails; use staking_details::StakingDetails; @@ -44,6 +45,7 @@ use rotate_popup::RotatePopup; use validate_popup::ValidatePopup; use chill_popup::ChillPopup; use unbond_popup::UnbondPopup; +use rebond_popup::RebondPopup; #[derive(Debug, Copy, Clone, PartialEq)] pub enum CurrentTab { @@ -61,6 +63,7 @@ pub enum CurrentTab { ValidatePopup, ChillPopup, UnbondPopup, + RebondPopup, } pub trait PartialComponent: Component { @@ -97,6 +100,7 @@ impl Default for Validator { Box::new(ValidatePopup::default()), Box::new(ChillPopup::default()), Box::new(UnbondPopup::default()), + Box::new(RebondPopup::default()), ], } } @@ -160,6 +164,7 @@ impl Component for Validator { CurrentTab::ValidatePopup | CurrentTab::ChillPopup | CurrentTab::UnbondPopup | + CurrentTab::RebondPopup | CurrentTab::PayoutPopup => match key.code { KeyCode::Esc => { self.current_tab = self.previous_tab; @@ -229,6 +234,13 @@ impl Component for Validator { component.set_active(self.current_tab.clone()); } }, + KeyCode::Char('D') => { + self.previous_tab = self.current_tab; + self.current_tab = CurrentTab::RebondPopup; + for component in self.components.iter_mut() { + component.set_active(self.current_tab.clone()); + } + }, _ => { for component in self.components.iter_mut() { component.handle_key_event(key)?; diff --git a/src/components/validator/rebond_popup.rs b/src/components/validator/rebond_popup.rs new file mode 100644 index 0000000..3e9798e --- /dev/null +++ b/src/components/validator/rebond_popup.rs @@ -0,0 +1,173 @@ +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; +use color_eyre::Result; +use ratatui::{ + layout::{Position, Alignment, Constraint, Flex, Layout, Rect}, + widgets::{Block, Clear, Paragraph}, + Frame +}; +use tokio::sync::mpsc::UnboundedSender; +use std::sync::mpsc::Sender; + +use super::{Component, PartialComponent, CurrentTab}; +use crate::{ + action::Action, + config::Config, + palette::StylePalette, + types::{ActionLevel, ActionTarget}, + widgets::{Input, InputRequest}, +}; + +#[derive(Debug)] +pub struct RebondPopup { + is_active: bool, + action_tx: Option>, + network_tx: Option>, + secret_seed: [u8; 32], + amount: Input, + palette: StylePalette +} + +impl Default for RebondPopup { + fn default() -> Self { + Self::new() + } +} + +impl RebondPopup { + pub fn new() -> Self { + Self { + is_active: false, + secret_seed: [0u8; 32], + action_tx: None, + network_tx: None, + amount: Input::new(String::new()), + palette: StylePalette::default(), + } + } +} + +impl RebondPopup { + fn log_event(&mut self, message: String, level: ActionLevel) { + if let Some(action_tx) = &self.action_tx { + let _ = action_tx.send( + Action::EventLog(message, level, ActionTarget::ValidatorLog)); + } + } + + fn submit_message(&mut self) { + if let Some(network_tx) = &self.network_tx { + match self.amount.value().parse::() { + Ok(value) => { + let amount = (value * 1_000_000_000_000_000_000.0) as u128; + let _ = network_tx.send(Action::RebondFrom(self.secret_seed, amount)); + if let Some(action_tx) = &self.action_tx { + let _ = action_tx.send(Action::ClosePopup); + } + }, + Err(err) => self.log_event( + format!("invalid amount, error: {err}"), ActionLevel::Error), + } + } + } + + fn enter_char(&mut self, new_char: char) { + let is_separator_needed = !self.amount.value().contains('.') && new_char == '.'; + if new_char.is_digit(10) || is_separator_needed { + let _ = self.amount.handle(InputRequest::InsertChar(new_char)); + } + } + + fn delete_char(&mut self) { + let _ = self.amount.handle(InputRequest::DeletePrevChar); + } + + fn move_cursor_right(&mut self) { + let _ = self.amount.handle(InputRequest::GoToNextChar); + } + + fn move_cursor_left(&mut self) { + let _ = self.amount.handle(InputRequest::GoToPrevChar); + } +} + +impl PartialComponent for RebondPopup { + fn set_active(&mut self, current_tab: CurrentTab) { + match current_tab { + CurrentTab::RebondPopup => self.is_active = true, + _ => { + self.is_active = false; + self.amount = Input::new(String::new()); + } + }; + } +} + +impl Component for RebondPopup { + fn register_network_handler(&mut self, tx: Sender) -> Result<()> { + self.network_tx = Some(tx); + Ok(()) + } + + fn register_action_handler(&mut self, tx: UnboundedSender) -> Result<()> { + self.action_tx = Some(tx); + Ok(()) + } + + fn register_config_handler(&mut self, config: Config) -> Result<()> { + if let Some(style) = config.styles.get(&crate::app::Mode::Wallet) { + self.palette.with_normal_style(style.get("normal_style").copied()); + self.palette.with_normal_border_style(style.get("normal_border_style").copied()); + self.palette.with_normal_title_style(style.get("normal_title_style").copied()); + self.palette.with_popup_style(style.get("popup_style").copied()); + self.palette.with_popup_title_style(style.get("popup_title_style").copied()); + } + Ok(()) + } + fn handle_key_event(&mut self, key: KeyEvent) -> Result> { + if self.is_active && key.kind == KeyEventKind::Press { + match key.code { + KeyCode::Enter => self.submit_message(), + KeyCode::Char(to_insert) => self.enter_char(to_insert), + KeyCode::Backspace => self.delete_char(), + KeyCode::Left => self.move_cursor_left(), + KeyCode::Right => self.move_cursor_right(), + KeyCode::Esc => self.is_active = false, + _ => {}, + }; + } + Ok(None) + } + + fn update(&mut self, action: Action) -> Result> { + match action { + Action::SetStashSecret(secret_seed) => self.secret_seed = secret_seed, + _ => {} + }; + Ok(None) + } + + fn draw(&mut self, frame: &mut Frame, area: Rect) -> Result<()> { + if self.is_active { + let (border_style, border_type) = self.palette.create_popup_style(); + let input = Paragraph::new(self.amount.value()) + .block(Block::bordered() + .border_style(border_style) + .border_type(border_type) + .title_style(self.palette.create_popup_title_style()) + .title_alignment(Alignment::Right) + .title(format!("Amount to rebond"))); + let v = Layout::vertical([Constraint::Max(3)]).flex(Flex::Center); + let h = Layout::horizontal([Constraint::Max(50)]).flex(Flex::Center); + let [area] = v.areas(area); + let [area] = h.areas(area); + + frame.render_widget(Clear, area); + frame.render_widget(input, area); + frame.set_cursor_position(Position::new( + area.x + self.amount.cursor() as u16 + 1, + area.y + 1 + )); + } + Ok(()) + } +} diff --git a/src/network/mod.rs b/src/network/mod.rs index f0d3d14..b55c8f4 100644 --- a/src/network/mod.rs +++ b/src/network/mod.rs @@ -384,6 +384,24 @@ impl Network { } Ok(()) } + Action::RebondFrom(sender, amount) => { + let sender_str = hex::encode(sender); + let maybe_nonce = self.senders.get_mut(&sender_str); + if let Ok(tx_progress) = predefined_txs::rebond( + &self.action_tx, + &self.online_client_api, + &sender, + &amount, + maybe_nonce, + ).await { + self.transactions_to_watch.push(TxToWatch { + tx_progress, + sender: sender_str, + target: ActionTarget::ValidatorLog, + }); + } + Ok(()) + } _ => Ok(()) } } diff --git a/src/network/predefined_txs.rs b/src/network/predefined_txs.rs index adfa56b..f0fa0e4 100644 --- a/src/network/predefined_txs.rs +++ b/src/network/predefined_txs.rs @@ -191,6 +191,25 @@ pub async fn unbond( ).await } +pub async fn rebond( + action_tx: &UnboundedSender, + api: &OnlineClient, + sender: &[u8; 32], + amount: &u128, + maybe_nonce: Option<&mut u32>, +) -> Result>> { + let rebond_tx = casper_network::tx().staking().rebond(*amount); + inner_sign_and_submit_then_watch( + action_tx, + api, + sender, + maybe_nonce, + Box::new(rebond_tx), + "rebond", + ActionTarget::ValidatorLog, + ).await +} + async fn inner_sign_and_submit_then_watch( action_tx: &UnboundedSender, api: &OnlineClient,