@exodus/hw-ledger 2.2.3 → 2.2.4

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.4](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.2.3...@exodus/hw-ledger@2.2.4) (2024-01-23)
+
+### Bug Fixes
+
+- build wallet policy with correct xpub ([#5488](https://github.com/ExodusMovement/exodus-hydra/issues/5488)) ([d25dd95](https://github.com/ExodusMovement/exodus-hydra/commit/d25dd9503828b957e3c6206758325bd21b0dffbe))
+
 ## [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

package/lib/module/assets/bitcoin.js

@@ -23,9 +23,7 @@ async function createHandler(transport) {
         const psbtBuffer = params.signableTransaction;
         const psbt = new PsbtV2();
         psbt.deserialize(psbtBuffer);
-        const [purpose, coin, account] = splitBip44DerivationPath(params.derivationPaths[0]);
         const fpr = await app.getMasterFingerprint();
-        const xpub = await app.getExtendedPubkey(`m/${purpose}/${coin}/${account}`);
         const derivationPathToPublicKeyMap = Object.create(null);
         for (const derivationPath of params.derivationPaths) {
             derivationPathToPublicKeyMap[derivationPath] = await getPublicKey({
@@ -36,7 +34,7 @@ async function createHandler(transport) {
         tagPsbtWithDerivationPaths(psbt, fpr, derivationPathToPublicKeyMap);
         assertPsbtOnlyHasAllowedDerivationPaths(psbt, fpr, params.derivationPaths);
         const signatures = [];
-        const walletPolicies = derivationPathsToWalletPolicy(fpr, xpub, params.derivationPaths);
+        const walletPolicies = await derivationPathsToWalletPolicy(fpr, app, params.derivationPaths);
         for (const walletPolicy of walletPolicies) {
             const _signatures = await app.signPsbt(psbt.serialize(), walletPolicy, null);
             signatures.push(..._signatures);

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

@@ -3,4 +3,4 @@ import { DefaultWalletPolicy, PsbtV2, WalletPolicy } from '@exodus/ledger-bitcoi
 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[];
+export declare function derivationPathsToWalletPolicy(fpr: string, app: any, derivationPaths: string[]): Promise<WalletPolicy[]>;

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

@@ -104,16 +104,18 @@ export const getWalletPolicy = (fpr, xpub, purpose, coin, account) => {
     }[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;
+export async function derivationPathsToWalletPolicy(fpr, app, derivationPaths) {
+    const splittedDerivationPaths = derivationPaths.map(splitBip44DerivationPath);
+    const dedupedPaths = Object.values(splittedDerivationPaths.reduce((prev, splittedDerivationPath) => {
+        const [purpose, coin, account] = splittedDerivationPath;
+        prev[[purpose, coin, account].toString()] = [purpose, coin, account];
+        return prev;
+    }, Object.create(null)));
+    const walletPolicies = [];
+    for (const dedupedPath of dedupedPaths) {
+        const [purpose, coin, account] = dedupedPath;
+        const xpub = await app.getExtendedPubkey(`m/${purpose}/${coin}/${account}`);
+        walletPolicies.push(getWalletPolicy(fpr, xpub, purpose, coin, account));
     }
-    return Object.values(deduped);
+    return walletPolicies;
 }

package/package.json

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