Merge pull request #20 from Zondax/update-app

some fixes
Zondax · Apr 24, 2023 · a10e246 · a10e246
2 parents 7183d18 + ced5ea3
commit a10e246
Show file tree

Hide file tree

Showing 101 changed files with 26 additions and 60 deletions.
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -62,6 +62,7 @@ jobs:
           [ ${{needs.build_ledger.outputs.size}} -le $NANOS_LIMIT_SIZE ]
 
   test_zemu:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
       - name: Test
@@ -80,11 +81,7 @@ jobs:
         run: |
           npm install -g yarn
       - name: Build Ledger app
-        run: make
-      - name: Build/Install build js deps
-        run: make zemu_install
-      - name: Run zemu tests
-        run: "cd tests_zemu; yarn test"
+        run: make test_all
       - name: Upload Snapshots (only failure)
         if: ${{ failure() }}
         uses: actions/upload-artifact@v3

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=1
 # This is the patch version of this release
-APPVERSION_P=2
+APPVERSION_P=3
diff --git a/app/glyphs/icon_back.gif b/app/glyphs/icon_back.gif
diff --git a/app/glyphs/icon_back_x.gif b/app/glyphs/icon_back_x.gif
diff --git a/app/glyphs/icon_certificate.gif b/app/glyphs/icon_certificate.gif
diff --git a/app/glyphs/icon_crossmark.gif b/app/glyphs/icon_crossmark.gif
diff --git a/app/glyphs/icon_dashboard.gif b/app/glyphs/icon_dashboard.gif
diff --git a/app/glyphs/icon_dashboard_x.gif b/app/glyphs/icon_dashboard_x.gif
diff --git a/app/glyphs/icon_down.gif b/app/glyphs/icon_down.gif
diff --git a/app/glyphs/icon_eye.gif b/app/glyphs/icon_eye.gif
diff --git a/app/glyphs/icon_left.gif b/app/glyphs/icon_left.gif
diff --git a/app/glyphs/icon_right.gif b/app/glyphs/icon_right.gif
diff --git a/app/glyphs_stax/icon_stax_32.gif → app/glyphs/icon_stax_32.gif b/app/glyphs_stax/icon_stax_32.gif → app/glyphs/icon_stax_32.gif
diff --git a/app/glyphs_stax/icon_stax_64.gif → app/glyphs/icon_stax_64.gif b/app/glyphs_stax/icon_stax_64.gif → app/glyphs/icon_stax_64.gif
diff --git a/app/glyphs/icon_up.gif b/app/glyphs/icon_up.gif
diff --git a/app/glyphs/icon_validate_14.gif b/app/glyphs/icon_validate_14.gif
diff --git a/app/glyphs/icon_warning.gif b/app/glyphs/icon_warning.gif
diff --git a/app/src/algo_asa.c b/app/src/algo_asa.c
@@ -36,6 +36,21 @@ static const algo_asset_info_t algo_assets[] = {
     ALGO_ASA(27165954, "PLANET",                    "PLANETS ",     6),
     ALGO_ASA(163650, "Asia Reserve Currency Coin",  "ARCC ",        6),
     ALGO_ASA(137594422, "HEADLINE",                 "HDL ",         6),
+    ALGO_ASA(922346083, "Nimble",                   "NIMBLE ",      6),
+    ALGO_ASA(470842789, "Defly",                    "DEFLY ",       6),
+    ALGO_ASA(408898501, "Loot Box ASA",             "LTBX ",        1),
+    ALGO_ASA(1003833031, "CollecteursX",            "CLTR ",        6),
+    ALGO_ASA(230946361, "AlgoGems",                 "GEMS ",        6),
+    ALGO_ASA(226701642, "Yieldly",                  "YLDY ",        6),
+    ALGO_ASA(300208676, "Smile Coin",               "SMILE ",       6),
+    ALGO_ASA(287867876, "Opulous",                  "OPUL ",       10),
+    ALGO_ASA(213345970, "Exodus",                   "EXIT ",        8),
+    ALGO_ASA(297995609, "Choice Coin",              "CHOICE ",      2),
+    ALGO_ASA(386192725, "goBTC",                    "goBTC ",       8),
+    ALGO_ASA(386195940, "goETH",                    "goETH ",       8),
+    ALGO_ASA(441139422, "goMINT",                   "goMINT ",      6),
+    ALGO_ASA(403499324, "NEXUS",                    "GP ",          0),
+    ALGO_ASA(142838028, "AlgoFam",                  "FAME",         6),
 };
 
 

diff --git a/app/src/parser.c b/app/src/parser.c
@@ -745,7 +745,7 @@ parser_error_t parser_getTxnText(parser_context_t *ctx,
             snprintf(outVal, outValLen, "Review asset\nconfiguration");
             break;
         case TX_APPLICATION:
-            snprintf(outVal, outValLen, "Review application call");
+            snprintf(outVal, outValLen, "Review application\ncall");
             break;
         default:
             return parser_unknown_transaction;

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk
diff --git a/deps/stax-secure-sdk b/deps/stax-secure-sdk
diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@zondax/ledger-algorand": "../js",
-    "@zondax/zemu": "^0.39.1"
+    "@zondax/zemu": "^0.41.0"
   },
   "devDependencies": {
     "@types/jest": "^29.4.0",
@@ -34,7 +34,7 @@
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "29.4.2",
+    "jest": "29.5.0",
     "jssha": "^3.2.0",
     "prettier": "^2.4.1",
     "ts-jest": "^29.0.5",

diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00008.png b/tests_zemu/snapshots/s-mainmenu/00008.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00005.png b/tests_zemu/snapshots/sp-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00008.png b/tests_zemu/snapshots/sp-mainmenu/00008.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00000.png b/tests_zemu/snapshots/st-mainmenu/00000.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00002.png b/tests_zemu/snapshots/st-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00003.png b/tests_zemu/snapshots/st-mainmenu/00003.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/st-mainmenu/00005.png b/tests_zemu/snapshots/st-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/st-show_address/00000.png b/tests_zemu/snapshots/st-show_address/00000.png
diff --git a/tests_zemu/snapshots/st-show_address/00001.png b/tests_zemu/snapshots/st-show_address/00001.png
diff --git a/tests_zemu/snapshots/st-show_address/00002.png b/tests_zemu/snapshots/st-show_address/00002.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00000.png b/tests_zemu/snapshots/st-show_address_reject/00000.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00001.png b/tests_zemu/snapshots/st-show_address_reject/00001.png
diff --git a/tests_zemu/snapshots/st-show_address_reject/00003.png b/tests_zemu/snapshots/st-show_address_reject/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application/00000.png b/tests_zemu/snapshots/st-sign_application/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application/00001.png b/tests_zemu/snapshots/st-sign_application/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application/00002.png b/tests_zemu/snapshots/st-sign_application/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application/00003.png b/tests_zemu/snapshots/st-sign_application/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application/00004.png b/tests_zemu/snapshots/st-sign_application/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application/00005.png b/tests_zemu/snapshots/st-sign_application/00005.png
diff --git a/tests_zemu/snapshots/st-sign_application/00006.png b/tests_zemu/snapshots/st-sign_application/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application/00007.png b/tests_zemu/snapshots/st-sign_application/00007.png
diff --git a/tests_zemu/snapshots/st-sign_application/00008.png b/tests_zemu/snapshots/st-sign_application/00008.png
diff --git a/tests_zemu/snapshots/st-sign_application/00009.png b/tests_zemu/snapshots/st-sign_application/00009.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00000.png b/tests_zemu/snapshots/st-sign_application_big/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00001.png b/tests_zemu/snapshots/st-sign_application_big/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00002.png b/tests_zemu/snapshots/st-sign_application_big/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00003.png b/tests_zemu/snapshots/st-sign_application_big/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00005.png b/tests_zemu/snapshots/st-sign_application_big/00005.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00006.png b/tests_zemu/snapshots/st-sign_application_big/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00007.png b/tests_zemu/snapshots/st-sign_application_big/00007.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00008.png b/tests_zemu/snapshots/st-sign_application_big/00008.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00009.png b/tests_zemu/snapshots/st-sign_application_big/00009.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00011.png b/tests_zemu/snapshots/st-sign_application_big/00011.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00012.png b/tests_zemu/snapshots/st-sign_application_big/00012.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00013.png b/tests_zemu/snapshots/st-sign_application_big/00013.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00014.png b/tests_zemu/snapshots/st-sign_application_big/00014.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00015.png b/tests_zemu/snapshots/st-sign_application_big/00015.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00001.png b/tests_zemu/snapshots/st-sign_asset_config/00001.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00002.png b/tests_zemu/snapshots/st-sign_asset_config/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00003.png b/tests_zemu/snapshots/st-sign_asset_config/00003.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00004.png b/tests_zemu/snapshots/st-sign_asset_config/00004.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00005.png b/tests_zemu/snapshots/st-sign_asset_config/00005.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00006.png b/tests_zemu/snapshots/st-sign_asset_config/00006.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00007.png b/tests_zemu/snapshots/st-sign_asset_config/00007.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00008.png b/tests_zemu/snapshots/st-sign_asset_config/00008.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00001.png b/tests_zemu/snapshots/st-sign_asset_freeze/00001.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00002.png b/tests_zemu/snapshots/st-sign_asset_freeze/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00003.png b/tests_zemu/snapshots/st-sign_asset_freeze/00003.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00004.png b/tests_zemu/snapshots/st-sign_asset_freeze/00004.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00005.png b/tests_zemu/snapshots/st-sign_asset_freeze/00005.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00001.png b/tests_zemu/snapshots/st-sign_asset_transfer/00001.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00002.png b/tests_zemu/snapshots/st-sign_asset_transfer/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00003.png b/tests_zemu/snapshots/st-sign_asset_transfer/00003.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00004.png b/tests_zemu/snapshots/st-sign_asset_transfer/00004.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00005.png b/tests_zemu/snapshots/st-sign_asset_transfer/00005.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00001.png b/tests_zemu/snapshots/st-sign_keyreg/00001.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00002.png b/tests_zemu/snapshots/st-sign_keyreg/00002.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00003.png b/tests_zemu/snapshots/st-sign_keyreg/00003.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00005.png b/tests_zemu/snapshots/st-sign_keyreg/00005.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00006.png b/tests_zemu/snapshots/st-sign_keyreg/00006.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00007.png b/tests_zemu/snapshots/st-sign_keyreg/00007.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00001.png b/tests_zemu/snapshots/st-sign_payment/00001.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00002.png b/tests_zemu/snapshots/st-sign_payment/00002.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00003.png b/tests_zemu/snapshots/st-sign_payment/00003.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00004.png b/tests_zemu/snapshots/st-sign_payment/00004.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00005.png b/tests_zemu/snapshots/st-sign_payment/00005.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00006.png b/tests_zemu/snapshots/st-sign_payment/00006.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00005.png b/tests_zemu/snapshots/x-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00008.png b/tests_zemu/snapshots/x-mainmenu/00008.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
+3 −3		app/ui/view.c
+4 −4		app/ui/view.h
+3 −3		app/ui/view_internal.h
+1 −1		app/ui/view_nano.c
+3 −3		app/ui/view_s.c
+6 −119		app/ui/view_stax.c
+3 −3		app/ui/view_x.c
+1 −1		dockerized_build.mk
+4 −3		include/zxformat.h
+3 −3		include/zxversion.h
+0 −5		makefiles/Makefile.platform
+5 −0		Makefile.defines
+2 −4		Makefile.rules
+159 −0		Makefile.standard_app
+126 −0		include/os_seed.h
+4 −1		lib_bagl/src/bagl.c
+155 −0		lib_standard_app/base58.c
+52 −0		lib_standard_app/base58.h
+87 −0		lib_standard_app/bip32.c
+47 −0		lib_standard_app/bip32.h
+165 −0		lib_standard_app/buffer.c
+192 −0		lib_standard_app/buffer.h
+175 −0		lib_standard_app/crypto_helpers.c
+341 −0		lib_standard_app/crypto_helpers.h
+157 −0		lib_standard_app/format.c
+69 −0		lib_standard_app/format.h
+189 −0		lib_standard_app/io.c
+99 −0		lib_standard_app/io.h
+10 −0		lib_standard_app/macros.h
+85 −0		lib_standard_app/main.c
+26 −0		lib_standard_app/offsets.h
+39 −0		lib_standard_app/parser.c
+33 −0		lib_standard_app/parser.h
+64 −0		lib_standard_app/read.c
+82 −0		lib_standard_app/read.h
+101 −0		lib_standard_app/varint.c
+52 −0		lib_standard_app/varint.h
+64 −0		lib_standard_app/write.c
+82 −0		lib_standard_app/write.h
+ −		lib_ux/glyphs/icon_back.gif
+ −		lib_ux/glyphs/icon_back_x.gif
+ −		lib_ux/glyphs/icon_certificate.gif
+ −		lib_ux/glyphs/icon_coggle.gif
+ −		lib_ux/glyphs/icon_crossmark.gif
+ −		lib_ux/glyphs/icon_dashboard.gif
+ −		lib_ux/glyphs/icon_dashboard_x.gif
+ −		lib_ux/glyphs/icon_eye.gif
+ −		lib_ux/glyphs/icon_processing.gif
+ −		lib_ux/glyphs/icon_validate_14.gif
+8 −3		Makefile.defines
+2 −4		Makefile.rules
+170 −0		Makefile.standard_app
+4 −0		include/os_io_seproxyhal.h
+126 −0		include/os_seed.h
+2 −0		lib_blewbxx_impl/src/ledger_ble.c
+65 −59		lib_nbgl/fonts/nbgl_font_inter_regular_24.inc
+82 −83		lib_nbgl/fonts/nbgl_font_inter_regular_24_1bpp.inc
+70 −61		lib_nbgl/fonts/nbgl_font_inter_regular_32.inc
+4 −4		lib_nbgl/fonts/nbgl_font_inter_regular_32_1bpp.inc
+68 −61		lib_nbgl/fonts/nbgl_font_inter_semibold_24.inc
+82 −83		lib_nbgl/fonts/nbgl_font_inter_semibold_24_1bpp.inc
+3 −3		lib_nbgl/include/nbgl_use_case.h
+1 −1		lib_nbgl/src/nbgl_draw.c
+1 −0		lib_nbgl/src/nbgl_layout.c
+13 −8		lib_nbgl/src/nbgl_use_case.c
+ −		lib_nbgl/tools/nbgl_font_Inter_Regular_24px/nbgl_font_Inter_Regular_24px_0x000049.bmp
+ −		lib_nbgl/tools/nbgl_font_Inter_Regular_24px/nbgl_font_Inter_Regular_24px_0x00006C.bmp
+ −		lib_nbgl/tools/nbgl_font_Inter_Regular_24px_1bpp/nbgl_font_Inter_Regular_24px_1bpp_0x000030.gif
+ −		lib_nbgl/tools/nbgl_font_Inter_Regular_32px/nbgl_font_Inter_Regular_32px_0x000049.bmp
+ −		lib_nbgl/tools/nbgl_font_Inter_Regular_32px/nbgl_font_Inter_Regular_32px_0x00006C.bmp
+ −		lib_nbgl/tools/nbgl_font_Inter_Regular_32px_1bpp/nbgl_font_Inter_Regular_32px_1bpp_0x000030.gif
+ −		lib_nbgl/tools/nbgl_font_Inter_SemiBold_24px/nbgl_font_Inter_SemiBold_24px_0x000049.bmp
+ −		lib_nbgl/tools/nbgl_font_Inter_SemiBold_24px/nbgl_font_Inter_SemiBold_24px_0x00006C.bmp
+ −		lib_nbgl/tools/nbgl_font_Inter_SemiBold_24px_1bpp/nbgl_font_Inter_SemiBold_24px_1bpp_0x000030.gif
+155 −0		lib_standard_app/base58.c
+52 −0		lib_standard_app/base58.h
+87 −0		lib_standard_app/bip32.c
+47 −0		lib_standard_app/bip32.h
+165 −0		lib_standard_app/buffer.c
+192 −0		lib_standard_app/buffer.h
+175 −0		lib_standard_app/crypto_helpers.c
+341 −0		lib_standard_app/crypto_helpers.h
+157 −0		lib_standard_app/format.c
+69 −0		lib_standard_app/format.h
+189 −0		lib_standard_app/io.c
+99 −0		lib_standard_app/io.h
+10 −0		lib_standard_app/macros.h
+85 −0		lib_standard_app/main.c
+26 −0		lib_standard_app/offsets.h
+39 −0		lib_standard_app/parser.c
+33 −0		lib_standard_app/parser.h
+64 −0		lib_standard_app/read.c
+82 −0		lib_standard_app/read.h
+101 −0		lib_standard_app/varint.c
+52 −0		lib_standard_app/varint.h
+64 −0		lib_standard_app/write.c
+82 −0		lib_standard_app/write.h
+ −		lib_ux/glyphs/icon_back.gif
+ −		lib_ux/glyphs/icon_back_x.gif
+ −		lib_ux/glyphs/icon_certificate.gif
+ −		lib_ux/glyphs/icon_coggle.gif
+ −		lib_ux/glyphs/icon_crossmark.gif
+ −		lib_ux/glyphs/icon_dashboard.gif
+ −		lib_ux/glyphs/icon_dashboard_x.gif
+ −		lib_ux/glyphs/icon_eye.gif
+ −		lib_ux/glyphs/icon_processing.gif
+ −		lib_ux/glyphs/icon_validate_14.gif
+4 −0		src/os_io_seproxyhal.c