Add Ledger signer provider

Author: OBorce

node-gui/Cargo.toml

@@ -5,7 +5,11 @@ license.workspace = true
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
-authors = ["Samer Afach <samer.afach@mintlayer.org>", "Ben Marsh <benjamin.marsh@mintlayer.org>", "Enrico Rubboli <enrico.rubboli@mintlayer.org>"]
+authors = [
+  "Samer Afach <samer.afach@mintlayer.org>",
+  "Ben Marsh <benjamin.marsh@mintlayer.org>",
+  "Enrico Rubboli <enrico.rubboli@mintlayer.org>",
+]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,7 +27,7 @@ utils = { path = "../utils" }
 wallet = { path = "../wallet" }
 wallet-controller = { path = "../wallet/wallet-controller" }
 wallet-types = { path = "../wallet/types" }
-wallet-cli-commands = { path = "../wallet/wallet-cli-commands"}
+wallet-cli-commands = { path = "../wallet/wallet-cli-commands" }
 wallet-storage = { path = "../wallet/storage" }
 
 anyhow.workspace = true
@@ -42,5 +46,16 @@ tokio.workspace = true
 winres = "0.1"
 
 [features]
-trezor = ["wallet-controller/trezor", "wallet-types/trezor", "wallet-cli-commands/trezor", "node-gui-backend/trezor"]
-default = ["trezor"]
+trezor = [
+  "wallet-controller/trezor",
+  "wallet-types/trezor",
+  "wallet-cli-commands/trezor",
+  "node-gui-backend/trezor",
+]
+ledger = [
+  "wallet-controller/ledger",
+  "wallet-types/ledger",
+  "wallet-cli-commands/ledger",
+  "node-gui-backend/ledger",
+]
+default = ["trezor", "ledger"]

node-gui/backend/Cargo.toml

@@ -5,7 +5,11 @@ license.workspace = true
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
-authors = ["Samer Afach <samer.afach@mintlayer.org>", "Ben Marsh <benjamin.marsh@mintlayer.org>", "Enrico Rubboli <enrico.rubboli@mintlayer.org>"]
+authors = [
+  "Samer Afach <samer.afach@mintlayer.org>",
+  "Ben Marsh <benjamin.marsh@mintlayer.org>",
+  "Enrico Rubboli <enrico.rubboli@mintlayer.org>",
+]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -24,9 +28,9 @@ utils = { path = "../../utils" }
 wallet = { path = "../../wallet" }
 wallet-controller = { path = "../../wallet/wallet-controller" }
 wallet-types = { path = "../../wallet/types" }
-wallet-rpc-lib = { path = "../../wallet/wallet-rpc-lib"}
-wallet-rpc-client = { path = "../../wallet/wallet-rpc-client"}
-wallet-cli-commands = { path = "../../wallet/wallet-cli-commands"}
+wallet-rpc-lib = { path = "../../wallet/wallet-rpc-lib" }
+wallet-rpc-client = { path = "../../wallet/wallet-rpc-client" }
+wallet-cli-commands = { path = "../../wallet/wallet-cli-commands" }
 
 anyhow.workspace = true
 chrono.workspace = true
@@ -45,4 +49,19 @@ test-utils = { path = "../../test-utils" }
 rstest.workspace = true
 
 [features]
-trezor = ["wallet/trezor", "wallet-controller/trezor", "wallet-types/trezor", "wallet-rpc-lib/trezor", "wallet-rpc-client/trezor", "wallet-cli-commands/trezor"]
+trezor = [
+  "wallet/trezor",
+  "wallet-controller/trezor",
+  "wallet-types/trezor",
+  "wallet-rpc-lib/trezor",
+  "wallet-rpc-client/trezor",
+  "wallet-cli-commands/trezor",
+]
+ledger = [
+  "wallet/ledger",
+  "wallet-controller/ledger",
+  "wallet-types/ledger",
+  "wallet-rpc-lib/ledger",
+  "wallet-rpc-client/ledger",
+  "wallet-cli-commands/ledger",
+]

node-gui/src/main_window/main_widget/tabs/wallet/mod.rs

@@ -471,6 +471,7 @@ impl Tab for WalletTab {
             Some(wallet_info) => match wallet_info.extra_info {
                 wallet_controller::types::WalletExtraInfo::SoftwareWallet => "Software wallet",
                 wallet_controller::types::WalletExtraInfo::TrezorWallet { .. } => "Trezor wallet",
+                wallet_controller::types::WalletExtraInfo::LedgerWallet { .. } => "Ledger wallet",
             },
             None => "No wallet",
         };

node-gui/src/main_window/main_widget/tabs/wallet/status_bar.rs

@@ -36,6 +36,11 @@ pub fn estimate_status_bar_height(wallet_info: &WalletExtraInfo) -> f32 {
             // For some reason, the status bar gets a bit of additional height.
             + 4.
         }
+        WalletExtraInfo::LedgerWallet { .. } => {
+            TEXT_SIZE + 2. * VERTICAL_PADDING
+            // Same as Trezor
+            + 4.
+        }
     }
 }
 
@@ -67,6 +72,16 @@ pub fn view_status_bar(wallet_info: &WalletExtraInfo) -> Option<Element<'static,
                 .size(TEXT_SIZE),
             ]
         }
+        #[cfg(feature = "ledger")]
+        WalletExtraInfo::LedgerWallet { firmware_version } => {
+            use iced::widget::{rich_text, span};
+
+            row![rich_text([
+                span("Firmware version: ").font(bold_font),
+                span(firmware_version.clone())
+            ])
+            .size(TEXT_SIZE),]
+        }
     };
 
     let status_bar = Container::new(

wallet/src/key_chain/master_key_chain/mod.rs

@@ -22,7 +22,7 @@ use crypto::vrf::ExtendedVRFPrivateKey;
 use std::sync::Arc;
 use wallet_storage::{
     StoreTxRwUnlocked, WalletStorageReadLocked, WalletStorageReadUnlocked,
-    WalletStorageWriteUnlocked,
+    WalletStorageWriteLocked, WalletStorageWriteUnlocked,
 };
 use wallet_types::seed_phrase::{SerializableSeedPhrase, StoreSeedPhrase};
 
@@ -131,7 +131,7 @@ impl MasterKeyChain {
 
     pub fn create_account_key_chain(
         &self,
-        db_tx: &mut impl WalletStorageWriteUnlocked,
+        db_tx: &mut (impl WalletStorageWriteLocked + WalletStorageReadUnlocked),
         account_index: U31,
         lookahead_size: u32,
     ) -> KeyChainResult<AccountKeyChainImplSoftware> {

wallet/src/signer/ledger_signer/ledger_messages.rs

@@ -30,6 +30,7 @@ use crypto::key::{
 };
 use serialization::{Decode, DecodeAll, Encode};
 use utils::ensure;
+use wallet_types::hw_data::LedgerDataFullInfo;
 
 use ledger_lib::Exchange;
 
@@ -57,6 +58,7 @@ impl From<LedgerAddrType> for u8 {
 struct Ins {}
 
 impl Ins {
+    const APP_VER: u8 = 0x03;
     const APP_NAME: u8 = 0x04;
     const PUB_KEY: u8 = 0x05;
     const SIGN_TX: u8 = 0x06;
@@ -199,8 +201,13 @@ pub async fn get_app_name<L: Exchange>(ledger: &mut L) -> Result<Vec<u8>, ledger
     ledger.exchange(&msg_buf, Duration::from_millis(100)).await
 }
 
+async fn get_app_version<L: Exchange>(ledger: &mut L) -> Result<Vec<u8>, ledger_lib::Error> {
+    let msg_buf = [CLA, Ins::APP_VER, 0, P2::DONE];
+    ledger.exchange(&msg_buf, Duration::from_millis(100)).await
+}
+
 #[allow(dead_code)]
-pub async fn check_current_app<L: Exchange>(ledger: &mut L) -> SignerResult<()> {
+pub async fn check_current_app<L: Exchange>(ledger: &mut L) -> SignerResult<LedgerDataFullInfo> {
     let resp = get_app_name(ledger)
         .await
         .map_err(|err| LedgerError::DeviceError(err.to_string()))?;
@@ -212,7 +219,19 @@ pub async fn check_current_app<L: Exchange>(ledger: &mut L) -> SignerResult<()>
         LedgerError::DifferentActiveApp(name)
     );
 
-    Ok(())
+    let ver = get_app_version(ledger)
+        .await
+        .map_err(|err| LedgerError::DeviceError(err.to_string()))?;
+    let firmware_version = match ver.as_slice() {
+        [major, minor, patch] => common::primitives::semver::SemVer {
+            major: *major,
+            minor: *minor,
+            patch: *patch as u16,
+        },
+        _ => return Err(SignerError::LedgerError(LedgerError::InvalidResponse)),
+    };
+
+    Ok(LedgerDataFullInfo { firmware_version })
 }
 
 pub async fn get_extended_public_key<L: Exchange>(