diff --git a/CHANGELOG.md b/CHANGELOG.md index 5843b37..9c78e3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 2.0.1 - 2025-01-02 + +- Update to Ledger SDK API_LEVEL_22, deprecated API replacement + ## 2.0.0 - 2024-05-01 - Support of Flex device diff --git a/Makefile b/Makefile index 5d01240..61ac071 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #******************************************************************************* # Ledger App Monero -# (c) 2023 Ledger SAS. -# +# (c) 2023-2025 Ledger SAS. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -29,7 +29,7 @@ APPNAME = "Monero" # Application version APPVERSION_M = 2 APPVERSION_N = 0 -APPVERSION_P = 0 +APPVERSION_P = 1 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)" SPECVERSION = "1.0" diff --git a/src/monero_ux_nbgl_menu.c b/src/monero_ux_nbgl_menu.c index 758d43d..944fc59 100644 --- a/src/monero_ux_nbgl_menu.c +++ b/src/monero_ux_nbgl_menu.c @@ -34,7 +34,6 @@ #define PAGE_START 0 #define NB_PAGE_SETTING 3 -#define IS_TOUCHABLE true void __attribute__((noreturn)) app_exit(void); @@ -201,12 +200,14 @@ static void settings_control_cb(int token, uint8_t index, int page) { UNUSED(page); switch (token) { case ACCOUNT_TOKEN: - nbgl_useCaseSettings("Select account", 0, 3, IS_TOUCHABLE, display_settings_menu, - account_settings_navigation_cb, account_settings_control_cb); + nbgl_useCaseNavigableContent("Select account", 0, 3, display_settings_menu, + account_settings_navigation_cb, + account_settings_control_cb); break; case NETWORK_TOKEN: - nbgl_useCaseSettings("Select network", 0, 2, IS_TOUCHABLE, display_settings_menu, - network_settings_navigation_cb, network_settings_control_cb); + nbgl_useCaseNavigableContent("Select network", 0, 2, display_settings_menu, + network_settings_navigation_cb, + network_settings_control_cb); break; case RESET_TOKEN: nbgl_useCaseConfirm("Reset account\ninformations ?", "", "Yes, Reset", "Go back", diff --git a/tests/monero_client/monero_crypto_cmd.py b/tests/monero_client/monero_crypto_cmd.py index 2066a7b..d12fc0f 100644 --- a/tests/monero_client/monero_crypto_cmd.py +++ b/tests/monero_client/monero_crypto_cmd.py @@ -121,7 +121,7 @@ def display_address(self, test_name, firmware, navigator, derivation: bytes, out else: instructions = [ NavIns(NavInsID.SWIPE_CENTER_TO_LEFT), - NavIns(NavInsID.TOUCH, (200, 350 if firmware.device.startswith("flex") else 410)), + NavIns(NavInsID.TOUCH, (200, 350 if firmware.device.startswith("flex") else 375)), NavIns(NavInsID.USE_CASE_ADDRESS_CONFIRMATION_EXIT_QR), NavIns(NavInsID.SWIPE_CENTER_TO_LEFT), NavIns(NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM), diff --git a/tests/snapshots/flex/test_display_address/00000.png b/tests/snapshots/flex/test_display_address/00000.png index b824ee5..4f058ca 100644 Binary files a/tests/snapshots/flex/test_display_address/00000.png and b/tests/snapshots/flex/test_display_address/00000.png differ diff --git a/tests/snapshots/flex/test_display_address/00001.png b/tests/snapshots/flex/test_display_address/00001.png index 075ca11..63bc86a 100644 Binary files a/tests/snapshots/flex/test_display_address/00001.png and b/tests/snapshots/flex/test_display_address/00001.png differ diff --git a/tests/snapshots/flex/test_display_address/00002.png b/tests/snapshots/flex/test_display_address/00002.png index c99cda9..fcc4b51 100644 Binary files a/tests/snapshots/flex/test_display_address/00002.png and b/tests/snapshots/flex/test_display_address/00002.png differ diff --git a/tests/snapshots/flex/test_display_address/00003.png b/tests/snapshots/flex/test_display_address/00003.png index 075ca11..63bc86a 100644 Binary files a/tests/snapshots/flex/test_display_address/00003.png and b/tests/snapshots/flex/test_display_address/00003.png differ diff --git a/tests/snapshots/flex/test_display_address/00004.png b/tests/snapshots/flex/test_display_address/00004.png index 27b70e0..31f73a3 100644 Binary files a/tests/snapshots/flex/test_display_address/00004.png and b/tests/snapshots/flex/test_display_address/00004.png differ diff --git a/tests/snapshots/flex/test_display_address/00006.png b/tests/snapshots/flex/test_display_address/00006.png index 876e018..3a5a4a3 100644 Binary files a/tests/snapshots/flex/test_display_address/00006.png and b/tests/snapshots/flex/test_display_address/00006.png differ diff --git a/tests/snapshots/flex/test_display_subaddress/00000.png b/tests/snapshots/flex/test_display_subaddress/00000.png index b824ee5..4f058ca 100644 Binary files a/tests/snapshots/flex/test_display_subaddress/00000.png and b/tests/snapshots/flex/test_display_subaddress/00000.png differ diff --git a/tests/snapshots/flex/test_display_subaddress/00001.png b/tests/snapshots/flex/test_display_subaddress/00001.png index f9bc649..c462610 100644 Binary files a/tests/snapshots/flex/test_display_subaddress/00001.png and b/tests/snapshots/flex/test_display_subaddress/00001.png differ diff --git a/tests/snapshots/flex/test_display_subaddress/00002.png b/tests/snapshots/flex/test_display_subaddress/00002.png index 1775cfc..c5839c6 100644 Binary files a/tests/snapshots/flex/test_display_subaddress/00002.png and b/tests/snapshots/flex/test_display_subaddress/00002.png differ diff --git a/tests/snapshots/flex/test_display_subaddress/00003.png b/tests/snapshots/flex/test_display_subaddress/00003.png index f9bc649..c462610 100644 Binary files a/tests/snapshots/flex/test_display_subaddress/00003.png and b/tests/snapshots/flex/test_display_subaddress/00003.png differ diff --git a/tests/snapshots/flex/test_display_subaddress/00004.png b/tests/snapshots/flex/test_display_subaddress/00004.png index 409120c..2d1fde1 100644 Binary files a/tests/snapshots/flex/test_display_subaddress/00004.png and b/tests/snapshots/flex/test_display_subaddress/00004.png differ diff --git a/tests/snapshots/flex/test_display_subaddress/00006.png b/tests/snapshots/flex/test_display_subaddress/00006.png index 876e018..3a5a4a3 100644 Binary files a/tests/snapshots/flex/test_display_subaddress/00006.png and b/tests/snapshots/flex/test_display_subaddress/00006.png differ diff --git a/tests/snapshots/flex/test_prefix_hash_hash_init/00000.png b/tests/snapshots/flex/test_prefix_hash_hash_init/00000.png index 60911ae..4bb060d 100644 Binary files a/tests/snapshots/flex/test_prefix_hash_hash_init/00000.png and b/tests/snapshots/flex/test_prefix_hash_hash_init/00000.png differ diff --git a/tests/snapshots/flex/test_private_view_key/00000.png b/tests/snapshots/flex/test_private_view_key/00000.png index 146a5f5..881c364 100644 Binary files a/tests/snapshots/flex/test_private_view_key/00000.png and b/tests/snapshots/flex/test_private_view_key/00000.png differ diff --git a/tests/snapshots/flex/test_validate_prehash_update/00001.png b/tests/snapshots/flex/test_validate_prehash_update/00001.png index 5dfb8a9..e8e0658 100644 Binary files a/tests/snapshots/flex/test_validate_prehash_update/00001.png and b/tests/snapshots/flex/test_validate_prehash_update/00001.png differ diff --git a/tests/snapshots/flex/test_validate_prehash_update/00002.png b/tests/snapshots/flex/test_validate_prehash_update/00002.png index 0e3eac5..8d0f73a 100644 Binary files a/tests/snapshots/flex/test_validate_prehash_update/00002.png and b/tests/snapshots/flex/test_validate_prehash_update/00002.png differ diff --git a/tests/snapshots/nanosp/test_display_address/00001.png b/tests/snapshots/nanosp/test_display_address/00001.png index a074d01..688401e 100644 Binary files a/tests/snapshots/nanosp/test_display_address/00001.png and b/tests/snapshots/nanosp/test_display_address/00001.png differ diff --git a/tests/snapshots/nanosp/test_display_address/00002.png b/tests/snapshots/nanosp/test_display_address/00002.png index 224e7fd..fe01a44 100644 Binary files a/tests/snapshots/nanosp/test_display_address/00002.png and b/tests/snapshots/nanosp/test_display_address/00002.png differ diff --git a/tests/snapshots/nanosp/test_display_address/00003.png b/tests/snapshots/nanosp/test_display_address/00003.png index c4ba482..74a8caf 100644 Binary files a/tests/snapshots/nanosp/test_display_address/00003.png and b/tests/snapshots/nanosp/test_display_address/00003.png differ diff --git a/tests/snapshots/nanosp/test_display_subaddress/00001.png b/tests/snapshots/nanosp/test_display_subaddress/00001.png index ab2a588..a135953 100644 Binary files a/tests/snapshots/nanosp/test_display_subaddress/00001.png and b/tests/snapshots/nanosp/test_display_subaddress/00001.png differ diff --git a/tests/snapshots/nanosp/test_display_subaddress/00002.png b/tests/snapshots/nanosp/test_display_subaddress/00002.png index d7e3975..b42e190 100644 Binary files a/tests/snapshots/nanosp/test_display_subaddress/00002.png and b/tests/snapshots/nanosp/test_display_subaddress/00002.png differ diff --git a/tests/snapshots/nanosp/test_display_subaddress/00003.png b/tests/snapshots/nanosp/test_display_subaddress/00003.png index 3aa6755..fa8f0f6 100644 Binary files a/tests/snapshots/nanosp/test_display_subaddress/00003.png and b/tests/snapshots/nanosp/test_display_subaddress/00003.png differ diff --git a/tests/snapshots/nanosp/test_prefix_hash_hash_init/00002.png b/tests/snapshots/nanosp/test_prefix_hash_hash_init/00002.png index b1a8fd9..e1237d4 100644 Binary files a/tests/snapshots/nanosp/test_prefix_hash_hash_init/00002.png and b/tests/snapshots/nanosp/test_prefix_hash_hash_init/00002.png differ diff --git a/tests/snapshots/nanosp/test_validate_prehash_init/00002.png b/tests/snapshots/nanosp/test_validate_prehash_init/00002.png index b1a8fd9..e1237d4 100644 Binary files a/tests/snapshots/nanosp/test_validate_prehash_init/00002.png and b/tests/snapshots/nanosp/test_validate_prehash_init/00002.png differ diff --git a/tests/snapshots/nanosp/test_validate_prehash_update/00001.png b/tests/snapshots/nanosp/test_validate_prehash_update/00001.png index 6204775..dfd2f4d 100644 Binary files a/tests/snapshots/nanosp/test_validate_prehash_update/00001.png and b/tests/snapshots/nanosp/test_validate_prehash_update/00001.png differ diff --git a/tests/snapshots/nanosp/test_validate_prehash_update/00002.png b/tests/snapshots/nanosp/test_validate_prehash_update/00002.png index bac1f06..cc95274 100644 Binary files a/tests/snapshots/nanosp/test_validate_prehash_update/00002.png and b/tests/snapshots/nanosp/test_validate_prehash_update/00002.png differ diff --git a/tests/snapshots/nanox/test_display_address/00001.png b/tests/snapshots/nanox/test_display_address/00001.png index a074d01..688401e 100644 Binary files a/tests/snapshots/nanox/test_display_address/00001.png and b/tests/snapshots/nanox/test_display_address/00001.png differ diff --git a/tests/snapshots/nanox/test_display_address/00002.png b/tests/snapshots/nanox/test_display_address/00002.png index 224e7fd..fe01a44 100644 Binary files a/tests/snapshots/nanox/test_display_address/00002.png and b/tests/snapshots/nanox/test_display_address/00002.png differ diff --git a/tests/snapshots/nanox/test_display_address/00003.png b/tests/snapshots/nanox/test_display_address/00003.png index c4ba482..74a8caf 100644 Binary files a/tests/snapshots/nanox/test_display_address/00003.png and b/tests/snapshots/nanox/test_display_address/00003.png differ diff --git a/tests/snapshots/nanox/test_display_subaddress/00001.png b/tests/snapshots/nanox/test_display_subaddress/00001.png index ab2a588..a135953 100644 Binary files a/tests/snapshots/nanox/test_display_subaddress/00001.png and b/tests/snapshots/nanox/test_display_subaddress/00001.png differ diff --git a/tests/snapshots/nanox/test_display_subaddress/00002.png b/tests/snapshots/nanox/test_display_subaddress/00002.png index d7e3975..b42e190 100644 Binary files a/tests/snapshots/nanox/test_display_subaddress/00002.png and b/tests/snapshots/nanox/test_display_subaddress/00002.png differ diff --git a/tests/snapshots/nanox/test_display_subaddress/00003.png b/tests/snapshots/nanox/test_display_subaddress/00003.png index 3aa6755..fa8f0f6 100644 Binary files a/tests/snapshots/nanox/test_display_subaddress/00003.png and b/tests/snapshots/nanox/test_display_subaddress/00003.png differ diff --git a/tests/snapshots/nanox/test_prefix_hash_hash_init/00002.png b/tests/snapshots/nanox/test_prefix_hash_hash_init/00002.png index b1a8fd9..e1237d4 100644 Binary files a/tests/snapshots/nanox/test_prefix_hash_hash_init/00002.png and b/tests/snapshots/nanox/test_prefix_hash_hash_init/00002.png differ diff --git a/tests/snapshots/nanox/test_validate_prehash_init/00002.png b/tests/snapshots/nanox/test_validate_prehash_init/00002.png index b1a8fd9..e1237d4 100644 Binary files a/tests/snapshots/nanox/test_validate_prehash_init/00002.png and b/tests/snapshots/nanox/test_validate_prehash_init/00002.png differ diff --git a/tests/snapshots/nanox/test_validate_prehash_update/00001.png b/tests/snapshots/nanox/test_validate_prehash_update/00001.png index 6204775..dfd2f4d 100644 Binary files a/tests/snapshots/nanox/test_validate_prehash_update/00001.png and b/tests/snapshots/nanox/test_validate_prehash_update/00001.png differ diff --git a/tests/snapshots/nanox/test_validate_prehash_update/00002.png b/tests/snapshots/nanox/test_validate_prehash_update/00002.png index bac1f06..cc95274 100644 Binary files a/tests/snapshots/nanox/test_validate_prehash_update/00002.png and b/tests/snapshots/nanox/test_validate_prehash_update/00002.png differ diff --git a/tests/snapshots/stax/test_display_address/00000.png b/tests/snapshots/stax/test_display_address/00000.png index ef48b90..84a859d 100644 Binary files a/tests/snapshots/stax/test_display_address/00000.png and b/tests/snapshots/stax/test_display_address/00000.png differ diff --git a/tests/snapshots/stax/test_display_address/00001.png b/tests/snapshots/stax/test_display_address/00001.png index b331e02..799e6dc 100644 Binary files a/tests/snapshots/stax/test_display_address/00001.png and b/tests/snapshots/stax/test_display_address/00001.png differ diff --git a/tests/snapshots/stax/test_display_address/00002.png b/tests/snapshots/stax/test_display_address/00002.png index 4380f09..4ad7883 100644 Binary files a/tests/snapshots/stax/test_display_address/00002.png and b/tests/snapshots/stax/test_display_address/00002.png differ diff --git a/tests/snapshots/stax/test_display_address/00003.png b/tests/snapshots/stax/test_display_address/00003.png index b331e02..799e6dc 100644 Binary files a/tests/snapshots/stax/test_display_address/00003.png and b/tests/snapshots/stax/test_display_address/00003.png differ diff --git a/tests/snapshots/stax/test_display_address/00004.png b/tests/snapshots/stax/test_display_address/00004.png index 3a3a98e..645bb18 100644 Binary files a/tests/snapshots/stax/test_display_address/00004.png and b/tests/snapshots/stax/test_display_address/00004.png differ diff --git a/tests/snapshots/stax/test_display_address/00005.png b/tests/snapshots/stax/test_display_address/00005.png index 3f906b2..7a49478 100644 Binary files a/tests/snapshots/stax/test_display_address/00005.png and b/tests/snapshots/stax/test_display_address/00005.png differ diff --git a/tests/snapshots/stax/test_display_address/00006.png b/tests/snapshots/stax/test_display_address/00006.png index 02f4af8..a289fd7 100644 Binary files a/tests/snapshots/stax/test_display_address/00006.png and b/tests/snapshots/stax/test_display_address/00006.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00000.png b/tests/snapshots/stax/test_display_subaddress/00000.png index ef48b90..84a859d 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00000.png and b/tests/snapshots/stax/test_display_subaddress/00000.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00001.png b/tests/snapshots/stax/test_display_subaddress/00001.png index e6bce05..0e730e0 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00001.png and b/tests/snapshots/stax/test_display_subaddress/00001.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00002.png b/tests/snapshots/stax/test_display_subaddress/00002.png index ce34346..4d825e5 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00002.png and b/tests/snapshots/stax/test_display_subaddress/00002.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00003.png b/tests/snapshots/stax/test_display_subaddress/00003.png index e6bce05..0e730e0 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00003.png and b/tests/snapshots/stax/test_display_subaddress/00003.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00004.png b/tests/snapshots/stax/test_display_subaddress/00004.png index 58f51b5..90b9ba1 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00004.png and b/tests/snapshots/stax/test_display_subaddress/00004.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00005.png b/tests/snapshots/stax/test_display_subaddress/00005.png index 3f906b2..7a49478 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00005.png and b/tests/snapshots/stax/test_display_subaddress/00005.png differ diff --git a/tests/snapshots/stax/test_display_subaddress/00006.png b/tests/snapshots/stax/test_display_subaddress/00006.png index 02f4af8..a289fd7 100644 Binary files a/tests/snapshots/stax/test_display_subaddress/00006.png and b/tests/snapshots/stax/test_display_subaddress/00006.png differ diff --git a/tests/snapshots/stax/test_prefix_hash_hash_init/00000.png b/tests/snapshots/stax/test_prefix_hash_hash_init/00000.png index b77c0a4..6216e52 100644 Binary files a/tests/snapshots/stax/test_prefix_hash_hash_init/00000.png and b/tests/snapshots/stax/test_prefix_hash_hash_init/00000.png differ diff --git a/tests/snapshots/stax/test_prefix_hash_hash_init/00001.png b/tests/snapshots/stax/test_prefix_hash_hash_init/00001.png index cfb9942..7409353 100644 Binary files a/tests/snapshots/stax/test_prefix_hash_hash_init/00001.png and b/tests/snapshots/stax/test_prefix_hash_hash_init/00001.png differ diff --git a/tests/snapshots/stax/test_private_view_key/00000.png b/tests/snapshots/stax/test_private_view_key/00000.png index 5e2de95..d54acf6 100644 Binary files a/tests/snapshots/stax/test_private_view_key/00000.png and b/tests/snapshots/stax/test_private_view_key/00000.png differ diff --git a/tests/snapshots/stax/test_private_view_key/00001.png b/tests/snapshots/stax/test_private_view_key/00001.png index b802c1c..31b251e 100644 Binary files a/tests/snapshots/stax/test_private_view_key/00001.png and b/tests/snapshots/stax/test_private_view_key/00001.png differ diff --git a/tests/snapshots/stax/test_validate_prehash_update/00000.png b/tests/snapshots/stax/test_validate_prehash_update/00000.png index bc5b2d0..3623167 100644 Binary files a/tests/snapshots/stax/test_validate_prehash_update/00000.png and b/tests/snapshots/stax/test_validate_prehash_update/00000.png differ diff --git a/tests/snapshots/stax/test_validate_prehash_update/00001.png b/tests/snapshots/stax/test_validate_prehash_update/00001.png index 17d0bfb..3d4e8d6 100644 Binary files a/tests/snapshots/stax/test_validate_prehash_update/00001.png and b/tests/snapshots/stax/test_validate_prehash_update/00001.png differ diff --git a/tests/snapshots/stax/test_validate_prehash_update/00002.png b/tests/snapshots/stax/test_validate_prehash_update/00002.png index f1e88e7..0e94064 100644 Binary files a/tests/snapshots/stax/test_validate_prehash_update/00002.png and b/tests/snapshots/stax/test_validate_prehash_update/00002.png differ