fix(cardano): update ledger dependencies and improve hardware wallet …

…integration (#1600)

packages/cardano/package.json

@@ -51,7 +51,7 @@
     "@cardano-sdk/wallet": "0.46.2",
     "@cardano-sdk/web-extension": "0.36.1",
     "@lace/common": "0.1.0",
-    "@ledgerhq/devices": "^8.2.1",
+    "@ledgerhq/devices": "^8.4.4",
     "@stablelib/chacha20poly1305": "1.0.1",
     "@trezor/transport": "^1.1.18",
     "bignumber.js": "9.0.1",

packages/cardano/src/wallet/lib/hardware-wallet.ts

@@ -5,7 +5,7 @@ import { HardwareWalletConnection, DeviceConnection, HardwareWallets, LedgerConn
 import * as HardwareLedger from '@cardano-sdk/hardware-ledger';
 import * as HardwareTrezor from '@cardano-sdk/hardware-trezor';
 import { WalletType } from '@cardano-sdk/web-extension';
-import { ledgerUSBVendorId } from '@ledgerhq/devices';
+import { DeviceModelId, getDeviceModel, ledgerUSBVendorId } from '@ledgerhq/devices';
 import { TREZOR_USB_DESCRIPTORS } from '@trezor/transport';
 
 const isTrezorHWSupported = (): boolean => process.env.USE_TREZOR_HW === 'true';
@@ -46,19 +46,35 @@ const isDeviceDescribedBy = (device: USBDevice, descriptors: Descriptor[]) =>
     (Object.entries(descriptor) as DescriptorEntries<Descriptor>).every(([key, value]) => device[key] === value)
   );
 
+/** ProductId returned by `navigator.usb.requestDevice` uses two bytes (e.g. `0x5000`), but the `productIMM`
+ * stores only the most significant byte (e.g. `0x50`). We need to shift to get the correct filter value.
+ */
+// eslint-disable-next-line no-bitwise, no-magic-numbers
+const productImmToID = (productId: number) => productId << 8;
 const ledgerNanoSWithNoAppOpenProductId = 4113;
 const ledgerNanoSWithCardanoAppOpenProductId = 4117;
 const ledgerNanoSPlusWithNoAppOpenProductId = 20_497;
 const ledgerNanoSPlusWithCardanoAppOpenProductId = 20_501;
 const ledgerNanoXWithNoAppOpenProductId = 16_401;
 const ledgerNanoXWithCardanoAppOpenProductId = 16_405;
+let ledgerProductIdFromLedgerHq: number[] = [];
+try {
+  ledgerProductIdFromLedgerHq = [
+    productImmToID(getDeviceModel(DeviceModelId.nanoS).productIdMM),
+    productImmToID(getDeviceModel(DeviceModelId.nanoSP).productIdMM),
+    productImmToID(getDeviceModel(DeviceModelId.nanoX).productIdMM)
+  ];
+} catch (error) {
+  console.error('Failed to get Ledger device model', error);
+}
 export const ledgerDescriptors = [
   ledgerNanoSWithNoAppOpenProductId,
   ledgerNanoSWithCardanoAppOpenProductId,
   ledgerNanoSPlusWithNoAppOpenProductId,
   ledgerNanoSPlusWithCardanoAppOpenProductId,
   ledgerNanoXWithNoAppOpenProductId,
-  ledgerNanoXWithCardanoAppOpenProductId
+  ledgerNanoXWithCardanoAppOpenProductId,
+  ...ledgerProductIdFromLedgerHq
 ].map((productId) => ({
   vendorId: ledgerUSBVendorId,
   productId

packages/nami/package.json

@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@biglup/is-cid": "^1.0.3",
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.4",
     "@cardano-sdk/core": "0.42.1",
     "@cardano-sdk/crypto": "0.1.32",
     "@cardano-sdk/tx-construction": "0.23.0",

yarn.lock

@@ -9060,18 +9060,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cardano-foundation/ledgerjs-hw-app-cardano@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "@cardano-foundation/ledgerjs-hw-app-cardano@npm:6.0.1"
-  dependencies:
-    "@ledgerhq/hw-transport": ^6.27.10
-    base-x: ^3.0.5
-    bech32: ^1.1.4
-    int64-buffer: ^1.0.1
-  checksum: 7c4dc9f272e625d894eb6c0ca49986903397fda35a8525bab7e08dc2d3652619acc0c310119f3f985fc31c8404f7c29ab1ee9b34b987f02187544968913b6f54
-  languageName: node
-  linkType: hard
-
 "@cardano-foundation/ledgerjs-hw-app-cardano@npm:^7.1.4":
   version: 7.1.4
   resolution: "@cardano-foundation/ledgerjs-hw-app-cardano@npm:7.1.4"
@@ -13597,7 +13585,7 @@ __metadata:
     "@cardano-sdk/web-extension": 0.36.1
     "@emurgo/cardano-message-signing-browser": 1.0.1
     "@lace/common": 0.1.0
-    "@ledgerhq/devices": ^8.2.1
+    "@ledgerhq/devices": ^8.4.4
     "@stablelib/chacha20poly1305": 1.0.1
     "@trezor/transport": ^1.1.18
     "@types/webextension-polyfill": 0.10.0
@@ -13755,7 +13743,7 @@ __metadata:
   resolution: "@lace/nami@workspace:packages/nami"
   dependencies:
     "@biglup/is-cid": ^1.0.3
-    "@cardano-foundation/ledgerjs-hw-app-cardano": ^6.0.0
+    "@cardano-foundation/ledgerjs-hw-app-cardano": ^7.1.4
     "@cardano-sdk/core": 0.42.1
     "@cardano-sdk/crypto": 0.1.32
     "@cardano-sdk/tx-construction": 0.23.0
@@ -13952,30 +13940,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ledgerhq/devices@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@ledgerhq/devices@npm:8.0.0"
-  dependencies:
-    "@ledgerhq/errors": ^6.12.3
-    "@ledgerhq/logs": ^6.10.1
-    rxjs: 6
-    semver: ^7.3.5
-  checksum: 467bc30c8e60753762e52de708d5231234be4c35e0e73e39f8a0d0c7cf795a566208de4687f491de801a0f5642b16ae7de6527813f5283e247b800066ae4c4d0
-  languageName: node
-  linkType: hard
-
-"@ledgerhq/devices@npm:^8.2.1":
-  version: 8.2.1
-  resolution: "@ledgerhq/devices@npm:8.2.1"
-  dependencies:
-    "@ledgerhq/errors": ^6.16.2
-    "@ledgerhq/logs": ^6.12.0
-    rxjs: ^7.8.1
-    semver: ^7.3.5
-  checksum: 5c7fa3004a4ebd30b0dcb8563642db308478bbec115102e5404dd0affcc99f880d094137e88c1f2cc064f78d65a5e946d5ebd8db89141977e32860885ea23ebe
-  languageName: node
-  linkType: hard
-
 "@ledgerhq/devices@npm:^8.4.4":
   version: 8.4.4
   resolution: "@ledgerhq/devices@npm:8.4.4"
@@ -13988,20 +13952,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ledgerhq/errors@npm:^6.12.3":
-  version: 6.12.3
-  resolution: "@ledgerhq/errors@npm:6.12.3"
-  checksum: 3284cbc85dc2df24f17a6e3899eb5afdff96e63d073b5914906c45ed8f1a93c7daa1e2b847d621610a1088b63c0abb9379e6b6ca395144c2d50855a4606c1d3f
-  languageName: node
-  linkType: hard
-
-"@ledgerhq/errors@npm:^6.16.2":
-  version: 6.16.2
-  resolution: "@ledgerhq/errors@npm:6.16.2"
-  checksum: 2dd796c78b8428339c8906cfe2325e62c211f484576835198a9bf4efc8fed38b4ca5d342bfb08aef6c623720753ea3e5ce77e50367f2808ad5610e3ff54cec70
-  languageName: node
-  linkType: hard
-
 "@ledgerhq/errors@npm:^6.19.1":
   version: 6.19.1
   resolution: "@ledgerhq/errors@npm:6.19.1"
@@ -14034,17 +13984,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ledgerhq/hw-transport@npm:^6.27.10":
-  version: 6.28.1
-  resolution: "@ledgerhq/hw-transport@npm:6.28.1"
-  dependencies:
-    "@ledgerhq/devices": ^8.0.0
-    "@ledgerhq/errors": ^6.12.3
-    events: ^3.3.0
-  checksum: 69bf0f72e112c0c2f538c66d0b1dd2b24b19f1fcf5d671fdcfd50838e86dc55702555e0c639bbc55889a42a8ebd07243ad31798c2ff237dc21a1573581caf5ab
-  languageName: node
-  linkType: hard
-
 "@ledgerhq/hw-transport@npm:^6.31.2, @ledgerhq/hw-transport@npm:^6.31.4":
   version: 6.31.4
   resolution: "@ledgerhq/hw-transport@npm:6.31.4"
@@ -14057,13 +13996,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ledgerhq/logs@npm:^6.10.1":
-  version: 6.10.1
-  resolution: "@ledgerhq/logs@npm:6.10.1"
-  checksum: 4dde46557d9daa6028f7040d26585aaa7260445212ad8348ae4a01463b7d76a1592dfc36921e47f5fc477c50b5d73e840070ac167e3cbe5b45123f36a4f96b08
-  languageName: node
-  linkType: hard
-
 "@ledgerhq/logs@npm:^6.12.0":
   version: 6.12.0
   resolution: "@ledgerhq/logs@npm:6.12.0"
@@ -53802,15 +53734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:6, rxjs@npm:^6.4.0, rxjs@npm:^6.6.3, rxjs@npm:^6.6.7":
-  version: 6.6.7
-  resolution: "rxjs@npm:6.6.7"
-  dependencies:
-    tslib: ^1.9.0
-  checksum: bc334edef1bb8bbf56590b0b25734ba0deaf8825b703256a93714308ea36dff8a11d25533671adf8e104e5e8f256aa6fdfe39b2e248cdbd7a5f90c260acbbd1b
-  languageName: node
-  linkType: hard
-
 "rxjs@npm:7.4.0, rxjs@npm:^7.4.0":
   version: 7.4.0
   resolution: "rxjs@npm:7.4.0"
@@ -53820,6 +53743,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^6.4.0, rxjs@npm:^6.6.3, rxjs@npm:^6.6.7":
+  version: 6.6.7
+  resolution: "rxjs@npm:6.6.7"
+  dependencies:
+    tslib: ^1.9.0
+  checksum: bc334edef1bb8bbf56590b0b25734ba0deaf8825b703256a93714308ea36dff8a11d25533671adf8e104e5e8f256aa6fdfe39b2e248cdbd7a5f90c260acbbd1b
+  languageName: node
+  linkType: hard
+
 "rxjs@npm:^7.8.0":
   version: 7.8.0
   resolution: "rxjs@npm:7.8.0"