debug

wizardsardine · Aug 1, 2024 · da653de · da653de
1 parent b734c35
commit da653de
Show file tree

Hide file tree

Showing 12 changed files with 289 additions and 171 deletions.
diff --git a/gui/Cargo.toml b/gui/Cargo.toml
@@ -47,7 +47,7 @@ bitcoin_hashes = "0.12"
 reqwest = { version = "0.11", default-features=false, features = ["json", "rustls-tls"] }
 rust-ini = "0.19.0"
 
-ledger_manager = { git = "https://github.com/pythcoiner/ledger_installer.git", branch = "liana", ref = "bdefcefad4a5c8d15cfaea2c1103effdc961fe18"}
+ledger_manager = { git = "https://github.com/pythcoiner/ledger_installer.git", branch = "liana", ref = "53477ee2077590c461e605350aa0d76494a162d9"}
 
 [patch.crates-io]
 iced_style = { git = "https://github.com/edouardparis/iced", branch = "patch-0.12.3"}

diff --git a/gui/src/app/message.rs b/gui/src/app/message.rs
@@ -45,6 +45,6 @@ pub enum Message {
     LabelsUpdated(Result<HashMap<String, Option<String>>, Error>),
     BroadcastModal(Result<HashSet<Txid>, Error>),
     RbfModal(Box<HistoryTransaction>, bool, Result<HashSet<Txid>, Error>),
-    UpgradeLedger(String),
+    UpgradeLedger(String, Network),
     Upgrade(UpgradeMessage),
 }
diff --git a/gui/src/app/state/psbt.rs b/gui/src/app/state/psbt.rs
@@ -413,6 +413,7 @@ pub struct SignAction {
     signed: HashSet<Fingerprint>,
     is_saved: bool,
     display_modal: bool,
+    runtime: tokio::runtime::Handle,
 }
 
 impl SignAction {
@@ -431,14 +432,15 @@ impl SignAction {
             signed,
             is_saved,
             display_modal: true,
+            runtime: tokio::runtime::Handle::current(),
         }
     }
 }
 
 impl Action for SignAction {
     fn subscription(&self) -> Subscription<Message> {
-        let mut subs = maybe_ledger_upgrade_subscription(&self.hws);
-        subs.push(self.hws.refresh().map(Message::HardwareWallets));
+        let ( mut subs, upgrading_hws ) = maybe_ledger_upgrade_subscription(&self.hws, self.runtime.clone());
+        subs.push(self.hws.refresh(upgrading_hws).map(Message::HardwareWallets));
         Subscription::batch(subs)
     }
 
@@ -526,8 +528,8 @@ impl Action for SignAction {
                     self.error = Some(e.into());
                 }
             },
-            Message::UpgradeLedger(id) => {
-                maybe_start_upgrade(id, &mut self.hws);
+            Message::UpgradeLedger(id, network) => {
+                maybe_start_upgrade(id, &mut self.hws, network);
             }
             Message::Upgrade(msg) => {
                 update_upgrade_state(msg, &mut self.hws);

diff --git a/gui/src/app/state/receive.rs b/gui/src/app/state/receive.rs
@@ -224,6 +224,7 @@ pub struct VerifyAddressModal {
     hws: HardwareWallets,
     address: Address,
     derivation_index: ChildNumber,
+    runtime: tokio::runtime::Handle,
 }
 
 impl VerifyAddressModal {
@@ -240,6 +241,7 @@ impl VerifyAddressModal {
             hws: HardwareWallets::new(data_dir, network).with_wallet(wallet),
             address,
             derivation_index,
+            runtime: tokio::runtime::Handle::current(),
         }
     }
 }
@@ -256,8 +258,13 @@ impl VerifyAddressModal {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        let mut subs = maybe_ledger_upgrade_subscription(&self.hws);
-        subs.push(self.hws.refresh().map(Message::HardwareWallets));
+        let (mut subs, upgrading_hws) =
+            maybe_ledger_upgrade_subscription(&self.hws, self.runtime.clone());
+        subs.push(
+            self.hws
+                .refresh(upgrading_hws)
+                .map(Message::HardwareWallets),
+        );
         Subscription::batch(subs)
     }
 
@@ -300,8 +307,8 @@ impl VerifyAddressModal {
                     Command::none()
                 }
             }
-            Message::UpgradeLedger(id) => {
-                maybe_start_upgrade(id, &mut self.hws);
+            Message::UpgradeLedger(id, network) => {
+                maybe_start_upgrade(id, &mut self.hws, network);
                 Command::none()
             }
             Message::Upgrade(msg) => {

diff --git a/gui/src/app/state/settings/wallet.rs b/gui/src/app/state/settings/wallet.rs
@@ -204,6 +204,7 @@ pub struct RegisterWalletModal {
     hws: HardwareWallets,
     registered: HashSet<Fingerprint>,
     processing: bool,
+    runtime: tokio::runtime::Handle,
 }
 
 impl RegisterWalletModal {
@@ -220,6 +221,7 @@ impl RegisterWalletModal {
             wallet,
             processing: false,
             registered,
+            runtime: tokio::runtime::Handle::current(),
         }
     }
 }
@@ -236,8 +238,13 @@ impl RegisterWalletModal {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        let mut subs = maybe_ledger_upgrade_subscription(&self.hws);
-        subs.push(self.hws.refresh().map(Message::HardwareWallets));
+        let (mut subs, upgrading_hws) =
+            maybe_ledger_upgrade_subscription(&self.hws, self.runtime.clone());
+        subs.push(
+            self.hws
+                .refresh(upgrading_hws)
+                .map(Message::HardwareWallets),
+        );
         Subscription::batch(subs)
     }
 
@@ -303,8 +310,8 @@ impl RegisterWalletModal {
                     Command::none()
                 }
             }
-            Message::UpgradeLedger(id) => {
-                maybe_start_upgrade(id, &mut self.hws);
+            Message::UpgradeLedger(id, network) => {
+                maybe_start_upgrade(id, &mut self.hws, network);
                 Command::none()
             }
             Message::Upgrade(msg) => {