Skip to content

Commit 2986651

Browse files
committed
Change ledger-lib and ledger-proto source to point to github.com/ledger-community instead of a custom fork. Update revisions of mintlayer-core-primitives and mintlayer-ledger-messages. Make LEDGER_TESTS_AUTO_CONFIRM true by default, to match the corresponding Trezor behaviour. Silence cargo-deny error about rand being unsound. Update rustls-webpki to fix a vulnerability.
Update the Trezor repo referencve again.
1 parent d067c0b commit 2986651

6 files changed

Lines changed: 47 additions & 45 deletions

File tree

Cargo.lock

Lines changed: 11 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -280,28 +280,30 @@ zeroize = "1.5"
280280

281281
[workspace.dependencies.ml_primitives]
282282
git = "https://github.com/mintlayer/mintlayer-core-primitives"
283-
# The commit "Add CoinType used for Ledger and encode/decode utils".
284-
rev = "13b10dbc88efdf3b5aa31ece8e34278bc69a5a9b"
283+
# The commit "Merge pull request #4 from mintlayer/fix_typo".
284+
rev = "8644bfe06d932d687075939d2d175183ba1c369d"
285285
package = "mintlayer-core-primitives"
286286

287287
[workspace.dependencies.ledger-lib]
288-
git = "https://github.com/ImplOfAnImpl/rust-ledger.git"
289-
rev = "035789ec436d47b938e8a3d2085ffb2fbf6f0559"
288+
git = "https://github.com/ledger-community/rust-ledger.git"
289+
# Note: we need this PR - https://github.com/ledger-community/rust-ledger/pull/14
290+
rev = "c8ed12e89788e78d77cdc0dc9fb8a4bd4dc24b89"
290291

291292
[workspace.dependencies.ledger-proto]
292-
git = "https://github.com/ImplOfAnImpl/rust-ledger.git"
293-
rev = "035789ec436d47b938e8a3d2085ffb2fbf6f0559"
293+
git = "https://github.com/ledger-community/rust-ledger.git"
294+
# The revision must be the same as for ledger-lib.
295+
rev = "c8ed12e89788e78d77cdc0dc9fb8a4bd4dc24b89"
294296

295297
[workspace.dependencies.mintlayer-ledger-messages]
296298
git = "https://github.com/mintlayer/mintlayer-ledger-app"
297-
# The commit "Move StatusWord to messages crate"
298-
rev = "dbc41342564b2198037ed4ad41b4cf0c34617870"
299+
# The commit "Update mintlayer-core-primitives repo revision. Enable disabled CI workflows. ..."
300+
rev = "ffe0d6256877c1b4b18b2e4a27bdeeaa7fc5a2ff"
299301
package = "messages"
300302

301303
[workspace.dependencies.trezor-client]
302304
git = "https://github.com/mintlayer/mintlayer-trezor-firmware"
303-
# The commit "Fix Mintlayer code after merge with v2.11.0"
304-
rev = "fda0c12fc408ab96d4bd0fc3e796e00c622642db"
305+
# The commit "Fix Mintlayer code after merge with v2.11.0. Update revisions of mintlayer-core-primitives and parity-scale-codec."
306+
rev = "596b3ebf536b438156132406d2e3a3f4dde53ebc"
305307
features = ["bitcoin", "mintlayer"]
306308

307309
[workspace.metadata.dist.dependencies.apt]
@@ -346,10 +348,13 @@ opt-level = 2
346348
# TODO: investigate this further.
347349
fontconfig-parser = { git = "https://github.com/Riey/fontconfig-parser", rev = "f7d13a779e6ee282ce75acbc00a1270c0350e0c2" }
348350

349-
# This patch is needed because there is no release of the library and because ledger-lib depends on ledger-proto, so this is the only way to make the former find the latter.
350-
# Note that the revision specified here must be the same as the one used in the workspace.dependencies section
351-
ledger-proto = { git = "https://github.com/ImplOfAnImpl/rust-ledger.git", rev = "035789ec436d47b938e8a3d2085ffb2fbf6f0559" }
352-
# The specific commit is chosen because it contains a fix for the Ledger NanoX,
353-
# and we use the same version across all Trezor, Ledger and Mintlayerr core primitives repos
354-
# If a different version is used the tests in Mintlayer core will stop compiling
351+
# This patch is needed because there is no release of the library and because ledger-lib depends on ledger-proto, so this
352+
# is the only way to make the former find the latter.
353+
# Note that the revision specified here must be the same as the one used in the workspace.dependencies section.
354+
ledger-proto = { git = "https://github.com/ledger-community/rust-ledger.git", rev = "c8ed12e89788e78d77cdc0dc9fb8a4bd4dc24b89" }
355+
356+
# Use a specific commit because we need a fix (github.com/paritytech/parity-scale-codec/pull/751)
357+
# that has not been released yet (should be part of the release coming after v3.7.5).
358+
# Note that the fix is needed for the Ledger app, but we have to use the same version of parity-scale-codec
359+
# across Trezor, Ledger, mintlayer-core and mintlayer-core-primitives repos.
355360
parity-scale-codec = { git = "https://github.com/paritytech/parity-scale-codec.git", rev = "5021525697edc0661591ebc71392c48d950a10b0" }

deny.toml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ db-path = "~/.cargo/advisory-dbs"
4444
db-urls = ["https://github.com/RustSec/advisory-db"]
4545
yanked = "warn"
4646
ignore = [
47-
"RUSTSEC-2024-0436", # "paste" is no longer maintained
48-
"RUSTSEC-2025-0141", # "bincode" is no longer maintained
47+
# "paste" is no longer maintained.
48+
"RUSTSEC-2024-0436",
49+
50+
# "bincode" is no longer maintained.
51+
"RUSTSEC-2025-0141",
52+
53+
# `rand` is unsound.
54+
# Note: to fix the error we need to upgrade `rand` to either 0.9.3 or 0.10.1, which is non-trivial
55+
# because some of our dependencies still use 0.8.x and earlier versions.
56+
"RUSTSEC-2026-0097"
4957
]

supply-chain/config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,11 +713,11 @@ version = "0.10.4"
713713
criteria = "safe-to-deploy"
714714

715715
[[exemptions.ledger-lib]]
716-
version = "0.1.0@git:035789ec436d47b938e8a3d2085ffb2fbf6f0559"
716+
version = "0.1.0@git:c8ed12e89788e78d77cdc0dc9fb8a4bd4dc24b89"
717717
criteria = "safe-to-deploy"
718718

719719
[[exemptions.ledger-proto]]
720-
version = "0.1.0@git:035789ec436d47b938e8a3d2085ffb2fbf6f0559"
720+
version = "0.1.0@git:c8ed12e89788e78d77cdc0dc9fb8a4bd4dc24b89"
721721
criteria = "safe-to-deploy"
722722

723723
[[exemptions.libdbus-sys]]

supply-chain/imports.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,8 +1430,8 @@ user-login = "cpu"
14301430
user-name = "Daniel McCarney"
14311431

14321432
[[publisher.rustls-webpki]]
1433-
version = "0.103.10"
1434-
when = "2026-03-20"
1433+
version = "0.103.12"
1434+
when = "2026-04-14"
14351435
user-id = 2751
14361436
user-login = "ctz"
14371437
user-name = "Joe Birr-Pixton"

wallet/src/signer/ledger_signer/tests/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fn emulator_apdu_port() -> u16 {
8686
}
8787

8888
fn should_auto_confirm() -> bool {
89-
bool_from_env("LEDGER_TESTS_AUTO_CONFIRM").unwrap().unwrap_or(false)
89+
bool_from_env("LEDGER_TESTS_AUTO_CONFIRM").unwrap().unwrap_or(true)
9090
}
9191

9292
async fn auto_confirmer(mut control_msg_rx: mpsc::Receiver<ControlMessage>, handle: Handle) {

0 commit comments

Comments
 (0)