@btc-vision/bitcoin 6.4.10 → 6.5.1

package/src/payments/bip341.ts

@@ -1,140 +1,140 @@
-import { Buffer as NBuffer } from 'buffer';
-import * as bcrypto from '../crypto.js';
-import { getEccLib } from '../ecc_lib.js';
-
-import { varuint } from '../bufferutils.js';
-import { isTapleaf, Tapleaf, Taptree } from '../types.js';
-
-export const LEAF_VERSION_TAPSCRIPT = 0xc0;
-export const MAX_TAPTREE_DEPTH = 128;
-
-interface HashLeaf {
-    hash: Buffer;
-}
-
-interface HashBranch {
-    hash: Buffer;
-    left: HashTree;
-    right: HashTree;
-}
-
-interface TweakedPublicKey {
-    parity: number;
-    x: Buffer;
-}
-
-const isHashBranch = (ht: HashTree): ht is HashBranch => 'left' in ht && 'right' in ht;
-
-/**
- * Binary tree representing leaf, branch, and root node hashes of a Taptree.
- * Each node contains a hash, and potentially left and right branch hashes.
- * This tree is used for 2 purposes: Providing the root hash for tweaking,
- * and calculating merkle inclusion proofs when constructing a control block.
- */
-export type HashTree = HashLeaf | HashBranch;
-
-/**
- * Calculates the root hash from a given control block and leaf hash.
- * @param controlBlock - The control block buffer.
- * @param leafHash - The leaf hash buffer.
- * @returns The root hash buffer.
- * @throws {TypeError} If the control block length is less than 33.
- */
-export function rootHashFromPath(controlBlock: Buffer, leafHash: Buffer): Buffer {
-    if (controlBlock.length < 33)
-        throw new TypeError(
-            `The control-block length is too small. Got ${controlBlock.length}, expected min 33.`,
-        );
-    const m = (controlBlock.length - 33) / 32;
-
-    let kj = leafHash;
-    for (let j = 0; j < m; j++) {
-        const ej = controlBlock.slice(33 + 32 * j, 65 + 32 * j);
-        if (kj.compare(ej) < 0) {
-            kj = tapBranchHash(kj, ej);
-        } else {
-            kj = tapBranchHash(ej, kj);
-        }
-    }
-
-    return kj;
-}
-
-/**
- * Build a hash tree of merkle nodes from the scripts binary tree.
- * @param scriptTree - the tree of scripts to pairwise hash.
- */
-export function toHashTree(scriptTree: Taptree): HashTree {
-    if (isTapleaf(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;
-
-    return {
-        hash: tapBranchHash(left.hash, right.hash),
-        left,
-        right,
-    };
-}
-
-/**
- * Given a HashTree, finds the path from a particular hash to the root.
- * @param node - the root of the tree
- * @param hash - the hash to search for
- * @returns - array of sibling hashes, from leaf (inclusive) to root
- * (exclusive) needed to prove inclusion of the specified hash. undefined if no
- * path is found
- */
-export function findScriptPath(node: HashTree, hash: Buffer): Buffer[] | undefined {
-    if (isHashBranch(node)) {
-        const leftPath = findScriptPath(node.left, hash);
-        if (leftPath !== undefined) return [...leftPath, node.right.hash];
-
-        const rightPath = findScriptPath(node.right, hash);
-        if (rightPath !== undefined) return [...rightPath, node.left.hash];
-    } else if (node.hash.equals(hash)) {
-        return [];
-    }
-
-    return undefined;
-}
-
-export function tapleafHash(leaf: Tapleaf): Buffer {
-    const version = leaf.version || LEAF_VERSION_TAPSCRIPT;
-    return bcrypto.taggedHash(
-        'TapLeaf',
-        NBuffer.concat([NBuffer.from([version]), serializeScript(leaf.output)]),
-    );
-}
-
-export function tapTweakHash(pubKey: Buffer, h: Buffer | undefined): Buffer {
-    return bcrypto.taggedHash('TapTweak', NBuffer.concat(h ? [pubKey, h] : [pubKey]));
-}
-
-export function tweakKey(pubKey: Buffer, h: Buffer | undefined): TweakedPublicKey | null {
-    if (!NBuffer.isBuffer(pubKey)) return null;
-    if (pubKey.length !== 32) return null;
-    if (h && h.length !== 32) return null;
-
-    const tweakHash = tapTweakHash(pubKey, h);
-
-    const res = getEccLib().xOnlyPointAddTweak(pubKey, tweakHash);
-    if (!res || res.xOnlyPubkey === null) return null;
-
-    return {
-        parity: res.parity,
-        x: NBuffer.from(res.xOnlyPubkey),
-    };
-}
-
-function tapBranchHash(a: Buffer, b: Buffer): Buffer {
-    return bcrypto.taggedHash('TapBranch', NBuffer.concat([a, b]));
-}
-
-function serializeScript(s: Buffer): Buffer {
-    const varintLen = varuint.encodingLength(s.length);
-    const buffer = NBuffer.allocUnsafe(varintLen); // better
-    varuint.encode(s.length, buffer);
-    return NBuffer.concat([buffer, s]);
-}
+import { Buffer as NBuffer } from 'buffer';
+import * as bcrypto from '../crypto.js';
+import { getEccLib } from '../ecc_lib.js';
+
+import { varuint } from '../bufferutils.js';
+import { isTapleaf, Tapleaf, Taptree } from '../types.js';
+
+export const LEAF_VERSION_TAPSCRIPT = 0xc0;
+export const MAX_TAPTREE_DEPTH = 128;
+
+interface HashLeaf {
+    hash: Buffer;
+}
+
+interface HashBranch {
+    hash: Buffer;
+    left: HashTree;
+    right: HashTree;
+}
+
+interface TweakedPublicKey {
+    parity: number;
+    x: Buffer;
+}
+
+const isHashBranch = (ht: HashTree): ht is HashBranch => 'left' in ht && 'right' in ht;
+
+/**
+ * Binary tree representing leaf, branch, and root node hashes of a Taptree.
+ * Each node contains a hash, and potentially left and right branch hashes.
+ * This tree is used for 2 purposes: Providing the root hash for tweaking,
+ * and calculating merkle inclusion proofs when constructing a control block.
+ */
+export type HashTree = HashLeaf | HashBranch;
+
+/**
+ * Calculates the root hash from a given control block and leaf hash.
+ * @param controlBlock - The control block buffer.
+ * @param leafHash - The leaf hash buffer.
+ * @returns The root hash buffer.
+ * @throws {TypeError} If the control block length is less than 33.
+ */
+export function rootHashFromPath(controlBlock: Buffer, leafHash: Buffer): Buffer {
+    if (controlBlock.length < 33)
+        throw new TypeError(
+            `The control-block length is too small. Got ${controlBlock.length}, expected min 33.`,
+        );
+    const m = (controlBlock.length - 33) / 32;
+
+    let kj = leafHash;
+    for (let j = 0; j < m; j++) {
+        const ej = controlBlock.slice(33 + 32 * j, 65 + 32 * j);
+        if (kj.compare(ej) < 0) {
+            kj = tapBranchHash(kj, ej);
+        } else {
+            kj = tapBranchHash(ej, kj);
+        }
+    }
+
+    return kj;
+}
+
+/**
+ * Build a hash tree of merkle nodes from the scripts binary tree.
+ * @param scriptTree - the tree of scripts to pairwise hash.
+ */
+export function toHashTree(scriptTree: Taptree): HashTree {
+    if (isTapleaf(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;
+
+    return {
+        hash: tapBranchHash(left.hash, right.hash),
+        left,
+        right,
+    };
+}
+
+/**
+ * Given a HashTree, finds the path from a particular hash to the root.
+ * @param node - the root of the tree
+ * @param hash - the hash to search for
+ * @returns - array of sibling hashes, from leaf (inclusive) to root
+ * (exclusive) needed to prove inclusion of the specified hash. undefined if no
+ * path is found
+ */
+export function findScriptPath(node: HashTree, hash: Buffer): Buffer[] | undefined {
+    if (isHashBranch(node)) {
+        const leftPath = findScriptPath(node.left, hash);
+        if (leftPath !== undefined) return [...leftPath, node.right.hash];
+
+        const rightPath = findScriptPath(node.right, hash);
+        if (rightPath !== undefined) return [...rightPath, node.left.hash];
+    } else if (node.hash.equals(hash)) {
+        return [];
+    }
+
+    return undefined;
+}
+
+export function tapleafHash(leaf: Tapleaf): Buffer {
+    const version = leaf.version || LEAF_VERSION_TAPSCRIPT;
+    return bcrypto.taggedHash(
+        'TapLeaf',
+        NBuffer.concat([NBuffer.from([version]), serializeScript(leaf.output)]),
+    );
+}
+
+export function tapTweakHash(pubKey: Buffer, h: Buffer | undefined): Buffer {
+    return bcrypto.taggedHash('TapTweak', NBuffer.concat(h ? [pubKey, h] : [pubKey]));
+}
+
+export function tweakKey(pubKey: Buffer, h: Buffer | undefined): TweakedPublicKey | null {
+    if (!NBuffer.isBuffer(pubKey)) return null;
+    if (pubKey.length !== 32) return null;
+    if (h && h.length !== 32) return null;
+
+    const tweakHash = tapTweakHash(pubKey, h);
+
+    const res = getEccLib().xOnlyPointAddTweak(pubKey, tweakHash);
+    if (!res || res.xOnlyPubkey === null) return null;
+
+    return {
+        parity: res.parity,
+        x: NBuffer.from(res.xOnlyPubkey),
+    };
+}
+
+function tapBranchHash(a: Buffer, b: Buffer): Buffer {
+    return bcrypto.taggedHash('TapBranch', NBuffer.concat([a, b]));
+}
+
+function serializeScript(s: Buffer): Buffer {
+    const varintLen = varuint.encodingLength(s.length);
+    const buffer = NBuffer.allocUnsafe(varintLen); // better
+    varuint.encode(s.length, buffer);
+    return NBuffer.concat([buffer, s]);
+}

package/src/payments/embed.ts

@@ -1,61 +1,61 @@
-import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
-import * as bscript from '../script.js';
-import { stacksEqual, typeforce as typef } from '../types.js';
-import { EmbedPayment, PaymentOpts, PaymentType, Stack } from './index.js';
-import * as lazy from './lazy.js';
-
-const OPS = bscript.opcodes;
-
-// output: OP_RETURN ...
-/**
- * Embeds data in a Bitcoin payment.
- * @param a - The payment object.
- * @param opts - Optional payment options.
- * @returns The modified payment object.
- * @throws {TypeError} If there is not enough data or if the output is invalid.
- */
-export function p2data(a: Omit<EmbedPayment, 'name'>, opts?: PaymentOpts): EmbedPayment {
-    if (!a.data && !a.output) throw new TypeError('Not enough data');
-    opts = Object.assign({ validate: true }, opts || {});
-
-    typef(
-        {
-            network: typef.maybe(typef.Object),
-            output: typef.maybe(typef.Buffer),
-            data: typef.maybe(typef.arrayOf(typef.Buffer)),
-        },
-        a,
-    );
-
-    const network = a.network || BITCOIN_NETWORK;
-    const o: EmbedPayment = { name: PaymentType.Embed, network, data: [] };
-
-    lazy.prop(o, 'output', () => {
-        if (!a.data) return;
-        return bscript.compile(([OPS.OP_RETURN] as Stack).concat(a.data));
-    });
-
-    lazy.prop(o, 'data', () => {
-        if (!a.output) return;
-        const script = bscript.decompile(a.output);
-        if (script === null || script === undefined) {
-            return;
-        }
-
-        return script.slice(1) as Buffer[];
-    });
-
-    // extended validation
-    if (opts.validate) {
-        if (a.output) {
-            const chunks = bscript.decompile(a.output);
-            if (chunks![0] !== OPS.OP_RETURN) throw new TypeError('Output is invalid');
-            if (!chunks!.slice(1).every(typef.Buffer)) throw new TypeError('Output is invalid');
-
-            if (a.data && !stacksEqual(a.data, o.data as Buffer[]))
-                throw new TypeError('Data mismatch');
-        }
-    }
-
-    return Object.assign(o, a);
-}
+import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
+import * as bscript from '../script.js';
+import { stacksEqual, typeforce as typef } from '../types.js';
+import { EmbedPayment, PaymentOpts, PaymentType, Stack } from './index.js';
+import * as lazy from './lazy.js';
+
+const OPS = bscript.opcodes;
+
+// output: OP_RETURN ...
+/**
+ * Embeds data in a Bitcoin payment.
+ * @param a - The payment object.
+ * @param opts - Optional payment options.
+ * @returns The modified payment object.
+ * @throws {TypeError} If there is not enough data or if the output is invalid.
+ */
+export function p2data(a: Omit<EmbedPayment, 'name'>, opts?: PaymentOpts): EmbedPayment {
+    if (!a.data && !a.output) throw new TypeError('Not enough data');
+    opts = Object.assign({ validate: true }, opts || {});
+
+    typef(
+        {
+            network: typef.maybe(typef.Object),
+            output: typef.maybe(typef.Buffer),
+            data: typef.maybe(typef.arrayOf(typef.Buffer)),
+        },
+        a,
+    );
+
+    const network = a.network || BITCOIN_NETWORK;
+    const o: EmbedPayment = { name: PaymentType.Embed, network, data: [] };
+
+    lazy.prop(o, 'output', () => {
+        if (!a.data) return;
+        return bscript.compile(([OPS.OP_RETURN] as Stack).concat(a.data));
+    });
+
+    lazy.prop(o, 'data', () => {
+        if (!a.output) return;
+        const script = bscript.decompile(a.output);
+        if (script === null || script === undefined) {
+            return;
+        }
+
+        return script.slice(1) as Buffer[];
+    });
+
+    // extended validation
+    if (opts.validate) {
+        if (a.output) {
+            const chunks = bscript.decompile(a.output);
+            if (chunks![0] !== OPS.OP_RETURN) throw new TypeError('Output is invalid');
+            if (!chunks!.slice(1).every(typef.Buffer)) throw new TypeError('Output is invalid');
+
+            if (a.data && !stacksEqual(a.data, o.data as Buffer[]))
+                throw new TypeError('Data mismatch');
+        }
+    }
+
+    return Object.assign(o, a);
+}