@bitcoinerlab/descriptors 2.3.5 → 2.3.6

package/dist/applyPR2137.js

@@ -55,6 +55,16 @@ function getTweakSignersFromHD(inputIndex, inputs, hdKeyPair) {
         if (!bipDv.pubkey.equals(toXOnly(node.publicKey))) {
             throw new Error('pubkey did not match tapBip32Derivation');
         }
+        //FIX BITCOINERLAB:
+        //The 3 lines below detect script-path spends and disable key-path tweaking.
+        //Reasoning:
+        //- In Taproot, key-path spends require tweaking the internal key.
+        //- Script-path spends MUST NOT tweak the key; signatures use the raw internal key.
+        const input = inputs[inputIndex];
+        if (!input)
+            throw new Error('could not find the input');
+        if (input.tapLeafScript && input.tapLeafScript.length > 0)
+            return node;
         const h = calculateScriptTreeMerkleRoot(bipDv.leafHashes);
         const tweakValue = (0, bip341_1.tapTweakHash)(toXOnly(node.publicKey), h);
         return node.tweak(tweakValue);

package/dist/signers.js

@@ -34,15 +34,20 @@ function range(n) {
  */
 function signInputECPair({ psbt, index, ecpair }) {
     //psbt.signInput(index, ecpair); <- Replaced for the code below
-    //that can handle taroot inputs automatically.
+    //that can handle taproot inputs automatically.
     //See https://github.com/bitcoinjs/bitcoinjs-lib/pull/2137#issuecomment-2713264848
     const input = psbt.data.inputs[index];
     if (!input)
         throw new Error('Invalid index');
     if ((0, bip371_1.isTaprootInput)(input)) {
-        const hash = (0, bip341_1.tapTweakHash)(Buffer.from(ecpair.publicKey.slice(1, 33)), undefined);
-        const tweakedEcpair = ecpair.tweak(hash);
-        psbt.signInput(index, tweakedEcpair);
+        // If script-path (tapLeafScript present) -> DO NOT TWEAK
+        if (input.tapLeafScript && input.tapLeafScript.length > 0)
+            psbt.signInput(index, ecpair);
+        else {
+            const hash = (0, bip341_1.tapTweakHash)(Buffer.from(ecpair.publicKey.slice(1, 33)), undefined);
+            const tweakedEcpair = ecpair.tweak(hash);
+            psbt.signInput(index, tweakedEcpair);
+        }
     }
     else
         psbt.signInput(index, ecpair);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bitcoinerlab/descriptors",
   "description": "This library parses and creates Bitcoin Miniscript Descriptors and generates Partially Signed Bitcoin Transactions (PSBTs). It provides PSBT finalizers and signers for single-signature, BIP32 and Hardware Wallets.",
   "homepage": "https://github.com/bitcoinerlab/descriptors",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "author": "Jose-Luis Landabaso",
   "license": "MIT",
   "repository": {