@exodus/hw-ledger 2.8.0 → 2.9.0

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.
 
+## [2.9.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.8.1...@exodus/hw-ledger@2.9.0) (2024-07-16)
+
+### Features
+
+- **hw-ledger:** expose bluetooth status to clients ([#7848](https://github.com/ExodusMovement/exodus-hydra/issues/7848)) ([36943b1](https://github.com/ExodusMovement/exodus-hydra/commit/36943b194c286a07c44dd78bd3a1f03324c87ce8))
+
+## [2.8.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.8.0...@exodus/hw-ledger@2.8.1) (2024-07-10)
+
+### Bug Fixes
+
+- **ledger:** fix selectors ([#7744](https://github.com/ExodusMovement/exodus-hydra/issues/7744)) ([11ad709](https://github.com/ExodusMovement/exodus-hydra/commit/11ad7098314c1a7dee014765bfc0500d9636b4df))
+
 ## [2.8.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@2.7.0...@exodus/hw-ledger@2.8.0) (2024-07-10)
 
 ### Features

package/lib/atoms/index.d.ts

@@ -1,5 +1,5 @@
-export declare const bluetoothEnabledAtomDefinition: {
-    readonly id: "bluetoothEnabledAtom";
+export declare const bluetoothStatusAtomDefinition: {
+    readonly id: "bluetoothStatusAtom";
     readonly type: "atom";
     readonly factory: () => import("@exodus/atoms").Atom<boolean>;
     readonly dependencies: readonly [];

package/lib/atoms/index.js

@@ -1,6 +1,6 @@
 import { createInMemoryAtom } from '@exodus/atoms';
-export const bluetoothEnabledAtomDefinition = {
-    id: 'bluetoothEnabledAtom',
+export const bluetoothStatusAtomDefinition = {
+    id: 'bluetoothStatusAtom',
     type: 'atom',
     factory: () => createInMemoryAtom({ defaultValue: false }),
     dependencies: [],

package/lib/index.d.ts

@@ -3,7 +3,7 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
     readonly id: "hardwareWalletLedger";
     readonly definitions: readonly [{
         readonly definition: {
-            readonly id: "bluetoothEnabledAtom";
+            readonly id: "bluetoothStatusAtom";
             readonly type: "atom";
             readonly factory: () => import("libraries/atoms/lib").Atom<boolean>;
             readonly dependencies: readonly [];
@@ -19,10 +19,10 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
         readonly definition: {
             readonly id: "hardwareWalletLedgerPlugin";
             readonly type: "plugin";
-            readonly factory: ({ logger, transportsFactories, bluetoothEnabledAtom, bluetoothScanningAtom, port, }: {
+            readonly factory: ({ logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, port, }: {
                 logger: import("./shared/types").Logger;
                 transportsFactories: import("./module/types").TransportFactories;
-                bluetoothEnabledAtom: import("libraries/atoms/lib").Atom<boolean>;
+                bluetoothStatusAtom: import("libraries/atoms/lib").Atom<import("./redux/initial-state").BluetoothStatus>;
                 bluetoothScanningAtom: import("libraries/atoms/lib").Atom<boolean>;
                 port: import("./shared/types").Port;
             }) => {
@@ -30,7 +30,7 @@ declare const hardwareWalletLedger: ({ bluetoothScannerTimeout, }?: Partial<HwLe
                 onLoad: () => void;
                 onStop: () => void;
             };
-            readonly dependencies: readonly ["logger", "transportsFactories", "bluetoothEnabledAtom", "bluetoothScanningAtom", "port"];
+            readonly dependencies: readonly ["logger", "transportsFactories", "bluetoothStatusAtom", "bluetoothScanningAtom", "port"];
         };
     }, {
         readonly definition: {

package/lib/index.js

@@ -1,4 +1,4 @@
-import { bluetoothEnabledAtomDefinition, bluetoothScanningAtomDefinition } from './atoms';
+import { bluetoothStatusAtomDefinition, bluetoothScanningAtomDefinition } from './atoms';
 import ledgerDiscoveryDefinition from './module';
 import hardwareWalletLedgerPluginDefinition from './plugin';
 const hardwareWalletLedger = ({ bluetoothScannerTimeout = 10000, } = {}) => {
@@ -6,7 +6,7 @@ const hardwareWalletLedger = ({ bluetoothScannerTimeout = 10000, } = {}) => {
         id: 'hardwareWalletLedger',
         definitions: [
             {
-                definition: bluetoothEnabledAtomDefinition,
+                definition: bluetoothStatusAtomDefinition,
             },
             {
                 definition: bluetoothScanningAtomDefinition,

package/lib/plugin/index.d.ts

@@ -1,13 +1,14 @@
 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';
 declare const hardwareWalletLedgerPluginDefinition: {
     readonly id: "hardwareWalletLedgerPlugin";
     readonly type: "plugin";
-    readonly factory: ({ logger, transportsFactories, bluetoothEnabledAtom, bluetoothScanningAtom, port, }: {
+    readonly factory: ({ logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, port, }: {
         logger: Logger;
         transportsFactories: TransportFactories;
-        bluetoothEnabledAtom: Atom<boolean>;
+        bluetoothStatusAtom: Atom<BluetoothStatus>;
         bluetoothScanningAtom: Atom<boolean>;
         port: Port;
     }) => {
@@ -15,6 +16,6 @@ declare const hardwareWalletLedgerPluginDefinition: {
         onLoad: () => void;
         onStop: () => void;
     };
-    readonly dependencies: readonly ["logger", "transportsFactories", "bluetoothEnabledAtom", "bluetoothScanningAtom", "port"];
+    readonly dependencies: readonly ["logger", "transportsFactories", "bluetoothStatusAtom", "bluetoothScanningAtom", "port"];
 };
 export default hardwareWalletLedgerPluginDefinition;

package/lib/plugin/index.js

@@ -1,8 +1,8 @@
 import { createAtomObserver } from '@exodus/atoms';
-const createHardwareWalletLedgerPlugin = ({ logger, transportsFactories, bluetoothEnabledAtom, bluetoothScanningAtom, port, }) => {
+const createHardwareWalletLedgerPlugin = ({ logger, transportsFactories, bluetoothStatusAtom, bluetoothScanningAtom, port, }) => {
     let subscription;
     const observers = [
-        createAtomObserver({ atom: bluetoothEnabledAtom, port, event: 'bluetoothEnabled' }),
+        createAtomObserver({ atom: bluetoothStatusAtom, port, event: 'bluetoothStatus' }),
         createAtomObserver({ atom: bluetoothScanningAtom, port, event: 'bluetoothScanning' }),
     ];
     observers.forEach((observer) => observer.register());
@@ -13,17 +13,13 @@ const createHardwareWalletLedgerPlugin = ({ logger, transportsFactories, bluetoo
             return;
         if (transportsFactories.bluetooth.observeState) {
             subscription = transportsFactories.bluetooth.observeState({
-                next: (e) => {
-                    bluetoothEnabledAtom.set(!!e.available);
-                },
+                next: ({ type, available }) => bluetoothStatusAtom.set({ type, available }),
                 error: (error) => logger.error(error),
             });
         }
         else if (transportsFactories.bluetooth.observeAvailability) {
             subscription = transportsFactories.bluetooth.observeAvailability({
-                next: (available) => {
-                    bluetoothEnabledAtom.set(available);
-                },
+                next: (available) => bluetoothStatusAtom.set({ type: 'Unknown', available }),
                 error: (error) => logger.error(error),
             });
         }
@@ -51,7 +47,7 @@ const hardwareWalletLedgerPluginDefinition = {
     dependencies: [
         'logger',
         'transportsFactories',
-        'bluetoothEnabledAtom',
+        'bluetoothStatusAtom',
         'bluetoothScanningAtom',
         'port',
     ],

package/lib/redux/index.d.ts

@@ -4,26 +4,26 @@ declare const exchangeReduxDefinition: {
     readonly type: "redux-module";
     readonly initialState: LedgerHardwareWalletState;
     readonly eventReducers: {
-        readonly bluetoothEnabled: (state: LedgerHardwareWalletState, payload: boolean) => {
-            bluetoothEnabled: boolean;
+        readonly bluetoothStatus: (state: LedgerHardwareWalletState, payload: boolean) => {
+            bluetoothStatus: boolean;
             bluetoothScanning: boolean;
         };
         readonly bluetoothScanning: (state: LedgerHardwareWalletState, payload: boolean) => {
             bluetoothScanning: boolean;
-            bluetoothEnabled: boolean;
+            bluetoothStatus: import("./initial-state").BluetoothStatus;
         };
     };
     readonly selectorDefinitions: ({
-        readonly id: "bluetoothEnabled";
-        readonly resultFunction: (bluetoothEnabled: LedgerHardwareWalletState) => LedgerHardwareWalletState;
+        readonly id: "bluetoothStatus";
+        readonly resultFunction: (state: LedgerHardwareWalletState) => import("./initial-state").BluetoothStatus;
         readonly dependencies: readonly [{
-            readonly selector: "bluetoothEnabled";
+            readonly selector: string;
         }];
     } | {
         readonly id: "bluetoothScanning";
-        readonly resultFunction: (bluetoothScanning: LedgerHardwareWalletState) => LedgerHardwareWalletState;
+        readonly resultFunction: (state: LedgerHardwareWalletState) => boolean;
         readonly dependencies: readonly [{
-            readonly selector: "bluetoothScanning";
+            readonly selector: string;
         }];
     })[];
 };

package/lib/redux/index.js

@@ -6,9 +6,9 @@ const exchangeReduxDefinition = {
     type: 'redux-module',
     initialState,
     eventReducers: {
-        bluetoothEnabled: (state, payload) => ({
+        bluetoothStatus: (state, payload) => ({
             ...state,
-            bluetoothEnabled: payload,
+            bluetoothStatus: payload,
         }),
         bluetoothScanning: (state, payload) => ({
             ...state,

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

@@ -1,5 +1,9 @@
+export type BluetoothStatus = {
+    type: 'Unknown' | 'Resetting' | 'Unsupported' | 'Unauthorized' | 'PoweredOff' | 'PoweredOn';
+    available: boolean;
+};
 export type LedgerHardwareWalletState = {
-    bluetoothEnabled: boolean;
+    bluetoothStatus: BluetoothStatus;
     bluetoothScanning: boolean;
 };
 declare const initialState: LedgerHardwareWalletState;

package/lib/redux/initial-state.js

@@ -1,5 +1,5 @@
 const initialState = {
-    bluetoothEnabled: false,
+    bluetoothStatus: { type: 'Unknown', available: false },
     bluetoothScanning: false,
 };
 export default initialState;

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

@@ -1,9 +1,9 @@
 import type { LedgerHardwareWalletState } from '../initial-state';
 declare const bluetoothScanningSelectorDefinition: {
     readonly id: "bluetoothScanning";
-    readonly resultFunction: (bluetoothScanning: LedgerHardwareWalletState) => LedgerHardwareWalletState;
+    readonly resultFunction: (state: LedgerHardwareWalletState) => boolean;
     readonly dependencies: readonly [{
-        readonly selector: "bluetoothScanning";
+        readonly selector: string;
     }];
 };
 export default bluetoothScanningSelectorDefinition;

package/lib/redux/selectors/bluetoothScanning.js

@@ -1,7 +1,8 @@
-const resultFunction = (bluetoothScanning) => bluetoothScanning;
+import { MY_STATE } from '@exodus/redux-dependency-injection';
+const resultFunction = (state) => state.bluetoothScanning;
 const bluetoothScanningSelectorDefinition = {
     id: 'bluetoothScanning',
     resultFunction,
-    dependencies: [{ selector: 'bluetoothScanning' }],
+    dependencies: [{ selector: MY_STATE }],
 };
 export default bluetoothScanningSelectorDefinition;

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

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

package/lib/redux/selectors/bluetoothStatus.js

@@ -0,0 +1,8 @@
+import { MY_STATE } from '@exodus/redux-dependency-injection';
+const resultFunction = (state) => state.bluetoothStatus;
+const bluetoothStatusSelectorDefinition = {
+    id: 'bluetoothStatus',
+    resultFunction,
+    dependencies: [{ selector: MY_STATE }],
+};
+export default bluetoothStatusSelectorDefinition;

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

@@ -1,14 +1,14 @@
 declare const ledgerSelectors: ({
-    readonly id: "bluetoothEnabled";
-    readonly resultFunction: (bluetoothEnabled: import("../initial-state").LedgerHardwareWalletState) => import("../initial-state").LedgerHardwareWalletState;
+    readonly id: "bluetoothStatus";
+    readonly resultFunction: (state: import("../initial-state").LedgerHardwareWalletState) => import("../initial-state").BluetoothStatus;
     readonly dependencies: readonly [{
-        readonly selector: "bluetoothEnabled";
+        readonly selector: string;
     }];
 } | {
     readonly id: "bluetoothScanning";
-    readonly resultFunction: (bluetoothScanning: import("../initial-state").LedgerHardwareWalletState) => import("../initial-state").LedgerHardwareWalletState;
+    readonly resultFunction: (state: import("../initial-state").LedgerHardwareWalletState) => boolean;
     readonly dependencies: readonly [{
-        readonly selector: "bluetoothScanning";
+        readonly selector: string;
     }];
 })[];
 export default ledgerSelectors;

package/lib/redux/selectors/index.js

@@ -1,4 +1,4 @@
-import bluetoothEnabledSelectorDefinition from './bluetoothEnabled';
+import bluetoothStatusSelectorDefinition from './bluetoothStatus';
 import bluetoothScanningSelectorDefinition from './bluetoothScanning';
-const ledgerSelectors = [bluetoothEnabledSelectorDefinition, bluetoothScanningSelectorDefinition];
+const ledgerSelectors = [bluetoothStatusSelectorDefinition, bluetoothScanningSelectorDefinition];
 export default ledgerSelectors;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -39,6 +39,7 @@
     "@exodus/ledgerhq-devices": "^8.1.0-exodus.3",
     "@exodus/ledgerhq-hw-app-eth": "^6.33.7-exodus.8",
     "@exodus/module": "^1.2.2",
+    "@exodus/redux-dependency-injection": "^3.0.0",
     "@exodus/secp256k1": "^4.0.2-exodus.0",
     "@ledgerhq/hw-app-solana": "^7.0.10",
     "@ledgerhq/hw-transport": "^6.28.5",
@@ -66,9 +67,10 @@
     "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",
     "typescript": "^4.7.3"
   },
-  "gitHead": "7c0905f9185d9c00a8f3d4897991f596e226867a"
+  "gitHead": "03f1666538fa7d596c729b77a380f891f7e747e4"
 }

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

@@ -1,9 +0,0 @@
-import type { LedgerHardwareWalletState } from '../initial-state';
-declare const bluetoothEnabledSelectorDefinition: {
-    readonly id: "bluetoothEnabled";
-    readonly resultFunction: (bluetoothEnabled: LedgerHardwareWalletState) => LedgerHardwareWalletState;
-    readonly dependencies: readonly [{
-        readonly selector: "bluetoothEnabled";
-    }];
-};
-export default bluetoothEnabledSelectorDefinition;

package/lib/redux/selectors/bluetoothEnabled.js

@@ -1,7 +0,0 @@
-const resultFunction = (bluetoothEnabled) => bluetoothEnabled;
-const bluetoothEnabledSelectorDefinition = {
-    id: 'bluetoothEnabled',
-    resultFunction,
-    dependencies: [{ selector: 'bluetoothEnabled' }],
-};
-export default bluetoothEnabledSelectorDefinition;