Skip to content

Commit 6bb6007

Browse files
authored
Merge pull request #1928 from chainapsis/rowan/ledger-bump-gen5-support
feat: upgrade @ledgerhq/hw-transport for Nano Gen5 USB support
2 parents 6453e5e + c440db6 commit 6bb6007

4 files changed

Lines changed: 71 additions & 95 deletions

File tree

apps/extension/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"@keystonehq/hw-app-base": "0.1.1",
6262
"@keystonehq/hw-transport-webusb": "0.4.0",
6363
"@keystonehq/keystone-sdk": "^0.2.3",
64-
"@ledgerhq/devices": "^6.20.0",
6564
"@react-spring/web": "^9.6.1",
6665
"@toruslabs/fetch-node-details": "=14.2.0",
6766
"@toruslabs/torus.js": "=15.1.1",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
"resolutions": {
104104
"@types/react": "^18.2.19",
105105
"@types/react-dom": "^18.2.7",
106+
"@ledgerhq/hw-transport": "^6.35.0",
106107
"@iov/crypto": "2.1.0",
107108
"@walletconnect/jsonrpc-types": "^1.0.4",
108109
"@walletconnect/sign-client": "=2.10.5",

packages/background/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
"@keplr-wallet/unit": "0.13.23",
4747
"@ledgerhq/hw-app-eth": "6.42.8",
4848
"@ledgerhq/hw-app-starknet": "^3.0.1",
49-
"@ledgerhq/hw-transport": "^6.31.4",
50-
"@ledgerhq/hw-transport-webhid": "^6.29.4",
51-
"@ledgerhq/hw-transport-webusb": "^6.29.4",
49+
"@ledgerhq/hw-transport": "^6.35.0",
50+
"@ledgerhq/hw-transport-webhid": "^6.35.0",
51+
"@ledgerhq/hw-transport-webusb": "^6.34.0",
5252
"@noble/hashes": "^1.4.0",
5353
"aes-js": "^3.1.2",
5454
"big-integer": "^1.6.48",

yarn.lock

Lines changed: 67 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -6529,9 +6529,9 @@ __metadata:
65296529
"@keplr-wallet/unit": 0.13.23
65306530
"@ledgerhq/hw-app-eth": 6.42.8
65316531
"@ledgerhq/hw-app-starknet": ^3.0.1
6532-
"@ledgerhq/hw-transport": ^6.31.4
6533-
"@ledgerhq/hw-transport-webhid": ^6.29.4
6534-
"@ledgerhq/hw-transport-webusb": ^6.29.4
6532+
"@ledgerhq/hw-transport": ^6.35.0
6533+
"@ledgerhq/hw-transport-webhid": ^6.35.0
6534+
"@ledgerhq/hw-transport-webusb": ^6.34.0
65356535
"@noble/hashes": ^1.4.0
65366536
"@types/aes-js": ^3.1.0
65376537
"@types/secp256k1": ^4.0.1
@@ -6685,7 +6685,6 @@ __metadata:
66856685
"@keystonehq/hw-app-base": 0.1.1
66866686
"@keystonehq/hw-transport-webusb": 0.4.0
66876687
"@keystonehq/keystone-sdk": ^0.2.3
6688-
"@ledgerhq/devices": ^6.20.0
66896688
"@react-spring/web": ^9.6.1
66906689
"@storybook/addon-actions": ^7.6.18
66916690
"@storybook/addon-docs": ^7.6.18
@@ -7541,27 +7540,15 @@ __metadata:
75417540
languageName: node
75427541
linkType: hard
75437542

7544-
"@ledgerhq/devices@npm:^6.20.0":
7545-
version: 6.20.0
7546-
resolution: "@ledgerhq/devices@npm:6.20.0"
7543+
"@ledgerhq/devices@npm:8.14.0":
7544+
version: 8.14.0
7545+
resolution: "@ledgerhq/devices@npm:8.14.0"
75477546
dependencies:
7548-
"@ledgerhq/errors": ^6.10.0
7549-
"@ledgerhq/logs": ^6.10.0
7550-
rxjs: 6
7551-
semver: ^7.3.5
7552-
checksum: 67246ffe6d6b95e3ec2f6ce2f02eeb138397911f7018c1055ec8ed103e9790b4f825754e2f0e64f554e90f698fec05e2c80abf2bf3ec3c0eecc490acf4c21ad7
7553-
languageName: node
7554-
linkType: hard
7555-
7556-
"@ledgerhq/devices@npm:^8.4.4":
7557-
version: 8.4.4
7558-
resolution: "@ledgerhq/devices@npm:8.4.4"
7559-
dependencies:
7560-
"@ledgerhq/errors": ^6.19.1
7561-
"@ledgerhq/logs": ^6.12.0
7562-
rxjs: ^7.8.1
7563-
semver: ^7.3.5
7564-
checksum: 370fb38d484665c92165580e285cc792e7af0bf114a5d1e855aec602c6e39592090d0de7a43addeb4c13622f734ddd4f25be82f07507e14550753ce5473eea66
7547+
"@ledgerhq/errors": ^6.33.0
7548+
"@ledgerhq/logs": ^6.17.0
7549+
rxjs: 7.8.2
7550+
semver: 7.7.3
7551+
checksum: 46a58d3905bcaa6a5e3c627dc35c65170c2474af95adccf4b22b6cfffffe284cfee3ab45f69d2b9b0cd45bd05ccb88254e4a1351e6dc0ba69fd4ee407453d14a
75657552
languageName: node
75667553
linkType: hard
75677554

@@ -7580,13 +7567,6 @@ __metadata:
75807567
languageName: node
75817568
linkType: hard
75827569

7583-
"@ledgerhq/errors@npm:^6.10.0":
7584-
version: 6.10.0
7585-
resolution: "@ledgerhq/errors@npm:6.10.0"
7586-
checksum: d9fab0e6ae164a605dc7929c31bda43d4c2d42b5070786ce429e1cfc1cd05b85e15d27c5c403304936711077a45d3d8989eb582b809a73bd19af252182546920
7587-
languageName: node
7588-
linkType: hard
7589-
75907570
"@ledgerhq/errors@npm:^6.19.1":
75917571
version: 6.19.1
75927572
resolution: "@ledgerhq/errors@npm:6.19.1"
@@ -7601,6 +7581,13 @@ __metadata:
76017581
languageName: node
76027582
linkType: hard
76037583

7584+
"@ledgerhq/errors@npm:^6.33.0":
7585+
version: 6.33.0
7586+
resolution: "@ledgerhq/errors@npm:6.33.0"
7587+
checksum: 19514c9fde16b8992e77ec6661974538a6128eeea9e9c15f5e3f3ea06c65e69643602424ecdb8321eeee5caa47f3f54b01d947bfc04eb31e7faaed881a4d1c5c
7588+
languageName: node
7589+
linkType: hard
7590+
76047591
"@ledgerhq/evm-tools@npm:^1.4.0":
76057592
version: 1.7.9
76067593
resolution: "@ledgerhq/evm-tools@npm:1.7.9"
@@ -7661,50 +7648,39 @@ __metadata:
76617648
languageName: node
76627649
linkType: hard
76637650

7664-
"@ledgerhq/hw-transport-webhid@npm:^6.29.4":
7665-
version: 6.29.4
7666-
resolution: "@ledgerhq/hw-transport-webhid@npm:6.29.4"
7651+
"@ledgerhq/hw-transport-webhid@npm:^6.35.0":
7652+
version: 6.35.0
7653+
resolution: "@ledgerhq/hw-transport-webhid@npm:6.35.0"
76677654
dependencies:
7668-
"@ledgerhq/devices": ^8.4.4
7669-
"@ledgerhq/errors": ^6.19.1
7670-
"@ledgerhq/hw-transport": ^6.31.4
7671-
"@ledgerhq/logs": ^6.12.0
7672-
checksum: 3aab5ee821a2b9cf7c15f967e51413708d70178514b6d1684206c5038a08cb95ed654d9ca2a7260bde5e50d53729272957aabb5779beb004aeef48de487a27ae
7673-
languageName: node
7674-
linkType: hard
7675-
7676-
"@ledgerhq/hw-transport-webusb@npm:^6.29.4":
7677-
version: 6.29.4
7678-
resolution: "@ledgerhq/hw-transport-webusb@npm:6.29.4"
7679-
dependencies:
7680-
"@ledgerhq/devices": ^8.4.4
7681-
"@ledgerhq/errors": ^6.19.1
7682-
"@ledgerhq/hw-transport": ^6.31.4
7683-
"@ledgerhq/logs": ^6.12.0
7684-
checksum: 430afb3b71a3225438c3420c29c43945a38d9c8fef1aade7cd844e37d22ae981da7d0f11c75794e2a478cae4a2984cd41b249b674087b566124111d245fdfb75
7655+
"@ledgerhq/devices": 8.14.0
7656+
"@ledgerhq/errors": ^6.33.0
7657+
"@ledgerhq/hw-transport": 6.35.0
7658+
"@ledgerhq/logs": ^6.17.0
7659+
checksum: 6bbca98e82e62a93bbd3c9e5860958b7b6cb4e0f099249d71814a930d7a8707d6f53cc1da4e26b6f05f937d4175285fe6875359459b9fa554687f4197da4c21a
76857660
languageName: node
76867661
linkType: hard
76877662

7688-
"@ledgerhq/hw-transport@npm:^6.20.0":
7689-
version: 6.20.0
7690-
resolution: "@ledgerhq/hw-transport@npm:6.20.0"
7663+
"@ledgerhq/hw-transport-webusb@npm:^6.34.0":
7664+
version: 6.34.0
7665+
resolution: "@ledgerhq/hw-transport-webusb@npm:6.34.0"
76917666
dependencies:
7692-
"@ledgerhq/devices": ^6.20.0
7693-
"@ledgerhq/errors": ^6.10.0
7694-
events: ^3.3.0
7695-
checksum: 89ecfeba2b2e179a665325603d74c7aa85042d1268bbb6f0cd023e15510cda468a3f162ba9140134fe1c1f24832765fbe5a99f396caaa67b2a5914ea02ab07c4
7667+
"@ledgerhq/devices": 8.14.0
7668+
"@ledgerhq/errors": ^6.33.0
7669+
"@ledgerhq/hw-transport": 6.35.0
7670+
"@ledgerhq/logs": ^6.17.0
7671+
checksum: 3ad0a4f55e40538dbcb65e0001f6ff0f4219cb0f1cb2ef8a17f33c133df2f3699ea689366ba53dc030f37c7637fcbce8fb7c57061c44676629f2fe327eb705d4
76967672
languageName: node
76977673
linkType: hard
76987674

7699-
"@ledgerhq/hw-transport@npm:^6.31.2, @ledgerhq/hw-transport@npm:^6.31.4":
7700-
version: 6.31.4
7701-
resolution: "@ledgerhq/hw-transport@npm:6.31.4"
7675+
"@ledgerhq/hw-transport@npm:^6.35.0":
7676+
version: 6.35.0
7677+
resolution: "@ledgerhq/hw-transport@npm:6.35.0"
77027678
dependencies:
7703-
"@ledgerhq/devices": ^8.4.4
7704-
"@ledgerhq/errors": ^6.19.1
7705-
"@ledgerhq/logs": ^6.12.0
7679+
"@ledgerhq/devices": 8.14.0
7680+
"@ledgerhq/errors": ^6.33.0
7681+
"@ledgerhq/logs": ^6.17.0
77067682
events: ^3.3.0
7707-
checksum: bb5204513f2df3dbb646265954d1539bf6117cc08e73a4d1761ec10cb5f8255fe2b30112debc2433608de7260ee8878340c9f67690f5f62447a1466daa241ea7
7683+
checksum: 09aa4b5685088159039d96c02920791e1f87e7a179180b35be80f5f237d798eb2f7cd00bf611b1cd1edc9e8e42cd8733d686dd525bd7d0cf00851658d6fdf48e
77087684
languageName: node
77097685
linkType: hard
77107686

@@ -7718,13 +7694,6 @@ __metadata:
77187694
languageName: node
77197695
linkType: hard
77207696

7721-
"@ledgerhq/logs@npm:^6.10.0":
7722-
version: 6.10.0
7723-
resolution: "@ledgerhq/logs@npm:6.10.0"
7724-
checksum: 6194311890ccc3879fb1371e37a6ca67e7e13ea67199885b15ba8dd1c6613f31fd52a5248bdc541c2d2632aadd099af34524adc34f0e0f94732ba3ff6e3069fe
7725-
languageName: node
7726-
linkType: hard
7727-
77287697
"@ledgerhq/logs@npm:^6.12.0":
77297698
version: 6.12.0
77307699
resolution: "@ledgerhq/logs@npm:6.12.0"
@@ -7739,6 +7708,13 @@ __metadata:
77397708
languageName: node
77407709
linkType: hard
77417710

7711+
"@ledgerhq/logs@npm:^6.17.0":
7712+
version: 6.17.0
7713+
resolution: "@ledgerhq/logs@npm:6.17.0"
7714+
checksum: 2bdf70dd526a718a23e56436223da83178ad830f246cdfa4a06abc750d97e5f11d76f844e3255ca2afe43dfb6804b1d852b4fd8b7a95a5d276586fada57d42a2
7715+
languageName: node
7716+
linkType: hard
7717+
77427718
"@ledgerhq/types-live@npm:^6.61.0, @ledgerhq/types-live@npm:^6.87.0":
77437719
version: 6.87.0
77447720
resolution: "@ledgerhq/types-live@npm:6.87.0"
@@ -32259,7 +32235,16 @@ __metadata:
3225932235
languageName: node
3226032236
linkType: hard
3226132237

32262-
"rxjs@npm:6, rxjs@npm:^6.6.7":
32238+
"rxjs@npm:7.8.2, rxjs@npm:^7.8.2":
32239+
version: 7.8.2
32240+
resolution: "rxjs@npm:7.8.2"
32241+
dependencies:
32242+
tslib: ^2.1.0
32243+
checksum: 2f233d7c832a6c255dabe0759014d7d9b1c9f1cb2f2f0d59690fd11c883c9826ea35a51740c06ab45b6ade0d9087bde9192f165cba20b6730d344b831ef80744
32244+
languageName: node
32245+
linkType: hard
32246+
32247+
"rxjs@npm:^6.6.7":
3226332248
version: 6.6.7
3226432249
resolution: "rxjs@npm:6.6.7"
3226532250
dependencies:
@@ -32277,15 +32262,6 @@ __metadata:
3227732262
languageName: node
3227832263
linkType: hard
3227932264

32280-
"rxjs@npm:^7.8.2":
32281-
version: 7.8.2
32282-
resolution: "rxjs@npm:7.8.2"
32283-
dependencies:
32284-
tslib: ^2.1.0
32285-
checksum: 2f233d7c832a6c255dabe0759014d7d9b1c9f1cb2f2f0d59690fd11c883c9826ea35a51740c06ab45b6ade0d9087bde9192f165cba20b6730d344b831ef80744
32286-
languageName: node
32287-
linkType: hard
32288-
3228932265
"sade@npm:^1.7.3":
3229032266
version: 1.8.1
3229132267
resolution: "sade@npm:1.8.1"
@@ -32543,6 +32519,15 @@ __metadata:
3254332519
languageName: node
3254432520
linkType: hard
3254532521

32522+
"semver@npm:7.7.3, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.5.3, semver@npm:^7.6.3, semver@npm:^7.7.2":
32523+
version: 7.7.3
32524+
resolution: "semver@npm:7.7.3"
32525+
bin:
32526+
semver: bin/semver.js
32527+
checksum: f013a3ee4607857bcd3503b6ac1d80165f7f8ea94f5d55e2d3e33df82fce487aa3313b987abf9b39e0793c83c9fc67b76c36c067625141a9f6f704ae0ea18db2
32528+
languageName: node
32529+
linkType: hard
32530+
3254632531
"semver@npm:7.x, semver@npm:^7.3.5":
3254732532
version: 7.3.5
3254832533
resolution: "semver@npm:7.3.5"
@@ -32572,15 +32557,6 @@ __metadata:
3257232557
languageName: node
3257332558
linkType: hard
3257432559

32575-
"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.5.3, semver@npm:^7.6.3, semver@npm:^7.7.2":
32576-
version: 7.7.3
32577-
resolution: "semver@npm:7.7.3"
32578-
bin:
32579-
semver: bin/semver.js
32580-
checksum: f013a3ee4607857bcd3503b6ac1d80165f7f8ea94f5d55e2d3e33df82fce487aa3313b987abf9b39e0793c83c9fc67b76c36c067625141a9f6f704ae0ea18db2
32581-
languageName: node
32582-
linkType: hard
32583-
3258432560
"semver@npm:^7.3.2, semver@npm:^7.3.4":
3258532561
version: 7.3.4
3258632562
resolution: "semver@npm:7.3.4"

0 commit comments

Comments
 (0)