[DDW-1179] Introduce bip32StrToPath function

tomislavhoracek · tomislavhoracek · commit 5dbba7ce7886 · 2023-02-28T17:14:36.000+01:00
diff --git a/package.json b/package.json
@@ -203,7 +203,7 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "6.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
-    "@ledgerhq/hw-transport-node-hid": "6.27.12",
+    "@ledgerhq/hw-transport-node-hid": "6.27.1",
     "@trezor/connect": "9.0.2",
     "aes-js": "3.1.2",
     "bech32": "2.0.0",
diff --git a/source/common/utils/helper.ts b/source/common/utils/helper.ts
@@ -1,2 +1,21 @@
+import { HARDENED } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+
 export const toJS = (object: any | null | undefined): any =>
   typeof object === 'object' ? JSON.parse(JSON.stringify(object)) : object;
+
+export const parseBIP32Index = (str: string): number => {
+  let base = 0;
+  if (str.endsWith("'")) {
+    str = str.slice(0, -1);
+    base = HARDENED;
+  }
+  const i = parseInt(str, 10);
+  if (i < 0 || i > HARDENED) throw new Error('Invalid path');
+  return base + i;
+};
+
+export const bip32StrToPath = (str: string): number[] => {
+  return str.split('/').map((i: string): number => {
+    return parseBIP32Index(i);
+  });
+};
diff --git a/source/main/ipc/getHardwareWalletChannel.ts b/source/main/ipc/getHardwareWalletChannel.ts
@@ -32,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 { bip32StrToPath } from '../../common/utils/helper';
 
 type ListenerType = {
   unsubscribe: (...args: Array<any>) => any;
@@ -474,10 +475,8 @@ export const handleHardwareWalletRequests = async (
       networkId,
       protocolMagic,
     } = params;
-    const spendingPath = utils.str_to_path(spendingPathStr);
-    const stakingPath = stakingPathStr
-      ? utils.str_to_path(stakingPathStr)
-      : null;
+    const spendingPath = bip32StrToPath(spendingPathStr);
+    const stakingPath = stakingPathStr ? bip32StrToPath(stakingPathStr) : null;
 
     deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
 
@@ -542,10 +541,8 @@ export const handleHardwareWalletRequests = async (
       networkId,
       protocolMagic,
     } = params;
-    const spendingPath = utils.str_to_path(spendingPathStr);
-    const stakingPath = stakingPathStr
-      ? utils.str_to_path(stakingPathStr)
-      : null;
+    const spendingPath = bip32StrToPath(spendingPathStr);
+    const stakingPath = stakingPathStr ? bip32StrToPath(stakingPathStr) : null;
 
     try {
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
@@ -804,9 +801,10 @@ export const handleHardwareWalletRequests = async (
       if (!deviceConnection) {
         throw new Error('Ledger device not connected');
       }
-
+      console.debug('>>> EXPORT - start: ', path);
+      console.debug('>>> DERIVED: ', bip32StrToPath(path));
       const extendedPublicKey = await deviceConnection.getExtendedPublicKey({
-        path: utils.str_to_path(path),
+        path: bip32StrToPath(path),
       });
       const deviceSerial = await deviceConnection.getSerial();
       return Promise.resolve({
@@ -815,6 +813,7 @@ export const handleHardwareWalletRequests = async (
         deviceId: deviceSerial.serialHex,
       });
     } catch (error) {
+      console.debug('>>> EXPORT - ERROR: ', error);
       logger.info('[HW-DEBUG] EXPORT KEY ERROR', error);
       throw error;
     }
diff --git a/source/renderer/app/components/wallet/receive/WalletReceiveDialog.tsx b/source/renderer/app/components/wallet/receive/WalletReceiveDialog.tsx
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { observer } from 'mobx-react';
-import { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import { map, filter } from 'lodash';
 import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
 import classnames from 'classnames';
@@ -25,6 +24,8 @@ import { HW_SHELLEY_CONFIG } from '../../../config/hardwareWalletsConfig';
 import { hardenedPathToDerivationPath } from '../../../utils/hardwareWalletUtils';
 import { AddressVerificationCheckStatuses } from '../../../stores/HardwareWalletsStore';
 import LoadingSpinner from '../../widgets/LoadingSpinner';
+import { bip32StrToPath } from '../../../../../common/utils/helper';
+
 import type { AddressVerificationCheckStatus } from '../../../stores/HardwareWalletsStore';
 import type { HwDeviceStatus } from '../../../domains/Wallet';
 
@@ -196,7 +197,7 @@ class WalletReceiveDialog extends Component<Props, State> {
     field.value = field.value.replace(/\n/g, '');
   };
   constructPaths = (address: WalletAddress) => {
-    const hardenedSpendingPath = utils.str_to_path(address.spendingPath);
+    const hardenedSpendingPath = bip32StrToPath(address.spendingPath);
     const derivationSpendingPath = hardenedPathToDerivationPath(
       hardenedSpendingPath
     );
diff --git a/source/renderer/app/utils/hardwareWalletUtils.ts b/source/renderer/app/utils/hardwareWalletUtils.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { bech32 } from 'bech32';
-import { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import { HARDENED } from '../config/hardwareWalletsConfig';
+import { bip32StrToPath } from '../../../common/utils/helper';
 // Types
 import type { CoinSelectionAssetsType } from '../api/transactions/types';
 import type { AddressType } from '../../../common/types/address-introspection.types';
@@ -73,7 +73,7 @@ export const derivationPathToLedgerPath = (derivationPath: Array<string>) => {
 
   const constructedPath = _.join(transformedPath, '/');
 
-  return utils.str_to_path(constructedPath);
+  return bip32StrToPath(constructedPath);
 };
 export const getParamsFromPath = (derivationPath: Array<string>) => {
   const pathParams = _.takeRight(derivationPath, 2);
diff --git a/source/renderer/app/utils/shelleyLedger.ts b/source/renderer/app/utils/shelleyLedger.ts
@@ -16,6 +16,7 @@ import {
 } from './hardwareWalletUtils';
 import { deriveXpubChannel } from '../ipc/getHardwareWalletChannel';
 import { AddressStyles } from '../domains/WalletAddress';
+import { bip32StrToPath } from '../../../common/utils/helper';
 // Types
 import type {
   CoinSelectionInput,
@@ -443,7 +444,7 @@ export const prepareLedgerOutput = (
           type: AddressType.BASE_PAYMENT_KEY_STAKE_KEY,
           params: {
             spendingPath: derivationPathToLedgerPath(output.derivationPath),
-            stakingPath: utils.str_to_path("1852'/1815'/0'/2/0"),
+            stakingPath: bip32StrToPath("1852'/1815'/0'/2/0"),
           },
         },
       },
diff --git a/yarn.lock b/yarn.lock
@@ -1434,6 +1434,15 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@ledgerhq/devices@^6.27.1":
+  version "6.27.1"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-6.27.1.tgz#3b13ab1d1ba8201e9e74a08f390560483978c962"
+  dependencies:
+    "@ledgerhq/errors" "^6.10.0"
+    "@ledgerhq/logs" "^6.10.0"
+    rxjs "6"
+    semver "^7.3.5"
+
 "@ledgerhq/devices@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.0.tgz#8fe9f9e442e28b7a20bcdf4c2eed06ce7b8f76ae"
@@ -1443,11 +1452,11 @@
     rxjs "6"
     semver "^7.3.5"
 
-"@ledgerhq/errors@^6.12.3":
+"@ledgerhq/errors@^6.10.0", "@ledgerhq/errors@^6.12.3":
   version "6.12.3"
   resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.3.tgz#a610caae1eeeb7cb038525e5212fe03217dda683"
 
-"@ledgerhq/hw-transport-node-hid-noevents@^6.27.12":
+"@ledgerhq/hw-transport-node-hid-noevents@^6.27.1":
   version "6.27.12"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.12.tgz#5dacbaf7e146018a73d18d16ce975925b5795732"
   dependencies:
@@ -1457,36 +1466,28 @@
     "@ledgerhq/logs" "^6.10.1"
     node-hid "^2.1.2"
 
-"@ledgerhq/hw-transport-node-hid@6.27.12":
-  version "6.27.12"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.12.tgz#8a628ea574c51bd727aa1d7b7a4ddaf9a5042df1"
+"@ledgerhq/hw-transport-node-hid@6.27.1":
+  version "6.27.1"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.1.tgz#550b56b741fbdeb07ceb66082cf9500844f3d0a1"
   dependencies:
-    "@ledgerhq/devices" "^8.0.0"
-    "@ledgerhq/errors" "^6.12.3"
-    "@ledgerhq/hw-transport" "^6.28.1"
-    "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.12"
-    "@ledgerhq/logs" "^6.10.1"
+    "@ledgerhq/devices" "^6.27.1"
+    "@ledgerhq/errors" "^6.10.0"
+    "@ledgerhq/hw-transport" "^6.27.1"
+    "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.1"
+    "@ledgerhq/logs" "^6.10.0"
     lodash "^4.17.21"
-    node-hid "^2.1.2"
+    node-hid "2.1.1"
     usb "^1.7.0"
 
-"@ledgerhq/hw-transport@^6.27.10":
-  version "6.28.1"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.1.tgz#cb22fe9bc23af4682c30f2aac7fe6f7ab13ed65a"
-  dependencies:
-    "@ledgerhq/devices" "^8.0.0"
-    "@ledgerhq/errors" "^6.12.3"
-    events "^3.3.0"
-
-"@ledgerhq/hw-transport@^6.28.1":
+"@ledgerhq/hw-transport@^6.27.1", "@ledgerhq/hw-transport@^6.27.10", "@ledgerhq/hw-transport@^6.28.1":
   version "6.28.1"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.1.tgz#cb22fe9bc23af4682c30f2aac7fe6f7ab13ed65a"
   dependencies:
     "@ledgerhq/devices" "^8.0.0"
     "@ledgerhq/errors" "^6.12.3"
     events "^3.3.0"
 
-"@ledgerhq/logs@^6.10.1":
+"@ledgerhq/logs@^6.10.0", "@ledgerhq/logs@^6.10.1":
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d"
 
