@ledgerhq/hw-app-btc 6.7.0 → 6.9.1-6.9.1-taproot.0.0

package/lib-es/Btc.js

@@ -1,22 +1,48 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
-import { signMessage } from "./signMessage";
-import { getWalletPublicKey } from "./getWalletPublicKey";
-import { splitTransaction } from "./splitTransaction";
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import semver from "semver";
+import BtcNew from "./BtcNew";
+import BtcOld from "./BtcOld";
+import { getAppAndVersion } from "./getAppAndVersion";
 import { getTrustedInput } from "./getTrustedInput";
 import { getTrustedInputBIP143 } from "./getTrustedInputBIP143";
-import { createTransaction } from "./createTransaction";
-import { signP2SHTransaction } from "./signP2SHTransaction";
+import { AppClient } from "./newops/appClient";
 import { serializeTransactionOutputs } from "./serializeTransaction";
+import { splitTransaction } from "./splitTransaction";
 /**
  * Bitcoin API.
  *
@@ -43,7 +69,7 @@ var Btc = /** @class */ (function () {
      *
      * - verify (boolean) will ask user to confirm the address on the device
      *
-     * - format ("legacy" | "p2sh" | "bech32" | "cashaddr") to use different bitcoin address formatter.
+     * - format ("legacy" | "p2sh" | "bech32" | "bech32m" | "cashaddr") to use different bitcoin address formatter.
      *
      * NB The normal usage is to use:
      *
@@ -72,7 +98,9 @@ var Btc = /** @class */ (function () {
         else {
             options = opts || {};
         }
-        return getWalletPublicKey(this.transport, __assign(__assign({}, options), { path: path }));
+        return this.getCorrectImpl().then(function (impl) {
+            return impl.getWalletPublicKey(path, options);
+        });
     };
     /**
      * You can sign a message according to the Bitcoin Signature format and retrieve v, r, s given the message and the BIP 32 path of the account to sign.
@@ -84,10 +112,7 @@ var Btc = /** @class */ (function () {
      }).catch(function(ex) {console.log(ex);});
      */
     Btc.prototype.signMessageNew = function (path, messageHex) {
-        return signMessage(this.transport, {
-            path: path,
-            messageHex: messageHex
-        });
+        return this.old().signMessageNew(path, messageHex);
     };
     /**
      * To sign a transaction involving standard (P2PKH) inputs, call createTransaction with the following parameters
@@ -125,7 +150,9 @@ var Btc = /** @class */ (function () {
         if (arguments.length > 1) {
             console.warn("@ledgerhq/hw-app-btc: createPaymentTransactionNew multi argument signature is deprecated. please switch to named parameters.");
         }
-        return createTransaction(this.transport, arg);
+        return this.getCorrectImpl().then(function (impl) {
+            return impl.createPaymentTransactionNew(arg);
+        });
     };
     /**
      * To obtain the signature of multisignature (P2SH) inputs, call signP2SHTransaction_async with the folowing parameters
@@ -147,10 +174,7 @@ var Btc = /** @class */ (function () {
     }).then(result => ...);
      */
     Btc.prototype.signP2SHTransaction = function (arg) {
-        if (arguments.length > 1) {
-            console.warn("@ledgerhq/hw-app-btc: signP2SHTransaction multi argument signature is deprecated. please switch to named parameters.");
-        }
-        return signP2SHTransaction(this.transport, arg);
+        return this.old().signP2SHTransaction(arg);
     };
     /**
      * For each UTXO included in your transaction, create a transaction object from the raw serialized version of the transaction used in this UTXO.
@@ -180,6 +204,48 @@ var Btc = /** @class */ (function () {
         if (additionals === void 0) { additionals = []; }
         return getTrustedInputBIP143(this.transport, indexLookup, transaction, additionals);
     };
+    Btc.prototype.getCorrectImpl = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var isNewApp;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.useNewApp()];
+                    case 1:
+                        isNewApp = _a.sent();
+                        if (isNewApp) {
+                            return [2 /*return*/, this["new"]()];
+                        }
+                        else {
+                            return [2 /*return*/, this.old()];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Btc.prototype.old = function () {
+        return new BtcOld(this.transport);
+    };
+    Btc.prototype["new"] = function () {
+        return new BtcNew(new AppClient(this.transport));
+    };
+    Btc.prototype.useNewApp = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var a, isNewApp;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, getAppAndVersion(this.transport)];
+                    case 1:
+                        a = _a.sent();
+                        isNewApp = semver.major(a.version) >= 2;
+                        if ((a.name == "Bitcoin" || a.name == "Bitcoin Test") && isNewApp) {
+                            return [2 /*return*/, true];
+                        }
+                        return [2 /*return*/, false];
+                }
+            });
+        });
+    };
     return Btc;
 }());
 export default Btc;

package/lib-es/Btc.js.map

@@ -1 +1 @@
-{"version":3,"file":"Btc.js","sourceRoot":"","sources":["../src/Btc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Btc.js","sourceRoot":"","sources":["../src/Btc.ts"],"names":[],"mappings":"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"}

package/lib-es/BtcNew.d.ts

@@ -0,0 +1,70 @@
+import type { CreateTransactionArg } from "./createTransaction";
+import type { AddressFormat } from "./getWalletPublicKey";
+import { AppClient as Client } from "./newops/appClient";
+export default class BtcNew {
+    private client;
+    constructor(client: Client);
+    getWalletPublicKey(path: string, opts?: {
+        verify?: boolean;
+        format?: AddressFormat;
+    }): Promise<{
+        publicKey: string;
+        bitcoinAddress: string;
+        chainCode: string;
+    }>;
+    /**
+     * Get an address for the specified path.
+     *
+     * If display is true, we must get the address from the device, which would require
+     * us to determine WalletPolicy. This requires two *extra* queries to the device, one
+     * for the account xpub and one for master key fingerprint.
+     *
+     * If display is false we *could* generate the address ourselves, but chose to
+     * get it from the device to save development time. However, it shouldn't take
+     * more than a few hours to implement local address generation.
+     *
+     * Moreover, if the path is not for a leaf, ie accountPath+/X/Y, there is no
+     * way to get the address from the device. In this case we have to create it
+     * ourselves, but we don't at this time, and instead return an empty ("") address.
+     */
+    private getWalletAddress;
+    private accountPathLength;
+    /**
+     * To sign a transaction involving standard (P2PKH) inputs, call createTransaction with the following parameters
+     * @param inputs is an array of [ transaction, output_index, optional redeem script, optional sequence ] where
+     *
+     * * transaction is the previously computed transaction object for this UTXO
+     * * output_index is the output in the transaction used as input for this UTXO (counting from 0)
+     * * redeem script is the optional redeem script to use when consuming a Segregated Witness input
+     * * sequence is the sequence number to use for this input (when using RBF), or non present
+     * @param associatedKeysets is an array of BIP 32 paths pointing to the path to the private key used for each UTXO
+     * @param changePath is an optional BIP 32 path pointing to the path to the public key used to compute the change address
+     * @param outputScriptHex is the hexadecimal serialized outputs of the transaction to sign, including leading vararg voutCount
+     * @param lockTime is the optional lockTime of the transaction to sign, or default (0)
+     * @param sigHashType is the hash type of the transaction to sign, or default (all)
+     * @param segwit is an optional boolean indicating wether to use segwit or not. This includes wrapped segwit.
+     * @param initialTimestamp is an optional timestamp of the function call to use for coins that necessitate timestamps only, (not the one that the tx will include)
+     * @param additionals list of additionnal options
+     *
+     * - "bech32" for spending native segwit outputs
+     * - "bech32m" for spending segwit v1+ outptus
+     * - "abc" for bch
+     * - "gold" for btg
+     * - "bipxxx" for using BIPxxx
+     * - "sapling" to indicate a zec transaction is supporting sapling (to be set over block 419200)
+     * @param expiryHeight is an optional Buffer for zec overwinter / sapling Txs
+     * @param useTrustedInputForSegwit trust inputs for segwit transactions. If app version >= 1.4.0 this should be true.
+     * @return the signed transaction ready to be broadcast
+     * @example
+    btc.createTransaction({
+     inputs: [ [tx1, 1] ],
+     associatedKeysets: ["0'/0/0"],
+     outputScriptHex: "01905f0100000000001976a91472a5d75c8d2d0565b656a5232703b167d50d5a2b88ac"
+    }).then(res => ...);
+     */
+    createPaymentTransactionNew(arg: CreateTransactionArg): Promise<string>;
+    private setInput;
+    private signPsbt;
+    private createRedeemScript;
+}
+//# sourceMappingURL=BtcNew.d.ts.map

package/lib-es/BtcNew.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BtcNew.d.ts","sourceRoot":"","sources":["../src/BtcNew.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,SAAS,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AASzD,MAAM,CAAC,OAAO,OAAO,MAAM;IACb,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAE5B,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,MAAM,CAAC,EAAE,aAAa,CAAC;KACxB,GACA,OAAO,CAAC;QACT,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;QACvB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IAsBF;;;;;;;;;;;;;;OAcG;YACW,gBAAgB;IA0B9B,OAAO,CAAC,iBAAiB;IASzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACG,2BAA2B,CAC/B,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,MAAM,CAAC;YA6EJ,QAAQ;YAyDR,QAAQ;IA8BtB,OAAO,CAAC,kBAAkB;CAI3B"}

package/lib-es/BtcNew.js

@@ -0,0 +1,370 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { crypto } from "bitcoinjs-lib";
+import { getXpubComponents, pathStringToArray, pubkeyFromXpub } from "./bip32";
+import { BufferReader } from "./buffertools";
+import { hashPublicKey } from "./hashPublicKey";
+import { createKey, WalletPolicy } from "./newops/policy";
+import { extract } from "./newops/psbtExtractor";
+import { finalize } from "./newops/psbtFinalizer";
+import { psbtIn, PsbtV2 } from "./newops/psbtv2";
+import { serializeTransaction } from "./serializeTransaction";
+import { pointCompress } from "tiny-secp256k1";
+var BtcNew = /** @class */ (function () {
+    function BtcNew(client) {
+        this.client = client;
+    }
+    BtcNew.prototype.getWalletPublicKey = function (path, opts) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var pathElements, xpub, display, address, components, uncompressedPubkey;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        pathElements = pathStringToArray(path);
+                        return [4 /*yield*/, this.client.getPubkey(false, pathElements)];
+                    case 1:
+                        xpub = _c.sent();
+                        display = (_a = opts === null || opts === void 0 ? void 0 : opts.verify) !== null && _a !== void 0 ? _a : false;
+                        return [4 /*yield*/, this.getWalletAddress(pathElements, accountTypeFrom((_b = opts === null || opts === void 0 ? void 0 : opts.format) !== null && _b !== void 0 ? _b : "legacy"), display)];
+                    case 2:
+                        address = _c.sent();
+                        components = getXpubComponents(xpub);
+                        uncompressedPubkey = Buffer.from(pointCompress(components.pubkey, false));
+                        return [2 /*return*/, {
+                                publicKey: uncompressedPubkey.toString("hex"),
+                                bitcoinAddress: address,
+                                chainCode: components.chaincode.toString("hex")
+                            }];
+                }
+            });
+        });
+    };
+    /**
+     * Get an address for the specified path.
+     *
+     * If display is true, we must get the address from the device, which would require
+     * us to determine WalletPolicy. This requires two *extra* queries to the device, one
+     * for the account xpub and one for master key fingerprint.
+     *
+     * If display is false we *could* generate the address ourselves, but chose to
+     * get it from the device to save development time. However, it shouldn't take
+     * more than a few hours to implement local address generation.
+     *
+     * Moreover, if the path is not for a leaf, ie accountPath+/X/Y, there is no
+     * way to get the address from the device. In this case we have to create it
+     * ourselves, but we don't at this time, and instead return an empty ("") address.
+     */
+    BtcNew.prototype.getWalletAddress = function (pathElements, accountType, display) {
+        return __awaiter(this, void 0, void 0, function () {
+            var accountPathLength, accountPath, accountXpub, masterFingerprint, policy, changeAndIndex;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        accountPathLength = this.accountPathLength(pathElements);
+                        if (accountPathLength + 2 != pathElements.length) {
+                            return [2 /*return*/, ""];
+                        }
+                        accountPath = pathElements.slice(0, accountPathLength);
+                        return [4 /*yield*/, this.client.getPubkey(false, accountPath)];
+                    case 1:
+                        accountXpub = _a.sent();
+                        return [4 /*yield*/, this.client.getMasterFingerprint()];
+                    case 2:
+                        masterFingerprint = _a.sent();
+                        policy = new WalletPolicy(accountType, createKey(masterFingerprint, accountPath, accountXpub));
+                        changeAndIndex = pathElements.slice(-2, pathElements.length);
+                        return [2 /*return*/, this.client.getWalletAddress(policy, Buffer.alloc(32, 0), changeAndIndex[0], changeAndIndex[1], display)];
+                }
+            });
+        });
+    };
+    BtcNew.prototype.accountPathLength = function (pathElements) {
+        for (var i = pathElements.length - 1; i >= 0; i--) {
+            if (pathElements[i] >= 0x80000000) {
+                return i + 1;
+            }
+        }
+        return 0;
+    };
+    /**
+     * To sign a transaction involving standard (P2PKH) inputs, call createTransaction with the following parameters
+     * @param inputs is an array of [ transaction, output_index, optional redeem script, optional sequence ] where
+     *
+     * * transaction is the previously computed transaction object for this UTXO
+     * * output_index is the output in the transaction used as input for this UTXO (counting from 0)
+     * * redeem script is the optional redeem script to use when consuming a Segregated Witness input
+     * * sequence is the sequence number to use for this input (when using RBF), or non present
+     * @param associatedKeysets is an array of BIP 32 paths pointing to the path to the private key used for each UTXO
+     * @param changePath is an optional BIP 32 path pointing to the path to the public key used to compute the change address
+     * @param outputScriptHex is the hexadecimal serialized outputs of the transaction to sign, including leading vararg voutCount
+     * @param lockTime is the optional lockTime of the transaction to sign, or default (0)
+     * @param sigHashType is the hash type of the transaction to sign, or default (all)
+     * @param segwit is an optional boolean indicating wether to use segwit or not. This includes wrapped segwit.
+     * @param initialTimestamp is an optional timestamp of the function call to use for coins that necessitate timestamps only, (not the one that the tx will include)
+     * @param additionals list of additionnal options
+     *
+     * - "bech32" for spending native segwit outputs
+     * - "bech32m" for spending segwit v1+ outptus
+     * - "abc" for bch
+     * - "gold" for btg
+     * - "bipxxx" for using BIPxxx
+     * - "sapling" to indicate a zec transaction is supporting sapling (to be set over block 419200)
+     * @param expiryHeight is an optional Buffer for zec overwinter / sapling Txs
+     * @param useTrustedInputForSegwit trust inputs for segwit transactions. If app version >= 1.4.0 this should be true.
+     * @return the signed transaction ready to be broadcast
+     * @example
+    btc.createTransaction({
+     inputs: [ [tx1, 1] ],
+     associatedKeysets: ["0'/0/0"],
+     outputScriptHex: "01905f0100000000001976a91472a5d75c8d2d0565b656a5232703b167d50d5a2b88ac"
+    }).then(res => ...);
+     */
+    BtcNew.prototype.createPaymentTransactionNew = function (arg) {
+        return __awaiter(this, void 0, void 0, function () {
+            var psbt, accountType, masterFp, accountXpub, accountPath, i, pathElems, outputsConcat, outputsBufferReader, outputCount, i, amount, outputScript, isChange, changePath, xpubBase58, pubkey, redeemScript, key, p;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (arg.inputs.length == 0) {
+                            throw Error("No inputs");
+                        }
+                        psbt = new PsbtV2();
+                        accountType = accountTypeFromArg(arg);
+                        psbt.setGlobalTxVersion(2);
+                        if (arg.lockTime) {
+                            psbt.setGlobalFallbackLocktime(arg.lockTime);
+                        }
+                        psbt.setGlobalInputCount(arg.inputs.length);
+                        psbt.setGlobalPsbtVersion(2);
+                        psbt.setGlobalTxVersion(2);
+                        return [4 /*yield*/, this.client.getMasterFingerprint()];
+                    case 1:
+                        masterFp = _a.sent();
+                        accountXpub = "";
+                        accountPath = [];
+                        i = 0;
+                        _a.label = 2;
+                    case 2:
+                        if (!(i < arg.inputs.length)) return [3 /*break*/, 7];
+                        pathElems = pathStringToArray(arg.associatedKeysets[i]);
+                        if (!(accountXpub == "")) return [3 /*break*/, 4];
+                        // We assume all inputs belong to the same account so we set
+                        // the account xpub and path based on the first input.
+                        accountPath = pathElems.slice(0, -2);
+                        return [4 /*yield*/, this.client.getPubkey(false, accountPath)];
+                    case 3:
+                        accountXpub = _a.sent();
+                        _a.label = 4;
+                    case 4: return [4 /*yield*/, this.setInput(psbt, i, arg.inputs[i], pathElems, accountType, masterFp)];
+                    case 5:
+                        _a.sent();
+                        _a.label = 6;
+                    case 6:
+                        i++;
+                        return [3 /*break*/, 2];
+                    case 7:
+                        outputsConcat = Buffer.from(arg.outputScriptHex, "hex");
+                        outputsBufferReader = new BufferReader(outputsConcat);
+                        outputCount = outputsBufferReader.readVarInt();
+                        psbt.setGlobalOutputCount(outputCount);
+                        i = 0;
+                        _a.label = 8;
+                    case 8:
+                        if (!(i < outputCount)) return [3 /*break*/, 12];
+                        amount = Number(outputsBufferReader.readUInt64());
+                        outputScript = outputsBufferReader.readVarSlice();
+                        isChange = arg.changePath && i == outputCount - 1;
+                        if (!isChange) return [3 /*break*/, 10];
+                        changePath = pathStringToArray(arg.changePath);
+                        return [4 /*yield*/, this.client.getPubkey(false, changePath)];
+                    case 9:
+                        xpubBase58 = _a.sent();
+                        pubkey = pubkeyFromXpub(xpubBase58);
+                        if (accountType == AccountType.p2pkh) {
+                            psbt.setOutputBip32Derivation(i, pubkey, masterFp, changePath);
+                        }
+                        else if (accountType == AccountType.p2wpkh) {
+                            psbt.setOutputBip32Derivation(i, pubkey, masterFp, changePath);
+                        }
+                        else if (accountType == AccountType.p2wpkhWrapped) {
+                            redeemScript = this.createRedeemScript(pubkey);
+                            psbt.setOutputRedeemScript(i, redeemScript);
+                            psbt.setOutputBip32Derivation(i, pubkey, masterFp, changePath);
+                        }
+                        else if (accountType == AccountType.p2tr) {
+                            psbt.setOutputTapBip32Derivation(i, pubkey, [], masterFp, changePath);
+                        }
+                        _a.label = 10;
+                    case 10:
+                        psbt.setOutputAmount(i, amount);
+                        psbt.setOutputScript(i, outputScript);
+                        _a.label = 11;
+                    case 11:
+                        i++;
+                        return [3 /*break*/, 8];
+                    case 12:
+                        key = createKey(masterFp, accountPath, accountXpub);
+                        p = new WalletPolicy(accountType, key);
+                        return [4 /*yield*/, this.signPsbt(psbt, p)];
+                    case 13: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    BtcNew.prototype.setInput = function (psbt, i, input, pathElements, accountType, masterFP) {
+        return __awaiter(this, void 0, void 0, function () {
+            var inputTx, spentOutputIndex, redeemScript, sequence, inputTxBuffer, inputTxid, xpubBase58, pubkey, spentOutput, expectedRedeemScript;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        inputTx = input[0];
+                        spentOutputIndex = input[1];
+                        redeemScript = input[2];
+                        sequence = input[3];
+                        if (sequence) {
+                            psbt.setInputSequence(i, sequence);
+                        }
+                        inputTxBuffer = serializeTransaction(inputTx, true);
+                        inputTxid = crypto.hash256(inputTxBuffer);
+                        return [4 /*yield*/, this.client.getPubkey(false, pathElements)];
+                    case 1:
+                        xpubBase58 = _a.sent();
+                        pubkey = pubkeyFromXpub(xpubBase58);
+                        if (!inputTx.outputs)
+                            throw Error("Missing outputs array in transaction to sign");
+                        spentOutput = inputTx.outputs[spentOutputIndex];
+                        if (accountType == AccountType.p2pkh) {
+                            psbt.setInputNonWitnessUtxo(i, inputTxBuffer);
+                            psbt.setInputBip32Derivation(i, pubkey, masterFP, pathElements);
+                        }
+                        else if (accountType == AccountType.p2wpkh) {
+                            psbt.setInputNonWitnessUtxo(i, inputTxBuffer);
+                            psbt.setInputBip32Derivation(i, pubkey, masterFP, pathElements);
+                            psbt.setInputWitnessUtxo(i, spentOutput.amount, spentOutput.script);
+                        }
+                        else if (accountType == AccountType.p2wpkhWrapped) {
+                            psbt.setInputNonWitnessUtxo(i, inputTxBuffer);
+                            psbt.setInputBip32Derivation(i, pubkey, masterFP, pathElements);
+                            if (!redeemScript) {
+                                throw new Error("Missing redeemScript for p2wpkhWrapped input");
+                            }
+                            expectedRedeemScript = this.createRedeemScript(pubkey);
+                            if (redeemScript != expectedRedeemScript.toString("hex")) {
+                                throw new Error("Unexpected redeemScript");
+                            }
+                            psbt.setInputRedeemScript(i, expectedRedeemScript);
+                            psbt.setInputWitnessUtxo(i, spentOutput.amount, spentOutput.script);
+                        }
+                        else if (accountType == AccountType.p2tr) {
+                            psbt.setInputTapBip32Derivation(i, pubkey, [], masterFP, pathElements);
+                            psbt.setInputWitnessUtxo(i, spentOutput.amount, spentOutput.script);
+                        }
+                        psbt.setInputPreviousTxId(i, inputTxid);
+                        psbt.setInputOutputIndex(i, spentOutputIndex);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    BtcNew.prototype.signPsbt = function (psbt, walletPolicy) {
+        return __awaiter(this, void 0, void 0, function () {
+            var sigs, serializedTx;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.signPsbt(psbt, walletPolicy, Buffer.alloc(32, 0))];
+                    case 1:
+                        sigs = _a.sent();
+                        sigs.forEach(function (v, k) {
+                            // Note: Looking at BIP32 derivation does not work in the generic case.
+                            // some inputs might not have a BIP32-derived pubkey.
+                            var pubkeys = psbt.getInputKeyDatas(k, psbtIn.BIP32_DERIVATION);
+                            var pubkey;
+                            if (pubkeys.length != 1) {
+                                pubkey = psbt.getInputKeyDatas(k, psbtIn.TAP_BIP32_DERIVATION);
+                                if (pubkey.length == 0) {
+                                    throw Error("Missing pubkey derivation for input " + k);
+                                }
+                                psbt.setInputTapKeySig(k, v);
+                            }
+                            else {
+                                pubkey = pubkeys[0];
+                                psbt.setInputPartialSig(k, pubkey, v);
+                            }
+                        });
+                        finalize(psbt);
+                        serializedTx = extract(psbt);
+                        return [2 /*return*/, serializedTx.toString("hex")];
+                }
+            });
+        });
+    };
+    BtcNew.prototype.createRedeemScript = function (pubkey) {
+        var pubkeyHash = hashPublicKey(pubkey);
+        return Buffer.concat([Buffer.from("0014", "hex"), pubkeyHash]);
+    };
+    return BtcNew;
+}());
+export default BtcNew;
+var AccountType;
+(function (AccountType) {
+    AccountType["p2pkh"] = "pkh(@0)";
+    AccountType["p2wpkh"] = "wpkh(@0)";
+    AccountType["p2wpkhWrapped"] = "sh(wpkh(@0))";
+    AccountType["p2tr"] = "tr(@0)";
+})(AccountType || (AccountType = {}));
+function accountTypeFrom(addressFormat) {
+    if (addressFormat == "legacy")
+        return AccountType.p2pkh;
+    if (addressFormat == "p2sh")
+        return AccountType.p2wpkhWrapped;
+    if (addressFormat == "bech32")
+        return AccountType.p2wpkh;
+    if (addressFormat == "bech32m")
+        return AccountType.p2tr;
+    throw new Error("Unsupported address format " + addressFormat);
+}
+function accountTypeFromArg(arg) {
+    if (arg.additionals.includes("bech32m"))
+        return AccountType.p2tr;
+    if (arg.additionals.includes("bech32"))
+        return AccountType.p2wpkh;
+    if (arg.segwit)
+        return AccountType.p2wpkhWrapped;
+    return AccountType.p2pkh;
+}
+//# sourceMappingURL=BtcNew.js.map

package/lib-es/BtcNew.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BtcNew.js","sourceRoot":"","sources":["../src/BtcNew.ts"],"names":[],"mappings":"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"}