@btc-vision/bitcoin 6.5.2 → 6.5.4

package/src/payments/index.ts

@@ -6,167 +6,43 @@
  * @packageDocumentation
  */
 
-import type { Network } from '../networks.js';
-import type { Taptree } from '../types.js';
-
-export * from './bip341.js';
-export * from './embed.js';
-export * from './lazy.js';
-export * from './p2ms.js';
-export * from './p2pk.js';
-export * from './p2pkh.js';
-export * from './p2sh.js';
-export * from './p2tr.js';
-export * from './p2wpkh.js';
-export * from './p2wsh.js';
-export * from './p2op.js';
-
-export enum PaymentType {
-    P2PK = 'p2pk',
-    P2PKH = 'p2pkh',
-    P2SH = 'p2sh',
-    P2MS = 'p2ms',
-    P2WPKH = 'p2wpkh',
-    P2WSH = 'p2wsh',
-    P2TR = 'p2tr',
-    P2OP = 'p2op',
-    Embed = 'embed',
-    ScriptRedeem = 'scriptRedeem',
-}
-
-export interface BasePayment {
-    /** Convenience label, also the discriminant for the union. */
-    name?: PaymentType;
-    /** Network parameters (mainnet if omitted). */
-    network?: Network;
-    /** Fully-assembled scriptPubKey (if already known). */
-    output?: Buffer;
-    /** Raw scriptSig (legacy script types only). */
-    input?: Buffer;
-    /** Human-readable address (if already known). */
-    address?: string;
-    /** Segwit stack (empty for legacy). */
-    witness?: Buffer[];
-
-    /** Script template for P2SH, P2WSH, P2TR, etc. */
-    redeem?: ScriptRedeem;
-
-    /** Non-standard options used by some wallets. */
-    useHybrid?: boolean;
-    useUncompressed?: boolean;
-}
-
-/** 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)
-}
-
-export interface P2PKPayment extends BasePayment {
-    name: PaymentType.P2PK;
-    pubkey?: Buffer;
-    /** DER-encoded sig – empty until signed. */
-    signature?: Buffer;
-}
-
-export interface P2PKHPayment extends BasePayment {
-    name: PaymentType.P2PKH;
-    /** RIPEMD-160(SHA-256(pubkey)) – 20 bytes. */
-    hash?: Buffer;
-    pubkey?: Buffer;
-    signature?: Buffer;
-}
-
-export interface P2SHPayment extends BasePayment {
-    name: PaymentType.P2SH;
-    /** Hash160 of a redeem script. */
-    hash?: Buffer;
-
-    /** The entire signature stack when spending a P2SH (non-segwit). */
-    signatures?: Buffer[];
-}
-
-export interface P2MSPayment extends BasePayment {
-    name: PaymentType.P2MS;
-    /** M-of-N parameters. */
-    m?: number;
-    n?: number;
-    pubkeys?: Buffer[];
-    signatures?: Buffer[];
-}
-
-export interface P2WPKHPayment extends BasePayment {
-    name: PaymentType.P2WPKH;
-    /** 20-byte witness program. */
-    hash?: Buffer;
-    pubkey?: Buffer;
-    signature?: Buffer;
-}
-
-export interface P2WSHPayment extends BasePayment {
-    name: PaymentType.P2WSH;
-    /** 32-byte witness program. */
-    hash?: Buffer;
-    redeem?: ScriptRedeem;
-}
-
-export interface P2TRPayment extends BasePayment {
-    name: PaymentType.P2TR;
-    /** x-only pubkey that commits to the tree. */
-    pubkey?: Buffer;
-    /** Internal (untweaked) x-only pubkey. */
-    internalPubkey?: Buffer;
-    /** Merkle-root tweak, present when a script path exists. */
-    hash?: Buffer;
-    /** Full taptree description (optional, dev-side). */
-    scriptTree?: Taptree;
-    /** Key-path sig or leading stack elem. */
-    signature?: Buffer;
-
-    redeemVersion?: number; // tapscript leaves etc.
-    redeem?: ScriptRedeem;
-}
-
-export interface P2OPPayment extends BasePayment {
-    name: PaymentType.P2OP;
-    /** <deploymentVersion || HASH160(payload)> (2–40 bytes). */
-    program?: Buffer;
-    deploymentVersion: number | undefined;
-    /** Convenience slice of `program` (20 bytes for current spec). */
-    hash160?: Buffer;
-}
-
-/** OP_RETURN data-carrying output */
-export interface EmbedPayment extends BasePayment {
-    name: PaymentType.Embed;
-    /** Raw pushed chunks after OP_RETURN. */
-    data: Buffer[];
-    // `output` is automatically derived from `data` (or vice-versa)
-}
-
-export type Payment =
-    | P2PKPayment
-    | P2PKHPayment
-    | P2SHPayment
-    | P2MSPayment
-    | P2WPKHPayment
-    | P2WSHPayment
-    | P2TRPayment
-    | P2OPPayment
-    | EmbedPayment
-    | ScriptRedeem;
-
-export type PaymentCreator = <T extends BasePayment>(a: T, opts?: PaymentOpts) => T;
-
-export interface PaymentOpts {
-    validate?: boolean;
-    allowIncomplete?: boolean;
-}
-
-export type StackElement = Buffer | number;
-export type Stack = StackElement[];
-export type StackFunction = () => Stack;
-
-// TODO
-// witness commitment
+export {
+    PaymentType,
+    type BasePayment,
+    type ScriptRedeem,
+    type P2PKPayment,
+    type P2PKHPayment,
+    type P2SHPayment,
+    type P2MSPayment,
+    type P2WPKHPayment,
+    type P2WSHPayment,
+    type P2TRPayment,
+    type P2OPPayment,
+    type P2OPPaymentParams,
+    type EmbedPayment,
+    type Payment,
+    type PaymentCreator,
+    type PaymentOpts,
+} from './types.js';
+
+export { p2data } from './embed.js';
+export { prop, value } from './lazy.js';
+export { p2ms } from './p2ms.js';
+export { p2pk } from './p2pk.js';
+export { p2pkh } from './p2pkh.js';
+export { p2sh } from './p2sh.js';
+export { p2tr } from './p2tr.js';
+export { p2wpkh } from './p2wpkh.js';
+export { p2wsh } from './p2wsh.js';
+export { p2op } from './p2op.js';
+
+export {
+    findScriptPath,
+    LEAF_VERSION_TAPSCRIPT,
+    MAX_TAPTREE_DEPTH,
+    rootHashFromPath,
+    tapleafHash,
+    toHashTree,
+    tweakKey,
+    type HashTree,
+} from './bip341.js';

package/src/payments/p2ms.ts

@@ -1,7 +1,7 @@
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
-import { isPoint, stacksEqual, typeforce as typef } from '../types.js';
-import { P2MSPayment, PaymentOpts, PaymentType, Stack } from './index.js';
+import { isPoint, stacksEqual, typeforce as typef, type Stack } from '../types.js';
+import { P2MSPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
 
 const OPS = bscript.opcodes;

package/src/payments/p2op.ts

@@ -1,11 +1,11 @@
 import { bech32m } from 'bech32';
 import { Buffer as NBuffer } from 'buffer';
-import { fromBech32 } from '../address.js';
+import { fromBech32 } from '../bech32utils.js';
 import { bitcoin as BITCOIN_NETWORK, Network } from '../networks.js';
 import * as bscript from '../script.js';
 import { typeforce as typef } from '../types.js';
+import { BasePayment, P2OPPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
-import { BasePayment, P2OPPayment, PaymentOpts, PaymentType } from './index.js';
 
 const OPS = bscript.opcodes;
 const P2OP_WITNESS_VERSION = 0x10;

package/src/payments/p2pk.ts

@@ -1,7 +1,7 @@
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
-import { isPoint, typeforce as typef } from '../types.js';
-import { P2PKPayment, PaymentOpts, PaymentType, StackFunction } from './index.js';
+import { isPoint, typeforce as typef, type StackFunction } from '../types.js';
+import { P2PKPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
 
 const OPS = bscript.opcodes;

package/src/payments/p2pkh.ts

@@ -1,11 +1,11 @@
 import * as bs58check from 'bs58check';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
+import { decompressPublicKey } from '../pubkey.js';
 import * as bscript from '../script.js';
-import { isPoint, typeforce as typef } from '../types.js';
-import { P2PKHPayment, PaymentOpts, PaymentType, StackFunction } from './index.js';
+import { isPoint, typeforce as typef, type StackFunction } from '../types.js';
+import { P2PKHPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
-import { decompressPublicKey } from '../psbt/psbtutils.js';
 
 const OPS = bscript.opcodes;
 

package/src/payments/p2sh.ts

@@ -2,16 +2,8 @@ import * as bs58check from 'bs58check';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
-import { stacksEqual, typeforce as typef } from '../types.js';
-import {
-    P2SHPayment,
-    Payment,
-    PaymentOpts,
-    PaymentType,
-    ScriptRedeem,
-    Stack,
-    StackFunction,
-} from './index.js';
+import { stacksEqual, typeforce as typef, type Stack, type StackFunction } from '../types.js';
+import { P2SHPayment, Payment, PaymentOpts, PaymentType, ScriptRedeem } from './types.js';
 import * as lazy from './lazy.js';
 
 const OPS = bscript.opcodes;

package/src/payments/p2tr.ts

@@ -1,6 +1,6 @@
 import { bech32m } from 'bech32';
 import { Buffer as NBuffer } from 'buffer';
-import { fromBech32 } from '../address.js';
+import { fromBech32 } from '../bech32utils.js';
 import { getEccLib } from '../ecc_lib.js';
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
@@ -13,7 +13,7 @@ import {
     toHashTree,
     tweakKey,
 } from './bip341.js';
-import { P2TRPayment, PaymentOpts, PaymentType } from './index.js';
+import { P2TRPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
 
 const OPS = bscript.opcodes;

package/src/payments/p2wpkh.ts

@@ -3,7 +3,7 @@ import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
 import { isPoint, typeforce as typef } from '../types.js';
-import { P2WPKHPayment, PaymentOpts, PaymentType } from './index.js';
+import { P2WPKHPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
 
 const OPS = bscript.opcodes;

package/src/payments/p2wsh.ts

@@ -2,8 +2,14 @@ import { bech32 } from 'bech32';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
-import { isPoint, stacksEqual, typeforce as typef } from '../types.js';
-import { P2WSHPayment, PaymentOpts, PaymentType, StackElement, StackFunction } from './index.js';
+import {
+    isPoint,
+    stacksEqual,
+    typeforce as typef,
+    type StackElement,
+    type StackFunction,
+} from '../types.js';
+import { P2WSHPayment, PaymentOpts, PaymentType } from './types.js';
 import * as lazy from './lazy.js';
 
 const OPS = bscript.opcodes;

package/src/payments/types.ts

@@ -0,0 +1,154 @@
+/**
+ * Payment types and interfaces
+ * @packageDocumentation
+ */
+
+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',
+}
+
+export interface BasePayment {
+    /** Convenience label, also the discriminant for the union. */
+    name?: PaymentType;
+    /** Network parameters (mainnet if omitted). */
+    network?: Network;
+    /** Fully-assembled scriptPubKey (if already known). */
+    output?: Buffer;
+    /** Raw scriptSig (legacy script types only). */
+    input?: Buffer;
+    /** Human-readable address (if already known). */
+    address?: string;
+    /** Segwit stack (empty for legacy). */
+    witness?: Buffer[];
+
+    /** Script template for P2SH, P2WSH, P2TR, etc. */
+    redeem?: ScriptRedeem;
+
+    /** Non-standard options used by some wallets. */
+    useHybrid?: boolean;
+    useUncompressed?: boolean;
+}
+
+/** 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)
+}
+
+export interface P2PKPayment extends BasePayment {
+    name: PaymentType.P2PK;
+    pubkey?: Buffer;
+    /** DER-encoded sig – empty until signed. */
+    signature?: Buffer;
+}
+
+export interface P2PKHPayment extends BasePayment {
+    name: PaymentType.P2PKH;
+    /** RIPEMD-160(SHA-256(pubkey)) – 20 bytes. */
+    hash?: Buffer;
+    pubkey?: Buffer;
+    signature?: Buffer;
+}
+
+export interface P2SHPayment extends BasePayment {
+    name: PaymentType.P2SH;
+    /** Hash160 of a redeem script. */
+    hash?: Buffer;
+
+    /** The entire signature stack when spending a P2SH (non-segwit). */
+    signatures?: Buffer[];
+}
+
+export interface P2MSPayment extends BasePayment {
+    name: PaymentType.P2MS;
+    /** M-of-N parameters. */
+    m?: number;
+    n?: number;
+    pubkeys?: Buffer[];
+    signatures?: Buffer[];
+}
+
+export interface P2WPKHPayment extends BasePayment {
+    name: PaymentType.P2WPKH;
+    /** 20-byte witness program. */
+    hash?: Buffer;
+    pubkey?: Buffer;
+    signature?: Buffer;
+}
+
+export interface P2WSHPayment extends BasePayment {
+    name: PaymentType.P2WSH;
+    /** 32-byte witness program. */
+    hash?: Buffer;
+    redeem?: ScriptRedeem;
+}
+
+export interface P2TRPayment extends BasePayment {
+    name: PaymentType.P2TR;
+    /** x-only pubkey that commits to the tree. */
+    pubkey?: Buffer;
+    /** Internal (untweaked) x-only pubkey. */
+    internalPubkey?: Buffer;
+    /** Merkle-root tweak, present when a script path exists. */
+    hash?: Buffer;
+    /** Full taptree description (optional, dev-side). */
+    scriptTree?: Taptree;
+    /** Key-path sig or leading stack elem. */
+    signature?: Buffer;
+
+    redeemVersion?: number; // tapscript leaves etc.
+    redeem?: ScriptRedeem;
+}
+
+export interface P2OPPayment extends BasePayment {
+    name: PaymentType.P2OP;
+    /** <deploymentVersion || HASH160(payload)> (2–40 bytes). */
+    program?: Buffer;
+    deploymentVersion: number | undefined;
+    /** Convenience slice of `program` (20 bytes for current spec). */
+    hash160?: Buffer;
+}
+
+export interface P2OPPaymentParams extends Omit<P2OPPayment, 'name' | 'deploymentVersion'> {
+    deploymentVersion?: number;
+}
+
+/** OP_RETURN data-carrying output */
+export interface EmbedPayment extends BasePayment {
+    name: PaymentType.Embed;
+    /** Raw pushed chunks after OP_RETURN. */
+    data: Buffer[];
+    // `output` is automatically derived from `data` (or vice-versa)
+}
+
+export type Payment =
+    | P2PKPayment
+    | P2PKHPayment
+    | P2SHPayment
+    | P2MSPayment
+    | P2WPKHPayment
+    | P2WSHPayment
+    | P2TRPayment
+    | P2OPPayment
+    | EmbedPayment
+    | ScriptRedeem;
+
+export type PaymentCreator = <T extends BasePayment>(a: T, opts?: PaymentOpts) => T;
+
+export interface PaymentOpts {
+    validate?: boolean;
+    allowIncomplete?: boolean;
+}

package/src/psbt/bip371.ts

@@ -7,14 +7,6 @@ import {
     TapScriptSig,
     TapTree,
 } from 'bip174/src/lib/interfaces.js';
-import { isTapleaf, isTaptree, Tapleaf, Taptree } from '../types.js';
-
-interface PsbtOutputWithScript extends PsbtOutput {
-    script?: Buffer;
-}
-
-import { Transaction } from '../transaction.js';
-
 import {
     LEAF_VERSION_TAPSCRIPT,
     MAX_TAPTREE_DEPTH,
@@ -23,6 +15,9 @@ 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 {
     isP2TR,
     pubkeyPositionInScript,
@@ -30,11 +25,9 @@ import {
     witnessStackToScriptWitness,
 } from './psbtutils.js';
 
-export const toXOnly = (pubKey: Buffer | Uint8Array): Buffer => {
-    const buffer = pubKey.length === 32 ? pubKey : pubKey.subarray(1, 33);
-
-    return Buffer.isBuffer(buffer) ? buffer : Buffer.from(buffer);
-};
+interface PsbtOutputWithScript extends PsbtOutput {
+    script?: Buffer;
+}
 
 /**
  * Default tapscript finalizer. It searches for the `tapLeafHashToFinalize` if provided.

package/src/psbt/psbtutils.ts

@@ -1,4 +1,3 @@
-import { ProjectivePoint } from '@noble/secp256k1';
 import * as varuint from 'bip174/src/lib/converter/varint.js';
 import { PartialSig, PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { hash160 } from '../crypto.js';
@@ -9,10 +8,10 @@ import { p2sh } from '../payments/p2sh.js';
 import { p2tr } from '../payments/p2tr.js';
 import { p2wpkh } from '../payments/p2wpkh.js';
 import { p2wsh } from '../payments/p2wsh.js';
+import { p2op } from '../payments/p2op.js';
+import { decompressPublicKey, pubkeysMatch, toXOnly } from '../pubkey.js';
 import * as bscript from '../script.js';
 import { Transaction } from '../transaction.js';
-import { toXOnly } from './bip371.js';
-import { p2op } from '../payments/p2op.js';
 
 type PaymentFunction = (opts: { output: Buffer }) => unknown;
 
@@ -85,107 +84,6 @@ export function witnessStackToScriptWitness(witness: Buffer[]): Buffer {
     return buffer;
 }
 
-export interface UncompressedPublicKey {
-    hybrid: Buffer;
-    uncompressed: Buffer;
-}
-
-/**
- * Converts an existing real Bitcoin public key (compressed or uncompressed)
- * to its "hybrid" form (prefix 0x06/0x07), then derives a P2PKH address from it.
- *
- * @param realPubKey - 33-byte compressed (0x02/0x03) or 65-byte uncompressed (0x04) pubkey
- * @returns Buffer | undefined
- */
-export function decompressPublicKey(
-    realPubKey: Uint8Array | Buffer,
-): UncompressedPublicKey | undefined {
-    if (realPubKey.length === 32) {
-        return;
-    }
-
-    if (![33, 65].includes(realPubKey.length)) {
-        console.warn(
-            `Unsupported key length=${realPubKey.length}. Must be 33 (compressed) or 65 (uncompressed).`,
-        );
-
-        /*throw new Error(
-            `Unsupported key length=${realPubKey.length}. Must be 33 (compressed) or 65 (uncompressed).`,
-        );*/
-        return;
-    }
-
-    // 1) Parse the public key to get an actual Point on secp256k1
-    //    If it fails, the pubkey is invalid/corrupted.
-    let point: ProjectivePoint;
-    try {
-        point = ProjectivePoint.fromHex(realPubKey);
-    } catch (err) {
-        throw new Error('Invalid secp256k1 public key bytes. Cannot parse.');
-    }
-
-    // 2) Extract X and Y as 32-byte big-endian buffers
-    const xBuf = bigIntTo32Bytes(point.x);
-    const yBuf = bigIntTo32Bytes(point.y);
-
-    // 3) Determine if Y is even or odd. That decides the hybrid prefix:
-    //    - 0x06 => "uncompressed + even Y"
-    //    - 0x07 => "uncompressed + odd Y"
-    const isEven = point.y % 2n === 0n;
-    const prefix = isEven ? 0x06 : 0x07;
-
-    // 4) Construct 65-byte hybrid pubkey
-    //    [prefix(1) || X(32) || Y(32)]
-    const hybridPubKey = Buffer.alloc(65);
-    hybridPubKey[0] = prefix;
-    xBuf.copy(hybridPubKey, 1);
-    yBuf.copy(hybridPubKey, 33);
-
-    const uncompressedPubKey = Buffer.concat([Buffer.from([0x04]), xBuf, yBuf]);
-
-    return {
-        hybrid: hybridPubKey,
-        uncompressed: uncompressedPubKey,
-    };
-}
-
-/****************************************
- * Convert bigint -> 32-byte Buffer
- ****************************************/
-export function bigIntTo32Bytes(num: bigint): Buffer {
-    let hex = num.toString(16);
-    // Pad to 64 hex chars => 32 bytes
-    hex = hex.padStart(64, '0');
-    // In case it's bigger than 64 chars, slice the rightmost 64 (mod 2^256)
-    if (hex.length > 64) {
-        hex = hex.slice(-64);
-    }
-    return Buffer.from(hex, 'hex');
-}
-
-/**
- * Compare two potential pubkey Buffers, treating hybrid keys (0x06/0x07)
- * as equivalent to uncompressed (0x04).
- */
-export function pubkeysMatch(a: Buffer, b: Buffer): boolean {
-    // If they’re literally the same bytes, no further check needed
-    if (a.equals(b)) return true;
-
-    // If both are 65 bytes, see if one is hybrid and the other is uncompressed
-    if (a.length === 65 && b.length === 65) {
-        const aCopy = Buffer.from(a);
-        const bCopy = Buffer.from(b);
-
-        // Convert 0x06/0x07 to 0x04
-        if (aCopy[0] === 0x06 || aCopy[0] === 0x07) aCopy[0] = 0x04;
-        if (bCopy[0] === 0x06 || bCopy[0] === 0x07) bCopy[0] = 0x04;
-
-        return aCopy.equals(bCopy);
-    }
-
-    return false;
-}
-
 /**
  * Finds the position of a public key in a script.
  * @param pubkey The public key to search for.

package/src/psbt.ts

@@ -26,8 +26,9 @@ import { BIP32Interface } from '@btc-vision/bip32';
 import { ECPairInterface } from 'ecpair';
 import { fromOutputScript, isUnknownSegwitVersion, toOutputScript } from './address.js';
 import { cloneBuffer, reverseBuffer } from './bufferutils.js';
-import { P2WSHPayment, payments } from './index.js';
 import { bitcoin as btcNetwork, Network } from './networks.js';
+import * as payments from './payments/index.js';
+import type { P2WSHPayment } from './payments/index.js';
 import { tapleafHash } from './payments/bip341.js';
 import { P2SHPayment, Payment, PaymentOpts } from './payments/index.js';
 import {
@@ -37,8 +38,8 @@ import {
     isTaprootInput,
     serializeTaprootSignature,
     tapScriptFinalizer,
-    toXOnly,
 } from './psbt/bip371.js';
+import { toXOnly } from './pubkey.js';
 import {
     checkInputForSig,
     isP2MS,