fix: resolve transaction signature mismatch with cosigners (#1324)

* fix: signature mismatch with cosigners * chore: update SDK packages * chore: add todo task * fix: use non-extended key hash in shared wallet script --------- Co-authored-by: Martynas Kazlauskas <martynas.kazlauskas@iohk.io>
input-output-hk · Jul 26, 2024 · 0e9f83b · 0e9f83b
1 parent e09e9e2
commit 0e9f83b
Show file tree

Hide file tree

Showing 13 changed files with 318 additions and 339 deletions.
diff --git a/apps/browser-extension-wallet/package.json b/apps/browser-extension-wallet/package.json
@@ -41,14 +41,14 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/cardano-services-client": "0.19.9",
-    "@cardano-sdk/core": "0.34.0",
-    "@cardano-sdk/dapp-connector": "0.12.21",
-    "@cardano-sdk/input-selection": "0.13.3",
-    "@cardano-sdk/tx-construction": "0.19.3",
-    "@cardano-sdk/util": "0.15.2",
-    "@cardano-sdk/wallet": "0.38.4",
-    "@cardano-sdk/web-extension": "0.29.4",
+    "@cardano-sdk/cardano-services-client": "0.19.14",
+    "@cardano-sdk/core": "0.35.4",
+    "@cardano-sdk/dapp-connector": "0.12.26",
+    "@cardano-sdk/input-selection": "0.13.8",
+    "@cardano-sdk/tx-construction": "0.19.8",
+    "@cardano-sdk/util": "0.15.4",
+    "@cardano-sdk/wallet": "0.39.1",
+    "@cardano-sdk/web-extension": "0.29.10",
     "@emurgo/cip14-js": "~3.0.1",
     "@input-output-hk/lace-ui-toolkit": "1.9.0",
     "@lace/cardano": "0.1.0",
@@ -91,7 +91,7 @@
     "zustand": "3.5.14"
   },
   "devDependencies": {
-    "@cardano-sdk/hardware-ledger": "0.9.10",
+    "@cardano-sdk/hardware-ledger": "0.10.1",
     "@emurgo/cardano-message-signing-asmjs": "1.0.1",
     "@types/dotenv-webpack": "7.0.3",
     "@types/pluralize": "^0.0.29",

diff --git a/...sion-wallet/src/features/dapp/components/confirm-transaction/DappTransactionContainer.tsx b/...sion-wallet/src/features/dapp/components/confirm-transaction/DappTransactionContainer.tsx
@@ -14,7 +14,8 @@ import {
   transactionSummaryInspector,
   Cardano,
   TokenTransferValue,
-  tokenTransferInspector
+  tokenTransferInspector,
+  Milliseconds
 } from '@cardano-sdk/core';
 import { createWalletAssetProvider } from '@cardano-sdk/wallet';
 import { Skeleton } from 'antd';
@@ -31,6 +32,9 @@ interface DappTransactionContainerProps {
   errorMessage?: string;
 }
 
+// eslint-disable-next-line no-magic-numbers
+const TIMEOUT = 6000 as Milliseconds;
+
 export const DappTransactionContainer = withAddressBookContext(
   ({ errorMessage }: DappTransactionContainerProps): React.ReactElement => {
     const {
@@ -106,7 +110,9 @@ export const DappTransactionContainer = withAddressBookContext(
               assetInfo$: inMemoryWallet.assetInfo$,
               tx,
               logger
-            })
+            }),
+            timeout: TIMEOUT,
+            logger: console
           }),
           summary: transactionSummaryInspector({
             addresses: userAddresses,
@@ -118,7 +124,9 @@ export const DappTransactionContainer = withAddressBookContext(
               assetInfo$: inMemoryWallet.assetInfo$,
               tx,
               logger
-            })
+            }),
+            timeout: TIMEOUT,
+            logger: console
           })
         });
 

diff --git a/apps/browser-extension-wallet/src/hooks/useWalletManager.ts b/apps/browser-extension-wallet/src/hooks/useWalletManager.ts
@@ -852,11 +852,12 @@ export const useWalletManager = (): UseWalletManager => {
             name: signer.name,
             sharedWalletKey: Wallet.Crypto.Bip32PublicKeyHex(signer.sharedWalletKey)
           })),
+          // TODO: LW-11069 multiSigExtendedPublicKey can be removed from wallet metadata and this key fetched from accounts since addAccount is called
           multiSigExtendedPublicKey: sharedWalletKey
         },
         ownSigners: [
           {
-            accountIndex: 0,
+            accountIndex,
             paymentScriptKeyPath,
             purpose: KeyManagement.KeyPurpose.MULTI_SIG,
             stakingScriptKeyPath,
@@ -870,6 +871,14 @@ export const useWalletManager = (): UseWalletManager => {
 
       const scriptWalletId = await walletRepository.addWallet(createScriptWalletProps);
 
+      await walletRepository.addAccount({
+        accountIndex,
+        extendedAccountPublicKey: sharedWalletKey,
+        metadata: { name: defaultAccountName(accountIndex) },
+        purpose: KeyManagement.KeyPurpose.MULTI_SIG,
+        walletId: ownSignerWalletId
+      });
+
       await walletManager.activate({
         walletId: scriptWalletId,
         chainId,

diff --git a/...views/browser-view/features/activity/components/SharedWalletTransactionDetailsWrapper.tsx b/...views/browser-view/features/activity/components/SharedWalletTransactionDetailsWrapper.tsx
@@ -1,4 +1,11 @@
-import { ActivityStatus, CoSignersListItem, SharedWalletTransactionDetails, SignPolicy, TxSummary } from '@lace/core';
+import {
+  ActivityStatus,
+  CoSignersListItem,
+  hasSigned,
+  SharedWalletTransactionDetails,
+  SignPolicy,
+  TxSummary
+} from '@lace/core';
 import React, { ReactElement, useEffect, useMemo, useState } from 'react';
 import { useWalletStore } from '@stores';
 import { Wallet } from '@lace/cardano';
@@ -41,27 +48,29 @@ export const SharedWalletTransactionDetailsWrapper = withAddressBookContext(
   ({ amountTransformer, activityInfo, direction }: SharedWalletTransactionDetailsProxyProps): ReactElement => {
     const {
       walletUI: { cardanoCoin },
-      walletInfo
+      walletInfo,
+      activityDetail
     } = useWalletStore();
     const { sharedWalletKey, getSignPolicy, coSigners } = useSharedWalletData();
     const [signPolicy, setSignPolicy] = useState<SignPolicy>();
+    const [transactionCosigners, setTransactionCosigners] = useState<CoSignersListItem[]>([]);
     const { list: addressList } = useAddressBookContext();
 
     useEffect(() => {
       (async () => {
         const policy = await getSignPolicy('payment');
         setSignPolicy(policy);
-      })();
-    }, [getSignPolicy]);
 
-    const transactionCosigners = useMemo(
-      (): CoSignersListItem[] =>
-        coSigners?.map((signer) => ({
-          ...signer,
-          signed: false
-        })) || [],
-      [coSigners]
-    );
+        const signatures = (activityDetail.activity as Wallet.Cardano.Tx).witness.signatures;
+        const cosignersWithSignStatus = await Promise.all(
+          coSigners.map(async (signer) => ({
+            ...signer,
+            signed: await hasSigned(signer.sharedWalletKey, 'payment', signatures)
+          }))
+        );
+        setTransactionCosigners(cosignersWithSignStatus);
+      })();
+    }, [activityDetail.activity, coSigners, getSignPolicy, sharedWalletKey]);
 
     const addressToNameMap = useMemo(
       () => new Map<string, string>(addressList?.map((item: AddressListType) => [item.address, item.name])),

diff --git a/packages/cardano/package.json b/packages/cardano/package.json
@@ -40,15 +40,15 @@
     "watch": "yarn build --watch"
   },
   "dependencies": {
-    "@cardano-sdk/cardano-services-client": "0.19.9",
-    "@cardano-sdk/core": "0.34.0",
-    "@cardano-sdk/crypto": "0.1.25",
-    "@cardano-sdk/hardware-ledger": "0.9.10",
-    "@cardano-sdk/hardware-trezor": "0.4.30",
-    "@cardano-sdk/key-management": "0.20.8",
-    "@cardano-sdk/util": "0.15.2",
-    "@cardano-sdk/wallet": "0.38.4",
-    "@cardano-sdk/web-extension": "0.29.4",
+    "@cardano-sdk/cardano-services-client": "0.19.14",
+    "@cardano-sdk/core": "0.35.4",
+    "@cardano-sdk/crypto": "0.1.28",
+    "@cardano-sdk/hardware-ledger": "0.10.1",
+    "@cardano-sdk/hardware-trezor": "0.4.35",
+    "@cardano-sdk/key-management": "0.21.1",
+    "@cardano-sdk/util": "0.15.4",
+    "@cardano-sdk/wallet": "0.39.1",
+    "@cardano-sdk/web-extension": "0.29.10",
     "@lace/common": "0.1.0",
     "@ledgerhq/devices": "^8.2.1",
     "@stablelib/chacha20poly1305": "1.0.1",

diff --git a/packages/cardano/src/wallet/util/derive-ed25519-key-hash-from-bip32-public-key.ts b/packages/cardano/src/wallet/util/derive-ed25519-key-hash-from-bip32-public-key.ts
@@ -7,5 +7,6 @@ export const deriveEd25519KeyHashFromBip32PublicKey = async (
 ): Promise<Crypto.Ed25519KeyHashHex> => {
   const accountKey = Crypto.Bip32PublicKey.fromHex(key);
   const derivedKey = await accountKey.derive([derivationPath.role, derivationPath.index]);
-  return Crypto.Ed25519KeyHashHex(await derivedKey.hash());
+  const derivedKeyHash = await derivedKey.toRawKey().hash();
+  return Crypto.Ed25519KeyHashHex(derivedKeyHash.hex());
 };
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -39,7 +39,7 @@
     "watch": "yarn build --watch"
   },
   "dependencies": {
-    "@cardano-sdk/util": "0.15.2",
+    "@cardano-sdk/util": "0.15.4",
     "antd": "^4.24.10",
     "classnames": "^2.3.1",
     "jdenticon": "3.1.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/wallet": "0.38.4",
-    "@cardano-sdk/web-extension": "0.29.3",
+    "@cardano-sdk/wallet": "0.39.1",
+    "@cardano-sdk/web-extension": "0.29.10",
     "@input-output-hk/lace-ui-toolkit": "1.9.0",
     "@lace/cardano": "0.1.0",
     "@lace/common": "0.1.0",

diff --git a/packages/core/src/shared-wallets/transaction/TransactionDetails.tsx b/packages/core/src/shared-wallets/transaction/TransactionDetails.tsx
diff --git a/packages/core/src/shared-wallets/utils/has-signed.ts b/packages/core/src/shared-wallets/utils/has-signed.ts
@@ -0,0 +1,14 @@
+import { Wallet } from '@lace/cardano';
+import { paymentScriptKeyPath, stakingScriptKeyPath } from '@src/shared-wallets';
+
+export const hasSigned = async (
+  key: Wallet.Crypto.Bip32PublicKeyHex,
+  type: 'payment' | 'staking',
+  signatures: Wallet.Cardano.Signatures,
+) => {
+  const derivationPath = type === 'payment' ? paymentScriptKeyPath : stakingScriptKeyPath;
+  const accountKey = Wallet.Crypto.Bip32PublicKey.fromHex(key);
+  const xkey = await accountKey.derive([derivationPath.role, derivationPath.index]);
+  const hash = xkey.toRawKey().hex();
+  return signatures.has(hash);
+};
diff --git a/packages/core/src/shared-wallets/utils/index.ts b/packages/core/src/shared-wallets/utils/index.ts
@@ -3,3 +3,4 @@ export * from './derivation-path';
 export * from './is-shared-wallet';
 export * from './get-shared-wallet-sign-policy';
 export * from './get-key-hash-to-wallet-name-map';
+export * from './has-signed';
diff --git a/packages/staking/package.json b/packages/staking/package.json
@@ -76,12 +76,12 @@
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",
-    "@cardano-sdk/core": "0.34.0",
-    "@cardano-sdk/input-selection": "0.13.3",
-    "@cardano-sdk/tx-construction": "0.19.3",
-    "@cardano-sdk/util": "0.15.2",
-    "@cardano-sdk/wallet": "0.38.4",
-    "@cardano-sdk/web-extension": "0.29.4",
+    "@cardano-sdk/core": "0.35.4",
+    "@cardano-sdk/input-selection": "0.13.8",
+    "@cardano-sdk/tx-construction": "0.19.8",
+    "@cardano-sdk/util": "0.15.4",
+    "@cardano-sdk/wallet": "0.39.1",
+    "@cardano-sdk/web-extension": "0.29.10",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.7",
     "@storybook/addon-interactions": "^7.6.7",
@@ -126,11 +126,11 @@
     "wait-on": "^7.0.1"
   },
   "peerDependencies": {
-    "@cardano-sdk/input-selection": "0.13.3",
-    "@cardano-sdk/tx-construction": "0.19.3",
-    "@cardano-sdk/util": "0.15.2",
-    "@cardano-sdk/wallet": "0.38.4",
-    "@cardano-sdk/web-extension": "0.29.4",
+    "@cardano-sdk/input-selection": "0.13.8",
+    "@cardano-sdk/tx-construction": "0.19.8",
+    "@cardano-sdk/util": "0.15.4",
+    "@cardano-sdk/wallet": "0.39.1",
+    "@cardano-sdk/web-extension": "0.29.10",
     "@lace/cardano": "^0.1.0",
     "@lace/common": "^0.1.0",
     "@lace/core": "0.1.0",