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

package/src/payments/p2pkh.ts

@@ -1,108 +1,439 @@
+/**
+ * Pay-to-Public-Key-Hash (P2PKH) payment class.
+ *
+ * P2PKH is the most common legacy Bitcoin payment type. The output script
+ * contains the hash of a public key, and spending requires the full public key
+ * and a valid signature.
+ *
+ * @packageDocumentation
+ */
+
 import * as bs58check from 'bs58check';
 import * as bcrypto from '../crypto.js';
-import { bitcoin as BITCOIN_NETWORK } from '../networks.js';
+import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import { decompressPublicKey } from '../pubkey.js';
 import * as bscript from '../script.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 { type Bytes20, isPoint, type PublicKey, type Script, type Signature } from '../types.js';
+import { alloc, equals } from '../io/index.js';
+import { type P2PKHPayment, type PaymentOpts, PaymentType } from './types.js';
 
 const OPS = bscript.opcodes;
 
-// input: {signature} {pubkey}
-// output: OP_DUP OP_HASH160 {hash160(pubkey)} OP_EQUALVERIFY OP_CHECKSIG
 /**
- * Creates a Pay-to-Public-Key-Hash (P2PKH) payment object.
+ * Pay-to-Public-Key-Hash (P2PKH) payment class.
+ *
+ * Creates locking scripts of the form:
+ * `OP_DUP OP_HASH160 {hash160(pubkey)} OP_EQUALVERIFY OP_CHECKSIG`
+ *
+ * Spending requires providing: `{signature} {pubkey}`
  *
- * @param a - The payment object containing the necessary data.
- * @param opts - Optional payment options.
- * @returns The P2PKH payment object.
- * @throws {TypeError} If the required data is not provided or if the data is invalid.
+ * @example
+ * ```typescript
+ * import { P2PKH } from '@btc-vision/bitcoin';
+ *
+ * // Create from public key
+ * const payment = P2PKH.fromPubkey(pubkey);
+ * console.log(payment.address); // Bitcoin address
+ * console.log(payment.output); // scriptPubKey
+ *
+ * // Create from address
+ * const fromAddr = P2PKH.fromAddress('1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2');
+ * console.log(fromAddr.hash); // 20-byte pubkey hash
+ *
+ * // Create from hash
+ * const fromHash = P2PKH.fromHash(hash160);
+ * console.log(fromHash.address);
+ * ```
  */
-export function p2pkh(a: Omit<P2PKHPayment, 'name'>, opts?: PaymentOpts): P2PKHPayment {
-    if (!a.address && !a.hash && !a.output && !a.pubkey && !a.input) {
-        throw new TypeError('Not enough data');
+export class P2PKH {
+    // Static public fields
+    static readonly NAME = PaymentType.P2PKH;
+
+    // Private instance fields
+    readonly #network: Network;
+    readonly #opts: Required<PaymentOpts>;
+
+    // Input data (provided by user)
+    #inputAddress?: string | undefined;
+    #inputHash?: Uint8Array | undefined;
+    #inputPubkey?: Uint8Array | undefined;
+    #inputSignature?: Uint8Array | undefined;
+    #inputOutput?: Uint8Array | undefined;
+    #inputInput?: Uint8Array | undefined;
+
+    // Hybrid/uncompressed key flags
+    #useHybrid = false;
+    #useUncompressed = false;
+
+    // Cached computed values
+    #address?: string | undefined;
+    #hash?: Uint8Array | undefined;
+    #pubkey?: Uint8Array | undefined;
+    #signature?: Uint8Array | undefined;
+    #output?: Uint8Array | undefined;
+    #input?: Uint8Array | undefined;
+    #witness?: Uint8Array[] | undefined;
+
+    // Cache flags
+    #addressComputed = false;
+    #hashComputed = false;
+    #pubkeyComputed = false;
+    #signatureComputed = false;
+    #outputComputed = false;
+    #inputComputed = false;
+    #witnessComputed = false;
+
+    // Decoded address cache
+    #decodedAddress?: { version: number; hash: Uint8Array } | undefined;
+    #decodedAddressComputed = false;
+
+    // Decoded input chunks cache
+    #inputChunks?: (Uint8Array | number)[] | undefined;
+    #inputChunksComputed = false;
+
+    /**
+     * Creates a new P2PKH payment instance.
+     *
+     * @param params - Payment parameters
+     * @param params.address - Base58Check encoded address
+     * @param params.hash - 20-byte pubkey hash (RIPEMD160(SHA256(pubkey)))
+     * @param params.pubkey - The public key (33 or 65 bytes)
+     * @param params.signature - DER-encoded signature
+     * @param params.output - The scriptPubKey
+     * @param params.input - The scriptSig
+     * @param params.network - Network parameters (defaults to mainnet)
+     * @param opts - Payment options
+     * @param opts.validate - Whether to validate inputs (default: true)
+     *
+     * @throws {TypeError} If validation is enabled and data is invalid
+     */
+    constructor(
+        params: {
+            address?: string | undefined;
+            hash?: Uint8Array | undefined;
+            pubkey?: Uint8Array | undefined;
+            signature?: Uint8Array | undefined;
+            output?: Uint8Array | undefined;
+            input?: Uint8Array | undefined;
+            network?: Network | undefined;
+            useHybrid?: boolean | undefined;
+            useUncompressed?: boolean | undefined;
+        },
+        opts?: PaymentOpts,
+    ) {
+        this.#network = params.network ?? BITCOIN_NETWORK;
+        this.#opts = {
+            validate: opts?.validate ?? true,
+            allowIncomplete: opts?.allowIncomplete ?? false,
+        };
+
+        // Store input data
+        this.#inputAddress = params.address;
+        this.#inputHash = params.hash;
+        this.#inputPubkey = params.pubkey;
+        this.#inputSignature = params.signature;
+        this.#inputOutput = params.output;
+        this.#inputInput = params.input;
+        this.#useHybrid = params.useHybrid ?? false;
+        this.#useUncompressed = params.useUncompressed ?? false;
+
+        // Validate if requested
+        if (this.#opts.validate) {
+            this.#validate();
+        }
     }
 
-    opts = Object.assign({ validate: true }, opts || {});
+    // Public getters
 
-    typef(
-        {
-            network: typef.maybe(typef.Object),
-            address: typef.maybe(typef.String),
-            hash: typef.maybe(typef.BufferN(20)),
-            output: typef.maybe(typef.BufferN(25)),
-
-            pubkey: typef.maybe(isPoint),
-            signature: typef.maybe(bscript.isCanonicalScriptSignature),
-            input: typef.maybe(typef.Buffer),
-        },
-        a,
-    );
+    /**
+     * Payment type discriminant.
+     */
+    get name(): typeof PaymentType.P2PKH {
+        return PaymentType.P2PKH;
+    }
+
+    /**
+     * Network parameters.
+     */
+    get network(): Network {
+        return this.#network;
+    }
+
+    /**
+     * Base58Check encoded Bitcoin address.
+     */
+    get address(): string | undefined {
+        if (!this.#addressComputed) {
+            this.#address = this.#computeAddress();
+            this.#addressComputed = true;
+        }
+        return this.#address;
+    }
+
+    /**
+     * 20-byte pubkey hash (RIPEMD160(SHA256(pubkey))).
+     */
+    get hash(): Bytes20 | undefined {
+        if (!this.#hashComputed) {
+            this.#hash = this.#computeHash();
+            this.#hashComputed = true;
+        }
+        return this.#hash as Bytes20 | undefined;
+    }
+
+    /**
+     * The public key (33 or 65 bytes).
+     */
+    get pubkey(): PublicKey | undefined {
+        if (!this.#pubkeyComputed) {
+            this.#pubkey = this.#computePubkey();
+            this.#pubkeyComputed = true;
+        }
+        return this.#pubkey as PublicKey | undefined;
+    }
+
+    /**
+     * The DER-encoded signature.
+     */
+    get signature(): Signature | undefined {
+        if (!this.#signatureComputed) {
+            this.#signature = this.#computeSignature();
+            this.#signatureComputed = true;
+        }
+        return this.#signature as Signature | undefined;
+    }
+
+    /**
+     * The scriptPubKey:
+     * `OP_DUP OP_HASH160 {hash} OP_EQUALVERIFY OP_CHECKSIG`
+     */
+    get output(): Script | undefined {
+        if (!this.#outputComputed) {
+            this.#output = this.#computeOutput();
+            this.#outputComputed = true;
+        }
+        return this.#output as Script | undefined;
+    }
+
+    /**
+     * The scriptSig: `{signature} {pubkey}`
+     */
+    get input(): Script | undefined {
+        if (!this.#inputComputed) {
+            this.#input = this.#computeInput();
+            this.#inputComputed = true;
+        }
+        return this.#input as Script | undefined;
+    }
+
+    /**
+     * Witness stack (empty for P2PKH as it's not a SegWit type).
+     */
+    get witness(): Uint8Array[] | undefined {
+        if (!this.#witnessComputed) {
+            this.#witness = this.#computeWitness();
+            this.#witnessComputed = true;
+        }
+        return this.#witness;
+    }
+
+    // Static factory methods
+
+    /**
+     * Creates a P2PKH payment from a public key.
+     *
+     * @param pubkey - The public key (33 or 65 bytes)
+     * @param network - Network parameters (defaults to mainnet)
+     * @returns A new P2PKH payment instance
+     *
+     * @example
+     * ```typescript
+     * const payment = P2PKH.fromPubkey(pubkey);
+     * const address = payment.address;
+     * ```
+     */
+    static fromPubkey(pubkey: PublicKey, network?: Network): P2PKH {
+        return new P2PKH({ pubkey, network });
+    }
+
+    /**
+     * Creates a P2PKH payment from a Base58Check address.
+     *
+     * @param address - Base58Check encoded address
+     * @param network - Network parameters (defaults to mainnet)
+     * @returns A new P2PKH payment instance
+     *
+     * @example
+     * ```typescript
+     * const payment = P2PKH.fromAddress('1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2');
+     * const hash = payment.hash;
+     * ```
+     */
+    static fromAddress(address: string, network?: Network): P2PKH {
+        return new P2PKH({ address, network });
+    }
+
+    /**
+     * Creates a P2PKH payment from a 20-byte pubkey hash.
+     *
+     * @param hash - 20-byte pubkey hash
+     * @param network - Network parameters (defaults to mainnet)
+     * @returns A new P2PKH payment instance
+     *
+     * @example
+     * ```typescript
+     * const payment = P2PKH.fromHash(hash160);
+     * const address = payment.address;
+     * ```
+     */
+    static fromHash(hash: Bytes20, network?: Network): P2PKH {
+        return new P2PKH({ hash, network });
+    }
+
+    /**
+     * Creates a P2PKH payment from a scriptPubKey.
+     *
+     * @param output - The scriptPubKey
+     * @param network - Network parameters (defaults to mainnet)
+     * @returns A new P2PKH payment instance
+     */
+    static fromOutput(output: Uint8Array, network?: Network): P2PKH {
+        return new P2PKH({ output, network });
+    }
+
+    // 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) {
+                const payload = new Uint8Array(bs58check.default.decode(this.#inputAddress));
+                this.#decodedAddress = {
+                    version: payload[0]!,
+                    hash: payload.subarray(1),
+                };
+            }
+            this.#decodedAddressComputed = true;
+        }
+        return this.#decodedAddress;
+    }
+
+    // Private computation methods
+
+    #getInputChunks(): (Uint8Array | number)[] | undefined {
+        if (!this.#inputChunksComputed) {
+            if (this.#inputInput) {
+                this.#inputChunks = bscript.decompile(this.#inputInput) ?? undefined;
+            }
+            this.#inputChunksComputed = true;
+        }
+        return this.#inputChunks;
+    }
 
-    const _address = lazy.value(() => {
-        const payload = Buffer.from(bs58check.default.decode(a.address!));
-        const version = payload.readUInt8(0);
-        const hash = payload.subarray(1);
-        return { version, hash };
-    });
-
-    const _chunks = lazy.value(() => {
-        return bscript.decompile(a.input!);
-    }) as StackFunction;
-
-    const network = a.network || BITCOIN_NETWORK;
-    const o: P2PKHPayment = {
-        name: PaymentType.P2PKH,
-        network,
-        hash: undefined,
-    };
-
-    lazy.prop(o, 'address', () => {
-        if (!o.hash) return;
-
-        const payload = Buffer.allocUnsafe(21);
-        payload.writeUInt8(network.pubKeyHash, 0);
-        o.hash.copy(payload, 1);
+    #computeAddress(): string | undefined {
+        if (this.#inputAddress) {
+            return this.#inputAddress;
+        }
+        const h = this.hash;
+        if (!h) return undefined;
+
+        const payload = alloc(21);
+        payload[0] = this.#network.pubKeyHash;
+        payload.set(h, 1);
         return bs58check.default.encode(payload);
-    });
+    }
+
+    #computeHash(): Bytes20 | undefined {
+        if (this.#inputHash) {
+            return this.#inputHash as Bytes20;
+        }
+        if (this.#inputOutput) {
+            return this.#inputOutput.subarray(3, 23) as Bytes20;
+        }
+        if (this.#inputAddress) {
+            return this.#getDecodedAddress()?.hash as Bytes20 | undefined;
+        }
+        // Use the pubkey getter to derive pubkey from input if available
+        const pk = this.pubkey;
+        if (pk) {
+            return bcrypto.hash160(pk) as Bytes20;
+        }
+        return undefined;
+    }
 
-    lazy.prop(o, 'hash', () => {
-        if (a.output) return a.output.subarray(3, 23);
-        if (a.address) return _address().hash;
-        if (a.pubkey || o.pubkey) return bcrypto.hash160(a.pubkey! || o.pubkey!);
-    });
+    #computePubkey(): PublicKey | undefined {
+        if (this.#inputPubkey) {
+            return this.#inputPubkey as PublicKey;
+        }
+        if (this.#inputInput) {
+            const chunks = this.#getInputChunks();
+            if (chunks && chunks.length >= 2) {
+                return chunks[1] as PublicKey;
+            }
+        }
+        return undefined;
+    }
+
+    #computeSignature(): Signature | undefined {
+        if (this.#inputSignature) {
+            return this.#inputSignature as Signature;
+        }
+        if (this.#inputInput) {
+            const chunks = this.#getInputChunks();
+            if (chunks && chunks.length >= 1) {
+                return chunks[0] as Signature;
+            }
+        }
+        return undefined;
+    }
+
+    #computeOutput(): Script | undefined {
+        if (this.#inputOutput) {
+            return this.#inputOutput as Script;
+        }
+        const h = this.hash;
+        if (!h) return undefined;
 
-    lazy.prop(o, 'output', () => {
-        if (!o.hash) return;
         return bscript.compile([
             OPS.OP_DUP,
             OPS.OP_HASH160,
-            o.hash,
+            h,
             OPS.OP_EQUALVERIFY,
             OPS.OP_CHECKSIG,
-        ]);
-    });
-
-    lazy.prop(o, 'pubkey', () => {
-        if (!a.input) return;
-        return _chunks()[1] as Buffer;
-    });
-
-    lazy.prop(o, 'signature', () => {
-        if (!a.input) return;
-        return _chunks()[0] as Buffer;
-    });
-
-    lazy.prop(o, 'input', () => {
-        if (!a.pubkey) return;
-        if (!a.signature) return;
-
-        let pubKey: Buffer = a.pubkey;
-        if (a.useHybrid || a.useUncompressed) {
-            const decompressed = decompressPublicKey(a.pubkey);
+        ]) as Script;
+    }
+
+    #computeInput(): Script | undefined {
+        if (this.#inputInput) {
+            return this.#inputInput as Script;
+        }
+        if (!this.#inputPubkey || !this.#inputSignature) {
+            return undefined;
+        }
+
+        let pubKey: Uint8Array = this.#inputPubkey;
+        if (this.#useHybrid || this.#useUncompressed) {
+            const decompressed = decompressPublicKey(this.#inputPubkey as PublicKey);
             if (decompressed) {
-                if (a.useUncompressed) {
+                if (this.#useUncompressed) {
                     pubKey = decompressed.uncompressed;
                 } else {
                     pubKey = decompressed.hybrid;
@@ -110,77 +441,87 @@ export function p2pkh(a: Omit<P2PKHPayment, 'name'>, opts?: PaymentOpts): P2PKHP
             }
         }
 
-        return bscript.compile([a.signature, pubKey]);
-    });
+        return bscript.compile([this.#inputSignature, pubKey]) as Script;
+    }
 
-    lazy.prop(o, 'witness', () => {
-        if (!o.input) return;
-        return [];
-    });
+    // Validation
 
-    // extended validation
-    if (opts.validate) {
-        let hash: Buffer = Buffer.from([]);
-        if (a.address) {
-            if (_address().version !== network.pubKeyHash) {
+    #computeWitness(): Uint8Array[] | undefined {
+        if (this.input) {
+            return [];
+        }
+        return undefined;
+    }
+
+    #validate(): void {
+        let hash: Uint8Array = new Uint8Array(0);
+
+        if (this.#inputAddress) {
+            const addr = this.#getDecodedAddress();
+            if (!addr) {
+                throw new TypeError('Invalid address');
+            }
+            if (addr.version !== this.#network.pubKeyHash) {
                 throw new TypeError('Invalid version or Network mismatch');
             }
-
-            if (_address().hash.length !== 20) {
+            if (addr.hash.length !== 20) {
                 throw new TypeError('Invalid address');
             }
-
-            hash = _address().hash;
+            hash = addr.hash;
         }
 
-        if (a.hash) {
-            if (hash.length > 0 && !hash.equals(a.hash)) {
+        if (this.#inputHash) {
+            if (hash.length > 0 && !equals(hash, this.#inputHash)) {
                 throw new TypeError('Hash mismatch');
             } else {
-                hash = a.hash;
+                hash = this.#inputHash;
             }
         }
 
-        if (a.output) {
+        if (this.#inputOutput) {
             if (
-                a.output.length !== 25 ||
-                a.output[0] !== OPS.OP_DUP ||
-                a.output[1] !== OPS.OP_HASH160 ||
-                a.output[2] !== 0x14 ||
-                a.output[23] !== OPS.OP_EQUALVERIFY ||
-                a.output[24] !== OPS.OP_CHECKSIG
+                this.#inputOutput.length !== 25 ||
+                this.#inputOutput[0] !== OPS.OP_DUP ||
+                this.#inputOutput[1] !== OPS.OP_HASH160 ||
+                this.#inputOutput[2] !== 0x14 ||
+                this.#inputOutput[23] !== OPS.OP_EQUALVERIFY ||
+                this.#inputOutput[24] !== OPS.OP_CHECKSIG
             ) {
                 throw new TypeError('Output is invalid');
             }
 
-            const hash2 = a.output.subarray(3, 23);
-            if (hash.length > 0 && !hash.equals(hash2)) throw new TypeError('Hash mismatch');
-            else hash = hash2;
+            const hash2 = this.#inputOutput.subarray(3, 23);
+            if (hash.length > 0 && !equals(hash, hash2)) {
+                throw new TypeError('Hash mismatch');
+            } else {
+                hash = hash2;
+            }
         }
 
-        if (a.pubkey) {
-            const pkh = bcrypto.hash160(a.pubkey);
+        if (this.#inputPubkey) {
+            const pkh = bcrypto.hash160(this.#inputPubkey);
 
-            let badHash = hash.length > 0 && !hash.equals(pkh);
+            let badHash = hash.length > 0 && !equals(hash, pkh);
             if (badHash) {
                 if (
-                    (a.pubkey.length === 33 && (a.pubkey[0] === 0x02 || a.pubkey[0] === 0x03)) ||
-                    (a.pubkey.length === 65 && a.pubkey[0] === 0x04)
+                    (this.#inputPubkey.length === 33 &&
+                        (this.#inputPubkey[0] === 0x02 || this.#inputPubkey[0] === 0x03)) ||
+                    (this.#inputPubkey.length === 65 && this.#inputPubkey[0] === 0x04)
                 ) {
-                    const uncompressed = decompressPublicKey(a.pubkey);
+                    const uncompressed = decompressPublicKey(this.#inputPubkey as PublicKey);
                     if (uncompressed) {
                         const pkh2 = bcrypto.hash160(uncompressed.uncompressed);
 
-                        if (!hash.equals(pkh2)) {
+                        if (!equals(hash, pkh2)) {
                             const pkh3 = bcrypto.hash160(uncompressed.hybrid);
-                            badHash = !hash.equals(pkh3);
+                            badHash = !equals(hash, pkh3);
 
                             if (!badHash) {
-                                a.useHybrid = true;
+                                this.#useHybrid = true;
                             }
                         } else {
                             badHash = false;
-                            a.useUncompressed = true;
+                            this.#useUncompressed = true;
                         }
                     }
                 }
@@ -193,22 +534,75 @@ export function p2pkh(a: Omit<P2PKHPayment, 'name'>, opts?: PaymentOpts): P2PKHP
             }
         }
 
-        if (a.input) {
-            const chunks = _chunks();
-            if (chunks.length !== 2) throw new TypeError('Input is invalid');
-            if (!bscript.isCanonicalScriptSignature(chunks[0] as Buffer))
+        if (this.#inputInput) {
+            const chunks = this.#getInputChunks();
+            if (!chunks || chunks.length !== 2) {
+                throw new TypeError('Input is invalid');
+            }
+            if (!bscript.isCanonicalScriptSignature(chunks[0] as Uint8Array)) {
                 throw new TypeError('Input has invalid signature');
-            if (!isPoint(chunks[1])) throw new TypeError('Input has invalid pubkey');
+            }
+            if (!isPoint(chunks[1])) {
+                throw new TypeError('Input has invalid pubkey');
+            }
 
-            if (a.signature && !a.signature.equals(chunks[0] as Buffer))
+            if (this.#inputSignature && !equals(this.#inputSignature, chunks[0] as Uint8Array)) {
                 throw new TypeError('Signature mismatch');
-            if (a.pubkey && !a.pubkey.equals(chunks[1] as Buffer))
+            }
+            if (this.#inputPubkey && !equals(this.#inputPubkey, chunks[1] as Uint8Array)) {
                 throw new TypeError('Pubkey mismatch');
+            }
 
-            const pkh = bcrypto.hash160(chunks[1] as Buffer);
-            if (hash.length > 0 && !hash.equals(pkh)) throw new TypeError('Hash mismatch (input)');
+            const pkh = bcrypto.hash160(chunks[1] as Uint8Array);
+            if (hash.length > 0 && !equals(hash, pkh)) {
+                throw new TypeError('Hash mismatch (input)');
+            }
         }
     }
+}
+
+/**
+ * Creates a Pay-to-Public-Key-Hash (P2PKH) payment object.
+ *
+ * This is the legacy factory function for backwards compatibility.
+ * For new code, prefer using the P2PKH class directly.
+ *
+ * @param a - The payment object containing the necessary data
+ * @param opts - Optional payment options
+ * @returns The P2PKH payment object
+ * @throws {TypeError} If the required data is not provided or if the data is invalid
+ *
+ * @example
+ * ```typescript
+ * import { p2pkh } from '@btc-vision/bitcoin';
+ *
+ * // Create from public key
+ * const payment = p2pkh({ pubkey });
+ *
+ * // Create from address
+ * const fromAddr = p2pkh({ address: '1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2' });
+ * ```
+ */
+export function p2pkh(a: Omit<P2PKHPayment, 'name'>, opts?: PaymentOpts): P2PKHPayment {
+    if (!a.address && !a.hash && !a.output && !a.pubkey && !a.input) {
+        throw new TypeError('Not enough data');
+    }
+
+    const instance = new P2PKH(
+        {
+            address: a.address,
+            hash: a.hash,
+            pubkey: a.pubkey,
+            signature: a.signature,
+            output: a.output,
+            input: a.input,
+            network: a.network,
+            useHybrid: a.useHybrid,
+            useUncompressed: a.useUncompressed,
+        },
+        opts,
+    );
 
-    return Object.assign(o, a);
+    // Return a merged object for backwards compatibility
+    return Object.assign(instance.toPayment(), a);
 }