Merge branch 'develop' into feat/test_btc

Author: cy-utkarshM

apps/btc_family/btc_pub_key.c

@@ -228,7 +228,16 @@ static size_t btc_get_address(const uint8_t *seed,
     case NON_SEGWIT:
       hdnode_get_address(&node, g_btc_app->p2pkh_addr_ver, addr, 35);
       break;
-    // TODO: add support for taproot and segwit
+    case PURPOSE_SEGWIT:
+      ecdsa_get_address_segwit_p2sh(node.public_key,
+                                    g_btc_app->p2sh_addr_ver,
+                                    node.curve->hasher_pubkey,
+                                    node.curve->hasher_base58,
+                                    addr,
+                                    36);
+      break;
+
+    // TODO: add support for taproot
     default:
       break;
   }

apps/btc_family/btc_script.c

@@ -239,13 +239,25 @@ bool btc_check_script_address(const uint8_t *script,
 
   uint8_t digest[HASHER_DIGEST_LENGTH] = {0};
   btc_script_type_e type = btc_get_script_type(script, script_len);
-  if (SCRIPT_TYPE_P2PKH != type && SCRIPT_TYPE_P2WPKH != type) {
-    // allow only p2pkh and p2wpkh for change output
+  if (SCRIPT_TYPE_P2PKH != type && SCRIPT_TYPE_P2WPKH != type &&
+      SCRIPT_TYPE_P2SH != type) {
+    // allow only p2pkh and p2wpkh and p2sh-p2wpkh for change output
     return false;
   }
   uint8_t offset = (SCRIPT_TYPE_P2PKH == type) ? 3 : 2;
 
   hasher_Raw(HASHER_SHA2_RIPEMD, public_key, BTC_SHORT_PUB_KEY_SIZE, digest);
+
+  if (SCRIPT_TYPE_P2SH == type) {
+    // Compute redeemscript(P2WPKH). scriptpub of nested-segwit is hash160 of
+    // redeemscript
+    uint8_t buf[22] = {0};
+    buf[0] = 0;     // version byte
+    buf[1] = 20;    // push 20 bytes
+    memcpy(buf + 2, digest, 20);
+    hasher_Raw(HASHER_SHA2_RIPEMD, buf, 22, digest);
+  }
+
   return (memcmp(digest, &script[offset], RIPEMD160_DIGEST_LENGTH) == 0);
 }
 

apps/btc_family/btc_txn.c

@@ -510,7 +510,8 @@ static bool fetch_valid_input(btc_query_t *query) {
     payload = NULL;
     hoisted_query = NULL;
 
-    if ((SCRIPT_TYPE_P2PKH != type && SCRIPT_TYPE_P2WPKH != type) ||
+    if ((SCRIPT_TYPE_P2PKH != type && SCRIPT_TYPE_P2WPKH != type &&
+         SCRIPT_TYPE_P2SH != type) ||
         validation_result != BTC_VALIDATE_SUCCESS) {
       // input validation failed, terminate immediately
       btc_send_error(ERROR_COMMON_ERROR_CORRUPT_DATA_TAG,
@@ -690,11 +691,27 @@ static bool sign_input(scrip_sig_t *signatures) {
   status = true;
   for (int idx = 0; idx < btc_txn_context->metadata.input_count; idx++) {
     // generate the input digest and respective private key
-    status = btc_digest_input(btc_txn_context, idx, buffer);
     memcpy(&t_node, &node, sizeof(HDNode));
     hdnode_private_ckd(&t_node, btc_txn_context->inputs[idx].change_index);
     hdnode_private_ckd(&t_node, btc_txn_context->inputs[idx].address_index);
     hdnode_fill_public_key(&t_node);
+
+    // detect input type
+    btc_sign_txn_input_script_pub_key_t *script =
+        &btc_txn_context->inputs[idx].script_pub_key;
+    btc_script_type_e type = btc_get_script_type(script->bytes, script->size);
+    if (SCRIPT_TYPE_P2SH == type) {
+      // replace BIP16 scriptpubkey with redeemscript(P2WPKH)
+      uint8_t buf[22] = {0};
+      buf[0] = 0;     // version byte
+      buf[1] = 20;    // push 20 bytes
+      ecdsa_get_pubkeyhash(
+          t_node.public_key, t_node.curve->hasher_pubkey, buf + 2);
+      memcpy(btc_txn_context->inputs[idx].script_pub_key.bytes, buf, 22);
+      btc_txn_context->inputs[idx].script_pub_key.size = 22;
+    }
+
+    status = btc_digest_input(btc_txn_context, idx, buffer);
     ecdsa_sign_digest(
         curve, t_node.private_key, buffer, signatures[idx].bytes, NULL, NULL);
     signatures[idx].size = btc_sig_to_script_sig(

apps/btc_family/btc_txn_helpers.c

@@ -406,7 +406,6 @@ bool btc_digest_input(const btc_txn_context_t *context,
   btc_sign_txn_input_script_pub_key_t *script =
       &context->inputs[index].script_pub_key;
   btc_script_type_e type = btc_get_script_type(script->bytes, script->size);
-
   if (SCRIPT_TYPE_P2WPKH == type) {
     // segwit digest calculation; could fail if segwit_cache not filled
     status = calculate_p2wpkh_digest(context, index, digest);

apps/evm_family/evm_user_verification.c

@@ -67,8 +67,10 @@
 #include "evm_api.h"
 #include "evm_priv.h"
 #include "exchange_main.h"
+#include "flash_api.h"
 #include "ui_core_confirm.h"
 #include "ui_screens.h"
+#include "utils.h"
 
 /*****************************************************************************
  * EXTERN VARIABLES
@@ -166,6 +168,8 @@ bool evm_verify_clear_signing(const evm_txn_context_t *txn_context) {
   char address[43] = "0x";
   const uint8_t *to_address = NULL;
   const char *unit = g_evm_app->lunit_name;
+  char hex_str[30] = {'\0'};
+  char value[34] = {'\0'};
   char fee[34] = "";
   char display[40] = "";
 
@@ -179,6 +183,24 @@ bool evm_verify_clear_signing(const evm_txn_context_t *txn_context) {
     return false;
   }
 
+  // verify recipient amount
+  uint8_t zeros[32] = {0};
+  if (memcmp(txn_context->transaction_info.value,
+             zeros,
+             txn_context->transaction_info.value_size[0]) != 0) {
+    uint8_t len = eth_get_value(txn_context, hex_str);
+    if (!convert_byte_array_to_decimal_string(
+            len, evm_get_decimal(txn_context), hex_str, value, sizeof(value))) {
+      evm_send_error(ERROR_COMMON_ERROR_UNKNOWN_ERROR_TAG, 1);
+      return false;
+    }
+
+    snprintf(display, sizeof(display), UI_TEXT_VERIFY_AMOUNT, value, unit);
+    if (!core_confirmation(display, evm_send_error)) {
+      return false;
+    }
+  }
+
   // verify transaction fee
   eth_get_fee_string(
       &txn_context->transaction_info, fee, sizeof(fee), ETH_DECIMAL);
@@ -207,27 +229,71 @@ bool evm_verify_blind_signing(const evm_txn_context_t *txn_context) {
   bool status = false;
   const uint8_t *to_address = NULL;
   char address[43] = "0x";
-  char path_str[64] = "";
   char fee[34] = "";
   char display[40] = "";
+  char amount_display[40] = "";
+  uint8_t zeros[32] = {0};
+  bool verify_amount = false;
   const char *unit = g_evm_app->lunit_name;
-  const uint32_t *hd_path = txn_context->init_info.derivation_path;
-  size_t depth = txn_context->init_info.derivation_path_count;
 
   // TODO: decide on handling blind signing via wallet setting
   to_address = txn_context->transaction_info.to_address;
   ethereum_address_checksum(
       to_address, &address[2], false, g_evm_app->chain_id);
-  hd_path_array_to_string(hd_path, depth, false, path_str, sizeof(path_str));
+
   eth_get_fee_string(
       &txn_context->transaction_info, fee, sizeof(fee), ETH_DECIMAL);
   snprintf(display, sizeof(display), UI_TEXT_SEND_TXN_FEE, fee, unit);
-  // show warning for unknown EVM function; take user consent
-  if (!core_confirmation(UI_TEXT_BLIND_SIGNING_WARNING, evm_send_error) ||
-      !core_scroll_page(UI_TEXT_VERIFY_HD_PATH, path_str, evm_send_error) ||
-      !core_scroll_page(ui_text_verify_contract, address, evm_send_error) ||
-      !core_scroll_page(UI_TEXT_TXN_FEE, display, evm_send_error)) {
-    return status;
+
+  // verify recipient amount
+  if (memcmp(txn_context->transaction_info.value,
+             zeros,
+             txn_context->transaction_info.value_size[0]) != 0) {
+    verify_amount = true;
+    char hex_str[30] = {'\0'};
+    char value[34] = {'\0'};
+    uint8_t len = eth_get_value(txn_context, hex_str);
+    if (!convert_byte_array_to_decimal_string(
+            len, evm_get_decimal(txn_context), hex_str, value, sizeof(value))) {
+      evm_send_error(ERROR_COMMON_ERROR_UNKNOWN_ERROR_TAG, 1);
+      return false;
+    }
+
+    snprintf(amount_display,
+             sizeof(amount_display),
+             UI_TEXT_VERIFY_AMOUNT,
+             value,
+             unit);
+  }
+
+  if (is_raw_calldata_enabled()) {
+    uint64_t data_size = txn_context->transaction_info.data_size;
+    char data_str[2 + data_size * 2 + 1];
+    snprintf(data_str, sizeof(data_str), "0x");
+    byte_array_to_hex_string(txn_context->transaction_info.data,
+                             data_size,
+                             data_str + 2,
+                             sizeof(data_str) - 2);
+    if (!core_scroll_page(ui_text_verify_contract, address, evm_send_error) ||
+        (verify_amount && !core_confirmation(amount_display, evm_send_error)) ||
+        !core_scroll_page(UI_TEXT_TXN_FEE, display, evm_send_error) ||
+        !core_scroll_page(UI_TEXT_CALLDATA, data_str, evm_send_error)) {
+      return status;
+    }
+  } else {
+    char path_str[64] = "";
+    const uint32_t *hd_path = txn_context->init_info.derivation_path;
+    size_t depth = txn_context->init_info.derivation_path_count;
+    hd_path_array_to_string(hd_path, depth, false, path_str, sizeof(path_str));
+
+    // show warning for unknown EVM function; take user consent
+    if (!core_confirmation(UI_TEXT_BLIND_SIGNING_WARNING, evm_send_error) ||
+        !core_scroll_page(UI_TEXT_VERIFY_HD_PATH, path_str, evm_send_error) ||
+        !core_scroll_page(ui_text_verify_contract, address, evm_send_error) ||
+        (verify_amount && !core_confirmation(amount_display, evm_send_error)) ||
+        !core_scroll_page(UI_TEXT_TXN_FEE, display, evm_send_error)) {
+      return status;
+    }
   }
 
   return true;