From 1c99376860458f350c3289cd995716aca96c4d87 Mon Sep 17 00:00:00 2001 From: jp1ac4 <121959000+jp1ac4@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:13:22 +0000 Subject: [PATCH] gui(app): cache unconfirmed & confirmed coins only --- gui/src/app/mod.rs | 6 +++--- gui/src/loader.rs | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gui/src/app/mod.rs b/gui/src/app/mod.rs index 66b80066..a2aa1717 100644 --- a/gui/src/app/mod.rs +++ b/gui/src/app/mod.rs @@ -18,7 +18,7 @@ use std::time::Duration; use iced::{clipboard, time, Command, Subscription}; use tracing::{error, info, warn}; -pub use liana::{config::Config as DaemonConfig, miniscript::bitcoin}; +pub use liana::{commands::CoinStatus, config::Config as DaemonConfig, miniscript::bitcoin}; use liana_ui::widget::Element; pub use config::Config; @@ -239,8 +239,8 @@ impl App { daemon.is_alive()?; let info = daemon.get_info()?; - // todo: filter coins to only have current coins. - let coins = daemon.list_coins(&[], &[])?; + let coins = daemon + .list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])?; Ok(Cache { datadir_path, coins: coins.coins, diff --git a/gui/src/loader.rs b/gui/src/loader.rs index af175b6d..84cd19ee 100644 --- a/gui/src/loader.rs +++ b/gui/src/loader.rs @@ -9,6 +9,7 @@ use iced::{Alignment, Command, Length, Subscription}; use tracing::{debug, info, warn}; use liana::{ + commands::CoinStatus, config::{Config, ConfigError}, miniscript::bitcoin, StartupError, @@ -370,7 +371,9 @@ pub async fn load_application( let wallet = Wallet::new(info.descriptors.main).load_settings(&gui_config, &datadir_path, network)?; - let coins = daemon.list_coins(&[], &[]).map(|res| res.coins)?; + let coins = daemon + .list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[]) + .map(|res| res.coins)?; let cache = Cache { datadir_path,