@exodus/hw-ledger 2.13.1 → 3.1.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 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
+
+- remove `getFirstDevice` from hardware wallet discovery (#9821)
+
+### Features
+
+- remove `getFirstDevice` from hardware wallet discovery ([#9821](https://github.com/ExodusMovement/exodus-hydra/issues/9821)) ([ad3e902](https://github.com/ExodusMovement/exodus-hydra/commit/ad3e902fd9e27dfccd8311089b6d966767cc6d0a))
+
 ## [2.13.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.13.0...@exodus/hw-ledger@2.13.1) (2024-10-09)
 
 **Note:** Version bump only for package @exodus/hw-ledger

package/lib/module/assets/bitcoin.d.ts

@@ -7,6 +7,10 @@ export interface BitcoinMessage {
         address: string;
         message: Bytes;
     };
+    bip137Message?: {
+        address: string;
+        message: Bytes;
+    };
 }
 declare function createHandler(transport: Transport, walletPolicyAtom?: Atom<Record<string, Buffer>>): Promise<HardwareWalletAssetHandler<BitcoinMessage>>;
 declare const metadata: {

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.d.ts

@@ -18,7 +18,6 @@ export declare class LedgerDiscovery implements HardwareWalletDiscovery {
     scan: () => Promise<void>;
     stopScan: (clearDevices?: boolean) => void;
     list: () => Promise<HardwareWalletDescriptor[]>;
-    getFirstDevice: () => Promise<import("@exodus/hw-common").HardwareWalletDevice<import("@exodus/hw-common").Message>>;
     stop: () => Promise<void>;
 }
 declare const _default: {

package/lib/module/discovery.js

@@ -1,5 +1,4 @@
 import { getInfosForServiceUuid, identifyUSBProductId } from '@exodus/ledgerhq-devices';
-import { NoDeviceFoundError } from '@exodus/hw-common';
 import { APDU_PORT } from './constants';
 import { LedgerDevice } from './device';
 import { UnknownTransportError } from './errors';
@@ -96,53 +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 deviceModel = getInfosForServiceUuid(bluetoothDevice.serviceUUIDs?.[0] ?? '')?.deviceModel;
+                        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);
@@ -150,13 +154,6 @@ export class LedgerDiscovery {
         }
         return descriptors;
     };
-    getFirstDevice = async () => {
-        const devices = await this.list();
-        if (devices[0]) {
-            return devices[0].get();
-        }
-        throw new NoDeviceFoundError();
-    };
     stop = async () => {
         this.#statusBluetooth?.unsubscribe();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "2.13.1",
+  "version": "3.1.0",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "build": "run -T tsc --build tsconfig.build.json",
-    "build:watch": "run -T tsc --build tsconfig.build.json && (concurrently 'run -T tsc --build -w tsconfig.build.json')",
+    "build:watch": "run -T tsc --build tsconfig.build.json && run -T tsc --build -w tsconfig.build.json",
     "clean": "run -T tsc --build --clean",
     "test": "run -T jest --testMatch='**/*.unit.test.js' --coverageDirectory coverage/unit",
     "zemu:install": "docker pull zondax/builder-zemu:speculos-745fe46f81cfc18114b94a37beaefb58a09c0fcd",
@@ -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",
@@ -51,26 +51,19 @@
   "devDependencies": {
     "@exodus/bip32": "^3.3.0",
     "@exodus/dependency-types": "^2.1.0",
-    "@exodus/ethersproject-abi": "^5.4.2-exodus.3",
     "@ledgerhq/hw-transport-node-hid": "^6.27.17",
-    "@ledgerhq/hw-transport-node-speculos": "^6.27.16",
     "@solana/web3.js": "^1.78.0",
     "@types/bs58": "^4.0.1",
     "@types/bs58check": "^2.1.0",
-    "@types/create-hash": "^1.2.6",
-    "@types/jest-when": "^3.5.2",
     "@types/minimalistic-assert": "^1.0.1",
     "@types/secp256k1": "^4.0.3",
     "@types/semver": "^7.3.5",
     "@zondax/zemu": "^0.43.1",
     "bitcoinjs-lib": "^6.1.3",
-    "concurrently": "^7.6.0",
     "ecpair": "^2.1.0",
-    "istanbul-combine": "^0.3.0",
-    "jest-when": "^3.5.2",
     "redux": "^4.2.1",
     "tiny-secp256k1": "^2.2.3",
     "ts-jest": "^29.0.3"
   },
-  "gitHead": "4b80481d5accabf8676bac0b18ccbcf95d89faa4"
+  "gitHead": "a4f949331317cbeb49ea2392703722914a67fcac"
 }