Skip to content

Fix(electrum-pool): use call_async instead of any_client for full scans #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Einliterflasche merged 1 commit into from
Feb 23, 2026
Merged

Fix(electrum-pool): use call_async instead of any_client for full scans #887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions bitcoin-wallet/src/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,24 +555,22 @@ impl Wallet {

let progress_handle = tauri_handle.as_ref().map(|th| th.start_full_scan());

let callback = progress_handle.clone().and_then(|ph| InnerSyncCallback::new(move |consumed, total| {
ph.update(consumed,total);
})).chain(InnerSyncCallback::new(move |consumed, total| {
tracing::debug!(
"Full scanning Bitcoin wallet, currently at index {}. We will scan around {} in total.",
consumed,
total
);
}).throttle_callback(10.0)).to_full_scan_callback(Self::SCAN_STOP_GAP, 100);

let full_scan = wallet.start_full_scan().inspect(callback);
let wallet = Arc::new(wallet);
let ph = progress_handle.clone();
let full_scan_response = client.inner.call_async("full_scan_wallet", move |electrum_client| {
let callback = ph.clone().and_then(|ph| InnerSyncCallback::new(move |consumed, total| {
ph.update(consumed, total);
})).chain(InnerSyncCallback::new(move |consumed, total| {
tracing::debug!(
"Full scanning Bitcoin wallet, currently at index {}. We will scan around {} in total.",
consumed,
total
);
}).throttle_callback(10.0)).to_full_scan_callback(Self::SCAN_STOP_GAP, 100);

let full_scan_response = client.inner.get_any_client().await?.full_scan(
full_scan,
Self::SCAN_STOP_GAP as usize,
Self::SCAN_BATCH_SIZE as usize,
true,
)?;
let full_scan = wallet.start_full_scan().inspect(callback);
electrum_client.full_scan(full_scan, Self::SCAN_STOP_GAP as usize, Self::SCAN_BATCH_SIZE as usize, true)
}).await?;

// Only create the persister once we have the full scan result
let mut persister = persister_constructor()?;
Expand Down
Loading