Merge remote-tracking branch 'origin/develop' into fix/ddw-1190-fix-percentage-decimals

Author: przemyslaw-wlodek

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Fixed decimals for syncing percentage ([PR 3106](https://github.com/input-output-hk/daedalus/pull/3106))
 
+### Chores
+
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
+
 ## 5.2.0
 
 ### Features

installers/common/MacInstaller.hs

@@ -156,9 +156,6 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/dar
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-arm64-"*"/blake-hash.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/build/Release/addon.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/bin/darwin-x64-"*"/blake2.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/bin/darwin-arm64-"*"/blake2.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-arm64-"*"/tiny-secp256k1.node"
@@ -241,7 +238,6 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "bip66"
       , "bitcoin-ops"
       , "blake-hash"
-      , "blake2"
       , "blake2b"
       , "blake2b-wasm"
       , "bn.js"

package.json

@@ -201,7 +201,7 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "5.1.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "6.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "@ledgerhq/hw-transport-node-hid": "6.27.1",
     "@trezor/connect": "9.0.2",

source/common/types/hardware-wallets.types.ts

@@ -1,4 +1,10 @@
 import { BridgeInfo, Device as TrezorDevice, UdevInfo } from '@trezor/connect';
+import {
+  TxOutputDestinationType,
+  AddressType,
+  CIP36VoteRegistrationFormat,
+  TxAuxiliaryDataType,
+} from '@cardano-foundation/ledgerjs-hw-app-cardano';
 
 export type BIP32Path = Array<number>;
 export type LedgerModel = 'nanoS' | 'nanoSP' | 'nanoX';
@@ -139,14 +145,18 @@ export type LedgerSignTransactionOutputsType =
   | []
   | Array<LedgerOutputTypeAddress | LedgerOutputTypeChange>;
 export type LedgerAuxiliaryDataType = {
-  type: string;
+  type: TxAuxiliaryDataType;
   params: {
-    votingPublicKeyHex: string;
+    format: CIP36VoteRegistrationFormat;
+    voteKeyHex: string;
     stakingPath: BIP32Path;
-    rewardsDestination: {
-      type: number;
+    paymentDestination: {
+      type: TxOutputDestinationType;
       params: {
-        stakingPath: BIP32Path;
+        type: AddressType;
+        params: {
+          stakingPath: BIP32Path;
+        };
       };
     };
     nonce: string;
@@ -199,7 +209,7 @@ export type LedgerSignTransactionResponse = {
   txHashHex: string;
   witnesses: Array<Witness>;
   auxiliaryDataSupplement?: {
-    catalystRegistrationSignatureHex: string;
+    cip36VoteRegistrationSignatureHex: string;
     auxiliaryDataHashHex: string;
     type: 'catalyst_registration';
   };

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,
@@ -455,7 +457,7 @@ export const handleHardwareWalletRequests = async (
   });
   deriveXpubChannel.onRequest(async (params) => {
     const { parentXpubHex, lastIndex, derivationScheme } = params;
-    const parentXpub = utils.hex_to_buf(parentXpubHex);
+    const parentXpub = utils.hex_to_buf(parentXpubHex as HexString);
 
     try {
       const xpub = deriveChildXpub(parentXpub, lastIndex, derivationScheme);
@@ -474,10 +476,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 = str_to_path(spendingPathStr);
+    const stakingPath = stakingPathStr ? str_to_path(stakingPathStr) : null;
 
     deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
 
@@ -542,10 +542,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 = str_to_path(spendingPathStr);
+    const stakingPath = stakingPathStr ? str_to_path(stakingPathStr) : null;
 
     try {
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
@@ -804,9 +802,8 @@ export const handleHardwareWalletRequests = async (
       if (!deviceConnection) {
         throw new Error('Ledger device not connected');
       }
-
       const extendedPublicKey = await deviceConnection.getExtendedPublicKey({
-        path: utils.str_to_path(path),
+        path: str_to_path(path),
       });
       const deviceSerial = await deviceConnection.getSerial();
       return Promise.resolve({

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';
@@ -12,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';
@@ -196,7 +196,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 = str_to_path(address.spendingPath);
     const derivationSpendingPath = hardenedPathToDerivationPath(
       hardenedSpendingPath
     );

source/renderer/app/stores/HardwareWalletsStore.ts

@@ -2639,7 +2639,7 @@ export default class HardwareWalletsStore extends Store {
         txAuxiliaryData = cborizeTxAuxiliaryVotingData(
           unsignedTxAuxiliaryData,
           signedTransaction.auxiliaryDataSupplement
-            .catalystRegistrationSignatureHex
+            .cip36VoteRegistrationSignatureHex
         );
       }
 

source/renderer/app/utils/hardwareWalletUtils.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { bech32 } from 'bech32';
-import { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import { str_to_path } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address';
 import { HARDENED } from '../config/hardwareWalletsConfig';
 // Types
 import type { CoinSelectionAssetsType } from '../api/transactions/types';
@@ -73,7 +73,7 @@ export const derivationPathToLedgerPath = (derivationPath: Array<string>) => {
 
   const constructedPath = _.join(transformedPath, '/');
 
-  return utils.str_to_path(constructedPath);
+  return str_to_path(constructedPath);
 };
 export const getParamsFromPath = (derivationPath: Array<string>) => {
   const pathParams = _.takeRight(derivationPath, 2);

source/renderer/app/utils/shelleyLedger.ts

@@ -4,7 +4,13 @@ import {
   AddressType,
   TxAuxiliaryDataType, // CHECK THIS
   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';
@@ -173,7 +179,7 @@ export function ShelleyTxOutput(
     const addressBuff =
       addressStyle === AddressStyles.ADDRESS_SHELLEY
         ? utils.bech32_decodeAddress(address)
-        : utils.base58_decode(address);
+        : base58_decode(address);
     return encoder.pushAny([addressBuff, coins]);
   }
 
@@ -403,8 +409,7 @@ export const CachedDeriveXpubFactory = (
         lastIndex,
         derivationScheme: derivationScheme.ed25519Mode,
       });
-      // @ts-ignore
-      return utils.hex_to_buf(derivedXpub);
+      return utils.hex_to_buf(derivedXpub as HexString);
     } catch (e) {
       throw e;
     }
@@ -442,7 +447,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: str_to_path("1852'/1815'/0'/2/0"),
           },
         },
       },
@@ -458,7 +463,7 @@ export const prepareLedgerOutput = (
         addressHex:
           addressStyle === AddressStyles.ADDRESS_SHELLEY
             ? utils.buf_to_hex(utils.bech32_decodeAddress(output.address))
-            : utils.buf_to_hex(utils.base58_decode(output.address)),
+            : utils.buf_to_hex(base58_decode(output.address)),
       },
     },
     amount: output.amount.quantity.toString(),
@@ -469,17 +474,20 @@ export const prepareLedgerAuxiliaryData = (
   txAuxiliaryData: TxAuxiliaryData
 ) => {
   const { votingPubKey, rewardDestinationAddress, type } = txAuxiliaryData;
-
   if (type === CATALYST_VOTING_REGISTRATION_TYPE) {
     return {
-      type: TxAuxiliaryDataType.CATALYST_REGISTRATION,
+      type: TxAuxiliaryDataType.CIP36_REGISTRATION,
       params: {
-        votingPublicKeyHex: votingPubKey,
+        format: CIP36VoteRegistrationFormat.CIP_15,
+        voteKeyHex: votingPubKey,
         stakingPath: rewardDestinationAddress.stakingPath,
-        rewardsDestination: {
-          type: AddressType.REWARD_KEY,
+        paymentDestination: {
+          type: TxOutputDestinationType.DEVICE_OWNED,
           params: {
-            stakingPath: rewardDestinationAddress.stakingPath,
+            type: AddressType.REWARD_KEY,
+            params: {
+              stakingPath: rewardDestinationAddress.stakingPath,
+            },
           },
         },
         nonce: `${txAuxiliaryData.nonce}`,