Skip to content

Use cbf status from compact node #93

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
buffrr merged 1 commit into from
May 13, 2025
Merged

Use cbf status from compact node #93

Show file tree
Hide file tree
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
24 changes: 5 additions & 19 deletions client/src/cbf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,37 +127,23 @@ impl CompactFilterSync {
return Ok(());
}
}
// if wallet already past filter headers, we're done
if let Some(filter_headers) = info.filter_headers {
if self.initial_tip.height >= filter_headers {
info!("wallet({}): tip {} >= filters {}, cbf done", wallet.name(), self.initial_tip.height, filter_headers);
self.state = SyncState::Synced;
return Ok(());
}
}
if info.headers != info.blocks {
info!("Source still syncing, retrying...");
*progress = WalletProgressUpdate::new(WalletStatus::Syncing, None);
self.wait = Some(Instant::now());
return Ok(());
}
if info.filters != info.filter_headers {
let filters_synced = info.filters_progress.unwrap_or(0.0) == 1.0;
if !filters_synced {
if !self.filters_queued {
source.queue_filters()?;
self.filters_queued = true;
}

info!("Filters syncing, retrying...");
*progress = WalletProgressUpdate::new(WalletStatus::CbfFilterSync, Some(
calc_progress(
info.checkpoint.map(|c| c.height).unwrap_or(0),
info.filters.unwrap_or(0),
std::cmp::max(
info.prune_height.unwrap_or(0),
info.filter_headers.unwrap_or(0)
),
)
));
*progress = WalletProgressUpdate::new(WalletStatus::CbfFilterSync,
Some(info.filters_progress.unwrap_or(0.0))
);
self.wait = Some(Instant::now());
return Ok(());
}
Expand Down
2 changes: 2 additions & 0 deletions client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ pub struct BlockchainInfo {
pub block_queue: Option<BlockQueueResult>,
#[serde(skip_serializing_if = "Option::is_none")]
pub checkpoint: Option<ChainAnchor>,
#[serde(rename = "filtersprogress", skip_serializing_if = "Option::is_none")]
pub filters_progress: Option<f32>,
}


Expand Down
Loading