chore: code clean-up; fix o.scriptLeaf (needs tests)

Author: motorina0

src/payments/p2tr.js

@@ -11,9 +11,6 @@ const bech32_1 = require('bech32');
 const OPS = bscript.OPS;
 const TAPROOT_VERSION = 0x01;
 const ANNEX_PREFIX = 0x50;
-// witness: {signature}
-// input: <>
-// output: OP_1 {pubKey}
 function p2tr(a, opts) {
   if (
     !a.address &&
@@ -93,7 +90,7 @@ function p2tr(a, opts) {
     return bscript.compile([OPS.OP_1, o.pubkey]);
   });
   lazy.prop(o, 'scriptLeaf', () => {
-    if (!a.scriptLeaf) return a.scriptLeaf;
+    if (a.scriptLeaf) return a.scriptLeaf;
   });
   lazy.prop(o, 'pubkey', () => {
     if (a.pubkey) return a.pubkey;

ts_src/payments/index.ts

@@ -12,18 +12,18 @@ import { p2tr } from './p2tr';
 export interface Payment {
   name?: string;
   network?: Network;
-  output?: Buffer; // the full scriptPubKey
+  output?: Buffer;
   data?: Buffer[];
   m?: number;
   n?: number;
   pubkeys?: Buffer[];
   input?: Buffer;
   signatures?: Buffer[];
-  internalPubkey?: Buffer; // taproot: output key
-  pubkey?: Buffer; // taproot: output key
+  internalPubkey?: Buffer;
+  pubkey?: Buffer;
   signature?: Buffer;
-  address?: string; // taproot: betch32m
-  hash?: Buffer; // taproot: MAST root
+  address?: string;
+  hash?: Buffer;
   redeem?: Payment;
   scriptsTree?: any; // todo: solve
   scriptLeaf?: TaprootLeaf;

ts_src/payments/p2tr.ts

@@ -18,9 +18,6 @@ const OPS = bscript.OPS;
 const TAPROOT_VERSION = 0x01;
 const ANNEX_PREFIX = 0x50;
 
-// witness: {signature}
-// input: <>
-// output: OP_1 {pubKey}
 export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
   if (
     !a.address &&
@@ -105,7 +102,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
     return bscript.compile([OPS.OP_1, o.pubkey]);
   });
   lazy.prop(o, 'scriptLeaf', () => {
-    if (!a.scriptLeaf) return a.scriptLeaf;
+    if (a.scriptLeaf) return a.scriptLeaf;
   });
   lazy.prop(o, 'pubkey', () => {
     if (a.pubkey) return a.pubkey;