Merge pull request #48 from cosmos/dev

allow longer message type names

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the `transaction_version` field of `Runtime`
 APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
-APPVERSION_N=33
+APPVERSION_N=34
 # This is the patch version of this release
 APPVERSION_P=0

app/src/coin.h

@@ -53,6 +53,12 @@ typedef enum {
 #define COIN_DENOM_MAXSIZE                  50
 #define COIN_AMOUNT_MAXSIZE                 50
 
+#define COIN_MAX_CHAINID_LEN                20
+#define INDEXING_TMP_KEYSIZE 70
+#define INDEXING_TMP_VALUESIZE 70
+#define INDEXING_GROUPING_REF_TYPE_SIZE 70
+#define INDEXING_GROUPING_REF_FROM_SIZE 70
+
 #define MENU_MAIN_APP_LINE2_SECRET         "?"
 #define COIN_SECRET_REQUIRED_CLICKS         0
 

app/src/tx_display.c

@@ -98,7 +98,7 @@ __Z_INLINE parser_error_t calculate_is_default_chainid() {
 
     // get chain_id
     char outKey[2];
-    char outVal[20];
+    char outVal[COIN_MAX_CHAINID_LEN];
     uint8_t pageCount;
     INIT_QUERY_CONTEXT(outKey, sizeof(outKey),
                        outVal, sizeof(outVal),
@@ -140,11 +140,6 @@ __Z_INLINE bool address_matches_own(char *addr) {
     return true;
 }
 
-#define INDEXING_TMP_KEYSIZE 70
-#define INDEXING_TMP_VALUESIZE 70
-#define INDEXING_GROUPING_REF_TYPE_SIZE 70
-#define INDEXING_GROUPING_REF_FROM_SIZE 70
-
 parser_error_t tx_indexRootFields() {
     if (parser_tx_obj.flags.cache_valid) {
         return parser_ok;

app/src/tx_parser.c

@@ -51,14 +51,15 @@ __Z_INLINE void strcat_chunk_s(char *dst, uint16_t dst_max, const char *src_chun
 ///////////////////////////
 
 static const key_subst_t value_substitutions[] = {
-        {"cosmos-sdk/MsgSend",                     "Send"},
-        {"cosmos-sdk/MsgDelegate",                 "Delegate"},
-        {"cosmos-sdk/MsgUndelegate",               "Undelegate"},
-        {"cosmos-sdk/MsgBeginRedelegate",          "Redelegate"},
-        {"cosmos-sdk/MsgSubmitProposal",           "Propose"},
-        {"cosmos-sdk/MsgDeposit",                  "Deposit"},
-        {"cosmos-sdk/MsgVote",                     "Vote"},
-        {"cosmos-sdk/MsgWithdrawDelegationReward", "Withdraw Reward"},
+        {"cosmos-sdk/MsgSend",                        "Send"},
+        {"cosmos-sdk/MsgDelegate",                    "Delegate"},
+        {"cosmos-sdk/MsgUndelegate",                  "Undelegate"},
+        {"cosmos-sdk/MsgBeginRedelegate",             "Redelegate"},
+        {"cosmos-sdk/MsgSubmitProposal",              "Propose"},
+        {"cosmos-sdk/MsgDeposit",                     "Deposit"},
+        {"cosmos-sdk/MsgVote",                        "Vote"},
+        {"cosmos-sdk/MsgWithdrawDelegationReward",    "Withdraw Reward"},
+        {"cosmos-sdk/MsgWithdrawValidatorCommission", "Withdraw Val. Commission"},
 };
 
 parser_error_t tx_getToken(uint16_t token_index,
@@ -80,7 +81,7 @@ parser_error_t tx_getToken(uint16_t token_index,
     // empty strings are considered the first page
     *pageCount = 1;
     if (inLen > 0) {
-        for (uint32_t i = 0; i <    array_length(value_substitutions); i++) {
+        for (uint32_t i = 0; i < array_length(value_substitutions); i++) {
             const char *substStr = value_substitutions[i].str1;
             const size_t substStrLen = strlen(substStr);
             if (inLen == substStrLen && !MEMCMP(inValue, substStr, substStrLen)) {

tests/testcases/manual.json

@@ -1728,5 +1728,41 @@
       "8 | Tipper : cosmosaccaddr1d9h8qatxTIPPER"
     ],
     "expert": true
+  },
+  {
+    "name": "MsgWithdrawValidatorCommission",
+    "tx": {
+      "account_number": "6571",
+      "chain_id": "cosmoshub-4",
+      "fee": {
+        "amount": [
+          {
+            "amount": "5000",
+            "denom": "uatom"
+          }
+        ],
+        "gas": "200000"
+      },
+      "memo": "Zondax.ch",
+      "msgs": [
+        {
+          "type": "cosmos-sdk/MsgWithdrawValidatorCommission",
+          "value": {
+            "validator_address": "cosmosvaloper1grgelyng2v6v3t8z87wu3sxgt9m5s03xfytvz7"
+          }
+        }
+      ],
+      "sequence": "1"
+    },
+    "parsingErr": "No error",
+    "validationErr": "No error",
+    "expected": [
+      "0 | Type : Withdraw Val. Commission",
+      "1 | Validator [1/2] : cosmosvaloper1grgelyng2v6v3t8z87wu3sxgt",
+      "1 | Validator [2/2] : 9m5s03xfytvz7",
+      "2 | Memo : Zondax.ch",
+      "3 | Fee : 0.005000 ATOM"
+    ],
+    "expert": false
   }
 ]