@exodus/hw-ledger 3.2.0 → 3.3.1

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.
 
+## [3.3.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@3.3.0...@exodus/hw-ledger@3.3.1) (2024-10-24)
+
+### Bug Fixes
+
+- support legacy transaction signing ([#10154](https://github.com/ExodusMovement/exodus-hydra/issues/10154)) ([55c3d63](https://github.com/ExodusMovement/exodus-hydra/commit/55c3d63e809397b94aa08309b03715fe6d0ed831))
+
+## [3.3.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@3.2.0...@exodus/hw-ledger@3.3.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))
+
 ## [3.2.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/hw-ledger@3.1.0...@exodus/hw-ledger@3.2.0) (2024-10-21)
 
 ### Features

package/lib/module/assets/ethereum.js

@@ -1,4 +1,4 @@
-import secp256k1 from '@exodus/secp256k1';
+import * as secp256k1 from '@exodus/crypto/secp256k1';
 import * as ethers from '@exodus/ethersproject-transactions';
 import AppEth, { ledgerService } from '@exodus/ledgerhq-hw-app-eth';
 import { TypedDataUtils, SignTypedDataVersion } from '@metamask/eth-sig-util';
@@ -36,13 +36,20 @@ async function createHandler(transport) {
         },
         getXPub: async (params) => {
             const { publicKey, chainCode } = await app.getAddress(params.derivationPath.replace('m/', ''), false, true);
-            const compressedPublicKey = Buffer.from(secp256k1.publicKeyConvert(Buffer.from(publicKey, 'hex'), true));
+            const compressedPublicKey = secp256k1.publicKeyConvert({
+                publicKey: Buffer.from(publicKey, 'hex'),
+                compressed: true,
+                format: 'buffer',
+            });
             return buildFauxXPUB(compressedPublicKey, Buffer.from(chainCode, 'hex'));
         },
         getPublicKey: async (params) => {
             const { publicKey } = await app.getAddress(params.derivationPath.replace('m/', ''));
-            const compressedPublicKey = secp256k1.publicKeyConvert(Buffer.from(publicKey, 'hex'), true);
-            return Buffer.from(compressedPublicKey);
+            return secp256k1.publicKeyConvert({
+                publicKey: Buffer.from(publicKey, 'hex'),
+                compressed: true,
+                format: 'buffer',
+            });
         },
         signTransaction: async (params) => {
             assert(Array.isArray(params.derivationPaths) && params.derivationPaths.length === 1, 'derivationsPath array must be one element long');

package/lib/module/assets/utils/bip322.d.ts

@@ -1,2 +1,2 @@
-import * as bitcoin from '@exodus/bitcoinjs-lib';
+import * as bitcoin from '@exodus/bitcoinjs';
 export declare function buildBip322PSBT(message: string, address: string): bitcoin.Psbt;

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

@@ -1,4 +1,4 @@
-import * as bitcoin from '@exodus/bitcoinjs-lib';
+import * as bitcoin from '@exodus/bitcoinjs';
 import { BIP322, Address } from '@exodus/bip322-js';
 export function buildBip322PSBT(message, address) {
     const scriptPubKey = Address.convertAdressToScriptPubkey(address);

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

@@ -1,6 +1,6 @@
 import assert from 'minimalistic-assert';
 import { DefaultWalletPolicy, WalletPolicy } from '@exodus/ledger-bitcoin';
-import { payments, address as baddress } from '@exodus/bitcoinjs-lib';
+import { payments, address as baddress, Transaction } from '@exodus/bitcoinjs';
 import { buildBip44PathFromNumber, assertBip44PathNumber, splitBip44PathToNumber, splitBip44DerivationPath, } from './derivation-paths';
 export function assertPsbtOnlyHasAllowedDerivationPaths(psbt, masterFingerprint, derivationPaths) {
     for (let i = 0; i < psbt.getGlobalInputCount(); i++) {
@@ -36,12 +36,23 @@ export function tagPsbtWithDerivationPaths(psbt, masterFingerprint, derivationPa
     const scriptPubKeyToDerivationPathMap = computeScriptPubKeyToDerivationPathMap(derivationPathToPublicKeyMap);
     for (let inputIndex = 0; inputIndex < psbt.getGlobalInputCount(); inputIndex++) {
         const witnessUtxo = psbt.getInputWitnessUtxo(inputIndex);
-        assert(witnessUtxo, `witnessUtxo is currently the only supported type`);
-        const scriptPubKey = witnessUtxo.scriptPubKey.toString('hex');
-        let derivationPath = scriptPubKeyToDerivationPathMap[scriptPubKey];
+        const nonWitnessUtxo = psbt.getInputNonWitnessUtxo(inputIndex);
+        let scriptPubKey;
+        if (witnessUtxo) {
+            scriptPubKey = witnessUtxo.scriptPubKey;
+        }
+        else if (nonWitnessUtxo) {
+            const prevOutputIndex = psbt.getInputOutputIndex(inputIndex);
+            const decodedTransaction = Transaction.fromBuffer(nonWitnessUtxo);
+            scriptPubKey = decodedTransaction.outs[prevOutputIndex].script;
+        }
+        else {
+            throw new Error('missing witnessUtxo or nonWitnessUtxo');
+        }
+        let derivationPath = scriptPubKeyToDerivationPathMap[scriptPubKey.toString('hex')];
         if (addressToDerivationPathMap && !derivationPath) {
             try {
-                const address = baddress.fromOutputScript(witnessUtxo.scriptPubKey);
+                const address = baddress.fromOutputScript(scriptPubKey);
                 derivationPath = addressToDerivationPathMap[address];
             }
             catch { }
@@ -50,7 +61,7 @@ export function tagPsbtWithDerivationPaths(psbt, masterFingerprint, derivationPa
             const publicKey = derivationPathToPublicKeyMap[derivationPath];
             assert(Buffer.isBuffer(publicKey), `no public key found for derivation path`);
             const derivationPathNumerical = splitBip44PathToNumber(derivationPath);
-            if (isTaproot(witnessUtxo.scriptPubKey)) {
+            if (isTaproot(scriptPubKey)) {
                 psbt.setInputTapBip32Derivation(inputIndex, publicKey.slice(1), [], masterFingerprintBuffer, derivationPathNumerical);
             }
             else {
@@ -83,25 +94,41 @@ export function tagPsbtWithDerivationPaths(psbt, masterFingerprint, derivationPa
 }
 function computeScriptPubKeyToDerivationPathMap(derivationPathToPublicKeyMap) {
     return Object.entries(derivationPathToPublicKeyMap).reduce((acc, [derivationPath, publicKey]) => {
-        if (derivationPath.startsWith('m/84')) {
-            const segwitV0 = payments.p2wpkh({
+        if (derivationPath.startsWith('m/44')) {
+            const p2pkh = payments.p2pkh({
                 pubkey: publicKey,
             }).output;
-            if (segwitV0) {
-                Object.assign(acc, {
-                    [segwitV0.toString('hex')]: derivationPath,
-                });
-            }
+            assert(p2pkh, 'failed to compute p2pkh scriptPubKey');
+            Object.assign(acc, {
+                [p2pkh.toString('hex')]: derivationPath,
+            });
+        }
+        else if (derivationPath.startsWith('m/49')) {
+            const nestedSegwit = payments.p2sh({
+                redeem: payments.p2wpkh({ pubkey: publicKey }),
+            }).output;
+            assert(nestedSegwit, 'failed to compute p2pkh scriptPubKey');
+            Object.assign(acc, {
+                [nestedSegwit.toString('hex')]: derivationPath,
+            });
+        }
+        else if (derivationPath.startsWith('m/84')) {
+            const p2wpkh = payments.p2wpkh({
+                pubkey: publicKey,
+            }).output;
+            assert(p2wpkh, 'failed to compute p2wpkh scriptPubKey');
+            Object.assign(acc, {
+                [p2wpkh.toString('hex')]: derivationPath,
+            });
         }
         else if (derivationPath.startsWith('m/86')) {
-            const taproot = payments.p2tr({
+            const p2tr = payments.p2tr({
                 internalPubkey: publicKey.slice(1),
             }).output;
-            if (taproot) {
-                Object.assign(acc, {
-                    [taproot.toString('hex')]: derivationPath,
-                });
-            }
+            assert(p2tr, 'failed to compute p2tr scriptPubKey');
+            Object.assign(acc, {
+                [p2tr.toString('hex')]: derivationPath,
+            });
         }
         return acc;
     }, Object.create(null));

package/lib/module/device.d.ts

@@ -10,6 +10,7 @@ export declare class LedgerDevice implements HardwareWalletDevice {
     #private;
     constructor({ transportFactory, descriptor, walletPolicyAtom }: Dependencies);
     get descriptor(): HardwareWalletDescriptor;
+    cancelAction: () => Promise<void>;
     ensureApplicationIsOpened: (baseAssetName: string) => Promise<void>;
     listSupportedAssetNames: () => Promise<string[]>;
     listInstalledAssetNames: () => Promise<string[]>;

package/lib/module/device.js

@@ -7,6 +7,7 @@ export class LedgerDevice {
     #transportFactory;
     #descriptor;
     #walletPolicyAtom;
+    #cancelPendingAction;
     constructor({ transportFactory, descriptor, walletPolicyAtom }) {
         this.#transportFactory = transportFactory;
         this.#descriptor = descriptor;
@@ -17,6 +18,7 @@ export class LedgerDevice {
     }
     #runInSession = async (operation, expectErrorWhenClosing = false) => {
         const transport = await this.#transportFactory.open(this.#descriptor.internalDescriptor);
+        this.#cancelPendingAction = async () => transport.close();
         try {
             return await operation(transport);
         }
@@ -24,6 +26,7 @@ export class LedgerDevice {
             throw transformToCommonError(err);
         }
         finally {
+            this.#cancelPendingAction = undefined;
             if (expectErrorWhenClosing) {
                 await transport.close().catch((err) => {
                     console.warn(`caught error while closing ledger transport but was expected = `, err);
@@ -64,6 +67,12 @@ export class LedgerDevice {
             return handler.quitApplication();
         });
     };
+    cancelAction = async () => {
+        if (this.#cancelPendingAction) {
+            await this.#cancelPendingAction();
+            await this.#quitApplication();
+        }
+    };
     ensureApplicationIsOpened = async (baseAssetName) => {
         const { applications } = this.#getAssetApplication(baseAssetName);
         const supportedApplicationNames = applications.map(({ applicationName }) => applicationName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -22,24 +22,24 @@
     "build": "run -T tsc --build 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",
+    "test": "RUN_TESTS=unit run -T exodus-test --jest --esbuild",
     "zemu:install": "docker pull zondax/builder-zemu:speculos-745fe46f81cfc18114b94a37beaefb58a09c0fcd",
-    "test:integration": "yarn zemu:install && run -T exodus-test --jest --esbuild",
+    "test:integration": "yarn zemu:install && RUN_TESTS=integration run -T exodus-test --jest --esbuild",
     "lint": "run -T eslint .",
     "lint:fix": "yarn lint --fix",
     "prepublishOnly": "yarn run -T build --scope @exodus/hw-ledger"
   },
   "dependencies": {
     "@exodus/atoms": "^9.0.0",
-    "@exodus/bip322-js": "^1.1.0-exodus.4",
-    "@exodus/bitcoinjs-lib": "^6.1.5-exodus.0",
+    "@exodus/bip322-js": "^1.2.1",
+    "@exodus/bitcoinjs": "^1.1.0",
+    "@exodus/crypto": "^1.0.0-rc.14",
     "@exodus/ethersproject-transactions": "^5.4.2-exodus.0",
-    "@exodus/hw-common": "^3.0.0",
+    "@exodus/hw-common": "^3.1.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",
     "@exodus/redux-dependency-injection": "^4.0.0",
-    "@exodus/secp256k1": "^4.0.2-exodus.0",
     "@ledgerhq/hw-app-solana": "^7.0.10",
     "@ledgerhq/hw-transport": "^6.28.5",
     "@metamask/eth-sig-util": "^4.0.1",
@@ -56,14 +56,13 @@
     "@types/bs58": "^4.0.1",
     "@types/bs58check": "^2.1.0",
     "@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",
     "ecpair": "^2.1.0",
+    "p-defer": "^4.0.1",
     "redux": "^4.2.1",
-    "tiny-secp256k1": "^2.2.3",
-    "ts-jest": "^29.0.3"
+    "tiny-secp256k1": "^2.2.3"
   },
-  "gitHead": "6bb100cacdf1975464a78ab0c54b84c2b922d8a2"
+  "gitHead": "75c0ccc137017dbd6fea08e2c42f6b46e2e85f9c"
 }