ragger 1.41.2__py3-none-any.whl → 1.42.1__py3-none-any.whl

ragger/__version__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.41.2'
-__version_tuple__ = version_tuple = (1, 41, 2)
+__version__ = version = '1.42.1'
+__version_tuple__ = version_tuple = (1, 42, 1)
 
 __commit_id__ = commit_id = None

ragger/backend/speculos.py

@@ -120,6 +120,7 @@ class SpeculosBackend(BackendInterface):
                                                       api_url=self.url,
                                                       **kwargs)
         self._pending: Optional[ApduResponse] = None
+        self._pending_async_response: Optional[ApduResponse] = None
         self._last_screenshot: Optional[BytesIO] = None
         self._home_screenshot: Optional[BytesIO] = None
         self._ticker_paused_count = 0
@@ -137,6 +138,15 @@ class SpeculosBackend(BackendInterface):
     def apdu_timeout(self, value: float) -> None:
         self._apdu_timeout = value
 
+    def _check_async_error(self) -> None:
+        """Check for async APDU errors and raise if present."""
+        if self._pending_async_response is not None and self._last_async_response is None:
+            if has_data_available(self._pending_async_response, timeout=0):
+                self.logger.info("[Ragger] Early async data available, retrieving it now.")
+                # This will raise ExceptionRAPDU immediately if status != 9000
+                self._last_async_response = self._get_last_async_response(
+                    self._pending_async_response)
+
     def _retrieve_client_screen_content(self) -> dict:
         raw_content = self._client.get_current_screen_content()
         # Keep only text events
@@ -214,13 +224,22 @@ class SpeculosBackend(BackendInterface):
     @contextmanager
     def exchange_async_raw(self, data: bytes = b"") -> Generator[bool, None, None]:
         self.apdu_logger.info("=> %s", data.hex())
+        # Reset state for this new async exchange
+        self._last_async_response = None
         with self._client.apdu_exchange_nowait(cla=data[0],
                                                ins=data[1],
                                                p1=data[2],
                                                p2=data[3],
                                                data=data[5:]) as response:
-            yield has_data_available(response, timeout=self.apdu_timeout)
-            self._last_async_response = self._get_last_async_response(response)
+            self._pending_async_response = response
+            try:
+                yield has_data_available(response, timeout=self.apdu_timeout)
+                # Only retrieve if not already retrieved by _check_async_error during navigation
+                if self._last_async_response is None:
+                    self._last_async_response = self._get_last_async_response(response)
+            finally:
+                # Clear pending async response flag in all cases
+                self._pending_async_response = None
 
     def right_click(self) -> None:
         self._client.press_and_release("right")
@@ -315,6 +334,12 @@ class SpeculosBackend(BackendInterface):
             if not screenshot_equal(screenshot, self._last_screenshot):
                 break
 
+            # Check for async APDU errors before sending a tick. This ensures that if the
+            # application has already refused the APDU (e.g., due to an error), we detect and raise
+            # the error immediately instead of waiting for a screen change that will never occur.
+            # This makes navigation robust and prevents hanging.
+            self._check_async_error()
+
             # Send a ticker event and let the app process it
             self.send_tick()
             screenshot = BytesIO(self._client.get_screenshot())

ragger/conftest/base_conftest.py

@@ -283,8 +283,9 @@ def prepare_speculos_args(root_pytest_dir: Path,
             )
         main_app_path = find_application(app_dir_subdirectories[0], device_name, "c")
 
-        # 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)
+        # This repo holds the library, not the standalone app: search in build_directory
+        lib_path = find_application(project_root_dir / manifest.app.build_directory, device_name,
+                                    manifest.app.sdk)
         speculos_args.append(f"-l{lib_path}")
     # If the app is standalone, the main app should be located in project_root_dir / manifest.app.build_directory
     else:

{ragger-1.41.2.dist-info → ragger-1.42.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragger
-Version: 1.41.2
+Version: 1.42.1
 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.41.2.dist-info → ragger-1.42.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ragger/__init__.py,sha256=Vbk78M7VtDVMTu02zYQquYSTxtgbieknkvr3uXONrig,713
-ragger/__version__.py,sha256=YovYgyS1Rxt5rHmXoIuT5lFDUCxkYEVR2lrSZcSCwYg,706
+ragger/__version__.py,sha256=0mWI4xQoxal_8S_OmewzeMGCk0Sffbe_ECmk0NOV1QU,706
 ragger/error.py,sha256=mmeipucrlUz1g1kkNy15rXpCccpzucnRTGIsKbcOzBo,6528
 ragger/logger.py,sha256=XF3DsHDLGOHAG7cqVj_7BQlHKj9J8zw8A9soFHIydc8,2457
 ragger/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,13 +8,13 @@ ragger/backend/interface.py,sha256=P_Uk0qXz8xrgy9m6mMaY7HWz_gg9dlYvarjmYpv_6EQ,2
 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=n83w4RevwHzFz-iF-Qo_tLCEckqxiP8e7PQ3wGMD21U,16138
+ragger/backend/speculos.py,sha256=nQjvzSd0uCRt6tkJjPcjQVM2msBMkF8u7fqk1p-QCFk,17629
 ragger/backend/stub.py,sha256=OIn4pIdnBuhgmCAAjGlVTEuWtaCLyCtVLVO-VTAEBRs,3284
 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=CZxd88vtU1axohRpEK_Uf5IbDa8S0YBX5mOxGjoc_20,20763
+ragger/conftest/base_conftest.py,sha256=r3MuOMDsI3Q5ZiUs4S0TlcyqYT8BeCrWImXjQOXTmN8,20831
 ragger/conftest/configuration.py,sha256=jE_zbvDWSc7jQQ4VEJBo8m_3kME09i2YXK6PLigPAes,3297
 ragger/firmware/__init__.py,sha256=3g_-n2b0qEgVlP42lOQiZzBPux6PCUtZnydkQeEn_Vk,687
 ragger/firmware/structs.py,sha256=pkUzEkq-kiUntWK2mt1Vkalgoe-3tbvBcLfe12L-CNo,1804
@@ -50,8 +50,8 @@ ragger/utils/__init__.py,sha256=PUabSv1qx0XyKWovIxvGBI71sd3O3bKp3gCsUxlWm1E,997
 ragger/utils/misc.py,sha256=Gx1LbtaOh3ns8C_4sRJAFyym2RcbTEmjNtjRfHT_BYw,6851
 ragger/utils/packing.py,sha256=2xaRR-FhwVfknP74ZGo-O4JTE6R0HpNqhxKJ9aMrns4,766
 ragger/utils/structs.py,sha256=JMfuX5u-4gSZfqH0SER05B15-mj0YyHjnxLAgxAYtAM,1413
-ragger-1.41.2.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-ragger-1.41.2.dist-info/METADATA,sha256=F3RzajCILlcstsq8xs3SCFIKIxB8BjHDgtrchfkKn8U,10660
-ragger-1.41.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ragger-1.41.2.dist-info/top_level.txt,sha256=kqJEoAZ6qn0T3iuVa-710gBK7Ik1euCwNwBbyFraRQg,7
-ragger-1.41.2.dist-info/RECORD,,
+ragger-1.42.1.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+ragger-1.42.1.dist-info/METADATA,sha256=dTcZ-2aynRqePhA93nHelHWskURVRN71CCelSLk3jv8,10660
+ragger-1.42.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ragger-1.42.1.dist-info/top_level.txt,sha256=kqJEoAZ6qn0T3iuVa-710gBK7Ik1euCwNwBbyFraRQg,7
+ragger-1.42.1.dist-info/RECORD,,

{ragger-1.41.2.dist-info → ragger-1.42.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any