[DDW-197] Fix Flow and EsLint issues

input-output-hk · Nov 29, 2020 · 70850c8 · 70850c8
1 parent 2a52f0d
commit 70850c8
Show file tree

Hide file tree

Showing 10 changed files with 133 additions and 149 deletions.
diff --git a/source/common/ipc/api.js b/source/common/ipc/api.js
@@ -390,6 +390,12 @@ export type ManageAppUpdateMainResponse = {
   },
 };
 
+export type DeriveXpubRendererRequestType = {
+  parentXpubHex: string,
+  lastIndex: number,
+  derivationScheme: number,
+};
+
 /**
  * Channel for introspecting an address
  */
@@ -418,7 +424,7 @@ export type getExtendedPublicKeyRendererRequest = HardwareWalletExtendedPublicKe
 export type getExtendedPublicKeyMainResponse = HardwareWalletExtendedPublicKeyResponse;
 
 export const GET_CARDANO_ADA_APP_CHANNEL = 'GET_CARDANO_ADA_APP_CHANNEL';
-export type getCardanoAdaAppRendererRequest = void;
+export type getCardanoAdaAppRendererRequest = { path: ?string };
 export type getCardanoAdaAppMainResponse = HardwareWalletCardanoAdaAppResponse;
 
 export const GET_HARDWARE_WALLET_CONNECTION_CHANNEL =
@@ -447,8 +453,8 @@ export type handleInitLedgerConnectRendererRequest = void;
 export type handleInitLedgerConnectMainResponse = void;
 
 export const DERIVE_XPUB_CHANNEL = 'DERIVE_XPUB_CHANNEL';
-export type deriveXpubRendererRequest = void;
-export type deriveXpubMainResponse = void;
+export type deriveXpubRendererRequest = DeriveXpubRendererRequestType;
+export type deriveXpubMainResponse = string;
 
 export const RESET_ACTION_TREZOR_CHANNEL = 'RESET_ACTION_TREZOR_CHANNEL';
 export type resetTrezorActionRendererRequest = void;

diff --git a/source/common/types/hardware-wallets.types.js b/source/common/types/hardware-wallets.types.js
@@ -62,11 +62,19 @@ export type TransportDevice = {
   firmwareVersion: ?string,
 };
 
-export type Certificate = {|
+/* export type Certificate = {|
   type: CertificateType,
   path: BIP32Path,
   poolKeyHashHex: ?string,
-|};
+|}; */
+
+export type Certificate = {
+  address: string,
+  type: string,
+  accountAddress: string,
+  poolHash: ?string,
+  encodeCBOR: Function,
+};
 
 export type Withdrawal = {|
   path: BIP32Path,
@@ -153,6 +161,7 @@ export type HardwareWalletExtendedPublicKeyRequest = {
 export type HardwareWalletExtendedPublicKeyResponse = {
   publicKeyHex: string,
   chainCodeHex: string,
+  deviceId?: string,
 };
 
 export type HardwareWalletCardanoAdaAppResponse = {
@@ -175,6 +184,7 @@ export type LedgerSignTransactionRequest = {
   withdrawals: Array<?Withdrawal>, // TODO - add once withdrawals defined
   metadataHashHex: ?string, // TODO - add once metadata defined
   reset?: boolean,
+  devicePath: ?string,
 };
 
 export type TrezorSignTransactionRequest = {
@@ -186,7 +196,7 @@ export type TrezorSignTransactionRequest = {
   protocolMagic: number,
   certificates: Array<?Certificate>,
   reset?: boolean,
-  devicePath: ?string,
+  devicePath: string,
 };
 
 export type LedgerSignTransactionResponse = {

diff --git a/source/main/ipc/getHardwareWalletChannel.js b/source/main/ipc/getHardwareWalletChannel.js
@@ -10,7 +10,7 @@ import TrezorConnect, {
   TRANSPORT_EVENT,
   // $FlowFixMe
 } from 'trezor-connect';
-import { get, omit, last, includes } from 'lodash';
+import { get, omit, last } from 'lodash';
 import { derivePublic as deriveChildXpub } from 'cardano-crypto.js';
 import { MainIpcChannel } from './lib/MainIpcChannel';
 import {
@@ -114,8 +114,8 @@ class EventObserver {
     // this.channel = {};
   }
   next = async (event) => {
-    logger.info('>>> Ledger NEXT');
     const transportList = await TransportNodeHid.list();
+    logger.info('>>> Ledger NEXT: ', transportList);
     const connectionChanged = event.type === 'add' || event.type === 'remove';
     if (connectionChanged) {
       logger.info('>>> Ledger NEXT - connection changed');
@@ -130,7 +130,7 @@ class EventObserver {
             const AdaConnection = new AppAda(transport);
             devicesMemo[device.path] = {
               transport,
-              AdaConnection: AdaConnection,
+              AdaConnection,
             };
             getHardwareWalletConnectionChannel.send(
               {
@@ -187,20 +187,16 @@ class EventObserver {
     logger.info('>>> Ledger NEXT error');
     throw e;
   }
-  complete(event) {
+  complete() {
     logger.info('>>> Ledger NEXT complete');
   }
 }
 
-// INIT - 2
 export const handleHardwareWalletDevices = (mainWindow: BrowserWindow) => {
-  logger.info('>>> handleHardwareWalletDevices 1');
+  logger.info('>>> handleHardwareWalletDevices');
   const handleCheckHardwareWalletDevices = async () => {
-    logger.info('>>> handleCheckHardwareWalletDevices 1');
-    // INIT - 3
+    logger.info('>>> handleCheckHardwareWalletDevices');
     const observer = new EventObserver(mainWindow);
-    // INIT - 5
-    // @TODO - uncomment once Ledger enabled
     await TransportNodeHid.listen(observer);
   };
 
@@ -253,57 +249,26 @@ export const handleHardwareWalletRequests = async (
       }
     }
 
-    // @TODO - uncomment once Ledger enabled
     try {
-      //       // New Ledger TRY
-      //       logger.info('>>> TRY 3: ', { observer: observer.channel, devicePath });
-      //
-      //       const deviceTransport = observer.channel[devicePath].transport;
-      //       logger.info('>>> CHANNEL: ', deviceTransport);
-      //
-      //
-      //       const { deviceModel } = deviceTransport;
-      //       if (deviceModel) {
-      //         logger.info('>>> getHardwareWalletTransportChannel:: LEDGER case RESPONSE: ', deviceTransport);
-      //         const info = await deviceTransport.device.getDeviceInfo();
-      //         logger.info('>>> !!! INFO !!!: ', info);
-      //         const { id, productName } = deviceModel;
-      //         return Promise.resolve({
-      //           deviceId: null, // @TODO - to be defined
-      //           deviceType: 'ledger',
-      //           deviceModel: id, // e.g. nanoS
-      //           deviceName: productName, // e.g. Ledger Nano S
-      //           path: devicePath,
-      //           firmwareVersion: null,
-      //         });
-      //       }
-      //       return
-      //       // END of try
-
       logger.info('>>> getHardwareWalletTransportChannel:: LEDGER');
-      const transportList = await TransportNodeHid.list();
+      let transportList = await TransportNodeHid.list();
       let hw;
-      let deviceConnection;
-      let transport;
-
-      // const path = devicePath || last(transportList);
-      logger.info('>>> getHardwareWalletTransportChannel:: PATH');
       let lastConnectedPath;
 
-      // const noInstance = (devicePath && !devicesMemo[devicePath]) || (!devicePath && !transportList.length);
-
+      // $FlowFixMe
       if (transportList && !transportList.length) {
         // Establish connection with last device
         try {
           logger.info('>>> INIT NEW transport');
-          // hw = await TransportNodeHid.open(devicePath);
+          // hw = TransportNodeHid.open(devicePath);
           logger.info('>>> OPEN <<<');
           hw = await TransportNodeHid.create();
+          transportList = await TransportNodeHid.list();
           logger.info('>>> INIT NEW transport - DONE');
-          const transportList = await TransportNodeHid.list();
           lastConnectedPath = last(transportList);
           logger.info('>>> !!! lastConnectedPath !!!');
 
+          // $FlowFixMe
           deviceConnection = new AppAda(hw);
           devicesMemo[lastConnectedPath] = {
             transport: hw,
@@ -313,22 +278,19 @@ export const handleHardwareWalletRequests = async (
           logger.info('>>> INIT NEW transport - ERROR');
           throw e;
         }
-        // throw new Error('DEVICE_NOT_CONNECTED');
-      } else if (!devicesMemo[devicePath]) {
-        logger.info('>>> USE First');
+      } else if (!devicePath || !devicesMemo[devicePath]) {
         // Use first like native usb nodeHID
-        lastConnectedPath = transportList[0];
-        // devicesMemo[lastConnectedPath]
+        // $FlowFixMe
+        lastConnectedPath = transportList[0]; // eslint-disable-line
         if (devicesMemo[lastConnectedPath]) {
           hw = devicesMemo[lastConnectedPath].transport;
           deviceConnection = devicesMemo[lastConnectedPath].AdaConnection;
         } else {
           throw new Error('Device not connected!');
         }
       } else {
-        logger.info('>>> USE CURRENT CONNECTION');
         hw = devicesMemo[devicePath].transport;
-        deviceConnection = devicesMemo[devicePath].AdaConnection;
+        deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
       }
 
       // No Device instance established at this point or disconnected flag set
@@ -361,11 +323,10 @@ export const handleHardwareWalletRequests = async (
       //   logger.info('>>> getHardwareWalletTransportChannel:: LEDGER case get appAda: ', deviceConnection);
       // }
 
+      // $FlowFixMe
       const { deviceModel } = hw;
       if (deviceModel) {
         logger.info('>>> getHardwareWalletTransportChannel:: LEDGER case RESPONSE');
-        const info = await hw.device.getDeviceInfo();
-        logger.info('>>> !!! INFO !!!');
         const { id, productName } = deviceModel;
         return Promise.resolve({
           deviceId: null, // @TODO - to be defined
@@ -464,7 +425,7 @@ export const handleHardwareWalletRequests = async (
   });
 
   deriveXpubChannel.onRequest(async (params) => {
-    const { parentXpubHex, lastIndex, derivationScheme, test_new } = params;
+    const { parentXpubHex, lastIndex, derivationScheme } = params;
     const parentXpub = utils.hex_to_buf(parentXpubHex);
     try {
       const xpub = deriveChildXpub(parentXpub, lastIndex, derivationScheme);
@@ -539,9 +500,9 @@ export const handleHardwareWalletRequests = async (
     //    }
 
     try {
-      if (!devicesMemo[path]) {
+      if (!path || !devicesMemo[path]) {
         logger.info('>>> Device not instantiated!');
-        // >>> USE FIRST maybe @TODO
+        // eslint-disable-next-line
         throw { code: 'DEVICE_NOT_CONNECTED' };
       }
       logger.info('>>> GET CARDANO APP');
@@ -561,14 +522,12 @@ export const handleHardwareWalletRequests = async (
       });
     } catch (error) {
       logger.info('>>> ERROR in Cardano App');
-      if (error.name === 'DisconnectedDevice') {
+      if (error.name === 'DisconnectedDevice' && path) {
         logger.info('>>> ERROR in Cardano App (CODE - DisconnectedDevice)');
-        // Set old connection to null and force reinitialization once method called again
-        // deviceConnection = null;
-        //   const transport = await TransportNodeHid.open(device.path);
-        //   const AdaConnection = new AppAda(transport);
+        // Mutate / change old connection and force reinitialization once method called again
         const newTransport = await TransportNodeHid.open(path);
         deviceConnection = new AppAda(newTransport);
+
         // Update devicesMemo
         devicesMemo[path] = {
           transport: newTransport,
@@ -577,7 +536,6 @@ export const handleHardwareWalletRequests = async (
       }
       throw error;
     }
-    return;
 
     /*
     const transportList = await TransportNodeHid.list();
@@ -659,16 +617,7 @@ export const handleHardwareWalletRequests = async (
         throw new Error('Trezor device not connected');
       }
 
-      // New Ledger TRY
-      // logger.info('>>> TRY 4 - export keys: ', { observer: observer.channel, devicePath });
-      //
-      // const deviceTransport = observer.channel[devicePath].transport;
-      // const deviceConnection = observer.channel[devicePath].AdaConnection;
-      // logger.info('>>> CHANNEL: ', deviceConnection);
-
-      logger.info('>>> EXPORT KEY');
-      deviceConnection = devicesMemo[devicePath].AdaConnection;
-
+      deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
       // Check if Ledger instantiated
       if (!deviceConnection) {
         throw new Error('Ledger device not connected');
@@ -702,7 +651,7 @@ export const handleHardwareWalletRequests = async (
     } = params;
 
     logger.info('>>> SIGN Ledger transaction');
-    deviceConnection = devicesMemo[devicePath].AdaConnection;
+    deviceConnection = devicePath ? devicesMemo[devicePath].AdaConnection : null;
 
     try {
       if (!deviceConnection) {

diff --git a/source/renderer/app/api/addresses/requests/constructAddress.js b/source/renderer/app/api/addresses/requests/constructAddress.js
@@ -1,5 +1,6 @@
 // @flow
 import { request } from '../../utils/request';
+import type { RequestConfig } from '../../common/types';
 
 export const constructAddress = (
   config: RequestConfig,

diff --git a/source/renderer/app/api/addresses/requests/inspectAddress.js b/source/renderer/app/api/addresses/requests/inspectAddress.js
@@ -1,5 +1,6 @@
 // @flow
 import { request } from '../../utils/request';
+import type { RequestConfig } from '../../common/types';
 
 export const inspectAddress = (
   config: RequestConfig,

diff --git a/source/renderer/app/api/transactions/requests/getPublicKey.js b/source/renderer/app/api/transactions/requests/getPublicKey.js
@@ -1,5 +1,6 @@
 // @flow
 import { request } from '../../utils/request';
+import type { RequestConfig } from '../../common/types';
 
 export const getPublicKey = (
   config: RequestConfig,

diff --git a/...derer/app/components/staking/delegation-setup-wizard/DelegationStepsConfirmationDialog.js b/...derer/app/components/staking/delegation-setup-wizard/DelegationStepsConfirmationDialog.js
@@ -212,7 +212,7 @@ export default class DelegationStepsConfirmationDialog extends Component<Props>
               HwDeviceStatuses.VERIFYING_TRANSACTION_SUCCEEDED) ||
           isSubmitting ||
           !transactionFee ||
-          error,
+          !!error,
       },
     ];