Fix Thorswap for ERC20 tokens by increasing CROSSCHAIN internal plugin priority

(cherry picked from commit 942a7ba)

Author: fbeutin-ledger

src/eth_plugin_handler.c

@@ -140,34 +140,38 @@ eth_plugin_result_t eth_plugin_perform_init(uint8_t *contractAddress,
         case ERC721:
 #endif  // HAVE_NFT_SUPPORT
         case EXTERNAL:
+            PRINTF("eth_plugin_perform_init_default\n");
             eth_plugin_perform_init_default(contractAddress, init);
             contractAddress = NULL;
             break;
         case OLD_INTERNAL:
+            PRINTF("eth_plugin_perform_init_old_internal\n");
             if (eth_plugin_perform_init_old_internal(contractAddress, init)) {
                 contractAddress = NULL;
             }
             break;
+        case SWAP_WITH_CALLDATA:
+            PRINTF("contractAddress == %.*H\n", 20, contractAddress);
+            PRINTF("Fallback on swap_with_calldata plugin\n");
+            contractAddress = NULL;
+            dataContext.tokenContext.pluginStatus = ETH_PLUGIN_RESULT_OK;
+            break;
         default:
             PRINTF("Unsupported pluginType %d\n", pluginType);
             os_sched_exit(0);
             break;
     }
 
-    if (G_called_from_swap && (contractAddress != NULL)) {
-        PRINTF("contractAddress == %.*H\n", 20, contractAddress);
-        PRINTF("selector == %.*H\n", 20, contractAddress);
-        PRINTF("Fallback on swap_with_calldata plugin\n");
-        set_swap_with_calldata_plugin_type();
-        dataContext.tokenContext.pluginStatus = ETH_PLUGIN_RESULT_OK;
-        contractAddress = NULL;
-    }
-
     eth_plugin_result_t status = ETH_PLUGIN_RESULT_UNAVAILABLE;
 
     if (contractAddress != NULL) {
         PRINTF("No plugin available for %.*H\n", 20, contractAddress);
-        return status;
+        if (G_called_from_swap) {
+            PRINTF("Not supported in swap mode\n");
+            return ETH_PLUGIN_RESULT_ERROR;
+        } else {
+            return status;
+        }
     }
 
     PRINTF("eth_plugin_init\n");

src/handle_swap_sign_transaction.c

@@ -6,6 +6,7 @@
 #include "shared_context.h"
 #include "common_utils.h"
 #include "network.h"
+#include "cmd_setPlugin.h"
 #ifdef HAVE_NBGL
 #include "nbgl_use_case.h"
 #endif  // HAVE_NBGL
@@ -138,6 +139,10 @@ void __attribute__((noreturn)) handle_swap_sign_transaction(const chain_config_t
     reset_app_context();
     G_called_from_swap = true;
     G_swap_response_ready = false;
+    // If we are in crosschain context, automatically register the CROSSCHAIN plugin
+    if (G_swap_mode == SWAP_MODE_CROSSCHAIN_PENDING_CHECK) {
+        set_swap_with_calldata_plugin_type();
+    }
 
     common_app_init();
 

src_features/signTx/cmd_signTx.c

@@ -83,7 +83,14 @@ uint16_t handleSign(uint8_t p1,
         case USTREAM_PROCESSING:
             return APDU_RESPONSE_OK;
         case USTREAM_FAULT:
-            return APDU_RESPONSE_INVALID_DATA;
+            if (G_called_from_swap) {
+                // We have encountered an error while trying to sign a SWAP type transaction
+                // Return dedicated error code and flag an early exit back to Exchange
+                G_swap_response_ready = true;
+                return APDU_RESPONSE_MODE_CHECK_FAILED;
+            } else {
+                return APDU_RESPONSE_INVALID_DATA;
+            }
         default:
             PRINTF("Unexpected parser status\n");
             return APDU_RESPONSE_INVALID_DATA;

src_features/signTx/logic_signTx.c

@@ -57,7 +57,8 @@ customStatus_e customProcessor(txContext_t *context) {
             dataContext.tokenContext.pluginStatus = ETH_PLUGIN_RESULT_UNAVAILABLE;
             // If contract debugging mode is activated, do not go through the plugin activation
             // as they wouldn't be displayed if the plugin consumes all data but fallbacks
-            if (!N_storage.contractDetails) {
+            // Still go through plugin activation in Swap context
+            if (!N_storage.contractDetails || G_called_from_swap) {
                 eth_plugin_prepare_init(&pluginInit,
                                         context->workBuffer,
                                         context->currentFieldLength);