diff --git a/.gitmodules b/.gitmodules index eb838fb..88129b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,9 @@ -[submodule "deps/nanos-secure-sdk"] - path = deps/nanos-secure-sdk - url = https://github.com/LedgerHQ/nanos-secure-sdk -[submodule "deps/nanosplus-secure-sdk"] - path = deps/nanosplus-secure-sdk - url = https://github.com/LedgerHQ/ledger-secure-sdk.git -[submodule "deps/nanox-secure-sdk"] - path = deps/nanox-secure-sdk - url = https://github.com/LedgerHQ/ledger-secure-sdk.git -[submodule "cmake/cmake-modules"] - path = cmake/cmake-modules - url = https://github.com/bilke/cmake-modules [submodule "deps/picohash"] path = deps/picohash url = https://github.com/kazuho/picohash [submodule "deps/ledger-zxlib"] path = deps/ledger-zxlib url = https://github.com/Zondax/ledger-zxlib.git -[submodule "deps/stax-secure-sdk"] - path = deps/stax-secure-sdk - url = https://github.com/LedgerHQ/ledger-secure-sdk.git [submodule "deps/ledger-secure-sdk"] path = deps/ledger-secure-sdk url = https://github.com/LedgerHQ/ledger-secure-sdk diff --git a/app/Makefile.version b/app/Makefile.version index dbd8903..be85216 100644 --- 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=13 +APPVERSION_P=14 diff --git a/app/src/common/parser.h b/app/src/common/parser.h index f07f43c..a847b21 100644 --- a/app/src/common/parser.h +++ b/app/src/common/parser.h @@ -46,8 +46,6 @@ parser_error_t parser_getItem(parser_context_t *ctx, parser_error_t getItem(uint8_t index, uint8_t* displayIdx); -parser_error_t parser_getTxnText(parser_context_t *ctx, char *outVal, uint16_t outValLen); - #ifdef __cplusplus } #endif diff --git a/app/src/common/tx.c b/app/src/common/tx.c index 1a896a5..d2e2756 100644 --- a/app/src/common/tx.c +++ b/app/src/common/tx.c @@ -122,13 +122,6 @@ zxerr_t tx_getItem(int8_t displayIdx, { uint8_t numItems = 0; -#if defined(TARGET_STAX) || defined(TARGET_FLEX) - if (displayIdx == -1) { - const parser_error_t tmpError = parser_getTxnText(&ctx_parsed_tx, outVal, outValLen); - return (tmpError == parser_ok ? zxerr_ok : zxerr_no_data); - } -#endif - CHECK_ZXERR(tx_getNumItems(&numItems)) if (displayIdx > numItems) { diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib index a69b91d..4b60244 160000 --- a/deps/ledger-zxlib +++ b/deps/ledger-zxlib @@ -1 +1 @@ -Subproject commit a69b91dbe387f39e8d37a252673d0d0bb42361a2 +Subproject commit 4b60244c489e6d4e0e48a7f38272dadd24415ef6 diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index e65b4dc..eecf1f3 100644 Binary files a/tests_zemu/snapshots/fl-mainmenu/00004.png and b/tests_zemu/snapshots/fl-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/fl-sign_application/00000.png b/tests_zemu/snapshots/fl-sign_application/00000.png index 66001d3..5bf7b71 100644 Binary files a/tests_zemu/snapshots/fl-sign_application/00000.png and b/tests_zemu/snapshots/fl-sign_application/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_application_big/00000.png b/tests_zemu/snapshots/fl-sign_application_big/00000.png index 5bdbe74..a18ffbd 100644 Binary files a/tests_zemu/snapshots/fl-sign_application_big/00000.png and b/tests_zemu/snapshots/fl-sign_application_big/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_asset_config/00000.png b/tests_zemu/snapshots/fl-sign_asset_config/00000.png index 88e9bbe..dc72ad3 100644 Binary files a/tests_zemu/snapshots/fl-sign_asset_config/00000.png and b/tests_zemu/snapshots/fl-sign_asset_config/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_asset_freeze/00000.png b/tests_zemu/snapshots/fl-sign_asset_freeze/00000.png index be78cd3..74720b4 100644 Binary files a/tests_zemu/snapshots/fl-sign_asset_freeze/00000.png and b/tests_zemu/snapshots/fl-sign_asset_freeze/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_asset_transfer/00000.png b/tests_zemu/snapshots/fl-sign_asset_transfer/00000.png index d8441c1..74720b4 100644 Binary files a/tests_zemu/snapshots/fl-sign_asset_transfer/00000.png and b/tests_zemu/snapshots/fl-sign_asset_transfer/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_keyreg/00000.png b/tests_zemu/snapshots/fl-sign_keyreg/00000.png index 47c06a9..16d7a4d 100644 Binary files a/tests_zemu/snapshots/fl-sign_keyreg/00000.png and b/tests_zemu/snapshots/fl-sign_keyreg/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_payment/00000.png b/tests_zemu/snapshots/fl-sign_payment/00000.png index 2ef79f2..dc72ad3 100644 Binary files a/tests_zemu/snapshots/fl-sign_payment/00000.png and b/tests_zemu/snapshots/fl-sign_payment/00000.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png index e72026a..107c4ae 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00005.png and b/tests_zemu/snapshots/s-mainmenu/00005.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png index e72026a..107c4ae 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00011.png and b/tests_zemu/snapshots/s-mainmenu/00011.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00005.png b/tests_zemu/snapshots/sp-mainmenu/00005.png index 9ee988e..89611be 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00005.png and b/tests_zemu/snapshots/sp-mainmenu/00005.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png index 9ee988e..89611be 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00011.png and b/tests_zemu/snapshots/sp-mainmenu/00011.png differ diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png index 1c3947c..81d8e42 100644 Binary files a/tests_zemu/snapshots/st-mainmenu/00004.png and b/tests_zemu/snapshots/st-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/st-sign_application/00000.png b/tests_zemu/snapshots/st-sign_application/00000.png index 6021ad5..efa3e6b 100644 Binary files a/tests_zemu/snapshots/st-sign_application/00000.png and b/tests_zemu/snapshots/st-sign_application/00000.png differ diff --git a/tests_zemu/snapshots/st-sign_application/00002.png b/tests_zemu/snapshots/st-sign_application/00002.png index 56a89b3..02b9e5d 100644 Binary files a/tests_zemu/snapshots/st-sign_application/00002.png and b/tests_zemu/snapshots/st-sign_application/00002.png differ diff --git a/tests_zemu/snapshots/st-sign_application_big/00000.png b/tests_zemu/snapshots/st-sign_application_big/00000.png index 26acdf3..6d605f5 100644 Binary files a/tests_zemu/snapshots/st-sign_application_big/00000.png and b/tests_zemu/snapshots/st-sign_application_big/00000.png differ diff --git a/tests_zemu/snapshots/st-sign_application_big/00002.png b/tests_zemu/snapshots/st-sign_application_big/00002.png index f722c1f..c3e04ef 100644 Binary files a/tests_zemu/snapshots/st-sign_application_big/00002.png and b/tests_zemu/snapshots/st-sign_application_big/00002.png differ diff --git a/tests_zemu/snapshots/st-sign_asset_config/00000.png b/tests_zemu/snapshots/st-sign_asset_config/00000.png index 841dac6..c87e48f 100644 Binary files a/tests_zemu/snapshots/st-sign_asset_config/00000.png and b/tests_zemu/snapshots/st-sign_asset_config/00000.png differ diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00000.png b/tests_zemu/snapshots/st-sign_asset_freeze/00000.png index 8e1f687..6e1522b 100644 Binary files a/tests_zemu/snapshots/st-sign_asset_freeze/00000.png and b/tests_zemu/snapshots/st-sign_asset_freeze/00000.png differ diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00000.png b/tests_zemu/snapshots/st-sign_asset_transfer/00000.png index 9ee4f0b..6e1522b 100644 Binary files a/tests_zemu/snapshots/st-sign_asset_transfer/00000.png and b/tests_zemu/snapshots/st-sign_asset_transfer/00000.png differ diff --git a/tests_zemu/snapshots/st-sign_keyreg/00000.png b/tests_zemu/snapshots/st-sign_keyreg/00000.png index a860853..c87e48f 100644 Binary files a/tests_zemu/snapshots/st-sign_keyreg/00000.png and b/tests_zemu/snapshots/st-sign_keyreg/00000.png differ diff --git a/tests_zemu/snapshots/st-sign_payment/00000.png b/tests_zemu/snapshots/st-sign_payment/00000.png index c5b9ee1..6e1522b 100644 Binary files a/tests_zemu/snapshots/st-sign_payment/00000.png and b/tests_zemu/snapshots/st-sign_payment/00000.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00005.png b/tests_zemu/snapshots/x-mainmenu/00005.png index 9ee988e..89611be 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00005.png and b/tests_zemu/snapshots/x-mainmenu/00005.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png index 9ee988e..89611be 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00011.png and b/tests_zemu/snapshots/x-mainmenu/00011.png differ