btc: put network name and coin into params

Put it into the params like the rest of the params - no need to have
special mapping functions just for the name.

Author: benma

src/apps/btc/btc.c

@@ -90,7 +90,7 @@ app_btc_result_t app_btc_address_multisig(
 
     const char* title = "Receive to";
 
-    if (!apps_btc_confirm_multisig_basic(title, coin, multisig_registered_name, multisig)) {
+    if (!apps_btc_confirm_multisig_basic(title, params, multisig_registered_name, multisig)) {
         return APP_BTC_ERR_USER_ABORT;
     }
 
@@ -209,7 +209,7 @@ app_btc_result_t app_btc_register_script_config(
     }
 
     if (!apps_btc_confirm_multisig_extended(
-            "Register", coin, name, multisig, xpub_type, keypath, keypath_len)) {
+            "Register", params, name, multisig, xpub_type, keypath, keypath_len)) {
         return APP_BTC_ERR_USER_ABORT;
     }
 

src/apps/btc/btc_common.c

@@ -27,27 +27,6 @@
 
 #define MULTISIG_P2WSH_MAX_SIGNERS 15
 
-const char* btc_common_coin_name(BTCCoin coin)
-{
-    static const char* _coin_btc = "Bitcoin";
-    static const char* _coin_tbtc = "BTC Testnet";
-    static const char* _coin_ltc = "Litecoin";
-    static const char* _coin_tltc = "LTC Testnet";
-
-    switch (coin) {
-    case BTCCoin_BTC:
-        return _coin_btc;
-    case BTCCoin_TBTC:
-        return _coin_tbtc;
-    case BTCCoin_LTC:
-        return _coin_ltc;
-    case BTCCoin_TLTC:
-        return _coin_tltc;
-    default:
-        Abort("btc_common_coin_name");
-    }
-}
-
 bool btc_common_is_valid_keypath_account_simple(
     BTCScriptConfig_SimpleType script_type,
     const uint32_t* keypath,

src/apps/btc/btc_common.h

@@ -36,12 +36,6 @@
 // is technically possible to extend to if needed.
 #define MAX_PK_SCRIPT_SIZE (700)
 
-/**
- * Returns the coin name to be used in confirm dialogs ("Bitcoin", "Litecoin", etc.). Aborts for an
- * invalid coin.
- */
-USE_RESULT const char* btc_common_coin_name(BTCCoin coin);
-
 /**
  * Does limit checks the keypath, whitelisting bip44 purposes and accounts.
  * @return true if the keypath is valid, false if it is invalid.

src/apps/btc/btc_params.c

@@ -18,37 +18,45 @@
 // Keep these in sync with hww/api/bitcoin/params.rs
 
 static const app_btc_coin_params_t _params_btc = {
+    .coin = BTCCoin_BTC,
     .bip44_coin = 0 + BIP32_INITIAL_HARDENED_CHILD,
     .base58_version_p2pkh = 0x00, // starts with 1
     .base58_version_p2sh = 0x05, // starts with 3
     .bech32_hrp = "bc",
+    .name = "Bitcoin",
     .unit = "BTC",
     .rbf_support = true,
 };
 
 static const app_btc_coin_params_t _params_tbtc = {
+    .coin = BTCCoin_TBTC,
     .bip44_coin = 1 + BIP32_INITIAL_HARDENED_CHILD,
     .base58_version_p2pkh = 0x6f, // starts with m or n
     .base58_version_p2sh = 0xc4, // starts with 2
     .bech32_hrp = "tb",
+    .name = "BTC Testnet",
     .unit = "TBTC",
     .rbf_support = true,
 };
 
 static const app_btc_coin_params_t _params_ltc = {
+    .coin = BTCCoin_LTC,
     .bip44_coin = 2 + BIP32_INITIAL_HARDENED_CHILD,
     .base58_version_p2pkh = 0x30, // starts with L
     .base58_version_p2sh = 0x32, // starts with M
     .bech32_hrp = "ltc",
+    .name = "Litecoin",
     .unit = "LTC",
     .rbf_support = false,
 };
 
 static const app_btc_coin_params_t _params_tltc = {
+    .coin = BTCCoin_TLTC,
     .bip44_coin = 1 + BIP32_INITIAL_HARDENED_CHILD,
     .base58_version_p2pkh = 0x6f, // starts with m or n
     .base58_version_p2sh = 0xc4, // starts with 2
     .bech32_hrp = "tltc",
+    .name = "LTC testnet",
     .unit = "TLTC",
     .rbf_support = false,
 };

src/apps/btc/btc_params.h

@@ -18,10 +18,12 @@
 #include <hww.pb.h>
 
 typedef struct {
+    BTCCoin coin;
     uint32_t bip44_coin;
     uint8_t base58_version_p2pkh;
     uint8_t base58_version_p2sh;
     const char* bech32_hrp;
+    const char* name;
     // unit to use in formatted amounts, e.g. "BTC".
     const char* unit;
     bool rbf_support;

src/apps/btc/btc_sign_validate.c

@@ -62,7 +62,7 @@ app_btc_result_t app_btc_sign_validate_init_script_configs(
             return APP_BTC_ERR_INVALID_INPUT;
         }
         if (!apps_btc_confirm_multisig_basic(
-                "Spend from", coin, multisig_registered_name, multisig)) {
+                "Spend from", coin_params, multisig_registered_name, multisig)) {
             return APP_BTC_ERR_USER_ABORT;
         }
         return APP_BTC_OK;

src/apps/btc/confirm_multisig.c

@@ -25,7 +25,7 @@
 
 bool apps_btc_confirm_multisig_basic(
     const char* title,
-    BTCCoin coin,
+    const app_btc_coin_params_t* params,
     const char* name,
     const BTCScriptConfig_Multisig* multisig)
 {
@@ -36,7 +36,7 @@ bool apps_btc_confirm_multisig_basic(
         "%lu-of-%lu\n%s multisig",
         (unsigned long)multisig->threshold,
         (unsigned long)multisig->xpubs_count,
-        btc_common_coin_name(coin));
+        params->name);
     if (snprintf_result < 0 || snprintf_result >= (int)sizeof(basic_info)) {
         Abort("apps_btc_confirm_multisig/0");
     }
@@ -60,7 +60,7 @@ bool apps_btc_confirm_multisig_basic(
 
 bool apps_btc_confirm_multisig_extended(
     const char* title,
-    BTCCoin coin,
+    const app_btc_coin_params_t* params,
     const char* name,
     const BTCScriptConfig_Multisig* multisig,
     BTCRegisterScriptConfigRequest_XPubType xpub_type,
@@ -82,7 +82,7 @@ bool apps_btc_confirm_multisig_extended(
     rust_bip32_to_string(
         keypath, keypath_len, rust_util_cstr_mut(keypath_string, sizeof(keypath_string)));
 
-    if (!apps_btc_confirm_multisig_basic(title, coin, name, multisig)) {
+    if (!apps_btc_confirm_multisig_basic(title, params, name, multisig)) {
         return false;
     }
 
@@ -92,19 +92,19 @@ bool apps_btc_confirm_multisig_extended(
     if (snprintf_result < 0 || snprintf_result >= (int)sizeof(info)) {
         Abort("apps_btc_confirm_multisig/0");
     }
-    const confirm_params_t params = {
+    const confirm_params_t confirm_params = {
         .title = title,
         .body = info,
         .accept_is_nextarrow = true,
     };
-    if (!workflow_confirm_blocking(&params)) {
+    if (!workflow_confirm_blocking(&confirm_params)) {
         return false;
     }
 
     xpub_type_t output_xpub_type;
     switch (xpub_type) {
     case BTCRegisterScriptConfigRequest_XPubType_AUTO_ELECTRUM:
-        switch (coin) {
+        switch (params->coin) {
         case BTCCoin_BTC:
         case BTCCoin_LTC:
             switch (multisig->script_type) {
@@ -136,7 +136,7 @@ bool apps_btc_confirm_multisig_extended(
         }
         break;
     case BTCRegisterScriptConfigRequest_XPubType_AUTO_XPUB_TPUB:
-        switch (coin) {
+        switch (params->coin) {
         case BTCCoin_BTC:
         case BTCCoin_LTC:
             output_xpub_type = XPUB;

src/apps/btc/confirm_multisig.h

@@ -15,6 +15,8 @@
 #ifndef _APPS_BTC_CONFIRM_MULTISIG_H_
 #define _APPS_BTC_CONFIRM_MULTISIG_H_
 
+#include "btc_params.h"
+
 #include <btc.pb.h>
 #include <compiler_util.h>
 #include <stdbool.h>
@@ -26,13 +28,13 @@
  * - multisig type (m-of-n)
  * - name given by the user
  * @param[in] title the title shown in each confirmation screen
- * @param[in] coin coin to be confirmed
+ * @param[in] params Coin params of the coin to be confirmed.
  * @param[in] name User given name of the multisig account.
  * @param[in] multisig multisig details
  */
 USE_RESULT bool apps_btc_confirm_multisig_basic(
     const char* title,
-    BTCCoin coin,
+    const app_btc_coin_params_t* params,
     const char* name,
     const BTCScriptConfig_Multisig* multisig);
 
@@ -46,7 +48,7 @@ USE_RESULT bool apps_btc_confirm_multisig_basic(
  * - account keypath
  * - all xpubs (formatted according to `xpub_type`).
  * @param[in] title the title shown in each confirmation screen
- * @param[in] coin coin to be confirmed
+ * @param[in] params Coin params of the coin to be confirmed.
  * @param[in] name User given name of the multisig account.
  * @param[in] multisig multisig details
  * @param[in] xpub_type: if AUTO_ELECTRUM, will automatically format xpubs as `Zpub/Vpub`,
@@ -56,7 +58,7 @@ USE_RESULT bool apps_btc_confirm_multisig_basic(
  */
 USE_RESULT bool apps_btc_confirm_multisig_extended(
     const char* title,
-    BTCCoin coin,
+    const app_btc_coin_params_t* params,
     const char* name,
     const BTCScriptConfig_Multisig* multisig,
     BTCRegisterScriptConfigRequest_XPubType xpub_type,

src/rust/bitbox02-rust/src/hww/api/bitcoin.rs

@@ -88,16 +88,6 @@ fn coin_enabled(coin: pb::BtcCoin) -> Result<(), Error> {
     Err(Error::Disabled)
 }
 
-pub fn coin_name(coin: pb::BtcCoin) -> &'static str {
-    use pb::BtcCoin::*;
-    match coin {
-        Btc => "Bitcoin",
-        Tbtc => "BTC Testnet",
-        Ltc => "Litecoin",
-        Tltc => "LTC Testnet",
-    }
-}
-
 /// Processes an xpub api call.
 async fn xpub(
     coin: BtcCoin,
@@ -121,11 +111,7 @@ async fn xpub(
     };
     let xpub = encode_xpub_at_keypath(keypath, xpub_type).or(Err(Error::InvalidInput))?;
     if display {
-        let title = format!(
-            "{}\naccount #{}",
-            coin_name(coin),
-            keypath[2] - HARDENED + 1,
-        );
+        let title = format!("{}\naccount #{}", params.name, keypath[2] - HARDENED + 1,);
         let confirm_params = confirm::Params {
             title: &title,
             body: &xpub,
@@ -147,7 +133,7 @@ async fn address_simple(
     let address = bitbox02::app_btc::address_simple(coin as _, simple_type as _, keypath)?;
     if display {
         let confirm_params = confirm::Params {
-            title: coin_name(coin),
+            title: params::get(coin).name,
             body: &address,
             scrollable: true,
             ..Default::default()

src/rust/bitbox02-rust/src/hww/api/bitcoin/params.rs

@@ -25,6 +25,7 @@ pub struct Params {
     pub base58_version_p2pkh: u8,
     pub base58_version_p2sh: u8,
     pub bech32_hrp: &'static str,
+    pub name: &'static str,
     pub unit: &'static str,
     pub rbf_support: bool,
 }
@@ -36,6 +37,7 @@ const PARAMS_BTC: Params = Params {
     base58_version_p2pkh: 0x00, // starts with 1
     base58_version_p2sh: 0x05,  // starts with 3
     bech32_hrp: "bc",
+    name: "Bitcoin",
     unit: "BTC",
     rbf_support: true,
 };
@@ -45,6 +47,7 @@ const PARAMS_TBTC: Params = Params {
     base58_version_p2pkh: 0x6f, // starts with m or n
     base58_version_p2sh: 0xc4,  // starts with 2
     bech32_hrp: "tb",
+    name: "BTC Testnet",
     unit: "TBTC",
     rbf_support: true,
 };
@@ -54,6 +57,7 @@ const PARAMS_LTC: Params = Params {
     base58_version_p2pkh: 0x30, // starts with L
     base58_version_p2sh: 0x32,  // starts with M
     bech32_hrp: "ltc",
+    name: "Litecoin",
     unit: "LTC",
     rbf_support: false,
 };
@@ -63,6 +67,7 @@ const PARAMS_TLTC: Params = Params {
     base58_version_p2pkh: 0x6f, // starts with m or n
     base58_version_p2sh: 0xc4,  // starts with 2
     bech32_hrp: "tltc",
+    name: "LTC Testnet",
     unit: "TLTC",
     rbf_support: false,
 };