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

package/test/integration/transactions.spec.ts

@@ -4,7 +4,10 @@ import * as ecc from 'tiny-secp256k1';
 import { ECPairFactory } from 'ecpair';
 import { describe, it } from 'vitest';
 import * as bitcoin from '../../src/index.js';
-import { regtestUtils } from './_regtest.js';
+import { fromHex, compare } from '../../src/index.js';
+import type { Satoshi, PublicKey } from '../../src/index.js';
+import type { HDSigner } from '../../src/psbt/types.js';
+import { regtestUtils, broadcastAndVerify } from './_regtest.js';
 
 import rng from 'randombytes';
 
@@ -12,7 +15,7 @@ const ECPair = ECPairFactory(ecc);
 const regtest = { ...regtestUtils.network, bech32Opnet: 'opreg' };
 const bip32 = BIP32Factory(ecc);
 
-const validator = (pubkey: Buffer, msghash: Buffer, signature: Buffer): boolean =>
+const validator = (pubkey: Uint8Array, msghash: Uint8Array, signature: Uint8Array): boolean =>
     ECPair.fromPublicKey(pubkey).verify(msghash, signature);
 
 // See bottom of file for some helper functions used to make the payment objects needed.
@@ -29,8 +32,8 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             index: 0,
             sequence: 0xffffffff, // These are defaults. This line is not needed.
 
-            // non-segwit inputs now require passing the whole previous tx as Buffer
-            nonWitnessUtxo: Buffer.from(
+            // non-segwit inputs now require passing the whole previous tx as Uint8Array
+            nonWitnessUtxo: fromHex(
                 '0200000001f9f34e95b9d5c8abcd20fc5bd4a825d1517be62f0f775e5f36da944d9' +
                     '452e550000000006b483045022100c86e9a111afc90f64b4904bd609e9eaed80d48' +
                     'ca17c162b1aca0a788ac3526f002207bb79b60d4fc6526329bf18a77135dc566020' +
@@ -44,7 +47,6 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
                     '76a9148bbc95d2709c71607c60ee3f097c1217482f518d88ac' +
                     // locktime
                     '00000000',
-                'hex',
             ),
 
             // // If this input was segwit, instead of nonWitnessUtxo, you would add
@@ -63,7 +65,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
         });
         psbt.addOutput({
             address: '1KRMKfeZcmosxALVYESdPNez1AP1mEtywp',
-            value: 80000,
+            value: 80000n as Satoshi,
         });
         psbt.signInput(0, alice);
         psbt.validateSignaturesOfInput(0, validator);
@@ -103,11 +105,11 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .addInput(inputData2) // alice2 unspent
             .addOutput({
                 address: 'mwCwTceJvYV27KXBc3NJZys6CjsgsoeHmf',
-                value: 8e4,
+                value: 80000n as Satoshi,
             }) // the actual "spend"
             .addOutput({
                 address: alice2.payment.address, // OR script, which is a Buffer.
-                value: 1e4,
+                value: 10000n as Satoshi,
             }); // Alice's change
         // (in)(5e4 + 7e4) - (out)(8e4 + 1e4) = (fee)3e4 = 30000, this is the miner fee
 
@@ -199,7 +201,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .addInput(inputData1)
             .addOutput({
                 address: regtestUtils.RANDOM_ADDRESS,
-                value: 1e4,
+                value: 10000n as Satoshi,
             })
             .signInput(0, multisig.keys[0])
             .signInput(0, multisig.keys[2]);
@@ -243,11 +245,11 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
         const keyPair = p2sh.keys[0];
         const outputData = {
             script: p2sh.payment.output, // sending to myself for fun
-            value: 2e4,
+            value: 20000n as Satoshi,
         };
         const outputData2 = {
             script: p2sh.payment.output, // sending to myself for fun
-            value: 7e4,
+            value: 70000n as Satoshi,
         };
 
         const tx = new bitcoin.Psbt()
@@ -277,11 +279,11 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
         const keyPair = p2sh.keys[0];
         const outputData = {
             script: p2sh.payment.output,
-            value: 2e4,
+            value: 20000n as Satoshi,
         };
         const outputData2 = {
             script: p2sh.payment.output,
-            value: 7e4,
+            value: 70000n as Satoshi,
         };
         const tx = new bitcoin.Psbt()
             .addInputs([inputData, inputData2])
@@ -312,7 +314,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .addInput(inputData)
             .addOutput({
                 address: regtestUtils.RANDOM_ADDRESS,
-                value: 2e4,
+                value: 20000n as Satoshi,
             })
             .signInput(0, p2wpkh.keys[0]);
 
@@ -341,18 +343,19 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .addInput(inputData)
             .addOutput({
                 address: regtestUtils.RANDOM_ADDRESS,
-                value: 2e4,
+                value: 20000n as Satoshi,
             })
             .signInput(0, p2wpkh.keys[0]);
         psbt.finalizeAllInputs();
         const tx = psbt.extractTransaction();
-        await regtestUtils.broadcast(tx.toHex());
-        await regtestUtils.verify({
-            txId: tx.getId(),
-            address: regtestUtils.RANDOM_ADDRESS,
-            vout: 0,
-            value: 2e4,
-        });
+        await broadcastAndVerify(tx.toHex(), () =>
+            regtestUtils.verify({
+                txId: tx.getId(),
+                address: regtestUtils.RANDOM_ADDRESS,
+                vout: 0,
+                value: 2e4,
+            }),
+        );
     });
 
     it('can create (and broadcast via 3PBP) a Transaction, w/ a P2WSH(P2PK) input', async () => {
@@ -372,7 +375,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .addInput(inputData)
             .addOutput({
                 address: regtestUtils.RANDOM_ADDRESS,
-                value: 2e4,
+                value: 20000n as Satoshi,
             })
             .signInput(0, p2wsh.keys[0]);
 
@@ -401,7 +404,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .addInput(inputData)
             .addOutput({
                 address: regtestUtils.RANDOM_ADDRESS,
-                value: 2e4,
+                value: 20000n as Satoshi,
             })
             .signInput(0, p2wsh.keys[0]);
         psbt.finalizeAllInputs();
@@ -433,7 +436,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
                 .addInput(inputData)
                 .addOutput({
                     address: regtestUtils.RANDOM_ADDRESS,
-                    value: 2e4,
+                    value: 20000n as Satoshi,
                 })
                 .signInput(0, p2sh.keys[0])
                 .signInput(0, p2sh.keys[2])
@@ -475,7 +478,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
                 .addInput(inputData)
                 .addOutput({
                     address: regtestUtils.RANDOM_ADDRESS,
-                    value: 2e4,
+                    value: 20000n as Satoshi,
                 })
                 .signInput(0, p2sh.keys[0])
                 .signInput(0, p2sh.keys[2])
@@ -504,7 +507,7 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
                 .addInput(inputData)
                 .addOutput({
                     address: regtestUtils.RANDOM_ADDRESS,
-                    value: 2e4,
+                    value: 20000n as Satoshi,
                 })
                 .signInput(0, p2sh.keys[0]);
             psbt.finalizeAllInputs();
@@ -558,12 +561,12 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             // .updateInput(0, updateData) // if you didn't merge the bip32Derivation with inputData
             .addOutput({
                 address: regtestUtils.RANDOM_ADDRESS,
-                value: 2e4,
+                value: 20000n as Satoshi,
             })
-            .signInputHD(0, hdRoot); // must sign with root!!!
+            .signInputHD(0, hdRoot as unknown as HDSigner); // must sign with root!!!
 
         assert.strictEqual(psbt.validateSignaturesOfInput(0, validator), true);
-        assert.strictEqual(psbt.validateSignaturesOfInput(0, validator, childNode.publicKey), true);
+        assert.strictEqual(psbt.validateSignaturesOfInput(0, validator, childNode.publicKey as PublicKey), true);
         psbt.finalizeAllInputs();
 
         const tx = psbt.extractTransaction();
@@ -605,7 +608,7 @@ function createPayment(_type: string, myKeys?: any[], network?: any): any {
         if (type.slice(0, 4) === 'p2ms') {
             payment = bitcoin.payments.p2ms({
                 m,
-                pubkeys: keys.map((key) => key.publicKey).sort((a, b) => a.compare(b)),
+                pubkeys: keys.map((key) => key.publicKey).sort((a, b) => compare(a, b)),
                 network,
             });
         } else if (['p2sh', 'p2wsh'].indexOf(type) > -1) {
@@ -629,7 +632,7 @@ function createPayment(_type: string, myKeys?: any[], network?: any): any {
 
 function getWitnessUtxo(out: any): any {
     delete out.address;
-    out.script = Buffer.from(out.script, 'hex');
+    out.script = fromHex(out.script);
     return out;
 }
 
@@ -639,10 +642,10 @@ async function getInputData(
     isSegwit: boolean,
     redeemType: string,
 ): Promise<any> {
-    const unspent = await regtestUtils.faucetComplex(payment.output, amount);
+    const unspent = await regtestUtils.faucetComplex(Buffer.from(payment.output), amount);
     const utx = await regtestUtils.fetch(unspent.txId);
-    // for non segwit inputs, you must pass the full transaction buffer
-    const nonWitnessUtxo = Buffer.from(utx.txHex, 'hex');
+    // for non segwit inputs, you must pass the full transaction as Uint8Array
+    const nonWitnessUtxo = fromHex(utx.txHex);
     // for segwit inputs, you only need the output script and value as an object.
     const witnessUtxo = getWitnessUtxo(utx.outs[unspent.vout]);
     const mixin = isSegwit ? { witnessUtxo } : { nonWitnessUtxo };

package/test/payments.spec.ts

@@ -2,28 +2,51 @@ import assert from 'assert';
 import * as ecc from 'tiny-secp256k1';
 import { beforeEach, describe, it } from 'vitest';
 import { initEccLib } from '../src/index.js';
+import type { EccLib } from '../src/index.js';
 import type { P2SHPayment, PaymentCreator } from '../src/payments/index.js';
 import { p2pk, p2wsh } from '../src/payments/index.js';
 import * as u from './payments.utils.js';
 import fs from 'node:fs';
-
-const require = async (name: string) => {
-    const mod = await import(name);
-
-    return mod.default || mod;
+import { fromHex } from '../src/io/index.js';
+import type { PublicKey } from '../src/types.js';
+
+// Pre-load all payment modules synchronously-like at import time
+import * as embedModule from '../src/payments/embed.js';
+import * as p2msModule from '../src/payments/p2ms.js';
+import * as p2pkModule from '../src/payments/p2pk.js';
+import * as p2pkhModule from '../src/payments/p2pkh.js';
+import * as p2shModule from '../src/payments/p2sh.js';
+import * as p2wpkhModule from '../src/payments/p2wpkh.js';
+import * as p2wshModule from '../src/payments/p2wsh.js';
+import * as p2trModule from '../src/payments/p2tr.js';
+
+const paymentModules: Record<string, { [key: string]: PaymentCreator }> = {
+    embed: embedModule as any,
+    p2ms: p2msModule as any,
+    p2pk: p2pkModule as any,
+    p2pkh: p2pkhModule as any,
+    p2sh: p2shModule as any,
+    p2wpkh: p2wpkhModule as any,
+    p2wsh: p2wshModule as any,
+    p2tr: p2trModule as any,
 };
 
+// Initialize ECC library at module load time
+initEccLib(ecc as unknown as EccLib);
+
 ['embed', 'p2ms', 'p2pk', 'p2pkh', 'p2sh', 'p2wpkh', 'p2wsh', 'p2tr'].forEach((p) => {
-    describe(p, async () => {
+    describe(p, () => {
+        // Ensure ECC library is initialized before each test
         beforeEach(() => {
-            initEccLib(p === 'p2tr' ? ecc : undefined);
+            initEccLib(ecc as unknown as EccLib);
         });
+
+        const payment = paymentModules[p]!;
         let fn: PaymentCreator;
-        const payment = await require('../src/payments/' + p);
         if (p === 'embed') {
-            fn = payment.p2data;
+            fn = payment['p2data']!;
         } else {
-            fn = payment[p];
+            fn = payment[p]!;
         }
 
         const fixtures = JSON.parse(fs.readFileSync('test/fixtures/' + p + '.json', 'utf8'));
@@ -63,10 +86,9 @@ const require = async (name: string) => {
                 const actual = fn({
                     redeem: p2wsh({
                         redeem: p2pk({
-                            pubkey: Buffer.from(
+                            pubkey: fromHex(
                                 '03e15819590382a9dd878f01e2f0cbce541564eb415e43b440472d883ecd283058',
-                                'hex',
-                            ),
+                            ) as PublicKey,
                         }),
                     }),
                 } as P2SHPayment);

package/test/payments.utils.ts

@@ -1,26 +1,27 @@
 import * as t from 'assert';
 import * as BNETWORKS from '../src/networks.js';
 import * as bscript from '../src/script.js';
+import { toHex, fromHex as ioFromHex } from '../src/io/index.js';
 
-function tryHex(x: Buffer | Buffer[]): string | string[] {
-    if (Buffer.isBuffer(x)) return x.toString('hex');
+function tryHex(x: Uint8Array | Uint8Array[]): string | string[] {
+    if (x instanceof Uint8Array) return toHex(x);
     if (Array.isArray(x)) return x.map(tryHex) as string[];
     return x;
 }
 
-function fromHex(x: string | string[]): Buffer | Buffer[] {
-    if (typeof x === 'string') return Buffer.from(x, 'hex');
-    if (Array.isArray(x)) return x.map(fromHex) as Buffer[];
+function fromHex(x: string | string[]): Uint8Array | Uint8Array[] {
+    if (typeof x === 'string') return ioFromHex(x);
+    if (Array.isArray(x)) return x.map(fromHex) as Uint8Array[];
     return x;
 }
 
-function tryASM(x: Buffer): string {
-    if (Buffer.isBuffer(x)) return bscript.toASM(x);
+function tryASM(x: Uint8Array): string {
+    if (x instanceof Uint8Array) return bscript.toASM(x);
     return x;
 }
 
-function asmToBuffer(x: string): Buffer {
-    if (x === '') return Buffer.alloc(0);
+function asmToBuffer(x: string): Uint8Array {
+    if (x === '') return new Uint8Array(0);
     return bscript.fromASM(x);
 }
 
@@ -99,11 +100,11 @@ export function preform(x: any): any {
 
     if (x.network) x.network = (BNETWORKS as any)[x.network];
     if (typeof x.inputHex === 'string') {
-        x.input = Buffer.from(x.inputHex, 'hex');
+        x.input = ioFromHex(x.inputHex);
         delete x.inputHex;
     }
     if (typeof x.outputHex === 'string') {
-        x.output = Buffer.from(x.outputHex, 'hex');
+        x.output = ioFromHex(x.outputHex);
         delete x.outputHex;
     }
     if (typeof x.output === 'string') x.output = asmToBuffer(x.output);
@@ -111,14 +112,14 @@ export function preform(x: any): any {
     if (Array.isArray(x.witness)) x.witness = x.witness.map(fromHex);
 
     if (x.data) x.data = x.data.map(fromHex);
-    if (x.hash) x.hash = Buffer.from(x.hash, 'hex');
-    if (x.pubkey) x.pubkey = Buffer.from(x.pubkey, 'hex');
-    if (x.internalPubkey) x.internalPubkey = Buffer.from(x.internalPubkey, 'hex');
-    if (x.signature) x.signature = Buffer.from(x.signature, 'hex');
+    if (x.hash) x.hash = ioFromHex(x.hash);
+    if (x.pubkey) x.pubkey = ioFromHex(x.pubkey);
+    if (x.internalPubkey) x.internalPubkey = ioFromHex(x.internalPubkey);
+    if (x.signature) x.signature = ioFromHex(x.signature);
     if (x.pubkeys) x.pubkeys = x.pubkeys.map(fromHex);
     if (x.signatures)
         x.signatures = x.signatures.map((y: any) => {
-            return Number.isFinite(y) ? y : Buffer.from(y, 'hex');
+            return Number.isFinite(y) ? y : ioFromHex(y);
         });
     if (x.redeem) {
         x.redeem = Object.assign({}, x.redeem);