Merge #863: Use create_spend to calculate amount left to select and c…

…oin selection a732468 spend: check max feerate (edouardparis) 4ccecd1 Use create_spend to calculate amount left to select (edouardparis) Pull request description: Fixes #822. based on #865 ACKs for top commit: jp1ac4: ACK a732468. Tree-SHA512: aa2728218d9ccf7b6511f881d88b262522705b4162b5b4235560626ee8b5b8c6d57e743ebfaf85dc633d6e3d2380badfe354a6dc4d19b89d3f380c63e123704e
wizardsardine · Dec 12, 2023 · 0346b7a · 0346b7a
2 parents 3e0f82a + a732468
commit 0346b7a
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 116 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(),