consistency: make display network checks consistent between btc and liquid

Suggested-by: Jamie C. Driver <jamie@blockstream.io>

Author: jgriffiths

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.
@@ -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/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));