Merge pull request #188 from KeystoneHQ/cardano

fix(cardano): transaction error
KeystoneHQ · Oct 26, 2023 · 34c9bcb · 34c9bcb
2 parents 2298d7d + 2378b1e
commit 34c9bcb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/rust/apps/cardano/Cargo.lock b/rust/apps/cardano/Cargo.lock
diff --git a/rust/apps/cardano/src/structs.rs b/rust/apps/cardano/src/structs.rs
@@ -229,7 +229,7 @@ impl ParsedCardanoTx {
                 let cert = _certs.get(i);
                 if let Some(_cert) = cert.as_stake_delegation() {
                     certs.push(CardanoCertificate::new(
-                        "stake delegation".to_string(),
+                        "Stake Pool Delegation".to_string(),
                         RewardAddress::new(network_id, &_cert.stake_credential())
                             .to_address()
                             .to_bech32(None)
@@ -244,7 +244,7 @@ impl ParsedCardanoTx {
                 }
                 if let Some(_cert) = cert.as_stake_deregistration() {
                     certs.push(CardanoCertificate::new(
-                        "stake deregistration".to_string(),
+                        "Stake Deregistration".to_string(),
                         RewardAddress::new(network_id, &_cert.stake_credential())
                             .to_address()
                             .to_bech32(None)
@@ -254,7 +254,7 @@ impl ParsedCardanoTx {
                 }
                 if let Some(_cert) = cert.as_stake_registration() {
                     certs.push(CardanoCertificate::new(
-                        "stake registration".to_string(),
+                        "Stake Registration".to_string(),
                         RewardAddress::new(network_id, &_cert.stake_credential())
                             .to_address()
                             .to_bech32(None)
@@ -366,7 +366,7 @@ impl ParsedCardanoTx {
 
                     let to = CardanoTo {
                         address: address.clone(),
-                        amount: normalize_value(output.value),
+                        amount: normalize_coin(output.value),
                         value: output.value,
                         assets: assets_map.clone(),
                         assets_text: match assets_map.len() {

diff --git a/rust/rust_c/src/interfaces/cardano/mod.rs b/rust/rust_c/src/interfaces/cardano/mod.rs
@@ -6,7 +6,7 @@ use crate::interfaces::types::{Ptr, PtrBytes, PtrString, PtrT, PtrUR};
 use crate::interfaces::ur::{UREncodeResult, FRAGMENT_MAX_LENGTH_DEFAULT};
 use crate::interfaces::utils::{convert_c_char, recover_c_char};
 use alloc::format;
-use alloc::string::ToString;
+use alloc::string::{String, ToString};
 
 use alloc::vec::Vec;
 use app_cardano::errors::CardanoError;
@@ -48,7 +48,13 @@ pub extern "C" fn cardano_get_path(ptr: PtrUR) -> Ptr<SimpleResponse<c_char>> {
     let cardano_sign_reqeust = extract_ptr_with_type!(ptr, CardanoSignRequest);
     match cardano_sign_reqeust.get_utxos().get(0) {
         Some(_data) => match _data.get_key_path().get_path() {
-            Some(_path) => SimpleResponse::success(convert_c_char(_path)).simple_c_ptr(),
+            Some(_path) => {
+                if let Some(path) = parse_cardano_root_path(_path) {
+                    return SimpleResponse::success(convert_c_char(path)).simple_c_ptr();
+                }
+                SimpleResponse::from(CardanoError::InvalidTransaction(format!("invalid utxo")))
+                    .simple_c_ptr()
+            }
             None => SimpleResponse::from(CardanoError::InvalidTransaction(format!("invalid utxo")))
                 .simple_c_ptr(),
         },
@@ -57,6 +63,21 @@ pub extern "C" fn cardano_get_path(ptr: PtrUR) -> Ptr<SimpleResponse<c_char>> {
     }
 }
 
+fn parse_cardano_root_path(path: String) -> Option<String> {
+    let root_path = "1852'/1815'/";
+    match path.strip_prefix(root_path) {
+        Some(path) => {
+            if let Some(index) = path.find("/") {
+                let sub_path = &path[..index];
+                Some(format!("{}{}", root_path, sub_path))
+            } else {
+                None
+            }
+        }
+        None => None,
+    }
+}
+
 #[no_mangle]
 pub extern "C" fn cardano_parse_tx(
     ptr: PtrUR,

diff --git a/src/ui/gui_widgets/gui_multi_accounts_receive_widgets.c b/src/ui/gui_widgets/gui_multi_accounts_receive_widgets.c
@@ -610,7 +610,7 @@ static void GuiCreateGotoAddressWidgets(lv_obj_t *parent)
         label = GuiCreateLabelWithFont(cont, _("receive_btc_receive_change_address_title"), &openSans_20);
         lv_obj_align(label, LV_ALIGN_TOP_LEFT, 36, 30 + 270);
         lv_obj_set_style_text_opa(label, LV_OPA_56, LV_PART_MAIN);
-        label = GuiCreateLabelWithFont(cont, "Account-", &openSans_24);
+        label = GuiCreateLabelWithFont(cont, "Address-", &openSans_24);
         lv_obj_align(label, LV_ALIGN_TOP_LEFT, 36, 108 + 270);
         lv_obj_set_style_text_opa(label, LV_OPA_56, LV_PART_MAIN);
         g_multiAccountsReceiveWidgets.inputAccountLabel = GuiCreateLabelWithFont(cont, "", &openSans_24);