@exodus/hardware-wallets 3.4.0 → 3.5.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.5.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@3.4.0...@exodus/hardware-wallets@3.5.0) (2025-12-11)
+
+### Features
+
+- feat: throw device unininitialized error for hw (#14601)
+
+### Bug Fixes
+
+- fix: various trezor and hardware-wallets fixes (#14502)
+
+## [3.4.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@3.4.0...@exodus/hardware-wallets@3.4.1) (2025-11-28)
+
+### Bug Fixes
+
+- fix: various trezor and hardware-wallets fixes (#14502)
+
 ## [3.4.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@3.3.0...@exodus/hardware-wallets@3.4.0) (2025-11-13)
 
 ### Features

package/lib/module/hardware-wallets.js

@@ -3,7 +3,7 @@ import { WalletAccount } from '@exodus/models';
 import Emitter from '@exodus/wild-emitter';
 import { randomBytes } from '@exodus/crypto/randomBytes';
 import delay from 'delay';
-import { NoDeviceFoundError, UserRefusedError } from '@exodus/hw-common';
+import { DeviceUninitializedError, NoDeviceFoundError, UserRefusedError } from '@exodus/hw-common';
 import restrictConcurrency from 'make-concurrent';
 import pDefer from 'p-defer';
 export class HardwareWallets {
@@ -18,6 +18,7 @@ export class HardwareWallets {
     #walletAccounts;
     #syncedKeysMap = new Map();
     #signingRequest;
+    #isRetrying = false;
     events = new Emitter();
     constructor({ assetsModule, ledgerDiscovery, trezorDiscovery, logger, hardwareWalletSigningRequestsAtom, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }) {
         this.#assetsModule = assetsModule;
@@ -30,12 +31,41 @@ export class HardwareWallets {
         this.#walletAccountsAtom = walletAccountsAtom;
         this.#walletAccounts = walletAccounts;
     }
-    #getSelectedDevice = async () => {
-        const [trezors, ledgers] = await Promise.all([
-            this.#trezorDiscovery.list().catch(() => []),
-            this.#ledgerDiscovery.list().catch(() => []),
-        ]);
-        const descriptors = [...trezors, ...ledgers];
+    #listTrezorDevicesOrEmpty = async () => {
+        try {
+            return await this.#trezorDiscovery.list();
+        }
+        catch (error) {
+            if (error instanceof DeviceUninitializedError) {
+                throw error;
+            }
+            return [];
+        }
+    };
+    #listLedgerDevicesOrEmpty = async () => {
+        try {
+            return await this.#ledgerDiscovery.list();
+        }
+        catch {
+            return [];
+        }
+    };
+    #getSelectedDevice = async (walletAccount) => {
+        let descriptors;
+        const manufacturer = walletAccount?.source;
+        if (manufacturer === 'ledger') {
+            descriptors = await this.#listLedgerDevicesOrEmpty();
+        }
+        else if (manufacturer === 'trezor') {
+            descriptors = await this.#listTrezorDevicesOrEmpty();
+        }
+        else {
+            const [trezors, ledgers] = await Promise.all([
+                this.#listTrezorDevicesOrEmpty(),
+                this.#listLedgerDevicesOrEmpty(),
+            ]);
+            descriptors = [...trezors, ...ledgers];
+        }
         if (descriptors[0]) {
             return { device: await descriptors[0].get() };
         }
@@ -62,9 +92,14 @@ export class HardwareWallets {
             this.#logger.warn(`No signing request found for id: ${id}`);
             return;
         }
+        if (this.#isRetrying) {
+            this.#logger.debug(`Retry already in progress for id: ${id}, ignoring duplicate call`);
+            return;
+        }
+        this.#isRetrying = true;
         try {
             this.#logger.debug(`Attempting to get selected device for signing request with id: ${id}`);
-            const { device } = await this.#getSelectedDevice();
+            const { device } = await this.#getSelectedDevice(request.walletAccount);
             this.#logger.debug(`Attempting to sign for signing request with id: ${id}`);
             const result = await request.sign({ device });
             await this.#deleteSigningRequest(id);
@@ -79,6 +114,7 @@ export class HardwareWallets {
             if (['DisconnectedDevice', 'DisconnectedDeviceDuringOperation'].includes(_error.name)) {
                 this.#logger.debug(`Device disconnected during signing request, likely due to app opening: ${id}`, _error);
                 await delay(300);
+                this.#isRetrying = false;
                 await this.retrySigningRequest(id);
                 return;
             }
@@ -93,6 +129,9 @@ export class HardwareWallets {
                 baseAssetName: this.#signingRequest.baseAssetName,
             });
         }
+        finally {
+            this.#isRetrying = false;
+        }
     };
     cancelSigningRequest = async (id, fromUI) => {
         const request = this.#signingRequest;
@@ -105,7 +144,7 @@ export class HardwareWallets {
         if (fromUI) {
             this.#logger.debug(`Cancelling signing request on device for id: ${id}`);
             try {
-                const { device } = await this.#getSelectedDevice();
+                const { device } = await this.#getSelectedDevice(request.walletAccount);
                 await device.cancelAction();
                 this.#logger.debug(`Succesfully cancelled signing request on device for id: ${id}`);
             }
@@ -115,13 +154,14 @@ export class HardwareWallets {
         }
         request.reject(new UserRefusedError(!fromUI));
     };
-    #signGeneric = restrictConcurrency(async ({ baseAssetName, scenario, sign }) => {
+    #signGeneric = restrictConcurrency(async ({ baseAssetName, scenario, sign, walletAccount }) => {
         const id = randomBytes(16).toString('hex');
         this.#logger.debug(`Starting signing request for ${baseAssetName} with scenario: ${scenario} and id: ${id}`);
         const deferred = pDefer();
         this.#signingRequest = {
             id,
             baseAssetName,
+            walletAccount,
             sign: async ({ device }) => {
                 await this.#updateSigningRequest({
                     id,
@@ -148,7 +188,12 @@ export class HardwareWallets {
                 multisigData,
             });
         };
-        return this.#signGeneric({ baseAssetName, scenario: 'signTransaction', sign });
+        return this.#signGeneric({
+            baseAssetName,
+            scenario: 'signTransaction',
+            sign,
+            walletAccount,
+        });
     };
     signMessage = async ({ assetName, derivationPath, message }) => {
         const baseAssetName = this.#assetsModule.getAsset(assetName).baseAsset.name;
@@ -168,7 +213,11 @@ export class HardwareWallets {
                 return true;
             }
         }
-        catch { }
+        catch (error) {
+            if (error instanceof DeviceUninitializedError) {
+                throw error;
+            }
+        }
         try {
             const devices = await this.#ledgerDiscovery.list();
             return devices.length > 0;
@@ -189,8 +238,8 @@ export class HardwareWallets {
     };
     getAvailableDevices = async () => {
         const [ledgers, trezors] = await Promise.all([
-            this.#ledgerDiscovery.list().catch(() => []),
-            this.#trezorDiscovery.list().catch(() => []),
+            this.#listLedgerDevicesOrEmpty(),
+            this.#listTrezorDevicesOrEmpty(),
         ]);
         return [...ledgers, ...trezors].map((device) => ({
             model: device.model,
@@ -227,10 +276,10 @@ export class HardwareWallets {
     getAddress = async ({ assetName, accountIndex, addressIndex, multisigData, displayOnDevice, }) => {
         const asset = this.#assetsModule.getAsset(assetName);
         const { device } = await this.#getSelectedDevice();
-        const supportedPurposes = asset.baseAsset.api.getSupportedPurposes({
+        const supportedPurposes = asset.baseAsset.api.getSupportedPurposes?.({
             compatibilityMode: device.descriptor.manufacturer,
             isMultisig: !!multisigData,
-        });
+        }) ?? [44];
         const { derivationPath } = asset.baseAsset.api.getKeyIdentifier({
             compatibilityMode: device.descriptor.manufacturer,
             purpose: supportedPurposes[0],
@@ -348,10 +397,10 @@ export class HardwareWallets {
                 continue;
             }
             const baseAsset = asset.baseAsset;
-            const supportedPurposes = baseAsset.api.getSupportedPurposes({
+            const supportedPurposes = baseAsset.api.getSupportedPurposes?.({
                 compatibilityMode: source,
                 isMultisig,
-            });
+            }) ?? [44];
             for (const purpose of supportedPurposes) {
                 const { keyIdentifier, xpub, publicKey, } = (await this.#getXPUB({ device, baseAsset, purpose, accountIndex })) ||
                     (await this.#getPublicKey({ device, baseAsset, purpose, accountIndex }));
@@ -381,6 +430,10 @@ export class HardwareWallets {
         const { device } = await this.#getSelectedDevice();
         const source = device.descriptor.manufacturer;
         const label = source === WalletAccount.LEDGER_SRC ? 'Ledger' : 'Trezor';
+        const id = source === WalletAccount.TREZOR_SRC
+            ? device.descriptor.internalDescriptor
+            :
+                randomBytes(32).toString('hex');
         const { accountIndex, model } = this.#syncedKeysMap.get(syncedKeysId);
         const walletAccount = new WalletAccount({
             label: `${label}${accountIndex === 0 ? '' : '_' + accountIndex}`,
@@ -388,7 +441,7 @@ export class HardwareWallets {
             source,
             model,
             index: accountIndex,
-            id: randomBytes(32).toString('hex'),
+            id,
             isMultisig: !!isMultisig,
         });
         const walletAccountName = walletAccount.toString();

package/lib/module/interfaces.d.ts

@@ -84,6 +84,7 @@ export interface GenericSignParams {
     baseAssetName: string;
     scenario: 'signTransaction' | 'signMessage';
     sign: GenericSignCallback;
+    walletAccount?: WalletAccount;
 }
 export interface SigningRequestState {
     id: string;
@@ -94,6 +95,7 @@ export interface SigningRequestState {
 export interface SigningRequest {
     id: string;
     baseAssetName?: string;
+    walletAccount?: WalletAccount;
     sign: GenericSignCallback;
     resolve: (result: any) => void;
     reject: (error: Error) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hardware-wallets",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "An Exodus SDK feature that provides a high level abstraction for interacting with hardware wallet devices",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -32,7 +32,7 @@
     "@exodus/basic-utils": "^3.2.0",
     "@exodus/bip32": "^4.0.2",
     "@exodus/crypto": "^1.0.0-rc.14",
-    "@exodus/hw-common": "^3.2.0",
+    "@exodus/hw-common": "^3.3.0",
     "@exodus/models": "^12.18.0",
     "@exodus/redux-dependency-injection": "^4.0.0",
     "@exodus/wild-emitter": "^1.1.0",
@@ -53,5 +53,5 @@
     "access": "public",
     "provenance": false
   },
-  "gitHead": "781bdadc2bb8d8a749ade2dd01f3f7f62792363d"
+  "gitHead": "91c5651b997e904755c35158697523f816611d71"
 }