Merge pull request #2975 from input-output-hk/feature/ddw-1092-support-for-ledger-nano-s-plus

Author: danielmain

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### Features
 
+- Added support for Ledger Nano S Plus ([PR 2975](https://github.com/input-output-hk/daedalus/pull/2975))
+
+## 4.10.0
+
+### Features
+
 - Implemented hover tooltips for menu ([PR 2938](https://github.com/input-output-hk/daedalus/pull/2938))
 - Improved UI regarding the Hardware Wallet public key export error ([PR 2922](https://github.com/input-output-hk/daedalus/pull/2922))
 - Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))

hardware-wallet-tests/connect-multiple-hardware-wallets.ts

@@ -19,6 +19,7 @@ export const run = () => {
   createTestInstructions([
     'Start test runner',
     'Plug Ledger Nano S to your computer',
+    'Plug Ledger Nano S Plus to your computer',
     'Plug Ledger Nano X to your computer',
   ]);
 
@@ -27,6 +28,10 @@ export const run = () => {
       disconnected: false,
       deviceModel: 'nanoS',
     },
+    {
+      disconnected: false,
+      deviceModel: 'nanoSP',
+    },
     {
       disconnected: false,
       deviceModel: 'nanoX',

hardware-wallet-tests/disconnect-multiple-hardware-wallets.ts

@@ -14,6 +14,10 @@ const getNextExpectedSequence = createSequentialResult([
     disconnected: false,
     deviceModel: 'nanoS',
   },
+  {
+    disconnected: false,
+    deviceModel: 'nanoSP',
+  },
   {
     disconnected: false,
     deviceModel: 'nanoX',
@@ -22,6 +26,10 @@ const getNextExpectedSequence = createSequentialResult([
     disconnected: true,
     deviceModel: 'nanoS',
   },
+  {
+    disconnected: true,
+    deviceModel: 'nanoSP',
+  },
   {
     disconnected: true,
     deviceModel: 'nanoX',
@@ -37,8 +45,10 @@ export const run = () => {
 
   createTestInstructions([
     'Connect Nano S',
+    'Connect Nano S Plus',
     'Connect Nano X',
     'Disconnect Nano S',
+    'Disconnect Nano S Plus',
     'Disconnect Nano X',
   ]);
 

package.json

@@ -198,7 +198,7 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "5.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
-    "@ledgerhq/hw-transport-node-hid": "5.51.1",
+    "@ledgerhq/hw-transport-node-hid": "6.27.1",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
     "bignumber.js": "9.0.1",

source/common/types/hardware-wallets.types.ts

@@ -1,7 +1,7 @@
 import { BridgeInfo, Device as TrezorDevice, UdevInfo } from 'trezor-connect';
 
 export type BIP32Path = Array<number>;
-export type LedgerModel = 'nanoS' | 'nanoX';
+export type LedgerModel = 'nanoS' | 'nanoSP' | 'nanoX';
 export type TrezorModel = '1' | 'T';
 export type DeviceType = 'ledger' | 'trezor';
 export type DeviceEvent =
@@ -24,11 +24,13 @@ export type DeviceEvent =
   | 'unreadable-device';
 export const DeviceModels: {
   LEDGER_NANO_S: LedgerModel;
+  LEDGER_NANO_S_PLUS: LedgerModel;
   LEDGER_NANO_X: LedgerModel;
   TREZOR_ONE: TrezorModel;
   TREZOR_T: TrezorModel;
 } = {
   LEDGER_NANO_S: 'nanoS',
+  LEDGER_NANO_S_PLUS: 'nanoSP',
   LEDGER_NANO_X: 'nanoX',
   TREZOR_ONE: '1',
   TREZOR_T: 'T',

source/main/ipc/getHardwareWalletChannel.ts

@@ -21,6 +21,7 @@ import { IpcSender } from '../../common/ipc/lib/IpcChannel';
 import { logger } from '../utils/logging';
 import {
   HardwareWalletTransportDeviceRequest,
+  LedgerDevicePayload,
   TransportDevice,
 } from '../../common/types/hardware-wallets.types';
 
@@ -79,6 +80,19 @@ class EventObserver {
           if (!devicesMemo[device.path]) {
             logger.info('[HW-DEBUG] CONSTRUCTOR ADD');
 
+            const walletData: LedgerDevicePayload = {
+              disconnected: false,
+              deviceType: 'ledger',
+              deviceId: null,
+              // Available only when Cardano APP opened
+              deviceModel: deviceModel.id,
+              // e.g. nanoS
+              deviceName: deviceModel.productName,
+              // e.g. Test Name
+              path: device.path,
+              product: device.product,
+            };
+
             try {
               const transport = await TransportNodeHid.open(device.path);
               const AdaConnection = new AppAda(transport);
@@ -88,22 +102,14 @@ class EventObserver {
                 AdaConnection,
               };
               this.getHardwareWalletConnectionChannel.send(
-                {
-                  disconnected: false,
-                  deviceType: 'ledger',
-                  deviceId: null,
-                  // Available only when Cardano APP opened
-                  deviceModel: deviceModel.id,
-                  // e.g. nanoS
-                  deviceName: deviceModel.productName,
-                  // e.g. Test Name
-                  path: device.path,
-                  product: device.product,
-                },
+                walletData,
                 this.mainWindow
               );
-            } catch (e) {
-              logger.info('[HW-DEBUG] CONSTRUCTOR error');
+            } catch (error) {
+              logger.error('[HW-DEBUG] CONSTRUCTOR error', {
+                walletData,
+                error,
+              });
             }
           }
         } else {

source/main/ipc/hardwareWallets/ledger/deviceDetection/deviceDetection.ts

@@ -27,15 +27,19 @@ export const deviceDetection = (
 ) => {
   // detect existing connected devices without blocking the subscription registration
   // https://github.com/LedgerHQ/ledgerjs/blob/master/packages/hw-transport-node-hid-singleton/src/TransportNodeHid.ts#L56
-  Promise.resolve(DeviceTracker.getDevices()).then((devices) => {
-    // this needs to run asynchronously so the subscription is defined during this phase
-    for (const device of devices) {
-      onAdd({
-        type: 'add',
-        ...DeviceTracker.getTrackedDeviceByPath(device.path),
-      });
-    }
-  });
+  Promise.resolve(DeviceTracker.getDevices())
+    .then((devices) => {
+      // this needs to run asynchronously so the subscription is defined during this phase
+      for (const device of devices) {
+        onAdd({
+          type: 'add',
+          ...DeviceTracker.getTrackedDeviceByPath(device.path),
+        });
+      }
+    })
+    .catch((e) => {
+      logger.error(`[HW-DEBUG] ERROR getting devices ${JSON.stringify(e)}`);
+    });
 
   const handleOnAdd = (trackedDevice: TrackedDevice) =>
     onAdd({ type: 'add', ...trackedDevice });
@@ -48,6 +52,7 @@ export const deviceDetection = (
 };
 
 export const waitForDevice = () => {
+  logger.debug('[HW-DEBUG] Wait for device ...');
   return new Promise<TrackedDevice>((resolve) => {
     const currentDevices = DeviceTracker.getDevices();
 

source/main/ipc/hardwareWallets/ledger/deviceDetection/deviceTracker.ts

@@ -33,7 +33,7 @@ export class DeviceTracker {
   constructor() {
     this.knownDevices = new Map();
 
-    getDevices().forEach((d) => this.knownDevices.set(d.path, d));
+    getDevices()?.forEach((d) => this.knownDevices.set(d.path, d));
   }
 
   findNewDevice() {

source/main/ipc/hardwareWallets/ledger/deviceDetection/types.ts

@@ -13,6 +13,7 @@ export type Device = {
   usage: number;
 };
 
+// TODO: Use native types instead of creating new ones https://github.com/LedgerHQ/ledgerjs/blob/23ba9fa883db9f49f81de236c9232df2c5ca1020/packages/devices/src/index.ts#L197
 export type DeviceModel = {
   id: string;
   productName: string;