Feature/trezor reconnect

node-gui/backend/src/backend_impl.rs

@@ -626,6 +626,7 @@ impl Backend {
                 false,
                 ScanBlockchain::ScanNoWait,
                 hardware_wallet,
+                None,
             )
             .await
             .map_err(|err| BackendError::WalletError(err.to_string()))?;

node-gui/src/main_window/mod.rs

@@ -655,6 +655,20 @@ impl MainWindow {
                             backend_sender,
                         )
                         .map(MainWindowMessage::MainWidgetMessage),
+                    ConsoleCommand::ChoiceMenu(menu) => self
+                        .main_widget
+                        .update(
+                            MainWidgetMessage::TabsMessage(TabsMessage::WalletMessage(
+                                wallet_id,
+                                WalletMessage::ConsoleOutput(format!(
+                                    "{}\n{}",
+                                    menu.header(),
+                                    menu.choice_list().join("\n")
+                                )),
+                            )),
+                            backend_sender,
+                        )
+                        .map(MainWindowMessage::MainWidgetMessage),
                     ConsoleCommand::ClearScreen
                     | ConsoleCommand::ClearHistory
                     | ConsoleCommand::PrintHistory
@@ -718,7 +732,7 @@ impl MainWindow {
                         }
                     }
                     #[cfg(feature = "trezor")]
-                    WalletArgs::Trezor => WalletTypeArgs::Trezor,
+                    WalletArgs::Trezor => WalletTypeArgs::Trezor { device_id: None },
                 };
 
                 self.file_dialog_active = true;

wallet/Cargo.toml

@@ -26,7 +26,7 @@ utils-networking = { path = "../utils/networking" }
 utxo = { path = "../utxo" }
 wallet-storage = { path = "./storage" }
 wallet-types = { path = "./types" }
-trezor-client = { git = "https://github.com/mintlayer/mintlayer-trezor-firmware", branch = "feature/mintlayer-pk", features = ["bitcoin", "mintlayer"], optional = true }
+trezor-client = { git = "https://github.com/mintlayer/mintlayer-trezor-firmware", branch = "mintlayer-master", features = ["bitcoin", "mintlayer"], optional = true }
 
 bip39 = { workspace = true, default-features = false, features = ["std", "zeroize"] }
 hex.workspace = true

wallet/src/signer/mod.rs

@@ -13,6 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(test)]
+mod signer_test_helpers;
+
 use std::sync::Arc;
 
 use common::{
@@ -152,5 +155,5 @@ pub trait SignerProvider {
         id: &AccountId,
     ) -> WalletResult<Account<Self::K>>;
 
-    fn get_hardware_wallet_data(&mut self) -> Option<HardwareWalletData>;
+    fn get_hardware_wallet_data(&self) -> Option<HardwareWalletData>;
 }