@exodus/hw-ledger 2.9.4 → 2.9.5

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.5](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.9.4...@exodus/hw-ledger@2.9.5) (2024-08-16)
+
+### Bug Fixes
+
+- bluetooth on scan ([#8457](https://github.com/ExodusMovement/exodus-hydra/issues/8457)) ([c6cef7a](https://github.com/ExodusMovement/exodus-hydra/commit/c6cef7a19dad315bdbe8e01ea353f108348d48e3))
+- use safe alloc ([#8467](https://github.com/ExodusMovement/exodus-hydra/issues/8467)) ([926ef36](https://github.com/ExodusMovement/exodus-hydra/commit/926ef36d1478e8fea290b56eabab5c807e7e6695))
+
 ## [2.9.4](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.9.3...@exodus/hw-ledger@2.9.4) (2024-08-14)
 
 ### Bug Fixes

package/lib/atoms/index.d.ts

@@ -1,7 +1,11 @@
+export type BluetoothStatus = {
+    type: 'Unknown' | 'Resetting' | 'Unsupported' | 'Unauthorized' | 'PoweredOff' | 'PoweredOn';
+    available: boolean;
+};
 export declare const bluetoothStatusAtomDefinition: {
     readonly id: "bluetoothStatusAtom";
     readonly type: "atom";
-    readonly factory: () => import("@exodus/atoms").Atom<boolean>;
+    readonly factory: () => import("@exodus/atoms").Atom<BluetoothStatus>;
     readonly dependencies: readonly [];
     readonly public: true;
 };

package/lib/atoms/index.js

@@ -2,7 +2,9 @@ import { createInMemoryAtom } from '@exodus/atoms';
 export const bluetoothStatusAtomDefinition = {
     id: 'bluetoothStatusAtom',
     type: 'atom',
-    factory: () => createInMemoryAtom({ defaultValue: false }),
+    factory: () => createInMemoryAtom({
+        defaultValue: { type: 'Unknown', available: false },
+    }),
     dependencies: [],
     public: true,
 };

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<boolean>;
+            readonly factory: () => import("libraries/atoms/lib").Atom<import("./atoms").BluetoothStatus>;
             readonly dependencies: readonly [];
             readonly public: true;
         };
@@ -21,18 +21,17 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
         readonly definition: {
             readonly id: "hardwareWalletLedgerPlugin";
             readonly type: "plugin";
-            readonly factory: ({ logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, port, }: {
-                logger: import("./shared/types").Logger;
-                transportsFactories: import("./module/types").TransportFactories;
-                bluetoothStatusAtom: import("libraries/atoms/lib").Atom<import("./redux/initial-state").BluetoothStatus>;
+            readonly factory: ({ bluetoothStatusAtom, bluetoothScanningAtom, ledgerDiscovery, port, }: {
+                bluetoothStatusAtom: import("libraries/atoms/lib").Atom<import("./atoms").BluetoothStatus>;
                 bluetoothScanningAtom: import("libraries/atoms/lib").Atom<boolean>;
+                ledgerDiscovery: import("./module").LedgerDiscovery;
                 port: import("./shared/types").Port;
             }) => {
                 onUnlock: () => void;
                 onLoad: () => void;
                 onStop: () => void;
             };
-            readonly dependencies: readonly ["logger", "transportsFactories", "bluetoothStatusAtom", "bluetoothScanningAtom", "port"];
+            readonly dependencies: readonly ["bluetoothStatusAtom", "bluetoothScanningAtom", "ledgerDiscovery", "port"];
             readonly public: true;
         };
     }, {
@@ -40,7 +39,7 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
             readonly id: "ledgerDiscovery";
             readonly type: "module";
             readonly factory: (deps: import("./module").Dependencies) => import("./module").LedgerDiscovery;
-            readonly dependencies: readonly ["config", "logger", "transportsFactories", "bluetoothScanningAtom"];
+            readonly dependencies: readonly ["config", "logger", "transportsFactories", "bluetoothStatusAtom", "bluetoothScanningAtom"];
             readonly public: true;
         };
         readonly config: {

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

@@ -2,7 +2,7 @@ import bs58check from 'bs58check';
 export function buildFauxXPUB(publicKey, chainCode) {
     const LEN = 78;
     const XPUB_PREFIX = 0x04_88_b2_1e;
-    const buffer = Buffer.allocUnsafe(LEN);
+    const buffer = Buffer.alloc(LEN);
     const fingerprint = 0x00_00_00_00;
     const depth = 0;
     const index = 0;

package/lib/module/discovery.d.ts

@@ -2,25 +2,29 @@ import { Logger } from '../shared/types';
 import type { Atom } from '@exodus/atoms';
 import type { HardwareWalletDescriptor, HardwareWalletDiscovery } from '@exodus/hw-common';
 import type { HwLedgerConfig, TransportFactories } from './types';
+import type { BluetoothStatus } from '../atoms';
 export type Dependencies = {
     config: HwLedgerConfig;
     logger: Logger;
     transportsFactories: TransportFactories;
+    bluetoothStatusAtom: Atom<BluetoothStatus>;
     bluetoothScanningAtom: Atom<boolean>;
 };
 export declare class LedgerDiscovery implements HardwareWalletDiscovery {
     #private;
-    constructor({ config, logger, transportsFactories, bluetoothScanningAtom }: Dependencies);
+    constructor({ config, logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, }: Dependencies);
+    start: () => void;
     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: {
     readonly id: "ledgerDiscovery";
     readonly type: "module";
     readonly factory: (deps: Dependencies) => LedgerDiscovery;
-    readonly dependencies: readonly ["config", "logger", "transportsFactories", "bluetoothScanningAtom"];
+    readonly dependencies: readonly ["config", "logger", "transportsFactories", "bluetoothStatusAtom", "bluetoothScanningAtom"];
     readonly public: true;
 };
 export default _default;

package/lib/module/discovery.js

@@ -7,11 +7,14 @@ export class LedgerDiscovery {
     #logger;
     #transportsFactories;
     #scannerTimeout;
+    #statusBluetooth;
+    #bluetoothStatusAtom;
     #scannerBluetooth;
     #bluetoothScanningAtom;
     #discoveredBluetoothDevices = Object.create(null);
-    constructor({ config, logger, transportsFactories, bluetoothScanningAtom }) {
+    constructor({ config, logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, }) {
         this.#logger = logger;
+        this.#bluetoothStatusAtom = bluetoothStatusAtom;
         this.#bluetoothScanningAtom = bluetoothScanningAtom;
         if (!(typeof transportsFactories === 'object' &&
             Object.keys(transportsFactories).length > 0 &&
@@ -26,7 +29,26 @@ export class LedgerDiscovery {
         this.#transportsFactories = transportsFactories;
         this.#scannerTimeout = config.bluetoothScannerTimeout;
     }
+    start = () => {
+        if (!this.#transportsFactories.bluetooth)
+            return;
+        if (this.#statusBluetooth)
+            return;
+        if (this.#transportsFactories.bluetooth.observeState) {
+            this.#statusBluetooth = this.#transportsFactories.bluetooth.observeState({
+                next: ({ type, available }) => this.#bluetoothStatusAtom.set({ type, available }),
+                error: (error) => this.#logger.error(error),
+            });
+        }
+        else if (this.#transportsFactories.bluetooth.observeAvailability) {
+            this.#statusBluetooth = this.#transportsFactories.bluetooth.observeAvailability({
+                next: (available) => this.#bluetoothStatusAtom.set({ type: 'Unknown', available }),
+                error: (error) => this.#logger.error(error),
+            });
+        }
+    };
     scan = async () => {
+        this.start();
         return new Promise((resolve, reject) => {
             if (this.#transportsFactories.bluetooth) {
                 this.stopScan(true);
@@ -123,12 +145,21 @@ export class LedgerDiscovery {
         }
         throw new NoDeviceFoundError();
     };
+    stop = async () => {
+        this.#statusBluetooth?.unsubscribe();
+    };
 }
 const createLedgerDiscovery = (deps) => new LedgerDiscovery({ ...deps });
 export default {
     id: MODULE_ID,
     type: 'module',
     factory: createLedgerDiscovery,
-    dependencies: ['config', 'logger', 'transportsFactories', 'bluetoothScanningAtom'],
+    dependencies: [
+        'config',
+        'logger',
+        'transportsFactories',
+        'bluetoothStatusAtom',
+        'bluetoothScanningAtom',
+    ],
     public: true,
 };

package/lib/plugin/index.d.ts

@@ -1,22 +1,21 @@
 import type { Atom } from '@exodus/atoms';
-import type { TransportFactories } from '../module/types';
-import type { Logger, Port } from '../shared/types';
-import { BluetoothStatus } from '../redux/initial-state';
+import type { Port } from '../shared/types';
+import type { BluetoothStatus } from '../atoms';
+import type { LedgerDiscovery } from '../module';
 declare const hardwareWalletLedgerPluginDefinition: {
     readonly id: "hardwareWalletLedgerPlugin";
     readonly type: "plugin";
-    readonly factory: ({ logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, port, }: {
-        logger: Logger;
-        transportsFactories: TransportFactories;
+    readonly factory: ({ bluetoothStatusAtom, bluetoothScanningAtom, ledgerDiscovery, port, }: {
         bluetoothStatusAtom: Atom<BluetoothStatus>;
         bluetoothScanningAtom: Atom<boolean>;
+        ledgerDiscovery: LedgerDiscovery;
         port: Port;
     }) => {
         onUnlock: () => void;
         onLoad: () => void;
         onStop: () => void;
     };
-    readonly dependencies: readonly ["logger", "transportsFactories", "bluetoothStatusAtom", "bluetoothScanningAtom", "port"];
+    readonly dependencies: readonly ["bluetoothStatusAtom", "bluetoothScanningAtom", "ledgerDiscovery", "port"];
     readonly public: true;
 };
 export default hardwareWalletLedgerPluginDefinition;

package/lib/plugin/index.js

@@ -1,33 +1,16 @@
 import { createAtomObserver } from '@exodus/atoms';
-const createHardwareWalletLedgerPlugin = ({ logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, port, }) => {
-    let subscription;
+const createHardwareWalletLedgerPlugin = ({ bluetoothStatusAtom, bluetoothScanningAtom, ledgerDiscovery, port, }) => {
     const observers = [
         createAtomObserver({ atom: bluetoothStatusAtom, port, event: 'bluetoothStatus' }),
         createAtomObserver({ atom: bluetoothScanningAtom, port, event: 'bluetoothScanning' }),
     ];
     observers.forEach((observer) => observer.register());
     const start = () => {
-        if (!transportsFactories.bluetooth)
-            return;
-        if (subscription)
-            return;
-        if (transportsFactories.bluetooth.observeState) {
-            subscription = transportsFactories.bluetooth.observeState({
-                next: ({ type, available }) => bluetoothStatusAtom.set({ type, available }),
-                error: (error) => logger.error(error),
-            });
-        }
-        else if (transportsFactories.bluetooth.observeAvailability) {
-            subscription = transportsFactories.bluetooth.observeAvailability({
-                next: (available) => bluetoothStatusAtom.set({ type: 'Unknown', available }),
-                error: (error) => logger.error(error),
-            });
-        }
         observers.forEach((observer) => observer.start());
     };
     const stop = () => {
         observers.forEach((observer) => observer.unregister());
-        subscription?.unsubscribe();
+        ledgerDiscovery.stop();
     };
     const onUnlock = () => {
         start();
@@ -44,13 +27,7 @@ const hardwareWalletLedgerPluginDefinition = {
     id: 'hardwareWalletLedgerPlugin',
     type: 'plugin',
     factory: createHardwareWalletLedgerPlugin,
-    dependencies: [
-        'logger',
-        'transportsFactories',
-        'bluetoothStatusAtom',
-        'bluetoothScanningAtom',
-        'port',
-    ],
+    dependencies: ['bluetoothStatusAtom', 'bluetoothScanningAtom', 'ledgerDiscovery', 'port'],
     public: true,
 };
 export default hardwareWalletLedgerPluginDefinition;

package/lib/redux/index.d.ts

@@ -10,12 +10,12 @@ declare const exchangeReduxDefinition: {
         };
         readonly bluetoothScanning: (state: LedgerHardwareWalletState, payload: boolean) => {
             bluetoothScanning: boolean;
-            bluetoothStatus: import("./initial-state").BluetoothStatus;
+            bluetoothStatus: import("../atoms").BluetoothStatus;
         };
     };
     readonly selectorDefinitions: ({
         readonly id: "bluetoothStatus";
-        readonly resultFunction: (state: LedgerHardwareWalletState) => import("./initial-state").BluetoothStatus;
+        readonly resultFunction: (state: LedgerHardwareWalletState) => import("../atoms").BluetoothStatus;
         readonly dependencies: readonly [{
             readonly selector: string;
         }];

package/lib/redux/initial-state.d.ts

@@ -1,7 +1,4 @@
-export type BluetoothStatus = {
-    type: 'Unknown' | 'Resetting' | 'Unsupported' | 'Unauthorized' | 'PoweredOff' | 'PoweredOn';
-    available: boolean;
-};
+import type { BluetoothStatus } from '../atoms';
 export type LedgerHardwareWalletState = {
     bluetoothStatus: BluetoothStatus;
     bluetoothScanning: boolean;

package/lib/redux/selectors/bluetoothStatus.d.ts

@@ -1,7 +1,7 @@
 import type { LedgerHardwareWalletState } from '../initial-state';
 declare const bluetoothStatusSelectorDefinition: {
     readonly id: "bluetoothStatus";
-    readonly resultFunction: (state: LedgerHardwareWalletState) => import("../initial-state").BluetoothStatus;
+    readonly resultFunction: (state: LedgerHardwareWalletState) => import("../../atoms").BluetoothStatus;
     readonly dependencies: readonly [{
         readonly selector: string;
     }];

package/lib/redux/selectors/index.d.ts

@@ -1,6 +1,6 @@
 declare const ledgerSelectors: ({
     readonly id: "bluetoothStatus";
-    readonly resultFunction: (state: import("../initial-state").LedgerHardwareWalletState) => import("../initial-state").BluetoothStatus;
+    readonly resultFunction: (state: import("../initial-state").LedgerHardwareWalletState) => import("../../atoms").BluetoothStatus;
     readonly dependencies: readonly [{
         readonly selector: string;
     }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -71,5 +71,5 @@
     "tiny-secp256k1": "^2.2.3",
     "ts-jest": "^29.0.3"
   },
-  "gitHead": "02011f9404194769108cec052ec27c714c19ad64"
+  "gitHead": "6133e25d4d50f7737703294bdbb0699af419c0a7"
 }