[DDW-1102] Add retry to Trezor calls

Author: Marcin Mazurek

source/common/utils/wait.ts

@@ -0,0 +1,2 @@
+export const wait = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));

source/main/ipc/getHardwareWalletChannel.ts

@@ -4,7 +4,6 @@ import TransportNodeHid, {
 } from '@ledgerhq/hw-transport-node-hid-noevents';
 import AppAda, { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import TrezorConnect, {
-  CardanoPublicKey,
   DEVICE,
   DEVICE_EVENT,
   Features,
@@ -33,6 +32,7 @@ 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 { getTrezorDeviceFeatures } from './hardwareWallets/trezor/getTrezorDeviceFeatures';
 
 type ListenerType = {
   unsubscribe: (...args: Array<any>) => any;
@@ -154,6 +154,9 @@ class EventObserver {
   }
 }
 
+const wait = (ms: number): Promise<void> =>
+  new Promise((resolve) => setTimeout(resolve, ms));
+
 export const handleHardwareWalletRequests = async (
   mainWindow: BrowserWindow,
   {
@@ -285,13 +288,9 @@ export const handleHardwareWalletRequests = async (
       if (isTrezor) {
         logger.info('[HW-DEBUG] getHardwareWalletTransportChannel::TREZOR ');
 
-        try {
-          deviceFeatures = await TrezorConnect.getFeatures({
-            device: {
-              path: devicePath,
-            },
-          });
+        deviceFeatures = await getTrezorDeviceFeatures();
 
+        try {
           logger.info('[TREZOR-CONNECT] Called TrezorConnect.getFeatures()');
 
           if (deviceFeatures && deviceFeatures.success) {
@@ -466,6 +465,9 @@ export const handleHardwareWalletRequests = async (
     }
   });
   deriveAddressChannel.onRequest(async (params) => {
+    await reinitTrezorConnect();
+    resetTrezorListeners();
+
     const {
       addressType,
       spendingPathStr,
@@ -766,7 +768,8 @@ export const handleHardwareWalletRequests = async (
         resetTrezorListeners();
 
         logger.info('[TREZOR-CONNECT] Calling TrezorConnect.getFeatures()');
-        const deviceFeatures = await TrezorConnect.getFeatures();
+
+        const deviceFeatures = await getTrezorDeviceFeatures();
 
         if (deviceFeatures.success) {
           logger.info(
@@ -880,6 +883,13 @@ export const handleHardwareWalletRequests = async (
 
   resetTrezorActionChannel.onRequest(async () => {
     logger.info('[TREZOR-CONNECT] Called TrezorConnect.cancel()');
-    TrezorConnect.cancel('Method_Cancel');
+
+    try {
+      TrezorConnect.cancel();
+    } catch (error) {
+      logger.warn(
+        '[TREZOR-CONNECT] Failed to cancel the operation:' + error.error
+      );
+    }
   });
 };

source/main/ipc/hardwareWallets/trezor/getTrezorDeviceFeatures.ts

@@ -0,0 +1,35 @@
+import TrezorConnect from 'trezor-connect';
+import { logger } from '../../../utils/logging';
+import { wait } from '../../../../common/utils/wait';
+
+export const getTrezorDeviceFeatures = async (retries = 3) => {
+  const features = await TrezorConnect.getFeatures();
+
+  if (retries < 0) {
+    throw new Error('Failed to get Trezor device features');
+  }
+
+  if (features.success === false) {
+    if (
+      features.payload.code === 'Device_CallInProgress' ||
+      features.payload.error === 'wrong previous session' ||
+      features.payload.error === 'device disconnected during action'
+    ) {
+      logger.info(
+        '[TREZOR-CONNECT] Got Device_CallInProgress error - retrying'
+      );
+
+      await wait(1000);
+      return getTrezorDeviceFeatures(retries - 1);
+    }
+
+    logger.error(
+      '[TREZOR-CONNECT] Got other error - not retrying',
+      features.payload
+    );
+
+    throw features.payload;
+  }
+
+  return features;
+};

source/renderer/app/api/utils/apiHelpers.ts

@@ -19,9 +19,6 @@ export const testSync = (apiMethod: (...args: Array<any>) => any) => {
   console.log(`testSync result: ${result}`);
   return result;
 };
-// helper code for deferring API call execution
-export const wait = (ms: number): Promise<void> =>
-  new Promise((resolve) => setTimeout(resolve, ms));
 export const doesWalletRequireAdaToRemainToSupportTokens = (
   error: ErrorType,
   hasAssetsRemainingAfterTransaction?: boolean