Merge pull request #157 from LedgerHQ/cev/B2CA-1942_nbgl-on-nano

Nbgl on Nano

Author: cedelavergne-ledger

.github/workflows/python_client_checks.yml

@@ -1,6 +1,6 @@
 name: Checks on the Python client
 
-# This workflow performs some checks on the Python client used by the Boilerplate tests
+# This workflow performs some checks on the Python client used by the ragger tests
 # It is there to help us maintain a level of quality in our codebase and does not have to be kept on forked
 # applications.
 
@@ -15,7 +15,7 @@ on:
 
 jobs:
   lint:
-    name: Boilerplate client linting
+    name: Client linting
     runs-on: ubuntu-latest
     steps:
       - name: Clone

.pre-commit-config.yaml

@@ -14,18 +14,18 @@ repos:
       - id: check-case-conflict
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v12.0.1
+    rev: v14.0.6
     hooks:
       - id: clang-format
         types_or: [c]
 
   - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-    rev: v1.7.6.22
+    rev: v1.7.7.23
     hooks:
       - id: actionlint
         types_or: [yaml]
@@ -38,7 +38,7 @@ repos:
         types_or: [markdown]
 
   - repo: https://github.com/PyCQA/pylint
-    rev: v3.3.3
+    rev: v3.3.6
     hooks:
       - id: pylint
         language: system

Makefile

@@ -28,7 +28,7 @@ APPNAME = "Boilerplate"
 # Application version
 APPVERSION_M = 2
 APPVERSION_N = 2
-APPVERSION_P = 0
+APPVERSION_P = 1
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 # Application source files

src/handler/sign_tx.c

@@ -134,4 +134,4 @@ int handler_sign_tx(buffer_t *cdata, uint8_t chunk, bool more) {
         }
     }
     return 0;
-}
+}

src/swap/handle_get_printable_amount.c

@@ -45,4 +45,4 @@ void swap_handle_get_printable_amount(get_printable_amount_parameters_t* params)
         PRINTF("Failed to convert amount to uint64_t\n");
     }
 }
-#endif  // HAVE_SWAP
+#endif  // HAVE_SWAP

src/swap/handle_swap.h

@@ -1,2 +1,2 @@
 #pragma once
-bool swap_check_validity(uint64_t amount, uint64_t fee, const uint8_t *destination);
+bool swap_check_validity(uint64_t amount, uint64_t fee, const uint8_t *destination);

src/swap/handle_swap_sign_transaction.c

@@ -127,4 +127,4 @@ bool swap_check_validity(uint64_t amount, uint64_t fee, const uint8_t* destinati
     }
     return true;
 }
-#endif  // HAVE_SWAP
+#endif  // HAVE_SWAP

tests/snapshots/flex/test_app_mainmenu/00006.png

@@ -2,8 +2,6 @@
 
 from ragger.backend.interface import BackendInterface
 from ragger.error import ExceptionRAPDU
-from ragger.firmware import Firmware
-from ragger.navigator import Navigator, NavInsID
 from ragger.navigator.navigation_scenario import NavigateWithScenario
 
 from application_client.boilerplate_transaction import Transaction
@@ -51,12 +49,7 @@ def test_sign_tx_short_tx(backend: BackendInterface, scenario_navigator: Navigat
 # In this test we send to the device a transaction to trig a blind-signing flow
 # The transaction is short and will be sent in one chunk
 # We will ensure that the displayed information is correct by using screenshots comparison
-def test_sign_tx_short_tx_blind_sign(firmware: Firmware,
-                                     backend: BackendInterface,
-                                     navigator: Navigator,
-                                     scenario_navigator: NavigateWithScenario,
-                                     test_name: str,
-                                     default_screenshot_path: str) -> None:
+def test_sign_tx_short_tx_blind_sign(backend: BackendInterface, scenario_navigator: NavigateWithScenario) -> None:
     # Use the app interface instead of raw interface
     client = BoilerplateCommandSender(backend)
     # The path used for this entire test
@@ -74,18 +67,11 @@ def test_sign_tx_short_tx_blind_sign(firmware: Firmware,
         memo="Blind-sign"
     ).serialize()
 
-    # Send the sign device instruction.
-    valid_instruction = [NavInsID.RIGHT_CLICK] if firmware.is_nano else [NavInsID.USE_CASE_CHOICE_REJECT]
     # As it requires on-screen validation, the function is asynchronous.
     # It will yield the result when the navigation is done
     with client.sign_tx(path=path, transaction=transaction):
-        navigator.navigate_and_compare(default_screenshot_path,
-                                        test_name+"/part1",
-                                        valid_instruction,
-                                        screen_change_after_last_instruction=False)
-
         # Validate the on-screen request by performing the navigation appropriate for this device
-        scenario_navigator.review_approve()
+        scenario_navigator.review_approve_with_warning(warning_path="part1")
 
     # The device as yielded the result, parse it and ensure that the signature is correct
     response = client.get_async_response().data