diff --git a/CHANGELOG.md b/CHANGELOG.md index 5843b37f..9c78e3b4 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 5d012402..61ac071b 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 758d43dd..944fc598 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 2066a7ba..d12fc0f8 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 b824ee50..4f058ca8 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 075ca11e..63bc86a7 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 c99cda9c..fcc4b516 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 075ca11e..63bc86a7 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 27b70e05..31f73a33 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 876e018f..3a5a4a3c 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 b824ee50..4f058ca8 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 f9bc6495..c4626106 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 1775cfc5..c5839c6f 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 f9bc6495..c4626106 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 409120c8..2d1fde1e 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 876e018f..3a5a4a3c 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 60911aed..4bb060d5 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 146a5f57..881c3640 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 5dfb8a9b..e8e0658c 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 0e3eac5c..8d0f73ab 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 a074d01a..688401ee 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 224e7fdf..fe01a441 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 c4ba4822..74a8cafb 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 ab2a5889..a1359530 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 d7e39756..b42e190b 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 3aa67551..fa8f0f63 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 b1a8fd91..e1237d40 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 b1a8fd91..e1237d40 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 62047757..dfd2f4d2 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 bac1f06c..cc95274e 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 a074d01a..688401ee 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 224e7fdf..fe01a441 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 c4ba4822..74a8cafb 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 ab2a5889..a1359530 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 d7e39756..b42e190b 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 3aa67551..fa8f0f63 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 b1a8fd91..e1237d40 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 b1a8fd91..e1237d40 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 62047757..dfd2f4d2 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 bac1f06c..cc95274e 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 ef48b90a..84a859d2 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 b331e020..799e6dc6 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 4380f090..4ad78833 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 b331e020..799e6dc6 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 3a3a98e2..645bb18e 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 3f906b2b..7a494786 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 02f4af83..a289fd78 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 ef48b90a..84a859d2 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 e6bce053..0e730e03 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 ce343464..4d825e5c 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 e6bce053..0e730e03 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 58f51b54..90b9ba11 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 3f906b2b..7a494786 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 02f4af83..a289fd78 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 b77c0a4d..6216e52b 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 cfb99420..74093531 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 5e2de951..d54acf63 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 b802c1cc..31b251ed 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 bc5b2d0e..36231674 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 17d0bfba..3d4e8d6b 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 f1e88e79..0e940642 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