@exodus/hw-ledger 3.0.0 → 3.1.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@3.0.0...@exodus/hw-ledger@3.1.0) (2024-10-17)
+
+### Features
+
+- support adding model to wallet account ([#9936](https://github.com/ExodusMovement/exodus-hydra/issues/9936)) ([8c858f6](https://github.com/ExodusMovement/exodus-hydra/commit/8c858f6e08e41bee3261f444c3d25e8bdd385014))
+
+### Bug Fixes
+
+- unify user refused error handling ([#10052](https://github.com/ExodusMovement/exodus-hydra/issues/10052)) ([db85d10](https://github.com/ExodusMovement/exodus-hydra/commit/db85d108333630d09bad545c5ec1169b937e08fe))
+
 ## [3.0.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.13.1...@exodus/hw-ledger@3.0.0) (2024-10-15)
 
 ### ⚠ BREAKING CHANGES

package/lib/module/device.d.ts

@@ -1,15 +1,15 @@
-import type { GetAddressParams, GetPublicKeyParams, GetXPubParams, HardwareWalletDevice, SignMessageParams, SignTransactionParams } from '@exodus/hw-common';
+import type { GetAddressParams, GetPublicKeyParams, GetXPubParams, HardwareWalletDescriptor, HardwareWalletDevice, SignMessageParams, SignTransactionParams } from '@exodus/hw-common';
 import type { TransportFactory } from './types';
 import type { Atom } from '@exodus/atoms';
-export type Descriptor = unknown;
 export type Dependencies = {
     transportFactory: TransportFactory;
-    descriptor: Descriptor;
+    descriptor: HardwareWalletDescriptor;
     walletPolicyAtom: Atom<Record<string, Buffer>>;
 };
 export declare class LedgerDevice implements HardwareWalletDevice {
     #private;
     constructor({ transportFactory, descriptor, walletPolicyAtom }: Dependencies);
+    get descriptor(): HardwareWalletDescriptor;
     ensureApplicationIsOpened: (baseAssetName: string) => Promise<void>;
     listSupportedAssetNames: () => Promise<string[]>;
     listInstalledAssetNames: () => Promise<string[]>;

package/lib/module/device.js

@@ -12,8 +12,11 @@ export class LedgerDevice {
         this.#descriptor = descriptor;
         this.#walletPolicyAtom = walletPolicyAtom;
     }
+    get descriptor() {
+        return this.#descriptor;
+    }
     #runInSession = async (operation, expectErrorWhenClosing = false) => {
-        const transport = await this.#transportFactory.open(this.#descriptor);
+        const transport = await this.#transportFactory.open(this.#descriptor.internalDescriptor);
         try {
             return await operation(transport);
         }
@@ -158,8 +161,8 @@ function transformToCommonError(_err) {
     if (err.name === 'LockedDeviceError') {
         return new DeviceLockedError();
     }
-    if (err.name === 'UserRefusedOnDevice') {
-        return new UserRefusedError();
+    if (err.name === 'UserRefusedOnDevice' || err.statusCode === 0x69_85) {
+        return new UserRefusedError(true);
     }
     if ([
         'HwTransportError',

package/lib/module/discovery.js

@@ -95,52 +95,58 @@ export class LedgerDiscovery {
         for (const [transportName, transportFactory] of Object.entries(this.#transportsFactories)) {
             switch (transportName) {
                 case 'usb':
-                    const deviceList = await transportFactory.list();
+                    const deviceList = (await transportFactory.list());
                     const usbDeviceList = deviceList.map((hidDevice) => {
                         const deviceModel = identifyUSBProductId(hidDevice.productId);
-                        return {
+                        const descriptor = {
                             name: deviceModel?.productName ?? 'Ledger USB',
                             manufacturer: 'ledger',
                             transport: 'usb',
                             model: deviceModel?.id ?? 'unknown',
+                            internalDescriptor: hidDevice,
                             get: async () => new LedgerDevice({
                                 transportFactory,
-                                descriptor: hidDevice,
+                                descriptor,
                                 walletPolicyAtom: this.#walletPolicyAtom,
                             }),
                         };
+                        return descriptor;
                     });
                     descriptors.push(...usbDeviceList);
                     break;
                 case 'bluetooth':
                     const bluetoothDeviceList = Object.values(this.#discoveredBluetoothDevices).map((bluetoothDevice) => {
                         const deviceModel = getInfosForServiceUuid(bluetoothDevice.serviceUUIDs?.[0] ?? '')?.deviceModel;
-                        return {
+                        const descriptor = {
                             name: bluetoothDevice.localName ?? deviceModel?.productName,
                             manufacturer: 'ledger',
                             transport: 'bluetooth',
                             model: deviceModel?.id ?? 'unknown',
+                            internalDescriptor: bluetoothDevice,
                             get: async () => new LedgerDevice({
                                 transportFactory,
-                                descriptor: bluetoothDevice,
+                                descriptor,
                                 walletPolicyAtom: this.#walletPolicyAtom,
                             }),
                         };
+                        return descriptor;
                     });
                     descriptors.push(...bluetoothDeviceList);
                     break;
                 case 'tcp':
-                    descriptors.push({
+                    const descriptor = {
                         name: 'TCP Emulator',
                         manufacturer: 'ledger',
                         transport: 'tcp',
                         model: 'unknown',
+                        internalDescriptor: { apduPort: APDU_PORT },
                         get: async () => new LedgerDevice({
                             transportFactory,
-                            descriptor: { apduPort: APDU_PORT },
+                            descriptor,
                             walletPolicyAtom: this.#walletPolicyAtom,
                         }),
-                    });
+                    };
+                    descriptors.push(descriptor);
                     break;
                 default:
                     throw new UnknownTransportError(transportName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -34,7 +34,7 @@
     "@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.5.1",
+    "@exodus/hw-common": "^3.0.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",
@@ -65,5 +65,5 @@
     "tiny-secp256k1": "^2.2.3",
     "ts-jest": "^29.0.3"
   },
-  "gitHead": "50ae8273c930389d0054db9207c7f1d9b0f6ed77"
+  "gitHead": "a4f949331317cbeb49ea2392703722914a67fcac"
 }