ragger 1.40.2__tar.gz → 1.40.4__tar.gz

{ragger-1.40.2 → ragger-1.40.4}/.github/workflows/build_and_tests.yml

@@ -36,14 +36,36 @@ jobs:
       app_branch_name: nanos_baseline
       upload_app_binaries_artifact: boilerplate_binaries_nanos
 
+  prepare_matrix:
+    name: Prepare matrix from TOML file
+    runs-on: ubuntu-latest
+    outputs:
+      devices: ${{ steps.get_devices.outputs.devices }}
+    env:
+      APP_MANIFEST: "ledger_app.toml"
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+      - name: Install ledgered
+        run: pip install ledgered
+      - name: Get devices from TOML
+        id: get_devices
+        run: |
+          # get device list as a single line json formatted value
+          compatible_devices="$(ledger-manifest --output-devices "${APP_MANIFEST}" -j | jq -rc '.devices')"
+
+          echo "devices=${compatible_devices}" | sed 's/+/p/' >> "${GITHUB_OUTPUT}"
+
   build_install_test:
     name: Install and test the library
-    needs: [build_boilerplate_application, build_boilerplate_application_nanos]
+    needs: [prepare_matrix, build_boilerplate_application, build_boilerplate_application_nanos]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python_version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        device: ${{ fromJson(needs.prepare_matrix.outputs.devices) }}
 
     steps:
     - name: Clone
@@ -64,13 +86,20 @@ jobs:
         pip install -U .[tests,all_backends]
         pip install -U "click>=8"
 
+    - name: Install speculos for Nanos
+      if: ${{ matrix.device == 'nanos' }}
+      run: |
+        pip install -U speculos==v0.25.5
+
     - name: Download app binaries
+      if: ${{ matrix.device != 'nanos' }}
       uses: actions/download-artifact@v4
       with:
         name: boilerplate_binaries
         path: ./build/
 
     - name: Download app binaries for Nano S
+      if: ${{ matrix.device == 'nanos' }}
       uses: actions/download-artifact@v4
       with:
         name: boilerplate_binaries_nanos
@@ -83,7 +112,7 @@ jobs:
       run: pytest -v --tb=short tests/unit --cov ragger --cov-report xml
 
     - name: Run functional tests and generate coverage
-      run: pytest -v --tb=short tests/functional --cov ragger --cov-report xml --cov-append --device all
+      run: pytest -v --tb=short tests/functional --cov ragger --cov-report xml --cov-append --device ${{ matrix.device }}
 
     - name: Upload to codecov.io
       uses: codecov/codecov-action@v5
@@ -91,6 +120,7 @@ jobs:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:
         name: codecov-ragger
+        flags: ${{ matrix.device }}-py${{ matrix.python_version }}
 
   package_and_deploy:
     name: Build and deploy the Ragger Python package
@@ -100,4 +130,4 @@ jobs:
       package_name: ragger
       publish: ${{ startsWith(github.ref, 'refs/tags/') }}
     secrets:
-      pypi_token: ${{ secrets.PYPI_PUBLIC_API_TOKEN  }}
+      pypi_token: ${{ secrets.PYPI_PUBLIC_API_TOKEN }}

{ragger-1.40.2 → ragger-1.40.4}/.github/workflows/codeql-analysis.yml

@@ -27,16 +27,13 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: "python"
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,10 +42,10 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
         queries: +security-and-quality
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -62,6 +59,6 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         config-file: .codeql-config.yaml

{ragger-1.40.2 → ragger-1.40.4}/.github/workflows/fast-checks.yml

@@ -64,7 +64,7 @@ jobs:
     - name: Clone
       uses: actions/checkout@v4
     - name: Check misspellings
-      uses: codespell-project/actions-codespell@v1
+      uses: codespell-project/actions-codespell@v2
       with:
         builtin: clear,rare
         check_filenames: true

{ragger-1.40.2 → ragger-1.40.4}/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.40.4] - 2025-11-20
+
+### Fixed
+
+- Fix navigation in functions `xxx_with_warning` with multiple warning screens for Nano on NBGL
+
+## [1.40.3] - 2025-11-06
+
+### Fixed
+
+- Add new parameter in `navigation_scenario` functions `xxx_with_warning` to specify the number of warning screens
+
 ## [1.40.2] - 2025-09-09
 
 ### Fixed

{ragger-1.40.2/src/ragger.egg-info → ragger-1.40.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragger
-Version: 1.40.2
+Version: 1.40.4
 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.2 → ragger-1.40.4}/ledger_app.toml

@@ -2,4 +2,4 @@
 [app]
 build_directory = "./"
 sdk = "C"
-devices =  ["nanos", "nanos+", "nanox", "stax", "flex"]
+devices =  ["nanos", "nanos+", "nanox", "stax", "flex", "apex_p"]

{ragger-1.40.2 → ragger-1.40.4}/src/ragger/__version__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.40.2'
-__version_tuple__ = version_tuple = (1, 40, 2)
+__version__ = version = '1.40.4'
+__version_tuple__ = version_tuple = (1, 40, 4)
 
-__commit_id__ = commit_id = 'g178742d51'
+__commit_id__ = commit_id = 'gfbba4eeb8'

{ragger-1.40.2 → ragger-1.40.4}/src/ragger/navigator/navigation_scenario.py

@@ -19,17 +19,24 @@ 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 = []
+                self.dismiss_warning += [NavInsID.RIGHT_CLICK] * (nb_warnings - 1)
+                self.dismiss_warning += [NavInsID.BOTH_CLICK]
                 # 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 +61,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 +140,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 +148,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 +160,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 +168,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 +180,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 +189,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.2 → ragger-1.40.4/src/ragger.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragger
-Version: 1.40.2
+Version: 1.40.4
 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.2 → ragger-1.40.4}/src/ragger.egg-info/SOURCES.txt

@@ -104,6 +104,11 @@ tests/functional/backend/__init__.py
 tests/functional/backend/test_speculos.py
 tests/functional/navigator/__init__.py
 tests/functional/navigator/test_navigator.py
+tests/snapshots/apex_p/waiting_screen/00000.png
+tests/snapshots/apex_p/waiting_screen/00001.png
+tests/snapshots/apex_p/waiting_screen/00002.png
+tests/snapshots/apex_p/waiting_screen/00003.png
+tests/snapshots/apex_p/waiting_screen/00004.png
 tests/snapshots/flex/waiting_screen/00000.png
 tests/snapshots/flex/waiting_screen/00001.png
 tests/snapshots/flex/waiting_screen/00002.png

{ragger-1.40.2 → ragger-1.40.4}/tests/unit/backend/test_physical_backend.py

@@ -22,7 +22,7 @@ class StubPhysicalBackend(PhysicalBackend):
     def receive(self) -> RAPDU:
         return RAPDU(0x9000, b"")
 
-    def exchange_raw(self, data: bytes = b"") -> RAPDU:
+    def exchange_raw(self, data: bytes = b"", tick_timeout: int = 0) -> RAPDU:
         return RAPDU(0x9000, b"")
 
     @contextmanager

{ragger-1.40.2 → ragger-1.40.4}/tests/unit/utils/test_misc.py

@@ -2,7 +2,7 @@ import os
 import subprocess
 from pathlib import Path
 from unittest import TestCase
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
 
 from ragger.error import ExceptionRAPDU
 from ragger.utils import misc