Use create_spend to calculate amount left to select

close wizardsardine#822
edouardparis · Dec 11, 2023 · 7c778ce · 7c778ce
1 parent b5a3e78
commit 7c778ce
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 114 deletions.
diff --git a/gui/Cargo.lock b/gui/Cargo.lock
diff --git a/gui/src/app/error.rs b/gui/src/app/error.rs
@@ -1,7 +1,7 @@
 use std::convert::From;
 use std::io::ErrorKind;
 
-use liana::{config::ConfigError, descriptors::LianaDescError};
+use liana::{config::ConfigError, descriptors::LianaDescError, spend::SpendCreationError};
 
 use crate::{
     app::{settings::SettingsError, wallet::WalletError},
@@ -16,13 +16,15 @@ pub enum Error {
     Unexpected(String),
     HardwareWallet(async_hwi::Error),
     Desc(LianaDescError),
+    Spend(SpendCreationError),
 }
 
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
             Self::Config(e) => write!(f, "{}", e),
             Self::Wallet(e) => write!(f, "{}", e),
+            Self::Spend(e) => write!(f, "{}", e),
             Self::Daemon(e) => match e {
                 DaemonError::Unexpected(e) => write!(f, "{}", e),
                 DaemonError::NoAnswer => write!(f, "Daemon did not answer"),
@@ -84,3 +86,9 @@ impl From<async_hwi::Error> for Error {
         Error::HardwareWallet(error)
     }
 }
+
+impl From<SpendCreationError> for Error {
+    fn from(error: SpendCreationError) -> Self {
+        Error::Spend(error)
+    }
+}
diff --git a/gui/src/app/state/coins.rs b/gui/src/app/state/coins.rs
@@ -216,6 +216,8 @@ mod tests {
                 spend_info: None,
                 is_immature: false,
                 address: dummy_address.clone(),
+                derivation_index: 0.into(),
+                is_change: false,
             },
             Coin {
                 outpoint: bitcoin::OutPoint { txid, vout: 3 },
@@ -224,6 +226,8 @@ mod tests {
                 spend_info: None,
                 is_immature: false,
                 address: dummy_address.clone(),
+                derivation_index: 1.into(),
+                is_change: false,
             },
             Coin {
                 outpoint: bitcoin::OutPoint { txid, vout: 0 },
@@ -232,6 +236,8 @@ mod tests {
                 spend_info: None,
                 is_immature: false,
                 address: dummy_address.clone(),
+                derivation_index: 2.into(),
+                is_change: false,
             },
             Coin {
                 outpoint: bitcoin::OutPoint { txid, vout: 1 },
@@ -240,6 +246,8 @@ mod tests {
                 spend_info: None,
                 is_immature: false,
                 address: dummy_address,
+                derivation_index: 3.into(),
+                is_change: false,
             },
         ]);
 

diff --git a/gui/src/app/state/spend/mod.rs b/gui/src/app/state/spend/mod.rs
@@ -32,7 +32,7 @@ impl CreateSpendPanel {
             current: 0,
             steps: vec![
                 Box::new(
-                    step::DefineSpend::new(descriptor, coins, timelock)
+                    step::DefineSpend::new(network, descriptor, coins, timelock)
                         .with_coins_sorted(blockheight),
                 ),
                 Box::new(step::SaveSpend::new(wallet)),
@@ -54,7 +54,7 @@ impl CreateSpendPanel {
             current: 0,
             steps: vec![
                 Box::new(
-                    step::DefineSpend::new(descriptor, coins, timelock)
+                    step::DefineSpend::new(network, descriptor, coins, timelock)
                         .with_preselected_coins(preselected_coins)
                         .with_coins_sorted(blockheight)
                         .self_send(),