Merge pull request #852 from lcastillo-ledger/feat/erc20-extra-data

Add support for displaying extra data trailing calldata in ERC20 calls

Author: apaillier-ledger

src/eth_plugin_handler.c

@@ -135,20 +135,21 @@ eth_plugin_result_t eth_plugin_perform_init(uint8_t *contractAddress,
 
     PRINTF("Selector %.*H\n", 4, init->selector);
     switch (pluginType) {
-        case ERC1155:
-        case ERC721:
-        case EXTERNAL:
-            PRINTF("eth_plugin_perform_init_default\n");
-            eth_plugin_perform_init_default(contractAddress, init);
-            contractAddress = NULL;
-            break;
-        case OLD_INTERNAL:
+        case PLUGIN_TYPE_NONE:
             PRINTF("eth_plugin_perform_init_old_internal\n");
             if (eth_plugin_perform_init_old_internal(contractAddress, init)) {
+                pluginType = PLUGIN_TYPE_OLD_INTERNAL;
                 contractAddress = NULL;
             }
             break;
-        case SWAP_WITH_CALLDATA:
+        case PLUGIN_TYPE_ERC1155:
+        case PLUGIN_TYPE_ERC721:
+        case PLUGIN_TYPE_EXTERNAL:
+            PRINTF("eth_plugin_perform_init_default\n");
+            eth_plugin_perform_init_default(contractAddress, init);
+            contractAddress = NULL;
+            break;
+        case PLUGIN_TYPE_SWAP_WITH_CALLDATA:
             PRINTF("contractAddress == %.*H\n", 20, contractAddress);
             PRINTF("Fallback on swap_with_calldata plugin\n");
             contractAddress = NULL;
@@ -249,7 +250,7 @@ eth_plugin_result_t eth_plugin_call(int method, void *parameter) {
     }
 
     switch (pluginType) {
-        case EXTERNAL: {
+        case PLUGIN_TYPE_EXTERNAL: {
             uint32_t params[3];
             params[0] = (uint32_t) alias;
             params[1] = method;
@@ -268,19 +269,19 @@ eth_plugin_result_t eth_plugin_call(int method, void *parameter) {
             END_TRY;
             break;
         }
-        case SWAP_WITH_CALLDATA: {
+        case PLUGIN_TYPE_SWAP_WITH_CALLDATA: {
             swap_with_calldata_plugin_call(method, parameter);
             break;
         }
-        case ERC721: {
+        case PLUGIN_TYPE_ERC721: {
             erc721_plugin_call(method, parameter);
             break;
         }
-        case ERC1155: {
+        case PLUGIN_TYPE_ERC1155: {
             erc1155_plugin_call(method, parameter);
             break;
         }
-        case OLD_INTERNAL: {
+        case PLUGIN_TYPE_OLD_INTERNAL: {
             // Perform the call
             for (i = 0;; i++) {
                 if (INTERNAL_ETH_PLUGINS[i].alias[0] == 0) {

src/eth_swap_utils.c

@@ -15,12 +15,16 @@
  *  limitations under the License.
  ********************************************************************************/
 
-#include <stdint.h>
 #include <string.h>
-#include <stdbool.h>
-
-#include "asset_info.h"
+#include <ctype.h>
 #include "eth_swap_utils.h"
+#include "asset_info.h"
+#include "apdu_constants.h"
+#include "utils.h"
+#include "swap_error_code_helpers.h"
+#include "feature_signTx.h"
+
+bool G_swap_checked;
 
 bool parse_swap_config(const uint8_t *config,
                        uint8_t config_len,
@@ -56,3 +60,66 @@ bool parse_swap_config(const uint8_t *config,
     }
     return true;
 }
+
+/* Local implementation of strncasecmp, workaround of the segfaulting base implem on return value
+ * Remove once strncasecmp is fixed
+ */
+static int strcasecmp_workaround(const char *str1, const char *str2) {
+    unsigned char c1, c2;
+    do {
+        c1 = *str1++;
+        c2 = *str2++;
+        if (toupper(c1) != toupper(c2)) {
+            return toupper(c1) - toupper(c2);
+        }
+    } while (c1 != '\0');
+    return 0;
+}
+
+bool swap_check_destination(const char *destination) {
+    // Ensure the values are the same that the ones that have been previously validated
+    if (strcasecmp_workaround(strings.common.toAddress, destination) != 0) {
+        PRINTF("Error comparing destination addresses\n");
+        send_swap_error_with_string(APDU_RESPONSE_MODE_CHECK_FAILED,
+                                    SWAP_EC_ERROR_WRONG_DESTINATION,
+                                    APP_CODE_DEFAULT,
+                                    "%s != %s",
+                                    strings.common.toAddress,
+                                    destination);
+        // unreachable
+        os_sched_exit(0);
+    }
+    return true;
+}
+
+bool swap_check_amount(const char *amount) {
+    // Ensure the values are the same that the ones that have been previously validated
+    if (strcmp(strings.common.fullAmount, amount) != 0) {
+        PRINTF("Error comparing amounts\n");
+        send_swap_error_with_string(APDU_RESPONSE_MODE_CHECK_FAILED,
+                                    SWAP_EC_ERROR_WRONG_AMOUNT,
+                                    APP_CODE_DEFAULT,
+                                    "%s != %s",
+                                    strings.common.fullAmount,
+                                    amount);
+        // unreachable
+        os_sched_exit(0);
+    }
+    return true;
+}
+
+bool swap_check_fee(const char *fee) {
+    // Ensure the values are the same that the ones that have been previously validated
+    if (strcmp(strings.common.maxFee, fee) != 0) {
+        PRINTF("Error comparing fees\n");
+        send_swap_error_with_string(APDU_RESPONSE_MODE_CHECK_FAILED,
+                                    SWAP_EC_ERROR_WRONG_FEES,
+                                    APP_CODE_DEFAULT,
+                                    "%s != %s",
+                                    strings.common.maxFee,
+                                    fee);
+        // unreachable
+        os_sched_exit(0);
+    }
+    return true;
+}

src/eth_swap_utils.h

@@ -17,11 +17,14 @@
 
 #pragma once
 
+#include <stdbool.h>
 #include <stdint.h>
 #include "swap_lib_calls.h"
 #include "chainConfig.h"
 #include "caller_api.h"
 
+extern bool G_swap_checked;
+
 typedef struct eth_libargs_s {
     unsigned int id;
     unsigned int command;
@@ -39,3 +42,6 @@ bool parse_swap_config(const uint8_t *config,
                        char *ticker,
                        uint8_t *decimals,
                        uint64_t *chain_id);
+bool swap_check_destination(const char *destination);
+bool swap_check_amount(const char *amount);
+bool swap_check_fee(const char *fee);

src/features/provide_network_info/network_info.c

@@ -120,7 +120,7 @@ static bool handle_name(const s_tlv_data *data, s_network_info_ctx *context) {
         return false;
     }
     // Check if the name is printable
-    if (!check_name(data->value, data->length)) {
+    if (!is_printable((const char *) data->value, data->length)) {
         PRINTF("NETWORK_NAME is not printable!\n");
         return false;
     }
@@ -142,7 +142,7 @@ static bool handle_ticker(const s_tlv_data *data, s_network_info_ctx *context) {
         return false;
     }
     // Check if the ticker is printable
-    if (!check_name(data->value, data->length)) {
+    if (!is_printable((const char *) data->value, data->length)) {
         PRINTF("NETWORK_TICKER is not printable!\n");
         return false;
     }

src/features/provide_tx_simulation/cmd_get_tx_simulation.c

@@ -270,7 +270,7 @@ static uint16_t parse_type(const s_tlv_data *data, s_tx_simu_ctx *context) {
 static uint16_t parse_provider_msg(const s_tlv_data *data, s_tx_simu_ctx *context) {
     CHECK_FIELD_OVERFLOW("TX_CHECKS_PROVIDER_MSG", context->simu->provider_msg, data->length);
     // Check if the name is printable
-    if (!check_name(data->value, data->length)) {
+    if (!is_printable((const char *) data->value, data->length)) {
         PRINTF("TX_CHECKS_PROVIDER_MSG is not printable!\n");
         return SWO_INCORRECT_DATA;
     }
@@ -289,7 +289,7 @@ static uint16_t parse_provider_msg(const s_tlv_data *data, s_tx_simu_ctx *contex
 static uint16_t parse_tiny_url(const s_tlv_data *data, s_tx_simu_ctx *context) {
     CHECK_FIELD_OVERFLOW("TX_CHECKS_TINY_URL", context->simu->tiny_url, data->length);
     // Check if the name is printable
-    if (!check_name(data->value, data->length)) {
+    if (!is_printable((const char *) data->value, data->length)) {
         PRINTF("TX_CHECKS_TINY_URL is not printable!\n");
         return SWO_INCORRECT_DATA;
     }

src/features/setExternalPlugin/cmd_setExternalPlugin.c

@@ -78,7 +78,7 @@ uint16_t handleSetExternalPlugin(const uint8_t *workBuffer, uint8_t dataLength)
     memmove(dataContext.tokenContext.contractAddress, workBuffer, ADDRESS_LENGTH);
     workBuffer += ADDRESS_LENGTH;
     memmove(dataContext.tokenContext.methodSelector, workBuffer, SELECTOR_SIZE);
-    pluginType = EXTERNAL;
+    pluginType = PLUGIN_TYPE_EXTERNAL;
 
     return SWO_SUCCESS;
 }

src/features/setPlugin/cmd_setPlugin.c

@@ -54,25 +54,25 @@ typedef bool verificationAlgo(const cx_ecfp_public_key_t *,
 
 // Returns the plugin type of a given plugin name.
 // If the plugin name is not a specific known internal plugin, this function default return value is
-// `EXTERNAL`.
+// `PLUGIN_TYPE_EXTERNAL`.
 static pluginType_t getPluginType(char *pluginName, uint8_t pluginNameLength) {
     if (pluginNameLength == sizeof(ERC721_STR) - 1 &&
         strncmp(pluginName, ERC721_STR, pluginNameLength) == 0) {
         PRINTF("Using internal plugin ERC721\n");
-        return ERC721;
+        return PLUGIN_TYPE_ERC721;
     } else if (pluginNameLength == sizeof(ERC1155_STR) - 1 &&
                strncmp(pluginName, ERC1155_STR, pluginNameLength) == 0) {
         PRINTF("Using internal plugin ERC1155\n");
-        return ERC1155;
+        return PLUGIN_TYPE_ERC1155;
     } else {
         PRINTF("Using external plugin\n");
-        return EXTERNAL;
+        return PLUGIN_TYPE_EXTERNAL;
     }
 }
 
 void set_swap_with_calldata_plugin_type(void) {
-    PRINTF("Using internal plugin SWAP_WITH_CALLDATA\n");
-    pluginType = SWAP_WITH_CALLDATA;
+    PRINTF("Using internal plugin PLUGIN_TYPE_SWAP_WITH_CALLDATA\n");
+    pluginType = PLUGIN_TYPE_SWAP_WITH_CALLDATA;
 }
 
 uint16_t handleSetPlugin(const uint8_t *workBuffer, uint8_t dataLength) {
@@ -213,13 +213,13 @@ uint16_t handleSetPlugin(const uint8_t *workBuffer, uint8_t dataLength) {
 
     pluginType = getPluginType(tokenContext->pluginName, pluginNameLength);
     if (keyId == PROD_PLUGIN_KEY) {
-        if (pluginType != ERC721 && pluginType != ERC1155) {
+        if (pluginType != PLUGIN_TYPE_ERC721 && pluginType != PLUGIN_TYPE_ERC1155) {
             PRINTF("AWS key must only be used to set NFT internal plugins\n");
             return SWO_INCORRECT_DATA;
         }
     }
 
-    if (pluginType == EXTERNAL) {
+    if (pluginType == PLUGIN_TYPE_EXTERNAL) {
         PRINTF("Check external plugin %s\n", tokenContext->pluginName);
 
         // Check if the plugin is present on the device