Merge branch 'Blockstream:master' into feature_export_xpub

Author: Austin-Fulbright

main/fonts/jade_symbols_16x16.c

@@ -1,5 +1,5 @@
 #ifndef AMALGAMATED_BUILD
-const unsigned char jade_symbols_16x16[4 + 32 * 31] = {
+const unsigned char jade_symbols_16x16[4 + 32 * 32] = {
     0x10, 0x10, 0x30, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xC0, 0x0F, 0xC0,
     0x0F, 0xC0, 0x0F, 0xC0, 0x0F, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, // 0 Battery empty
@@ -63,5 +63,7 @@ const unsigned char jade_symbols_16x16[4 + 32 * 31] = {
     0x0C, 0x18, 0x18, 0x5C, 0x38, 0x0F, 0xF0, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00, // M Hollow Circle
     0x00, 0x00, 0x00, 0x00, 0x03, 0xC0, 0x0F, 0xF0, 0x1C, 0x38, 0x19, 0x98, 0x31, 0x8C, 0x37, 0x8C, 0x37, 0x8C, 0x30,
     0x0C, 0x18, 0x18, 0x5C, 0x38, 0x0F, 0xF0, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00, // N Clock
+    0x7F, 0xFE, 0x40, 0x02, 0x5F, 0xE2, 0x5F, 0xF2, 0x58, 0x1A, 0x58, 0x1A, 0x58, 0x1A, 0x5F, 0xF2, 0x5F, 0xE2, 0x59,
+    0xC2, 0x58, 0xE2, 0x58, 0x72, 0x58, 0x3A, 0x58, 0x1A, 0x40, 0x02, 0x7F, 0xFE, // O Japan Cert "R"
 };
 #endif // AMALGAMATED_BUILD

main/process/sign_psbt.c

@@ -28,8 +28,8 @@
 #include "process_utils.h"
 
 bool show_btc_transaction_outputs_activity(
-    const network_t network_id, const struct wally_tx* tx, const output_info_t* output_info);
-bool show_btc_fee_confirmation_activity(const struct wally_tx* tx, const output_info_t* outinfo,
+    network_t network_id, const struct wally_tx* tx, const output_info_t* output_info);
+bool show_btc_fee_confirmation_activity(network_t network_id, const struct wally_tx* tx, const output_info_t* outinfo,
     script_flavour_t aggregate_inputs_scripts_flavour, uint64_t input_amount, uint64_t output_amount);
 
 // From https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki
@@ -810,7 +810,7 @@ int sign_psbt(const network_t network_id, struct wally_psbt* psbt, const char**
     // User to agree fee amount
     // Check to see whether user accepted or declined
     if (!show_btc_fee_confirmation_activity(
-            tx, output_info, aggregate_inputs_scripts_flavour, input_amount, output_amount)) {
+            network_id, tx, output_info, aggregate_inputs_scripts_flavour, input_amount, output_amount)) {
         *errmsg = "User declined to sign psbt";
         retval = CBOR_RPC_USER_CANCELLED;
         goto cleanup;

main/process/sign_tx.c

@@ -47,7 +47,7 @@ bool show_elements_swap_activity(const network_t network_id, bool initial_propos
     size_t num_in_sums, const asset_summary_t* out_sums, size_t num_out_sums, const asset_info_t* assets,
     size_t num_assets);
 
-bool show_btc_final_confirmation_activity(uint64_t fee, const char* warning_msg);
+bool show_btc_final_confirmation_activity(network_t network_id, uint64_t fee, const char* warning_msg);
 bool show_elements_final_confirmation_activity(
     const network_t network_id, const char* title, const uint64_t fee, const char* warning_msg);
 
@@ -365,8 +365,9 @@ bool rpc_get_signing_outputs(jade_process_t* process, const CborValue* params, c
     return true;
 }
 
-bool show_btc_fee_confirmation_activity(const struct wally_tx* tx, const output_info_t* outinfo,
-    const script_flavour_t aggregate_inputs_scripts_flavour, const uint64_t input_amount, const uint64_t output_amount)
+bool show_btc_fee_confirmation_activity(const network_t network_id, const struct wally_tx* tx,
+    const output_info_t* outinfo, const script_flavour_t aggregate_inputs_scripts_flavour, const uint64_t input_amount,
+    const uint64_t output_amount)
 {
     JADE_ASSERT(tx);
     // outputinfo is optional
@@ -405,7 +406,7 @@ bool show_btc_fee_confirmation_activity(const struct wally_tx* tx, const output_
     }
 
     // Return whether the user accepts or declines
-    return show_btc_final_confirmation_activity(fees, warning_msg);
+    return show_btc_final_confirmation_activity(network_id, fees, warning_msg);
 }
 
 // Loop to generate and send Anti-Exfil signatures as they are requested.
@@ -602,7 +603,7 @@ static void sign_tx_impl(jade_process_t* process, const bool for_liquid)
         }
     } else {
         // Bitcoin: Confirm all non-change outputs
-        if (for_liquid && !show_btc_transaction_outputs_activity(network_id, tx, output_info)) {
+        if (!show_btc_transaction_outputs_activity(network_id, tx, output_info)) {
             cancelmsg = "User declined to sign transaction";
         }
     }
@@ -934,7 +935,7 @@ static void sign_tx_impl(jade_process_t* process, const bool for_liquid)
         // User to agree fee amount
         // If user cancels we'll send the 'cancelled' error response for the last input message only
         if (!show_btc_fee_confirmation_activity(
-                tx, output_info, aggregate_inputs_scripts_flavour, input_amount, output_amount)) {
+                network_id, tx, output_info, aggregate_inputs_scripts_flavour, input_amount, output_amount)) {
             // If using ae-signatures, we need to load the message to send the error back on
             if (use_ae_signatures) {
                 jade_process_load_in_message(process, true);

main/ui/dashboard.c

@@ -752,18 +752,25 @@ static void make_legal_page(link_activity_t* page_act, int legal_page)
     }
 #if defined(CONFIG_BOARD_TYPE_JADE_V1_1) || defined(CONFIG_BOARD_TYPE_JADE_V2)
     case 6: {
-        gui_view_node_t* vsplit;
-        gui_make_vsplit(&vsplit, GUI_SPLIT_RELATIVE, 2, 80, 20);
-        gui_set_parent(vsplit, parent);
+        gui_view_node_t* hsplit;
+        gui_make_hsplit(&hsplit, GUI_SPLIT_RELATIVE, 3, 36, 10, 54);
+        gui_set_parent(hsplit, parent);
 
         Picture* const pic = get_picture(telecstart, telecend);
         gui_make_picture(&node, pic);
-        gui_set_parent(node, vsplit);
-        gui_set_align(node, GUI_ALIGN_CENTER, GUI_ALIGN_MIDDLE);
+        gui_set_parent(node, hsplit);
+        gui_set_align(node, GUI_ALIGN_RIGHT, GUI_ALIGN_MIDDLE);
+        gui_set_padding(node, GUI_MARGIN_ALL_DIFFERENT, 0, 8, 0, 0);
+
+        gui_make_text_font(&node, "O", TFT_WHITE, JADE_SYMBOLS_16x16_FONT);
+        gui_set_parent(node, hsplit);
+        gui_set_align(node, GUI_ALIGN_RIGHT, GUI_ALIGN_MIDDLE);
+        gui_set_padding(node, GUI_MARGIN_ALL_DIFFERENT, 0, 4, 2, 0);
 
         gui_make_text(&node, "211-210802", TFT_WHITE);
-        gui_set_parent(node, vsplit);
-        gui_set_align(node, GUI_ALIGN_CENTER, GUI_ALIGN_MIDDLE);
+        gui_set_parent(node, hsplit);
+        gui_set_align(node, GUI_ALIGN_LEFT, GUI_ALIGN_MIDDLE);
+        gui_set_padding(node, GUI_MARGIN_ALL_DIFFERENT, 0, 0, 0, 4);
         break;
     }
 #endif

main/ui/sign_tx.c

@@ -417,7 +417,7 @@ static bool show_input_output_activity(const char* title, const bool is_wallet_o
 bool show_btc_transaction_outputs_activity(
     const network_t network_id, const struct wally_tx* tx, const output_info_t* output_info)
 {
-    JADE_ASSERT(network_id != NETWORK_NONE);
+    JADE_ASSERT(!network_is_liquid(network_id));
     JADE_ASSERT(tx);
     // Note: output_info is optional and can be null
 
@@ -763,8 +763,10 @@ static bool show_final_confirmation_activity(
     }
 }
 
-bool show_btc_final_confirmation_activity(const uint64_t fee, const char* warning_msg)
+bool show_btc_final_confirmation_activity(const network_t network_id, const uint64_t fee, const char* warning_msg)
 {
+    JADE_ASSERT(!network_is_liquid(network_id));
+
     char feeamount[32];
     const int ret = snprintf(feeamount, sizeof(feeamount), "%.08f", 1.0 * fee / 1e8);
     JADE_ASSERT(ret > 0 && ret < sizeof(feeamount));