Merge pull request #210 from Zondax/swap

Zondax · Feb 20, 2024 · 828eb04 · 828eb04
2 parents 57a1925 + e559df4
commit 828eb04
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -48,5 +48,6 @@ zemu_install: tests_tools_build
 test_all:
 	make zemu_install
 	SUBSTRATE_PARSER_FULL=1 make
+	make clean_build
 	SUBSTRATE_PARSER_FULL=1 SUPPORT_SR25519=1 make buildS
 	make zemu_test
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=25
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=10100
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/app/rust/.cargo/.gitignore b/app/rust/.cargo/.gitignore
@@ -1,3 +1,3 @@
 registry/
 .package-cache
-
+.package-cache-mutate
diff --git a/app/src/swap/handle_sign_transaction.c b/app/src/swap/handle_sign_transaction.c
@@ -85,7 +85,7 @@ parser_error_t check_swap_conditions(const parser_context_t *ctx) {
         return err;
     }
     // Check method.
-    const char * valid_tx_method = "Balances Transfer";
+    const char * valid_tx_method = "Balances Transfer allow death";
     char tmp_str[80] = {0};
     snprintf(tmp_str, sizeof(tmp_str), "%s %s", _getMethod_ModuleName(ctx->tx_obj->transactionVersion,
                                                                     ctx->tx_obj->callIndex.moduleIdx),

diff --git a/cmake/cmake-modules b/cmake/cmake-modules
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
@@ -22,23 +22,23 @@
     "@zondax/zemu": "^0.46.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.0",
-    "@types/ledgerhq__hw-transport": "^4.21.4",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
+    "@types/jest": "^29.5.12",
+    "@types/ledgerhq__hw-transport": "^4.21.8",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
     "blakejs": "^1.1.1",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "ed25519-supercop": "^2.0.1",
-    "eslint": "^8.36.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^27.1.3",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.5.0",
     "jssha": "^3.2.0",
-    "prettier": "^2.8.6",
-    "ts-jest": "^29.0.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.5.3"
+    "prettier": "^3.2.5",
+    "ts-jest": "^29.1.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   }
 }
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/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.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