Flow improvement for clarity

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=1
 # This is the minor version
 APPVERSION_N=0
 # This is the patch version
-APPVERSION_P=2
+APPVERSION_P=3

app/src/items.c

@@ -34,7 +34,6 @@ static items_error_t items_storeNetwork();
 static items_error_t items_storeRequiringCapabilities();
 static items_error_t items_storeKey();
 static items_error_t items_validateSigners();
-static items_error_t items_storePayingGas();
 static items_error_t items_storeAllTransfers();
 static items_error_t items_storeCaution();
 static items_error_t items_storeHashWarning();
@@ -44,7 +43,6 @@ static items_error_t items_checkTxLengths();
 static items_error_t items_computeHash(tx_type_t tx_type);
 static items_error_t items_storeHash();
 static items_error_t items_storeSignForAddr();
-static items_error_t items_storeGasItem(uint16_t json_token_index);
 static items_error_t items_storeTxItem(uint16_t transfer_token_index, uint8_t *num_of_transfers);
 static items_error_t items_storeTxCrossItem(uint16_t transfer_token_index, uint8_t *num_of_transfers);
 static items_error_t items_storeTxRotateItem(uint16_t transfer_token_index);
@@ -84,8 +82,6 @@ items_error_t items_storeItems(tx_type_t tx_type) {
 
         CHECK_ITEMS_ERROR(items_validateSigners());
 
-        CHECK_ITEMS_ERROR(items_storePayingGas());
-
         CHECK_ITEMS_ERROR(items_storeAllTransfers());
 
         if (parser_validateMetaField() != parser_ok) {
@@ -204,45 +200,6 @@ static items_error_t items_validateSigners() {
     return items_ok;
 }
 
-static items_error_t items_storePayingGas() {
-    parsed_json_t *json_all = &(parser_getParserJsonObj()->json);
-    uint16_t *curr_token_idx = &item_array.items[item_array.numOfItems].json_token_index;
-    uint16_t token_index = 0;
-    uint16_t name_token_index = 0;
-    jsmntok_t *token;
-
-    PARSER_TO_ITEMS_ERROR(object_get_value(json_all, *curr_token_idx, JSON_SIGNERS, curr_token_idx));
-
-    if (!items_isNullField(*curr_token_idx)) {
-        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, *curr_token_idx, 0, curr_token_idx));
-
-        if (object_get_value(json_all, *curr_token_idx, JSON_CLIST, curr_token_idx) == parser_no_data) {
-            return items_ok;
-        }
-
-        if (!items_isNullField(*curr_token_idx)) {
-            uint16_t clist_element_count = 0;
-            PARSER_TO_ITEMS_ERROR(array_get_element_count(json_all, *curr_token_idx, &clist_element_count));
-
-            for (uint16_t i = 0; i < (uint8_t)clist_element_count; i++) {
-                PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, *curr_token_idx, i, &token_index));
-
-                PARSER_TO_ITEMS_ERROR(object_get_value(json_all, token_index, JSON_NAME, &name_token_index));
-                token = &(json_all->tokens[name_token_index]);
-
-                if (MEMCMP("coin.GAS", json_all->buffer + token->start, token->end - token->start) == 0) {
-                    *curr_token_idx = token_index;
-                    items_storeGasItem(*curr_token_idx);
-                    return items_ok;
-                }
-            }
-        }
-    }
-
-    *curr_token_idx = 0;
-    return items_ok;
-}
-
 static items_error_t items_storeAllTransfers() {
     parsed_json_t *json_all = &(parser_getParserJsonObj()->json);
     uint16_t *curr_token_idx = &item_array.items[item_array.numOfItems].json_token_index;
@@ -411,26 +368,6 @@ static items_error_t items_storeSignForAddr() {
     return items_ok;
 }
 
-static items_error_t items_storeGasItem(uint16_t json_token_index) {
-    uint16_t token_index = 0;
-    uint16_t args_count = 0;
-    parsed_json_t *json_all = &(parser_getParserJsonObj()->json);
-    item_t *item = &item_array.items[item_array.numOfItems];
-
-    PARSER_TO_ITEMS_ERROR(object_get_value(json_all, json_token_index, "args", &token_index));
-    PARSER_TO_ITEMS_ERROR(array_get_element_count(json_all, token_index, &args_count));
-
-    if (args_count > 0) {
-        items_storeUnknownItem(args_count, token_index);
-    } else {
-        item->key = key_paying_gas;
-        item_array.toString[item_array.numOfItems] = items_nothingToDisplayString;
-        INCREMENT_NUM_ITEMS()
-    }
-
-    return items_ok;
-}
-
 static items_error_t items_storeTxItem(uint16_t transfer_token_index, uint8_t *num_of_transfers) {
     uint16_t token_index = 0;
     uint16_t num_of_args = 0;
@@ -446,6 +383,21 @@ static items_error_t items_storeTxItem(uint16_t transfer_token_index, uint8_t *n
         (*num_of_transfers)++;
         item_array.toString[item_array.numOfItems] = items_transferToDisplayString;
         INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_from;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 0, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_stdToDisplayString;
+        INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_to;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 1, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_stdToDisplayString;
+        INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_amount;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 2, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_amountToDisplayString;
+        INCREMENT_NUM_ITEMS()
     } else {
         items_storeUnknownItem(num_of_args, token_index);
     }
@@ -468,6 +420,26 @@ static items_error_t items_storeTxCrossItem(uint16_t transfer_token_index, uint8
         (*num_of_transfers)++;
         item_array.toString[item_array.numOfItems] = items_crossTransferToDisplayString;
         INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_from;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 0, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_stdToDisplayString;
+        INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_to;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 1, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_stdToDisplayString;
+        INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_amount;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 2, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_amountToDisplayString;
+        INCREMENT_NUM_ITEMS()
+        item = &item_array.items[item_array.numOfItems];
+        item->key = key_to_chain;
+        PARSER_TO_ITEMS_ERROR(array_get_nth_element(json_all, token_index, 3, &item->json_token_index));
+        item_array.toString[item_array.numOfItems] = items_stdToDisplayString;
+        INCREMENT_NUM_ITEMS()
     } else {
         items_storeUnknownItem(num_of_args, token_index);
     }

app/src/items_defs.h

@@ -55,6 +55,10 @@ typedef enum {
     key_chain_id,
     key_paying_gas,
     key_transfer,
+    key_from,
+    key_to,
+    key_amount,
+    key_to_chain,
     key_rotate,
     key_unknown_capability,
     key_transaction_hash,

app/src/items_format.c

@@ -103,60 +103,37 @@ items_error_t items_requiringToDisplayString(__Z_UNUSED item_t item, char *outVa
     return items_ok;
 }
 
-items_error_t items_transferToDisplayString(item_t item, char *outVal, uint16_t outValLen) {
-    const char *amount;
-    const char *to;
-    const char *from;
-    uint8_t amount_len = 0;
-    uint8_t to_len = 0;
-    uint8_t from_len = 0;
-    uint16_t token_index = 0;
-    parsed_json_t *json_all = &(parser_getParserJsonObj()->json);
-    uint16_t item_token_index = item.json_token_index;
+items_error_t items_amountToDisplayString(item_t item, char *outVal, uint16_t outValLen) {
+    const parsed_json_t *json_all = &(parser_getParserJsonObj()->json);
+    const jsmntok_t *token = &(json_all->tokens[item.json_token_index]);
+    const uint16_t len = token->end - token->start;
 
-    PARSER_TO_ITEMS_ERROR(object_get_value(json_all, item_token_index, "args", &token_index));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 0, &from, &from_len));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 1, &to, &to_len));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 2, &amount, &amount_len));
+    if (len == 0) return items_length_zero;
 
-    uint16_t required_len = amount_len + from_len + to_len + strlen(" from ") + strlen(" to ") + 4 * sizeof("\"");
-    if (required_len > outValLen) {
+    if (len >= outValLen) {
         return items_data_too_large;
     }
 
-    snprintf(outVal, outValLen, "%.*s from \"%.*s\" to \"%.*s\"", amount_len, amount, from_len, from, to_len, to);
+    snprintf(outVal, outValLen, "KDA %.*s", len, json_all->buffer + token->start);
 
     return items_ok;
 }
 
-items_error_t items_crossTransferToDisplayString(item_t item, char *outVal, uint16_t outValLen) {
-    const char *amount;
-    const char *to;
-    const char *from;
-    const char *chain;
-    uint8_t amount_len = 0;
-    uint8_t to_len = 0;
-    uint8_t from_len = 0;
-    uint8_t chain_len = 0;
-    uint16_t token_index = 0;
-    parsed_json_t *json_all = &(parser_getParserJsonObj()->json);
-    uint16_t item_token_index = item.json_token_index;
+items_error_t items_transferToDisplayString(__Z_UNUSED item_t item, char *outVal, uint16_t outValLen) {
+    uint16_t len = sizeof("Normal Transfer");
 
-    PARSER_TO_ITEMS_ERROR(object_get_value(json_all, item_token_index, "args", &token_index));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 0, &from, &from_len));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 1, &to, &to_len));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 2, &amount, &amount_len));
-    PARSER_TO_ITEMS_ERROR(parser_arrayElementToString(token_index, 3, &chain, &chain_len));
+    if (len > outValLen) return items_data_too_large;
 
-    uint16_t required_len = amount_len + from_len + to_len + chain_len + strlen("Cross-chain ") + strlen(" from ") +
-                            strlen(" to ") + 6 * strlen("\"") + strlen(" to chain ");
-    if (required_len > outValLen) {
-        return items_data_too_large;
-    }
+    snprintf(outVal, len, "Normal Transfer");
+    return items_ok;
+}
 
-    snprintf(outVal, outValLen, "Cross-chain %.*s from \"%.*s\" to \"%.*s\" to chain \"%.*s\"", amount_len, amount, from_len,
-             from, to_len, to, chain_len, chain);
+items_error_t items_crossTransferToDisplayString(__Z_UNUSED item_t item, char *outVal, uint16_t outValLen) {
+    uint16_t len = sizeof("Cross-chain Transfer");
+
+    if (len > outValLen) return items_data_too_large;
 
+    snprintf(outVal, len, "Cross-chain Transfer");
     return items_ok;
 }
 

app/src/items_format.h

@@ -37,6 +37,7 @@ items_error_t items_cautionToDisplayString(__Z_UNUSED item_t item, char *outVal,
 items_error_t items_txTooLargeToDisplayString(__Z_UNUSED item_t item, char *outVal, uint16_t outValLen);
 items_error_t items_signingToDisplayString(item_t item, char *outVal, uint16_t outValLen);
 items_error_t items_requiringToDisplayString(item_t item, char *outVal, uint16_t outValLen);
+items_error_t items_amountToDisplayString(item_t item, char *outVal, uint16_t outValLen);
 items_error_t items_transferToDisplayString(item_t item, char *outVal, uint16_t outValLen);
 items_error_t items_crossTransferToDisplayString(item_t item, char *outVal, uint16_t outValLen);
 items_error_t items_rotateToDisplayString(item_t item, char *outVal, uint16_t outValLen);

app/src/parser.c

@@ -192,6 +192,18 @@ static parser_error_t parser_getItemKey(uint8_t displayIdx, char *outKey, uint16
         case key_paying_gas:
             strncpy(outKey, "Paying Gas", outKeyLen);
             break;
+        case key_from:
+            strncpy(outKey, "From", outKeyLen);
+            break;
+        case key_to:
+            strncpy(outKey, "To", outKeyLen);
+            break;
+        case key_amount:
+            strncpy(outKey, "Amount", outKeyLen);
+            break;
+        case key_to_chain:
+            strncpy(outKey, "To Chain", outKeyLen);
+            break;
         case key_transfer:
             if (update_counts) {
                 transfer_count++;

tests_zemu/package.json

@@ -25,8 +25,9 @@
     "upgrade": "bunx npm-check-updates -i"
   },
   "dependencies": {
-    "@zondax/ledger-kadena": "v0.0.3",
-    "@zondax/zemu": "^0.51.0"
+    "@zondax/ledger-kadena": "^0.0.3",
+    "@zondax/zemu": "^0.52.0",
+    "hw-app-kda": "^0.0.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "^6.29.5",
@@ -35,6 +36,7 @@
     "@types/ledgerhq__hw-transport": "^4.21.8",
     "@typescript-eslint/eslint-plugin": "^8.8.1",
     "@typescript-eslint/parser": "^8.8.1",
+    "@zondax/hw-app-kda": "^0.1.1",
     "blakejs": "^1.2.1",
     "crypto-js": "4.2.0",
     "ed25519-supercop": "^2.0.1",
@@ -46,7 +48,6 @@
     "eslint-plugin-promise": "^7.1.0",
     "eslint-plugin-tsdoc": "^0.3.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "@zondax/hw-app-kda": "^0.1.1",
     "jest": "29.7.0",
     "jssha": "^3.3.1",
     "prettier": "^3.3.3",