Merge branch 'develop' into feature/ddw-1092-support-for-ledger-nano-s-plus

Author: danielmain

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## vNext
+## 4.10.0
 
 ### Features
 
@@ -91,6 +91,7 @@
 
 ### Fixes
 
+- Improved error handling for incorrect passphrase and incorrect hardware wallet error ([PR 2860](https://github.com/input-output-hk/daedalus/pull/2860)) 
 - Fixed rewards CSV export issues ([PR 2885](https://github.com/input-output-hk/daedalus/pull/2885))
 - Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
 - Fixed styling of ITN rewards feature ([PR 2861](https://github.com/input-output-hk/daedalus/pull/2861))

cardano-foundation-ledgerjs-hw-app-cardano-v5.0.0-rc4.tgz

@@ -177,7 +177,9 @@ gulp.task(
     'clean:dist',
     'server:create:dev',
     'build:renderer:html',
-    'build:main:watch',
+    process.argv.includes('--disable-electron-reload')
+      ? 'build:main'
+      : 'build:main:watch',
     'build:renderer:watch'
   )
 );

gulpfile.js

@@ -154,8 +154,12 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/bin/darwin-x64-"*"/blake2.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
 
 # Sign the whole component deeply
 sign_cmd "$ABS_PATH"

installers/common/MacInstaller.hs

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

package.json

@@ -28,6 +28,9 @@ import {
 import { HardwareWalletChannels } from './createHardwareWalletIPCChannels';
 import { Device } from './hardwareWallets/ledger/deviceDetection/types';
 import { DeviceDetectionPayload } from './hardwareWallets/ledger/deviceDetection/deviceDetection';
+import { initTrezorConnect, reinitTrezorConnect } from '../trezor/connection';
+import { manifest } from '../trezor/manifest';
+import { buildTrezorDeviceParams } from '../utils/buildTrezorDeviceParams';
 
 type ListenerType = {
   unsubscribe: (...args: Array<any>) => any;
@@ -175,6 +178,8 @@ export const handleHardwareWalletRequests = async (
     TrezorConnect.removeAllListeners();
     // Initialize new device listeners
     TrezorConnect.on(UI_EVENT, (event) => {
+      logger.info('[TREZOR-CONNECT] Received UI_EVENT: ' + event.type);
+
       if (event.type === UI.REQUEST_PASSPHRASE) {
         // ui-request_passphrase
         if (event.payload && event.payload.device) {
@@ -186,11 +191,20 @@ export const handleHardwareWalletRequests = async (
               passphraseOnDevice: true,
             },
           });
+
+          logger.info(
+            '[TREZOR-CONNECT] Called TrezorConnect.uiResponse - requested to provide passphrase on device'
+          );
         }
       }
     });
     TrezorConnect.on(TRANSPORT_EVENT, (event) => {
       if (event.type === TRANSPORT.ERROR) {
+        logger.info(
+          '[TREZOR-CONNECT] Received TRANSPORT_EVENT: transport-error',
+          event.payload
+        );
+
         // Send Transport error to Renderer
         getHardwareWalletConnectionChannel.send(
           {
@@ -204,6 +218,8 @@ export const handleHardwareWalletRequests = async (
       }
     });
     TrezorConnect.on(DEVICE_EVENT, (event) => {
+      logger.info('[TREZOR-CONNECT] Received DEVICE_EVENT: ' + event.type);
+
       const connectionChanged =
         event.type === DEVICE.CONNECT ||
         event.type === DEVICE.DISCONNECT ||
@@ -256,13 +272,13 @@ export const handleHardwareWalletRequests = async (
   getHardwareWalletTransportChannel.onRequest(
     async (request: HardwareWalletTransportDeviceRequest) => {
       const { isTrezor, devicePath } = request;
-      // @ts-ignore ts-migrate(2345) FIXME: Argument of type 'string' is not assignable to par... Remove this comment to see the full error message
-      logger.info('[HW-DEBUG] getHardwareWalletTransportChannel', devicePath);
+      logger.info('[HW-DEBUG] getHardwareWalletTransportChannel', {
+        devicePath,
+      });
       // Connected Trezor device info
       let deviceFeatures;
 
       if (isTrezor) {
-        // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
         logger.info('[HW-DEBUG] getHardwareWalletTransportChannel::TREZOR ');
 
         try {
@@ -271,10 +287,12 @@ export const handleHardwareWalletRequests = async (
               path: devicePath,
             },
           });
-          // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
-          logger.info('[HW-DEBUG] Trezor connect success');
+
+          logger.info('[TREZOR-CONNECT] Called TrezorConnect.getFeatures()');
 
           if (deviceFeatures && deviceFeatures.success) {
+            logger.info('[HW-DEBUG] Trezor connect success');
+
             const {
               major_version: majorVersion,
               minor_version: minorVersion,
@@ -297,19 +315,16 @@ export const handleHardwareWalletRequests = async (
 
           throw deviceFeatures.payload; // Error is in payload
         } catch (e) {
-          // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
           logger.info('[HW-DEBUG] Trezor connect error');
           throw e;
         }
       }
 
       try {
-        // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
         logger.info('[HW-DEBUG] getHardwareWalletTransportChannel:: LEDGER');
         const transportList = await TransportNodeHid.list();
         let hw;
         let lastConnectedPath;
-        // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
         logger.info(
           `[HW-DEBUG] getHardwareWalletTransportChannel::transportList=${JSON.stringify(
             transportList
@@ -342,14 +357,12 @@ export const handleHardwareWalletRequests = async (
         if (transportList && !transportList.length) {
           // Establish connection with last device
           try {
-            // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
             logger.info('[HW-DEBUG] INIT NEW transport');
 
             const { device } = await waitForDevice();
 
             await openTransportLayer(device.path, device);
           } catch (e) {
-            // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
             logger.info('[HW-DEBUG] INIT NEW transport - ERROR');
             throw e;
           }
@@ -368,7 +381,6 @@ export const handleHardwareWalletRequests = async (
             throw new Error('Device not connected!');
           }
         } else {
-          // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
           logger.info('[HW-DEBUG] USE CURRENT CONNECTION');
           hw = devicesMemo[devicePath].transport;
           deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
@@ -400,41 +412,19 @@ export const handleHardwareWalletRequests = async (
 
         throw new Error('Missing device info');
       } catch (error) {
-        // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
         logger.info('[HW-DEBUG] ERROR on getHardwareWalletTransportChannel');
         throw error;
       }
     }
   );
+
   handleInitTrezorConnectChannel.onRequest(async () => {
-    // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
     logger.info('[HW-DEBUG] INIT TREZOR');
     resetTrezorListeners();
-    TrezorConnect.manifest({
-      email: '[email protected]',
-      appUrl: 'http://your.application.com',
-    });
-    TrezorConnect.init({
-      popup: false,
-      // render your own UI
-      webusb: false,
-      // webusb is not supported in electron
-      debug: true,
-      // see what's going on inside connect
-      // lazyLoad: true, // set to "false" (default) if you want to start communication with bridge on application start (and detect connected device right away)
-      // set it to "true", then trezor-connect will not be initialized until you call some TrezorConnect.method()
-      // this is useful when you don't know if you are dealing with Trezor user
-      manifest: {
-        email: '[email protected]',
-        // @TODO
-        appUrl: 'http://your.application.com', // @TODO
-      },
-    })
-      .then(() => {})
-      .catch((error) => {
-        throw error;
-      });
+    TrezorConnect.manifest(manifest);
+    await initTrezorConnect();
   });
+
   handleInitLedgerConnectChannel.onRequest(async () => {
     logger.info('[HW-DEBUG] INIT LEDGER');
     observer = new EventObserver({
@@ -489,16 +479,17 @@ export const handleHardwareWalletRequests = async (
 
     try {
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
-      // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
       logger.info('[HW-DEBUG] DERIVE ADDRESS');
 
       if (isTrezor) {
+        logger.info(
+          '[TREZOR-CONNECT] Called TrezorConnect.cardanoGetAddress()'
+        );
+
         const result = await TrezorConnect.cardanoGetAddress({
-          device: {
-            path: devicePath,
-            // @ts-ignore ts-migrate(2769) FIXME: No overload matches this call.
-            showOnTrezor: true,
-          },
+          showOnTrezor: true,
+          device: buildTrezorDeviceParams(devicePath),
           addressParameters: {
             addressType,
             path: `m/${spendingPathStr}`,
@@ -554,7 +545,7 @@ export const handleHardwareWalletRequests = async (
 
     try {
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
-      // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
       logger.info('[HW-DEBUG] SHOW ADDRESS');
 
       if (isTrezor) {
@@ -647,14 +638,13 @@ export const handleHardwareWalletRequests = async (
         };
       }
 
-      // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
       logger.info(`[HW-DEBUG] GET CARDANO APP path:${path}`);
       deviceConnection = devicesMemo[path].AdaConnection;
       const { version } = await deviceConnection.getVersion();
-      // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
       logger.info('[HW-DEBUG] getCardanoAdaAppChannel:: appVersion');
       const { serialHex } = await deviceConnection.getSerial();
-      // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
       logger.info(
         `[HW-DEBUG] getCardanoAdaAppChannel:: deviceSerial: ${serialHex}`
       );
@@ -692,6 +682,12 @@ export const handleHardwareWalletRequests = async (
         const hasPathChanged = !includes(devicePaths, oldPath);
         const newPath = hasPathChanged ? last(devicePaths) : oldPath;
 
+        if (hasPathChanged) {
+          logger.info(
+            `[HW-DEBUG] Device path changed from ${oldPath} to ${newPath}`
+          );
+        }
+
         if (!newPath) {
           logger.info(
             '[HW-DEBUG] ERROR in Cardano App (Device paths list is empty)',
@@ -755,20 +751,26 @@ export const handleHardwareWalletRequests = async (
   getExtendedPublicKeyChannel.onRequest(async (params) => {
     // Params example:
     // { path: "1852'/1815'/0'", isTrezor: false, devicePath: null }
-    // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
     logger.info('[HW-DEBUG] getExtendedPublicKeyChannel');
     const { path, isTrezor, devicePath } = params;
 
     try {
       if (isTrezor) {
-        // Check if Trezor instantiated
+        // We re-initialize the Trezor Connect session to give the user the chance to provide
+        // a different passphrase, in case they want to switch to a different
+        // hidden wallet or just if they provided a wrong one.
+        await reinitTrezorConnect();
+
+        logger.info('[TREZOR-CONNECT] Calling TrezorConnect.getFeatures()');
         const deviceFeatures = await TrezorConnect.getFeatures({
-          device: {
-            path: devicePath,
-          },
+          device: buildTrezorDeviceParams(devicePath),
         });
 
         if (deviceFeatures.success) {
+          logger.info(
+            '[TREZOR-CONNECT] Calling TrezorConnect.cardanoGetPublicKey()'
+          );
           const extendedPublicKeyResponse = await TrezorConnect.cardanoGetPublicKey(
             {
               path: `m/${path}`,
@@ -780,15 +782,13 @@ export const handleHardwareWalletRequests = async (
             throw extendedPublicKeyResponse.payload;
           }
 
-          const extendedPublicKey = get(
-            extendedPublicKeyResponse,
-            ['payload', 'node'],
-            {}
-          );
+          const extendedPublicKey = get(extendedPublicKeyResponse, [
+            'payload',
+            'node',
+          ]);
+
           return Promise.resolve({
-            // @ts-ignore ts-migrate(2339) FIXME: Property 'public_key' does not exist on type '{} |... Remove this comment to see the full error message
             publicKeyHex: extendedPublicKey.public_key,
-            // @ts-ignore ts-migrate(2339) FIXME: Property 'chain_code' does not exist on type '{} |... Remove this comment to see the full error message
             chainCodeHex: extendedPublicKey.chain_code,
           });
         }
@@ -797,7 +797,7 @@ export const handleHardwareWalletRequests = async (
       }
 
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
-      // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
       logger.info('[HW-DEBUG] EXPORT KEY');
 
       // Check if Ledger instantiated
@@ -835,7 +835,7 @@ export const handleHardwareWalletRequests = async (
       signingMode,
       additionalWitnessPaths,
     } = params;
-    // @ts-ignore ts-migrate(2554) FIXME: Expected 2 arguments, but got 1.
+
     logger.info('[HW-DEBUG] SIGN Ledger transaction');
     deviceConnection = devicePath
       ? devicesMemo[devicePath].AdaConnection
@@ -903,19 +903,25 @@ export const handleHardwareWalletRequests = async (
         auxiliaryData,
         signingMode,
       };
+
+      logger.info(
+        '[TREZOR-CONNECT] Calling TrezorConnect.cardanoSignTransaction()'
+      );
+
       // @ts-ignore ts-migrate(2345) FIXME: Argument of type '{ inputs: TrezorSignTransactionI... Remove this comment to see the full error message
       const signedTransaction = await TrezorConnect.cardanoSignTransaction({
-        device: {
-          path: devicePath,
-        },
+        device: buildTrezorDeviceParams(devicePath),
         ...dataToSign,
       });
+
       return Promise.resolve(signedTransaction);
     } catch (e) {
       throw e;
     }
   });
+
   resetTrezorActionChannel.onRequest(async () => {
+    logger.info('[TREZOR-CONNECT] Called TrezorConnect.cancel()');
     TrezorConnect.cancel('Method_Cancel');
   });
 };