Feat/lw 12399 sign multisig tx with hw (#1768)

* fix: [lw-12399] sign multisig tx with hw

* fix: bump cardano-js-sdk

---------

Co-authored-by: Angel Castillo <angel.castillo@iohk.io>

Author: vetalcore

apps/browser-extension-wallet/package.json

@@ -56,15 +56,15 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/cardano-services-client": "0.26.15",
+    "@cardano-sdk/cardano-services-client": "0.26.16",
     "@cardano-sdk/core": "0.46.0",
     "@cardano-sdk/dapp-connector": "0.13.14",
-    "@cardano-sdk/input-selection": "0.14.14",
-    "@cardano-sdk/tx-construction": "0.27.1",
+    "@cardano-sdk/input-selection": "0.14.15",
+    "@cardano-sdk/tx-construction": "0.27.2",
     "@cardano-sdk/util": "0.17.0",
-    "@cardano-sdk/util-rxjs": "0.9.16",
-    "@cardano-sdk/wallet": "0.53.1",
-    "@cardano-sdk/web-extension": "0.39.11",
+    "@cardano-sdk/util-rxjs": "0.9.17",
+    "@cardano-sdk/wallet": "0.53.2",
+    "@cardano-sdk/web-extension": "0.39.12",
     "@emurgo/cip14-js": "~3.0.1",
     "@input-output-hk/lace-ui-toolkit": "3.5.0",
     "@lace/bitcoin": "0.1.0",
@@ -119,7 +119,7 @@
     "zustand": "3.5.14"
   },
   "devDependencies": {
-    "@cardano-sdk/hardware-ledger": "0.16.1",
+    "@cardano-sdk/hardware-ledger": "0.16.2",
     "@emurgo/cardano-message-signing-asmjs": "1.0.1",
     "@openpgp/web-stream-tools": "0.0.11-patch-0",
     "@pdfme/common": "^4.0.2",

apps/browser-extension-wallet/src/components/MainMenu/DropdownMenuOverlay/components/WalletAccounts.tsx

@@ -69,7 +69,7 @@ export const WalletAccounts = ({ isPopup, onBack }: { isPopup: boolean; onBack:
   const disableUnlock = useMemo(
     () =>
       isPopup &&
-      (wallet.type === WalletType.Ledger || wallet.type === WalletType.Trezor) && {
+      Wallet.AVAILABLE_WALLETS.includes(wallet.type as Wallet.HardwareWallets) && {
         reason: (
           <Trans
             i18nKey="multiWallet.popupHwAccountEnable"

apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/__tests__/utils.test.tsx

@@ -85,7 +85,7 @@ describe('Testing utils', () => {
   });
 
   test('testing pubDRepKeyToHash', async () => {
-    const pubDRepKeyHex = '_pubDRepKeyHex';
+    const pubDRepKeyHex = '8293d319ef5b3ac72366dd28006bd315b715f7e7cfcbd3004129b80d';
     expect(await pubDRepKeyToHash(pubDRepKeyHex as Wallet.Crypto.Ed25519PublicKeyHex)).toEqual(pubDRepKeyHex);
   });
 

apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/utils.ts

@@ -1,9 +1,9 @@
 /* eslint-disable sonarjs/no-small-switch */
 /* eslint-disable complexity */
 import { Wallet } from '@lace/cardano';
-import { RemoteApiPropertyType, TransactionWitnessRequest, WalletType, exposeApi } from '@cardano-sdk/web-extension';
+import { exposeApi, RemoteApiPropertyType, TransactionWitnessRequest, WalletType } from '@cardano-sdk/web-extension';
 import type { UserPromptService } from '@lib/scripts/background/services';
-import { DAPP_CHANNELS, cardanoCoin } from '@src/utils/constants';
+import { cardanoCoin, DAPP_CHANNELS } from '@src/utils/constants';
 import { runtime } from 'webextension-polyfill';
 import { of } from 'rxjs';
 import { logger } from '@lace/common';
@@ -66,7 +66,7 @@ export const pubDRepKeyToHash = async (
   pubDRepKeyHex: Wallet.Crypto.Ed25519PublicKeyHex
 ): Promise<Wallet.Crypto.Hash28ByteBase16> => {
   const pubDRepKey = await Wallet.Crypto.Ed25519PublicKey.fromHex(pubDRepKeyHex);
-  return (await pubDRepKey.hash()).hex();
+  return (await pubDRepKey.hash()).hex() as unknown as Wallet.Crypto.Hash28ByteBase16;
 };
 
 export const depositPaidWithSymbol = (deposit: bigint, coinId: Wallet.CoinId): string => {

apps/browser-extension-wallet/src/features/delegation/components/MultiDelegationStakingPopup.tsx

@@ -37,7 +37,7 @@ import { isMultidelegationSupportedByDevice } from '@views/browser/features/stak
 import { useSecrets, useSignPolicy } from '@lace/core';
 import { useRewardAccountsData } from '@src/views/browser-view/features/staking/hooks';
 import { parseError } from '@src/utils/parse-error';
-import { getParentWalletCIP1854Account } from '@lib/scripts/background/util';
+import { getParentWalletForCIP1854Account } from '@lib/scripts/background/util';
 import { useObservable } from '@lace/common';
 import { walletRoutePaths } from '@routes';
 
@@ -86,7 +86,7 @@ export const MultiDelegationStakingPopup = (): JSX.Element => {
   const wallet = useCurrentWallet();
   const wallets = useObservable(walletRepository.wallets$);
 
-  const parentMultiSigAccount = getParentWalletCIP1854Account({ wallets, activeWallet: wallet });
+  const parentMultiSigAccount = getParentWalletForCIP1854Account({ wallets, activeWallet: wallet })?.account;
   const signPolicy = useSignPolicy(wallet, 'staking');
 
   const sendAnalytics = useCallback(() => {

apps/browser-extension-wallet/src/lib/scripts/background/storage/extension-blob-key-value-store.ts

@@ -9,7 +9,7 @@ import { toSerializableObject } from '@cardano-sdk/util';
  * Stores entire key-value collection in a single document
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export class ExtensionBlobKeyValueStore<K extends PropertyKey, V extends {}>
+export class ExtensionBlobKeyValueStore<K extends string, V extends {}>
   extends ExtensionDocumentStore<Record<K, V>>
   implements sdkStorage.KeyValueStore<K, V>
 {

apps/browser-extension-wallet/src/lib/scripts/background/util.ts

@@ -12,7 +12,6 @@ import {
   WalletType
 } from '@cardano-sdk/web-extension';
 import * as KeyManagement from '@cardano-sdk/key-management';
-import { HexBlob } from '@cardano-sdk/util';
 import { getBackgroundStorage } from './storage';
 import { catchAndBrandExtensionApiError } from '@utils/catch-and-brand-extension-api-error';
 
@@ -114,22 +113,30 @@ const waitForTabLoad = (tab: Tabs.Tab) =>
  * @param activeWallet
  * @returns {Bip32WalletAccount<Wallet.AccountMetadata>} | undefined
  */
-export const getParentWalletCIP1854Account = ({
+export const getParentWalletForCIP1854Account = ({
   wallets,
   activeWallet
 }: {
   wallets: AnyWallet<Wallet.WalletMetadata, Wallet.AccountMetadata>[];
   activeWallet: AnyWallet<Wallet.WalletMetadata, Wallet.AccountMetadata>;
-}): Bip32WalletAccount<Wallet.AccountMetadata> | undefined => {
+}):
+  | {
+      wallet: AnyWallet<Wallet.WalletMetadata, Wallet.AccountMetadata>;
+      account: Bip32WalletAccount<Wallet.AccountMetadata>;
+    }
+  | undefined => {
   if (activeWallet?.type !== WalletType.Script) return;
 
   const parentWallet = wallets.find(({ walletId }) => walletId === activeWallet.ownSigners[0].walletId);
 
   if (parentWallet.type !== WalletType.Script) {
     // eslint-disable-next-line consistent-return
-    return parentWallet.accounts.find(
-      ({ accountIndex, purpose }) => accountIndex === 0 && purpose === KeyManagement.KeyPurpose.MULTI_SIG
-    );
+    return {
+      wallet: parentWallet,
+      account: parentWallet.accounts.find(
+        ({ accountIndex, purpose }) => accountIndex === 0 && purpose === KeyManagement.KeyPurpose.MULTI_SIG
+      )
+    };
   }
 };
 
@@ -151,7 +158,7 @@ export const getActiveWallet = async ({
   if (!wallet) return;
   const account =
     wallet.type === WalletType.Script
-      ? getParentWalletCIP1854Account({ wallets, activeWallet: wallet })
+      ? getParentWalletForCIP1854Account({ wallets, activeWallet: wallet })?.account
       : wallet.accounts.find((acc) => activeWallet.accountIndex === acc.accountIndex);
   // eslint-disable-next-line consistent-return
   return { wallet, account };
@@ -192,8 +199,5 @@ export const getWalletName = (): string => {
   return `${process.env.WALLET_NAME}`;
 };
 
-export const hashExtendedAccountPublicKey = (extendedAccountPublicKey: string): string => {
-  const input = Buffer.from(extendedAccountPublicKey);
-
-  return blake2b.hash(HexBlob.fromBytes(input), 32);
-};
+export const hashExtendedAccountPublicKey = (extendedAccountPublicKey: string): string =>
+  blake2b.hash(extendedAccountPublicKey, 16);

apps/browser-extension-wallet/src/lib/scripts/background/wallet.ts

@@ -177,10 +177,7 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
         chainId,
         extendedAccountPublicKey: walletAccount.extendedAccountPublicKey
       },
-      {
-        bip32Ed25519: await Wallet.getBip32Ed25519(),
-        blake2b: Wallet.Crypto.blake2b
-      }
+      await Wallet.KeyManagement.Bip32Account.createDefaultDependencies()
     );
 
     const useWebSocket = isExperimentEnabled(featureFlags, ExperimentName.WEBSOCKET_API);

apps/browser-extension-wallet/src/views/browser-view/components/QRPublicKeyDrawer/QRPublicKeyDrawer.tsx

@@ -8,14 +8,14 @@ import { getQRCodeOptions } from '@src/utils/qrCodeHelpers';
 import { PostHogAction } from '@providers/AnalyticsProvider/analyticsTracker';
 import { useCurrentWallet, useWalletManager } from '@hooks';
 import { useObservable } from '@lace/common';
-import { getParentWalletCIP1854Account } from '@lib/scripts/background/util';
+import { getParentWalletForCIP1854Account } from '@lib/scripts/background/util';
 
 const useWalletInformation = () => {
   const { walletRepository } = useWalletManager();
   const wallets = useObservable(walletRepository.wallets$);
   const wallet = useCurrentWallet();
 
-  const parentMultiSigAccount = getParentWalletCIP1854Account({ wallets, activeWallet: wallet });
+  const parentMultiSigAccount = getParentWalletForCIP1854Account({ wallets, activeWallet: wallet })?.account;
 
   return useWalletStore((state) => ({
     name: state?.walletInfo?.name,

apps/browser-extension-wallet/src/views/browser-view/features/activity/components/SharedWalletTransactionDetailsWrapper.tsx

@@ -14,7 +14,7 @@ import { AddressListType, getTransactionData } from '@views/browser/features/act
 import { useAddressBookContext, withAddressBookContext } from '@src/features/address-book/context';
 import { TransactionActivityDetail, TxDirection, TxDirections } from '@types';
 import { useObservable } from '@lace/common';
-import { getParentWalletCIP1854Account } from '@lib/scripts/background/util';
+import { getParentWalletForCIP1854Account } from '@lib/scripts/background/util';
 
 interface SharedWalletTransactionDetailsProxyProps {
   amountTransformer: (amount: string) => string;
@@ -57,7 +57,7 @@ export const SharedWalletTransactionDetailsWrapper = withAddressBookContext(
     const wallets = useObservable(walletRepository.wallets$);
     const wallet = useCurrentWallet();
 
-    const parentMultiSigAccount = getParentWalletCIP1854Account({ wallets, activeWallet: wallet });
+    const parentMultiSigAccount = getParentWalletForCIP1854Account({ wallets, activeWallet: wallet })?.account;
     const sharedWalletKey = parentMultiSigAccount?.extendedAccountPublicKey;
 
     const coSigners = wallet?.metadata?.coSigners;