Merge pull request #283 from LedgerHQ/develop

Merge develop into master
LedgerHQ · Jul 19, 2024 · bda537e · bda537e
2 parents c9c57cb + b7c6323
commit bda537e
Show file tree

Hide file tree

Showing 62 changed files with 10 additions and 10 deletions.
diff --git a/tests/ragger_bitcoin/ragger_instructions.py b/tests/ragger_bitcoin/ragger_instructions.py
@@ -43,17 +43,17 @@ def navigate_end_of_flow(self, save_screenshot=True):
                          save_screenshot=save_screenshot)
 
     def review_start(self, output_count: int = 1, save_screenshot=True):
-        self.new_request("Review", NavInsID.USE_CASE_REVIEW_TAP, NavInsID.USE_CASE_REVIEW_TAP,
+        self.new_request("Review", NavInsID.SWIPE_CENTER_TO_LEFT, NavInsID.SWIPE_CENTER_TO_LEFT,
                          save_screenshot=save_screenshot)
         for _ in range(0, output_count):
-            self.same_request("Amount", NavInsID.USE_CASE_REVIEW_TAP, NavInsID.USE_CASE_REVIEW_TAP,
+            self.same_request("Amount", NavInsID.SWIPE_CENTER_TO_LEFT, NavInsID.SWIPE_CENTER_TO_LEFT,
                          save_screenshot=save_screenshot)
     def review_fees(self, fees_on_same_request: bool = True, save_screenshot=True):
         if fees_on_same_request:
-            self.same_request("Fees", NavInsID.USE_CASE_REVIEW_TAP, NavInsID.USE_CASE_REVIEW_TAP,
+            self.same_request("Fees", NavInsID.SWIPE_CENTER_TO_LEFT, NavInsID.SWIPE_CENTER_TO_LEFT,
                          save_screenshot=save_screenshot)
         else:
-            self.new_request("Fees", NavInsID.USE_CASE_REVIEW_TAP, NavInsID.USE_CASE_REVIEW_TAP,
+            self.new_request("Fees", NavInsID.SWIPE_CENTER_TO_LEFT, NavInsID.SWIPE_CENTER_TO_LEFT,
                          save_screenshot=save_screenshot)
 
     def confirm_transaction(self, save_screenshot=True):
@@ -64,9 +64,9 @@ def confirm_transaction(self, save_screenshot=True):
                          save_screenshot=save_screenshot)
 
     def confirm_message(self, save_screenshot=True):
-        self.new_request("Sign", NavInsID.USE_CASE_REVIEW_TAP,
+        self.new_request("Sign", NavInsID.SWIPE_CENTER_TO_LEFT,
                          NavInsID.USE_CASE_REVIEW_CONFIRM, save_screenshot=save_screenshot)
-        self.new_request("Message", NavInsID.USE_CASE_REVIEW_TAP,
+        self.new_request("Message", NavInsID.SWIPE_CENTER_TO_LEFT,
                          NavInsID.USE_CASE_STATUS_DISMISS, save_screenshot=save_screenshot)
 
     def confirm_wallet(self, save_screenshot=True):
@@ -88,7 +88,7 @@ def warning_accept(self, save_screenshot=True):
                          save_screenshot=save_screenshot)
 
     def address_confirm(self, save_screenshot=True):
-        self.new_request("Confirm", NavInsID.USE_CASE_REVIEW_TAP,
+        self.new_request("Confirm", NavInsID.SWIPE_CENTER_TO_LEFT,
                          NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM,
                          save_screenshot=save_screenshot)
 

diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_1/00001.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_1/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_1/00002.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_1/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_2/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/0'_0_2/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_1/00001.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_1/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_1/00002.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_1/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_2/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/10'_0_2/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_1/00001.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_1/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_1/00002.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_1/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_2/00000.png b/tests/snapshots/stax/test_get_public_key_m/44'/1'/2'/1/42_0_2/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_1/00001.png b/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_1/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_1/00002.png b/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_1/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_2/00000.png b/tests/snapshots/stax/test_get_public_key_m/48'/1'/4'/1'/0/7_0_2/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_1/00001.png b/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_1/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_1/00002.png b/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_1/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_2/00000.png b/tests/snapshots/stax/test_get_public_key_m/49'/1'/1'/1/3_0_2/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/84'/1'/2'/0/10_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/84'/1'/2'/0/10_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/84'/1'/2'/0/10_0_0/00001.png b/tests/snapshots/stax/test_get_public_key_m/84'/1'/2'/0/10_0_0/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/84'/1'/2'/0/10_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/84'/1'/2'/0/10_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_0/00000.png b/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_0/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_1/00000.png b/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_1/00000.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_1/00001.png b/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_1/00001.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_1/00002.png b/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_1/00002.png
diff --git a/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_2/00000.png b/tests/snapshots/stax/test_get_public_key_m/86'/1'/4'/1/12_0_2/00000.png
diff --git a/tests/snapshots/stax/test_sign_message_0_0/00000.png b/tests/snapshots/stax/test_sign_message_0_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_message_0_0/00001.png b/tests/snapshots/stax/test_sign_message_0_0/00001.png
diff --git a/tests/snapshots/stax/test_sign_message_0_1/00000.png b/tests/snapshots/stax/test_sign_message_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_message_1_0/00000.png b/tests/snapshots/stax/test_sign_message_1_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_message_1_0/00001.png b/tests/snapshots/stax/test_sign_message_1_0/00001.png
diff --git a/tests/snapshots/stax/test_sign_message_1_0/00002.png b/tests/snapshots/stax/test_sign_message_1_0/00002.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_2/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_3/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_3/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_2/00000.png
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_3/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_3/00000.png
diff --git a/tests/test_get_pubkey.py b/tests/test_get_pubkey.py
@@ -26,8 +26,8 @@ def pubkey_instruction_warning_approve(model: Firmware) -> Instructions:
     else:
         instructions.new_request("Unusual", NavInsID.USE_CASE_CHOICE_CONFIRM,
                                  NavInsID.USE_CASE_CHOICE_CONFIRM)
-        instructions.same_request("Confirm", NavInsID.USE_CASE_ADDRESS_CONFIRMATION_TAP if model.name == "stax" 
-                                  else NavInsID.SWIPE_CENTER_TO_LEFT,
+        instructions.same_request("Confirm",
+                                  NavInsID.SWIPE_CENTER_TO_LEFT,
                                   NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM)
         instructions.same_request("Address", NavInsID.USE_CASE_REVIEW_TAP,
                                   NavInsID.USE_CASE_STATUS_DISMISS)

diff --git a/tests/test_sign_message.py b/tests/test_sign_message.py
@@ -14,7 +14,7 @@ def message_instruction_approve(model: Firmware) -> Instructions:
         instructions.same_request("Sign")
     else:
         instructions.address_confirm()
-        instructions.same_request("Address", NavInsID.USE_CASE_REVIEW_TAP,
+        instructions.same_request("Address", NavInsID.SWIPE_CENTER_TO_LEFT,
                                   NavInsID.USE_CASE_STATUS_DISMISS)
         instructions.confirm_message()
     return instructions