Revert "[DDW-1102] Add retry to Trezor calls"

This reverts commit b6e8033.

Author: Marcin Mazurek

source/common/utils/wait.ts

@@ -4,6 +4,7 @@ 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,
@@ -32,7 +33,6 @@ 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,9 +154,6 @@ class EventObserver {
   }
 }
 
-const wait = (ms: number): Promise<void> =>
-  new Promise((resolve) => setTimeout(resolve, ms));
-
 export const handleHardwareWalletRequests = async (
   mainWindow: BrowserWindow,
   {
@@ -288,9 +285,13 @@ export const handleHardwareWalletRequests = async (
       if (isTrezor) {
         logger.info('[HW-DEBUG] getHardwareWalletTransportChannel::TREZOR ');
 
-        deviceFeatures = await getTrezorDeviceFeatures();
-
         try {
+          deviceFeatures = await TrezorConnect.getFeatures({
+            device: {
+              path: devicePath,
+            },
+          });
+
           logger.info('[TREZOR-CONNECT] Called TrezorConnect.getFeatures()');
 
           if (deviceFeatures && deviceFeatures.success) {
@@ -465,9 +466,6 @@ export const handleHardwareWalletRequests = async (
     }
   });
   deriveAddressChannel.onRequest(async (params) => {
-    await reinitTrezorConnect();
-    resetTrezorListeners();
-
     const {
       addressType,
       spendingPathStr,
@@ -768,8 +766,7 @@ export const handleHardwareWalletRequests = async (
         resetTrezorListeners();
 
         logger.info('[TREZOR-CONNECT] Calling TrezorConnect.getFeatures()');
-
-        const deviceFeatures = await getTrezorDeviceFeatures();
+        const deviceFeatures = await TrezorConnect.getFeatures();
 
         if (deviceFeatures.success) {
           logger.info(
@@ -883,13 +880,6 @@ export const handleHardwareWalletRequests = async (
 
   resetTrezorActionChannel.onRequest(async () => {
     logger.info('[TREZOR-CONNECT] Called TrezorConnect.cancel()');
-
-    try {
-      TrezorConnect.cancel();
-    } catch (error) {
-      logger.warn(
-        '[TREZOR-CONNECT] Failed to cancel the operation:' + error.error
-      );
-    }
+    TrezorConnect.cancel('Method_Cancel');
   });
 };

source/main/ipc/getHardwareWalletChannel.ts

@@ -19,6 +19,9 @@ 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