ledger: use NanoX

NanoS support has been dropped: LedgerHQ/app-bitcoin-new#262

NanoX also makes it possible to test MuSig2 in the future.

Keep NanoS for legacy.

Author: Sjors

.github/actions/install-sim/action.yml

@@ -66,7 +66,8 @@ runs:
     - if: inputs.device == 'ledger'
       uses: actions/download-artifact@v4
       with:
-        name: ledger_app
+        name: ${{ inputs.device == 'ledger-legacy' && 'ledger_app_nano_s' || 'ledger_app_nano_x' }}
+
 
     - if: inputs.device == 'ledger'
       shell: bash

.github/workflows/ci.yml

@@ -232,8 +232,8 @@ jobs:
       - uses: ./.github/actions/build-sim
 
 
-  ledger-app-builder:
-    name: Ledger App builder
+  ledger-s-app-builder:
+    name: Ledger Nano S Bitcoin App builder
     runs-on: ubuntu-latest
     container: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
@@ -244,7 +244,23 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: ledger_app
+          name: ledger_app_nano_s
+          path: app-bitcoin-new/bin/app.elf
+
+
+  ledger-x-app-builder:
+    name: Ledger Nano X Bitcoin App builder
+    runs-on: ubuntu-latest
+    container: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+    steps:
+      - run: |
+          git clone https://github.com/LedgerHQ/app-bitcoin-new.git
+          cd app-bitcoin-new
+          make DEBUG=1 BOLOS_SDK=$NANOX_SDK
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ledger_app_nano_x
           path: app-bitcoin-new/bin/app.elf
 
   bitcoind-builder:
@@ -451,7 +467,7 @@ jobs:
   test-ledger:
     name: Python ${{ matrix.python-version }} ${{ matrix.device }} ${{ matrix.interface }}
     runs-on: ubuntu-latest
-    needs: [ sim-builder-ledger, ledger-app-builder, bitcoind-builder ]
+    needs: [ sim-builder-ledger, ledger-s-app-builder, ledger-x-app-builder, bitcoind-builder ]
     timeout-minutes: 45
 
     strategy:

test/data/speculos-automation.json

@@ -2,7 +2,7 @@
     "version": 1,
     "rules": [
         {
-            "regexp": "^(Address|Review|Amount|Fee|Confirm|The derivation|Derivation path|Reject if you're|The change path|Change path|external inputs|Register wallet|Policy map|Key|Path|Public key|Spend from|Wallet name|Wallet policy).*",
+            "regexp": "^(Address|Review|Amount|Fee|Confirm|The derivation|Derivation path|Reject if you're|The change path|Change path|external inputs|Register wallet|Register account|Policy map|Key|Path|Public key|Spend from|Account name|Wallet name|Wallet policy|Descriptor template).*",
             "actions": [
                 [ "button", 2, true ],
                 [ "button", 2, false ]

test/test_ledger.py

@@ -52,7 +52,7 @@ def start(self):
         super().start()
         automation_path = os.path.abspath("data/speculos-automation.json")
         app_path = "./apps/nanos#btc#2.0#ce796c1b.elf" if self.legacy else "./apps/btc-test.elf"
-        os.environ["SPECULOS_APPNAME"] = "Bitcoin Test:1.6.0" if self.legacy else "Bitcoin Test:2.1.0"
+        os.environ["SPECULOS_APPNAME"] = "Bitcoin Test:1.6.0" if self.legacy else "Bitcoin Test:2.4.1"
 
         self.emulator_stderr = open('ledger-emulator.stderr', 'a')
         # Start the emulator
@@ -70,7 +70,7 @@ def start(self):
                 'seproxyhal:DEBUG',
                 '--api-port',
                 '0',
-                '--model', 'nanos',
+                '--model', 'nanos' if self.legacy else 'nanox',
                 app_path
             ],
             cwd=os.path.dirname(self.emulator_path),