From 872ebe3fe50c9932415c6941f1bfd450f5399f9a Mon Sep 17 00:00:00 2001
From: Mykhailo Kremniov <mkremniov@gmail.com>
Date: Tue, 11 Aug 2026 20:27:05 +0300
Subject: [PATCH] Update Ledger app repo revision; use specific version of
 ledger-app-dev-tools instead of "latest".

---
 .github/workflows/build.yml              | 10 ++++++++--
 Cargo.lock                               |  2 +-
 Cargo.toml                               |  7 +++++--
 wallet/src/signer/tests/generic_tests.rs |  2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a1d63fe25..d44342f96b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -363,7 +363,13 @@ jobs:
       matrix:
         model: [apex_p, flex, stax, nanox, nanosplus]
     env:
+      # This is used by the tests.
       LEDGER_TESTS_AUTO_CONFIRM: true
+      # This is only used directly in this job; the env var is only needed to avoid duplication.
+      # Note: using a specific version of the image instead of "latest" prevents breaking the CI
+      # when the latest image gets updated by Ledger (the latest image may require the app to use
+      # the latest SDK).
+      LEDGER_APP_DEV_TOOLS_IMAGE: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:5.3.19
     steps:
       - name: Checkout the core repository
         uses: actions/checkout@v5
@@ -397,7 +403,7 @@ jobs:
         run: |
           sudo docker run --rm \
             -v "$(realpath ./mintlayer-ledger-app):/app" \
-            ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest \
+            "$LEDGER_APP_DEV_TOOLS_IMAGE" \
             sh -c 'cargo ledger build ${{ matrix.model }}'
 
       - name: Run Ledger emulator and execute tests
@@ -407,7 +413,7 @@ jobs:
           sudo docker run -d --rm --name ledger-emulator \
             -v "$(realpath ./mintlayer-ledger-app):/app" \
             --publish 5000:5000 --publish 9999:9999 \
-            ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest \
+            "$LEDGER_APP_DEV_TOOLS_IMAGE" \
             sh -c 'speculos --apdu-port 9999 --api-port 5000 --display headless \
                -s "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about" \
                target/${{ matrix.model }}/release/mintlayer-app'
diff --git a/Cargo.lock b/Cargo.lock
index 3a8ba1f40c..b42075227e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5178,7 +5178,7 @@ dependencies = [
 [[package]]
 name = "mintlayer-messages"
 version = "1.0.0"
-source = "git+https://github.com/mintlayer/mintlayer-ledger-app?rev=16cc563caa5d3f746cc1b62608b88c3bdb284fa4#16cc563caa5d3f746cc1b62608b88c3bdb284fa4"
+source = "git+https://github.com/mintlayer/mintlayer-ledger-app?rev=25c7272424b1c55b2132dd22e4a921d617498993#25c7272424b1c55b2132dd22e4a921d617498993"
 dependencies = [
  "derive_more 2.1.1",
  "mintlayer-core-primitives",
diff --git a/Cargo.toml b/Cargo.toml
index 7831739095..441d128187 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -300,8 +300,11 @@ rev = "c8ed12e89788e78d77cdc0dc9fb8a4bd4dc24b89"
 
 [workspace.dependencies.mintlayer-ledger-messages]
 git = "https://github.com/mintlayer/mintlayer-ledger-app"
-# The commit "Merge pull request #23 from mintlayer/bugfixing"
-rev = "16cc563caa5d3f746cc1b62608b88c3bdb284fa4"
+# Note: whenever the revision is updated, check `LEDGER_APP_DEV_TOOLS_IMAGE` in `.github/workflows/build.yml`
+# and ensure that the image version is recent enough to be able to build this revision of the app (if the SDK
+# version has been upped in the app, `LEDGER_APP_DEV_TOOLS_IMAGE` should probably be upped too).
+# The commit "Fix fee calculation for ConcludeOrder; update sdk version".
+rev = "25c7272424b1c55b2132dd22e4a921d617498993"
 package = "mintlayer-messages"
 
 [workspace.dependencies.trezor-client]
diff --git a/wallet/src/signer/tests/generic_tests.rs b/wallet/src/signer/tests/generic_tests.rs
index 7e6b8b65a3..45a8434cc2 100644
--- a/wallet/src/signer/tests/generic_tests.rs
+++ b/wallet/src/signer/tests/generic_tests.rs
@@ -1589,6 +1589,8 @@ pub async fn test_sign_transaction_with_one_input_command_generic<MkS1, MkS2, S1
     );
     let orig_ptx = req.into_partially_signed_tx(ptx_additional_info).unwrap();
 
+    log::debug!("orig_ptx = {orig_ptx:?}");
+
     let mut signer = make_signer(chain_config.clone(), account.account_index());
     let (ptx, _, _) = signer
         .sign_tx(