ragger 1.37.1__py3-none-any.whl → 1.40.0__py3-none-any.whl

ragger/__version__.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.37.1'
-__version_tuple__ = version_tuple = (1, 37, 1)
+__version__ = version = '1.40.0'
+__version_tuple__ = version_tuple = (1, 40, 0)
+
+__commit_id__ = commit_id = None

ragger/backend/interface.py

@@ -144,8 +144,8 @@ class BackendInterface(ABC):
         :type ins: int
         :param p1: First instruction parameter, defaults to 0
         :type p1: int
-        :param p1: Second instruction parameter, defaults to 0
-        :type p1: int
+        :param p2: Second instruction parameter, defaults to 0
+        :type p2: int
         :param data: Command data
         :type data: bytes
 
@@ -205,8 +205,8 @@ class BackendInterface(ABC):
         :type ins: int
         :param p1: First instruction parameter, defaults to 0
         :type p1: int
-        :param p1: Second instruction parameter, defaults to 0
-        :type p1: int
+        :param p2: Second instruction parameter, defaults to 0
+        :type p2: int
         :param data: Command data
         :type data: bytes
 
@@ -262,8 +262,8 @@ class BackendInterface(ABC):
         :type ins: int
         :param p1: First instruction parameter, defaults to 0
         :type p1: int
-        :param p1: Second instruction parameter, defaults to 0
-        :type p1: int
+        :param p2: Second instruction parameter, defaults to 0
+        :type p2: int
         :param data: Command data
         :type data: bytes
 
@@ -292,7 +292,7 @@ class BackendInterface(ABC):
 
         :raises ExceptionRAPDU: If the `raises` attribute is True, this method
                                   will raise if the backend returns a status code
-                                  not registered a a `valid_statuses`
+                                  not registered as a `valid_statuses`
 
         :return: None
         :rtype: NoneType

ragger/backend/ledgercomm.py

@@ -106,7 +106,7 @@ class LedgerCommBackend(PhysicalBackend):
         return result
 
     @contextmanager
-    def exchange_async_raw(self, data: bytes = b"") -> Generator[None, None, None]:
+    def exchange_async_raw(self, data: bytes = b"") -> Generator[bool, None, None]:
         self.send_raw(data)
-        yield
+        yield True
         self._last_async_response = self.receive()

ragger/backend/ledgerwallet.py

@@ -98,7 +98,7 @@ class LedgerWalletBackend(PhysicalBackend):
         return result
 
     @contextmanager
-    def exchange_async_raw(self, data: bytes = b"") -> Generator[None, None, None]:
+    def exchange_async_raw(self, data: bytes = b"") -> Generator[bool, None, None]:
         self.send_raw(data)
-        yield
+        yield True
         self._last_async_response = self.receive()

ragger/conftest/base_conftest.py

@@ -1,3 +1,4 @@
+import os
 import pytest
 import logging
 from dataclasses import fields
@@ -39,7 +40,12 @@ def pytest_addoption(parser):
                      action="store_true",
                      default=False,
                      help="Have Speculos accept prod PKI certificates instead of test")
-    parser.addoption("--log_apdu_file", action="store", default=None, help="Log the APDU in a file")
+    parser.addoption("--log_apdu_file",
+                     action="store",
+                     default=None,
+                     nargs="?",
+                     const="apdu.log",
+                     help="Log the APDU in a file. If no pattern provided, uses 'apdu_xxx.log'.")
     parser.addoption("--seed", action="store", default=None, help="Set a custom seed")
     # Always allow "default" even if application conftest does not define it
     allowed_setups = conf.OPTIONAL.ALLOWED_SETUPS
@@ -72,10 +78,23 @@ def golden_run(pytestconfig):
     return pytestconfig.getoption("golden_run")
 
 
-@pytest.fixture(scope="session")
-def log_apdu_file(pytestconfig):
+@pytest.fixture(scope=conf.OPTIONAL.BACKEND_SCOPE)
+def log_apdu_file(request, pytestconfig, full_test_name: str):
     filename = pytestconfig.getoption("log_apdu_file")
-    return Path(filename).resolve() if filename is not None else None
+    if filename is None:
+        return None
+
+    path = Path(filename)
+    # Get nb of collected tests to be executed
+    collected_items = len(request.session.items)
+    if collected_items == 1:
+        # Single test - use filename directly
+        return path.resolve()
+    # Multiple tests - create a file per test
+    MAX_TEST_NAME_LENGTH = 100  # Define a safe maximum length for test names
+    truncated_test_name = full_test_name[:MAX_TEST_NAME_LENGTH]  # Truncate if necessary
+    new_filename = f"{path.stem}_{truncated_test_name}{path.suffix}"
+    return Path(new_filename).resolve()
 
 
 @pytest.fixture(scope="session")
@@ -112,6 +131,37 @@ def default_screenshot_path(root_pytest_dir: Path) -> Path:
     return root_pytest_dir
 
 
+@pytest.fixture(scope=conf.OPTIONAL.BACKEND_SCOPE)
+def full_test_name(request) -> str:
+    # Get the name of current pytest test
+    test_name = request.node.name
+
+    if '[' in test_name:
+        # Split all parameters
+        base_name, params = test_name.rsplit('[', 1)
+        params = params.rstrip(']')
+
+        # Split parameters by '-' and filter out device names
+        param_list = [p for p in params.split('-') if p not in DEVICES]
+
+        # Rebuild test name with remaining parameters
+        if param_list:
+            test_name = f"{base_name}[{'-'.join(param_list)}]"
+        else:
+            test_name = base_name
+
+    # Clean up for filename friendliness by replacing special characters with underscores
+    translation_table = str.maketrans({
+        '[': '_',
+        ']': '',
+        '-': '_',
+        '/': '_',
+        "'": '',
+    })
+    clean_name = test_name.translate(translation_table)
+    return clean_name
+
+
 @pytest.fixture
 def test_name(request) -> str:
     # Get the name of current pytest test
@@ -225,15 +275,16 @@ def prepare_speculos_args(root_pytest_dir: Path,
         main_app_path = find_application(project_root_dir / manifest.app.build_directory,
                                          device_name, manifest.app.sdk)
 
-    # Find all libraries that have to be sideloaded
+    # If this repository does not hold the main app, then we need to load this repository's application as a library
     if conf.OPTIONAL.MAIN_APP_DIR is not None:
         # This repo holds the library, not the standalone app: search in root_dir/build
         lib_path = find_application(project_root_dir, device_name, manifest.app.sdk)
         speculos_args.append(f"-l{lib_path}")
 
+    # Legacy lib method, remove once exchange is ported
     if len(conf.OPTIONAL.SIDELOADED_APPS) != 0:
         # We are testing a a standalone app that needs libraries: search in SIDELOADED_APPS_DIR
-        if conf.OPTIONAL.SIDELOADED_APPS_DIR == "":
+        if conf.OPTIONAL.SIDELOADED_APPS_DIR is None:
             raise ValueError("Configuration \"SIDELOADED_APPS_DIR\" is mandatory if "
                              "\"SIDELOADED_APPS\" is used")
         libs_dir = Path(project_root_dir / conf.OPTIONAL.SIDELOADED_APPS_DIR)
@@ -241,6 +292,16 @@ def prepare_speculos_args(root_pytest_dir: Path,
         for coin_name, lib_name in conf.OPTIONAL.SIDELOADED_APPS.items():
             lib_path = find_library_application(libs_dir, coin_name, device_name)
             speculos_args.append(f"-l{lib_name}:{lib_path}")
+    else:
+        # Keep this method instead
+        # Find all external libraries that have to be sideloaded
+        if conf.OPTIONAL.SIDELOADED_APPS_DIR is not None:
+            sideloaded_dir = project_root_dir / conf.OPTIONAL.SIDELOADED_APPS_DIR
+            subdirs = sorted(
+                filter(lambda d: (sideloaded_dir / d).is_dir(), os.listdir(sideloaded_dir)))
+            for subdir in subdirs:
+                lib_path = find_application(sideloaded_dir / subdir, device_name, manifest.app.sdk)
+                speculos_args.append(f"-l{lib_path}")
 
     # Check if custom user seed has been provided through CLI or optional configuration.
     # CLI user seed has priority over the optional configuration seed.

ragger/conftest/configuration.py

@@ -7,37 +7,39 @@ class OptionalOptions:
     APP_NAME: str
     MAIN_APP_DIR: Optional[str]
     SIDELOADED_APPS: dict
-    SIDELOADED_APPS_DIR: str
+    SIDELOADED_APPS_DIR: Optional[str]
     BACKEND_SCOPE: str
     CUSTOM_SEED: str
     ALLOWED_SETUPS: List[str]
 
 
 OPTIONAL = OptionalOptions(
-    # Use this parameter if you want to make sure the right app is started upon backend instantiation.
-    # This is only used for LedgerWallet and LedgerComm backend.
+    # Use this parameter if you want physical Ragger backends (LedgerWallet and LedgerComm) to start
+    # your application from the Dashboard at test start.
     APP_NAME=str(),
 
-    # If not None, the app being tested with Ragger should be loaded as a library and not as a standalone
-    # app. This parameter points to the repository holding the "main app", i.e the app started by the
-    # backend, which will then use the "local app" as a library.
-    # Use cases : your app is an Ethereum plugin, which will be used as a library by the Ethereum app.
-    # MAIN_APP_DIR contains the directory where the Ethereum app binaries are stored.
-    # example: "./tests/"
+    # If not None, the application being tested with Ragger should be loaded as a library and not as
+    # a standalone application. This parameter points to the repository holding the "main app", i.e
+    # the application started from the Dashboard, which will then use the "local app" as a library.
+    # Example use case: your application is an Ethereum plugin, which will be used as a library by
+    # the Ethereum application.
+    # MAIN_APP_DIR is the directory where the Ethereum application is cloned.
+    #
+    # example: configuration.OPTIONAL.MAIN_APP_DIR = "tests/.test_dependencies/"
+    # Speculos will then start "tests/.test_dependencies/ethereum/build/<device>/bin/app.elf"
+    # There must be exactly one application cloned inside this directory.
     MAIN_APP_DIR=None,
 
-    # use this parameter if you want Speculos to sideload libraries being installed on the device
-    # Useful for Ethereum main app and exchange app, for example
-    # example: {"bitcoin": "Bitcoin", "ethereum": "Ethereum"}
-    # this would result in Speculos being launched with -lbitcoin:/path/to/bitcoin_device.elf
-    # Mutually exclusive with LOAD_MAIN_APP_AS_LIBRARY
+    # Deprecated
     SIDELOADED_APPS=dict(),
 
-    # Mandatory in case SIDELOADED_APPS is used
-    # Relative path to the directory that will store your libs, from the top repository of your application
-    # example: "test/lib_binaries/"
-    # place your compiled application inside with naming "name_device.elf"
-    SIDELOADED_APPS_DIR=str(),
+    # Relative path to the directory that will store library applications needed for the test.
+    # They will be sideloaded by Speculos and can then be called by the main application. This
+    # emulates the applications being installed on the device alongside the main application.
+    #
+    # example: configuration.OPTIONAL.SIDELOADED_APPS_DIR = "tests/.test_dependencies/libraries"
+    # Speculos will then sideload "tests/.test_dependencies/libraries/*/build/<device>/bin/app.elf"
+    SIDELOADED_APPS_DIR=None,
 
     # As the backend instantiation may take some time, Ragger supports multiple backend scopes.
     # You can choose to share the backend instance between {session / module / class / function}
@@ -48,8 +50,10 @@ OPTIONAL = OptionalOptions(
     # Use this parameter if you want speculos to use a custom seed instead of the default one.
     # This would result in speculos being launched with --seed <CUSTOM_SEED>
     # If a seed is provided through the "--seed" pytest command line option, it will override this one.
+    # /!\ DO NOT USE SEEDS WITH REAL FUNDS /!\
     CUSTOM_SEED=str(),
 
+    # /!\ DEPRECATED /!\
     # Use this parameter if you want ragger to handle running different test suites depending on setup
     # Useful when some tests need certain build options and other tests need other build options, or a
     # different Speculos command line
@@ -59,5 +63,6 @@ OPTIONAL = OptionalOptions(
     #
     # "default" setup is always allowed, all tests without explicit decoration depend on default
     # and the --setup option defaults to "default"
+    # /!\ DEPRECATED /!\
     ALLOWED_SETUPS=["default"],
 )

ragger/firmware/structs.py

@@ -28,6 +28,8 @@ class Firmware(IntEnum):
     NANOX = DeviceType.NANOX
     STAX = DeviceType.STAX
     FLEX = DeviceType.FLEX
+    APEX_P = DeviceType.APEX_P
+    APEX_M = DeviceType.APEX_M
 
     @staticmethod
     def deprec_warning() -> None:

ragger/firmware/touch/layouts.py

@@ -88,18 +88,6 @@ class TappableCenter(_TappableElement):
     pass
 
 
-class KeyboardConfirmationButton(Element):
-    """
-    This layout is to be used as the confirmation button when coupled with a keyboard.
-
-    On Stax devices, the screen is high enough that this is equivalent to TappableCenter, however
-    on Flex, this button is not centered, but slightly closer to the top of the screen.
-    """
-
-    def confirm(self):
-        self.client.finger_touch(*self.positions)
-
-
 # Headers
 #########
 class RightHeader(_TappableElement):

ragger/firmware/touch/positions.py

@@ -28,42 +28,62 @@ class Position:
 
 _stax_res: Resolution = Devices.get_by_type(DeviceType.STAX).resolution
 _flex_res: Resolution = Devices.get_by_type(DeviceType.FLEX).resolution
+_apex_p_res: Resolution = Devices.get_by_type(DeviceType.APEX_P).resolution
+_apex_m_res: Resolution = Devices.get_by_type(DeviceType.APEX_M).resolution
 
 # Floor division '//' required, else the result will be a float, which can lead to issues when
 # using Speculos, which performs actions such as `var.to_bytes()` which does not work with a float.
 STAX_X_CENTER = _stax_res.x // 2
 FLEX_X_CENTER = _flex_res.x // 2
+APEX_P_X_CENTER = _apex_p_res.x // 2
+APEX_M_X_CENTER = _apex_m_res.x // 2
 
 STAX_CENTER = Position(STAX_X_CENTER, _stax_res.y // 2)
 FLEX_CENTER = Position(FLEX_X_CENTER, _flex_res.y // 2)
-
-STAX_BUTTON_UPPER_CENTER_MIDDLE = Position(STAX_X_CENTER, 280)
-FLEX_BUTTON_UPPER_CENTER_MIDDLE = Position(FLEX_X_CENTER, 250)
+APEX_P_CENTER = Position(APEX_P_X_CENTER, _apex_p_res.y // 2)
+APEX_M_CENTER = Position(APEX_M_X_CENTER, _apex_m_res.y // 2)
 
 STAX_BUTTON_UPPER_LEFT = Position(36, 36)
 FLEX_BUTTON_UPPER_LEFT = Position(45, 45)
+APEX_P_BUTTON_UPPER_LEFT = Position(30, 30)
+APEX_M_BUTTON_UPPER_LEFT = Position(30, 30)
 
 STAX_BUTTON_UPPER_RIGHT = Position(342, 55)
 FLEX_BUTTON_UPPER_RIGHT = Position(405, 75)
+APEX_P_BUTTON_UPPER_RIGHT = Position(256, 43)
+APEX_M_BUTTON_UPPER_RIGHT = Position(256, 43)
 
 STAX_BUTTON_LOWER_LEFT = Position(36, 606)
 FLEX_BUTTON_LOWER_LEFT = Position(55, 530)
+APEX_P_BUTTON_LOWER_LEFT = Position(56, 370)
+APEX_M_BUTTON_LOWER_LEFT = Position(56, 370)
 
 STAX_BUTTON_LOWER_MIDDLE = Position(STAX_X_CENTER, 606)
 FLEX_BUTTON_LOWER_MIDDLE = Position(FLEX_X_CENTER, 550)
+APEX_P_BUTTON_LOWER_MIDDLE = Position(APEX_P_X_CENTER, 370)
+APEX_M_BUTTON_LOWER_MIDDLE = Position(APEX_M_X_CENTER, 370)
 
 STAX_BUTTON_LOWER_RIGHT = Position(342, 606)
 FLEX_BUTTON_LOWER_RIGHT = Position(430, 550)
+APEX_P_BUTTON_LOWER_RIGHT = Position(270, 370)
+APEX_M_BUTTON_LOWER_RIGHT = Position(270, 370)
+
 STAX_BUTTON_LOWER_MIDDLE_RIGHT = Position(266, 615)
 FLEX_BUTTON_LOWER_MIDDLE_RIGHT = Position(320, 550)
+APEX_P_BUTTON_LOWER_MIDDLE_RIGHT = Position(207, 370)
+APEX_M_BUTTON_LOWER_MIDDLE_RIGHT = Position(207, 370)
 
-STAX_BUTTON_ABOVE_LOWER_MIDDLE = Position(200, 515)
-FLEX_BUTTON_ABOVE_LOWER_MIDDLE = Position(240, 435)
+STAX_BUTTON_ABOVE_LOWER_MIDDLE = Position(STAX_X_CENTER, 515)
+FLEX_BUTTON_ABOVE_LOWER_MIDDLE = Position(FLEX_X_CENTER, 435)
+APEX_P_BUTTON_ABOVE_LOWER_MIDDLE = Position(APEX_P_X_CENTER, 312)
+APEX_M_BUTTON_ABOVE_LOWER_MIDDLE = Position(APEX_M_X_CENTER, 312)
 
 POSITIONS = {
     "Center": {
         DeviceType.STAX: STAX_CENTER,
         DeviceType.FLEX: FLEX_CENTER,
+        DeviceType.APEX_P: APEX_P_CENTER,
+        DeviceType.APEX_M: APEX_M_CENTER,
     },
     "ChoiceList": {
         DeviceType.STAX: {
@@ -81,7 +101,23 @@ POSITIONS = {
             3: Position(FLEX_X_CENTER, 330),
             4: Position(FLEX_X_CENTER, 420),
             5: Position(FLEX_X_CENTER, 510),
-        }
+        },
+        DeviceType.APEX_P: {
+            # Up to 5 choices in a list
+            1: Position(APEX_P_X_CENTER, 90),
+            2: Position(APEX_P_X_CENTER, 160),
+            3: Position(APEX_P_X_CENTER, 230),
+            4: Position(APEX_P_X_CENTER, 300),
+            5: Position(APEX_P_X_CENTER, 370),
+        },
+        DeviceType.APEX_M: {
+            # Up to 5 choices in a list
+            1: Position(APEX_M_X_CENTER, 90),
+            2: Position(APEX_M_X_CENTER, 160),
+            3: Position(APEX_M_X_CENTER, 230),
+            4: Position(APEX_M_X_CENTER, 300),
+            5: Position(APEX_M_X_CENTER, 370),
+        },
     },
     "Suggestions": {
         DeviceType.STAX: {
@@ -382,30 +418,38 @@ POSITIONS = {
     "TappableCenter": {
         DeviceType.STAX: STAX_CENTER,
         DeviceType.FLEX: FLEX_CENTER,
-    },
-    "KeyboardConfirmationButton": {
-        DeviceType.STAX: STAX_BUTTON_UPPER_CENTER_MIDDLE,
-        DeviceType.FLEX: FLEX_BUTTON_UPPER_CENTER_MIDDLE,
+        DeviceType.APEX_P: APEX_P_CENTER,
+        DeviceType.APEX_M: APEX_M_CENTER
     },
     "RightHeader": {
         DeviceType.STAX: STAX_BUTTON_UPPER_RIGHT,
-        DeviceType.FLEX: FLEX_BUTTON_UPPER_RIGHT
+        DeviceType.FLEX: FLEX_BUTTON_UPPER_RIGHT,
+        DeviceType.APEX_P: APEX_P_BUTTON_UPPER_RIGHT,
+        DeviceType.APEX_M: APEX_M_BUTTON_UPPER_RIGHT
     },
     "LeftHeader": {
         DeviceType.STAX: STAX_BUTTON_UPPER_LEFT,
-        DeviceType.FLEX: FLEX_BUTTON_UPPER_LEFT
+        DeviceType.FLEX: FLEX_BUTTON_UPPER_LEFT,
+        DeviceType.APEX_P: APEX_P_BUTTON_UPPER_LEFT,
+        DeviceType.APEX_M: APEX_M_BUTTON_UPPER_LEFT
     },
     "CenteredFooter": {
         DeviceType.STAX: STAX_BUTTON_LOWER_MIDDLE,
-        DeviceType.FLEX: FLEX_BUTTON_LOWER_MIDDLE
+        DeviceType.FLEX: FLEX_BUTTON_LOWER_MIDDLE,
+        DeviceType.APEX_P: APEX_P_BUTTON_LOWER_MIDDLE,
+        DeviceType.APEX_M: APEX_M_BUTTON_LOWER_MIDDLE
     },
     "LeftFooter": {
         DeviceType.STAX: STAX_BUTTON_LOWER_LEFT,
-        DeviceType.FLEX: FLEX_BUTTON_LOWER_LEFT
+        DeviceType.FLEX: FLEX_BUTTON_LOWER_LEFT,
+        DeviceType.APEX_P: APEX_P_BUTTON_LOWER_LEFT,
+        DeviceType.APEX_M: APEX_M_BUTTON_LOWER_LEFT
     },
     "CancelFooter": {
         DeviceType.STAX: STAX_BUTTON_LOWER_LEFT,
-        DeviceType.FLEX: FLEX_BUTTON_LOWER_LEFT
+        DeviceType.FLEX: FLEX_BUTTON_LOWER_LEFT,
+        DeviceType.APEX_P: APEX_P_BUTTON_LOWER_LEFT,
+        DeviceType.APEX_M: APEX_M_BUTTON_LOWER_LEFT
     },
     "UseCaseHome": {
         DeviceType.STAX: {
@@ -417,6 +461,16 @@ POSITIONS = {
             "info": FLEX_BUTTON_UPPER_RIGHT,
             "settings": FLEX_BUTTON_UPPER_RIGHT,
             "quit": FLEX_BUTTON_LOWER_MIDDLE
+        },
+        DeviceType.APEX_P: {
+            "info": APEX_P_BUTTON_UPPER_RIGHT,
+            "settings": APEX_P_BUTTON_UPPER_RIGHT,
+            "quit": APEX_P_BUTTON_LOWER_MIDDLE
+        },
+        DeviceType.APEX_M: {
+            "info": APEX_M_BUTTON_UPPER_RIGHT,
+            "settings": APEX_M_BUTTON_UPPER_RIGHT,
+            "quit": APEX_M_BUTTON_LOWER_MIDDLE
         }
     },
     "UseCaseHomeExt": {
@@ -431,6 +485,18 @@ POSITIONS = {
             "settings": FLEX_BUTTON_UPPER_RIGHT,
             "action": FLEX_BUTTON_ABOVE_LOWER_MIDDLE,
             "quit": FLEX_BUTTON_LOWER_MIDDLE
+        },
+        DeviceType.APEX_P: {
+            "info": APEX_P_BUTTON_UPPER_RIGHT,
+            "settings": APEX_P_BUTTON_UPPER_RIGHT,
+            "action": APEX_P_BUTTON_ABOVE_LOWER_MIDDLE,
+            "quit": APEX_P_BUTTON_LOWER_MIDDLE
+        },
+        DeviceType.APEX_M: {
+            "info": APEX_M_BUTTON_UPPER_RIGHT,
+            "settings": APEX_M_BUTTON_UPPER_RIGHT,
+            "action": APEX_M_BUTTON_ABOVE_LOWER_MIDDLE,
+            "quit": APEX_M_BUTTON_LOWER_MIDDLE
         }
     },
     "UseCaseSettings": {
@@ -445,6 +511,18 @@ POSITIONS = {
             "multi_page_exit": FLEX_BUTTON_UPPER_LEFT,
             "previous": FLEX_BUTTON_LOWER_MIDDLE_RIGHT,
             "next": FLEX_BUTTON_LOWER_RIGHT,
+        },
+        DeviceType.APEX_P: {
+            "single_page_exit": APEX_P_BUTTON_UPPER_LEFT,
+            "multi_page_exit": APEX_P_BUTTON_UPPER_LEFT,
+            "previous": APEX_P_BUTTON_LOWER_MIDDLE_RIGHT,
+            "next": APEX_P_BUTTON_LOWER_RIGHT,
+        },
+        DeviceType.APEX_M: {
+            "single_page_exit": APEX_M_BUTTON_UPPER_LEFT,
+            "multi_page_exit": APEX_M_BUTTON_UPPER_LEFT,
+            "previous": APEX_M_BUTTON_LOWER_MIDDLE_RIGHT,
+            "next": APEX_M_BUTTON_LOWER_RIGHT,
         }
     },
     "UseCaseSubSettings": {
@@ -457,6 +535,16 @@ POSITIONS = {
             "exit": FLEX_BUTTON_UPPER_LEFT,
             "previous": FLEX_BUTTON_LOWER_LEFT,
             "next": FLEX_BUTTON_LOWER_RIGHT,
+        },
+        DeviceType.APEX_P: {
+            "exit": APEX_P_BUTTON_UPPER_LEFT,
+            "previous": APEX_P_BUTTON_LOWER_LEFT,
+            "next": APEX_P_BUTTON_LOWER_RIGHT,
+        },
+        DeviceType.APEX_M: {
+            "exit": APEX_M_BUTTON_UPPER_LEFT,
+            "previous": APEX_M_BUTTON_LOWER_LEFT,
+            "next": APEX_M_BUTTON_LOWER_RIGHT,
         }
     },
     "UseCaseChoice": {
@@ -467,6 +555,14 @@ POSITIONS = {
         DeviceType.FLEX: {
             "confirm": FLEX_BUTTON_ABOVE_LOWER_MIDDLE,
             "reject": FLEX_BUTTON_LOWER_LEFT,
+        },
+        DeviceType.APEX_P: {
+            "confirm": APEX_P_BUTTON_ABOVE_LOWER_MIDDLE,
+            "reject": APEX_P_BUTTON_LOWER_LEFT,
+        },
+        DeviceType.APEX_M: {
+            "confirm": APEX_M_BUTTON_ABOVE_LOWER_MIDDLE,
+            "reject": APEX_M_BUTTON_LOWER_LEFT,
         }
     },
     "UseCaseStatus": {
@@ -475,6 +571,12 @@ POSITIONS = {
         },
         DeviceType.FLEX: {
             "dismiss": FLEX_CENTER,
+        },
+        DeviceType.APEX_P: {
+            "dismiss": APEX_P_CENTER,
+        },
+        DeviceType.APEX_M: {
+            "dismiss": APEX_M_CENTER,
         }
     },
     "UseCaseReview": {
@@ -489,6 +591,18 @@ POSITIONS = {
             "previous": FLEX_BUTTON_LOWER_MIDDLE,
             "confirm": FLEX_BUTTON_ABOVE_LOWER_MIDDLE,
             "reject": FLEX_BUTTON_LOWER_LEFT,
+        },
+        DeviceType.APEX_P: {
+            "tap": APEX_P_BUTTON_LOWER_RIGHT,
+            "previous": APEX_P_BUTTON_LOWER_MIDDLE,
+            "confirm": APEX_P_BUTTON_ABOVE_LOWER_MIDDLE,
+            "reject": APEX_P_BUTTON_LOWER_LEFT,
+        },
+        DeviceType.APEX_M: {
+            "tap": APEX_M_BUTTON_LOWER_RIGHT,
+            "previous": APEX_M_BUTTON_LOWER_MIDDLE,
+            "confirm": APEX_M_BUTTON_ABOVE_LOWER_MIDDLE,
+            "reject": APEX_M_BUTTON_LOWER_LEFT,
         }
     },
     "UseCaseViewDetails": {
@@ -501,6 +615,16 @@ POSITIONS = {
             "exit": FLEX_BUTTON_LOWER_LEFT,
             "previous": FLEX_BUTTON_LOWER_MIDDLE,
             "next": FLEX_BUTTON_LOWER_RIGHT,
+        },
+        DeviceType.APEX_P: {
+            "exit": APEX_P_BUTTON_LOWER_LEFT,
+            "previous": APEX_P_BUTTON_LOWER_MIDDLE,
+            "next": APEX_P_BUTTON_LOWER_RIGHT,
+        },
+        DeviceType.APEX_M: {
+            "exit": APEX_M_BUTTON_LOWER_LEFT,
+            "previous": APEX_M_BUTTON_LOWER_MIDDLE,
+            "next": APEX_M_BUTTON_LOWER_RIGHT,
         }
     },
     "UseCaseAddressConfirmation": {
@@ -515,6 +639,18 @@ POSITIONS = {
             "exit_qr": FLEX_BUTTON_LOWER_MIDDLE,
             "confirm": FLEX_BUTTON_ABOVE_LOWER_MIDDLE,
             "cancel": FLEX_BUTTON_LOWER_LEFT,
+        },
+        DeviceType.APEX_P: {
+            "tap": APEX_P_BUTTON_ABOVE_LOWER_MIDDLE,
+            "exit_qr": APEX_P_BUTTON_LOWER_MIDDLE,
+            "confirm": APEX_P_BUTTON_ABOVE_LOWER_MIDDLE,
+            "cancel": APEX_P_BUTTON_LOWER_LEFT,
+        },
+        DeviceType.APEX_M: {
+            "tap": APEX_M_BUTTON_ABOVE_LOWER_MIDDLE,
+            "exit_qr": APEX_M_BUTTON_LOWER_MIDDLE,
+            "confirm": APEX_M_BUTTON_ABOVE_LOWER_MIDDLE,
+            "cancel": APEX_M_BUTTON_LOWER_LEFT,
         }
     },
 }

ragger/gui/interface.py

@@ -79,7 +79,15 @@ class RaggerMainWindow(QMainWindow):
         self._screenshot.setObjectName("screenshot")
         self._screenshot.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         self._screenshot.setAlignment(Qt.AlignmentFlag.AlignVCenter)
-        dict_margin = {"nanos": 75, "nanox": 90, "nanosp": 55, "stax": 65, "flex": 65}
+        dict_margin = {
+            "nanos": 75,
+            "nanox": 90,
+            "nanosp": 55,
+            "stax": 65,
+            "flex": 65,
+            "apex_p": 65,
+            "apex_m": 65
+        }
         margin = dict_margin[self._device]
         self._screenshot.setStyleSheet(f"QLabel {{margin-left: {margin}px;}}")
 
@@ -233,7 +241,7 @@ class RaggerMainWindow(QMainWindow):
         self._init_screenshot()
         self._init_validation_buttons()
 
-        if self._device in ["stax", "flex"]:
+        if self._device in ["stax", "flex", "apex_p", "apex_m"]:
             self._devicebody.raise_()
             self._touch.raise_()
             self._swipe_left.raise_()

{ragger-1.37.1.dist-info → ragger-1.40.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragger
-Version: 1.37.1
+Version: 1.40.0
 Summary: Testing framework using Speculos and LedgerComm as backends
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/ragger
@@ -79,7 +79,7 @@ It mainly consists of an interface which is implemented by three backends:
 
 - two physical backends (although technically they are agnostic, but the
   `SpeculosClient` is superior with an emulator), `LedgerCommBackend` and
-  `LedgerWalletbackend`, which use respectively the
+  `LedgerWalletBackend`, which use respectively the
   [`LedgerComm` library](https://github.com/LedgerHQ/ledgercomm) or the
   [`LedgerWallet` library](https://github.com/LedgerHQ/ledgerctl/) to discuss
   with a physical device. In these cases, the physical device must be started,

{ragger-1.37.1.dist-info → ragger-1.40.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ragger/__init__.py,sha256=Vbk78M7VtDVMTu02zYQquYSTxtgbieknkvr3uXONrig,713
-ragger/__version__.py,sha256=QWx9qO-yS070knKL7XFnyid1uVYAE79Po8ipAsiDItM,513
+ragger/__version__.py,sha256=dxZI2xWJYica5UvRI6U6kh8KsX350KFePNKSMlGyDEQ,706
 ragger/error.py,sha256=kd9yldPMis080jID6QjyDiCh7TDAVUtF5eczUH5pcKw,1251
 ragger/logger.py,sha256=XF3DsHDLGOHAG7cqVj_7BQlHKj9J8zw8A9soFHIydc8,2457
 ragger/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragger/backend/__init__.py,sha256=IQlMre2Pi5QWyYBTROMTbKuonNRUODKrrhj5UxcqQx4,1930
-ragger/backend/interface.py,sha256=Lf0HLSGvFiXyFiq3izUiSeL57kkNY-MzjNj1ZAD-GU0,21484
-ragger/backend/ledgercomm.py,sha256=Wuc8mg1CY6ZNNIuk55r3vtz-4u4WchrjoeQV6gxYlxs,3877
-ragger/backend/ledgerwallet.py,sha256=beHG6Iwe1HB4k0XD4uuXRz_GLHo3DRVr2uJ691JDXow,3728
+ragger/backend/interface.py,sha256=nKAp0Q7IYyfyta0__HAxJ3L9BlKlZsqvMsBdUX7jpgQ,21485
+ragger/backend/ledgercomm.py,sha256=XhG2GszkfjrJTPAECqUJ35PCkDs9mHnVn4ThbQZhQPg,3882
+ragger/backend/ledgerwallet.py,sha256=b8p6vTPCddAfIk9uT9bJbPqE8e4UqfL3w10ufqPdROc,3733
 ragger/backend/physical_backend.py,sha256=Y5BRhsKliqCyYFFce7D7swRlT3dkwsXptrUq3zm2Oks,5955
 ragger/backend/speculos.py,sha256=6HZ_BsVA19vFOOo91nI__VecMhIPHPUqxruC51lKqpE,16053
 ragger/backend/stub.py,sha256=p06nUL0S5z14rd9ZihVwpPylYPcIaAtD-WKaHTpDyIQ,3213
@@ -14,18 +14,18 @@ ragger/bip/__init__.py,sha256=7gY5V8gkJfct1g4OgaLg8bNpgoITGaqU9gTKC4tHbAM,920
 ragger/bip/path.py,sha256=uX69L3U8vteIHJy_PE5yPloGaiiYYMq_jLbBSENiRqs,1709
 ragger/bip/seed.py,sha256=yKGM_fkFCh6hNAl7vOMrEv5kEoQoDmVPhBCIMtO8dNk,1758
 ragger/conftest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ragger/conftest/base_conftest.py,sha256=U06mB2XfJbIz2jeGVI4eqkMg73ykbTjPGgmLf0GB8S8,16713
-ragger/conftest/configuration.py,sha256=u0TBFuuZwjeuokNRTpecJ1sxAQCG2OpAxP9uF7lSJo8,3061
+ragger/conftest/base_conftest.py,sha256=I2J0rvBY4W9G9OI3mE-qVeAM5vV3b9m_oSWqrceL-iM,19100
+ragger/conftest/configuration.py,sha256=jE_zbvDWSc7jQQ4VEJBo8m_3kME09i2YXK6PLigPAes,3297
 ragger/firmware/__init__.py,sha256=3g_-n2b0qEgVlP42lOQiZzBPux6PCUtZnydkQeEn_Vk,687
-ragger/firmware/structs.py,sha256=edSXAkniHx_GrAyydRK6_BfgeAjldICdLgim-Xx6LX8,1742
+ragger/firmware/structs.py,sha256=pkUzEkq-kiUntWK2mt1Vkalgoe-3tbvBcLfe12L-CNo,1804
 ragger/firmware/touch/__init__.py,sha256=qI5Hff1FKY_5CpBQFIOHoN8AaL9IGMwmhbNjOer5X9c,672
 ragger/firmware/touch/element.py,sha256=9HmV0pbKGFrNp0nOTJmeyUV7dOLu2_ejeLltmtYPgRA,1337
-ragger/firmware/touch/layouts.py,sha256=jBfxQiE0DFUVVXFZln5VuakSaAZQ2bg6NosXdF3TfBM,3055
-ragger/firmware/touch/positions.py,sha256=_wxA_ZfZYSsEF8AOgqSSwZHr7Cu9-FDMRx4odfrHkig,17819
+ragger/firmware/touch/layouts.py,sha256=XB1jLcJCy_PlnEr9QdSTXOF8hL9B3nRalpMMbalBu0w,2646
+ragger/firmware/touch/positions.py,sha256=kuodm-xeQqI0gErghEB60NsK615YDDec08eomPfXGCU,23498
 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
-ragger/gui/interface.py,sha256=jLH4hfhhOLqaxT2BAeA5OnxQdrv_BFrFuCHIV1AzqCk,13874
+ragger/gui/interface.py,sha256=lwya2ZE5FfP6fqQJr4FCazP3UdUCE8M099Uw7Lwi0IU,14016
 ragger/gui/process.py,sha256=Uu60zAH6g3qlyh6W-EPj8yOjYJgo1T2y_45g5cWxFgg,5683
 ragger/gui/assets/nanos_body.png,sha256=wBmRW6rOJmcMJ_Dg2xYL7v0PaDIr5A8S_4C06D2h-2w,8394
 ragger/gui/assets/nanos_leftbutton.png,sha256=L7iLeksppZchDq7nJtkqcF5gwze7iridlRC32AALnu0,1194
@@ -50,8 +50,8 @@ 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.37.1.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-ragger-1.37.1.dist-info/METADATA,sha256=nOAKgz8KM-GsVEujg-wQyEcCiTWN02Ggw1WJeO7kBL0,10660
-ragger-1.37.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ragger-1.37.1.dist-info/top_level.txt,sha256=kqJEoAZ6qn0T3iuVa-710gBK7Ik1euCwNwBbyFraRQg,7
-ragger-1.37.1.dist-info/RECORD,,
+ragger-1.40.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+ragger-1.40.0.dist-info/METADATA,sha256=aQatMB9sCrPq7J-PKztd4r4V9eTOskrTGbPNze_gZCI,10660
+ragger-1.40.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ragger-1.40.0.dist-info/top_level.txt,sha256=kqJEoAZ6qn0T3iuVa-710gBK7Ik1euCwNwBbyFraRQg,7
+ragger-1.40.0.dist-info/RECORD,,