@ledgerhq/hw-app-btc 6.11.1 → 6.15.0

package/README.md

@@ -45,51 +45,58 @@ Ledger Hardware Wallet BTC JavaScript bindings. Also supports many altcoins.
         *   [Parameters](#parameters-10)
     *   [createPaymentTransactionNew](#createpaymenttransactionnew-1)
         *   [Parameters](#parameters-11)
-*   [outputScriptOf](#outputscriptof)
-    *   [Parameters](#parameters-12)
-*   [getTaprootOutputKey](#gettaprootoutputkey)
-    *   [Parameters](#parameters-13)
 *   [BtcOld](#btcold)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-12)
     *   [Examples](#examples-7)
     *   [getWalletPublicKey](#getwalletpublickey-3)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-13)
         *   [Examples](#examples-8)
     *   [signMessageNew](#signmessagenew-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-14)
         *   [Examples](#examples-9)
     *   [createPaymentTransactionNew](#createpaymenttransactionnew-2)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-15)
         *   [Examples](#examples-10)
     *   [signP2SHTransaction](#signp2shtransaction-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-16)
         *   [Examples](#examples-11)
 *   [CreateTransactionArg](#createtransactionarg)
     *   [Properties](#properties)
 *   [AddressFormat](#addressformat)
+*   [AccountType](#accounttype)
+    *   [spendingCondition](#spendingcondition)
+        *   [Parameters](#parameters-17)
+    *   [setInput](#setinput)
+        *   [Parameters](#parameters-18)
+    *   [setOwnOutput](#setownoutput)
+        *   [Parameters](#parameters-19)
+    *   [getDescriptorTemplate](#getdescriptortemplate)
+*   [SingleKeyAccount](#singlekeyaccount)
+*   [getTaprootOutputKey](#gettaprootoutputkey)
+    *   [Parameters](#parameters-20)
 *   [AppClient](#appclient)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-21)
 *   [ClientCommandInterpreter](#clientcommandinterpreter)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-22)
 *   [MerkelizedPsbt](#merkelizedpsbt)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-23)
 *   [Merkle](#merkle)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-24)
 *   [MerkleMap](#merklemap)
-    *   [Parameters](#parameters-23)
+    *   [Parameters](#parameters-25)
 *   [WalletPolicy](#walletpolicy)
-    *   [Parameters](#parameters-24)
+    *   [Parameters](#parameters-26)
 *   [extract](#extract)
-    *   [Parameters](#parameters-25)
+    *   [Parameters](#parameters-27)
 *   [finalize](#finalize)
-    *   [Parameters](#parameters-26)
+    *   [Parameters](#parameters-28)
 *   [clearFinalizedInput](#clearfinalizedinput)
-    *   [Parameters](#parameters-27)
+    *   [Parameters](#parameters-29)
 *   [writePush](#writepush)
-    *   [Parameters](#parameters-28)
+    *   [Parameters](#parameters-30)
 *   [PsbtV2](#psbtv2)
 *   [serializeTransactionOutputs](#serializetransactionoutputs-1)
-    *   [Parameters](#parameters-29)
+    *   [Parameters](#parameters-31)
     *   [Examples](#examples-12)
 *   [SignP2SHTransactionArg](#signp2shtransactionarg)
     *   [Properties](#properties-1)
@@ -385,34 +392,6 @@ transaction is returned.
 
 Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** 
 
-### outputScriptOf
-
-Generates a single signature scriptPubKey (output script) from a public key.
-This is done differently depending on account type.
-
-If accountType is p2tr, the public key must be a 32 byte x-only taproot
-pubkey, otherwise it's expected to be a 33 byte ecdsa compressed pubkey.
-
-#### Parameters
-
-*   `pubkey` **[Buffer](https://nodejs.org/api/buffer.html)** 
-*   `accountType` **AccountType** 
-
-Returns **{script: [Buffer](https://nodejs.org/api/buffer.html), redeemScript: [Buffer](https://nodejs.org/api/buffer.html)?}** 
-
-### getTaprootOutputKey
-
-Calculates a taproot output key from an internal key. This output key will be
-used as witness program in a taproot output. The internal key is tweaked
-according to recommendation in BIP341:
-<https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#cite_ref-22-0>
-
-#### Parameters
-
-*   `internalPubkey` **[Buffer](https://nodejs.org/api/buffer.html)** A 32 byte x-only taproot internal key
-
-Returns **[Buffer](https://nodejs.org/api/buffer.html)** The output key
-
 ### BtcOld
 
 Bitcoin API.
@@ -567,6 +546,85 @@ address format is one of legacy | p2sh | bech32 | cashaddr
 
 Type: (`"legacy"` | `"p2sh"` | `"bech32"` | `"bech32m"` | `"cashaddr"`)
 
+### AccountType
+
+Encapsulates differences between account types, for example p2wpkh,
+p2wpkhWrapped, p2tr.
+
+#### spendingCondition
+
+Generates a scriptPubKey (output script) from a list of public keys. If a
+p2sh redeemScript or a p2wsh witnessScript is needed it will also be set on
+the returned SpendingCondition.
+
+The pubkeys are expected to be 33 byte ecdsa compressed pubkeys.
+
+##### Parameters
+
+*   `pubkeys` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Buffer](https://nodejs.org/api/buffer.html)>** 
+
+Returns **SpendingCondition** 
+
+#### setInput
+
+Populates the psbt with account type-specific data for an input.
+
+##### Parameters
+
+*   `i` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** The index of the input map to populate
+*   `inputTx` **([Buffer](https://nodejs.org/api/buffer.html) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))** The full transaction containing the spent output. This may
+    be omitted for taproot.
+*   `spentOutput` **SpentOutput** The amount and spending condition of the spent output
+*   `pubkeys` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Buffer](https://nodejs.org/api/buffer.html)>** The 33 byte ecdsa compressed public keys involved in the input
+*   `pathElems` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)>>** The paths corresponding to the pubkeys, in same order.
+
+Returns **void** 
+
+#### setOwnOutput
+
+Populates the psbt with account type-specific data for an output. This is typically
+done for change outputs and other outputs that goes to the same account as
+being spent from.
+
+##### Parameters
+
+*   `i` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** The index of the output map to populate
+*   `cond` **SpendingCondition** The spending condition for this output
+*   `pubkeys` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Buffer](https://nodejs.org/api/buffer.html)>** The 33 byte ecdsa compressed public keys involved in this output
+*   `paths` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)>>** The paths corresponding to the pubkeys, in same order.
+
+Returns **void** 
+
+#### getDescriptorTemplate
+
+Returns the descriptor template for this account type. Currently only
+DefaultDescriptorTemplates are allowed, but that might be changed in the
+future. See class WalletPolicy for more information on descriptor
+templates.
+
+Returns **DefaultDescriptorTemplate** 
+
+### SingleKeyAccount
+
+**Extends BaseAccount**
+
+Superclass for single signature accounts. This will make sure that the pubkey
+arrays and path arrays in the method arguments contains exactly one element
+and calls an abstract method to do the actual work.
+
+### getTaprootOutputKey
+
+Calculates a taproot output key from an internal key. This output key will be
+used as witness program in a taproot output. The internal key is tweaked
+according to recommendation in BIP341:
+<https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#cite_ref-22-0>
+
+#### Parameters
+
+*   `internalPubkey` **[Buffer](https://nodejs.org/api/buffer.html)** A 32 byte x-only taproot internal key
+
+Returns **[Buffer](https://nodejs.org/api/buffer.html)** The output key
+
 ### AppClient
 
 This class encapsulates the APDU protocol documented at

package/lib/Btc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Btc.d.ts","sourceRoot":"","sources":["../src/Btc.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AAEpD,OAAO,MAAyB,MAAM,UAAU,CAAC;AACjD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,aAAa,EAAE,CAAC;AAC9B;;;;;;GAMG;AAEH,MAAM,CAAC,OAAO,OAAO,GAAG;IACtB,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS,EAAE,WAAW,SAAQ;IAiBrD;;;;;;OAMG;IACH,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1E;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,kBAAkB,CAChB,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;IAmDF;;;;;;;;OAQG;IACH,cAAc,CACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;QACT,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAIF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,2BAA2B,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvE;;;;;;;;;;;;;;;;;;OAkBG;IACH,mBAAmB,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInE;;;;OAIG;IACH,gBAAgB,CACd,cAAc,EAAE,MAAM,EACtB,iBAAiB,GAAE,OAAO,GAAG,IAAI,GAAG,SAAiB,EACrD,YAAY,UAAQ,EACpB,YAAY,UAAQ,EACpB,WAAW,GAAE,KAAK,CAAC,MAAM,CAAM,GAC9B,WAAW;IAUd;;;;MAIE;IACF,2BAA2B,CAAC,CAAC,EAAE,WAAW,GAAG,MAAM;IAInD,eAAe,CACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,KAAK,CAAC,MAAM,CAAM,GAC9B,OAAO,CAAC,MAAM,CAAC;IASlB,qBAAqB,CACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,KAAK,CAAC,MAAM,CAAM,GAC9B,MAAM;IAUT,OAAO,CAAC,SAAS,CAAgC;YACnC,cAAc;YAQd,gBAAgB;IAU9B,SAAS,CAAC,GAAG,IAAI,MAAM;IAIvB,SAAS,CAAC,GAAG,IAAI,MAAM;CAGxB"}
+{"version":3,"file":"Btc.d.ts","sourceRoot":"","sources":["../src/Btc.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AAEpD,OAAO,MAAyB,MAAM,UAAU,CAAC;AACjD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,aAAa,EAAE,CAAC;AAC9B;;;;;;GAMG;AAEH,MAAM,CAAC,OAAO,OAAO,GAAG;IACtB,SAAS,EAAE,SAAS,CAAC;gBAET,SAAS,EAAE,SAAS,EAAE,WAAW,SAAQ;IAiBrD;;;;;;OAMG;IACH,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1E;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,kBAAkB,CAChB,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;IAiFF;;;;;;;;OAQG;IACH,cAAc,CACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;QACT,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAIF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,2BAA2B,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvE;;;;;;;;;;;;;;;;;;OAkBG;IACH,mBAAmB,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInE;;;;OAIG;IACH,gBAAgB,CACd,cAAc,EAAE,MAAM,EACtB,iBAAiB,GAAE,OAAO,GAAG,IAAI,GAAG,SAAiB,EACrD,YAAY,UAAQ,EACpB,YAAY,UAAQ,EACpB,WAAW,GAAE,KAAK,CAAC,MAAM,CAAM,GAC9B,WAAW;IAUd;;;;MAIE;IACF,2BAA2B,CAAC,CAAC,EAAE,WAAW,GAAG,MAAM;IAInD,eAAe,CACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,KAAK,CAAC,MAAM,CAAM,GAC9B,OAAO,CAAC,MAAM,CAAC;IASlB,qBAAqB,CACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,KAAK,CAAC,MAAM,CAAM,GAC9B,MAAM;IAUT,OAAO,CAAC,SAAS,CAAgC;YACnC,cAAc;YAQd,gBAAgB;IAU9B,SAAS,CAAC,GAAG,IAAI,MAAM;IAIvB,SAAS,CAAC,GAAG,IAAI,MAAM;CAGxB"}

package/lib/Btc.js

@@ -164,6 +164,7 @@ var Btc = /** @class */ (function () {
                 options.format != "bech32m" &&
                 (!options.verify || options.verify == false) &&
                 !isPathNormal(path)) {
+                console.warn("WARNING: Using deprecated device protocol to get the public key because\n        \n        * a non-standard path is requested, and\n        * verify flag is false\n        \n        The new protocol only allows export of non-standard paths if the \n        verify flag is true. Standard paths are (currently):\n\n        M/44'/(1|0)'/X'\n        M/49'/(1|0)'/X'\n        M/84'/(1|0)'/X'\n        M/86'/(1|0)'/X'\n        M/48'/(1|0)'/X'/Y'\n\n        followed by \"\", \"(0|1)\", or \"(0|1)/b\", where a and b are \n        non-hardened. For example, the following paths are standard\n        \n        M/48'/1'/99'/7'\n        M/86'/1'/99'/0\n        M/48'/0'/99'/7'/1/17\n\n        The following paths are non-standard\n\n        M/48'/0'/99'           // Not deepest hardened path\n        M/48'/0'/99'/7'/1/17/2 // Too many non-hardened derivation steps\n        M/199'/0'/1'/0/88      // Not a known purpose 199\n        M/86'/1'/99'/2         // Change path item must be 0 or 1\n\n        This compatibility safeguard will be removed in the future.\n        Please consider calling Btc.getWalletXpub() instead.");
                 return _this.old().getWalletPublicKey(path, options);
             }
             else {
@@ -325,14 +326,15 @@ function isPathNormal(path) {
     //path is not deepest hardened node of a standard path or deeper, use BtcOld
     var h = 0x80000000;
     var pathElems = (0, bip32_1.pathStringToArray)(path);
-    var hard = function (n) { return n > h; };
+    var hard = function (n) { return n >= h; };
     var soft = function (n) { return !n || n < h; };
+    var change = function (n) { return !n || n == 0 || n == 1; };
     if (pathElems.length >= 3 &&
         pathElems.length <= 5 &&
         [44 + h, 49 + h, 84 + h, 86 + h].some(function (v) { return v == pathElems[0]; }) &&
         [0 + h, 1 + h].some(function (v) { return v == pathElems[1]; }) &&
         hard(pathElems[2]) &&
-        soft(pathElems[3]) &&
+        change(pathElems[3]) &&
         soft(pathElems[4])) {
         return true;
     }
@@ -342,7 +344,7 @@ function isPathNormal(path) {
         [0 + h, 1 + h].some(function (v) { return v == pathElems[1]; }) &&
         hard(pathElems[2]) &&
         hard(pathElems[3]) &&
-        soft(pathElems[4]) &&
+        change(pathElems[4]) &&
         soft(pathElems[5])) {
         return true;
     }

package/lib/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/BtcNew.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BtcNew.d.ts","sourceRoot":"","sources":["../src/BtcNew.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,SAAS,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAUzD,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAKnE;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IACb,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,aAAa,CAAC,EAClB,IAAI,EACJ,WAAW,GACZ,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,MAAM,CAAC;IAYnB;;;;;;OAMG;IACG,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;IAyB9B;;;;;;;OAOG;IACG,2BAA2B,CAC/B,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,MAAM,CAAC;IA0HlB;;;;;;;OAOG;YACW,cAAc;IA2B5B;;;;OAIG;YACW,QAAQ;IA8DtB;;;;;;;;OAQG;YACW,QAAQ;CA6BvB"}
+{"version":3,"file":"BtcNew.d.ts","sourceRoot":"","sources":["../src/BtcNew.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS1D,OAAO,EAAE,SAAS,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAczD,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAKnE;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IACb,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,aAAa,CAAC,EAClB,IAAI,EACJ,WAAW,GACZ,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,MAAM,CAAC;IAYnB;;;;;;OAMG;IACG,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;IAyB9B;;;;;;;OAOG;IACG,2BAA2B,CAC/B,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,MAAM,CAAC;IAiHlB;;;;;;;OAOG;YACW,cAAc;IAsB5B;;;;OAIG;YACW,QAAQ;IAmDtB;;;;;;;;OAQG;YACW,QAAQ;CA6BvB"}

package/lib/BtcNew.js

@@ -1,15 +1,4 @@
 "use strict";
-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) {
@@ -56,8 +45,7 @@ var semver_1 = __importDefault(require("semver"));
 var tiny_secp256k1_1 = require("tiny-secp256k1");
 var bip32_1 = require("./bip32");
 var buffertools_1 = require("./buffertools");
-var constants_1 = require("./constants");
-var hashPublicKey_1 = require("./hashPublicKey");
+var accounttype_1 = require("./newops/accounttype");
 var policy_1 = require("./newops/policy");
 var psbtExtractor_1 = require("./newops/psbtExtractor");
 var psbtFinalizer_1 = require("./newops/psbtFinalizer");
@@ -155,7 +143,7 @@ var BtcNew = /** @class */ (function () {
                     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)];
+                        return [4 /*yield*/, this.getWalletAddress(pathElements, descrTemplFrom((_b = opts === null || opts === void 0 ? void 0 : opts.format) !== null && _b !== void 0 ? _b : "legacy"), display)];
                     case 2:
                         address = _c.sent();
                         components = (0, bip32_1.getXpubComponents)(xpub);
@@ -184,7 +172,7 @@ var BtcNew = /** @class */ (function () {
      * 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) {
+    BtcNew.prototype.getWalletAddress = function (pathElements, descrTempl, display) {
         return __awaiter(this, void 0, void 0, function () {
             var accountPath, accountXpub, masterFingerprint, policy, changeAndIndex;
             return __generator(this, function (_a) {
@@ -200,7 +188,7 @@ var BtcNew = /** @class */ (function () {
                         return [4 /*yield*/, this.client.getMasterFingerprint()];
                     case 2:
                         masterFingerprint = _a.sent();
-                        policy = new policy_1.WalletPolicy(accountType, (0, policy_1.createKey)(masterFingerprint, accountPath, accountXpub));
+                        policy = new policy_1.WalletPolicy(descrTempl, (0, policy_1.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)];
                 }
@@ -217,7 +205,7 @@ var BtcNew = /** @class */ (function () {
      */
     BtcNew.prototype.createPaymentTransactionNew = function (arg) {
         return __awaiter(this, void 0, void 0, function () {
-            var inputCount, psbt, accountType, notifyCount, progress, masterFp, accountXpub, accountPath, i, pathElems, outputsConcat, outputsBufferReader, outputCount, changeData, changeFound, i, amount, outputScript, isChange, changePath, pubkey, key, p, firstSigned, progressCallback, serializedTx;
+            var inputCount, psbt, masterFp, accountType, notifyCount, progress, accountXpub, accountPath, i, pathElems, outputsConcat, outputsBufferReader, outputCount, changeData, changeFound, i, amount, outputScript, isChange, changePath, pubkey, key, p, firstSigned, progressCallback, serializedTx;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -226,8 +214,11 @@ var BtcNew = /** @class */ (function () {
                             throw Error("No inputs");
                         }
                         psbt = new psbtv2_1.PsbtV2();
-                        accountType = accountTypeFromArg(arg);
-                        if (arg.lockTime) {
+                        return [4 /*yield*/, this.client.getMasterFingerprint()];
+                    case 1:
+                        masterFp = _a.sent();
+                        accountType = accountTypeFromArg(arg, psbt, masterFp);
+                        if (arg.lockTime != undefined) {
                             // The signer will assume locktime 0 if unset
                             psbt.setGlobalFallbackLocktime(arg.lockTime);
                         }
@@ -244,9 +235,6 @@ var BtcNew = /** @class */ (function () {
                                 progress: ++notifyCount / (2 * inputCount)
                             });
                         };
-                        return [4 /*yield*/, this.client.getMasterFingerprint()];
-                    case 1:
-                        masterFp = _a.sent();
                         accountXpub = "";
                         accountPath = [];
                         i = 0;
@@ -284,33 +272,20 @@ var BtcNew = /** @class */ (function () {
                             outputScript = outputsBufferReader.readVarSlice();
                             psbt.setOutputAmount(i, amount);
                             psbt.setOutputScript(i, outputScript);
-                            isChange = changeData && outputScript.equals(changeData === null || changeData === void 0 ? void 0 : changeData.script);
+                            isChange = changeData && outputScript.equals(changeData === null || changeData === void 0 ? void 0 : changeData.cond.scriptPubKey);
                             if (isChange) {
                                 changeFound = true;
                                 changePath = (0, bip32_1.pathStringToArray)(arg.changePath);
                                 pubkey = changeData.pubkey;
-                                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) {
-                                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                                    psbt.setOutputRedeemScript(i, changeData.redeemScript);
-                                    psbt.setOutputBip32Derivation(i, pubkey, masterFp, changePath);
-                                }
-                                else if (accountType == AccountType.p2tr) {
-                                    psbt.setOutputTapBip32Derivation(i, pubkey, [], masterFp, changePath);
-                                }
+                                accountType.setOwnOutput(i, changeData.cond, [pubkey], [changePath]);
                             }
                         }
                         if (!changeFound) {
                             throw new Error("Change script not found among outputs! " +
-                                (changeData === null || changeData === void 0 ? void 0 : changeData.script.toString("hex")));
+                                (changeData === null || changeData === void 0 ? void 0 : changeData.cond.scriptPubKey.toString("hex")));
                         }
                         key = (0, policy_1.createKey)(masterFp, accountPath, accountXpub);
-                        p = new policy_1.WalletPolicy(accountType, key);
+                        p = new policy_1.WalletPolicy(accountType.getDescriptorTemplate(), key);
                         // This is cheating, because it's not actually requested on the
                         // device yet, but it will be, soonish.
                         if (arg.onDeviceSignatureRequested)
@@ -343,7 +318,7 @@ var BtcNew = /** @class */ (function () {
      */
     BtcNew.prototype.outputScriptAt = function (accountPath, accountType, path) {
         return __awaiter(this, void 0, void 0, function () {
-            var pathElems, i, xpub, pubkey, script;
+            var pathElems, i, xpub, pubkey, cond;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -361,11 +336,8 @@ var BtcNew = /** @class */ (function () {
                     case 1:
                         xpub = _a.sent();
                         pubkey = (0, bip32_1.pubkeyFromXpub)(xpub);
-                        if (accountType == AccountType.p2tr) {
-                            pubkey = pubkey.slice(1);
-                        }
-                        script = outputScriptOf(pubkey, accountType);
-                        return [2 /*return*/, __assign(__assign({}, script), { pubkey: pubkey })];
+                        cond = accountType.spendingCondition([pubkey]);
+                        return [2 /*return*/, { cond: cond, pubkey: pubkey }];
                 }
             });
         });
@@ -377,18 +349,18 @@ var BtcNew = /** @class */ (function () {
      */
     BtcNew.prototype.setInput = function (psbt, i, input, pathElements, accountType, masterFP, sigHashType) {
         return __awaiter(this, void 0, void 0, function () {
-            var inputTx, spentOutputIndex, redeemScript, sequence, inputTxBuffer, inputTxid, xpubBase58, pubkey, spentOutput, xonly;
+            var inputTx, spentOutputIndex, redeemScript, sequence, inputTxBuffer, inputTxid, xpubBase58, pubkey, spentTxOutput, spendCondition, spentOutput;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         inputTx = input[0];
                         spentOutputIndex = input[1];
-                        redeemScript = input[2];
+                        redeemScript = input[2] ? Buffer.from(input[2], "hex") : undefined;
                         sequence = input[3];
-                        if (sequence) {
+                        if (sequence != undefined) {
                             psbt.setInputSequence(i, sequence);
                         }
-                        if (sigHashType) {
+                        if (sigHashType != undefined) {
                             psbt.setInputSighashType(i, sigHashType);
                         }
                         inputTxBuffer = (0, serializeTransaction_1.serializeTransaction)(inputTx, true);
@@ -399,33 +371,13 @@ var BtcNew = /** @class */ (function () {
                         pubkey = (0, bip32_1.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) {
-                                // At what point might a user set the redeemScript on its own?
-                                psbt.setInputRedeemScript(i, Buffer.from(redeemScript, "hex"));
-                            }
-                            else {
-                                psbt.setInputRedeemScript(i, createRedeemScript(pubkey));
-                            }
-                            psbt.setInputWitnessUtxo(i, spentOutput.amount, spentOutput.script);
-                        }
-                        else if (accountType == AccountType.p2tr) {
-                            xonly = pubkey.slice(1);
-                            psbt.setInputTapBip32Derivation(i, xonly, [], masterFP, pathElements);
-                            psbt.setInputWitnessUtxo(i, spentOutput.amount, spentOutput.script);
-                        }
+                        spentTxOutput = inputTx.outputs[spentOutputIndex];
+                        spendCondition = {
+                            scriptPubKey: spentTxOutput.script,
+                            redeemScript: redeemScript
+                        };
+                        spentOutput = { cond: spendCondition, amount: spentTxOutput.amount };
+                        accountType.setInput(i, inputTxBuffer, spentOutput, [pubkey], [pathElements]);
                         psbt.setInputPreviousTxId(i, inputTxid);
                         psbt.setInputOutputIndex(i, spentOutputIndex);
                         return [2 /*return*/];
@@ -476,105 +428,24 @@ var BtcNew = /** @class */ (function () {
     return BtcNew;
 }());
 exports["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 createRedeemScript(pubkey) {
-    var pubkeyHash = (0, hashPublicKey_1.hashPublicKey)(pubkey);
-    return Buffer.concat([Buffer.from("0014", "hex"), pubkeyHash]);
-}
-/**
- * Generates a single signature scriptPubKey (output script) from a public key.
- * This is done differently depending on account type.
- *
- * If accountType is p2tr, the public key must be a 32 byte x-only taproot
- * pubkey, otherwise it's expected to be a 33 byte ecdsa compressed pubkey.
- */
-function outputScriptOf(pubkey, accountType) {
-    var buf = new buffertools_1.BufferWriter();
-    var pubkeyHash = (0, hashPublicKey_1.hashPublicKey)(pubkey);
-    var redeemScript;
-    if (accountType == AccountType.p2pkh) {
-        buf.writeSlice(Buffer.of(constants_1.OP_DUP, constants_1.OP_HASH160, constants_1.HASH_SIZE));
-        buf.writeSlice(pubkeyHash);
-        buf.writeSlice(Buffer.of(constants_1.OP_EQUALVERIFY, constants_1.OP_CHECKSIG));
-    }
-    else if (accountType == AccountType.p2wpkhWrapped) {
-        redeemScript = createRedeemScript(pubkey);
-        var scriptHash = (0, hashPublicKey_1.hashPublicKey)(redeemScript);
-        buf.writeSlice(Buffer.of(constants_1.OP_HASH160, constants_1.HASH_SIZE));
-        buf.writeSlice(scriptHash);
-        buf.writeUInt8(constants_1.OP_EQUAL);
-    }
-    else if (accountType == AccountType.p2wpkh) {
-        buf.writeSlice(Buffer.of(0, constants_1.HASH_SIZE));
-        buf.writeSlice(pubkeyHash);
-    }
-    else if (accountType == AccountType.p2tr) {
-        var outputKey = getTaprootOutputKey(pubkey);
-        buf.writeSlice(Buffer.of(0x51, 32)); // push1, pubkeylen
-        buf.writeSlice(outputKey);
-    }
-    return { script: buf.buffer(), redeemScript: redeemScript };
-}
-function accountTypeFrom(addressFormat) {
+function descrTemplFrom(addressFormat) {
     if (addressFormat == "legacy")
-        return AccountType.p2pkh;
+        return "pkh(@0)";
     if (addressFormat == "p2sh")
-        return AccountType.p2wpkhWrapped;
+        return "sh(wpkh(@0))";
     if (addressFormat == "bech32")
-        return AccountType.p2wpkh;
+        return "wpkh(@0)";
     if (addressFormat == "bech32m")
-        return AccountType.p2tr;
+        return "tr(@0)";
     throw new Error("Unsupported address format " + addressFormat);
 }
-function accountTypeFromArg(arg) {
+function accountTypeFromArg(arg, psbt, masterFp) {
     if (arg.additionals.includes("bech32m"))
-        return AccountType.p2tr;
+        return new accounttype_1.p2tr(psbt, masterFp);
     if (arg.additionals.includes("bech32"))
-        return AccountType.p2wpkh;
+        return new accounttype_1.p2wpkh(psbt, masterFp);
     if (arg.segwit)
-        return AccountType.p2wpkhWrapped;
-    return AccountType.p2pkh;
-}
-/*
-The following two functions are copied from wallet-btc and adapted.
-They should be moved to a library to avoid code reuse.
-*/
-function hashTapTweak(x) {
-    // hash_tag(x) = SHA256(SHA256(tag) || SHA256(tag) || x), see BIP340
-    // See https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki#specification
-    var h = bitcoinjs_lib_1.crypto.sha256(Buffer.from("TapTweak", "utf-8"));
-    return bitcoinjs_lib_1.crypto.sha256(Buffer.concat([h, h, x]));
-}
-/**
- * Calculates a taproot output key from an internal key. This output key will be
- * used as witness program in a taproot output. The internal key is tweaked
- * according to recommendation in BIP341:
- * https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#cite_ref-22-0
- *
- * @param internalPubkey A 32 byte x-only taproot internal key
- * @returns The output key
- */
-function getTaprootOutputKey(internalPubkey) {
-    if (internalPubkey.length != 32) {
-        throw new Error("Expected 32 byte pubkey. Got " + internalPubkey.length);
-    }
-    // A BIP32 derived key can be converted to a schnorr pubkey by dropping
-    // the first byte, which represent the oddness/evenness. In schnorr all
-    // pubkeys are even.
-    // https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki#public-key-conversion
-    var evenEcdsaPubkey = Buffer.concat([Buffer.of(0x02), internalPubkey]);
-    var tweak = hashTapTweak(internalPubkey);
-    // Q = P + int(hash_TapTweak(bytes(P)))G
-    var outputEcdsaKey = Buffer.from((0, tiny_secp256k1_1.pointAddScalar)(evenEcdsaPubkey, tweak));
-    // Convert to schnorr.
-    var outputSchnorrKey = outputEcdsaKey.slice(1);
-    // Create address
-    return outputSchnorrKey;
+        return new accounttype_1.p2wpkhWrapped(psbt, masterFp);
+    return new accounttype_1.p2pkh(psbt, masterFp);
 }
 //# sourceMappingURL=BtcNew.js.map