github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-10-20 07:18:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

stratum: wallet selection, wallet api port saving, fix stratum config saving, modules optimization

Browse Source
This commit is contained in:
ardocrat
2024-08-01 01:59:51 +03:00
parent c64477e870
commit 38bb68736b
24 changed files with 396 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/content.rs
+3 -1
View File
@@ -19,11 +19,13 @@ use lazy_static::lazy_static;
use crate::gui::Colors;
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{Modal, NetworkContent, NodeSetup, View, WalletsContent};
use crate::gui::views::{Modal, View};
use crate::gui::views::types::ModalContainer;
use crate::node::Node;
use crate::AppConfig;
use crate::gui::icons::{CHECK, CHECK_FAT};
use crate::gui::views::network::{NetworkContent, NodeSetup};
use crate::gui::views::wallets::WalletsContent;
lazy_static! {
/// Global state to check if [`NetworkContent`] panel is open.
src/gui/views/mod.rs
+2 -4
View File
@@ -26,11 +26,9 @@ pub use modal::*;
mod content;
pub use content::*;
mod network;
pub use network::*;
pub mod network;
mod wallets;
pub use wallets::*;
pub mod wallets;
mod camera;
pub use camera::*;
src/gui/views/network/connections.rs
+3 -2
View File
@@ -18,8 +18,9 @@ use crate::AppConfig;
use crate::gui::Colors;
use crate::gui::icons::{CARET_RIGHT, CHECK_CIRCLE, COMPUTER_TOWER, DOTS_THREE_CIRCLE, GLOBE_SIMPLE, PENCIL, PLUS_CIRCLE, POWER, TRASH, X_CIRCLE};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{Modal, NodeSetup, View};
use crate::gui::views::modals::ExternalConnectionModal;
use crate::gui::views::{Modal, View};
use crate::gui::views::network::modals::ExternalConnectionModal;
use crate::gui::views::network::NodeSetup;
use crate::gui::views::types::{ModalContainer, ModalPosition};
use crate::node::{Node, NodeConfig};
use crate::wallet::{ConnectionsConfig, ExternalConnection};
src/gui/views/network/content.rs
+2 -1
View File
@@ -20,7 +20,8 @@ use crate::AppConfig;
use crate::gui::Colors;
use crate::gui::icons::{ARROWS_COUNTER_CLOCKWISE, BRIEFCASE, DATABASE, DOTS_THREE_OUTLINE_VERTICAL, FACTORY, FADERS, GAUGE, POWER};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{ConnectionsContent, NetworkMetrics, NetworkMining, NetworkNode, NetworkSettings, Content, TitlePanel, View};
use crate::gui::views::{Content, TitlePanel, View};
use crate::gui::views::network::{ConnectionsContent, NetworkMetrics, NetworkMining, NetworkNode, NetworkSettings};
use crate::gui::views::network::types::{NetworkTab, NetworkTabType};
use crate::gui::views::types::{TitleContentType, TitleType};
use crate::node::{Node, NodeError};
src/gui/views/network/metrics.rs
+2 -1
View File
@@ -19,7 +19,8 @@ use grin_servers::{DiffBlock, ServerStats};
use crate::gui::Colors;
use crate::gui::icons::{AT, COINS, CUBE_TRANSPARENT, HOURGLASS_LOW, HOURGLASS_MEDIUM, TIMER};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{NetworkContent, Content, View};
use crate::gui::views::{Content, View};
use crate::gui::views::network::NetworkContent;
use crate::gui::views::network::types::{NetworkTab, NetworkTabType};
use crate::node::Node;
src/gui/views/network/mining.rs
+2 -1
View File
@@ -20,7 +20,8 @@ use grin_servers::WorkerStats;
use crate::gui::Colors;
use crate::gui::icons::{BARBELL, CLOCK_AFTERNOON, CPU, CUBE, FADERS, FOLDER_DASHED, FOLDER_SIMPLE_MINUS, FOLDER_SIMPLE_PLUS, HARD_DRIVES, PLUGS, PLUGS_CONNECTED, POLYGON};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{NetworkContent, Content, View};
use crate::gui::views::{Content, View};
use crate::gui::views::network::NetworkContent;
use crate::gui::views::network::setup::StratumSetup;
use crate::gui::views::network::types::{NetworkTab, NetworkTabType};
use crate::node::{Node, NodeConfig};
src/gui/views/network/node.rs
+2 -1
View File
@@ -19,7 +19,8 @@ use grin_servers::PeerStats;
use crate::gui::Colors;
use crate::gui::icons::{AT, CUBE, DEVICES, FLOW_ARROW, HANDSHAKE, PACKAGE, SHARE_NETWORK};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{NetworkContent, Content, View};
use crate::gui::views::{Content, View};
use crate::gui::views::network::NetworkContent;
use crate::gui::views::network::types::{NetworkTab, NetworkTabType};
use crate::node::{Node, NodeConfig};
src/gui/views/network/setup/node.rs
+2 -1
View File
@@ -19,7 +19,8 @@ use crate::AppConfig;
use crate::gui::Colors;
use crate::gui::icons::{CLOCK_CLOCKWISE, COMPUTER_TOWER, PLUG, POWER, SHIELD, SHIELD_SLASH};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{Modal, NetworkContent, View};
use crate::gui::views::{Modal, View};
use crate::gui::views::network::NetworkContent;
use crate::gui::views::network::settings::NetworkSettings;
use crate::gui::views::types::{ModalContainer, ModalPosition, TextEditOptions};
use crate::node::{Node, NodeConfig};
src/gui/views/network/setup/stratum.rs
+59 -25
View File
@@ -20,11 +20,17 @@ use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{Modal, View};
use crate::gui::views::network::settings::NetworkSettings;
use crate::gui::views::types::{ModalContainer, ModalPosition, TextEditOptions};
use crate::gui::views::wallets::modals::WalletsModal;
use crate::node::{Node, NodeConfig};
use crate::wallet::WalletConfig;
use crate::wallet::{WalletConfig, WalletList};
/// Stratum server setup section content.
pub struct StratumSetup {
/// Wallet list to select for mining rewards.
wallets: WalletList,
/// Wallets [`Modal`] content.
wallets_modal: WalletsModal,
/// IP Addresses available at system.
available_ips: Vec<String>,
@@ -49,6 +55,8 @@ pub struct StratumSetup {
modal_ids: Vec<&'static str>
}
/// Identifier for wallet selection [`Modal`].
const WALLET_SELECTION_MODAL: &'static str = "stratum_wallet_selection_modal";
/// Identifier for stratum port [`Modal`].
const STRATUM_PORT_MODAL: &'static str = "stratum_port";
/// Identifier for attempt time [`Modal`].
@@ -60,12 +68,21 @@ impl Default for StratumSetup {
fn default() -> Self {
let (ip, port) = NodeConfig::get_stratum_address();
let is_port_available = NodeConfig::is_stratum_port_available(&ip, &port);
let wallet_name = if let Some(id) = NodeConfig::get_stratum_wallet_id() {
// Setup mining rewards wallet name and identifier.
let mut wallet_id = NodeConfig::get_stratum_wallet_id();
let wallet_name = if let Some(id) = wallet_id {
WalletConfig::name_by_id(id)
} else {
None
};
if wallet_name.is_none() {
wallet_id = None;
}
Self {
wallets: WalletList::default(),
wallets_modal: WalletsModal::new(wallet_id),
available_ips: NodeConfig::get_ip_addrs(),
stratum_port_edit: port,
stratum_port_available_edit: is_port_available,
@@ -74,6 +91,7 @@ impl Default for StratumSetup {
attempt_time_edit: NodeConfig::get_stratum_attempt_time(),
min_share_diff_edit: NodeConfig::get_stratum_min_share_diff(),
modal_ids: vec![
WALLET_SELECTION_MODAL,
STRATUM_PORT_MODAL,
ATTEMPT_TIME_MODAL,
MIN_SHARE_DIFF_MODAL
@@ -92,6 +110,10 @@ impl ModalContainer for StratumSetup {
modal: &Modal,
cb: &dyn PlatformCallbacks) {
match modal.id {
WALLET_SELECTION_MODAL => self.wallets_modal.ui(ui, modal, &self.wallets, |id| {
NodeConfig::save_stratum_wallet_id(id);
self.wallet_name = WalletConfig::name_by_id(id);
}),
STRATUM_PORT_MODAL => self.port_modal(ui, modal, cb),
ATTEMPT_TIME_MODAL => self.attempt_modal(ui, modal, cb),
MIN_SHARE_DIFF_MODAL => self.min_diff_modal(ui, modal, cb),
@@ -110,7 +132,7 @@ impl StratumSetup {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
// Show loading indicator or controls to start/stop stratum server if port is available.
// Show loading indicator or controls to start/stop stratum server.
if self.is_port_available && self.wallet_name.is_some() {
if Node::is_stratum_starting() || Node::is_stratum_stopping() {
ui.vertical_centered(|ui| {
@@ -150,30 +172,32 @@ impl StratumSetup {
);
}
ui.add_space(8.0);
View::horizontal_line(ui, Colors::item_stroke());
ui.add_space(8.0);
// Show wallet name.
ui.label(RichText::new(self.wallet_name.as_ref().unwrap_or(&"-".to_string()))
.size(16.0)
.color(Colors::white_or_black(true)));
ui.add_space(8.0);
// Show button to select wallet.
View::button(ui, t!("network_settings.choose_wallet"), Colors::button(), || {
self.show_wallets_modal();
});
ui.add_space(12.0);
if self.wallet_name.is_some() {
ui.label(RichText::new(t!("network_settings.stratum_wallet_warning"))
.size(16.0)
.color(Colors::inactive_text())
);
ui.add_space(12.0);
}
View::horizontal_line(ui, Colors::item_stroke());
ui.add_space(6.0);
});
View::horizontal_line(ui, Colors::item_stroke());
ui.add_space(6.0);
// Show wallet name.
ui.add_space(2.0);
ui.label(RichText::new(t!("wallets.wallet"))
.size(16.0)
.color(Colors::gray()));
ui.add_space(2.0);
ui.label(RichText::new(self.wallet_name.as_ref().unwrap_or(&"-".to_string()))
.size(16.0)
.color(Colors::white_or_black(true)));
ui.add_space(8.0);
View::button(ui, t!("network_settings.choose_wallet"), Colors::button(), || {
//TODO: select wallet
});
ui.add_space(12.0);
View::horizontal_line(ui, Colors::item_stroke());
ui.add_space(6.0);
// Show message when IP addresses are not available on the system.
if self.available_ips.is_empty() {
NetworkSettings::no_ip_address_ui(ui);
@@ -210,6 +234,16 @@ impl StratumSetup {
});
}
/// Show wallet selection [`Modal`].
fn show_wallets_modal(&mut self) {
self.wallets_modal = WalletsModal::new(NodeConfig::get_stratum_wallet_id());
// Show modal.
Modal::new(WALLET_SELECTION_MODAL)
.position(ModalPosition::Center)
.title(t!("network_settings.choose_wallet"))
.show();
}
/// Draw stratum port value setup content.
fn port_setup_ui(&mut self, ui: &mut egui::Ui, cb: &dyn PlatformCallbacks) {
ui.label(RichText::new(t!("network_settings.stratum_port"))
src/gui/views/wallets/content.rs
+5 -6
View File
@@ -53,6 +53,8 @@ pub struct WalletsContent {
modal_ids: Vec<&'static str>
}
/// Identifier for connection selection [`Modal`].
const CONNECTION_SELECTION_MODAL: &'static str = "wallets_connection_selection_modal";
/// Identifier for wallet opening [`Modal`].
const OPEN_WALLET_MODAL: &'static str = "open_wallet_modal";
@@ -69,7 +71,7 @@ impl Default for WalletsContent {
modal_ids: vec![
OPEN_WALLET_MODAL,
WalletCreation::NAME_PASS_MODAL,
WalletConnectionModal::ID,
CONNECTION_SELECTION_MODAL,
]
}
}
@@ -89,7 +91,7 @@ impl ModalContainer for WalletsContent {
WalletCreation::NAME_PASS_MODAL => {
self.creation_content.name_pass_modal_ui(ui, modal, cb)
},
WalletConnectionModal::ID => {
CONNECTION_SELECTION_MODAL => {
if let Some(content) = self.conn_modal_content.as_mut() {
content.ui(ui, modal, cb, |id| {
let list = self.wallets.list();
@@ -415,9 +417,6 @@ impl WalletsContent {
ui.painter().rect(rect, rounding, bg, stroke);
ui.allocate_ui_with_layout(rect.size(), Layout::right_to_left(Align::Center), |ui| {
// Setup padding for item buttons.
ui.style_mut().spacing.button_padding = egui::vec2(14.0, 0.0);
if !wallet.is_open() {
// Show button to open closed wallet.
View::item_button(ui, View::item_rounding(0, 1, true), FOLDER_OPEN, None, || {
@@ -520,7 +519,7 @@ impl WalletsContent {
let ext_conn = wallet.get_current_ext_conn();
self.conn_modal_content = Some(WalletConnectionModal::new(ext_conn));
// Show modal.
Modal::new(WalletConnectionModal::ID)
Modal::new(CONNECTION_SELECTION_MODAL)
.position(ModalPosition::CenterTop)
.title(t!("wallets.conn_method"))
.show();
src/gui/views/wallets/mod.rs
+1 -1
View File
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
mod modals;
pub mod modals;
mod creation;
mod content;
src/gui/views/wallets/modals/conn.rs
+5 -7
View File
@@ -18,11 +18,12 @@ use egui::scroll_area::ScrollBarVisibility;
use crate::gui::Colors;
use crate::gui::icons::{CHECK, CHECK_FAT, PLUS_CIRCLE};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{ConnectionsContent, Modal, View};
use crate::gui::views::modals::ExternalConnectionModal;
use crate::gui::views::{Modal, View};
use crate::gui::views::network::ConnectionsContent;
use crate::gui::views::network::modals::ExternalConnectionModal;
use crate::wallet::{ConnectionsConfig, ExternalConnection};
/// Wallet connection content.
/// Wallet connection [`Modal`] content.
pub struct WalletConnectionModal {
/// Current external connection.
pub ext_conn: Option<ExternalConnection>,
@@ -35,9 +36,6 @@ pub struct WalletConnectionModal {
}
impl WalletConnectionModal {
/// Identifier for [`Modal`].
pub const ID: &'static str = "select_connection_modal";
/// Create from provided wallet connection.
pub fn new(ext_conn: Option<ExternalConnection>) -> Self {
ExternalConnection::check_ext_conn_availability(None);
@@ -69,7 +67,7 @@ impl WalletConnectionModal {
.max_height(if ext_conn_list.len() < 4 {
330.0
} else {
323.0
350.0
})
.id_source("integrated_node")
.scroll_bar_visibility(ScrollBarVisibility::AlwaysHidden)
src/gui/views/wallets/modals/mod.rs
+4 -1
View File
@@ -13,4 +13,7 @@
// limitations under the License.
mod conn;
pub use conn::*;
pub use conn::*;
mod wallets;
pub use wallets::*;
src/gui/views/wallets/modals/wallets.rs
+135
View File
@@ -0,0 +1,135 @@
// Copyright 2024 The Grim Developers
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use egui::scroll_area::ScrollBarVisibility;
use egui::{Align, Layout, RichText, ScrollArea};
use crate::gui::Colors;
use crate::gui::icons::{CHECK, CHECK_FAT, COMPUTER_TOWER, GLOBE_SIMPLE, PLUGS_CONNECTED};
use crate::gui::views::{Modal, View};
use crate::wallet::{Wallet, WalletList};
/// Wallet list [`Modal`] content
pub struct WalletsModal {
/// Selected wallet id.
selected: Option<i64>
}
impl WalletsModal {
pub fn new(selected: Option<i64>) -> Self {
Self {
selected,
}
}
/// Draw [`Modal`] content.
pub fn ui(&mut self,
ui: &mut egui::Ui,
modal: &Modal,
wallets: &WalletList,
mut on_select: impl FnMut(i64)) {
ui.add_space(4.0);
ScrollArea::vertical()
.max_height(373.0)
.id_source("select_wallet_list")
.scroll_bar_visibility(ScrollBarVisibility::AlwaysHidden)
.auto_shrink([true; 2])
.show(ui, |ui| {
ui.add_space(2.0);
ui.vertical_centered(|ui| {
for wallet in wallets.list() {
// Draw wallet list item.
self.wallet_item_ui(ui, wallet, modal, |id| {
on_select(id);
});
ui.add_space(5.0);
}
});
});
ui.add_space(2.0);
View::horizontal_line(ui, Colors::stroke());
ui.add_space(6.0);
// Show button to close modal.
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
});
});
ui.add_space(6.0);
}
/// Draw wallet list item.
fn wallet_item_ui(&mut self,
ui: &mut egui::Ui,
wallet: &Wallet,
modal: &Modal,
mut on_select: impl FnMut(i64)) {
let config = wallet.get_config();
let id = config.id;
// Draw round background.
let mut rect = ui.available_rect_before_wrap();
rect.set_height(78.0);
let rounding = View::item_rounding(0, 1, false);
ui.painter().rect(rect, rounding, Colors::fill(), View::hover_stroke());
ui.allocate_ui_with_layout(rect.size(), Layout::right_to_left(Align::Center), |ui| {
// Draw button to select wallet.
let current = self.selected.unwrap_or(0) == id;
if current {
ui.add_space(12.0);
ui.label(RichText::new(CHECK_FAT).size(20.0).color(Colors::green()));
} else {
View::item_button(ui, View::item_rounding(0, 1, true), CHECK, None, || {
on_select(id);
modal.close();
});
}
let layout_size = ui.available_size();
ui.allocate_ui_with_layout(layout_size, Layout::left_to_right(Align::Center), |ui| {
ui.add_space(6.0);
ui.vertical(|ui| {
ui.add_space(3.0);
// Setup wallet name text.
ui.with_layout(Layout::left_to_right(Align::Min), |ui| {
ui.add_space(1.0);
View::ellipsize_text(ui, config.name, 18.0, Colors::title(false));
});
// Setup wallet API text.
let address = if let Some(port) = config.api_port {
format!("127.0.0.1:{}", port)
} else {
"-".to_string()
};
let api_text = format!("{} {}", PLUGS_CONNECTED, address);
ui.label(RichText::new(api_text).size(15.0).color(Colors::text(false)));
ui.add_space(1.0);
// Setup wallet connection text.
let conn = if let Some(conn) = wallet.get_current_ext_conn() {
format!("{} {}", GLOBE_SIMPLE, conn.url)
} else {
format!("{} {}", COMPUTER_TOWER, t!("network.node"))
};
View::ellipsize_text(ui, conn, 15.0, Colors::gray());
ui.add_space(3.0);
});
});
});
}
}
src/gui/views/wallets/wallet/settings/connection.rs
+3 -2
View File
@@ -17,8 +17,9 @@ use egui::{Align, Layout, RichText};
use crate::gui::Colors;
use crate::gui::icons::{CHECK, CHECK_CIRCLE, CHECK_FAT, DOTS_THREE_CIRCLE, GLOBE, GLOBE_SIMPLE, PLUS_CIRCLE, X_CIRCLE};
use crate::gui::platform::PlatformCallbacks;
use crate::gui::views::{ConnectionsContent, Modal, View};
use crate::gui::views::modals::ExternalConnectionModal;
use crate::gui::views::{Modal, View};
use crate::gui::views::network::ConnectionsContent;
use crate::gui::views::network::modals::ExternalConnectionModal;
use crate::gui::views::types::{ModalContainer, ModalPosition};
use crate::wallet::{ConnectionsConfig, ExternalConnection, Wallet};
use crate::wallet::types::ConnectionMethod;