chore: lint & format; fix: discovered bug in findScriptPath() after lint

Author: motorina0

src/payments/p2tr.js

@@ -120,6 +120,7 @@ function p2tr(a, opts) {
   lazy.prop(o, 'witness', () => {
     if (a.witness) return a.witness;
     if (a.scriptsTree && a.scriptLeaf && a.internalPubkey) {
+      // todo: optimize/cache
       const hashTree = (0, taproot_1.toHashTree)(a.scriptsTree);
       const leafHash = (0, taproot_1.tapLeafHash)(
         a.scriptLeaf.output,

src/taproot.js

@@ -116,9 +116,8 @@ function findScriptPath(node, hash) {
   if (node.right) {
     if (node.right.hash.equals(hash)) return node.left ? [node.left.hash] : [];
     const rightPath = findScriptPath(node.right, hash);
-    if (rightPath.length) {
-    }
-    return node.left ? [node.left.hash].concat(rightPath) : rightPath;
+    if (rightPath.length)
+      return node.left ? [node.left.hash].concat(rightPath) : rightPath;
   }
   return [];
 }

test/fixtures/p2tr.json

@@ -470,7 +470,7 @@
       "arguments": {
         "internalPubkey": "ee4fe085983462a184015d1f782d6a5f8b9c2b60130aff050ce221ecf3786592",
         "scriptLeaf": {
-          "output": "424950333431 OP_CHECKSIG",
+          "output": "424950333431",
           "version": 152
         },
         "scriptsTree": [
@@ -492,7 +492,7 @@
         "address": "bc1ppa3u5trk8xumkjlqgewvp237u79qwcd6ta0h6mlca2e5puya54ssw9zq0y",
         "hash": "f3004d6c183e038105d436db1424f321613366cbb7b05939bf05d763a9ebb962",
         "witness": [
-          "06424950333431ac",
+          "06424950333431",
           "98ee4fe085983462a184015d1f782d6a5f8b9c2b60130aff050ce221ecf37865928ad69ec7cf41c2a4001fd1f738bf1e505ce2277acdcaa63fe4765192497f47a7"
         ],
         "signature": null,

ts_src/payments/p2tr.ts

@@ -44,7 +44,6 @@ 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 ?
       scriptLeaf: typef.maybe({
         version: typef.maybe(typef.Number),
@@ -134,14 +133,18 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
     if (a.witness) return a.witness;
     if (a.scriptsTree && a.scriptLeaf && a.internalPubkey) {
       // todo: optimize/cache
-      const hashTree = toHashTree(a.scriptsTree)
-      const leafHash = tapLeafHash(a.scriptLeaf.output, a.scriptLeaf.version)
-      const path = findScriptPath(hashTree, leafHash)
+      const hashTree = toHashTree(a.scriptsTree);
+      const leafHash = tapLeafHash(a.scriptLeaf.output, a.scriptLeaf.version);
+      const path = findScriptPath(hashTree, leafHash);
       const outputKey = tweakKey(a.internalPubkey, hashTree.hash);
-      if (!outputKey) return
-      const version = a.scriptLeaf.version || 0xc0
-      const controlBock = NBuffer.concat([NBuffer.from([version | outputKey.parity]), a.internalPubkey].concat(path.reverse()))
-      return [a.scriptLeaf.output, controlBock]
+      if (!outputKey) return;
+      const version = a.scriptLeaf.version || 0xc0;
+      const controlBock = NBuffer.concat(
+        [NBuffer.from([version | outputKey.parity]), a.internalPubkey].concat(
+          path.reverse(),
+        ),
+      );
+      return [a.scriptLeaf.output, controlBock];
     }
     if (a.signature) return [a.signature];
   });
@@ -211,7 +214,8 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
         const controlBlock = witness[witness.length - 1];
         if (controlBlock.length < 33)
           throw new TypeError(
-            `The control-block length is too small. Got ${controlBlock.length
+            `The control-block length is too small. Got ${
+              controlBlock.length
             }, expected min 33.`,
           );
 

ts_src/taproot.ts

@@ -4,7 +4,13 @@ const BN = require('bn.js');
 import * as bcrypto from './crypto';
 // todo: use varuint-bitcoin??
 import * as varuint from 'bip174/src/lib/converter/varint';
-import { TweakedPublicKey, TaprootLeaf, ZERO32, EC_P, GROUP_ORDER } from './types';
+import {
+  TweakedPublicKey,
+  TaprootLeaf,
+  ZERO32,
+  EC_P,
+  GROUP_ORDER,
+} from './types';
 
 // todo: !!!Temp, to be replaced. Only works because bip32 has it as dependecy. Linting will fail.
 const ecc = require('tiny-secp256k1');
@@ -78,7 +84,10 @@ export function tweakKey(
   };
 }
 
-export function rootHashFromPath(controlBlock: Buffer, tapLeafMsg: Buffer): Buffer {
+export function rootHashFromPath(
+  controlBlock: Buffer,
+  tapLeafMsg: Buffer,
+): Buffer {
   const k = [tapLeafMsg];
   const e = [];
 
@@ -97,25 +106,24 @@ export function rootHashFromPath(controlBlock: Buffer, tapLeafMsg: Buffer): Buff
 }
 
 export interface HashTree {
-  hash: Buffer
-  left?: HashTree
-  right?: HashTree
+  hash: Buffer;
+  left?: HashTree;
+  right?: HashTree;
 }
 
-
 export function toHashTree(scripts: TaprootLeaf[]): HashTree {
   if (scripts.length === 1) {
     const script = scripts[0];
     if (Array.isArray(script)) {
       return toHashTree(script);
     }
     script.version = script.version || LEAF_VERSION_TAPSCRIPT;
-    if ((script.version & 1) !== 0) throw new TypeError('Invalid script version');
+    if ((script.version & 1) !== 0)
+      throw new TypeError('Invalid script version');
 
     return {
-      hash: tapLeafHash(script.output, script.version)
-    }
-
+      hash: tapLeafHash(script.output, script.version),
+    };
   }
   // todo: this is a binary tree, use zero an one index
   const half = Math.trunc(scripts.length / 2);
@@ -130,38 +138,38 @@ export function toHashTree(scripts: TaprootLeaf[]): HashTree {
   return {
     hash: tapBranchHash(leftHash, rightHash),
     left,
-    right
-  }
+    right,
+  };
 }
 
 export function findScriptPath(node: HashTree, hash: Buffer): Buffer[] {
   if (node.left) {
-    if (node.left.hash.equals(hash))
-      return node.right ? [node.right.hash] : []
-    const leftPath = findScriptPath(node.left, hash)
+    if (node.left.hash.equals(hash)) return node.right ? [node.right.hash] : [];
+    const leftPath = findScriptPath(node.left, hash);
     if (leftPath.length)
-      return node.right ? [node.right.hash].concat(leftPath) : leftPath
+      return node.right ? [node.right.hash].concat(leftPath) : leftPath;
   }
 
   if (node.right) {
-    if (node.right.hash.equals(hash))
-      return node.left ? [node.left.hash] : []
-    const rightPath = findScriptPath(node.right, hash)
-    if (rightPath.length) {}
-      return node.left ? [node.left.hash].concat(rightPath) : rightPath
+    if (node.right.hash.equals(hash)) return node.left ? [node.left.hash] : [];
+    const rightPath = findScriptPath(node.right, hash);
+    if (rightPath.length)
+      return node.left ? [node.left.hash].concat(rightPath) : rightPath;
   }
 
-  return []
-
+  return [];
 }
 
 export function tapLeafHash(script: Buffer, version?: number): Buffer {
-  version = version || LEAF_VERSION_TAPSCRIPT
-  return bcrypto.taggedHash(TAP_LEAF_TAG, NBuffer.concat([NBuffer.from([version]), serializeScript(script)]));
+  version = version || LEAF_VERSION_TAPSCRIPT;
+  return bcrypto.taggedHash(
+    TAP_LEAF_TAG,
+    NBuffer.concat([NBuffer.from([version]), serializeScript(script)]),
+  );
 }
 
 function tapBranchHash(a: Buffer, b: Buffer): Buffer {
-  return bcrypto.taggedHash(TAP_BRANCH_TAG, NBuffer.concat([a, b]),);
+  return bcrypto.taggedHash(TAP_BRANCH_TAG, NBuffer.concat([a, b]));
 }
 
 function serializeScript(s: Buffer): Buffer {