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

package/src/payments/p2pkh.ts

@@ -13,9 +13,9 @@ import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import { decompressPublicKey } from '../pubkey.js';
 import * as bscript from '../script.js';
-import { isPoint, type Bytes20, type PublicKey, type Script, type Signature } from '../types.js';
+import { type Bytes20, isPoint, type PublicKey, type Script, type Signature } from '../types.js';
 import { alloc, equals } from '../io/index.js';
-import { PaymentType, type P2PKHPayment, type PaymentOpts } from './types.js';
+import { type P2PKHPayment, type PaymentOpts, PaymentType } from './types.js';
 
 const OPS = bscript.opcodes;
 
@@ -303,6 +303,25 @@ export class P2PKH {
 
     // Private helper methods
 
+    /**
+     * Converts to a plain P2PKHPayment object for backwards compatibility.
+     *
+     * @returns A P2PKHPayment object
+     */
+    toPayment(): P2PKHPayment {
+        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,
+        };
+    }
+
     #getDecodedAddress(): { version: number; hash: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
@@ -317,6 +336,8 @@ export class P2PKH {
         return this.#decodedAddress;
     }
 
+    // Private computation methods
+
     #getInputChunks(): (Uint8Array | number)[] | undefined {
         if (!this.#inputChunksComputed) {
             if (this.#inputInput) {
@@ -327,8 +348,6 @@ export class P2PKH {
         return this.#inputChunks;
     }
 
-    // Private computation methods
-
     #computeAddress(): string | undefined {
         if (this.#inputAddress) {
             return this.#inputAddress;
@@ -425,6 +444,8 @@ export class P2PKH {
         return bscript.compile([this.#inputSignature, pubKey]) as Script;
     }
 
+    // Validation
+
     #computeWitness(): Uint8Array[] | undefined {
         if (this.input) {
             return [];
@@ -432,8 +453,6 @@ export class P2PKH {
         return undefined;
     }
 
-    // Validation
-
     #validate(): void {
         let hash: Uint8Array = new Uint8Array(0);
 
@@ -540,25 +559,6 @@ export class P2PKH {
             }
         }
     }
-
-    /**
-     * Converts to a plain P2PKHPayment object for backwards compatibility.
-     *
-     * @returns A P2PKHPayment object
-     */
-    toPayment(): P2PKHPayment {
-        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/p2sh.ts

@@ -12,13 +12,13 @@ import * as bs58check from 'bs58check';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import * as bscript from '../script.js';
-import { stacksEqual, type Bytes20, type Script, type Stack } from '../types.js';
+import { type Bytes20, type Script, type Stack, stacksEqual } from '../types.js';
 import { alloc, equals } from '../io/index.js';
 import {
-    PaymentType,
     type P2SHPayment,
     type Payment,
     type PaymentOpts,
+    PaymentType,
     type ScriptRedeem,
 } from './types.js';
 
@@ -282,6 +282,24 @@ export class P2SH {
 
     // Private helper methods
 
+    /**
+     * Converts to a plain P2SHPayment object for backwards compatibility.
+     *
+     * @returns A P2SHPayment object
+     */
+    toPayment(): P2SHPayment {
+        return {
+            name: this.name,
+            network: this.network,
+            address: this.address,
+            hash: this.hash,
+            output: this.output,
+            input: this.input,
+            redeem: this.redeem,
+            witness: this.witness,
+        };
+    }
+
     #getDecodedAddress(): { version: number; hash: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
@@ -306,6 +324,8 @@ export class P2SH {
         return this.#inputChunks;
     }
 
+    // Private computation methods
+
     #getDerivedRedeem(): ScriptRedeem | undefined {
         if (!this.#derivedRedeemComputed) {
             const chunks = this.#getInputChunks();
@@ -313,8 +333,9 @@ export class P2SH {
                 const lastChunk = chunks[chunks.length - 1];
                 this.#derivedRedeem = {
                     network: this.#network,
-                    output:
-                        (lastChunk === OPS.OP_FALSE ? new Uint8Array(0) : (lastChunk as Uint8Array)) as Script,
+                    output: (lastChunk === OPS.OP_FALSE
+                        ? new Uint8Array(0)
+                        : (lastChunk as Uint8Array)) as Script,
                     input: bscript.compile(chunks.slice(0, -1)) as Script,
                     witness: this.#inputWitness || [],
                 };
@@ -324,8 +345,6 @@ export class P2SH {
         return this.#derivedRedeem;
     }
 
-    // Private computation methods
-
     #computeAddress(): string | undefined {
         if (this.#inputAddress) {
             return this.#inputAddress;
@@ -374,7 +393,9 @@ export class P2SH {
         if (!r || !r.input || !r.output) {
             return undefined;
         }
-        return bscript.compile(([] as Stack).concat(bscript.decompile(r.input) as Stack, r.output)) as Script;
+        return bscript.compile(
+            ([] as Stack).concat(bscript.decompile(r.input) as Stack, r.output),
+        ) as Script;
     }
 
     #computeRedeem(): ScriptRedeem | undefined {
@@ -387,6 +408,8 @@ export class P2SH {
         return undefined;
     }
 
+    // Validation
+
     #computeWitness(): Uint8Array[] | undefined {
         if (this.#inputWitness) {
             return this.#inputWitness;
@@ -401,8 +424,6 @@ export class P2SH {
         return undefined;
     }
 
-    // Validation
-
     #checkRedeem(redeem: Payment): void {
         // Is the redeem output empty/invalid?
         if (redeem.output) {
@@ -547,24 +568,6 @@ export class P2SH {
             }
         }
     }
-
-    /**
-     * Converts to a plain P2SHPayment object for backwards compatibility.
-     *
-     * @returns A P2SHPayment object
-     */
-    toPayment(): P2SHPayment {
-        return {
-            name: this.name,
-            network: this.network,
-            address: this.address,
-            hash: this.hash,
-            output: this.output,
-            input: this.input,
-            redeem: this.redeem,
-            witness: this.witness,
-        };
-    }
 }
 
 /**

package/src/payments/p2tr.ts

@@ -13,25 +13,25 @@ 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,
     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;
@@ -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);
 
@@ -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;
@@ -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);
 
@@ -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;
@@ -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';

package/src/psbt/bip371.ts

@@ -16,8 +16,8 @@ import {
 } from '../payments/bip341.js';
 import { p2tr } from '../payments/p2tr.js';
 import { Transaction } from '../transaction.js';
+import type { Bytes32, Tapleaf, Taptree, XOnlyPublicKey } from '../types.js';
 import { isTapleaf, isTaptree } from '../types.js';
-import type { Tapleaf, Taptree, XOnlyPublicKey, Bytes32 } from '../types.js';
 import { concat, equals } from '../io/index.js';
 import {
     isP2TR,
@@ -137,8 +137,12 @@ function getTaprootScripPubkey(tapInternalKey: TapInternalKey, tapTree?: TapTree
 
 export function tweakInternalPubKey(inputIndex: number, input: PsbtInput): Uint8Array {
     const tapInternalKey = input.tapInternalKey;
-    const tapInternalKeyBuf = tapInternalKey ? new Uint8Array(tapInternalKey) as XOnlyPublicKey : undefined;
-    const tapMerkleRootBuf = input.tapMerkleRoot ? new Uint8Array(input.tapMerkleRoot) as Bytes32 : undefined;
+    const tapInternalKeyBuf = tapInternalKey
+        ? (new Uint8Array(tapInternalKey) as XOnlyPublicKey)
+        : undefined;
+    const tapMerkleRootBuf = input.tapMerkleRoot
+        ? (new Uint8Array(input.tapMerkleRoot) as Bytes32)
+        : undefined;
     const outputKey = tapInternalKeyBuf && tweakKey(tapInternalKeyBuf, tapMerkleRootBuf);
 
     if (!outputKey)

package/src/psbt/psbtutils.ts

@@ -1,5 +1,5 @@
 import type { PartialSig, PsbtInput } from 'bip174';
-import { varuint, concat, alloc, equals } from '../io/index.js';
+import { alloc, concat, equals, varuint } from '../io/index.js';
 import { hash160 } from '../crypto.js';
 import { p2ms } from '../payments/p2ms.js';
 import { p2pk } from '../payments/p2pk.js';

package/src/psbt/types.ts

@@ -5,15 +5,8 @@
 
 import type { Psbt as PsbtBase, PsbtGlobal, PsbtInput, PsbtOutput } from 'bip174';
 import type { Network } from '../networks.js';
-import type { Transaction, TaprootHashCache } from '../transaction.js';
-import type {
-    Bytes32,
-    PublicKey,
-    Satoshi,
-    Script,
-    Signature,
-    SchnorrSignature,
-} from '../types.js';
+import type { TaprootHashCache, Transaction } from '../transaction.js';
+import type { Bytes32, PublicKey, Satoshi, SchnorrSignature, Script, Signature } from '../types.js';
 
 /**
  * Transaction input interface for PSBT.

package/src/psbt/validation.ts

@@ -4,9 +4,9 @@
  */
 
 import type { PsbtInput } from 'bip174';
-import { reverse, equals, toHex } from '../io/index.js';
-import * as payments from '../payments/index.js';
+import { equals, reverse, toHex } from '../io/index.js';
 import type { P2SHPayment, Payment, PaymentOpts } from '../payments/index.js';
+import * as payments from '../payments/index.js';
 import { checkTaprootInputForSigs, isTaprootInput } from './bip371.js';
 import { checkInputForSig, pubkeyInScript } from './psbtutils.js';
 import * as bscript from '../script.js';
@@ -142,9 +142,7 @@ export function checkPartialSigSighashes(input: PsbtInput): void {
  */
 export function checkScriptForPubkey(pubkey: PublicKey, script: Script, action: string): void {
     if (!pubkeyInScript(pubkey, script)) {
-        throw new Error(
-            `Can not ${action} for this input with the key ${toHex(pubkey)}`,
-        );
+        throw new Error(`Can not ${action} for this input with the key ${toHex(pubkey)}`);
     }
 }
 
@@ -157,12 +155,7 @@ export function checkScriptForPubkey(pubkey: PublicKey, script: Script, action:
 export function scriptCheckerFactory(
     payment: (a: Omit<Payment, 'name'>, opts?: PaymentOpts) => Payment,
     paymentScriptName: string,
-): (
-    idx: number,
-    scriptPubKey: Script,
-    redeemScript: Script,
-    ioType: 'input' | 'output',
-) => void {
+): (idx: number, scriptPubKey: Script, redeemScript: Script, ioType: 'input' | 'output') => void {
     return (
         inputIndex: number,
         scriptPubKey: Script,