Consistent capitalization of tapleaf

Author: reardencode

src/payments/p2tr.js

@@ -89,7 +89,7 @@ function p2tr(a, opts) {
       const controlBlock = w[w.length - 1];
       const leafVersion = controlBlock[0] & types_1.TAPLEAF_VERSION_MASK;
       const script = w[w.length - 2];
-      const leafHash = (0, taprootutils_1.tapLeafHash)({
+      const leafHash = (0, taprootutils_1.tapleafHash)({
         output: script,
         version: leafVersion,
       });
@@ -147,7 +147,7 @@ function p2tr(a, opts) {
     if (a.scriptTree && a.redeem && a.redeem.output && a.internalPubkey) {
       // todo: optimize/cache
       const hashTree = (0, taprootutils_1.toHashTree)(a.scriptTree);
-      const leafHash = (0, taprootutils_1.tapLeafHash)({
+      const leafHash = (0, taprootutils_1.tapleafHash)({
         output: a.redeem.output,
         version: o.redeemVersion,
       });
@@ -258,7 +258,7 @@ function p2tr(a, opts) {
           throw new TypeError('Invalid internalPubkey for p2tr witness');
         const leafVersion = controlBlock[0] & types_1.TAPLEAF_VERSION_MASK;
         const script = witness[witness.length - 2];
-        const leafHash = (0, taprootutils_1.tapLeafHash)({
+        const leafHash = (0, taprootutils_1.tapleafHash)({
           output: script,
           version: leafVersion,
         });

src/payments/taprootutils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Tapleaf, Taptree } from '../types';
 export declare const LEAF_VERSION_TAPSCRIPT = 192;
-export declare function rootHashFromPath(controlBlock: Buffer, tapLeafMsg: Buffer): Buffer;
+export declare function rootHashFromPath(controlBlock: Buffer, tapleafMsg: Buffer): Buffer;
 export interface HashTree {
     hash: Buffer;
     left?: HashTree;
@@ -23,5 +23,5 @@ export declare function toHashTree(scriptTree: Taptree): HashTree;
  * @returns - and array of hashes representing the path, or an empty array if no pat is found
  */
 export declare function findScriptPath(node: HashTree, hash: Buffer): Buffer[];
-export declare function tapLeafHash(leaf: Tapleaf): Buffer;
+export declare function tapleafHash(leaf: Tapleaf): Buffer;
 export declare function tapTweakHash(pubKey: Buffer, h: Buffer | undefined): Buffer;

src/payments/taprootutils.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.tapTweakHash = exports.tapLeafHash = exports.findScriptPath = exports.toHashTree = exports.rootHashFromPath = exports.LEAF_VERSION_TAPSCRIPT = void 0;
+exports.tapTweakHash = exports.tapleafHash = exports.findScriptPath = exports.toHashTree = exports.rootHashFromPath = exports.LEAF_VERSION_TAPSCRIPT = void 0;
 const buffer_1 = require('buffer');
 const bcrypto = require('../crypto');
 const bufferutils_1 = require('../bufferutils');
@@ -9,8 +9,8 @@ const TAP_LEAF_TAG = 'TapLeaf';
 const TAP_BRANCH_TAG = 'TapBranch';
 const TAP_TWEAK_TAG = 'TapTweak';
 exports.LEAF_VERSION_TAPSCRIPT = 0xc0;
-function rootHashFromPath(controlBlock, tapLeafMsg) {
-  const k = [tapLeafMsg];
+function rootHashFromPath(controlBlock, tapleafMsg) {
+  const k = [tapleafMsg];
   const e = [];
   const m = (controlBlock.length - 33) / 32;
   for (let j = 0; j < m; j++) {
@@ -34,7 +34,7 @@ exports.rootHashFromPath = rootHashFromPath;
  */
 function toHashTree(scriptTree) {
   if ((0, types_1.isTapleaf)(scriptTree))
-    return { hash: tapLeafHash(scriptTree) };
+    return { hash: tapleafHash(scriptTree) };
   const hashes = [toHashTree(scriptTree[0]), toHashTree(scriptTree[1])];
   hashes.sort((a, b) => a.hash.compare(b.hash));
   const [left, right] = hashes;
@@ -67,7 +67,7 @@ function findScriptPath(node, hash) {
   return [];
 }
 exports.findScriptPath = findScriptPath;
-function tapLeafHash(leaf) {
+function tapleafHash(leaf) {
   const version = leaf.version || exports.LEAF_VERSION_TAPSCRIPT;
   return bcrypto.taggedHash(
     TAP_LEAF_TAG,
@@ -77,7 +77,7 @@ function tapLeafHash(leaf) {
     ]),
   );
 }
-exports.tapLeafHash = tapLeafHash;
+exports.tapleafHash = tapleafHash;
 function tapTweakHash(pubKey, h) {
   return bcrypto.taggedHash(
     TAP_TWEAK_TAG,

src/psbt.js

@@ -1079,7 +1079,7 @@ function getHashForSig(
     const signingScripts = prevOuts.map(o => o.script);
     const values = prevOuts.map(o => o.value);
     const leafHash = input.witnessScript
-      ? (0, taprootutils_1.tapLeafHash)({ output: input.witnessScript })
+      ? (0, taprootutils_1.tapleafHash)({ output: input.witnessScript })
       : undefined;
     hash = unsignedTx.hashForWitnessV1(
       inputIndex,

ts_src/payments/p2tr.ts

@@ -11,7 +11,7 @@ import {
   toHashTree,
   rootHashFromPath,
   findScriptPath,
-  tapLeafHash,
+  tapleafHash,
   tapTweakHash,
   LEAF_VERSION_TAPSCRIPT,
 } from './taprootutils';
@@ -107,7 +107,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
       const controlBlock = w[w.length - 1];
       const leafVersion = controlBlock[0] & TAPLEAF_VERSION_MASK;
       const script = w[w.length - 2];
-      const leafHash = tapLeafHash({ output: script, version: leafVersion });
+      const leafHash = tapleafHash({ output: script, version: leafVersion });
       return rootHashFromPath(controlBlock, leafHash);
     }
     return null;
@@ -164,7 +164,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
     if (a.scriptTree && a.redeem && a.redeem.output && a.internalPubkey) {
       // todo: optimize/cache
       const hashTree = toHashTree(a.scriptTree);
-      const leafHash = tapLeafHash({
+      const leafHash = tapleafHash({
         output: a.redeem.output,
         version: o.redeemVersion,
       });
@@ -292,7 +292,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
         const leafVersion = controlBlock[0] & TAPLEAF_VERSION_MASK;
         const script = witness[witness.length - 2];
 
-        const leafHash = tapLeafHash({ output: script, version: leafVersion });
+        const leafHash = tapleafHash({ output: script, version: leafVersion });
         const hash = rootHashFromPath(controlBlock, leafHash);
 
         const outputKey = tweakKey(internalPubkey, hash, _ecc());

ts_src/payments/taprootutils.ts

@@ -12,9 +12,9 @@ export const LEAF_VERSION_TAPSCRIPT = 0xc0;
 
 export function rootHashFromPath(
   controlBlock: Buffer,
-  tapLeafMsg: Buffer,
+  tapleafMsg: Buffer,
 ): Buffer {
-  const k = [tapLeafMsg];
+  const k = [tapleafMsg];
   const e = [];
 
   const m = (controlBlock.length - 33) / 32;
@@ -46,7 +46,7 @@ export interface HashTree {
  *  - one taproot leaf and a list of elements
  */
 export function toHashTree(scriptTree: Taptree): HashTree {
-  if (isTapleaf(scriptTree)) return { hash: tapLeafHash(scriptTree) };
+  if (isTapleaf(scriptTree)) return { hash: tapleafHash(scriptTree) };
 
   const hashes = [toHashTree(scriptTree[0]), toHashTree(scriptTree[1])];
   hashes.sort((a, b) => a.hash.compare(b.hash));
@@ -83,7 +83,7 @@ export function findScriptPath(node: HashTree, hash: Buffer): Buffer[] {
   return [];
 }
 
-export function tapLeafHash(leaf: Tapleaf): Buffer {
+export function tapleafHash(leaf: Tapleaf): Buffer {
   const version = leaf.version || LEAF_VERSION_TAPSCRIPT;
   return bcrypto.taggedHash(
     TAP_LEAF_TAG,

ts_src/psbt.ts

@@ -21,7 +21,7 @@ import { bitcoin as btcNetwork, Network } from './networks';
 import * as payments from './payments';
 import * as bscript from './script';
 import { Output, Transaction } from './transaction';
-import { tapLeafHash } from './payments/taprootutils';
+import { tapleafHash } from './payments/taprootutils';
 import { TinySecp256k1Interface } from './types';
 
 export interface TransactionInput {
@@ -1406,7 +1406,7 @@ function getHashForSig(
     const signingScripts: any = prevOuts.map(o => o.script);
     const values: any = prevOuts.map(o => o.value);
     const leafHash = input.witnessScript
-      ? tapLeafHash({ output: input.witnessScript })
+      ? tapleafHash({ output: input.witnessScript })
       : undefined;
 
     hash = unsignedTx.hashForWitnessV1(