@btc-vision/bitcoin 7.0.0-alpha.0 → 7.0.0-alpha.10

package/src/payments/p2tr.ts

@@ -9,29 +9,29 @@
 
 import { bech32m } from 'bech32';
 import { fromBech32 } from '../bech32utils.js';
-import { getEccLib } from '../ecc/context.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import * as bscript from '../script.js';
 import {
-    stacksEqual,
-    TAPLEAF_VERSION_MASK,
     type Bytes32,
-    type Script,
+    isXOnlyPublicKey,
     type SchnorrSignature,
+    type Script,
+    stacksEqual,
+    TAPLEAF_VERSION_MASK,
     type Taptree,
     type XOnlyPublicKey,
 } from '../types.js';
 import {
     findScriptPath,
+    type HashTree,
     LEAF_VERSION_TAPSCRIPT,
     rootHashFromPath,
     tapleafHash,
     toHashTree,
     tweakKey,
-    type HashTree,
 } from './bip341.js';
 import { concat, equals } from '../io/index.js';
-import { PaymentType, type P2TRPayment, type PaymentOpts, type ScriptRedeem } from './types.js';
+import { type P2TRPayment, type PaymentOpts, PaymentType, type ScriptRedeem } from './types.js';
 
 const OPS = bscript.opcodes;
 const TAPROOT_WITNESS_VERSION = 0x01;
@@ -362,6 +362,28 @@ export class P2TR {
 
     // Private helper methods
 
+    /**
+     * Converts to a plain P2TRPayment object for backwards compatibility.
+     *
+     * @returns A P2TRPayment object
+     */
+    toPayment(): P2TRPayment {
+        return {
+            name: this.name,
+            network: this.network,
+            address: this.address,
+            pubkey: this.pubkey,
+            internalPubkey: this.internalPubkey,
+            hash: this.hash,
+            scriptTree: this.#inputScriptTree,
+            signature: this.signature,
+            output: this.output,
+            redeem: this.redeem,
+            redeemVersion: this.redeemVersion,
+            witness: this.witness,
+        };
+    }
+
     #getDecodedAddress(): { version: number; prefix: string; data: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
@@ -397,6 +419,8 @@ export class P2TR {
         return this.#witnessWithoutAnnex;
     }
 
+    // Private computation methods
+
     #getHashTree(): HashTree | undefined {
         if (!this.#hashTreeComputed) {
             if (this.#inputScriptTree) {
@@ -409,8 +433,6 @@ export class P2TR {
         return this.#hashTree;
     }
 
-    // Private computation methods
-
     #computeAddress(): string | undefined {
         if (this.#inputAddress) {
             return this.#inputAddress;
@@ -437,7 +459,7 @@ export class P2TR {
         if (internalPk) {
             const tweakedKey = tweakKey(internalPk, this.hash);
             if (tweakedKey) {
-                return tweakedKey.x as XOnlyPublicKey;
+                return tweakedKey.x;
             }
         }
         return undefined;
@@ -457,7 +479,7 @@ export class P2TR {
     #computeHash(): Bytes32 | undefined {
         const hashTree = this.#getHashTree();
         if (hashTree) {
-            return hashTree.hash as Bytes32;
+            return hashTree.hash;
         }
 
         const w = this.#getWitnessWithoutAnnex();
@@ -469,7 +491,7 @@ export class P2TR {
                 output: script,
                 version: leafVersion,
             });
-            return rootHashFromPath(controlBlock, leafHash) as Bytes32;
+            return rootHashFromPath(controlBlock, leafHash);
         }
 
         return undefined;
@@ -493,7 +515,7 @@ export class P2TR {
         const pk = this.pubkey;
         if (!pk) return undefined;
 
-        return bscript.compile([OPS.OP_1, pk]) as Script;
+        return bscript.compile([OPS.OP_1, pk]);
     }
 
     #computeRedeem(): ScriptRedeem | undefined {
@@ -525,6 +547,8 @@ export class P2TR {
         return LEAF_VERSION_TAPSCRIPT;
     }
 
+    // Validation
+
     #computeWitness(): Uint8Array[] | undefined {
         if (this.#inputWitness) {
             return this.#inputWitness;
@@ -558,8 +582,6 @@ export class P2TR {
         return undefined;
     }
 
-    // Validation
-
     #validate(): void {
         let pubkey: Uint8Array = new Uint8Array(0);
 
@@ -666,7 +688,7 @@ export class P2TR {
         if (witness && witness.length > 0) {
             if (witness.length === 1) {
                 // Key-path spending
-                if (this.#inputSignature && !equals(this.#inputSignature!, witness[0]!)) {
+                if (this.#inputSignature && !equals(this.#inputSignature, witness[0]!)) {
                     throw new TypeError('Signature mismatch');
                 }
             } else {
@@ -690,11 +712,11 @@ export class P2TR {
                 }
 
                 const internalPk = controlBlock.subarray(1, 33);
-                if (this.#inputInternalPubkey && !equals(this.#inputInternalPubkey!, internalPk)) {
+                if (this.#inputInternalPubkey && !equals(this.#inputInternalPubkey, internalPk)) {
                     throw new TypeError('Internal pubkey mismatch');
                 }
 
-                if (!getEccLib().isXOnlyPoint(internalPk)) {
+                if (!isXOnlyPublicKey(internalPk)) {
                     throw new TypeError('Invalid internalPubkey for p2tr witness');
                 }
 
@@ -707,7 +729,7 @@ export class P2TR {
                 });
                 const computedHash = rootHashFromPath(controlBlock, leafHash);
 
-                const outputKey = tweakKey(internalPk as XOnlyPublicKey, computedHash);
+                const outputKey = tweakKey(internalPk, computedHash);
                 if (!outputKey) {
                     throw new TypeError('Invalid outputKey for p2tr witness');
                 }
@@ -722,28 +744,6 @@ export class P2TR {
             }
         }
     }
-
-    /**
-     * Converts to a plain P2TRPayment object for backwards compatibility.
-     *
-     * @returns A P2TRPayment object
-     */
-    toPayment(): P2TRPayment {
-        return {
-            name: this.name,
-            network: this.network,
-            address: this.address,
-            pubkey: this.pubkey,
-            internalPubkey: this.internalPubkey,
-            hash: this.hash,
-            scriptTree: this.#inputScriptTree,
-            signature: this.signature,
-            output: this.output,
-            redeem: this.redeem,
-            redeemVersion: this.redeemVersion,
-            witness: this.witness,
-        };
-    }
 }
 
 /**

package/src/payments/p2wpkh.ts

@@ -12,10 +12,10 @@ import { bech32 } from 'bech32';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import * as bscript from '../script.js';
-import { isPoint } from '../types.js';
 import type { Bytes20, PublicKey, Script, Signature } from '../types.js';
+import { isPoint } from '../types.js';
 import { equals } from '../io/index.js';
-import { PaymentType, type P2WPKHPayment, type PaymentOpts } from './types.js';
+import { type P2WPKHPayment, type PaymentOpts, PaymentType } from './types.js';
 
 const OPS = bscript.opcodes;
 const EMPTY_BUFFER = new Uint8Array(0);
@@ -279,6 +279,27 @@ export class P2WPKH {
 
     // Private helper methods
 
+    /**
+     * Converts to a plain P2WPKHPayment object for backwards compatibility.
+     *
+     * @returns A P2WPKHPayment object
+     */
+    toPayment(): P2WPKHPayment {
+        return {
+            name: this.name,
+            network: this.network,
+            address: this.address,
+            hash: this.hash,
+            pubkey: this.pubkey,
+            signature: this.signature,
+            output: this.output,
+            input: this.input,
+            witness: this.witness,
+        };
+    }
+
+    // Private computation methods
+
     #getDecodedAddress(): { version: number; prefix: string; data: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
@@ -296,8 +317,6 @@ export class P2WPKH {
         return this.#decodedAddress;
     }
 
-    // Private computation methods
-
     #computeAddress(): string | undefined {
         if (this.#inputAddress) {
             return this.#inputAddress;
@@ -322,7 +341,7 @@ export class P2WPKH {
         }
         const pk = this.#inputPubkey ?? this.pubkey;
         if (pk) {
-            return bcrypto.hash160(pk) as Bytes20;
+            return bcrypto.hash160(pk);
         }
         return undefined;
     }
@@ -354,7 +373,7 @@ export class P2WPKH {
         const h = this.hash;
         if (!h) return undefined;
 
-        return bscript.compile([OPS.OP_0, h]) as Script;
+        return bscript.compile([OPS.OP_0, h]);
     }
 
     #computeInput(): Uint8Array | undefined {
@@ -364,6 +383,8 @@ export class P2WPKH {
         return undefined;
     }
 
+    // Validation
+
     #computeWitness(): Uint8Array[] | undefined {
         if (this.#inputWitness) {
             return this.#inputWitness;
@@ -374,8 +395,6 @@ export class P2WPKH {
         return [this.#inputSignature, this.#inputPubkey];
     }
 
-    // Validation
-
     #validate(): void {
         let hash: Uint8Array = new Uint8Array(0);
 
@@ -438,14 +457,14 @@ export class P2WPKH {
             if (!bscript.isCanonicalScriptSignature(this.#inputWitness[0]!)) {
                 throw new TypeError('Witness has invalid signature');
             }
-            if (!isPoint(this.#inputWitness[1]!) || this.#inputWitness[1]!.length !== 33) {
+            if (!isPoint(this.#inputWitness[1]!) || this.#inputWitness[1].length !== 33) {
                 throw new TypeError('Witness has invalid pubkey');
             }
 
-            if (this.#inputSignature && !equals(this.#inputSignature!, this.#inputWitness[0]!)) {
+            if (this.#inputSignature && !equals(this.#inputSignature, this.#inputWitness[0]!)) {
                 throw new TypeError('Signature mismatch');
             }
-            if (this.#inputPubkey && !equals(this.#inputPubkey!, this.#inputWitness[1]!)) {
+            if (this.#inputPubkey && !equals(this.#inputPubkey, this.#inputWitness[1])) {
                 throw new TypeError('Pubkey mismatch');
             }
 
@@ -455,25 +474,6 @@ export class P2WPKH {
             }
         }
     }
-
-    /**
-     * Converts to a plain P2WPKHPayment object for backwards compatibility.
-     *
-     * @returns A P2WPKHPayment object
-     */
-    toPayment(): P2WPKHPayment {
-        return {
-            name: this.name,
-            network: this.network,
-            address: this.address,
-            hash: this.hash,
-            pubkey: this.pubkey,
-            signature: this.signature,
-            output: this.output,
-            input: this.input,
-            witness: this.witness,
-        };
-    }
 }
 
 /**

package/src/payments/p2wsh.ts

@@ -12,10 +12,10 @@ import { bech32 } from 'bech32';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import * as bscript from '../script.js';
-import { isPoint, stacksEqual, type StackElement } from '../types.js';
 import type { Bytes32, Script } from '../types.js';
+import { isPoint, type StackElement, stacksEqual } from '../types.js';
 import { equals } from '../io/index.js';
-import { PaymentType, type P2WSHPayment, type PaymentOpts, type ScriptRedeem } from './types.js';
+import { type P2WSHPayment, type PaymentOpts, PaymentType, type ScriptRedeem } from './types.js';
 
 const OPS = bscript.opcodes;
 const EMPTY_BUFFER = new Uint8Array(0);
@@ -278,6 +278,27 @@ export class P2WSH {
 
     // Private helper methods
 
+    /**
+     * Converts to a plain P2WSHPayment object for backwards compatibility.
+     *
+     * @returns A P2WSHPayment object
+     */
+    toPayment(): P2WSHPayment {
+        // Access witness first as it may modify redeem (transform input to witness)
+        const witness = this.witness;
+        const redeem = this.redeem;
+        return {
+            name: this.name,
+            network: this.network,
+            address: this.address,
+            hash: this.hash,
+            output: this.output,
+            input: this.input,
+            redeem,
+            witness,
+        };
+    }
+
     #getDecodedAddress(): { version: number; prefix: string; data: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
@@ -295,6 +316,8 @@ export class P2WSH {
         return this.#decodedAddress;
     }
 
+    // Private computation methods
+
     #getRedeemChunks(): (Uint8Array | number)[] | undefined {
         if (!this.#redeemChunksComputed) {
             if (this.#inputRedeem?.input) {
@@ -305,8 +328,6 @@ export class P2WSH {
         return this.#redeemChunks;
     }
 
-    // Private computation methods
-
     #computeAddress(): string | undefined {
         if (this.#inputAddress) {
             return this.#inputAddress;
@@ -331,7 +352,7 @@ export class P2WSH {
         }
         const r = this.redeem;
         if (r && r.output) {
-            return bcrypto.sha256(r.output) as Bytes32;
+            return bcrypto.sha256(r.output);
         }
         return undefined;
     }
@@ -343,7 +364,7 @@ export class P2WSH {
         const h = this.hash;
         if (!h) return undefined;
 
-        return bscript.compile([OPS.OP_0, h]) as Script;
+        return bscript.compile([OPS.OP_0, h]);
     }
 
     #computeInput(): Uint8Array | undefined {
@@ -367,6 +388,8 @@ export class P2WSH {
         return undefined;
     }
 
+    // Validation
+
     #computeWitness(): Uint8Array[] | undefined {
         if (this.#inputWitness) {
             return this.#inputWitness;
@@ -394,8 +417,6 @@ export class P2WSH {
         return undefined;
     }
 
-    // Validation
-
     #validate(): void {
         let hash: Uint8Array = new Uint8Array(0);
 
@@ -518,27 +539,6 @@ export class P2WSH {
             }
         }
     }
-
-    /**
-     * Converts to a plain P2WSHPayment object for backwards compatibility.
-     *
-     * @returns A P2WSHPayment object
-     */
-    toPayment(): P2WSHPayment {
-        // Access witness first as it may modify redeem (transform input to witness)
-        const witness = this.witness;
-        const redeem = this.redeem;
-        return {
-            name: this.name,
-            network: this.network,
-            address: this.address,
-            hash: this.hash,
-            output: this.output,
-            input: this.input,
-            redeem,
-            witness,
-        };
-    }
 }
 
 /**

package/src/payments/types.ts

@@ -8,9 +8,9 @@ import type {
     Bytes20,
     Bytes32,
     PublicKey,
+    SchnorrSignature,
     Script,
     Signature,
-    SchnorrSignature,
     Taptree,
     XOnlyPublicKey,
 } from '../types.js';