Merge branch 'LedgerHQ:develop' into develop

LedgerHQ · Aug 25, 2024 · be255bd · be255bd
2 parents 6ab32ec + 4d88a45
commit be255bd
Show file tree

Hide file tree

Showing 6 changed files with 643 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ APPNAME = "Solana"
 # Application version
 APPVERSION_M = 1
 APPVERSION_N = 5
-APPVERSION_P = 0
+APPVERSION_P = 1
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 # Application source files

diff --git a/libsol/message_test.c b/libsol/message_test.c
@@ -1681,7 +1681,7 @@ void test_process_message_body_spl_token_transfer() {
                 42, 0, 0, 0, 0, 0, 0, 0,
                 9
     };
-    process_message_body_and_sanity_check(message, sizeof(message), 5);
+    process_message_body_and_sanity_check(message, sizeof(message), 6);
 }
 
 void test_process_message_body_spl_token_approve() {
@@ -1703,7 +1703,7 @@ void test_process_message_body_spl_token_approve() {
                 42, 0, 0, 0, 0, 0, 0, 0,
                 9
     };
-    process_message_body_and_sanity_check(message, sizeof(message), 5);
+    process_message_body_and_sanity_check(message, sizeof(message), 6);
 }
 
 void test_process_message_body_spl_token_revoke() {
@@ -1784,7 +1784,7 @@ void test_process_message_body_spl_token_burn() {
                 42, 0, 0, 0, 0, 0, 0, 0,
                 9
     };
-    process_message_body_and_sanity_check(message, sizeof(message), 4);
+    process_message_body_and_sanity_check(message, sizeof(message), 5);
 }
 
 void test_process_message_body_spl_token_close_account() {
@@ -1916,7 +1916,7 @@ void test_process_message_body_spl_associated_token_create_with_transfer() {
                 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x09
     };
-    process_message_body_and_sanity_check(message, sizeof(message), 9);
+    process_message_body_and_sanity_check(message, sizeof(message), 10);
 }
 
 void test_process_message_body_spl_associated_token_create_with_transfer_and_assert_owner() {
@@ -1955,7 +1955,7 @@ void test_process_message_body_spl_associated_token_create_with_transfer_and_ass
                     0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                     0x09
     };
-    process_message_body_and_sanity_check(message, sizeof(message), 9);
+    process_message_body_and_sanity_check(message, sizeof(message), 10);
 }
 
 /* clang-format on */

diff --git a/libsol/spl_token_instruction.c b/libsol/spl_token_instruction.c
@@ -502,6 +502,9 @@ int print_spl_token_transfer_info(const SplTokenTransferInfo* info,
                                   symbol,
                                   info->body.decimals);
 
+    item = transaction_summary_general_item();
+    summary_item_set_pubkey(item, "Mint", info->mint_account);
+
     item = transaction_summary_general_item();
     summary_item_set_pubkey(item, "From", info->src_account);
 
@@ -528,6 +531,9 @@ static int print_spl_token_approve_info(const SplTokenApproveInfo* info,
                                   symbol,
                                   info->body.decimals);
 
+    item = transaction_summary_general_item();
+    summary_item_set_pubkey(item, "Mint", info->mint_account);
+
     item = transaction_summary_general_item();
     summary_item_set_pubkey(item, "From", info->token_account);
 
@@ -591,10 +597,8 @@ static int print_spl_token_mint_to_info(const SplTokenMintToInfo* info,
                                   symbol,
                                   info->body.decimals);
 
-    if (print_config->expert_mode) {
-        item = transaction_summary_general_item();
-        summary_item_set_pubkey(item, "From", info->mint_account);
-    }
+    item = transaction_summary_general_item();
+    summary_item_set_pubkey(item, "Mint", info->mint_account);
 
     item = transaction_summary_general_item();
     summary_item_set_pubkey(item, "To", info->token_account);
@@ -618,6 +622,9 @@ static int print_spl_token_burn_info(const SplTokenBurnInfo* info,
                                   symbol,
                                   info->body.decimals);
 
+    item = transaction_summary_general_item();
+    summary_item_set_pubkey(item, "Mint", info->mint_account);
+
     item = transaction_summary_general_item();
     summary_item_set_pubkey(item, "From", info->token_account);