Merge pull request #140 from iartemov-ledger/stax_flex_test_fix

Code base and tests adjustment to API_LEVEL_22 Ledger SDK
LedgerHQ · Jan 7, 2025 · 7abd9c6 · 7abd9c6
2 parents 3318347 + b554087
commit 7abd9c6
Show file tree

Hide file tree

Showing 61 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/tests/snapshots/flex/test_display_address/00001.png b/tests/snapshots/flex/test_display_address/00001.png
diff --git a/tests/snapshots/flex/test_display_address/00002.png b/tests/snapshots/flex/test_display_address/00002.png
diff --git a/tests/snapshots/flex/test_display_address/00003.png b/tests/snapshots/flex/test_display_address/00003.png
diff --git a/tests/snapshots/flex/test_display_address/00004.png b/tests/snapshots/flex/test_display_address/00004.png
diff --git a/tests/snapshots/flex/test_display_address/00006.png b/tests/snapshots/flex/test_display_address/00006.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00000.png b/tests/snapshots/flex/test_display_subaddress/00000.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00001.png b/tests/snapshots/flex/test_display_subaddress/00001.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00002.png b/tests/snapshots/flex/test_display_subaddress/00002.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00003.png b/tests/snapshots/flex/test_display_subaddress/00003.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00004.png b/tests/snapshots/flex/test_display_subaddress/00004.png
diff --git a/tests/snapshots/flex/test_display_subaddress/00006.png b/tests/snapshots/flex/test_display_subaddress/00006.png
diff --git a/tests/snapshots/flex/test_prefix_hash_hash_init/00000.png b/tests/snapshots/flex/test_prefix_hash_hash_init/00000.png
diff --git a/tests/snapshots/flex/test_private_view_key/00000.png b/tests/snapshots/flex/test_private_view_key/00000.png
diff --git a/tests/snapshots/flex/test_validate_prehash_update/00001.png b/tests/snapshots/flex/test_validate_prehash_update/00001.png
diff --git a/tests/snapshots/flex/test_validate_prehash_update/00002.png b/tests/snapshots/flex/test_validate_prehash_update/00002.png
diff --git a/tests/snapshots/nanosp/test_display_address/00001.png b/tests/snapshots/nanosp/test_display_address/00001.png
diff --git a/tests/snapshots/nanosp/test_display_address/00002.png b/tests/snapshots/nanosp/test_display_address/00002.png
diff --git a/tests/snapshots/nanosp/test_display_address/00003.png b/tests/snapshots/nanosp/test_display_address/00003.png
diff --git a/tests/snapshots/nanosp/test_display_subaddress/00001.png b/tests/snapshots/nanosp/test_display_subaddress/00001.png
diff --git a/tests/snapshots/nanosp/test_display_subaddress/00002.png b/tests/snapshots/nanosp/test_display_subaddress/00002.png
diff --git a/tests/snapshots/nanosp/test_display_subaddress/00003.png b/tests/snapshots/nanosp/test_display_subaddress/00003.png
diff --git a/tests/snapshots/nanosp/test_prefix_hash_hash_init/00002.png b/tests/snapshots/nanosp/test_prefix_hash_hash_init/00002.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_init/00002.png b/tests/snapshots/nanosp/test_validate_prehash_init/00002.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_update/00001.png b/tests/snapshots/nanosp/test_validate_prehash_update/00001.png
diff --git a/tests/snapshots/nanosp/test_validate_prehash_update/00002.png b/tests/snapshots/nanosp/test_validate_prehash_update/00002.png
diff --git a/tests/snapshots/nanox/test_display_address/00001.png b/tests/snapshots/nanox/test_display_address/00001.png
diff --git a/tests/snapshots/nanox/test_display_address/00002.png b/tests/snapshots/nanox/test_display_address/00002.png
diff --git a/tests/snapshots/nanox/test_display_address/00003.png b/tests/snapshots/nanox/test_display_address/00003.png
diff --git a/tests/snapshots/nanox/test_display_subaddress/00001.png b/tests/snapshots/nanox/test_display_subaddress/00001.png
diff --git a/tests/snapshots/nanox/test_display_subaddress/00002.png b/tests/snapshots/nanox/test_display_subaddress/00002.png
diff --git a/tests/snapshots/nanox/test_display_subaddress/00003.png b/tests/snapshots/nanox/test_display_subaddress/00003.png
diff --git a/tests/snapshots/nanox/test_prefix_hash_hash_init/00002.png b/tests/snapshots/nanox/test_prefix_hash_hash_init/00002.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_init/00002.png b/tests/snapshots/nanox/test_validate_prehash_init/00002.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_update/00001.png b/tests/snapshots/nanox/test_validate_prehash_update/00001.png
diff --git a/tests/snapshots/nanox/test_validate_prehash_update/00002.png b/tests/snapshots/nanox/test_validate_prehash_update/00002.png
diff --git a/tests/snapshots/stax/test_display_address/00000.png b/tests/snapshots/stax/test_display_address/00000.png
diff --git a/tests/snapshots/stax/test_display_address/00001.png b/tests/snapshots/stax/test_display_address/00001.png
diff --git a/tests/snapshots/stax/test_display_address/00002.png b/tests/snapshots/stax/test_display_address/00002.png
diff --git a/tests/snapshots/stax/test_display_address/00003.png b/tests/snapshots/stax/test_display_address/00003.png
diff --git a/tests/snapshots/stax/test_display_address/00004.png b/tests/snapshots/stax/test_display_address/00004.png
diff --git a/tests/snapshots/stax/test_display_address/00005.png b/tests/snapshots/stax/test_display_address/00005.png
diff --git a/tests/snapshots/stax/test_display_address/00006.png b/tests/snapshots/stax/test_display_address/00006.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00000.png b/tests/snapshots/stax/test_display_subaddress/00000.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00001.png b/tests/snapshots/stax/test_display_subaddress/00001.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00002.png b/tests/snapshots/stax/test_display_subaddress/00002.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00003.png b/tests/snapshots/stax/test_display_subaddress/00003.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00004.png b/tests/snapshots/stax/test_display_subaddress/00004.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00005.png b/tests/snapshots/stax/test_display_subaddress/00005.png
diff --git a/tests/snapshots/stax/test_display_subaddress/00006.png b/tests/snapshots/stax/test_display_subaddress/00006.png
diff --git a/tests/snapshots/stax/test_prefix_hash_hash_init/00000.png b/tests/snapshots/stax/test_prefix_hash_hash_init/00000.png
diff --git a/tests/snapshots/stax/test_prefix_hash_hash_init/00001.png b/tests/snapshots/stax/test_prefix_hash_hash_init/00001.png
diff --git a/tests/snapshots/stax/test_private_view_key/00000.png b/tests/snapshots/stax/test_private_view_key/00000.png
diff --git a/tests/snapshots/stax/test_private_view_key/00001.png b/tests/snapshots/stax/test_private_view_key/00001.png
diff --git a/tests/snapshots/stax/test_validate_prehash_update/00000.png b/tests/snapshots/stax/test_validate_prehash_update/00000.png
diff --git a/tests/snapshots/stax/test_validate_prehash_update/00001.png b/tests/snapshots/stax/test_validate_prehash_update/00001.png
diff --git a/tests/snapshots/stax/test_validate_prehash_update/00002.png b/tests/snapshots/stax/test_validate_prehash_update/00002.png