Merge pull request #994 from MutinyWallet/efficient-on-chain-scanning

More efficient on chain scanning
MutinyWallet · Jan 26, 2024 · fc244ba · fc244ba
2 parents 55a40fd + 0d50884
commit fc244ba
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/mutiny-core/src/lib.rs b/mutiny-core/src/lib.rs
@@ -40,7 +40,6 @@ pub mod vss;
 #[cfg(test)]
 mod test_utils;
 
-use crate::event::{HTLCStatus, MillisatAmount, PaymentInfo};
 pub use crate::gossip::{GOSSIP_SYNC_TIME_KEY, NETWORK_GRAPH_KEY, PROB_SCORER_KEY};
 pub use crate::keymanager::generate_seed;
 pub use crate::ldkstorage::{CHANNEL_MANAGER_KEY, MONITORS_PREFIX_KEY};
@@ -49,6 +48,10 @@ use crate::storage::{
 };
 use crate::{auth::MutinyAuthClient, logging::MutinyLogger};
 use crate::{error::MutinyError, nostr::ReservedProfile};
+use crate::{
+    event::{HTLCStatus, MillisatAmount, PaymentInfo},
+    onchain::FULL_SYNC_STOP_GAP,
+};
 use crate::{
     federation::{FederationClient, FederationIdentity, FederationIndex, FederationStorage},
     labels::{get_contact_key, Contact, LabelStorage},
@@ -775,7 +778,10 @@ impl<S: MutinyStorage> MutinyWalletBuilder<S> {
         {
             // if we need a full sync from a restore
             if mw.storage.get(NEED_FULL_SYNC_KEY)?.unwrap_or_default() {
-                mw.node_manager.wallet.full_sync().await?;
+                mw.node_manager
+                    .wallet
+                    .full_sync(crate::onchain::RESTORE_SYNC_STOP_GAP)
+                    .await?;
                 mw.storage.delete(&[NEED_FULL_SYNC_KEY])?;
             }
         }
@@ -1598,7 +1604,10 @@ impl<S: MutinyStorage> MutinyWallet<S> {
 
         self.start().await?;
 
-        self.node_manager.wallet.full_sync().await?;
+        self.node_manager
+            .wallet
+            .full_sync(FULL_SYNC_STOP_GAP)
+            .await?;
 
         Ok(())
     }

diff --git a/mutiny-core/src/onchain.rs b/mutiny-core/src/onchain.rs
@@ -27,8 +27,10 @@ use crate::logging::MutinyLogger;
 use crate::storage::{MutinyStorage, OnChainStorage};
 use crate::utils::{now, sleep};
 
-const DEFAULT_STOP_GAP: usize = 20;
-const FULL_SYNC_STOP_GAP: usize = 150;
+pub(crate) const DEFAULT_STOP_GAP: usize = 10;
+pub(crate) const FULL_SYNC_STOP_GAP: usize = 150;
+#[cfg(not(test))]
+pub(crate) const RESTORE_SYNC_STOP_GAP: usize = 20;
 
 #[derive(Clone)]
 pub struct OnChainWallet<S: MutinyStorage> {
@@ -195,7 +197,7 @@ impl<S: MutinyStorage> OnChainWallet<S> {
         Err(MutinyError::WalletOperationFailed)
     }
 
-    pub async fn full_sync(&self) -> Result<(), MutinyError> {
+    pub async fn full_sync(&self, gap: usize) -> Result<(), MutinyError> {
         // get first wallet lock that only needs to read
         let (checkpoints, spks) = {
             if let Ok(wallet) = self.wallet.try_read() {
@@ -216,7 +218,7 @@ impl<S: MutinyStorage> OnChainWallet<S> {
                 spks,
                 core::iter::empty(),
                 core::iter::empty(),
-                FULL_SYNC_STOP_GAP,
+                gap,
                 5,
             )
             .await?;