refactor: move taproot utils file

Author: motorina0

src/payments/p2tr.js

@@ -5,7 +5,7 @@ const buffer_1 = require('buffer');
 const networks_1 = require('../networks');
 const bscript = require('../script');
 const types_1 = require('../types');
-const taproot_1 = require('../taproot');
+const taprootutils_1 = require('./taprootutils');
 const lazy = require('./lazy');
 const bech32_1 = require('bech32');
 const OPS = bscript.OPS;
@@ -75,14 +75,15 @@ function p2tr(ecc) {
     });
     lazy.prop(o, 'hash', () => {
       if (a.hash) return a.hash;
-      if (a.scriptsTree) return (0, taproot_1.toHashTree)(a.scriptsTree).hash;
+      if (a.scriptsTree)
+        return (0, taprootutils_1.toHashTree)(a.scriptsTree).hash;
       const w = _witness();
       if (w && w.length > 1) {
         const controlBlock = w[w.length - 1];
         const leafVersion = controlBlock[0] & 0b11111110;
         const script = w[w.length - 2];
-        const leafHash = (0, taproot_1.tapLeafHash)(script, leafVersion);
-        return (0, taproot_1.rootHashFromPath)(controlBlock, leafHash);
+        const leafHash = (0, taprootutils_1.tapLeafHash)(script, leafVersion);
+        return (0, taprootutils_1.rootHashFromPath)(controlBlock, leafHash);
       }
       return null;
     });
@@ -119,12 +120,12 @@ function p2tr(ecc) {
       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)(
+        const hashTree = (0, taprootutils_1.toHashTree)(a.scriptsTree);
+        const leafHash = (0, taprootutils_1.tapLeafHash)(
           a.scriptLeaf.output,
           a.scriptLeaf.version,
         );
-        const path = (0, taproot_1.findScriptPath)(hashTree, leafHash);
+        const path = (0, taprootutils_1.findScriptPath)(hashTree, leafHash);
         const outputKey = tweakKey(a.internalPubkey, hashTree.hash);
         if (!outputKey) return;
         const version = a.scriptLeaf.version || 0xc0;
@@ -177,7 +178,7 @@ function p2tr(ecc) {
           throw new TypeError('Invalid pubkey for p2tr');
       }
       if (a.hash && a.scriptsTree) {
-        const hash = (0, taproot_1.toHashTree)(a.scriptsTree).hash;
+        const hash = (0, taprootutils_1.toHashTree)(a.scriptsTree).hash;
         if (!a.hash.equals(hash)) throw new TypeError('Hash mismatch');
       }
       const witness = _witness();
@@ -216,8 +217,11 @@ function p2tr(ecc) {
             throw new TypeError('Invalid internalPubkey for p2tr witness');
           const leafVersion = controlBlock[0] & 0b11111110;
           const script = witness[witness.length - 2];
-          const leafHash = (0, taproot_1.tapLeafHash)(script, leafVersion);
-          const hash = (0, taproot_1.rootHashFromPath)(controlBlock, leafHash);
+          const leafHash = (0, taprootutils_1.tapLeafHash)(script, leafVersion);
+          const hash = (0, taprootutils_1.rootHashFromPath)(
+            controlBlock,
+            leafHash,
+          );
           const outputKey = tweakKey(internalPubkey, hash);
           if (!outputKey)
             // todo: needs test data
@@ -235,7 +239,7 @@ function p2tr(ecc) {
     if (!buffer_1.Buffer.isBuffer(pubKey)) return null;
     if (pubKey.length !== 32) return null;
     if (h && h.length !== 32) return null;
-    const tweakHash = (0, taproot_1.tapTweakHash)(pubKey, h);
+    const tweakHash = (0, taprootutils_1.tapTweakHash)(pubKey, h);
     const res = ecc.xOnlyPointAddTweak(pubKey, tweakHash);
     if (!res || res.xOnlyPubkey === null) return null;
     return {

src/taproot.d.ts src/payments/taprootutils.d.tssrc/taproot.d.ts renamed to src/payments/taprootutils.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { TaprootLeaf } from './types';
+import { TaprootLeaf } from '../types';
 export declare function rootHashFromPath(controlBlock: Buffer, tapLeafMsg: Buffer): Buffer;
 export interface HashTree {
     hash: Buffer;

src/taproot.js src/payments/taprootutils.jssrc/taproot.js renamed to src/payments/taprootutils.js

@@ -2,11 +2,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.tapTweakHash = exports.tapLeafHash = exports.findScriptPath = exports.toHashTree = exports.rootHashFromPath = void 0;
 const buffer_1 = require('buffer');
-const bcrypto = require('./crypto');
-// todo: use varuint-bitcoin??
-const varuint = require('bip174/src/lib/converter/varint');
-// todo: !!!Temp, to be replaced. Only works because bip32 has it as dependecy. Linting will fail.
-// const ecc = require('tiny-secp256k1');
+const bcrypto = require('../crypto');
+const bufferutils_1 = require('../bufferutils');
 const LEAF_VERSION_TAPSCRIPT = 0xc0;
 const TAP_LEAF_TAG = 'TapLeaf';
 const TAP_BRANCH_TAG = 'TapBranch';
@@ -92,8 +89,8 @@ function tapTweakHash(pubKey, h) {
 }
 exports.tapTweakHash = tapTweakHash;
 function serializeScript(s) {
-  const varintLen = varuint.encodingLength(s.length);
+  const varintLen = bufferutils_1.varuint.encodingLength(s.length);
   const buffer = buffer_1.Buffer.allocUnsafe(varintLen); // better
-  varuint.encode(s.length, buffer);
+  bufferutils_1.varuint.encode(s.length, buffer);
   return buffer_1.Buffer.concat([buffer, s]);
 }

ts_src/payments/p2tr.ts

@@ -8,12 +8,12 @@ import {
   findScriptPath,
   tapLeafHash,
   tapTweakHash,
-} from '../taproot';
+} from './taprootutils';
 import { Payment, PaymentOpts, PaymentCreator } from './index';
 import * as lazy from './lazy';
 import { bech32m } from 'bech32';
-const OPS = bscript.OPS;
 
+const OPS = bscript.OPS;
 const TAPROOT_VERSION = 0x01;
 const ANNEX_PREFIX = 0x50;
 

ts_src/taproot.ts ts_src/payments/taprootutils.tsts_src/taproot.ts renamed to ts_src/payments/taprootutils.ts

@@ -1,12 +1,8 @@
 import { Buffer as NBuffer } from 'buffer';
-import * as bcrypto from './crypto';
+import * as bcrypto from '../crypto';
 
-// todo: use varuint-bitcoin??
-import * as varuint from 'bip174/src/lib/converter/varint';
-import { TaprootLeaf } from './types';
-
-// todo: !!!Temp, to be replaced. Only works because bip32 has it as dependecy. Linting will fail.
-// const ecc = require('tiny-secp256k1');
+import { varuint } from '../bufferutils';
+import { TaprootLeaf } from '../types';
 
 const LEAF_VERSION_TAPSCRIPT = 0xc0;
 const TAP_LEAF_TAG = 'TapLeaf';