Merge pull request #6 from SiaFoundation/ledger-pr (B2CA-1262)

Misc. Fixes
SiaFoundation · Jul 18, 2024 · 8895e0c · 8895e0c
2 parents 7b1b096 + f7af6a1
commit 8895e0c
Show file tree

Hide file tree

Showing 43 changed files with 22 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -38,10 +38,10 @@ APP_SOURCE_PATH += src
 
 # Application icons following guidelines:
 # https://developers.ledger.com/docs/embedded-app/design-requirements/#device-icon
-ICON_NANOS = nanos_app_sia.gif
-ICON_NANOX = nanox_app_sia.gif
-ICON_NANOSP = nanos2_app_sia.gif
-ICON_STAX = stax_app_sia_big.gif
+ICON_NANOS = icons/nanos_app_sia.gif
+ICON_NANOX = icons/nanox_app_sia.gif
+ICON_NANOSP = icons/nanos2_app_sia.gif
+ICON_STAX = icons/stax_app_sia.gif
 
 # Application allowed derivation curves.
 # Possibles curves are: secp256k1, secp256r1, ed25519 and bls12381g1

diff --git a/stax_app_sia_big.gif → glyphs/stax_app_sia_big.gif b/stax_app_sia_big.gif → glyphs/stax_app_sia_big.gif
diff --git a/icons/nanos2_app_sia.gif b/icons/nanos2_app_sia.gif
diff --git a/nanos_app_sia.gif → icons/nanos_app_sia.gif b/nanos_app_sia.gif → icons/nanos_app_sia.gif
diff --git a/nanox_app_sia.gif → icons/nanox_app_sia.gif b/nanox_app_sia.gif → icons/nanox_app_sia.gif
diff --git a/stax_app_sia.gif → icons/stax_app_sia.gif b/stax_app_sia.gif → icons/stax_app_sia.gif
diff --git a/ledger_app.toml b/ledger_app.toml
@@ -1,4 +1,7 @@
 [app]
 build_directory = "./"
 sdk = "C"
-devices = ["nanos", "nanox", "nanos+"]
+devices = ["nanos", "nanox", "nanos+", "stax"]
+
+[tests]
+pytest_directory = "./tests/"
diff --git a/nanos2_app_sia.gif b/nanos2_app_sia.gif
diff --git a/src/sia_ux.h b/src/sia_ux.h
@@ -3,6 +3,7 @@
 
 #include <ux.h>
 #include "txn.h"
+#include "glyphs.h"
 
 #ifdef HAVE_NBGL
 #include <nbgl_use_case.h>

diff --git a/tests/snapshots/stax/test_app_mainmenu/00000.png b/tests/snapshots/stax/test_app_mainmenu/00000.png
diff --git a/tests/snapshots/stax/test_app_mainmenu/00001.png b/tests/snapshots/stax/test_app_mainmenu/00001.png
diff --git a/tests/snapshots/stax/test_app_mainmenu/00002.png b/tests/snapshots/stax/test_app_mainmenu/00002.png
diff --git a/tests/snapshots/stax/test_app_mainmenu/00003.png b/tests/snapshots/stax/test_app_mainmenu/00003.png
diff --git a/tests/snapshots/stax/test_get_address_confirm_accepted/00000.png b/tests/snapshots/stax/test_get_address_confirm_accepted/00000.png
diff --git a/tests/snapshots/stax/test_get_address_confirm_accepted/00001.png b/tests/snapshots/stax/test_get_address_confirm_accepted/00001.png
diff --git a/tests/snapshots/stax/test_get_address_confirm_accepted/00002.png b/tests/snapshots/stax/test_get_address_confirm_accepted/00002.png
diff --git a/tests/snapshots/stax/test_get_address_confirm_refused/00000.png b/tests/snapshots/stax/test_get_address_confirm_refused/00000.png
diff --git a/tests/snapshots/stax/test_get_address_confirm_refused/00001.png b/tests/snapshots/stax/test_get_address_confirm_refused/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00000.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00001.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00002.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_accepted/00003.png b/tests/snapshots/stax/test_get_public_key_confirm_accepted/00003.png
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_refused/00000.png b/tests/snapshots/stax/test_get_public_key_confirm_refused/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_confirm_refused/00001.png b/tests/snapshots/stax/test_get_public_key_confirm_refused/00001.png
diff --git a/tests/snapshots/stax/test_sign_hash_accept/00000.png b/tests/snapshots/stax/test_sign_hash_accept/00000.png
diff --git a/tests/snapshots/stax/test_sign_hash_accept/00001.png b/tests/snapshots/stax/test_sign_hash_accept/00001.png
diff --git a/tests/snapshots/stax/test_sign_hash_accept/00002.png b/tests/snapshots/stax/test_sign_hash_accept/00002.png
diff --git a/tests/snapshots/stax/test_sign_hash_accept/00003.png b/tests/snapshots/stax/test_sign_hash_accept/00003.png
diff --git a/tests/snapshots/stax/test_sign_hash_reject/00000.png b/tests/snapshots/stax/test_sign_hash_reject/00000.png
diff --git a/tests/snapshots/stax/test_sign_hash_reject/00001.png b/tests/snapshots/stax/test_sign_hash_reject/00001.png
diff --git a/tests/snapshots/stax/test_sign_hash_reject/00002.png b/tests/snapshots/stax/test_sign_hash_reject/00002.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00000.png b/tests/snapshots/stax/test_sign_tx_accept/00000.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00001.png b/tests/snapshots/stax/test_sign_tx_accept/00001.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00002.png b/tests/snapshots/stax/test_sign_tx_accept/00002.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00003.png b/tests/snapshots/stax/test_sign_tx_accept/00003.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00004.png b/tests/snapshots/stax/test_sign_tx_accept/00004.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00005.png b/tests/snapshots/stax/test_sign_tx_accept/00005.png
diff --git a/tests/snapshots/stax/test_sign_tx_accept/00006.png b/tests/snapshots/stax/test_sign_tx_accept/00006.png
diff --git a/tests/snapshots/stax/test_sign_tx_refused/00000.png b/tests/snapshots/stax/test_sign_tx_refused/00000.png
diff --git a/tests/snapshots/stax/test_sign_tx_refused/00001.png b/tests/snapshots/stax/test_sign_tx_refused/00001.png
diff --git a/tests/test_pubkey_cmd.py b/tests/test_pubkey_cmd.py
@@ -26,7 +26,7 @@ def test_get_public_key_confirm_accepted(firmware, backend, navigator, test_name
             )
         else:
             instructions = [
-                NavInsID.USE_CASE_REVIEW_TAP,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
                 NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM,
             ]
             navigator.navigate_and_compare(
@@ -59,7 +59,7 @@ def test_get_public_key_confirm_refused(firmware, backend, navigator, test_name)
             )
         else:
             navigator.navigate_and_compare(
-                ROOT_SCREENSHOT_PATH, test_name, [NavInsID.USE_CASE_REVIEW_REJECT]
+                ROOT_SCREENSHOT_PATH, test_name, [NavInsID.USE_CASE_VIEW_DETAILS_EXIT]
             )
 
     response = client.get_async_response()
@@ -84,7 +84,7 @@ def test_get_address_confirm_accepted(firmware, backend, navigator, test_name):
             )
         else:
             instructions = [
-                NavInsID.USE_CASE_REVIEW_TAP,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
                 NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM,
             ]
             navigator.navigate_and_compare(
@@ -117,7 +117,7 @@ def test_get_address_confirm_refused(firmware, backend, navigator, test_name):
             )
         else:
             navigator.navigate_and_compare(
-                ROOT_SCREENSHOT_PATH, test_name, [NavInsID.USE_CASE_REVIEW_REJECT]
+                ROOT_SCREENSHOT_PATH, test_name, [NavInsID.USE_CASE_VIEW_DETAILS_EXIT]
             )
 
     response = client.get_async_response()

diff --git a/tests/test_sign_hash_cmd.py b/tests/test_sign_hash_cmd.py
@@ -49,8 +49,8 @@ def test_sign_hash_accept(firmware, backend, navigator, test_name):
             )
         else:
             instructions = [
-                NavInsID.USE_CASE_REVIEW_TAP,
-                NavInsID.USE_CASE_REVIEW_TAP,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
                 NavInsID.USE_CASE_REVIEW_CONFIRM,
             ]
             navigator.navigate_and_compare(
@@ -99,7 +99,7 @@ def test_sign_hash_reject(firmware, backend, navigator, test_name):
         else:
             navigator.navigate_and_compare(
                 ROOT_SCREENSHOT_PATH, test_name, [
-                    NavInsID.USE_CASE_REVIEW_REJECT,
+                    NavInsID.USE_CASE_VIEW_DETAILS_EXIT,
                     NavInsID.USE_CASE_CHOICE_CONFIRM,
                 ]
             )

diff --git a/tests/test_sign_txn_cmd.py b/tests/test_sign_txn_cmd.py
@@ -72,7 +72,7 @@ def test_sign_tx_refused(firmware, backend, navigator, test_name):
             ])
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH, test_name, instructions)
         else:
-            navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH, test_name, [NavInsID.USE_CASE_REVIEW_REJECT])
+            navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH, test_name, [NavInsID.USE_CASE_VIEW_DETAILS_EXIT])
 
     response = client.get_async_response()
     assert response.status == Errors.SW_DENY
@@ -127,11 +127,11 @@ def test_sign_tx_accept(firmware, backend, navigator, test_name):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH, test_name, instructions)
         else:
             instructions = [
-                NavInsID.USE_CASE_REVIEW_TAP,
-                NavInsID.USE_CASE_REVIEW_TAP,
-                NavInsID.USE_CASE_REVIEW_TAP,
-                NavInsID.USE_CASE_REVIEW_TAP,
-                NavInsID.USE_CASE_REVIEW_TAP,
+                NavInsID.SWIPE_CENTER_TO_LEFT,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
+                NavInsID.USE_CASE_VIEW_DETAILS_NEXT,
                 NavInsID.USE_CASE_REVIEW_CONFIRM,
             ]
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH, test_name, instructions)