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

package/src/payments/types.ts

@@ -4,133 +4,147 @@
  */
 
 import type { Network } from '../networks.js';
-import type { Taptree } from '../types.js';
-
-export enum PaymentType {
-    P2PK = 'p2pk',
-    P2PKH = 'p2pkh',
-    P2SH = 'p2sh',
-    P2MS = 'p2ms',
-    P2WPKH = 'p2wpkh',
-    P2WSH = 'p2wsh',
-    P2TR = 'p2tr',
-    P2OP = 'p2op',
-    Embed = 'embed',
-    ScriptRedeem = 'scriptRedeem',
-}
+import type {
+    Bytes20,
+    Bytes32,
+    PublicKey,
+    SchnorrSignature,
+    Script,
+    Signature,
+    Taptree,
+    XOnlyPublicKey,
+} from '../types.js';
+
+export const PaymentType = {
+    P2PK: 'p2pk',
+    P2PKH: 'p2pkh',
+    P2SH: 'p2sh',
+    P2MS: 'p2ms',
+    P2WPKH: 'p2wpkh',
+    P2WSH: 'p2wsh',
+    P2TR: 'p2tr',
+    P2OP: 'p2op',
+    Embed: 'embed',
+    ScriptRedeem: 'scriptRedeem',
+} as const;
+
+export type PaymentType = (typeof PaymentType)[keyof typeof PaymentType];
 
 export interface BasePayment {
-    /** Convenience label, also the discriminant for the union. */
-    name?: PaymentType;
+    /** Convenience label, also the discriminant for the union. Can be dynamic for nested types. */
+    readonly name?: string | undefined;
     /** Network parameters (mainnet if omitted). */
-    network?: Network;
+    readonly network?: Network | undefined;
     /** Fully-assembled scriptPubKey (if already known). */
-    output?: Buffer;
+    readonly output?: Script | undefined;
     /** Raw scriptSig (legacy script types only). */
-    input?: Buffer;
+    readonly input?: Script | undefined;
     /** Human-readable address (if already known). */
-    address?: string;
+    readonly address?: string | undefined;
     /** Segwit stack (empty for legacy). */
-    witness?: Buffer[];
+    readonly witness?: Uint8Array[] | undefined;
 
     /** Script template for P2SH, P2WSH, P2TR, etc. */
-    redeem?: ScriptRedeem;
+    readonly redeem?: ScriptRedeem | undefined;
 
     /** Non-standard options used by some wallets. */
-    useHybrid?: boolean;
-    useUncompressed?: boolean;
+    readonly useHybrid?: boolean | undefined;
+    readonly useUncompressed?: boolean | undefined;
 }
 
 /** Helper used by redeeming script-template outputs (P2SH, P2WSH). */
 export interface ScriptRedeem extends BasePayment {
-    output?: Buffer; // script template
-    redeemVersion?: number; // tapscript leaves etc.
-    network?: Network; // network parameters (mainnet if omitted)
+    readonly output?: Script | undefined; // script template
+    readonly redeemVersion?: number | undefined; // tapscript leaves etc.
+    readonly network?: Network | undefined; // network parameters (mainnet if omitted)
 }
 
 export interface P2PKPayment extends BasePayment {
-    name: PaymentType.P2PK;
-    pubkey?: Buffer;
+    readonly name: typeof PaymentType.P2PK;
+    readonly pubkey?: PublicKey | undefined;
     /** DER-encoded sig – empty until signed. */
-    signature?: Buffer;
+    readonly signature?: Signature | undefined;
 }
 
 export interface P2PKHPayment extends BasePayment {
-    name: PaymentType.P2PKH;
+    readonly name: typeof PaymentType.P2PKH;
     /** RIPEMD-160(SHA-256(pubkey)) – 20 bytes. */
-    hash?: Buffer;
-    pubkey?: Buffer;
-    signature?: Buffer;
+    readonly hash?: Bytes20 | undefined;
+    readonly pubkey?: PublicKey | undefined;
+    readonly signature?: Signature | undefined;
 }
 
 export interface P2SHPayment extends BasePayment {
-    name: PaymentType.P2SH;
+    /** Dynamic name like 'p2sh' or 'p2sh-p2wpkh' for nested types */
+    readonly name: string;
     /** Hash160 of a redeem script. */
-    hash?: Buffer;
+    readonly hash?: Bytes20 | undefined;
 
     /** The entire signature stack when spending a P2SH (non-segwit). */
-    signatures?: Buffer[];
+    readonly signatures?: Uint8Array[] | undefined;
 }
 
 export interface P2MSPayment extends BasePayment {
-    name: PaymentType.P2MS;
+    /** Dynamic name like 'p2ms' or 'p2ms(2 of 3)' with M-of-N parameters */
+    readonly name: string;
     /** M-of-N parameters. */
-    m?: number;
-    n?: number;
-    pubkeys?: Buffer[];
-    signatures?: Buffer[];
+    readonly m?: number | undefined;
+    readonly n?: number | undefined;
+    readonly pubkeys?: PublicKey[] | undefined;
+    readonly signatures?: Signature[] | undefined;
 }
 
 export interface P2WPKHPayment extends BasePayment {
-    name: PaymentType.P2WPKH;
+    readonly name: typeof PaymentType.P2WPKH;
     /** 20-byte witness program. */
-    hash?: Buffer;
-    pubkey?: Buffer;
-    signature?: Buffer;
+    readonly hash?: Bytes20 | undefined;
+    readonly pubkey?: PublicKey | undefined;
+    readonly signature?: Signature | undefined;
 }
 
 export interface P2WSHPayment extends BasePayment {
-    name: PaymentType.P2WSH;
+    /** Dynamic name like 'p2wsh' or 'p2wsh-p2pk' for nested types */
+    readonly name: string;
     /** 32-byte witness program. */
-    hash?: Buffer;
-    redeem?: ScriptRedeem;
+    readonly hash?: Bytes32 | undefined;
+    readonly redeem?: ScriptRedeem | undefined;
 }
 
 export interface P2TRPayment extends BasePayment {
-    name: PaymentType.P2TR;
+    readonly name: typeof PaymentType.P2TR;
     /** x-only pubkey that commits to the tree. */
-    pubkey?: Buffer;
+    readonly pubkey?: XOnlyPublicKey | undefined;
     /** Internal (untweaked) x-only pubkey. */
-    internalPubkey?: Buffer;
+    readonly internalPubkey?: XOnlyPublicKey | undefined;
     /** Merkle-root tweak, present when a script path exists. */
-    hash?: Buffer;
+    readonly hash?: Bytes32 | undefined;
     /** Full taptree description (optional, dev-side). */
-    scriptTree?: Taptree;
+    readonly scriptTree?: Taptree | undefined;
     /** Key-path sig or leading stack elem. */
-    signature?: Buffer;
+    readonly signature?: SchnorrSignature | undefined;
 
-    redeemVersion?: number; // tapscript leaves etc.
-    redeem?: ScriptRedeem;
+    readonly redeemVersion?: number | undefined; // tapscript leaves etc.
+    readonly redeem?: ScriptRedeem | undefined;
 }
 
 export interface P2OPPayment extends BasePayment {
-    name: PaymentType.P2OP;
+    readonly name: typeof PaymentType.P2OP;
     /** <deploymentVersion || HASH160(payload)> (2–40 bytes). */
-    program?: Buffer;
-    deploymentVersion: number | undefined;
+    readonly program?: Uint8Array | undefined;
+    readonly deploymentVersion?: number | undefined;
     /** Convenience slice of `program` (20 bytes for current spec). */
-    hash160?: Buffer;
+    readonly hash160?: Bytes20 | undefined;
 }
 
 export interface P2OPPaymentParams extends Omit<P2OPPayment, 'name' | 'deploymentVersion'> {
-    deploymentVersion?: number;
+    readonly deploymentVersion?: number | undefined;
 }
 
 /** OP_RETURN data-carrying output */
 export interface EmbedPayment extends BasePayment {
-    name: PaymentType.Embed;
+    readonly name: typeof PaymentType.Embed;
     /** Raw pushed chunks after OP_RETURN. */
-    data: Buffer[];
+    readonly data: Uint8Array[];
     // `output` is automatically derived from `data` (or vice-versa)
 }
 
@@ -149,6 +163,6 @@ export type Payment =
 export type PaymentCreator = <T extends BasePayment>(a: T, opts?: PaymentOpts) => T;
 
 export interface PaymentOpts {
-    validate?: boolean;
-    allowIncomplete?: boolean;
+    readonly validate?: boolean;
+    readonly allowIncomplete?: boolean;
 }

package/src/psbt/bip371.ts

@@ -1,4 +1,4 @@
-import {
+import type {
     PsbtInput,
     PsbtOutput,
     TapInternalKey,
@@ -6,7 +6,7 @@ import {
     TapLeafScript,
     TapScriptSig,
     TapTree,
-} from 'bip174/src/lib/interfaces.js';
+} from 'bip174';
 import {
     LEAF_VERSION_TAPSCRIPT,
     MAX_TAPTREE_DEPTH,
@@ -15,9 +15,10 @@ import {
     tweakKey,
 } from '../payments/bip341.js';
 import { p2tr } from '../payments/p2tr.js';
-import { toXOnly } from '../pubkey.js';
 import { Transaction } from '../transaction.js';
-import { isTapleaf, isTaptree, Tapleaf, Taptree } from '../types.js';
+import type { Bytes32, Tapleaf, Taptree, XOnlyPublicKey } from '../types.js';
+import { isTapleaf, isTaptree } from '../types.js';
+import { concat, equals } from '../io/index.js';
 import {
     isP2TR,
     pubkeyPositionInScript,
@@ -26,7 +27,7 @@ import {
 } from './psbtutils.js';
 
 interface PsbtOutputWithScript extends PsbtOutput {
-    script?: Buffer;
+    script?: Uint8Array;
 }
 
 /**
@@ -41,25 +42,27 @@ interface PsbtOutputWithScript extends PsbtOutput {
 export function tapScriptFinalizer(
     inputIndex: number,
     input: PsbtInput,
-    tapLeafHashToFinalize?: Buffer,
+    tapLeafHashToFinalize?: Uint8Array,
 ): {
-    finalScriptWitness: Buffer | undefined;
+    finalScriptWitness: Uint8Array | undefined;
 } {
     const tapLeaf = findTapLeafToFinalize(input, inputIndex, tapLeafHashToFinalize);
 
     try {
         const sigs = sortSignatures(input, tapLeaf);
-        const witness = sigs.concat(tapLeaf.script).concat(tapLeaf.controlBlock);
+        const witness = sigs
+            .concat(new Uint8Array(tapLeaf.script))
+            .concat(new Uint8Array(tapLeaf.controlBlock));
         return { finalScriptWitness: witnessStackToScriptWitness(witness) };
     } catch (err) {
         throw new Error(`Can not finalize taproot input #${inputIndex}: ${err}`);
     }
 }
 
-export function serializeTaprootSignature(sig: Buffer, sighashType?: number): Buffer {
-    const sighashTypeByte = sighashType ? Buffer.from([sighashType]) : Buffer.from([]);
+export function serializeTaprootSignature(sig: Uint8Array, sighashType?: number): Uint8Array {
+    const sighashTypeByte = sighashType ? new Uint8Array([sighashType]) : new Uint8Array(0);
 
-    return Buffer.concat([sig, sighashTypeByte]);
+    return concat([sig, sighashTypeByte]);
 }
 
 export function isTaprootInput(input: PsbtInput): boolean {
@@ -70,12 +73,12 @@ export function isTaprootInput(input: PsbtInput): boolean {
             input.tapMerkleRoot ||
             (input.tapLeafScript && input.tapLeafScript.length) ||
             (input.tapBip32Derivation && input.tapBip32Derivation.length) ||
-            (input.witnessUtxo && isP2TR(input.witnessUtxo.script))
+            (input.witnessUtxo && isP2TR(new Uint8Array(input.witnessUtxo.script)))
         )
     );
 }
 
-export function isTaprootOutput(output: PsbtOutput, script?: Buffer): boolean {
+export function isTaprootOutput(output: PsbtOutput, script?: Uint8Array): boolean {
     return (
         output &&
         !!(
@@ -117,29 +120,38 @@ function checkTaprootScriptPubkey(
     if (tapInternalKey) {
         const scriptPubkey = outputData.script;
         const script = getTaprootScripPubkey(tapInternalKey, tapTree);
-        if (scriptPubkey && !scriptPubkey.equals(script))
+        if (scriptPubkey && !equals(scriptPubkey, script))
             throw new Error('Error adding output. Script or address missmatch.');
     }
 }
 
-function getTaprootScripPubkey(tapInternalKey: TapInternalKey, tapTree?: TapTree): Buffer {
+function getTaprootScripPubkey(tapInternalKey: TapInternalKey, tapTree?: TapTree): Uint8Array {
     const scriptTree = tapTree && tapTreeFromList(tapTree.leaves);
     const { output } = p2tr({
-        internalPubkey: tapInternalKey,
+        internalPubkey: new Uint8Array(tapInternalKey) as XOnlyPublicKey,
         scriptTree,
     });
     if (!output) throw new Error('Failed to generate taproot script pubkey');
     return output;
 }
 
-export function tweakInternalPubKey(inputIndex: number, input: PsbtInput): Buffer {
+export function tweakInternalPubKey(inputIndex: number, input: PsbtInput): Uint8Array {
     const tapInternalKey = input.tapInternalKey;
-    const outputKey = tapInternalKey && tweakKey(tapInternalKey, input.tapMerkleRoot);
+    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)
         throw new Error(
             `Cannot tweak tap internal key for input #${inputIndex}. Public key: ${
-                tapInternalKey && tapInternalKey.toString('hex')
+                tapInternalKeyBuf &&
+                Array.from(tapInternalKeyBuf)
+                    .map((b) => b.toString(16).padStart(2, '0'))
+                    .join('')
             }`,
         );
     return outputKey.x;
@@ -168,10 +180,10 @@ export function tapTreeToList(tree: Taptree): TapLeaf[] {
  * @returns the corresponding taptree, or throws an exception if the tree cannot be reconstructed
  */
 export function tapTreeFromList(leaves: TapLeaf[] = []): Taptree {
-    if (leaves.length === 1 && leaves[0].depth === 0)
+    if (leaves.length === 1 && leaves[0]!.depth === 0)
         return {
-            output: leaves[0].script,
-            version: leaves[0].leafVersion,
+            output: new Uint8Array(leaves[0]!.script),
+            version: leaves[0]!.leafVersion,
         };
 
     return insertLeavesInTree(leaves);
@@ -182,8 +194,8 @@ export function checkTaprootInputForSigs(input: PsbtInput, action: string): bool
     return sigs.some((sig) => signatureBlocksAction(sig, decodeSchnorrSignature, action));
 }
 
-function decodeSchnorrSignature(signature: Buffer): {
-    signature: Buffer;
+function decodeSchnorrSignature(signature: Uint8Array): {
+    signature: Uint8Array;
     hashType: number;
 } {
     return {
@@ -192,23 +204,27 @@ function decodeSchnorrSignature(signature: Buffer): {
     };
 }
 
-function extractTaprootSigs(input: PsbtInput): Buffer[] {
-    const sigs: Buffer[] = [];
-    if (input.tapKeySig) sigs.push(input.tapKeySig);
-    if (input.tapScriptSig) sigs.push(...input.tapScriptSig.map((s) => s.signature));
+function extractTaprootSigs(input: PsbtInput): Uint8Array[] {
+    const sigs: Uint8Array[] = [];
+    if (input.tapKeySig) sigs.push(new Uint8Array(input.tapKeySig));
+    if (input.tapScriptSig)
+        sigs.push(...input.tapScriptSig.map((s) => new Uint8Array(s.signature)));
     if (!sigs.length) {
-        const finalTapKeySig = getTapKeySigFromWitness(input.finalScriptWitness);
+        const finalTapKeySig = getTapKeySigFromWitness(
+            input.finalScriptWitness ? new Uint8Array(input.finalScriptWitness) : undefined,
+        );
         if (finalTapKeySig) sigs.push(finalTapKeySig);
     }
 
     return sigs;
 }
 
-export function getTapKeySigFromWitness(finalScriptWitness?: Buffer): Buffer | undefined {
+export function getTapKeySigFromWitness(finalScriptWitness?: Uint8Array): Uint8Array | undefined {
     if (!finalScriptWitness) return;
     const witness = finalScriptWitness.subarray(2);
     // todo: add schnorr signature validation
     if (witness.length === 64 || witness.length === 65) return witness;
+    return undefined;
 }
 
 function _tapTreeToList(tree: Taptree, leaves: TapLeaf[] = [], depth = 0): TapLeaf[] {
@@ -245,7 +261,7 @@ function insertLeafInTree(leaf: TapLeaf, tree?: PartialTaptree, depth = 0): Part
     if (leaf.depth === depth) {
         if (!tree)
             return {
-                output: leaf.script,
+                output: new Uint8Array(leaf.script),
                 version: leaf.leafVersion,
             };
         return;
@@ -257,6 +273,7 @@ function insertLeafInTree(leaf: TapLeaf, tree?: PartialTaptree, depth = 0): Part
 
     const rightSide = insertLeafInTree(leaf, tree && tree[1], depth + 1);
     if (rightSide) return [tree && tree[0], rightSide];
+    return undefined;
 }
 
 function checkMixedTaprootAndNonTaprootInputFields(
@@ -307,17 +324,19 @@ function checkMixedTaprootAndNonTaprootOutputFields(
  */
 function checkIfTapLeafInTree(inputData: PsbtInput, newInputData: PsbtInput, action: string): void {
     if (newInputData.tapMerkleRoot) {
+        const merkleRoot = new Uint8Array(newInputData.tapMerkleRoot);
         const newLeafsInTree = (newInputData.tapLeafScript || []).every((l) =>
-            isTapLeafInTree(l, newInputData.tapMerkleRoot),
+            isTapLeafInTree(l, merkleRoot),
         );
         const oldLeafsInTree = (inputData.tapLeafScript || []).every((l) =>
-            isTapLeafInTree(l, newInputData.tapMerkleRoot),
+            isTapLeafInTree(l, merkleRoot),
         );
         if (!newLeafsInTree || !oldLeafsInTree)
             throw new Error(`Invalid arguments for Psbt.${action}. Tapleaf not part of taptree.`);
     } else if (inputData.tapMerkleRoot) {
+        const merkleRoot = new Uint8Array(inputData.tapMerkleRoot);
         const newLeafsInTree = (newInputData.tapLeafScript || []).every((l) =>
-            isTapLeafInTree(l, inputData.tapMerkleRoot),
+            isTapLeafInTree(l, merkleRoot),
         );
         if (!newLeafsInTree)
             throw new Error(`Invalid arguments for Psbt.${action}. Tapleaf not part of taptree.`);
@@ -330,16 +349,16 @@ function checkIfTapLeafInTree(inputData: PsbtInput, newInputData: PsbtInput, act
  * @param merkleRoot The Merkle root of the tree. If not provided, the function assumes the TapLeafScript is present.
  * @returns A boolean indicating whether the TapLeafScript is present in the tree.
  */
-function isTapLeafInTree(tapLeaf: TapLeafScript, merkleRoot?: Buffer): boolean {
+function isTapLeafInTree(tapLeaf: TapLeafScript, merkleRoot?: Uint8Array): boolean {
     if (!merkleRoot) return true;
 
     const leafHash = tapleafHash({
-        output: tapLeaf.script,
+        output: new Uint8Array(tapLeaf.script),
         version: tapLeaf.leafVersion,
     });
 
-    const rootHash = rootHashFromPath(tapLeaf.controlBlock, leafHash);
-    return rootHash.equals(merkleRoot);
+    const rootHash = rootHashFromPath(new Uint8Array(tapLeaf.controlBlock), leafHash);
+    return equals(rootHash, merkleRoot);
 }
 
 /**
@@ -347,19 +366,20 @@ function isTapLeafInTree(tapLeaf: TapLeafScript, merkleRoot?: Buffer): boolean {
  *
  * @param input - The PsbtInput object.
  * @param tapLeaf - The TapLeafScript object.
- * @returns An array of sorted signatures as Buffers.
+ * @returns An array of sorted signatures as Uint8Arrays.
  */
-function sortSignatures(input: PsbtInput, tapLeaf: TapLeafScript): Buffer[] {
+function sortSignatures(input: PsbtInput, tapLeaf: TapLeafScript): Uint8Array[] {
+    const tapLeafScript = new Uint8Array(tapLeaf.script);
     const leafHash = tapleafHash({
-        output: tapLeaf.script,
+        output: tapLeafScript,
         version: tapLeaf.leafVersion,
     });
 
     return (input.tapScriptSig || [])
-        .filter((tss) => tss.leafHash.equals(leafHash))
-        .map((tss) => addPubkeyPositionInScript(tapLeaf.script, tss))
+        .filter((tss) => equals(new Uint8Array(tss.leafHash), leafHash))
+        .map((tss) => addPubkeyPositionInScript(tapLeafScript, tss))
         .sort((t1, t2) => t2.positionInScript - t1.positionInScript)
-        .map((t) => t.signature);
+        .map((t) => new Uint8Array(t.signature));
 }
 
 /**
@@ -368,10 +388,10 @@ function sortSignatures(input: PsbtInput, tapLeaf: TapLeafScript): Buffer[] {
  * @param tss The TapScriptSig object to add the position to.
  * @returns A TapScriptSigWitPosition object with the added position.
  */
-function addPubkeyPositionInScript(script: Buffer, tss: TapScriptSig): TapScriptSigWitPosition {
+function addPubkeyPositionInScript(script: Uint8Array, tss: TapScriptSig): TapScriptSigWitPosition {
     return Object.assign(
         {
-            positionInScript: pubkeyPositionInScript(tss.pubkey, script),
+            positionInScript: pubkeyPositionInScript(new Uint8Array(tss.pubkey), script),
         },
         tss,
     ) as TapScriptSigWitPosition;
@@ -383,7 +403,7 @@ function addPubkeyPositionInScript(script: Buffer, tss: TapScriptSig): TapScript
 function findTapLeafToFinalize(
     input: PsbtInput,
     inputIndex: number,
-    leafHashToFinalize?: Buffer,
+    leafHashToFinalize?: Uint8Array,
 ): TapLeafScript {
     const { tapScriptSig } = input;
     if (!tapScriptSig || !tapScriptSig.length)
@@ -413,15 +433,16 @@ function findTapLeafToFinalize(
 function canFinalizeLeaf(
     leaf: TapLeafScript,
     tapScriptSig: TapScriptSig[],
-    hash?: Buffer,
+    hash?: Uint8Array,
 ): boolean {
     const leafHash = tapleafHash({
-        output: leaf.script,
+        output: new Uint8Array(leaf.script),
         version: leaf.leafVersion,
     });
-    const whiteListedHash = !hash || hash.equals(leafHash);
+    const whiteListedHash = !hash || equals(hash, leafHash);
     return (
-        whiteListedHash && tapScriptSig.find((tss) => tss.leafHash.equals(leafHash)) !== undefined
+        whiteListedHash &&
+        tapScriptSig.find((tss) => equals(new Uint8Array(tss.leafHash), leafHash)) !== undefined
     );
 }