Merge pull request #103 from Zondax/update

Update
Zondax · Feb 15, 2024 · 500b130 · 500b130
2 parents 0923f5e + 195fa4b
commit 500b130
Show file tree

Hide file tree

Showing 55 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -87,6 +87,18 @@ jobs:
         run: |
           make test_all
 
+      - name: Tar Zemu snapshots
+        if: always()
+        run: tar -cvf snapshots_tmp.tar ./tests_zemu/snapshots-tmp
+      - name: Upload tmp snapshots
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: snapshots-tmp
+          path: snapshots_tmp.tar
+          #we don't need these snapshots for very long
+          retention-days: 3
+
   build_package_nanos:
     needs: [configure, build, build_ledger, test_zemu]
     if: ${{ github.ref == 'refs/heads/main' }}

diff --git a/app/Makefile.version b/app/Makefile.version
@@ -1,3 +1,3 @@
 APPVERSION_M=1
 APPVERSION_N=0
-APPVERSION_P=22
+APPVERSION_P=23
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/js/package.json b/js/package.json
@@ -35,7 +35,7 @@
     "babel-jest": "^29.2.0",
     "bip32": "^4.0.0",
     "bip39": "^3.0.4",
-    "core-js": "^3.25.5",
+    "core-js": "^3.36.0",
     "crypto-js": "4.2.0",
     "eslint": "^8.31.0",
     "eslint-config-airbnb-base": "^15.0.0",

diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -28,16 +28,16 @@
     "@types/jest": "^29.2.2",
     "@types/ledgerhq__hw-transport": "^4.21.4",
     "@types/secp256k1": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.1",
+    "@typescript-eslint/parser": "^7.0.1",
     "crypto-js": "4.2.0",
     "eslint": "^8.27.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jest": "^27.1.5",
+    "eslint-plugin-jest": "^27.8.0",
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "29.7.0",
-    "js-sha256": "0.10.1",
+    "js-sha256": "0.11.0",
     "jssha": "^3.3.0",
     "prettier": "^3.0.3",
     "secp256k1": "^5.0.0",

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/00001.png b/tests_zemu/snapshots/sp-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00002.png b/tests_zemu/snapshots/sp-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00003.png b/tests_zemu/snapshots/sp-mainmenu/00003.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/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/sp-show_address/00001.png b/tests_zemu/snapshots/sp-show_address/00001.png
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00001.png b/tests_zemu/snapshots/sp-show_address_reject/00001.png
diff --git a/tests_zemu/snapshots/sp-show_address_reject/00003.png b/tests_zemu/snapshots/sp-show_address_reject/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_basic_transfer/00001.png b/tests_zemu/snapshots/sp-sign_basic_transfer/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_basic_transfer/00004.png b/tests_zemu/snapshots/sp-sign_basic_transfer/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_basic_transfer/00005.png b/tests_zemu/snapshots/sp-sign_basic_transfer/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_basic_transfer_expert/00001.png b/tests_zemu/snapshots/sp-sign_basic_transfer_expert/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_basic_transfer_expert/00004.png b/tests_zemu/snapshots/sp-sign_basic_transfer_expert/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_basic_transfer_expert/00005.png b/tests_zemu/snapshots/sp-sign_basic_transfer_expert/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer/00001.png b/tests_zemu/snapshots/sp-sign_noData_transfer/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer/00004.png b/tests_zemu/snapshots/sp-sign_noData_transfer/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer/00005.png b/tests_zemu/snapshots/sp-sign_noData_transfer/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00001.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00004.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00005.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00009.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00010.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00011.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00012.png b/tests_zemu/snapshots/sp-sign_noData_transfer_expert/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer/00001.png b/tests_zemu/snapshots/sp-sign_noTags_transfer/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer/00004.png b/tests_zemu/snapshots/sp-sign_noTags_transfer/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer/00005.png b/tests_zemu/snapshots/sp-sign_noTags_transfer/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00001.png b/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00004.png b/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00005.png b/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00007.png b/tests_zemu/snapshots/sp-sign_noTags_transfer_expert/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer/00001.png b/tests_zemu/snapshots/sp-sign_transfer/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer/00004.png b/tests_zemu/snapshots/sp-sign_transfer/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer/00005.png b/tests_zemu/snapshots/sp-sign_transfer/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00001.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00004.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00005.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00007.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00010.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00011.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00012.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_expert/00013.png b/tests_zemu/snapshots/sp-sign_transfer_expert/00013.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
+1 −1		app/ui/view.c
+1 −0		app/ui/view.h
+9 −0		app/ui/view_internal.h
+21 −19		app/ui/view_nano.c
+29 −20		app/ui/view_x.c
+2 −2		dockerized_build.mk
+1 −0		include/zxformat.h
+1 −1		include/zxversion.h
+30 −0		scripts/yearLookup.py
+236 −1		src/timeutils.c
+77 −7		src/zxformat.c
+1 −1		Makefile.defines
+54 −6		Makefile.rules
+34 −2		Makefile.rules_generic
+11 −0		include/cx_errors.h
+92 −153		include/ledger_assert.h
+226 −0		include/ledger_assert_internals.h
+0 −7		include/os.h
+7 −0		include/os_print.h
+37 −28		lib_cxng/include/lcx_aes.h
+14 −13		lib_cxng/include/lcx_blake2.h
+3 −3		lib_cxng/include/lcx_common.h
+7 −7		lib_cxng/include/lcx_crc.h
+19 −9		lib_cxng/include/lcx_des.h
+16 −14		lib_cxng/include/lcx_ecdh.h
+32 −31		lib_cxng/include/lcx_ecdsa.h
+68 −60		lib_cxng/include/lcx_ecfp.h
+19 −19		lib_cxng/include/lcx_ecschnorr.h
+32 −32		lib_cxng/include/lcx_eddsa.h
+4 −4		lib_cxng/include/lcx_groestl.h
+22 −22		lib_cxng/include/lcx_hash.h
+51 −38		lib_cxng/include/lcx_hmac.h
+91 −67		lib_cxng/include/lcx_math.h
+10 −9		lib_cxng/include/lcx_pbkdf2.h
+11 −8		lib_cxng/include/lcx_ripemd160.h
+23 −21		lib_cxng/include/lcx_rng.h
+62 −62		lib_cxng/include/lcx_rsa.h
+19 −9		lib_cxng/include/lcx_sha256.h
+17 −15		lib_cxng/include/lcx_sha3.h
+12 −10		lib_cxng/include/lcx_sha512.h
+1 −1		lib_cxng/include/libcxng.h
+4 −3		lib_cxng/src/cx_blake2.h
+6 −5		lib_cxng/src/cx_blake2b.h
+4 −4		lib_cxng/src/cx_crc.h
+4 −4		lib_cxng/src/cx_ecfp.h
+12 −12		lib_cxng/src/cx_eddsa.h
+16 −16		lib_cxng/src/cx_hash.h
+12 −11		lib_cxng/src/cx_pbkdf2.h
+9 −0		lib_cxng/src/cx_pkcs1.c
+23 −3		lib_cxng/src/cx_ripemd160.h
+4 −3		lib_cxng/src/cx_rng.h
+14 −13		lib_cxng/src/cx_rng_rfc6979.h
+2 −2		lib_cxng/src/cx_rsa.c
+35 −36		lib_cxng/src/cx_rsa.h
+23 −3		lib_cxng/src/cx_sha256.h
+23 −4		lib_cxng/src/cx_sha3.h
+23 −4		lib_cxng/src/cx_sha512.h
+1 −1		lib_cxng/src/cx_utils.h
+2 −3		lib_stusb/STM32_USB_Device_Library/Class/CCID/inc/sc_itf.h
+10 −0		lib_stusb/STM32_USB_Device_Library/Class/CCID/inc/usbd_ccid_if.h
+16 −23		lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_cmd.c
+36 −30		lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_if.c
+1 −0		lib_stusb/usbd_conf.h
+96 −24		lib_stusb_impl/u2f_impl.c
+7 −0		lib_stusb_impl/u2f_impl.h
+51 −5		lib_stusb_impl/usbd_impl.c
+7 −0		lib_ux/include/ux.h
+2 −0		lib_ux/src/ux_layout_common.h
+0 −2		lib_ux/src/ux_layout_paging.c
+3 −1		src/cx_stubs.S
+53 −0		src/cx_wrappers.c
+33 −34		src/ledger_assert.c