Merge pull request #1953 from mintlayer/prettify_wallet_cli_help

Prettify wallet-cli help; require mnemonic during wallet recovery

Author: ImplOfAnImpl

Cargo.lock

@@ -126,7 +126,7 @@ utxo = { path = "utxo" }
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.85"
+rust-version = "1.88"
 version = "1.0.2"
 license = "MIT"
 

Cargo.toml

@@ -45,6 +45,7 @@ use wallet_rpc_client::handles_client::WalletRpcHandlesClient;
 use wallet_rpc_lib::{types::HardwareWalletType, EventStream, WalletRpc, WalletService};
 use wallet_types::{
     scan_blockchain::ScanBlockchain, wallet_type::WalletType, with_locked::WithLocked,
+    ImportOrCreate,
 };
 
 use super::{
@@ -60,7 +61,6 @@ use super::{
     p2p_event_handler::P2pEventHandler,
     parse_address, parse_coin_amount,
     wallet_events::GuiWalletEvents,
-    ImportOrCreate,
 };
 
 const TRANSACTION_LIST_PAGE_COUNT: usize = 10;

node-gui/backend/src/backend_impl.rs

@@ -16,14 +16,12 @@
 pub mod error;
 pub mod messages;
 
+mod account_id;
 mod backend_impl;
 mod chainstate_event_handler;
 mod p2p_event_handler;
 mod wallet_events;
 
-mod account_id;
-use wallet_types::scan_blockchain::ScanBlockchain;
-
 use std::fmt::Debug;
 use std::sync::Arc;
 
@@ -54,21 +52,6 @@ pub enum InitNetwork {
     Regtest,
 }
 
-#[derive(Debug, Clone, Copy)]
-pub enum ImportOrCreate {
-    Import,
-    Create,
-}
-
-impl ImportOrCreate {
-    pub fn should_scan_blockchain(&self) -> ScanBlockchain {
-        match self {
-            Self::Create => ScanBlockchain::SkipScanning,
-            Self::Import => ScanBlockchain::ScanNoWait,
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy)]
 pub enum WalletMode {
     Cold,

node-gui/backend/src/lib.rs

@@ -35,9 +35,9 @@ use wallet::account::transaction_list::TransactionList;
 use wallet_cli_commands::ConsoleCommand;
 use wallet_controller::types::{Balances, WalletExtraInfo, WalletTypeArgs};
 use wallet_rpc_lib::types::PoolInfo;
-use wallet_types::wallet_type::WalletType;
+use wallet_types::{wallet_type::WalletType, ImportOrCreate};
 
-use super::{AccountId, BackendError, ImportOrCreate};
+use super::{AccountId, BackendError};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct WalletId(u64);

node-gui/backend/src/messages.rs

@@ -30,13 +30,13 @@ use node_gui_backend::{
         BackendEvent, BackendRequest, EncryptionAction, SignedTransactionWrapper, TransactionInfo,
         WalletId, WalletInfo,
     },
-    BackendSender, ImportOrCreate, InitializedNode,
+    BackendSender, InitializedNode,
 };
 use p2p::{net::types::services::Services, types::peer_id::PeerId, P2pEvent};
 use rfd::AsyncFileDialog;
 use wallet_cli_commands::ConsoleCommand;
 use wallet_controller::types::WalletTypeArgs;
-use wallet_types::{seed_phrase::StoreSeedPhrase, wallet_type::WalletType};
+use wallet_types::{seed_phrase::StoreSeedPhrase, wallet_type::WalletType, ImportOrCreate};
 
 #[cfg(feature = "trezor")]
 use crate::widgets::create_hw_wallet::hw_wallet_create_dialog;

node-gui/src/main_window/mod.rs

@@ -22,7 +22,8 @@ use iced::{
     Element, Length, Theme,
 };
 use iced_aw::Card;
-use node_gui_backend::ImportOrCreate;
+
+use wallet_types::ImportOrCreate;
 
 pub struct CreateHwWalletDialog<Message> {
     on_import: Box<dyn Fn() -> Message>,

node-gui/src/widgets/create_hw_wallet.rs

@@ -44,6 +44,8 @@ use common::{
     primitives::Amount,
 };
 
+use crate::scan_blockchain::ScanBlockchain;
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SignedTxWithFees {
     pub tx: SignedTransaction,
@@ -55,3 +57,18 @@ impl SignedTxWithFees {
         self.tx.transaction()
     }
 }
+
+#[derive(Debug, Clone, Copy)]
+pub enum ImportOrCreate {
+    Import,
+    Create,
+}
+
+impl ImportOrCreate {
+    pub fn should_scan_blockchain(&self) -> ScanBlockchain {
+        match self {
+            Self::Create => ScanBlockchain::SkipScanning,
+            Self::Import => ScanBlockchain::ScanNoWait,
+        }
+    }
+}

wallet/types/src/lib.rs

@@ -31,11 +31,14 @@ wallet-rpc-client = { path = "../wallet-rpc-client" }
 clap = { workspace = true, features = ["derive"] }
 async-trait.workspace = true
 crossterm.workspace = true
+derive_more.workspace = true
 directories.workspace = true
 dyn-clone.workspace = true
 humantime.workspace = true
 hex.workspace = true
 itertools.workspace = true
+lazy_static.workspace = true
+regex.workspace = true
 reedline = { workspace = true, features = ["external_printer"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
@@ -57,6 +60,7 @@ subsystem = { path = "../../subsystem" }
 test-utils = { path = "../../test-utils" }
 wallet-test-node = { path = "../wallet-test-node" }
 
+jsonrpsee.workspace = true
 rstest.workspace = true
 
 [features]

wallet/wallet-cli-commands/Cargo.toml

@@ -846,9 +846,9 @@ where
                 }
             }
 
-            WalletCommand::GetBlock { hash } => {
-                let hash = self.wallet().await?.node_block(hash).await?;
-                match hash {
+            WalletCommand::GetBlock { id } => {
+                let block = self.wallet().await?.node_block(id).await?;
+                match block {
                     Some(block) => Ok(ConsoleCommand::Print(block)),
                     None => Ok(ConsoleCommand::Print("Not found".to_owned())),
                 }