@exodus/hardware-wallets 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@1.5.1...@exodus/hardware-wallets@1.6.0) (2024-10-22)
+
+### Features
+
+- support cancelling an action on the ledger device ([#10105](https://github.com/ExodusMovement/exodus-hydra/issues/10105)) ([f1c1fbf](https://github.com/ExodusMovement/exodus-hydra/commit/f1c1fbff6ec70b7ddc68dd700ffb556b673b7a5a))
+
+### Bug Fixes
+
+- catch xpub key identifier errrors ([#10124](https://github.com/ExodusMovement/exodus-hydra/issues/10124)) ([7cd681d](https://github.com/ExodusMovement/exodus-hydra/commit/7cd681deec14adfa9c3e7613f276f2745f1df441))
+
+## [1.5.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@1.5.0...@exodus/hardware-wallets@1.5.1) (2024-10-17)
+
+### Bug Fixes
+
+- support cancelling transaction through ui ([#10058](https://github.com/ExodusMovement/exodus-hydra/issues/10058)) ([beb7d2d](https://github.com/ExodusMovement/exodus-hydra/commit/beb7d2d1aafba17678a34febcf2458163d9182d2))
+
 ## [1.5.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hardware-wallets@1.4.0...@exodus/hardware-wallets@1.5.0) (2024-10-17)
 
 ### Features

package/lib/module/hardware-wallets.js

@@ -37,21 +37,24 @@ export class HardwareWallets {
         return rpc.callMethod('handle-hardware-wallet', params);
     };
     #signGeneric = async ({ baseAssetName, scenario, sign }) => {
-        let needUserApproval = true;
         let attempts = 0;
         const MAX_ATTEMPTS = 50;
         while (attempts < MAX_ATTEMPTS) {
             try {
-                if (needUserApproval) {
-                    this.#requestUserAction({
-                        scenario,
-                        baseAssetName,
-                    });
-                    needUserApproval = false;
-                }
+                const approvePromise = this.#requestUserAction({
+                    scenario,
+                    baseAssetName,
+                });
                 const { device } = await this.#getSelectedDevice();
-                await device.ensureApplicationIsOpened(baseAssetName);
-                const result = await sign({ device });
+                const runSign = async () => {
+                    await device.ensureApplicationIsOpened(baseAssetName);
+                    return sign({ device });
+                };
+                const result = await Promise.race([approvePromise, runSign()]);
+                if (typeof result === 'object' && result.tryAgain === false) {
+                    device.cancelAction();
+                    throw new UserRefusedError(false);
+                }
                 this.#requestUserAction({ scenario: 'completed' });
                 return result;
             }
@@ -62,11 +65,7 @@ export class HardwareWallets {
                 else if (error.name === 'UserRefusedError') {
                     throw error;
                 }
-                if (error.name === 'DisconnectedDeviceDuringOperation') {
-                    this.#requestUserAction({
-                        scenario,
-                        baseAssetName,
-                    });
+                if (['DisconnectedDevice', 'DisconnectedDeviceDuringOperation'].includes(error.name)) {
                     continue;
                 }
                 try {
@@ -185,28 +184,32 @@ export class HardwareWallets {
         });
     };
     #getXPUB = async ({ device, baseAsset, purpose, accountIndex, }) => {
-        const keyIdentifier = baseAsset.api.getKeyIdentifier({
-            compatibilityMode: 'ledger',
-            purpose,
-            accountIndex,
-            chainIndex: undefined,
-            addressIndex: undefined,
-        });
-        const { derivationPath } = keyIdentifier;
-        const xpub = await device
-            .getXPub({
-            assetName: baseAsset.name,
-            derivationPath,
-        })
-            .catch((error) => {
-            if (error.name === 'XPubUnsupportedError') {
-                this.#logger.warn(`Retrieving XPUBs for ${baseAsset.name} is not supported`, error);
+        try {
+            const keyIdentifier = baseAsset.api.getKeyIdentifier({
+                compatibilityMode: 'ledger',
+                purpose,
+                accountIndex,
+                chainIndex: undefined,
+                addressIndex: undefined,
+            });
+            const { derivationPath } = keyIdentifier;
+            const xpub = await device.getXPub({
+                assetName: baseAsset.name,
+                derivationPath,
+            });
+            if (xpub) {
+                return { keyIdentifier, xpub };
             }
-            else {
-                throw error;
+            return null;
+        }
+        catch (error) {
+            if (error.name === 'XPubUnsupportedError' ||
+                error.message.includes(`XPUB derivation is not allowed`)) {
+                this.#logger.warn(`Retrieving XPUBs for ${baseAsset.name} is not supported`, error);
+                return null;
             }
-        });
-        return xpub ? { keyIdentifier, xpub } : null;
+            throw error;
+        }
     };
     #getPublicKey = async ({ device, baseAsset, purpose, accountIndex, }) => {
         const keyIdentifier = baseAsset.api.getKeyIdentifier({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hardware-wallets",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "An Exodus SDK feature that provides a high level abstraction for interacting with hardware wallet devices",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -28,7 +28,7 @@
     "prepublishOnly": "yarn run -T build --scope @exodus/hardware-wallets"
   },
   "dependencies": {
-    "@exodus/hw-common": "^3.0.0",
+    "@exodus/hw-common": "^3.1.0",
     "@exodus/models": "^12.0.1",
     "@exodus/wild-emitter": "^1.1.0",
     "delay": "^5.0.0",
@@ -41,7 +41,8 @@
     "@exodus/key-identifier": "^1.3.0",
     "@exodus/logger": "^1.2.2",
     "@exodus/public-key-provider": "^3.0.0",
-    "@types/randombytes": "^2.0.3"
+    "@types/randombytes": "^2.0.3",
+    "p-defer": "^4.0.1"
   },
-  "gitHead": "a4f949331317cbeb49ea2392703722914a67fcac"
+  "gitHead": "6a40d50082582568d68206d8926737eea560fa50"
 }