feat: compute p2tr hash based on the script tree

Author: motorina0

src/payments/p2tr.js

@@ -4,6 +4,7 @@ exports.p2tr = void 0;
 const networks_1 = require('../networks');
 const bscript = require('../script');
 const types_1 = require('../types');
+const merkle_1 = require('../merkle');
 const lazy = require('./lazy');
 const bech32_1 = require('bech32');
 const OPS = bscript.OPS;
@@ -28,6 +29,7 @@ function p2tr(a, opts) {
       witness: types_1.typeforce.maybe(
         types_1.typeforce.arrayOf(types_1.typeforce.Buffer),
       ),
+      // scriptsTree: typef.maybe(typef.TaprootNode), // use merkel.isMast ?
     },
     a,
   );
@@ -52,7 +54,7 @@ function p2tr(a, opts) {
   });
   lazy.prop(o, 'hash', () => {
     if (a.hash) return a.hash;
-    // todo: if (a.redeems?.length) compute from MAST root from redeems
+    if (a.scriptsTree) return (0, merkle_1.computeMastRoot)(a.scriptsTree);
     return null;
   });
   lazy.prop(o, 'output', () => {

ts_src/payments/p2tr.ts

@@ -1,6 +1,7 @@
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
 import * as bscript from '../script';
 import { liftX, tweakPublicKey, typeforce as typef } from '../types';
+import { computeMastRoot } from '../merkle';
 import { Payment, PaymentOpts } from './index';
 import * as lazy from './lazy';
 import { bech32m } from 'bech32';
@@ -27,6 +28,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
       pubkey: typef.maybe(typef.BufferN(32)),
       signature: typef.maybe(bscript.isCanonicalScriptSignature),
       witness: typef.maybe(typef.arrayOf(typef.Buffer)),
+      // scriptsTree: typef.maybe(typef.TaprootNode), // use merkel.isMast ?
     },
     a,
   );
@@ -58,7 +60,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
 
   lazy.prop(o, 'hash', () => {
     if (a.hash) return a.hash;
-    // todo: if (a.redeems?.length) compute from MAST root from redeems
+    if (a.scriptsTree) return computeMastRoot(a.scriptsTree)
     return null
   });
   lazy.prop(o, 'output', () => {