Merge pull request #383 from tvolk131/fix_incremental_scan_bug

lightningdevkit · Oct 18, 2024 · a9e6fba · a9e6fba
2 parents 3ae579e + 3684f29
commit a9e6fba
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/chain/mod.rs b/src/chain/mod.rs
@@ -481,6 +481,13 @@ impl ChainSource {
 					}
 
 					if incremental_sync {
+						let sync_request = onchain_wallet.get_incremental_sync_request();
+						let wallet_sync_timeout_fut = tokio::time::timeout(
+							Duration::from_secs(BDK_WALLET_SYNC_TIMEOUT_SECS),
+							esplora_client.sync(sync_request, BDK_CLIENT_CONCURRENCY),
+						);
+						get_and_apply_wallet_update!(wallet_sync_timeout_fut)
+					} else {
 						let full_scan_request = onchain_wallet.get_full_scan_request();
 						let wallet_sync_timeout_fut = tokio::time::timeout(
 							Duration::from_secs(BDK_WALLET_SYNC_TIMEOUT_SECS),
@@ -491,13 +498,6 @@ impl ChainSource {
 							),
 						);
 						get_and_apply_wallet_update!(wallet_sync_timeout_fut)
-					} else {
-						let sync_request = onchain_wallet.get_incremental_sync_request();
-						let wallet_sync_timeout_fut = tokio::time::timeout(
-							Duration::from_secs(BDK_WALLET_SYNC_TIMEOUT_SECS),
-							esplora_client.sync(sync_request, BDK_CLIENT_CONCURRENCY),
-						);
-						get_and_apply_wallet_update!(wallet_sync_timeout_fut)
 					}
 				};