@exodus/hw-ledger 3.3.0 → 3.3.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 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

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';
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/hw-ledger",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "The ledger module",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -64,5 +64,5 @@
     "redux": "^4.2.1",
     "tiny-secp256k1": "^2.2.3"
   },
-  "gitHead": "6a40d50082582568d68206d8926737eea560fa50"
+  "gitHead": "75c0ccc137017dbd6fea08e2c42f6b46e2e85f9c"
 }