@exodus/hardware-wallets 1.1.0 → 1.1.2

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.
 
+## [1.1.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@1.1.1...@exodus/hardware-wallets@1.1.2) (2024-08-13)
+
+### Bug Fixes
+
+- add require device for ([#8333](https://github.com/ExodusMovement/exodus-hydra/issues/8333)) ([102f065](https://github.com/ExodusMovement/exodus-hydra/commit/102f065d66f00e0501986aeb53d90435f1e51adc))
+
+## [1.1.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@1.1.0...@exodus/hardware-wallets@1.1.1) (2024-08-12)
+
+### Bug Fixes
+
+- resolve circular dependency temporarily ([#8316](https://github.com/ExodusMovement/exodus-hydra/issues/8316)) ([c4e7570](https://github.com/ExodusMovement/exodus-hydra/commit/c4e75706c5f1e4e4be63d6c46dcaa5f30f71d124))
+
 ## [1.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@1.0.0...@exodus/hardware-wallets@1.1.0) (2024-08-08)
 
 ### Features

package/lib/api/index.d.ts

@@ -2,8 +2,10 @@ import type { HardwareWallets } from '../module/hardware-wallets.js';
 declare const hardwareWalletsApiDefinition: {
     readonly id: "hardwareWalletsApi";
     readonly type: "api";
-    readonly factory: ({ hardwareWallets }: {
+    readonly factory: ({ hardwareWallets, restoreProgressTracker, txLogMonitors, }: {
         hardwareWallets: HardwareWallets;
+        txLogMonitors: any;
+        restoreProgressTracker: any;
     }) => {
         hardwareWallets: {
             isDeviceConnected: () => Promise<boolean>;
@@ -17,6 +19,6 @@ declare const hardwareWalletsApiDefinition: {
             create: ({ syncedKeysId }: import("../module/interfaces.js").CreateParams) => Promise<void>;
         };
     };
-    readonly dependencies: readonly ["hardwareWallets"];
+    readonly dependencies: readonly ["hardwareWallets", "txLogMonitors", "restoreProgressTracker"];
 };
 export default hardwareWalletsApiDefinition;

package/lib/api/index.js

@@ -1,4 +1,21 @@
-const createHardwareWalletsApi = ({ hardwareWallets }) => {
+const createHardwareWalletsApi = ({ hardwareWallets, restoreProgressTracker, txLogMonitors, }) => {
+    hardwareWallets.events.subscribe(({ type, payload }) => {
+        if (type !== 'syncAssets')
+            return;
+        const { assetNames } = payload;
+        for (const assetName of assetNames) {
+            if (assetName === 'ethereum' || assetName === 'matic') {
+                restoreProgressTracker.restoreAsset('ethereum');
+                restoreProgressTracker.restoreAsset('matic');
+                txLogMonitors.update({ assetName: 'ethereum', refresh: true });
+                txLogMonitors.update({ assetName: 'matic', refresh: true });
+            }
+            else {
+                restoreProgressTracker.restoreAsset(assetName);
+                txLogMonitors.update({ assetName, refresh: true });
+            }
+        }
+    });
     return {
         hardwareWallets: {
             isDeviceConnected: hardwareWallets.isDeviceConnected,
@@ -17,6 +34,6 @@ const hardwareWalletsApiDefinition = {
     id: 'hardwareWalletsApi',
     type: 'api',
     factory: createHardwareWalletsApi,
-    dependencies: ['hardwareWallets'],
+    dependencies: ['hardwareWallets', 'txLogMonitors', 'restoreProgressTracker'],
 };
 export default hardwareWalletsApiDefinition;

package/lib/index.d.ts

@@ -4,8 +4,10 @@ declare const hardwareWallets: () => {
         readonly definition: {
             readonly id: "hardwareWalletsApi";
             readonly type: "api";
-            readonly factory: ({ hardwareWallets }: {
+            readonly factory: ({ hardwareWallets, restoreProgressTracker, txLogMonitors, }: {
                 hardwareWallets: import("./module/hardware-wallets.js").HardwareWallets;
+                txLogMonitors: any;
+                restoreProgressTracker: any;
             }) => {
                 hardwareWallets: {
                     isDeviceConnected: () => Promise<boolean>;
@@ -19,14 +21,14 @@ declare const hardwareWallets: () => {
                     create: ({ syncedKeysId }: import("./module/interfaces.js").CreateParams) => Promise<void>;
                 };
             };
-            readonly dependencies: readonly ["hardwareWallets"];
+            readonly dependencies: readonly ["hardwareWallets", "txLogMonitors", "restoreProgressTracker"];
         };
     }, {
         readonly definition: {
             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", "userInterface", "publicKeyStore", "wallet", "walletAccountsAtom", "walletAccounts", "txLogMonitors", "restoreProgressTracker"];
+            readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "userInterface", "publicKeyStore", "wallet", "walletAccountsAtom", "walletAccounts"];
         };
     }];
 };

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

@@ -1,5 +1,6 @@
 import { WalletAccount } from '@exodus/models';
-import type { HardwareSignerProvider, CanAccessAssetParams, CreateParams, StoreSyncedKeysParams, ScanParams, SyncParams, EnsureApplicationIsOpenedParams, SignTransactionParams, ScanResult, SyncedKeysId } from './interfaces.js';
+import Emitter from '@exodus/wild-emitter';
+import type { HardwareSignerProvider, CanAccessAssetParams, CreateParams, StoreSyncedKeysParams, ScanParams, SyncParams, EnsureApplicationIsOpenedParams, SignTransactionParams, ScanResult, SyncedKeysId, RequireDeviceForParams } from './interfaces.js';
 import type { HardwareWalletDiscovery, SignMessageParams } from '@exodus/hw-common';
 import type { Atom } from '@exodus/atoms';
 import type { IPublicKeyStore } from '@exodus/public-key-store';
@@ -18,7 +19,8 @@ export type Dependencies = {
 };
 export declare class HardwareWallets implements HardwareSignerProvider {
     #private;
-    constructor({ assetsModule, ledgerDiscovery, logger, userInterface, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, txLogMonitors, restoreProgressTracker, }: Dependencies);
+    readonly events: Emitter<string, any>;
+    constructor({ assetsModule, ledgerDiscovery, logger, userInterface, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }: Dependencies);
     signTransaction: ({ baseAssetName, unsignedTx, walletAccount }: SignTransactionParams) => Promise<any>;
     signMessage: ({ assetName, derivationPath, message }: SignMessageParams) => Promise<any>;
     isDeviceConnected: () => Promise<boolean>;
@@ -30,11 +32,15 @@ export declare class HardwareWallets implements HardwareSignerProvider {
     sync: ({ accountIndex }: SyncParams) => Promise<SyncedKeysId>;
     addPublicKeysToWalletAccount: ({ walletAccountName, syncedKeysId, }: StoreSyncedKeysParams) => Promise<void>;
     create: ({ syncedKeysId }: CreateParams) => Promise<void>;
+    requireDeviceFor: ({ walletAccount }: RequireDeviceForParams) => Promise<{
+        signTransaction: ({ baseAssetName, unsignedTx, walletAccount }: SignTransactionParams) => Promise<any>;
+        signMessage: ({ assetName, derivationPath, message }: SignMessageParams) => Promise<any>;
+    }>;
 }
 declare const hardwareWalletsModuleDefinition: {
     readonly id: "hardwareWallets";
     readonly type: "module";
     readonly factory: (opts: Dependencies) => HardwareWallets;
-    readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "userInterface", "publicKeyStore", "wallet", "walletAccountsAtom", "walletAccounts", "txLogMonitors", "restoreProgressTracker"];
+    readonly dependencies: readonly ["assetsModule", "logger", "ledgerDiscovery", "userInterface", "publicKeyStore", "wallet", "walletAccountsAtom", "walletAccounts"];
 };
 export default hardwareWalletsModuleDefinition;

package/lib/module/hardware-wallets.js

@@ -1,5 +1,6 @@
 import assert from 'minimalistic-assert';
 import { WalletAccount } from '@exodus/models';
+import Emitter from '@exodus/wild-emitter';
 import randomBytes from 'randombytes';
 import delay from 'delay';
 import { UserCancelledError } from './errors.js';
@@ -12,10 +13,9 @@ export class HardwareWallets {
     #wallet;
     #walletAccountsAtom;
     #walletAccounts;
-    #txLogMonitors;
-    #restoreProgressTracker;
     #syncedKeysMap = new Map();
-    constructor({ assetsModule, ledgerDiscovery, logger, userInterface, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, txLogMonitors, restoreProgressTracker, }) {
+    events = new Emitter();
+    constructor({ assetsModule, ledgerDiscovery, logger, userInterface, publicKeyStore, wallet, walletAccountsAtom, walletAccounts, }) {
         this.#assetsModule = assetsModule;
         this.#ledgerDiscovery = ledgerDiscovery;
         this.#logger = logger;
@@ -24,8 +24,6 @@ export class HardwareWallets {
         this.#wallet = wallet;
         this.#walletAccountsAtom = walletAccountsAtom;
         this.#walletAccounts = walletAccounts;
-        this.#txLogMonitors = txLogMonitors;
-        this.#restoreProgressTracker = restoreProgressTracker;
     }
     #requestUserAction = async (params) => {
         const rpc = this.#userInterface.getRPC();
@@ -280,18 +278,7 @@ export class HardwareWallets {
             const { xpub, publicKey } = keys;
             await this.#publicKeyStore.add({ walletAccountName, keyIdentifier, xpub, publicKey });
         }
-        for (const assetName of assetNames) {
-            if (assetName === 'ethereum' || assetName === 'matic') {
-                this.#restoreProgressTracker.restoreAsset('ethereum');
-                this.#restoreProgressTracker.restoreAsset('matic');
-                this.#txLogMonitors.update({ assetName: 'ethereum', refresh: true });
-                this.#txLogMonitors.update({ assetName: 'matic', refresh: true });
-            }
-            else {
-                this.#restoreProgressTracker.restoreAsset(assetName);
-                this.#txLogMonitors.update({ assetName, refresh: true });
-            }
-        }
+        this.events.emit('syncAssets', { assetNames });
     };
     create = async ({ syncedKeysId }) => {
         assert(this.#syncedKeysMap.has(syncedKeysId), `no synchronized keys found for id ${syncedKeysId}`);
@@ -308,6 +295,12 @@ export class HardwareWallets {
         await this.#walletAccounts.setActive(walletAccountName);
         await this.addPublicKeysToWalletAccount({ walletAccountName, syncedKeysId });
     };
+    requireDeviceFor = async ({ walletAccount }) => {
+        return {
+            signTransaction: this.signTransaction,
+            signMessage: this.signMessage,
+        };
+    };
 }
 const createHardwareWalletsModule = (opts) => new HardwareWallets(opts);
 const hardwareWalletsModuleDefinition = {
@@ -323,8 +316,6 @@ const hardwareWalletsModuleDefinition = {
         'wallet',
         'walletAccountsAtom',
         'walletAccounts',
-        'txLogMonitors',
-        'restoreProgressTracker',
     ],
 };
 export default hardwareWalletsModuleDefinition;

package/lib/module/interfaces.d.ts

@@ -119,4 +119,7 @@ export interface FetchBalanceParams {
     address: string;
 }
 export type FetchBalanceResult = any | null;
+export interface RequireDeviceForParams {
+    walletAccount: WalletAccount;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hardware-wallets",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "An Exodus SDK feature that provides a high level abstraction for interacting with hardware wallet devices",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@exodus/models": "^11.7.0",
+    "@exodus/wild-emitter": "^1.1.0",
     "delay": "^5.0.0",
     "minimalistic-assert": "^1.0.1",
     "randombytes": "^2.1.0"
@@ -39,5 +40,5 @@
     "@exodus/logger": "^1.2.2",
     "@exodus/public-key-store": "^1.2.2"
   },
-  "gitHead": "25f3bcf0c26fd9b212c3d8aa8f3149cd139faaae"
+  "gitHead": "007b39adfd80a3f8367b46999f006a6904dfd002"
 }