@exodus/hw-ledger 2.2.1 → 2.2.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.2.2...@exodus/hw-ledger@2.2.3) (2024-01-23)
+
+### Bug Fixes
+
+- allow signing bitcoin transactions with multiple wallet policies ([#5479](https://github.com/ExodusMovement/exodus-hydra/issues/5479)) ([92a923b](https://github.com/ExodusMovement/exodus-hydra/commit/92a923b8bf30413040d6aa346281ae1b3d5ec8d8))
+
+## [2.2.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.2.1...@exodus/hw-ledger@2.2.2) (2024-01-18)
+
+### Bug Fixes
+
+- proper error handling for eth ([#5447](https://github.com/ExodusMovement/exodus-hydra/issues/5447)) ([4f72307](https://github.com/ExodusMovement/exodus-hydra/commit/4f72307b52c6dcd2584a7bf347139b9b7cf42387))
+
 ## [2.2.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.2.0...@exodus/hw-ledger@2.2.1) (2024-01-16)
 
 ### Bug Fixes

package/lib/module/assets/bitcoin.js

@@ -1,24 +1,15 @@
 import bs58 from 'bs58';
-import { AppClient, DefaultWalletPolicy, PsbtV2, } from '@exodus/ledger-bitcoin';
+import { AppClient, PsbtV2 } from '@exodus/ledger-bitcoin';
 import { splitBip44DerivationPath } from './utils';
 import assert from 'minimalistic-assert';
-import { assertPsbtOnlyHasAllowedDerivationPaths, tagPsbtWithDerivationPaths } from './utils/psbt';
+import { assertPsbtOnlyHasAllowedDerivationPaths, tagPsbtWithDerivationPaths, getWalletPolicy, derivationPathsToWalletPolicy, } from './utils/psbt';
 async function createHandler(transport) {
     const app = new AppClient(transport);
-    const getWalletPolicy = async (purpose, coin, account) => {
-        const fpr = await app.getMasterFingerprint();
-        const xpub = await app.getExtendedPubkey(`m/${purpose}/${coin}/${account}`);
-        const desc = {
-            "44'": 'pkh(@0/**)',
-            "49'": 'sh(wpkh(@0/**))',
-            "84'": 'wpkh(@0/**)',
-            "86'": 'tr(@0/**)',
-        }[purpose];
-        return new DefaultWalletPolicy(desc, `[${fpr}/${purpose}/${coin}/${account}]${xpub}`);
-    };
     const getAddress = async (params) => {
         const [purpose, coin, account, change, address] = splitBip44DerivationPath(params.derivationPath);
-        const walletPolicy = await getWalletPolicy(purpose, coin, account);
+        const fpr = await app.getMasterFingerprint();
+        const xpub = await app.getExtendedPubkey(`m/${purpose}/${coin}/${account}`);
+        const walletPolicy = getWalletPolicy(fpr, xpub, purpose, coin, account);
         return app.getWalletAddress(walletPolicy, null, Number(change), Number(address), false);
     };
     const getXPub = async (params) => {
@@ -34,7 +25,7 @@ async function createHandler(transport) {
         psbt.deserialize(psbtBuffer);
         const [purpose, coin, account] = splitBip44DerivationPath(params.derivationPaths[0]);
         const fpr = await app.getMasterFingerprint();
-        const walletPolicy = await getWalletPolicy(purpose, coin, account);
+        const xpub = await app.getExtendedPubkey(`m/${purpose}/${coin}/${account}`);
         const derivationPathToPublicKeyMap = Object.create(null);
         for (const derivationPath of params.derivationPaths) {
             derivationPathToPublicKeyMap[derivationPath] = await getPublicKey({
@@ -44,7 +35,12 @@ async function createHandler(transport) {
         }
         tagPsbtWithDerivationPaths(psbt, fpr, derivationPathToPublicKeyMap);
         assertPsbtOnlyHasAllowedDerivationPaths(psbt, fpr, params.derivationPaths);
-        const signatures = await app.signPsbt(psbt.serialize(), walletPolicy, null);
+        const signatures = [];
+        const walletPolicies = derivationPathsToWalletPolicy(fpr, xpub, params.derivationPaths);
+        for (const walletPolicy of walletPolicies) {
+            const _signatures = await app.signPsbt(psbt.serialize(), walletPolicy, null);
+            signatures.push(..._signatures);
+        }
         const result = signatures.map(([inputIndex, partialSignature]) => ({
             inputIndex,
             publicKey: partialSignature.pubkey,

package/lib/module/assets/ethereum.js

@@ -74,14 +74,14 @@ async function createHandler(transport) {
                 });
             }
             catch (err) {
-                if (err instanceof Error && err.message.includes('EthAppNftNotSupported')) {
+                if (err.name === 'EthAppNftNotSupported') {
                     response = await signTransaction({
                         derivationPath: params.derivationPaths[0],
                         serializedTransactionHex,
                         withNFT: false,
                     });
                 }
-                else if (err instanceof Error && err.message.includes('EthAppPleaseEnableContractData')) {
+                else if (err.name === 'EthAppPleaseEnableContractData') {
                     throw new RequiresBlindSigningError();
                 }
                 else {

package/lib/module/assets/utils/psbt.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
-import { PsbtV2 } from '@exodus/ledger-bitcoin';
+import { DefaultWalletPolicy, PsbtV2, WalletPolicy } from '@exodus/ledger-bitcoin';
 export declare function assertPsbtOnlyHasAllowedDerivationPaths(psbt: PsbtV2, masterFingerprint: string, derivationPaths: string[]): void;
 export declare function tagPsbtWithDerivationPaths(psbt: PsbtV2, masterFingerprint: string, derivationPathToPublicKeyMap: Record<string, Buffer>): void;
+export declare const getWalletPolicy: (fpr: string, xpub: string, purpose: string, coin: string, account: string) => DefaultWalletPolicy;
+export declare function derivationPathsToWalletPolicy(fpr: string, xpub: string, derivationPaths: string[]): WalletPolicy[];

package/lib/module/assets/utils/psbt.js

@@ -1,6 +1,7 @@
 import assert from 'minimalistic-assert';
+import { DefaultWalletPolicy, } from '@exodus/ledger-bitcoin';
 import { payments } from '@exodus/bitcoinjs-lib';
-import { buildBip44PathFromNumber, assertBip44PathNumber, splitBip44PathToNumber, } from './derivation-paths';
+import { buildBip44PathFromNumber, assertBip44PathNumber, splitBip44PathToNumber, splitBip44DerivationPath, } from './derivation-paths';
 export function assertPsbtOnlyHasAllowedDerivationPaths(psbt, masterFingerprint, derivationPaths) {
     for (let i = 0; i < psbt.getGlobalInputCount(); i++) {
         const BIP32_DERIVATION = 6;
@@ -94,3 +95,25 @@ function computeScriptPubKeyToDerivationPathMap(derivationPathToPublicKeyMap) {
 function isTaproot(scriptPubKey) {
     return scriptPubKey.length === 34 && scriptPubKey.at(0) === 0x51 && scriptPubKey.at(1) === 0x20;
 }
+export const getWalletPolicy = (fpr, xpub, purpose, coin, account) => {
+    const desc = {
+        "44'": 'pkh(@0/**)',
+        "49'": 'sh(wpkh(@0/**))',
+        "84'": 'wpkh(@0/**)',
+        "86'": 'tr(@0/**)',
+    }[purpose];
+    return new DefaultWalletPolicy(desc, `[${fpr}/${purpose}/${coin}/${account}]${xpub}`);
+};
+export function derivationPathsToWalletPolicy(fpr, xpub, derivationPaths) {
+    const walletPolicies = derivationPaths
+        .map(splitBip44DerivationPath)
+        .map(([purpose, coin, account]) => {
+        return getWalletPolicy(fpr, xpub, purpose, coin, account);
+    });
+    const deduped = Object.create(null);
+    for (const walletPolicy of walletPolicies) {
+        const uniqueId = walletPolicy.getId().toString('hex');
+        deduped[uniqueId] = walletPolicy;
+    }
+    return Object.values(deduped);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "The ledger module",
   "author": "Exodus Movement Inc.",
   "repository": {
@@ -67,5 +67,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.7.3"
   },
-  "gitHead": "58a6b3ab7d222a9a18a48fae2f450ebef9c67738"
+  "gitHead": "eae25afb3c619cf0d093cee791c9f899bda3e22e"
 }