Lift default transport detection to wallet logic

vacuumlabs · Jun 8, 2021 · 531e7c4 · 531e7c4
1 parent a654c31
commit 531e7c4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 28 deletions.
diff --git a/app/frontend/actions/wallet.ts b/app/frontend/actions/wallet.ts
@@ -17,6 +17,8 @@ import loadingActions from './loading'
 import {saveAs} from '../libs/file-saver'
 import {exportWalletSecretDef} from '../wallet/keypass-json'
 
+import {getDefaultTransport} from '../../frontend/helpers/transports'
+
 // TODO: (refactor), this should not call "setState" as it is not action
 const fetchConversionRates = async (conversionRates, setState) => {
   try {
@@ -60,18 +62,22 @@ export default (store: Store) => {
     {
       cryptoProviderType,
       walletSecretDef,
-      ledgerTransportType,
+      selectedLedgerTransportType,
       shouldExportPubKeyBulk,
     }: {
       cryptoProviderType: CryptoProviderType
       walletSecretDef?: any // TODO: until now, arguments came in freestyle combinations, refactor
-      ledgerTransportType?: LedgerTransportType
+      selectedLedgerTransportType?: LedgerTransportType
       shouldExportPubKeyBulk: boolean
     }
   ) => {
     loadingAction(state, 'Loading wallet data...')
     setState({walletLoadingError: undefined})
     const isShelleyCompatible = !(walletSecretDef && walletSecretDef.derivationScheme.type === 'v1')
+    const ledgerTransportType =
+      selectedLedgerTransportType === LedgerTransportType.DEFAULT
+        ? await getDefaultTransport()
+        : selectedLedgerTransportType
     const config = {
       ...ADALITE_CONFIG,
       isShelleyCompatible,

diff --git a/app/frontend/components/pages/login/hardwareAuth.tsx b/app/frontend/components/pages/login/hardwareAuth.tsx
@@ -17,7 +17,9 @@ const LoadByHardwareWalletSection = () => {
   const [enableBulkExport, setBulkExport] = useState(
     window.localStorage.getItem(localStorageVars.BULK_EXPORT) !== 'true'
   )
-  const [ledgerTransportType, setLedgerTransportType] = useState(LedgerTransportType.DEFAULT)
+  const [selectedLedgerTransportType, setSelectedLedgerTransportType] = useState(
+    LedgerTransportType.DEFAULT
+  )
   const toggleBulkExport = useCallback(() => {
     window.localStorage.setItem(localStorageVars.BULK_EXPORT, `${enableBulkExport}`)
     setBulkExport(!enableBulkExport)
@@ -85,7 +87,7 @@ const LoadByHardwareWalletSection = () => {
             {LedgerAffiliateLink('Support us by buying one')}
           </div>
           <div>
-            <LedgerTransportSelect onSelect={setLedgerTransportType} />
+            <LedgerTransportSelect onSelect={setSelectedLedgerTransportType} />
             <button
               {...tooltip(
                 'Support for Ledger is temporarily disabled',
@@ -97,7 +99,7 @@ const LoadByHardwareWalletSection = () => {
                 loadWallet({
                   cryptoProviderType: CryptoProviderType.LEDGER,
                   shouldExportPubKeyBulk: enableBulkExport,
-                  ledgerTransportType,
+                  selectedLedgerTransportType,
                 })
               }
             >

diff --git a/app/frontend/helpers/transports.ts b/app/frontend/helpers/transports.ts
@@ -0,0 +1,32 @@
+import {isWindows, isOpera} from 'react-device-detect'
+
+import LedgerTransportWebUsb from '@ledgerhq/hw-transport-webusb'
+import LedgerTransportWebHid from '@ledgerhq/hw-transport-webhid'
+import {LedgerTransportType} from '../types'
+
+const isWebUsbSupported = async (): Promise<boolean> => {
+  const isSupported = await LedgerTransportWebUsb.isSupported()
+  return isSupported && !isWindows && !isOpera
+}
+
+const isWebHidSupported = async (): Promise<boolean> => {
+  // On Opera the device-selection pop-up appears but there's no apparent way to
+  // select the device, resulting in an "Operation rejected by user" error
+  const isSupported = await LedgerTransportWebHid.isSupported()
+  return isSupported && !isOpera
+}
+
+const getDefaultTransport = async (): Promise<LedgerTransportType> => {
+  const supportWebHid = await isWebHidSupported()
+  const supportWebUsb = await isWebUsbSupported()
+
+  if (supportWebHid) {
+    return LedgerTransportType.WEB_HID
+  } else if (supportWebUsb) {
+    return LedgerTransportType.WEB_USB
+  } else {
+    return LedgerTransportType.U2F
+  }
+}
+
+export {getDefaultTransport}
diff --git a/app/frontend/wallet/shelley/shelley-ledger-crypto-provider.ts b/app/frontend/wallet/shelley/shelley-ledger-crypto-provider.ts
@@ -12,7 +12,6 @@ import {
   cborizeTxAuxiliaryVotingData,
   ShelleyTxAux,
 } from './shelley-transaction'
-import {isWindows, isOpera} from 'react-device-detect'
 import {hasRequiredVersion} from './helpers/version-check'
 import {LEDGER_VERSIONS, LEDGER_ERRORS} from '../constants'
 import {bech32} from 'cardano-crypto.js'
@@ -64,18 +63,6 @@ import {
 import {TxRelayType, TxStakepoolOwner, TxStakepoolRelay} from './helpers/poolCertificateUtils'
 import assertUnreachable from '../../helpers/assertUnreachable'
 
-const isWebUsbSupported = async (): Promise<boolean> => {
-  const isSupported = await LedgerTransportWebUsb.isSupported()
-  return isSupported && !isWindows && !isOpera
-}
-
-const isWebHidSupported = async (): Promise<boolean> => {
-  // On Opera the device-selection pop-up appears but there's no apparent way to
-  // select the device, resulting in an "Operation rejected by user" error
-  const isSupported = await LedgerTransportWebHid.isSupported()
-  return isSupported && !isOpera
-}
-
 let _activeTransport: Transport | null = null
 const getLedgerTransport = async (ledgerTransportType: LedgerTransportType): Promise<Transport> => {
   if (_activeTransport != null) {
@@ -91,9 +78,6 @@ const getLedgerTransport = async (ledgerTransportType: LedgerTransportType): Pro
     }
   }
 
-  const supportWebHid = await isWebHidSupported()
-  const supportWebUsb = await isWebUsbSupported()
-
   switch (ledgerTransportType) {
     case LedgerTransportType.WEB_HID:
       _activeTransport = await LedgerTransportWebHid.create()
@@ -105,13 +89,7 @@ const getLedgerTransport = async (ledgerTransportType: LedgerTransportType): Pro
       _activeTransport = await LedgerTransportWebUsb.create()
       break
     default:
-      if (supportWebHid) {
-        _activeTransport = await LedgerTransportWebHid.create()
-      } else if (supportWebUsb) {
-        _activeTransport = await LedgerTransportWebUsb.create()
-      } else {
-        _activeTransport = await LedgerTransportU2F.create()
-      }
+      break
   }
 
   return _activeTransport