@btc-vision/bitcoin 6.4.2 → 6.4.4

package/browser/payments/embed.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2data(a: Payment, opts?: PaymentOpts): Payment;
+import { EmbedPayment, PaymentOpts } from './index.js';
+export declare function p2data(a: Omit<EmbedPayment, 'name'>, opts?: PaymentOpts): EmbedPayment;

package/browser/payments/index.d.ts

@@ -11,33 +11,90 @@ export * from './p2tr.js';
 export * from './p2wpkh.js';
 export * from './p2wsh.js';
 export * from './p2op.js';
-export interface Payment {
-    name?: string;
+export declare 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 {
+    name?: PaymentType;
     network?: Network;
     output?: Buffer;
-    data?: Buffer[];
+    input?: Buffer;
+    address?: string;
+    witness?: Buffer[];
+    redeem?: ScriptRedeem;
+    useHybrid?: boolean;
+    useUncompressed?: boolean;
+}
+export interface ScriptRedeem extends BasePayment {
+    output?: Buffer;
+    redeemVersion?: number;
+    network?: Network;
+}
+export interface P2PKPayment extends BasePayment {
+    name: PaymentType.P2PK;
+    pubkey?: Buffer;
+    signature?: Buffer;
+}
+export interface P2PKHPayment extends BasePayment {
+    name: PaymentType.P2PKH;
+    hash?: Buffer;
+    pubkey?: Buffer;
+    signature?: Buffer;
+}
+export interface P2SHPayment extends BasePayment {
+    name: PaymentType.P2SH;
+    hash?: Buffer;
+    signatures?: Buffer[];
+}
+export interface P2MSPayment extends BasePayment {
+    name: PaymentType.P2MS;
     m?: number;
     n?: number;
     pubkeys?: Buffer[];
-    input?: Buffer;
     signatures?: Buffer[];
-    internalPubkey?: Buffer;
+}
+export interface P2WPKHPayment extends BasePayment {
+    name: PaymentType.P2WPKH;
+    hash?: Buffer;
     pubkey?: Buffer;
     signature?: Buffer;
-    address?: string;
+}
+export interface P2WSHPayment extends BasePayment {
+    name: PaymentType.P2WSH;
+    hash?: Buffer;
+    redeem?: ScriptRedeem;
+}
+export interface P2TRPayment extends BasePayment {
+    name: PaymentType.P2TR;
+    pubkey?: Buffer;
+    internalPubkey?: Buffer;
     hash?: Buffer;
-    redeem?: Payment;
-    redeemVersion?: number;
     scriptTree?: Taptree;
-    witness?: Buffer[];
-    useHybrid?: boolean;
-    useUncompressed?: boolean;
+    signature?: Buffer;
+    redeemVersion?: number;
+    redeem?: ScriptRedeem;
+}
+export interface P2OPPayment extends BasePayment {
+    name: PaymentType.P2OP;
     program?: Buffer;
-    deploymentVersion?: number;
+    deploymentVersion: number | undefined;
     hash160?: Buffer;
 }
-export type PaymentCreator = (a: Payment, opts?: PaymentOpts) => Payment;
-export type PaymentFunction = () => Payment;
+export interface EmbedPayment extends BasePayment {
+    name: PaymentType.Embed;
+    data: Buffer[];
+}
+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/browser/payments/lazy.d.ts

@@ -1,2 +1,2 @@
-export declare function prop(object: {}, name: string, f: () => any): void;
+export declare function prop<T extends {}>(object: T, name: string, f: () => T[keyof T]): void;
 export declare function value<T>(f: () => T): () => T;

package/browser/payments/p2ms.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2ms(a: Payment, opts?: PaymentOpts): Payment;
+import { P2MSPayment, PaymentOpts } from './index.js';
+export declare function p2ms(a: Omit<P2MSPayment, 'name'>, opts?: PaymentOpts): P2MSPayment;

package/browser/payments/p2op.d.ts

@@ -1,2 +1,25 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2op(a: Payment, opts?: PaymentOpts): Payment;
+import { BasePayment, P2OPPayment, PaymentOpts, PaymentType } from './index.js';
+interface P2OPBase extends BasePayment {
+    name: PaymentType.P2OP;
+}
+interface P2OP_fromOutput extends P2OPBase {
+    output: Buffer;
+    program?: undefined;
+    deploymentVersion?: undefined;
+    hash160?: undefined;
+}
+interface P2OP_fromProgram extends P2OPBase {
+    program: Buffer;
+    output?: undefined;
+    deploymentVersion?: never;
+    hash160?: never;
+}
+interface P2OP_fromParts extends P2OPBase {
+    deploymentVersion: number;
+    hash160: Buffer;
+    output?: undefined;
+    program?: undefined;
+}
+export type P2OPPaymentParams = P2OP_fromOutput | P2OP_fromProgram | P2OP_fromParts;
+export declare function p2op(a: Omit<P2OPPaymentParams, 'name'>, opts?: PaymentOpts): P2OPPayment;
+export {};

package/browser/payments/p2pk.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2pk(a: Payment, opts?: PaymentOpts): Payment;
+import { P2PKPayment, PaymentOpts } from './index.js';
+export declare function p2pk(a: Omit<P2PKPayment, 'name'>, opts?: PaymentOpts): P2PKPayment;

package/browser/payments/p2pkh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2pkh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2PKHPayment, PaymentOpts } from './index.js';
+export declare function p2pkh(a: Omit<P2PKHPayment, 'name'>, opts?: PaymentOpts): P2PKHPayment;

package/browser/payments/p2sh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2sh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2SHPayment, PaymentOpts } from './index.js';
+export declare function p2sh(a: Omit<P2SHPayment, 'name'>, opts?: PaymentOpts): P2SHPayment;

package/browser/payments/p2tr.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2tr(a: Payment, opts?: PaymentOpts): Payment;
+import { P2TRPayment, PaymentOpts } from './index.js';
+export declare function p2tr(a: Omit<P2TRPayment, 'name'>, opts?: PaymentOpts): P2TRPayment;

package/browser/payments/p2wpkh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2wpkh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2WPKHPayment, PaymentOpts } from './index.js';
+export declare function p2wpkh(a: Omit<P2WPKHPayment, 'name'>, opts?: PaymentOpts): P2WPKHPayment;

package/browser/payments/p2wsh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2wsh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2WSHPayment, PaymentOpts } from './index.js';
+export declare function p2wsh(a: Omit<P2WSHPayment, 'name'>, opts?: PaymentOpts): P2WSHPayment;

package/build/address.js

@@ -181,7 +181,6 @@ export function toOutputScript(address, network) {
                     throw new Error(address + ' has an invalid prefix');
                 return payments.p2op({
                     program: decodeBech32.data,
-                    deploymentVersion: decodeBech32.version,
                     network,
                 }).output;
             }

package/build/index.d.ts

@@ -17,7 +17,7 @@ export { OPS as opcodes } from './ops.js';
 export { Transaction } from './transaction.js';
 export { Network } from './networks.js';
 export { initEccLib } from './ecc_lib.js';
-export { Payment, PaymentCreator, PaymentOpts, Stack, StackElement } from './payments/index.js';
+export { Payment, PaymentCreator, PaymentOpts, Stack, StackElement, P2WSHPayment, P2PKPayment, BasePayment, P2SHPayment, P2TRPayment, P2WPKHPayment, P2PKHPayment, P2MSPayment, EmbedPayment, P2OPPayment, P2OPPaymentParams, StackFunction, PaymentType, } from './payments/index.js';
 export { Input as TxInput, Output as TxOutput } from './transaction.js';
 export interface PsbtInput extends _PsbtInput {
 }

package/build/index.js

@@ -15,6 +15,7 @@ export * from './psbt.js';
 export { OPS as opcodes } from './ops.js';
 export { Transaction } from './transaction.js';
 export { initEccLib } from './ecc_lib.js';
+export { PaymentType, } from './payments/index.js';
 export * from './psbt/bip371.js';
 export * from './address.js';
 export * from './bufferutils.js';

package/build/payments/embed.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2data(a: Payment, opts?: PaymentOpts): Payment;
+import { EmbedPayment, PaymentOpts } from './index.js';
+export declare function p2data(a: Omit<EmbedPayment, 'name'>, opts?: PaymentOpts): EmbedPayment;

package/build/payments/embed.js

@@ -1,6 +1,7 @@
 import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
 import { stacksEqual, typeforce as typef } from '../types.js';
+import { PaymentType } from './index.js';
 import * as lazy from './lazy.js';
 const OPS = bscript.OPS;
 export function p2data(a, opts) {
@@ -13,7 +14,7 @@ export function p2data(a, opts) {
         data: typef.maybe(typef.arrayOf(typef.Buffer)),
     }, a);
     const network = a.network || BITCOIN_NETWORK;
-    const o = { name: 'embed', network };
+    const o = { name: PaymentType.Embed, network, data: [] };
     lazy.prop(o, 'output', () => {
         if (!a.data)
             return;
@@ -22,7 +23,11 @@ export function p2data(a, opts) {
     lazy.prop(o, 'data', () => {
         if (!a.output)
             return;
-        return bscript.decompile(a.output).slice(1);
+        const script = bscript.decompile(a.output);
+        if (script === null || script === undefined) {
+            return;
+        }
+        return script.slice(1);
     });
     if (opts.validate) {
         if (a.output) {

package/build/payments/index.d.ts

@@ -11,33 +11,90 @@ export * from './p2tr.js';
 export * from './p2wpkh.js';
 export * from './p2wsh.js';
 export * from './p2op.js';
-export interface Payment {
-    name?: string;
+export declare 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 {
+    name?: PaymentType;
     network?: Network;
     output?: Buffer;
-    data?: Buffer[];
+    input?: Buffer;
+    address?: string;
+    witness?: Buffer[];
+    redeem?: ScriptRedeem;
+    useHybrid?: boolean;
+    useUncompressed?: boolean;
+}
+export interface ScriptRedeem extends BasePayment {
+    output?: Buffer;
+    redeemVersion?: number;
+    network?: Network;
+}
+export interface P2PKPayment extends BasePayment {
+    name: PaymentType.P2PK;
+    pubkey?: Buffer;
+    signature?: Buffer;
+}
+export interface P2PKHPayment extends BasePayment {
+    name: PaymentType.P2PKH;
+    hash?: Buffer;
+    pubkey?: Buffer;
+    signature?: Buffer;
+}
+export interface P2SHPayment extends BasePayment {
+    name: PaymentType.P2SH;
+    hash?: Buffer;
+    signatures?: Buffer[];
+}
+export interface P2MSPayment extends BasePayment {
+    name: PaymentType.P2MS;
     m?: number;
     n?: number;
     pubkeys?: Buffer[];
-    input?: Buffer;
     signatures?: Buffer[];
-    internalPubkey?: Buffer;
+}
+export interface P2WPKHPayment extends BasePayment {
+    name: PaymentType.P2WPKH;
+    hash?: Buffer;
     pubkey?: Buffer;
     signature?: Buffer;
-    address?: string;
+}
+export interface P2WSHPayment extends BasePayment {
+    name: PaymentType.P2WSH;
+    hash?: Buffer;
+    redeem?: ScriptRedeem;
+}
+export interface P2TRPayment extends BasePayment {
+    name: PaymentType.P2TR;
+    pubkey?: Buffer;
+    internalPubkey?: Buffer;
     hash?: Buffer;
-    redeem?: Payment;
-    redeemVersion?: number;
     scriptTree?: Taptree;
-    witness?: Buffer[];
-    useHybrid?: boolean;
-    useUncompressed?: boolean;
+    signature?: Buffer;
+    redeemVersion?: number;
+    redeem?: ScriptRedeem;
+}
+export interface P2OPPayment extends BasePayment {
+    name: PaymentType.P2OP;
     program?: Buffer;
-    deploymentVersion?: number;
+    deploymentVersion: number | undefined;
     hash160?: Buffer;
 }
-export type PaymentCreator = (a: Payment, opts?: PaymentOpts) => Payment;
-export type PaymentFunction = () => Payment;
+export interface EmbedPayment extends BasePayment {
+    name: PaymentType.Embed;
+    data: Buffer[];
+}
+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/build/payments/index.js

@@ -9,3 +9,16 @@ export * from './p2tr.js';
 export * from './p2wpkh.js';
 export * from './p2wsh.js';
 export * from './p2op.js';
+export var PaymentType;
+(function (PaymentType) {
+    PaymentType["P2PK"] = "p2pk";
+    PaymentType["P2PKH"] = "p2pkh";
+    PaymentType["P2SH"] = "p2sh";
+    PaymentType["P2MS"] = "p2ms";
+    PaymentType["P2WPKH"] = "p2wpkh";
+    PaymentType["P2WSH"] = "p2wsh";
+    PaymentType["P2TR"] = "p2tr";
+    PaymentType["P2OP"] = "p2op";
+    PaymentType["Embed"] = "embed";
+    PaymentType["ScriptRedeem"] = "scriptRedeem";
+})(PaymentType || (PaymentType = {}));

package/build/payments/lazy.d.ts

@@ -1,2 +1,2 @@
-export declare function prop(object: {}, name: string, f: () => any): void;
+export declare function prop<T extends {}>(object: T, name: string, f: () => T[keyof T]): void;
 export declare function value<T>(f: () => T): () => T;

package/build/payments/p2ms.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2ms(a: Payment, opts?: PaymentOpts): Payment;
+import { P2MSPayment, PaymentOpts } from './index.js';
+export declare function p2ms(a: Omit<P2MSPayment, 'name'>, opts?: PaymentOpts): P2MSPayment;

package/build/payments/p2ms.js

@@ -1,6 +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 { PaymentType } from './index.js';
 import * as lazy from './lazy.js';
 const OPS = bscript.OPS;
 const OP_INT_BASE = OPS.OP_RESERVED;
@@ -22,7 +23,10 @@ export function p2ms(a, opts) {
         input: typef.maybe(typef.Buffer),
     }, a);
     const network = a.network || BITCOIN_NETWORK;
-    const o = { network };
+    const o = {
+        network,
+        name: PaymentType.P2MS,
+    };
     let chunks = [];
     let decoded = false;
     function decode(output) {
@@ -63,7 +67,10 @@ export function p2ms(a, opts) {
     lazy.prop(o, 'signatures', () => {
         if (!a.input)
             return;
-        return bscript.decompile(a.input).slice(1);
+        const decompiled = bscript.decompile(a.input);
+        if (decompiled === null || decompiled === undefined)
+            return;
+        return decompiled.slice(1);
     });
     lazy.prop(o, 'input', () => {
         if (!a.signatures)

package/build/payments/p2op.d.ts

@@ -1,2 +1,25 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2op(a: Payment, opts?: PaymentOpts): Payment;
+import { BasePayment, P2OPPayment, PaymentOpts, PaymentType } from './index.js';
+interface P2OPBase extends BasePayment {
+    name: PaymentType.P2OP;
+}
+interface P2OP_fromOutput extends P2OPBase {
+    output: Buffer;
+    program?: undefined;
+    deploymentVersion?: undefined;
+    hash160?: undefined;
+}
+interface P2OP_fromProgram extends P2OPBase {
+    program: Buffer;
+    output?: undefined;
+    deploymentVersion?: never;
+    hash160?: never;
+}
+interface P2OP_fromParts extends P2OPBase {
+    deploymentVersion: number;
+    hash160: Buffer;
+    output?: undefined;
+    program?: undefined;
+}
+export type P2OPPaymentParams = P2OP_fromOutput | P2OP_fromProgram | P2OP_fromParts;
+export declare function p2op(a: Omit<P2OPPaymentParams, 'name'>, opts?: PaymentOpts): P2OPPayment;
+export {};

package/build/payments/p2op.js

@@ -5,13 +5,18 @@ import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
 import { typeforce as typef } from '../types.js';
 import * as lazy from './lazy.js';
+import { PaymentType } from './index.js';
 const OPS = bscript.OPS;
 const P2OP_WITNESS_VERSION = 0x10;
 const MIN_SIZE = 2;
 const MAX_SIZE = 40;
 export function p2op(a, opts) {
-    if (!a.address && !a.output && !a.program)
-        throw new TypeError('Not enough data for p2op');
+    if (!a.address &&
+        !a.output &&
+        !a.program &&
+        (typeof a.deploymentVersion === 'undefined' || !a.hash160)) {
+        throw new TypeError('At least one of address, output or program must be provided');
+    }
     opts = Object.assign({ validate: true }, opts || {});
     typef({
         address: typef.maybe(typef.String),
@@ -21,12 +26,29 @@ export function p2op(a, opts) {
         deploymentVersion: typef.maybe(typef.Number),
         hash160: typef.maybe(typef.BufferN(20)),
     }, a);
+    const makeProgramFromParts = () => {
+        if (typeof a.deploymentVersion !== 'undefined' && typeof a.hash160 !== 'undefined') {
+            if (a.hash160.length !== 20)
+                throw new TypeError('hash160 must be exactly 20 bytes');
+            if (a.deploymentVersion < 0 || a.deploymentVersion > 0xff)
+                throw new TypeError('deploymentVersion must fit in one byte');
+            return Buffer.concat([Buffer.of(a.deploymentVersion), a.hash160]);
+        }
+        return undefined;
+    };
     const _address = lazy.value(() => fromBech32(a.address));
     const network = a.network || BITCOIN_NETWORK;
-    const o = { name: 'p2op', network };
+    const o = {
+        name: PaymentType.P2OP,
+        network,
+        deploymentVersion: 0,
+    };
     lazy.prop(o, 'program', () => {
         if (a.program)
             return a.program;
+        const fromParts = makeProgramFromParts();
+        if (fromParts)
+            return fromParts;
         if (a.output) {
             if (a.output[0] !== OPS.OP_16)
                 throw new TypeError('Invalid P2OP script');
@@ -91,6 +113,9 @@ export function p2op(a, opts) {
                 throw new TypeError('Program mismatch');
             prog = a.program;
         }
+        if (!prog.length && a.deploymentVersion !== undefined && a.hash160) {
+            prog = makeProgramFromParts();
+        }
         if (a.output) {
             const outProg = o.program;
             if (prog.length && !prog.equals(outProg))
@@ -98,7 +123,7 @@ export function p2op(a, opts) {
             prog = outProg;
         }
         if (prog.length < MIN_SIZE || prog.length > MAX_SIZE)
-            throw new TypeError('Witness program must be 2–40 bytes');
+            throw new TypeError(`Witness program must be 2–40 bytes. Was ${prog.length} bytes`);
         if (a.deploymentVersion !== undefined && a.deploymentVersion !== prog[0])
             throw new TypeError('deploymentVersion mismatch');
         if (a.hash160 && !a.hash160.equals(prog.slice(1)))

package/build/payments/p2pk.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2pk(a: Payment, opts?: PaymentOpts): Payment;
+import { P2PKPayment, PaymentOpts } from './index.js';
+export declare function p2pk(a: Omit<P2PKPayment, 'name'>, opts?: PaymentOpts): P2PKPayment;

package/build/payments/p2pk.js

@@ -1,6 +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 { PaymentType } from './index.js';
 import * as lazy from './lazy.js';
 const OPS = bscript.OPS;
 export function p2pk(a, opts) {
@@ -18,7 +19,11 @@ export function p2pk(a, opts) {
         return bscript.decompile(a.input);
     });
     const network = a.network || BITCOIN_NETWORK;
-    const o = { name: 'p2pk', network };
+    const o = {
+        name: PaymentType.P2PK,
+        network,
+        pubkey: undefined,
+    };
     lazy.prop(o, 'output', () => {
         if (!a.pubkey)
             return;

package/build/payments/p2pkh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2pkh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2PKHPayment, PaymentOpts } from './index.js';
+export declare function p2pkh(a: Omit<P2PKHPayment, 'name'>, opts?: PaymentOpts): P2PKHPayment;

package/build/payments/p2pkh.js

@@ -3,6 +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 { PaymentType } from './index.js';
 import * as lazy from './lazy.js';
 import { decompressPublicKey } from '../psbt/psbtutils.js';
 const OPS = bscript.OPS;
@@ -30,7 +31,11 @@ export function p2pkh(a, opts) {
         return bscript.decompile(a.input);
     });
     const network = a.network || BITCOIN_NETWORK;
-    const o = { name: 'p2pkh', network };
+    const o = {
+        name: PaymentType.P2PKH,
+        network,
+        hash: undefined,
+    };
     lazy.prop(o, 'address', () => {
         if (!o.hash)
             return;

package/build/payments/p2sh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2sh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2SHPayment, PaymentOpts } from './index.js';
+export declare function p2sh(a: Omit<P2SHPayment, 'name'>, opts?: PaymentOpts): P2SHPayment;

package/build/payments/p2sh.js

@@ -3,6 +3,7 @@ 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 { PaymentType } from './index.js';
 import * as lazy from './lazy.js';
 const OPS = bscript.OPS;
 export function p2sh(a, opts) {
@@ -28,7 +29,10 @@ export function p2sh(a, opts) {
     if (!network) {
         network = (a.redeem && a.redeem.network) || BITCOIN_NETWORK;
     }
-    const o = { network };
+    const o = {
+        network,
+        name: PaymentType.P2SH
+    };
     const _address = lazy.value(() => {
         const payload = Buffer.from(bs58check.default.decode(a.address));
         const version = payload.readUInt8(0);

package/build/payments/p2tr.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2tr(a: Payment, opts?: PaymentOpts): Payment;
+import { P2TRPayment, PaymentOpts } from './index.js';
+export declare function p2tr(a: Omit<P2TRPayment, 'name'>, opts?: PaymentOpts): P2TRPayment;

package/build/payments/p2tr.js

@@ -6,6 +6,7 @@ import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
 import * as bscript from '../script.js';
 import { isTaptree, stacksEqual, TAPLEAF_VERSION_MASK, typeforce as typef } from '../types.js';
 import { findScriptPath, LEAF_VERSION_TAPSCRIPT, rootHashFromPath, tapleafHash, toHashTree, tweakKey, } from './bip341.js';
+import { PaymentType } from './index.js';
 import * as lazy from './lazy.js';
 const OPS = bscript.OPS;
 const TAPROOT_WITNESS_VERSION = 0x01;
@@ -55,7 +56,10 @@ export function p2tr(a, opts) {
         return;
     });
     const network = a.network || BITCOIN_NETWORK;
-    const o = { name: 'p2tr', network };
+    const o = {
+        name: PaymentType.P2TR,
+        network,
+    };
     lazy.prop(o, 'address', () => {
         if (!o.pubkey)
             return;
@@ -78,7 +82,7 @@ export function p2tr(a, opts) {
             });
             return rootHashFromPath(controlBlock, leafHash);
         }
-        return null;
+        return undefined;
     });
     lazy.prop(o, 'output', () => {
         if (!o.pubkey)

package/build/payments/p2wpkh.d.ts

@@ -1,2 +1,2 @@
-import { Payment, PaymentOpts } from './index.js';
-export declare function p2wpkh(a: Payment, opts?: PaymentOpts): Payment;
+import { P2WPKHPayment, PaymentOpts } from './index.js';
+export declare function p2wpkh(a: Omit<P2WPKHPayment, 'name'>, opts?: PaymentOpts): P2WPKHPayment;