eth: put network name 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/eth/eth_params.c

@@ -21,18 +21,21 @@
 static const app_eth_coin_params_t _params_eth = {
     .bip44_coin = 60 + BIP32_INITIAL_HARDENED_CHILD,
     .chain_id = 1,
+    .name = "Ethereum",
     .unit = "ETH",
 };
 
 static const app_eth_coin_params_t _params_ropsten_eth = {
     .bip44_coin = 1 + BIP32_INITIAL_HARDENED_CHILD,
     .chain_id = 3,
+    .name = "Ropsten",
     .unit = "TETH",
 };
 
 static const app_eth_coin_params_t _params_rinkeby_eth = {
     .bip44_coin = 1 + BIP32_INITIAL_HARDENED_CHILD,
     .chain_id = 4,
+    .name = "Rinkeby",
     .unit = "TETH",
 };
 

src/apps/eth/eth_params.h

@@ -21,6 +21,7 @@ typedef struct {
     uint32_t bip44_coin;
     // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md#list-of-chain-ids
     uint8_t chain_id;
+    const char* name;
     const char* unit;
 } app_eth_coin_params_t;
 

src/rust/bitbox02-rust/src/hww/api/ethereum/pubrequest.rs

@@ -24,16 +24,7 @@ use bitbox02::keystore;
 extern crate alloc;
 use core::convert::TryInto;
 
-fn coin_title(coin: pb::EthCoin) -> &'static str {
-    match coin {
-        pb::EthCoin::Eth => "Ethereum",
-        pb::EthCoin::RopstenEth => "Ropsten",
-        pb::EthCoin::RinkebyEth => "Rinkeby",
-    }
-}
-
 async fn process_address(request: &pb::EthPubRequest) -> Result<Response, Error> {
-    let coin = pb::EthCoin::from_i32(request.coin).ok_or(Error::InvalidInput)?;
     let params = bitbox02::app_eth::params_get(request.coin as _).ok_or(Error::InvalidInput)?;
     // If a contract_address is provided, it has to be a supported ERC20-token.
     let erc20_params: Option<bitbox02::app_eth::ERC20Params> =
@@ -61,7 +52,7 @@ async fn process_address(request: &pb::EthPubRequest) -> Result<Response, Error>
     if request.display {
         let title = match erc20_params {
             Some(erc20_params) => erc20_params.name,
-            None => coin_title(coin),
+            None => params.name,
         };
         let params = confirm::Params {
             title,

src/rust/bitbox02/src/app_eth.rs

@@ -17,6 +17,7 @@ use bitbox02_sys::in_buffer_t;
 pub struct Params {
     pub bip44_coin: u32,
     pub chain_id: u8,
+    pub name: &'static str,
     pub unit: &'static str,
 }
 
@@ -25,6 +26,13 @@ pub fn params_get(coin: bitbox02_sys::ETHCoin) -> Option<Params> {
     Some(Params {
         bip44_coin: params.bip44_coin,
         chain_id: params.chain_id,
+        name: {
+            let s = unsafe {
+                let len = crate::util::strlen_ptr(params.name);
+                core::slice::from_raw_parts(params.name, len as _)
+            };
+            core::str::from_utf8(s).unwrap()
+        },
         unit: {
             let s = unsafe {
                 let len = crate::util::strlen_ptr(params.unit);