[BUG] Fixes sync rescan

- modified: ignored return value of rescan_blockchain
- check rescan status using `get_wallet_info` and exit accordingly
- updates last_synced_height after rescan completes

Author: Godzilla-oss

src/wallet/rpc.rs

@@ -1,8 +1,11 @@
 //! Manages connection with a Bitcoin Core RPC.
 //!
-use std::{convert::TryFrom, thread};
+use std::{convert::TryFrom, ops::Mul, thread};
 
-use bitcoind::bitcoincore_rpc::{json::ListUnspentResultEntry, Auth, Client, RpcApi};
+use bitcoind::bitcoincore_rpc::{
+    json::{ListUnspentResultEntry, ScanningDetails},
+    Auth, Client, RpcApi,
+};
 use serde_json::{json, Value};
 
 use crate::{utill::HEART_BEAT_INTERVAL, wallet::api::KeychainKind};
@@ -130,40 +133,43 @@ impl Wallet {
             return Ok(());
         }
 
-        log::debug!("Importing Wallet spks/descriptors");
-
         self.import_descriptors(&descriptors_to_import, None)?;
 
-        // Now run the scan
-        log::debug!("Initializing TxOut scan. This may take a while.");
-
         // Sometimes in test multiple wallet scans can occur at same time, resulting in error.
-        // Just retry after 3 sec.
+        let last_synced_height = self
+            .store
+            .last_synced_height
+            .unwrap_or(0)
+            .min(self.store.wallet_birthday.unwrap_or(0));
+        let node_synced = self.rpc.get_block_count()?;
+        log::info!("Re-scanning Blockchain from:{last_synced_height} to:{node_synced}");
+
+        let _ = self.rpc.rescan_blockchain(
+            Some(last_synced_height as usize),
+            Some(node_synced as usize),
+        );
+
+        // Returns when the scanning is complete
         loop {
-            let last_synced_height = self
-                .store
-                .last_synced_height
-                .unwrap_or(0)
-                .max(self.store.wallet_birthday.unwrap_or(0));
-            let node_synced = self.rpc.get_block_count()?;
-            log::debug!("Re-scanning Blockchain from:{last_synced_height} to:{node_synced}");
-            match self.rpc.rescan_blockchain(
-                Some(last_synced_height as usize),
-                Some(node_synced as usize),
-            ) {
-                Ok(_) => {
-                    self.store.last_synced_height = Some(node_synced);
+            let wallet_info = self.rpc.get_wallet_info()?;
+            match wallet_info.scanning {
+                Some(ScanningDetails::Scanning { duration, progress }) => {
+                    log::info!("Scanning for {}s - {:.2}%", duration, progress.mul(100.0));
+                    thread::sleep(HEART_BEAT_INTERVAL);
+                    continue;
+                }
+                Some(ScanningDetails::NotScanning(_)) => {
+                    log::info!("Scanning completed");
                     break;
                 }
-
-                Err(e) => {
-                    log::warn!("Sync Error, Retrying: {e}");
+                None => {
+                    log::info!("No scan is in progress or Scanning completed");
                     thread::sleep(HEART_BEAT_INTERVAL);
-                    continue;
+                    break;
                 }
             }
         }
-
+        self.store.last_synced_height = Some(node_synced);
         self.update_utxo_cache(self.get_all_utxo_from_rpc()?);
 
         let max_external_index = self.find_hd_next_index(KeychainKind::External)?;
@@ -177,6 +183,7 @@ impl Wallet {
     fn sync_no_fail(&mut self) {
         while let Err(e) = self.sync() {
             log::error!("Blockchain sync failed. Retrying. | {e:?}");
+            thread::sleep(HEART_BEAT_INTERVAL);
         }
     }