PyPI - ragger - Versions diffs - 1.40.1__py3-none-any.whl → 1.40.3__py3-none-any.whl - Mend

ragger 1.40.1py3-none-any.whl → 1.40.3py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

ragger/__version__.py CHANGED Viewed

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
-__version__ = version = '1.40.1'
-__version_tuple__ = version_tuple = (1, 40, 1)
+__version__ = version = '1.40.3'
+__version_tuple__ = version_tuple = (1, 40, 3)
 __commit_id__ = commit_id = None

ragger/firmware/touch/positions.py CHANGED Viewed

@@ -125,7 +125,7 @@ POSITIONS = {
             # indexes for left to right, from up to down
             1: Position(100, 280),
             2: Position(290, 280),
-            3: Position(110, 350),
+            3: Position(100, 350),
             4: Position(290, 350),
         },
         DeviceType.FLEX: {
@@ -134,6 +134,16 @@ POSITIONS = {
             1: Position(140, 300),
             2: Position(350, 300),
         },
+        DeviceType.APEX_P: {
+            # On Apex, suggestions are on a single line
+            1: Position(80, 190),
+            2: Position(220, 300),
+        },
+        DeviceType.APEX_M: {
+            # On Apex, suggestions are on a single line
+            1: Position(80, 190),
+            2: Position(220, 300),
+        },
     },
     "LetterOnlyKeyboard": {
         DeviceType.STAX: {
@@ -199,7 +209,71 @@ POSITIONS = {
             "n": Position(264, 565),
             "m": Position(312, 565),
             "back": Position(400, 565),
-        }
+        },
+        DeviceType.APEX_P: {
+            # first line
+            "q": Position(15, 270),
+            "w": Position(45, 270),
+            "e": Position(75, 270),
+            "r": Position(105, 270),
+            "t": Position(135, 270),
+            "y": Position(165, 270),
+            "u": Position(195, 270),
+            "i": Position(225, 270),
+            "o": Position(255, 270),
+            "p": Position(285, 270),
+            # second line
+            "a": Position(30, 320),
+            "s": Position(60, 320),
+            "d": Position(90, 320),
+            "f": Position(120, 320),
+            "g": Position(150, 320),
+            "h": Position(180, 320),
+            "j": Position(210, 320),
+            "k": Position(240, 320),
+            "l": Position(270, 320),
+            # third and last line
+            "z": Position(15, 370),
+            "x": Position(45, 370),
+            "c": Position(75, 370),
+            "v": Position(105, 370),
+            "b": Position(135, 370),
+            "n": Position(165, 370),
+            "m": Position(195, 370),
+            "back": Position(255, 370),
+        },
+        DeviceType.APEX_M: {
+            # first line
+            "q": Position(15, 270),
+            "w": Position(45, 270),
+            "e": Position(75, 270),
+            "r": Position(105, 270),
+            "t": Position(135, 270),
+            "y": Position(165, 270),
+            "u": Position(195, 270),
+            "i": Position(225, 270),
+            "o": Position(255, 270),
+            "p": Position(285, 270),
+            # second line
+            "a": Position(30, 320),
+            "s": Position(60, 320),
+            "d": Position(90, 320),
+            "f": Position(120, 320),
+            "g": Position(150, 320),
+            "h": Position(180, 320),
+            "j": Position(210, 320),
+            "k": Position(240, 320),
+            "l": Position(270, 320),
+            # third and last line
+            "z": Position(15, 370),
+            "x": Position(45, 370),
+            "c": Position(75, 370),
+            "v": Position(105, 370),
+            "b": Position(135, 370),
+            "n": Position(165, 370),
+            "m": Position(195, 370),
+            "back": Position(255, 370),
+        },
     },
     "FullKeyboardLetters": {
         DeviceType.STAX: {
@@ -273,7 +347,79 @@ POSITIONS = {
             # fourth and last line
             "change_layout": Position(72, 560),
             " ": Position(312, 560),
-        }
+        },
+        DeviceType.APEX_P: {
+            # first line
+            "q": Position(15, 225),
+            "w": Position(45, 225),
+            "e": Position(75, 225),
+            "r": Position(105, 225),
+            "t": Position(135, 225),
+            "y": Position(165, 225),
+            "u": Position(195, 225),
+            "i": Position(225, 225),
+            "o": Position(255, 225),
+            "p": Position(285, 225),
+            # second line
+            "a": Position(30, 270),
+            "s": Position(60, 270),
+            "d": Position(90, 270),
+            "f": Position(120, 270),
+            "g": Position(150, 270),
+            "h": Position(180, 270),
+            "j": Position(210, 270),
+            "k": Position(240, 270),
+            "l": Position(270, 270),
+            # third and last line
+            "z": Position(60, 325),
+            "x": Position(90, 325),
+            "c": Position(120, 325),
+            "v": Position(150, 325),
+            "b": Position(180, 325),
+            "n": Position(210, 325),
+            "m": Position(240, 325),
+            "change_case": Position(20, 325),
+            "back": Position(280, 325),
+            # fourth and last line
+            "change_layout": Position(5, 370),
+            " ": Position(190, 370),
+        },
+        DeviceType.APEX_M: {
+            # first line
+            "q": Position(15, 225),
+            "w": Position(45, 225),
+            "e": Position(75, 225),
+            "r": Position(105, 225),
+            "t": Position(135, 225),
+            "y": Position(165, 225),
+            "u": Position(195, 225),
+            "i": Position(225, 225),
+            "o": Position(255, 225),
+            "p": Position(285, 225),
+            # second line
+            "a": Position(30, 270),
+            "s": Position(60, 270),
+            "d": Position(90, 270),
+            "f": Position(120, 270),
+            "g": Position(150, 270),
+            "h": Position(180, 270),
+            "j": Position(210, 270),
+            "k": Position(240, 270),
+            "l": Position(270, 270),
+            # third and last line
+            "z": Position(60, 325),
+            "x": Position(90, 325),
+            "c": Position(120, 325),
+            "v": Position(150, 325),
+            "b": Position(180, 325),
+            "n": Position(210, 325),
+            "m": Position(240, 325),
+            "change_case": Position(20, 325),
+            "back": Position(280, 325),
+            # fourth and last line
+            "change_layout": Position(5, 370),
+            " ": Position(190, 370),
+        },
     },
     "FullKeyboardSpecialCharacters1": {
         DeviceType.STAX: {
@@ -343,7 +489,75 @@ POSITIONS = {
             # fourth and last line
             "change_layout": Position(72, 560),
             " ": Position(312, 560),
-        }
+        },
+        DeviceType.APEX_P: {
+            # first line
+            "1": Position(15, 220),
+            "2": Position(45, 220),
+            "3": Position(75, 220),
+            "4": Position(105, 220),
+            "5": Position(135, 220),
+            "6": Position(165, 220),
+            "7": Position(195, 220),
+            "8": Position(225, 220),
+            "9": Position(255, 220),
+            "0": Position(285, 220),
+            # second line
+            "-": Position(30, 270),
+            "/": Position(60, 270),
+            ":": Position(90, 270),
+            ";": Position(120, 270),
+            "(": Position(150, 270),
+            ")": Position(180, 270),
+            "&": Position(210, 270),
+            "@": Position(240, 270),
+            "\"": Position(270, 270),
+            # third line
+            "more_specials": Position(35, 320),
+            ".": Position(90, 320),
+            ",": Position(120, 320),
+            "?": Position(150, 320),
+            "!": Position(180, 320),
+            "'": Position(210, 320),
+            "back": Position(265, 320),
+            # fourth and last line
+            "change_layout": Position(50, 370),
+            " ": Position(190, 370),
+        },
+        DeviceType.APEX_M: {
+            # first line
+            "1": Position(15, 220),
+            "2": Position(45, 220),
+            "3": Position(75, 220),
+            "4": Position(105, 220),
+            "5": Position(135, 220),
+            "6": Position(165, 220),
+            "7": Position(195, 220),
+            "8": Position(225, 220),
+            "9": Position(255, 220),
+            "0": Position(285, 220),
+            # second line
+            "-": Position(30, 270),
+            "/": Position(60, 270),
+            ":": Position(90, 270),
+            ";": Position(120, 270),
+            "(": Position(150, 270),
+            ")": Position(180, 270),
+            "&": Position(210, 270),
+            "@": Position(240, 270),
+            "\"": Position(270, 270),
+            # third line
+            "more_specials": Position(35, 320),
+            ".": Position(90, 320),
+            ",": Position(120, 320),
+            "?": Position(150, 320),
+            "!": Position(180, 320),
+            "'": Position(210, 320),
+            "back": Position(265, 320),
+            # fourth and last line
+            "change_layout": Position(50, 370),
+            " ": Position(190, 370),
+        },
     },
     "FullKeyboardSpecialCharacters2": {
         DeviceType.STAX: {
@@ -413,7 +627,75 @@ POSITIONS = {
             # fourth and last line
             "change_layout": Position(72, 560),
             " ": Position(312, 560),
-        }
+        },
+        DeviceType.APEX_P: {
+            # first line
+            "[": Position(15, 220),
+            "]": Position(45, 220),
+            "{": Position(75, 220),
+            "}": Position(105, 220),
+            "#": Position(135, 220),
+            "%": Position(165, 220),
+            "^": Position(195, 220),
+            "*": Position(225, 220),
+            "+": Position(255, 220),
+            "=": Position(285, 220),
+            # second line
+            "_": Position(30, 270),
+            "\\": Position(60, 270),
+            "|": Position(90, 270),
+            "~": Position(120, 270),
+            ">": Position(150, 270),
+            "<": Position(180, 270),
+            "$": Position(210, 270),
+            "`": Position(240, 270),
+            "\"": Position(270, 270),
+            # third line
+            "more_specials": Position(35, 320),
+            ".": Position(90, 320),
+            ",": Position(120, 320),
+            "?": Position(150, 320),
+            "!": Position(180, 320),
+            "'": Position(210, 320),
+            "back": Position(265, 320),
+            # fourth and last line
+            "change_layout": Position(50, 370),
+            " ": Position(190, 370),
+        },
+        DeviceType.APEX_M: {
+            # first line
+            "[": Position(15, 220),
+            "]": Position(45, 220),
+            "{": Position(75, 220),
+            "}": Position(105, 220),
+            "#": Position(135, 220),
+            "%": Position(165, 220),
+            "^": Position(195, 220),
+            "*": Position(225, 220),
+            "+": Position(255, 220),
+            "=": Position(285, 220),
+            # second line
+            "_": Position(30, 270),
+            "\\": Position(60, 270),
+            "|": Position(90, 270),
+            "~": Position(120, 270),
+            ">": Position(150, 270),
+            "<": Position(180, 270),
+            "$": Position(210, 270),
+            "`": Position(240, 270),
+            "\"": Position(270, 270),
+            # third line
+            "more_specials": Position(35, 320),
+            ".": Position(90, 320),
+            ",": Position(120, 320),
+            "?": Position(150, 320),
+            "!": Position(180, 320),
+            "'": Position(210, 320),
+            "back": Position(265, 320),
+            # fourth and last line
+            "change_layout": Position(50, 370),
+            " ": Position(190, 370),
+        },
     },
     "TappableCenter": {
         DeviceType.STAX: STAX_CENTER,

ragger/navigator/navigation_scenario.py CHANGED Viewed

@@ -19,17 +19,22 @@ class NavigationScenarioData:
     dismiss_warning: Sequence[InstructionType]
     pattern: str = ""
-    def __init__(self, device: Device, backend: BackendInterface, use_case: UseCase, approve: bool):
+    def __init__(self,
+                 device: Device,
+                 backend: BackendInterface,
+                 use_case: UseCase,
+                 approve: bool,
+                 nb_warnings: int = 1):
         if device.is_nano:
             self.navigation = NavInsID.RIGHT_CLICK
             self.validation = [NavInsID.BOTH_CLICK]
             if backend.sdk_graphics == GraphicalLibrary.BAGL:
-                self.dismiss_warning = [NavInsID.RIGHT_CLICK]
+                self.dismiss_warning = [NavInsID.RIGHT_CLICK] * nb_warnings
                 # Legacy navigation scenario when running an App compiled with bagl sdk library
                 self.pattern = r"^(Accept risk|Accept|Approve|Sign|Confirm)$" if approve else r"^(Cancel|Reject)$"
             else:
-                self.dismiss_warning = [NavInsID.BOTH_CLICK]
+                self.dismiss_warning = [NavInsID.BOTH_CLICK] * nb_warnings
                 # navigation scenario when running an App compiled with nbgl sdk library
                 if use_case == UseCase.ADDRESS_CONFIRMATION:
                     self.pattern = r"^(Accept risk|Accept|Approve|Sign|Confirm)$" if approve else r"^(Cancel|Reject)$"
@@ -54,7 +59,7 @@ class NavigationScenarioData:
         elif device.touchable:
             self.navigation = NavInsID.SWIPE_CENTER_TO_LEFT
-            self.dismiss_warning = [NavInsID.USE_CASE_CHOICE_REJECT]
+            self.dismiss_warning = [NavInsID.USE_CASE_CHOICE_REJECT] * nb_warnings
             if use_case == UseCase.ADDRESS_CONFIRMATION:
                 if approve:
@@ -133,10 +138,7 @@ class NavigateWithScenario:
                        test_name: Optional[str] = None,
                        custom_screen_text: Optional[str] = None,
                        do_comparison: bool = True):
-        scenario = NavigationScenarioData(self.device,
-                                          self.backend,
-                                          UseCase.TX_REVIEW,
-                                          approve=True)
+        scenario = NavigationScenarioData(self.device, self.backend, UseCase.TX_REVIEW, True)
         self._navigate_with_scenario(scenario, path, test_name, custom_screen_text, do_comparison)
     def review_approve_with_warning(self,
@@ -144,11 +146,10 @@ class NavigateWithScenario:
                                     test_name: Optional[str] = None,
                                     custom_screen_text: Optional[str] = None,
                                     do_comparison: bool = True,
-                                    warning_path: str = "warning"):
-        scenario = NavigationScenarioData(self.device,
-                                          self.backend,
-                                          UseCase.TX_REVIEW,
-                                          approve=True)
+                                    warning_path: str = "warning",
+                                    nb_warnings: int = 1):
+        scenario = NavigationScenarioData(self.device, self.backend, UseCase.TX_REVIEW, True,
+                                          nb_warnings)
         self._navigate_warning(scenario, test_name, do_comparison, warning_path)
         self._navigate_with_scenario(scenario, path, test_name, custom_screen_text, do_comparison)
@@ -157,10 +158,7 @@ class NavigateWithScenario:
                       test_name: Optional[str] = None,
                       custom_screen_text: Optional[str] = None,
                       do_comparison: bool = True):
-        scenario = NavigationScenarioData(self.device,
-                                          self.backend,
-                                          UseCase.TX_REVIEW,
-                                          approve=False)
+        scenario = NavigationScenarioData(self.device, self.backend, UseCase.TX_REVIEW, False)
         self._navigate_with_scenario(scenario, path, test_name, custom_screen_text, do_comparison)
     def review_reject_with_warning(self,
@@ -168,11 +166,10 @@ class NavigateWithScenario:
                                    test_name: Optional[str] = None,
                                    custom_screen_text: Optional[str] = None,
                                    do_comparison: bool = True,
-                                   warning_path: str = "warning"):
-        scenario = NavigationScenarioData(self.device,
-                                          self.backend,
-                                          UseCase.TX_REVIEW,
-                                          approve=False)
+                                   warning_path: str = "warning",
+                                   nb_warnings: int = 1):
+        scenario = NavigationScenarioData(self.device, self.backend, UseCase.TX_REVIEW, False,
+                                          nb_warnings)
         self._navigate_warning(scenario, test_name, do_comparison, warning_path)
         self._navigate_with_scenario(scenario, path, test_name, custom_screen_text, do_comparison)
@@ -181,10 +178,8 @@ class NavigateWithScenario:
                                test_name: Optional[str] = None,
                                custom_screen_text: Optional[str] = None,
                                do_comparison: bool = True):
-        scenario = NavigationScenarioData(self.device,
-                                          self.backend,
-                                          UseCase.ADDRESS_CONFIRMATION,
-                                          approve=True)
+        scenario = NavigationScenarioData(self.device, self.backend, UseCase.ADDRESS_CONFIRMATION,
+                                          True)
         self._navigate_with_scenario(scenario, path, test_name, custom_screen_text, do_comparison)
     def address_review_reject(self,
@@ -192,8 +187,6 @@ class NavigateWithScenario:
                               test_name: Optional[str] = None,
                               custom_screen_text: Optional[str] = None,
                               do_comparison: bool = True):
-        scenario = NavigationScenarioData(self.device,
-                                          self.backend,
-                                          UseCase.ADDRESS_CONFIRMATION,
-                                          approve=False)
+        scenario = NavigationScenarioData(self.device, self.backend, UseCase.ADDRESS_CONFIRMATION,
+                                          False)
         self._navigate_with_scenario(scenario, path, test_name, custom_screen_text, do_comparison)

{ragger-1.40.1.dist-info → ragger-1.40.3.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragger
-Version: 1.40.1
+Version: 1.40.3
 Summary: Testing framework using Speculos and LedgerComm as backends
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/ragger

{ragger-1.40.1.dist-info → ragger-1.40.3.dist-info}/RECORD RENAMED Viewed

@@ -1,5 +1,5 @@
 ragger/__init__.py,sha256=Vbk78M7VtDVMTu02zYQquYSTxtgbieknkvr3uXONrig,713
-ragger/__version__.py,sha256=XulopT_VgT2mWr-TUuH1VMduLqKc7_3J0NxfyFwMu44,706
+ragger/__version__.py,sha256=NM8z5Idkygww-PdAmCt9VmeNR_ut-W4tJNek-KVzqM8,706
 ragger/error.py,sha256=kd9yldPMis080jID6QjyDiCh7TDAVUtF5eczUH5pcKw,1251
 ragger/logger.py,sha256=XF3DsHDLGOHAG7cqVj_7BQlHKj9J8zw8A9soFHIydc8,2457
 ragger/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ ragger/firmware/structs.py,sha256=pkUzEkq-kiUntWK2mt1Vkalgoe-3tbvBcLfe12L-CNo,18
 ragger/firmware/touch/__init__.py,sha256=qI5Hff1FKY_5CpBQFIOHoN8AaL9IGMwmhbNjOer5X9c,672
 ragger/firmware/touch/element.py,sha256=9HmV0pbKGFrNp0nOTJmeyUV7dOLu2_ejeLltmtYPgRA,1337
 ragger/firmware/touch/layouts.py,sha256=XB1jLcJCy_PlnEr9QdSTXOF8hL9B3nRalpMMbalBu0w,2646
-ragger/firmware/touch/positions.py,sha256=5EfTSBJ525Y0vFPOIzvJeD4o2llTyXxiqfdZNJ--mEQ,23498
+ragger/firmware/touch/positions.py,sha256=D32_o0ND98ioG1Lt7eNBt0FcaDS5VsLIU6kKmbMAHMM,33462
 ragger/firmware/touch/screen.py,sha256=-t8mRceda9XDl7djZIrpWNsdrIq3Gy2AQbERsOsimUg,7033
 ragger/firmware/touch/use_cases.py,sha256=s8vOumOMxWfs5IRfOIq4i2O-n_ft2RdFdCSRHJgtH4E,3092
 ragger/gui/__init__.py,sha256=m3w6D_46oAKlRFMMsBwdvTvdnshUFDgcjWn_OT06hbE,962
@@ -43,15 +43,15 @@ ragger/gui/assets/touch_action.png,sha256=E3rTXz6NgPH1UqxaTwVzC9doK-i3nZZMkwb_Zd
 ragger/navigator/__init__.py,sha256=AJSPE4k4Cu_v1NqeBnClMu-tAvQ_A6YXFTCy5TuVvxI,950
 ragger/navigator/instruction.py,sha256=l1-0KBDnoDpz_G5AUDEw8UDOsf3TphTm5Jy412TsY7w,2652
 ragger/navigator/nano_navigator.py,sha256=D-00Vytb9bsOFsf4nn7BPqlS1d5K7UB9PLjozmdYpuk,1674
-ragger/navigator/navigation_scenario.py,sha256=6TnR7-wIuju0erLMYXu-rJPGny9cr-7GdFKRdyEc4YY,9766
+ragger/navigator/navigation_scenario.py,sha256=7ac3L8raD5v0NecbKE3NSoZdNllvEMcXVkxNjMV_vk4,9420
 ragger/navigator/navigator.py,sha256=ZT2smrw0Xz5XXhz2cZ3DJjbG4NwwQnCrQwvarbjZPTc,29146
 ragger/navigator/touch_navigator.py,sha256=k3PNaQ9sjfz4qFm-QuNPbnIJLXiICb_LeLbqnfjgdGM,5018
 ragger/utils/__init__.py,sha256=PUabSv1qx0XyKWovIxvGBI71sd3O3bKp3gCsUxlWm1E,997
 ragger/utils/misc.py,sha256=_ft_CrwEcZ-VVZCBG-_QjYQuTZn-Fht36k3C6BXhHOs,6930
 ragger/utils/packing.py,sha256=2xaRR-FhwVfknP74ZGo-O4JTE6R0HpNqhxKJ9aMrns4,766
 ragger/utils/structs.py,sha256=JMfuX5u-4gSZfqH0SER05B15-mj0YyHjnxLAgxAYtAM,1413
-ragger-1.40.1.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-ragger-1.40.1.dist-info/METADATA,sha256=s08pwIDG6iKsjUYBNJqniv36bwaV_dUawmWIlyPoLQs,10660
-ragger-1.40.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ragger-1.40.1.dist-info/top_level.txt,sha256=kqJEoAZ6qn0T3iuVa-710gBK7Ik1euCwNwBbyFraRQg,7
-ragger-1.40.1.dist-info/RECORD,,
+ragger-1.40.3.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+ragger-1.40.3.dist-info/METADATA,sha256=TnmWkCAAnu45k1OFY3G4QoArChZyC7nwfWFwyw6_CcY,10660
+ragger-1.40.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ragger-1.40.3.dist-info/top_level.txt,sha256=kqJEoAZ6qn0T3iuVa-710gBK7Ik1euCwNwBbyFraRQg,7
+ragger-1.40.3.dist-info/RECORD,,

{ragger-1.40.1.dist-info → ragger-1.40.3.dist-info}/WHEEL RENAMED Viewed

File without changes

{ragger-1.40.1.dist-info → ragger-1.40.3.dist-info}/licenses/LICENSE RENAMED Viewed

File without changes

{ragger-1.40.1.dist-info → ragger-1.40.3.dist-info}/top_level.txt RENAMED Viewed

File without changes

ragger 1.40.1__py3-none-any.whl → 1.40.3__py3-none-any.whl

ragger 1.40.1py3-none-any.whl → 1.40.3py3-none-any.whl