gui: bump liana:master and async-hwi:master

wizardsardine · Jan 22, 2024 · 043b7c7 · 043b7c7
1 parent 99bc44d
commit 043b7c7
Show file tree

Hide file tree

Showing 8 changed files with 190 additions and 123 deletions.
diff --git a/gui/Cargo.lock b/gui/Cargo.lock
diff --git a/gui/src/app/state/spend/step.rs b/gui/src/app/state/spend/step.rs
@@ -440,9 +440,9 @@ impl Step for DefineSpend {
                         !recipient.label.value.is_empty()
                             && Address::from_str(&recipient.address.value)
                                 .unwrap()
-                                .payload
+                                .payload()
                                 .matches_script_pubkey(&output.script_pubkey)
-                            && output.value == recipient.amount().unwrap()
+                            && output.value.to_sat() == recipient.amount().unwrap()
                     })
                     .map(|recipient| recipient.label.value.to_string())
                 {
@@ -517,7 +517,7 @@ impl Recipient {
         }
 
         if let Ok(address) = Address::from_str(&self.address.value) {
-            if amount <= address.payload.script_pubkey().dust_value() {
+            if amount <= address.payload().script_pubkey().dust_value() {
                 return Err(Error::Unexpected(
                     "Amount must be superior to script dust value".to_string(),
                 ));

diff --git a/gui/src/app/view/home.rs b/gui/src/app/view/home.rs
@@ -174,13 +174,13 @@ fn event_list_view(i: usize, event: &HistoryTransaction) -> Column<'_, Message>
                     col.push(event::confirmed_incoming_event(
                         label,
                         NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
-                        &Amount::from_sat(output.value),
+                        &output.value,
                         Message::SelectSub(i, output_index),
                     ))
                 } else {
                     col.push(event::unconfirmed_incoming_event(
                         label,
-                        &Amount::from_sat(output.value),
+                        &output.value,
                         Message::SelectSub(i, output_index),
                     ))
                 }
@@ -190,13 +190,13 @@ fn event_list_view(i: usize, event: &HistoryTransaction) -> Column<'_, Message>
                 col.push(event::confirmed_outgoing_event(
                     label,
                     NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
-                    &Amount::from_sat(output.value),
+                    &output.value,
                     Message::SelectSub(i, output_index),
                 ))
             } else {
                 col.push(event::unconfirmed_outgoing_event(
                     label,
-                    &Amount::from_sat(output.value),
+                    &output.value,
                     Message::SelectSub(i, output_index),
                 ))
             }
@@ -251,7 +251,7 @@ pub fn payment_view<'a>(
                 label::label_editable(vec![outpoint.clone()], tx.labels.get(&outpoint), H3_SIZE)
             })
             .push(Container::new(amount_with_size(
-                &Amount::from_sat(tx.tx.output[output_index].value),
+                &tx.tx.output[output_index].value,
                 H3_SIZE,
             )))
             .push(Space::with_height(H3_SIZE))

diff --git a/gui/src/app/view/psbt.rs b/gui/src/app/view/psbt.rs
@@ -8,7 +8,7 @@ use iced::{
 use liana::{
     descriptors::{LianaPolicy, PathInfo, PathSpendInfo},
     miniscript::bitcoin::{
-        bip32::Fingerprint, blockdata::transaction::TxOut, Address, Amount, Network, OutPoint,
+        bip32::Fingerprint, blockdata::transaction::TxOut, Address, Network, OutPoint,
         Transaction, Txid,
     },
 };
@@ -868,7 +868,7 @@ fn payment_view<'a>(
                     })
                     .width(Length::Fill),
                 )
-                .push(amount(&Amount::from_sat(output.value))),
+                .push(amount(&output.value)),
         )
         .push_maybe(addr.map(|addr| {
             Column::new()
@@ -932,7 +932,7 @@ fn change_view(output: &TxOut, network: Network) -> Element<Message> {
                         ),
                 ),
         )
-        .push(amount(&Amount::from_sat(output.value)))
+        .push(amount(&output.value))
         .into()
 }
 

diff --git a/gui/src/daemon/model.rs b/gui/src/daemon/model.rs
@@ -70,9 +70,9 @@ impl SpendTx {
             |(change, spend), (i, output)| {
                 if !psbt.outputs[i].bip32_derivation.is_empty() {
                     change_indexes.push(i);
-                    (change + Amount::from_sat(output.value), spend)
+                    (change + output.value, spend)
                 } else {
-                    (change, spend + Amount::from_sat(output.value))
+                    (change, spend + output.value)
                 }
             },
         );
@@ -103,7 +103,7 @@ impl SpendTx {
             let mut inputs_amount = Amount::from_sat(0);
             for (i, input) in psbt.inputs.iter().enumerate() {
                 if let Some(utxo) = &input.witness_utxo {
-                    inputs_amount += Amount::from_sat(utxo.value);
+                    inputs_amount += utxo.value;
                 // we try to have it from the coin
                 } else if let Some(coin) = psbt
                     .unsigned_tx
@@ -285,9 +285,9 @@ impl HistoryTransaction {
             (Amount::from_sat(0), Amount::from_sat(0)),
             |(change, spend), (i, output)| {
                 if change_indexes.contains(&i) {
-                    (change + Amount::from_sat(output.value), spend)
+                    (change + output.value, spend)
                 } else {
-                    (change, spend + Amount::from_sat(output.value))
+                    (change, spend + output.value)
                 }
             },
         );

diff --git a/gui/src/installer/step/descriptor.rs b/gui/src/installer/step/descriptor.rs
@@ -5,7 +5,7 @@ use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
 use iced::Command;
-use liana::miniscript::bitcoin::bip32::ExtendedPubKey;
+use liana::miniscript::bitcoin::bip32::Xpub;
 use liana::{
     descriptors::{LianaDescriptor, LianaPolicy, PathInfo},
     miniscript::{
@@ -565,9 +565,9 @@ impl Step for DefineDescriptor {
 }
 
 fn new_multixkey_from_xpub(
-    xpub: DescriptorXKey<ExtendedPubKey>,
+    xpub: DescriptorXKey<Xpub>,
     derivation_index: usize,
-) -> DescriptorMultiXKey<ExtendedPubKey> {
+) -> DescriptorMultiXKey<Xpub> {
     DescriptorMultiXKey {
         origin: xpub.origin,
         xkey: xpub.xkey,

diff --git a/gui/src/signer.rs b/gui/src/signer.rs
@@ -2,7 +2,7 @@ pub use liana::signer::SignerError;
 
 use liana::{
     miniscript::bitcoin::{
-        bip32::{DerivationPath, ExtendedPubKey, Fingerprint},
+        bip32::{DerivationPath, Fingerprint, Xpub},
         psbt::Psbt,
         secp256k1, Network,
     },
@@ -48,7 +48,7 @@ impl Signer {
         self.fingerprint
     }
 
-    pub fn get_extended_pubkey(&self, path: &DerivationPath) -> ExtendedPubKey {
+    pub fn get_extended_pubkey(&self, path: &DerivationPath) -> Xpub {
         self.key.xpub_at(path, &self.curve)
     }
 

diff --git a/gui/ui/Cargo.toml b/gui/ui/Cargo.toml
@@ -9,5 +9,5 @@ edition = "2021"
 iced = { version = "0.9", default_features = false, features = ["svg", "image", "glow"] }
 iced_native = "0.10"
 iced_lazy = { version = "0.6"}
-bitcoin = "0.30"
+bitcoin = "0.31"
 chrono = "0.4"