[DDW-1179] Revert str_to_path changes and add proper hex_to_buf type

Author: tomislavhoracek

source/common/utils/helper.ts

@@ -1,21 +1,2 @@
-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);
-  });
-};

source/main/ipc/getHardwareWalletChannel.ts

@@ -3,6 +3,8 @@ import TransportNodeHid, {
   getDevices,
 } from '@ledgerhq/hw-transport-node-hid-noevents';
 import AppAda, { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import { str_to_path } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address';
+import { HexString } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/types/internal';
 import TrezorConnect, {
   DEVICE,
   DEVICE_EVENT,
@@ -32,7 +34,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 { bip32StrToPath } from '../../common/utils/helper';
 
 type ListenerType = {
   unsubscribe: (...args: Array<any>) => any;
@@ -456,8 +457,7 @@ export const handleHardwareWalletRequests = async (
   });
   deriveXpubChannel.onRequest(async (params) => {
     const { parentXpubHex, lastIndex, derivationScheme } = params;
-    // @ts-ignore
-    const parentXpub = utils.hex_to_buf(parentXpubHex);
+    const parentXpub = utils.hex_to_buf(parentXpubHex as HexString);
 
     try {
       const xpub = deriveChildXpub(parentXpub, lastIndex, derivationScheme);
@@ -476,8 +476,8 @@ export const handleHardwareWalletRequests = async (
       networkId,
       protocolMagic,
     } = params;
-    const spendingPath = bip32StrToPath(spendingPathStr);
-    const stakingPath = stakingPathStr ? bip32StrToPath(stakingPathStr) : null;
+    const spendingPath = str_to_path(spendingPathStr);
+    const stakingPath = stakingPathStr ? str_to_path(stakingPathStr) : null;
 
     deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
 
@@ -542,8 +542,8 @@ export const handleHardwareWalletRequests = async (
       networkId,
       protocolMagic,
     } = params;
-    const spendingPath = bip32StrToPath(spendingPathStr);
-    const stakingPath = stakingPathStr ? bip32StrToPath(stakingPathStr) : null;
+    const spendingPath = str_to_path(spendingPathStr);
+    const stakingPath = stakingPathStr ? str_to_path(stakingPathStr) : null;
 
     try {
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
@@ -802,10 +802,8 @@ 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: bip32StrToPath(path),
+        path: str_to_path(path),
       });
       const deviceSerial = await deviceConnection.getSerial();
       return Promise.resolve({
@@ -814,7 +812,6 @@ export const handleHardwareWalletRequests = async (
         deviceId: deviceSerial.serialHex,
       });
     } catch (error) {
-      console.debug('>>> EXPORT - ERROR: ', error);
       logger.info('[HW-DEBUG] EXPORT KEY ERROR', error);
       throw error;
     }

source/renderer/app/components/wallet/receive/WalletReceiveDialog.tsx

@@ -11,6 +11,7 @@ import { PopOver } from 'react-polymorph/lib/components/PopOver';
 import QRCode from 'qrcode.react';
 import { Checkbox } from 'react-polymorph/lib/components/Checkbox';
 import { CheckboxSkin } from 'react-polymorph/lib/skins/simple/CheckboxSkin';
+import { str_to_path } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address';
 import RadioSet from '../../widgets/RadioSet';
 import Dialog from '../../widgets/Dialog';
 import DialogCloseButton from '../../widgets/DialogCloseButton';
@@ -24,7 +25,6 @@ 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';
@@ -197,7 +197,7 @@ class WalletReceiveDialog extends Component<Props, State> {
     field.value = field.value.replace(/\n/g, '');
   };
   constructPaths = (address: WalletAddress) => {
-    const hardenedSpendingPath = bip32StrToPath(address.spendingPath);
+    const hardenedSpendingPath = str_to_path(address.spendingPath);
     const derivationSpendingPath = hardenedPathToDerivationPath(
       hardenedSpendingPath
     );

source/renderer/app/utils/hardwareWalletUtils.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { bech32 } from 'bech32';
+import { str_to_path } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address';
 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 bip32StrToPath(constructedPath);
+  return str_to_path(constructedPath);
 };
 export const getParamsFromPath = (derivationPath: Array<string>) => {
   const pathParams = _.takeRight(derivationPath, 2);

source/renderer/app/utils/shelleyLedger.ts

@@ -6,6 +6,11 @@ import {
   StakeCredentialParamsType,
   CIP36VoteRegistrationFormat,
 } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import {
+  str_to_path,
+  base58_decode,
+} from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address';
+import { HexString } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/types/internal';
 import { encode } from 'borc';
 import blakejs from 'blakejs';
 import _ from 'lodash';
@@ -16,7 +21,6 @@ import {
 } from './hardwareWalletUtils';
 import { deriveXpubChannel } from '../ipc/getHardwareWalletChannel';
 import { AddressStyles } from '../domains/WalletAddress';
-import { bip32StrToPath } from '../../../common/utils/helper';
 // Types
 import type {
   CoinSelectionInput,
@@ -31,8 +35,6 @@ import type {
 } from '../../../common/types/hardware-wallets.types';
 import type { AddressStyle } from '../api/addresses/types';
 
-const bs58 = require('bs58');
-
 export const CATALYST_VOTING_REGISTRATION_TYPE = 'CATALYST_VOTING';
 export type ShelleyTxInputType = {
   coins: number;
@@ -177,7 +179,7 @@ export function ShelleyTxOutput(
     const addressBuff =
       addressStyle === AddressStyles.ADDRESS_SHELLEY
         ? utils.bech32_decodeAddress(address)
-        : bs58.decode(address);
+        : base58_decode(address);
     return encoder.pushAny([addressBuff, coins]);
   }
 
@@ -401,15 +403,13 @@ export const CachedDeriveXpubFactory = (
     const parentXpub = await deriveXpub(derivationPath.slice(0, -1), null);
 
     try {
-      // @ts-ignore
       const parentXpubHex = utils.buf_to_hex(parentXpub);
       const derivedXpub = await deriveXpubChannel.request({
         parentXpubHex,
         lastIndex,
         derivationScheme: derivationScheme.ed25519Mode,
       });
-      // @ts-ignore
-      return utils.hex_to_buf(derivedXpub);
+      return utils.hex_to_buf(derivedXpub as HexString);
     } catch (e) {
       throw e;
     }
@@ -447,7 +447,7 @@ export const prepareLedgerOutput = (
           type: AddressType.BASE_PAYMENT_KEY_STAKE_KEY,
           params: {
             spendingPath: derivationPathToLedgerPath(output.derivationPath),
-            stakingPath: bip32StrToPath("1852'/1815'/0'/2/0"),
+            stakingPath: str_to_path("1852'/1815'/0'/2/0"),
           },
         },
       },
@@ -463,7 +463,7 @@ export const prepareLedgerOutput = (
         addressHex:
           addressStyle === AddressStyles.ADDRESS_SHELLEY
             ? utils.buf_to_hex(utils.bech32_decodeAddress(output.address))
-            : utils.buf_to_hex(bs58.decode(output.address)),
+            : utils.buf_to_hex(base58_decode(output.address)),
       },
     },
     amount: output.amount.quantity.toString(),