Merge pull request #87 from Ximik/wallet

List wallets and chain info

Author: buffrr

client/src/bin/space-cli.rs

@@ -25,7 +25,8 @@ use spaces_client::{
     format::{
         print_error_rpc_response, print_list_bidouts, print_list_spaces_response,
         print_list_transactions, print_list_unspent, print_server_info,
-        print_wallet_balance_response, print_wallet_info, print_wallet_response, Format,
+        print_list_wallets, print_wallet_balance_response, print_wallet_info, print_wallet_response,
+        Format,
     },
     rpc::{
         BidParams, ExecuteParams, OpenParams, RegisterParams, RpcClient, RpcWalletRequest,
@@ -71,6 +72,9 @@ pub struct Args {
 
 #[derive(Subcommand, Debug, Clone)]
 enum Commands {
+    /// List existing wallets
+    #[command(name = "listwallets")]
+    ListWallets,
     /// Generate a new wallet
     #[command(name = "createwallet")]
     CreateWallet,
@@ -573,6 +577,10 @@ async fn handle_commands(cli: &SpaceCli, command: Commands) -> Result<(), Client
             let response = cli.client.get_spaceout(outpoint).await?;
             println!("{}", serde_json::to_string_pretty(&response)?);
         }
+        Commands::ListWallets => {
+            let result = cli.client.list_wallets().await?;
+            print_list_wallets(result, cli.format);
+        }
         Commands::CreateWallet => {
             cli.client.wallet_create(&cli.wallet).await?;
         }

client/src/format.rs

@@ -150,6 +150,17 @@ pub fn print_list_unspent(utxos: Vec<WalletOutput>, format: Format) {
     }
 }
 
+pub fn print_list_wallets(wallets: Vec<String>, format: Format) {
+    match format {
+        Format::Text => {
+            println!("{}", wallets.join("\n"));
+        }
+        Format::Json => {
+            println!("{}", serde_json::to_string_pretty(&wallets).unwrap());
+        }
+    }
+}
+
 pub fn print_server_info(info: ServerInfo, format: Format) {
     match format {
         Format::Text => {

client/src/rpc.rs

@@ -66,8 +66,8 @@ pub struct ServerInfo {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ChainInfo {
-    blocks: u32,
-    headers: u32,
+    pub blocks: u32,
+    pub headers: u32,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -199,6 +199,9 @@ pub trait Rpc {
     #[method(name = "gettxmeta")]
     async fn get_tx_meta(&self, txid: Txid) -> Result<Option<TxEntry>, ErrorObjectOwned>;
 
+    #[method(name = "listwallets")]
+    async fn list_wallets(&self) -> Result<Vec<String>, ErrorObjectOwned>;
+
     #[method(name = "walletload")]
     async fn wallet_load(&self, name: &str) -> Result<(), ErrorObjectOwned>;
 
@@ -575,6 +578,21 @@ impl WalletManager {
         (network, genesis_hash)
     }
 
+    pub async fn list_wallets(&self) -> anyhow::Result<Vec<String>> {
+        let wallets = std::fs::read_dir(&self.data_dir)?
+            .filter_map(Result::ok)
+            .filter(|entry| entry.path().is_dir())
+            .filter_map(|entry| {
+                entry.path()
+                    .file_name()
+                    .and_then(|name| name.to_str())
+                    .map(String::from)
+            })
+            .collect();
+
+        Ok(wallets)
+    }
+
     pub async fn load_wallet(&self, name: &str) -> anyhow::Result<()> {
         if self.wallets.read().await.contains_key(name) {
             return Ok(());
@@ -820,6 +838,15 @@ impl RpcServer for RpcServerImpl {
         Ok(data)
     }
 
+    async fn list_wallets(&self) ->  Result<Vec<String>, ErrorObjectOwned> {
+        self.wallet_manager
+            .list_wallets()
+            .await
+            .map_err(|error| {
+                ErrorObjectOwned::owned(-1, error.to_string(), None::<String>)
+            })
+    }
+
     async fn wallet_load(&self, name: &str) -> Result<(), ErrorObjectOwned> {
         self.wallet_manager
             .load_wallet(name)
@@ -1593,4 +1620,4 @@ async fn get_server_info(client: &reqwest::Client, rpc: &BitcoinRpc, tip: ChainA
         },
         progress: calc_progress(start_block, tip.height, info.headers),
     })
-}
+}