@exodus/hw-ledger 2.10.0 → 2.12.0

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.11.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.11.0...@exodus/hw-ledger@2.11.1) (2024-10-01)
+
+### Features
+
+- use internal xpub for multisig hardware wallet policy ([#9639](https://github.com/ExodusMovement/exodus-hydra/issues/9639)) ([e96bee0](https://github.com/ExodusMovement/exodus-hydra/commit/e96bee045b3799a43464db4487d42a980ef95f0f))
+
+## [2.11.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.10.0...@exodus/hw-ledger@2.11.0) (2024-09-23)
+
+### Features
+
+- add more metadata to unsupported version error ([#9267](https://github.com/ExodusMovement/exodus-hydra/issues/9267)) ([1a78d90](https://github.com/ExodusMovement/exodus-hydra/commit/1a78d9032bd97dfb77967be90d5cfad2678035b9))
+
 ## [2.10.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.9.5...@exodus/hw-ledger@2.10.0) (2024-09-16)
 
 ### Features

package/lib/atoms/index.js

@@ -23,7 +23,6 @@ export const walletPolicyAtomDefinition = {
         return createStorageAtom({
             key: 'walletPolicy',
             defaultValue: {},
-            isSoleWriter: true,
         });
     },
     dependencies: ['storage'],

package/lib/index.d.ts

@@ -5,7 +5,7 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
         readonly definition: {
             readonly id: "bluetoothStatusAtom";
             readonly type: "atom";
-            readonly factory: () => import("libraries/atoms/lib").Atom<import("./atoms").BluetoothStatus>;
+            readonly factory: () => import("@exodus/atoms").Atom<import("./atoms").BluetoothStatus>;
             readonly dependencies: readonly [];
             readonly public: true;
         };
@@ -13,7 +13,7 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
         readonly definition: {
             readonly id: "bluetoothScanningAtom";
             readonly type: "atom";
-            readonly factory: () => import("libraries/atoms/lib").Atom<boolean>;
+            readonly factory: () => import("@exodus/atoms").Atom<boolean>;
             readonly dependencies: readonly [];
             readonly public: true;
         };
@@ -23,7 +23,7 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
             readonly type: "atom";
             readonly factory: ({ storage }: {
                 storage: import("adapters/storage-interface").Storage<Record<string, Buffer>>;
-            }) => import("libraries/atoms/lib").Atom<Record<string, Buffer> | {}>;
+            }) => import("@exodus/atoms").Atom<Record<string, Buffer> | {}>;
             readonly dependencies: readonly ["storage"];
             readonly public: true;
         };
@@ -32,8 +32,8 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
             readonly id: "hardwareWalletLedgerPlugin";
             readonly type: "plugin";
             readonly factory: ({ bluetoothStatusAtom, bluetoothScanningAtom, ledgerDiscovery, port, }: {
-                bluetoothStatusAtom: import("libraries/atoms/lib").Atom<import("./atoms").BluetoothStatus>;
-                bluetoothScanningAtom: import("libraries/atoms/lib").Atom<boolean>;
+                bluetoothStatusAtom: import("@exodus/atoms").Atom<import("./atoms").BluetoothStatus>;
+                bluetoothScanningAtom: import("@exodus/atoms").Atom<boolean>;
                 ledgerDiscovery: import("./module").LedgerDiscovery;
                 port: import("./shared/types").Port;
             }) => {

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

@@ -4,7 +4,6 @@ import type { MultisigData } from 'libraries/hw-common/lib';
 export declare function assertPsbtOnlyHasAllowedDerivationPaths(psbt: PsbtV2, masterFingerprint: string, derivationPaths: string[]): void;
 export declare function tagPsbtWithDerivationPaths(psbt: PsbtV2, masterFingerprint: string, derivationPathToPublicKeyMap: Record<string, Buffer>, addressToDerivationPathMap?: Record<string, string>): void;
 export declare const getWalletPolicy: (fpr: string, xpub: string, purpose: string, coin: string, account: string) => DefaultWalletPolicy;
-export declare const DUMMY_TAPROOT_XPUB = "xpub661MyMwAqRbcEYS8w7XLSVeEsBXy79zSzH1J8vCdxAZningWLdN3zgtU6QgnecKFpJFPpdzxKrwoaZoV44qAJewsc4kX9vGaCaBExuvJH57";
 export declare const getMultisigWalletPolicy: (fpr: string, xpub: string, purpose: string, coin: string, account: string, multisigData: MultisigData) => WalletPolicy;
 export declare function derivationPathsToWalletPolicy(fpr: string, app: any, derivationPaths: string[], multisigData?: MultisigData): Promise<WalletPolicy[]>;
 export declare function addDummyInputs(psbt: PsbtV2): void;

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

@@ -118,10 +118,9 @@ export const getWalletPolicy = (fpr, xpub, purpose, coin, account) => {
     }[purpose];
     return new DefaultWalletPolicy(desc, `[${fpr}/${purpose}/${coin}/${account}]${xpub}`);
 };
-export const DUMMY_TAPROOT_XPUB = 'xpub661MyMwAqRbcEYS8w7XLSVeEsBXy79zSzH1J8vCdxAZningWLdN3zgtU6QgnecKFpJFPpdzxKrwoaZoV44qAJewsc4kX9vGaCaBExuvJH57';
 export const getMultisigWalletPolicy = (fpr, xpub, purpose, coin, account, multisigData) => {
     let template = `tr(@0/**,sortedmulti_a(${multisigData.threshold}`;
-    const keys = [DUMMY_TAPROOT_XPUB];
+    const keys = [multisigData.internalXpub];
     multisigData.xpubs.forEach((xpub2, i) => {
         if (xpub === xpub2) {
             keys.push(`[${fpr}/${purpose}/${coin}/${account}]${xpub}`);

package/lib/module/device.js

@@ -65,7 +65,7 @@ export class LedgerDevice {
         const { applications } = this.#getAssetApplication(baseAssetName);
         const supportedApplicationNames = applications.map(({ applicationName }) => applicationName);
         const currentApplicationInfo = await this.#getInformation();
-        let desiredApplicationInfo = null;
+        let desiredApplicationInfo;
         if (supportedApplicationNames.includes(currentApplicationInfo.name)) {
             desiredApplicationInfo = currentApplicationInfo;
         }
@@ -90,11 +90,10 @@ export class LedgerDevice {
             }
             desiredApplicationInfo = await this.#getInformation();
         }
-        const currentApplicationName = desiredApplicationInfo.name;
-        const { supportedVersions } = applications.find(({ applicationName }) => applicationName === currentApplicationName);
+        const { supportedVersions } = applications.find(({ applicationName }) => applicationName === desiredApplicationInfo.name);
         const isSupportedVersion = semver.satisfies(desiredApplicationInfo.version, supportedVersions);
         if (!isSupportedVersion) {
-            throw new UnsupportedVersionError(desiredApplicationInfo.version, supportedVersions);
+            throw new UnsupportedVersionError(baseAssetName, desiredApplicationInfo.name, desiredApplicationInfo.version, supportedVersions);
         }
     };
     listSupportedAssetNames = async () => {

package/lib/module/errors.d.ts

@@ -14,9 +14,11 @@ export declare class ApplicationNotFoundError extends HardwareWalletError {
 }
 export declare class UnsupportedVersionError extends HardwareWalletError {
     name: string;
+    baseAssetName: string;
+    applicationName: string;
     supportedVersions: string;
     actualVersion: string;
-    constructor(actualVersion: string, supportedVersions: string);
+    constructor(baseAssetName: string, applicationName: string, actualVersion: string, supportedVersions: string);
 }
 export declare class RequiresBlindSigningError extends HardwareWalletError {
     name: string;

package/lib/module/errors.js

@@ -21,10 +21,14 @@ export class ApplicationNotFoundError extends HardwareWalletError {
 }
 export class UnsupportedVersionError extends HardwareWalletError {
     name = 'UnsupportedVersionError';
+    baseAssetName;
+    applicationName;
     supportedVersions;
     actualVersion;
-    constructor(actualVersion, supportedVersions) {
+    constructor(baseAssetName, applicationName, actualVersion, supportedVersions) {
         super(`version does not meet version requirements: ${actualVersion} does not match ${supportedVersions}`);
+        this.baseAssetName = baseAssetName;
+        this.applicationName = applicationName;
         this.supportedVersions = supportedVersions;
         this.actualVersion = actualVersion;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "2.10.0",
+  "version": "2.12.0",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -34,11 +34,10 @@
     "@exodus/bip322-js": "^1.1.0-exodus.4",
     "@exodus/bitcoinjs-lib": "^6.1.5-exodus.0",
     "@exodus/ethersproject-transactions": "^5.4.2-exodus.0",
-    "@exodus/hw-common": "^2.4.0",
+    "@exodus/hw-common": "^2.5.0",
     "@exodus/ledger-bitcoin": "^0.2.3-exodus.3",
     "@exodus/ledgerhq-devices": "^8.1.0-exodus.3",
     "@exodus/ledgerhq-hw-app-eth": "^6.33.7-exodus.8",
-    "@exodus/module": "^1.2.2",
     "@exodus/redux-dependency-injection": "^4.0.0",
     "@exodus/secp256k1": "^4.0.2-exodus.0",
     "@ledgerhq/hw-app-solana": "^7.0.10",
@@ -72,5 +71,5 @@
     "tiny-secp256k1": "^2.2.3",
     "ts-jest": "^29.0.3"
   },
-  "gitHead": "d035797666e173e9cec145ddce8e137fe84dfb83"
+  "gitHead": "d4838cd68554c8a09b6d2815a6c77dd6187234a0"
 }