Merge pull request #664 from Cypherock/develop

Develop

Author: muzaffarbhat07

apps/btc_family/btc_pub_key.c

@@ -221,7 +221,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

@@ -502,7 +502,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,
@@ -680,11 +681,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;

common/interfaces/flash_interface/flash_api.c

@@ -1049,6 +1049,20 @@ uint8_t get_onboarding_step(void) {
   return flash_ram_instance.onboarding_step;
 }
 
+bool is_raw_calldata_enabled() {
+  get_flash_ram_instance();
+  return (flash_ram_instance.enable_raw_calldata == RAW_CALLDATA_ENABLED);
+}
+
+int set_raw_calldata_config(raw_calldata_config state,
+                            flash_save_mode save_mode) {
+  get_flash_ram_instance();
+  flash_ram_instance.enable_raw_calldata = state;
+  if (save_mode == FLASH_SAVE_NOW)
+    flash_struct_save();
+  return STM_SUCCESS;
+}
+
 const uint8_t *get_perm_self_key_id() {
   get_flash_perm_instance();
   return flash_perm_instance.permKeyData.ext_keys.self_key_id;

common/interfaces/flash_interface/flash_api.h

@@ -514,6 +514,39 @@ bool is_logging_enabled();
  */
 int set_logging_config(log_config state, flash_save_mode save_mode);
 
+/**
+ * @brief
+ * @details
+ *
+ * @param
+ *
+ * @return
+ * @retval
+ *
+ * @see
+ * @since v1.0.0
+ *
+ * @note
+ */
+bool is_raw_calldata_enabled();
+
+/**
+ * @brief
+ * @details
+ *
+ * @param
+ *
+ * @return
+ * @retval
+ *
+ * @see
+ * @since v1.0.0
+ *
+ * @note
+ */
+int set_raw_calldata_config(raw_calldata_config state,
+                            flash_save_mode save_mode);
+
 /**
  * @brief
  * @details

common/interfaces/flash_interface/flash_struct.c

@@ -58,6 +58,7 @@
  */
 #include "flash_struct.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #include "assert_conf.h"
@@ -84,7 +85,8 @@
   (6 + 3 + FAMILY_ID_SIZE + 3 + sizeof(uint32_t) + 3 +                         \
    (MAX_WALLETS_ALLOWED * ((15 * 3) + sizeof(Flash_Wallet))) + 3 +             \
    sizeof(uint8_t) + 3 + sizeof(uint8_t) + 3 + sizeof(uint8_t) + 3 +           \
-   sizeof(uint8_t))
+   sizeof(uint8_t)) +                                                          \
+      3 + sizeof(uint8_t)
 
 /// The size of tlv that will be read and written to flash. Since we read/write
 /// in multiples of 4 hence it is essential to make the size divisible by 4.
@@ -106,6 +108,7 @@ typedef enum Flash_tlv_tags {
   TAG_FLASH_TOGGLE_PASSPHRASE = 0x07,
   TAG_FLASH_TOGGLE_LOGS = 0x08,
   TAG_FLASH_ONBOARDING_STEP = 0x09,
+  TAG_FLASH_TOGGLE_RAW_CALLDATA = 0x10,
 
   TAG_FLASH_WALLET = 0x20,
   TAG_FLASH_WALLET_STATE = 0x21,
@@ -425,6 +428,12 @@ static uint16_t serialize_fs(const Flash_Struct *flash_struct, uint8_t *tlv) {
                  TAG_FLASH_ONBOARDING_STEP,
                  sizeof(flash_struct->onboarding_step),
                  &(flash_struct->onboarding_step));
+  fill_flash_tlv(tlv,
+                 &index,
+                 TAG_FLASH_TOGGLE_RAW_CALLDATA,
+                 sizeof(flash_struct->enable_raw_calldata),
+                 &(flash_struct->enable_raw_calldata));
+
   tlv[4] = index - 6;
   tlv[5] = (index - 6) >> 8;
 
@@ -605,6 +614,11 @@ static void deserialize_fs(Flash_Struct *flash_struct, uint8_t *tlv) {
         break;
       }
 
+      case TAG_FLASH_TOGGLE_RAW_CALLDATA: {
+        memcpy(&(flash_struct->enable_raw_calldata), tlv + index + 2, size);
+        break;
+      }
+
       default: {
         break;
       }

common/interfaces/flash_interface/flash_struct.h

@@ -31,6 +31,12 @@ typedef enum log_config {
   LOGGING_ENABLED,
 } log_config;
 
+/// enum for raw calldata config
+typedef enum raw_calldata_config {
+  RAW_CALLDATA_DISABLED,
+  RAW_CALLDATA_ENABLED,
+} raw_calldata_config;
+
 /// enum to signify the wallet state
 typedef enum wallet_state {
   INVALID_WALLET = 1,
@@ -123,6 +129,7 @@ typedef struct Flash_Struct {
   uint8_t enable_passphrase;
   uint8_t enable_log;
   uint8_t onboarding_step;
+  uint8_t enable_raw_calldata;
 } Flash_Struct;
 #pragma pack(pop)
 

src/constant_texts.c

@@ -91,6 +91,7 @@ const char *ui_text_options_settings[NUMBER_OF_OPTIONS_SETTINGS] = {
     "View Card Version",
     "Regulatory Info",
     "Pair Cards",
+    "Advanced",
 #ifdef DEV_BUILD
     "Buzzer toggle",
 #endif
@@ -122,6 +123,17 @@ const char *ui_text_options_buzzer_adjust[] = {
 };
 #endif /* DEV_BUILD */
 
+// Advanced Settings menu text
+const char *ui_text_heading_advanced_settings = "Advanced Settings";
+const char
+    *ui_text_options_advanced_settings[NUMBER_OF_OPTIONS_ADVANCED_SETTINGS] = {
+        "Toggle Raw Calldata"};
+
+const char *ui_text_options_raw_calldata[] = {
+    "Enable Raw Calldata",
+    "Disable Raw Calldata",
+};
+
 // Regulatory info text
 const char *ui_text_regulatory_info[NUMBER_OF_SLIDES_REGULATORY_INFO] = {
     "This device complies with Part 15 of the FCC Rules. Operation is",
@@ -448,6 +460,9 @@ const char *ui_text_warning_txn_fee_too_high =
     "WARNING!\nTransaction fees\ntoo high, proceed?";
 const char *ui_text_enable_log_export = "Do you want to enable logging?";
 const char *ui_text_disable_log_export = "Do you want to disable logging?";
+const char *ui_text_enable_raw_calldata =
+    "This will display transaction's raw technical\ndata for in-depth "
+    "verification before signing\nEnable Raw Calldata?";
 
 //?
 const char *ui_text_do_you_want_import_wallet_to_desktop =