From 9fa3cde2991a9ea66ba0f5e2b1da3f40e3d8165e Mon Sep 17 00:00:00 2001
From: edouard <m@edouard.paris>
Date: Thu, 8 Dec 2022 11:06:35 +0100
Subject: [PATCH] bump liana:master

---
 gui/Cargo.lock                  | 6 +++---
 gui/src/app/mod.rs              | 2 +-
 gui/src/app/state/spend/step.rs | 2 +-
 gui/src/main.rs                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gui/Cargo.lock b/gui/Cargo.lock
index 51b247f9..f5bb7293 100644
--- a/gui/Cargo.lock
+++ b/gui/Cargo.lock
@@ -1646,7 +1646,7 @@ dependencies = [
 [[package]]
 name = "liana"
 version = "0.0.1"
-source = "git+https://github.com/revault/liana?branch=master#38e342c8cd4c7d5d9d497013aa466fe62c0e3a4b"
+source = "git+https://github.com/revault/liana?branch=master#d385e99726733851da9101557cf2dfcbe4c2a2a0"
 dependencies = [
  "backtrace",
  "base64",
@@ -1902,8 +1902,8 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniscript"
-version = "8.0.0"
-source = "git+https://github.com/darosior/rust-miniscript?branch=multipath_descriptors_on_8.0#a63d5a263a9006b4d29342012133a3bc919765ba"
+version = "9.0.0"
+source = "git+https://github.com/darosior/rust-miniscript?branch=multipath_descriptors_on_9.0#3104519501ce6ad15b36dcec759936f4d3bd3980"
 dependencies = [
  "bitcoin",
  "serde",
diff --git a/gui/src/app/mod.rs b/gui/src/app/mod.rs
index 9403f27a..8ac1a17b 100644
--- a/gui/src/app/mod.rs
+++ b/gui/src/app/mod.rs
@@ -119,7 +119,7 @@ impl App {
                 self.cache.spend_txs = txs.clone();
             }
             Message::Info(Ok(info)) => {
-                self.cache.blockheight = info.blockheight;
+                self.cache.blockheight = info.block_height;
                 self.cache.rescan_progress = info.rescan_progress;
             }
             Message::StartRescan(Ok(())) => {
diff --git a/gui/src/app/state/spend/step.rs b/gui/src/app/state/spend/step.rs
index 3e77f10d..c2981d48 100644
--- a/gui/src/app/state/spend/step.rs
+++ b/gui/src/app/state/spend/step.rs
@@ -288,7 +288,7 @@ impl ChooseCoins {
         };
         // nValue size + scriptPubKey CompactSize + OP_0 + PUSH32 + <wit program>
         const CHANGE_TXO_SIZE: usize = 8 + 1 + 1 + 1 + 32;
-        let satisfaction_vsize = cfg.main_descriptor.change_descriptor().max_sat_weight() / 4;
+        let satisfaction_vsize = cfg.main_descriptor.max_sat_weight() / 4;
         let transaction_size =
             tx_template.vsize() + satisfaction_vsize * tx_template.input.len() + CHANGE_TXO_SIZE;
 
diff --git a/gui/src/main.rs b/gui/src/main.rs
index 77ffe9f2..b2c08533 100644
--- a/gui/src/main.rs
+++ b/gui/src/main.rs
@@ -164,7 +164,7 @@ impl Application for GUI {
                 if let loader::Message::Synced(info, coins, spend_txs, daemon) = *msg {
                     let cache = Cache {
                         network: daemon.config().bitcoin_config.network,
-                        blockheight: info.blockheight,
+                        blockheight: info.block_height,
                         coins,
                         spend_txs,
                         ..Default::default()