EIP-712 amount-joins can now handle with missing token information

LedgerHQ · Sep 6, 2024 · a9705cf · a9705cf
1 parent daf8a90
commit a9705cf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src_features/signMessageEIP712/filtering.c b/src_features/signMessageEIP712/filtering.c
@@ -131,10 +131,6 @@ static bool check_token_index(uint8_t idx) {
         PRINTF("Error: token index out of range (%u)\n", idx);
         return false;
     }
-    if (!tmpCtx.transactionContext.assetSet[idx]) {
-        PRINTF("Error: token not set (%u)\n", idx);
-        return false;
-    }
     return true;
 }
 

diff --git a/src_features/signMessageEIP712/ui_logic.c b/src_features/signMessageEIP712/ui_logic.c
@@ -413,19 +413,21 @@ static bool ui_712_format_uint(const uint8_t *data, uint8_t length, bool first)
  * @return whether it was successful or not
  */
 static bool ui_712_format_amount_join(void) {
-    const tokenDefinition_t *token;
-    token = &tmpCtx.transactionContext.extraInfo[ui_ctx->amount.idx].token;
+    const tokenDefinition_t *token = NULL;
 
+    if (tmpCtx.transactionContext.assetSet[ui_ctx->amount.idx]) {
+        token = &tmpCtx.transactionContext.extraInfo[ui_ctx->amount.idx].token;
+    }
     if ((ui_ctx->amount.joins[ui_ctx->amount.idx].value_length == INT256_LENGTH) &&
         ismaxint(ui_ctx->amount.joins[ui_ctx->amount.idx].value,
                  ui_ctx->amount.joins[ui_ctx->amount.idx].value_length)) {
         strlcpy(strings.tmp.tmp, "Unlimited ", sizeof(strings.tmp.tmp));
-        strlcat(strings.tmp.tmp, token->ticker, sizeof(strings.tmp.tmp));
+        strlcat(strings.tmp.tmp, (token != NULL) ? token->ticker : "???", sizeof(strings.tmp.tmp));
     } else {
         if (!amountToString(ui_ctx->amount.joins[ui_ctx->amount.idx].value,
                             ui_ctx->amount.joins[ui_ctx->amount.idx].value_length,
-                            token->decimals,
-                            token->ticker,
+                            (token != NULL) ? token->decimals : 0,
+                            (token != NULL) ? token->ticker : "???",
                             strings.tmp.tmp,
                             sizeof(strings.tmp.tmp))) {
             return false;
@@ -454,13 +456,23 @@ void amount_join_set_token_received(void) {
  * @return whether it was successful or not
  */
 static bool update_amount_join(const uint8_t *data, uint8_t length) {
-    tokenDefinition_t *token;
+    const tokenDefinition_t *token = NULL;
 
-    token = &tmpCtx.transactionContext.extraInfo[ui_ctx->amount.idx].token;
+    if (tmpCtx.transactionContext.assetSet[ui_ctx->amount.idx]) {
+        token = &tmpCtx.transactionContext.extraInfo[ui_ctx->amount.idx].token;
+    } else {
+        if (tmpCtx.transactionContext.currentAssetIndex == ui_ctx->amount.idx) {
+            // So that the following amount-join find their tokens in the expected indices
+            tmpCtx.transactionContext.currentAssetIndex =
+                (tmpCtx.transactionContext.currentAssetIndex + 1) % MAX_ASSETS;
+        }
+    }
     switch (ui_ctx->amount.state) {
         case AMOUNT_JOIN_STATE_TOKEN:
-            if (memcmp(data, token->address, ADDRESS_LENGTH) != 0) {
-                return false;
+            if (token != NULL) {
+                if (memcmp(data, token->address, ADDRESS_LENGTH) != 0) {
+                    return false;
+                }
             }
             amount_join_set_token_received();
             break;