Add validation for redeem in scriptTree

Author: reardencode

src/payments/p2tr.js

@@ -207,9 +207,17 @@ function p2tr(a, opts) {
       if (!_ecc().isXOnlyPoint(pubkey))
         throw new TypeError('Invalid pubkey for p2tr');
     }
-    if (a.hash && a.scriptTree) {
-      const hash = _hashTree().hash;
-      if (!a.hash.equals(hash)) throw new TypeError('Hash mismatch');
+    const hashTree = _hashTree();
+    if (a.hash && hashTree) {
+      if (!a.hash.equals(hashTree.hash)) throw new TypeError('Hash mismatch');
+    }
+    if (a.redeem && a.redeem.output && hashTree) {
+      const leafHash = (0, taprootutils_1.tapleafHash)({
+        output: a.redeem.output,
+        version: o.redeemVersion,
+      });
+      if (!(0, taprootutils_1.findScriptPath)(hashTree, leafHash))
+        throw new TypeError('Redeem script not in tree');
     }
     const witness = _witness();
     // compare the provided redeem data with the one computed from witness

test/fixtures/p2tr.json

@@ -1175,6 +1175,20 @@
           ]
         }
       }
+    },
+    {
+      "description": "Redeem script not in tree",
+      "exception": "Redeem script not in tree",
+      "options": {},
+      "arguments": {
+        "internalPubkey": "9fa5ffb68821cf559001caa0577eeea4978b29416def328a707b15e91701a2f7",
+        "scriptTree": {
+          "output": "83d8ee77a0f3a32a5cea96fd1624d623b836c1e5d1ac2dcde46814b619320c18 OP_CHECKSIG"
+        },
+        "redeem": {
+          "output": "83d8ee77a0f3a32a5cea96fd1624d623b836c1e5d1ac2dcde46814b619320c19 OP_CHECKSIG"
+        }
+      }
     }
   ],
   "dynamic": {

ts_src/payments/p2tr.ts

@@ -231,9 +231,19 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
         throw new TypeError('Invalid pubkey for p2tr');
     }
 
-    if (a.hash && a.scriptTree) {
-      const hash = _hashTree()!.hash;
-      if (!a.hash.equals(hash)) throw new TypeError('Hash mismatch');
+    const hashTree = _hashTree();
+
+    if (a.hash && hashTree) {
+      if (!a.hash.equals(hashTree.hash)) throw new TypeError('Hash mismatch');
+    }
+
+    if (a.redeem && a.redeem.output && hashTree) {
+      const leafHash = tapleafHash({
+        output: a.redeem.output,
+        version: o.redeemVersion,
+      });
+      if (!findScriptPath(hashTree, leafHash))
+        throw new TypeError('Redeem script not in tree');
     }
 
     const witness = _witness();