Skip to content

Fix loading glitches #99

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
merged 1 commit into from
Jul 9, 2025
Merged

Fix loading glitches #99

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
13 changes: 4 additions & 9 deletions client/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ use crate::wallets::WalletInfoWithProgress;
use crate::{
calc_progress,
checker::TxChecker,
client::{BlockMeta, TxEntry},
client::{BlockMeta, TxEntry, BlockchainInfo},
config::ExtendedNetwork,
deserialize_base64, serialize_base64,
source::BitcoinRpc,
Expand All @@ -72,6 +72,7 @@ pub struct ServerInfo {
pub network: String,
pub tip: ChainAnchor,
pub chain: ChainInfo,
pub ready: bool,
pub progress: f32,
}

Expand Down Expand Up @@ -1626,14 +1627,7 @@ async fn get_server_info(
rpc: &BitcoinRpc,
tip: ChainAnchor,
) -> anyhow::Result<ServerInfo> {
#[derive(Deserialize)]
struct Info {
pub chain: String,
pub headers: u32,
pub blocks: u32,
}

let info: Info = rpc
let info: BlockchainInfo = rpc
.send_json(client, &rpc.get_blockchain_info())
.await
.map_err(|e| anyhow!("Could not retrieve blockchain info ({})", e))?;
Expand All @@ -1653,6 +1647,7 @@ async fn get_server_info(
blocks: info.blocks,
headers: info.headers,
},
ready: info.headers_synced.unwrap_or(true),
progress: calc_progress(start_block, tip.height, info.headers),
})
}
Loading