Merge pull request #97 from Ximik/mnemonic

Mnemonic wallet recovery

Author: buffrr

client/src/bin/space-cli.rs

@@ -2,7 +2,7 @@ extern crate core;
 
 use std::{
     fs, io,
-    io::{Cursor, IsTerminal},
+    io::{Cursor, IsTerminal, Write},
     path::PathBuf,
 };
 
@@ -87,6 +87,9 @@ enum Commands {
     /// Generate a new wallet
     #[command(name = "createwallet")]
     CreateWallet,
+    /// Recover wallet from mnemonic phrase
+    #[command(name = "recoverwallet")]
+    RecoverWallet,
     /// Load a wallet
     #[command(name = "loadwallet")]
     LoadWallet,
@@ -611,7 +614,17 @@ async fn handle_commands(cli: &SpaceCli, command: Commands) -> Result<(), Client
             print_list_wallets(result, cli.format);
         }
         Commands::CreateWallet => {
-            cli.client.wallet_create(&cli.wallet).await?;
+            let response = cli.client.wallet_create(&cli.wallet).await?;
+            println!("⚠️ Write down your recovery phrase NOW!");
+            println!("This is the ONLY time it will be shown:");
+            println!("{}", &response);
+        }
+        Commands::RecoverWallet => {
+            print!("Enter mnemonic phrase: ");
+            io::stdout().flush().unwrap();
+            let mut mnemonic = String::new();
+            io::stdin().read_line(&mut mnemonic).unwrap();
+            cli.client.wallet_recover(&cli.wallet, mnemonic).await?;
         }
         Commands::LoadWallet => {
             cli.client.wallet_load(&cli.wallet).await?;

client/src/rpc.rs

@@ -242,7 +242,10 @@ pub trait Rpc {
     async fn wallet_export(&self, name: &str) -> Result<WalletExport, ErrorObjectOwned>;
 
     #[method(name = "walletcreate")]
-    async fn wallet_create(&self, name: &str) -> Result<(), ErrorObjectOwned>;
+    async fn wallet_create(&self, name: &str) -> Result<String, ErrorObjectOwned>;
+
+    #[method(name = "walletrecover")]
+    async fn wallet_recover(&self, name: &str, mnemonic: String) -> Result<(), ErrorObjectOwned>;
 
     #[method(name = "walletsendrequest")]
     async fn wallet_send_request(
@@ -503,11 +506,18 @@ impl WalletManager {
         Ok(export)
     }
 
-    pub async fn create_wallet(&self, client: &reqwest::Client, name: &str) -> anyhow::Result<()> {
+    pub async fn create_wallet(&self, client: &reqwest::Client, name: &str) -> anyhow::Result<String> {
         let mnemonic: GeneratedKey<_, Tap> =
             Mnemonic::generate((WordCount::Words12, Language::English))
                 .map_err(|_| anyhow!("Mnemonic generation error"))?;
 
+        let start_block = self.get_wallet_start_block(client).await?;
+        self.setup_new_wallet(name.to_string(), mnemonic.to_string(), start_block)?;
+        self.load_wallet(name).await?;
+        Ok(mnemonic.to_string())
+    }
+
+    pub async fn recover_wallet(&self, client: &reqwest::Client, name: &str, mnemonic: &str) -> anyhow::Result<()> {
         let start_block = self.get_wallet_start_block(client).await?;
         self.setup_new_wallet(name.to_string(), mnemonic.to_string(), start_block)?;
         self.load_wallet(name).await?;
@@ -525,7 +535,7 @@ impl WalletManager {
             return Err(anyhow!(format!("Wallet `{}` already exists", name)));
         }
 
-        let export = self.wallet_from_mnemonic(name.clone(), mnemonic.to_string(), start_block)?;
+        let export = self.wallet_from_mnemonic(name.clone(), mnemonic, start_block)?;
         fs::create_dir_all(&wallet_path)?;
         let wallet_export_path = wallet_path.join("wallet.json");
         let mut file = fs::File::create(wallet_export_path)?;
@@ -540,7 +550,7 @@ impl WalletManager {
         start_block: BlockId,
     ) -> anyhow::Result<WalletExport> {
         let (network, _) = self.fallback_network();
-        let xpriv = Self::descriptor_from_mnemonic(network, &mnemonic.to_string())?;
+        let xpriv = Self::descriptor_from_mnemonic(network, &mnemonic)?;
 
         let (external, internal) = Self::default_descriptors(xpriv);
         let tmp = bdk::Wallet::create(external, internal)
@@ -666,7 +676,7 @@ impl WalletManager {
     }
 
     fn descriptor_from_mnemonic(network: Network, m: &str) -> anyhow::Result<Xpriv> {
-        let mnemonic = Mnemonic::parse(m).unwrap();
+        let mnemonic = Mnemonic::parse(m)?;
         let xkey: ExtendedKey = mnemonic.clone().into_extended_key()?;
         Ok(xkey.into_xprv(network).expect("xpriv"))
     }
@@ -924,7 +934,7 @@ impl RpcServer for RpcServerImpl {
             })
     }
 
-    async fn wallet_create(&self, name: &str) -> Result<(), ErrorObjectOwned> {
+    async fn wallet_create(&self, name: &str) -> Result<String, ErrorObjectOwned> {
         self.wallet_manager
             .create_wallet(&self.client, name)
             .await
@@ -933,6 +943,15 @@ impl RpcServer for RpcServerImpl {
             })
     }
 
+    async fn wallet_recover(&self, name: &str, mnemonic: String) -> Result<(), ErrorObjectOwned> {
+        self.wallet_manager
+            .recover_wallet(&self.client, name, &mnemonic)
+            .await
+            .map_err(|error| {
+                ErrorObjectOwned::owned(RPC_WALLET_NOT_LOADED, error.to_string(), None::<String>)
+            })
+    }
+
     async fn wallet_send_request(
         &self,
         wallet: &str,