@exodus/hardware-wallets 3.3.0 → 3.4.1

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.
 
+## [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
+
+- feat: trezor bluetooth (#14374)
+
 ## [3.3.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@3.2.0...@exodus/hardware-wallets@3.3.0) (2025-10-27)
 
 ### Features

package/lib/api/index.d.ts

@@ -14,7 +14,7 @@ declare const hardwareWalletsApiDefinition: {
                 name: string;
             }[]>;
             listUseableAssetNames: () => Promise<string[]>;
-            scanForDevices: () => Promise<void>;
+            scanForDevices: (deviceType?: import("libraries/hw-common/lib/types.js").HardwareWalletManufacturer) => Promise<void>;
             canAccessAsset: ({ assetName }: import("../module/interfaces.js").CanAccessAssetParams) => Promise<boolean>;
             ensureApplicationIsOpened: ({ assetName }: import("../module/interfaces.js").EnsureApplicationIsOpenedParams) => Promise<void>;
             scan: ({ assetName, accountIndexes, addressLimit, addressOffset, }: import("../module/interfaces.js").ScanParams) => Promise<import("../module/interfaces.js").ScanResult>;

package/lib/atoms/index.d.ts

@@ -1,5 +1,4 @@
 export { hardwareWalletSigningRequestsAtomDefinition } from './hardwareWalletSigningRequestsAtom.js';
-export { hardwareWalletPairingPromptAtomDefinition } from './hardwareWalletPairingPromptAtom.js';
 type WalletAccountName = string;
 type AssetName = string;
 export type WalletAccountNameToConnectedAssetNamesMap = Record<WalletAccountName, AssetName[]>;

package/lib/atoms/index.js

@@ -2,7 +2,6 @@ import { combine, compute } from '@exodus/atoms';
 import { memoize } from '@exodus/basic-utils';
 import { HARDENED_OFFSET } from '@exodus/bip32';
 export { hardwareWalletSigningRequestsAtomDefinition } from './hardwareWalletSigningRequestsAtom.js';
-export { hardwareWalletPairingPromptAtomDefinition } from './hardwareWalletPairingPromptAtom.js';
 export const createHardwareWalletConnectedAssetNamesAtom = ({ hardwareWalletPublicKeysAtom, assetsModule, walletAccountsAtom, availableAssetNamesAtom, }) => {
     const selector = memoize(({ hardwareWalletPublicKeys, walletAccounts, availableAssetNames }) => {
         const result = Object.create(null);

package/lib/index.d.ts

@@ -17,7 +17,7 @@ declare const hardwareWallets: () => {
                         name: string;
                     }[]>;
                     listUseableAssetNames: () => Promise<string[]>;
-                    scanForDevices: () => Promise<void>;
+                    scanForDevices: (deviceType?: import("libraries/hw-common/lib/types.js").HardwareWalletManufacturer) => Promise<void>;
                     canAccessAsset: ({ assetName }: import("./module/interfaces.js").CanAccessAssetParams) => Promise<boolean>;
                     ensureApplicationIsOpened: ({ assetName }: import("./module/interfaces.js").EnsureApplicationIsOpenedParams) => Promise<void>;
                     scan: ({ assetName, accountIndexes, addressLimit, addressOffset, }: import("./module/interfaces.js").ScanParams) => Promise<import("./module/interfaces.js").ScanResult>;
@@ -37,7 +37,7 @@ declare const hardwareWallets: () => {
             readonly id: "hardwareWallets";
             readonly type: "module";
             readonly factory: (opts: import("./module/hardware-wallets.js").Dependencies) => import("./module/hardware-wallets.js").HardwareWallets;
-            readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "trezorDiscovery", "publicKeyStore", "hardwareWalletSigningRequestsAtom", "hardwareWalletPairingPromptAtom", "wallet", "walletAccountsAtom", "walletAccounts"];
+            readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "trezorDiscovery", "publicKeyStore", "hardwareWalletSigningRequestsAtom", "wallet", "walletAccountsAtom", "walletAccounts"];
             readonly public: true;
         };
     }, {
@@ -55,13 +55,6 @@ declare const hardwareWallets: () => {
             readonly dependencies: readonly [];
             readonly public: false;
         };
-    }, {
-        readonly definition: {
-            readonly id: "hardwareWalletPairingPromptAtom";
-            readonly type: "atom";
-            readonly factory: () => import("@exodus/atoms").Atom<boolean>;
-            readonly public: true;
-        };
     }, {
         readonly definition: {
             readonly id: "hardwareWalletsPlugin";

package/lib/index.js

@@ -1,6 +1,6 @@
 import hardwareWalletsApiDefinition from './api/index.js';
 import hardwareWalletsModuleDefinition from './module/hardware-wallets.js';
-import { hardwareWalletConnectedAssetNamesAtomDefinition, hardwareWalletSigningRequestsAtomDefinition, hardwareWalletPairingPromptAtomDefinition, } from './atoms/index.js';
+import { hardwareWalletConnectedAssetNamesAtomDefinition, hardwareWalletSigningRequestsAtomDefinition, } from './atoms/index.js';
 import hardwareWalletsPluginDefinition from './plugin/index.js';
 const hardwareWallets = () => {
     return {
@@ -18,9 +18,6 @@ const hardwareWallets = () => {
             {
                 definition: hardwareWalletSigningRequestsAtomDefinition,
             },
-            {
-                definition: hardwareWalletPairingPromptAtomDefinition,
-            },
             {
                 definition: hardwareWalletsPluginDefinition,
             },

package/lib/module/hardware-wallets.d.ts

@@ -1,7 +1,7 @@
 import { WalletAccount } from '@exodus/models';
 import Emitter from '@exodus/wild-emitter';
 import type { HardwareSignerProvider, CanAccessAssetParams, CreateParams, StoreSyncedKeysParams, ScanParams, SyncParams, EnsureApplicationIsOpenedParams, SignTransactionParams, ScanResult, SyncedKeysId, GetAddressParams, RequireDeviceForParams, ProcessPairingCodeParams, SigningRequestState } from './interfaces.js';
-import type { HardwareWalletDiscovery, SignMessageParams } from '@exodus/hw-common';
+import type { HardwareWalletDiscovery, HardwareWalletManufacturer, SignMessageParams } from '@exodus/hw-common';
 import type { Atom } from '@exodus/atoms';
 import type { IPublicKeyStore } from '@exodus/public-key-provider/lib/module/store/types';
 import type { Logger } from '@exodus/logger';
@@ -11,10 +11,10 @@ export type Dependencies = {
     trezorDiscovery: HardwareWalletDiscovery & {
         connected: boolean;
         submitPairingCode: (code: string) => Promise<any>;
+        clearPairingPrompt: () => Promise<void>;
     };
     logger: Logger;
     hardwareWalletSigningRequestsAtom: Atom<SigningRequestState>;
-    hardwareWalletPairingPromptAtom: Atom<boolean>;
     publicKeyStore: IPublicKeyStore;
     wallet: any;
     walletAccountsAtom: Atom<WalletAccount>;
@@ -25,13 +25,13 @@ export type Dependencies = {
 export declare class HardwareWallets implements HardwareSignerProvider {
     #private;
     readonly events: Emitter<string, any>;
-    constructor({ assetsModule, ledgerDiscovery, trezorDiscovery, logger, hardwareWalletSigningRequestsAtom, hardwareWalletPairingPromptAtom, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }: Dependencies);
+    constructor({ assetsModule, ledgerDiscovery, trezorDiscovery, logger, hardwareWalletSigningRequestsAtom, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }: Dependencies);
     retrySigningRequest: (id: string) => Promise<void>;
     cancelSigningRequest: (id: string, fromUI: boolean) => Promise<void>;
     signTransaction: ({ baseAssetName, unsignedTx, walletAccount, multisigData, }: SignTransactionParams) => Promise<any>;
     signMessage: ({ assetName, derivationPath, message }: SignMessageParams) => Promise<any>;
     isDeviceConnected: () => Promise<boolean>;
-    scanForDevices: () => Promise<void>;
+    scanForDevices: (deviceType?: HardwareWalletManufacturer) => Promise<void>;
     getAvailableDevices: () => Promise<{
         model: import("@exodus/hw-common").HardwareWalletDeviceModels;
         name: string;
@@ -55,7 +55,7 @@ declare const hardwareWalletsModuleDefinition: {
     readonly id: "hardwareWallets";
     readonly type: "module";
     readonly factory: (opts: Dependencies) => HardwareWallets;
-    readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "trezorDiscovery", "publicKeyStore", "hardwareWalletSigningRequestsAtom", "hardwareWalletPairingPromptAtom", "wallet", "walletAccountsAtom", "walletAccounts"];
+    readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "trezorDiscovery", "publicKeyStore", "hardwareWalletSigningRequestsAtom", "wallet", "walletAccountsAtom", "walletAccounts"];
     readonly public: true;
 };
 export default hardwareWalletsModuleDefinition;

package/lib/module/hardware-wallets.js

@@ -13,21 +13,20 @@ export class HardwareWallets {
     #logger;
     #publicKeyStore;
     #signingRequestAtom;
-    #pairingPromptAtom;
     #wallet;
     #walletAccountsAtom;
     #walletAccounts;
     #syncedKeysMap = new Map();
     #signingRequest;
+    #isRetrying = false;
     events = new Emitter();
-    constructor({ assetsModule, ledgerDiscovery, trezorDiscovery, logger, hardwareWalletSigningRequestsAtom, hardwareWalletPairingPromptAtom, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }) {
+    constructor({ assetsModule, ledgerDiscovery, trezorDiscovery, logger, hardwareWalletSigningRequestsAtom, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }) {
         this.#assetsModule = assetsModule;
         this.#ledgerDiscovery = ledgerDiscovery;
         this.#trezorDiscovery = trezorDiscovery;
         this.#logger = logger;
         this.#publicKeyStore = publicKeyStore;
         this.#signingRequestAtom = hardwareWalletSigningRequestsAtom;
-        this.#pairingPromptAtom = hardwareWalletPairingPromptAtom;
         this.#wallet = wallet;
         this.#walletAccountsAtom = walletAccountsAtom;
         this.#walletAccounts = walletAccounts;
@@ -64,6 +63,11 @@ 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();
@@ -81,6 +85,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;
             }
@@ -95,6 +100,9 @@ export class HardwareWallets {
                 baseAssetName: this.#signingRequest.baseAssetName,
             });
         }
+        finally {
+            this.#isRetrying = false;
+        }
     };
     cancelSigningRequest = async (id, fromUI) => {
         const request = this.#signingRequest;
@@ -164,9 +172,13 @@ export class HardwareWallets {
         return this.#signGeneric({ baseAssetName, scenario: 'signMessage', sign });
     };
     isDeviceConnected = async () => {
-        if (this.#trezorDiscovery.connected) {
-            return true;
+        try {
+            const devices = await this.#trezorDiscovery.list();
+            if (devices.length > 0) {
+                return true;
+            }
         }
+        catch { }
         try {
             const devices = await this.#ledgerDiscovery.list();
             return devices.length > 0;
@@ -175,10 +187,15 @@ export class HardwareWallets {
             return false;
         }
     };
-    scanForDevices = async () => {
+    scanForDevices = async (deviceType) => {
         this.#trezorDiscovery.stopScan(true);
         this.#ledgerDiscovery.stopScan(true);
-        await Promise.all([this.#ledgerDiscovery.scan(), this.#trezorDiscovery.scan()]);
+        if (!deviceType || deviceType === 'ledger') {
+            await this.#ledgerDiscovery.scan();
+        }
+        else {
+            await this.#trezorDiscovery.scan();
+        }
     };
     getAvailableDevices = async () => {
         const [ledgers, trezors] = await Promise.all([
@@ -220,10 +237,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],
@@ -341,10 +358,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 }));
@@ -374,6 +391,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}`,
@@ -381,7 +402,7 @@ export class HardwareWallets {
             source,
             model,
             index: accountIndex,
-            id: randomBytes(32).toString('hex'),
+            id,
             isMultisig: !!isMultisig,
         });
         const walletAccountName = walletAccount.toString();
@@ -391,7 +412,7 @@ export class HardwareWallets {
         return walletAccount;
     };
     clearPairingRequest = async () => {
-        await this.#pairingPromptAtom.set(false);
+        await this.#trezorDiscovery.clearPairingPrompt();
     };
     submitPairingCode = async ({ code }) => {
         return this.#trezorDiscovery.submitPairingCode(code);
@@ -415,7 +436,6 @@ const hardwareWalletsModuleDefinition = {
         'trezorDiscovery',
         'publicKeyStore',
         'hardwareWalletSigningRequestsAtom',
-        'hardwareWalletPairingPromptAtom',
         'wallet',
         'walletAccountsAtom',
         'walletAccounts',

package/lib/module/interfaces.d.ts

@@ -1,9 +1,9 @@
 import type { WalletAccount } from '@exodus/models';
-import type { HardwareWalletDeviceModels, HardwareWalletDevice, MultisigData, SignMessageParams } from '@exodus/hw-common';
+import type { HardwareWalletDeviceModels, HardwareWalletDevice, HardwareWalletManufacturer, MultisigData, SignMessageParams } from '@exodus/hw-common';
 import type KeyIdentifier from '@exodus/key-identifier';
 export interface HardwareSignerProvider {
     isDeviceConnected: () => Promise<boolean>;
-    scanForDevices: () => Promise<void>;
+    scanForDevices: (deviceType: HardwareWalletManufacturer) => Promise<void>;
     canAccessAsset: ({ assetName }: CanAccessAssetParams) => Promise<boolean>;
     listUseableAssetNames: () => Promise<string[]>;
     ensureApplicationIsOpened: ({ assetName }: EnsureApplicationIsOpenedParams) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hardware-wallets",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "An Exodus SDK feature that provides a high level abstraction for interacting with hardware wallet devices",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -46,12 +46,12 @@
     "@exodus/dependency-types": "^2.1.1",
     "@exodus/key-identifier": "^1.3.0",
     "@exodus/logger": "^1.2.3",
-    "@exodus/public-key-provider": "^4.2.0",
+    "@exodus/public-key-provider": "^4.2.1",
     "redux": "^4.2.1"
   },
   "publishConfig": {
     "access": "public",
     "provenance": false
   },
-  "gitHead": "48ffae642085d466f42c47df71156bd16bd7b5c8"
+  "gitHead": "7c1b8b88571d94cec15b9512e5301922ac1b6017"
 }

package/lib/atoms/hardwareWalletPairingPromptAtom.d.ts

@@ -1,6 +0,0 @@
-export declare const hardwareWalletPairingPromptAtomDefinition: {
-    readonly id: "hardwareWalletPairingPromptAtom";
-    readonly type: "atom";
-    readonly factory: () => import("@exodus/atoms").Atom<boolean>;
-    readonly public: true;
-};

package/lib/atoms/hardwareWalletPairingPromptAtom.js

@@ -1,9 +0,0 @@
-import { createInMemoryAtom } from '@exodus/atoms';
-export const hardwareWalletPairingPromptAtomDefinition = {
-    id: 'hardwareWalletPairingPromptAtom',
-    type: 'atom',
-    factory: () => createInMemoryAtom({
-        defaultValue: false,
-    }),
-    public: true,
-};