Merge pull request #129 from cosmos/dev

New release
cosmos · Nov 29, 2024 · 0f9bcc2 · 0f9bcc2
2 parents 7540506 + a29fcd7
commit 0f9bcc2
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 12 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=35
 # This is the patch version of this release
-APPVERSION_P=26
+APPVERSION_P=27
diff --git a/app/src/tx_validate.c b/app/src/tx_validate.c
@@ -51,15 +51,14 @@ parser_error_t contains_whitespace(parsed_json_t *json) {
                 }
             }
             start = json->tokens[i].end + 1;
+            if (start < 0) {
+                return parser_json_unexpected_error;
+            }
         } else {
             return parser_ok;
         }
     }
 
-    if (start < 0) {
-        return parser_json_unexpected_error;
-    }
-
     while (start < last_element_index && json->buffer[start] != '\0') {
         if (is_space(json->buffer[start])) {
             return parser_json_contains_whitespace;

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,17 +19,17 @@
   },
   "dependencies": {
     "@zondax/ledger-cosmos-js": "^3.0.3",
-    "@zondax/zemu": "^0.50.2"
+    "@zondax/zemu": "^0.52.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
     "@types/ledgerhq__hw-transport": "^4.21.8",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/eslint-plugin": "^8.16.0",
+    "@typescript-eslint/parser": "^8.16.0",
     "bech32": "^2.0.0",
     "blakejs": "^1.1.1",
     "crypto-js": "4.2.0",
-    "eslint": "^9.7.0",
+    "eslint": "^9.15.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^28.6.0",
@@ -39,10 +39,10 @@
     "js-sha3": "0.9.3",
     "jssha": "^3.2.0",
     "keccak256": "^1.0.6",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.1",
     "secp256k1": "^5.0.0",
     "ts-jest": "^29.2.3",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.4"
+    "typescript": "^5.7.2"
   }
 }
diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
+34 −39		app/common/app_main.c
+31 −30		app/common/app_main.h
+20 −27		app/ui/view.c
+1 −2		app/ui/view.h
+35 −37		app/ui/view_inspect_s.c
+20 −1		app/ui/view_internal.h
+97 −89		app/ui/view_nano.c
+1 −1		app/ui/view_nano.h
+15 −14		app/ui/view_nano_inspect.h
+12 −12		app/ui/view_nbgl.c
+215 −140		app/ui/view_x.c
+32 −33		include/apdu_codes.h
+19 −16		include/app_mode.h
+19 −21		include/base58.h
+1 −1		include/base64.h
+1 −1		include/bech32.h
+1 −1		include/bignum.h
+1 −6		include/bittools.h
+17 −20		include/buffering.h
+15 −15		include/hexutils.h
+8 −35		include/segwit_addr.h
+15 −18		include/sigutils.h
+17 −16		include/timeutils.h
+318 −415		include/utf8.h
+145 −149		include/view_templates.h
+14 −14		include/zxcanary.h
+51 −49		include/zxerror.h
+74 −79		include/zxformat.h
+14 −14		include/zxtypes.h
+2 −3		include/zxutils_ledger.h
+3 −3		include/zxversion.h
+1 −1		scripts/install_deps.sh
+1 −1		scripts/template.sh
+27 −3		src/app_mode.c
+40 −48		src/base58.c
+20 −20		src/base64.c
+20 −23		src/bech32.c
+24 −27		src/bignum.c
+20 −26		src/buffering.c
+24 −25		src/hexutils.c
+14 −22		src/segwit_addr.c
+17 −21		src/sigutils.c
+76 −686		src/timeutils.c
+19 −17		src/zxcanary.c
+30 −30		src/zxformat.c
+133 −134		src/zxutils_ledger.c
+1 −1		templates/Makefile.root
+1 −1		tests/asciify.cpp
+1 −1		tests/base64.cpp
+1 −1		tests/bech32.cpp
+1 −1		tests/bip44path.cpp
+1 −1		tests/buffering_tests.cpp
+1 −1		tests/doubledabble.cpp
+1 −1		tests/hexutils.cpp
+1 −1		tests/macros.cpp
+1 −1		tests/sigutils.cpp
+1 −1		tests/zxformat.cpp