@btc-vision/bitcoin 6.5.5 → 7.0.0-alpha.0

package/test/crypto.spec.ts

@@ -4,6 +4,7 @@ import { crypto as bcrypto } from '../src/index.js';
 import type { TaggedHashPrefix } from '../src/crypto.js';
 import fixtures from './fixtures/crypto.json' with { type: 'json' };
 import { sha256, TAGGED_HASH_PREFIXES, TAGS } from '../src/crypto.js';
+import { toHex, fromHex, fromUtf8, concat, equals } from '../src/io/index.js';
 
 describe('crypto', () => {
     ['hash160', 'hash256', 'ripemd160', 'sha1', 'sha256'].forEach((algorithm) => {
@@ -13,8 +14,8 @@ describe('crypto', () => {
                 const expected = (f as any)[algorithm];
 
                 it('returns ' + expected + ' for ' + f.hex, () => {
-                    const data = Buffer.from(f.hex, 'hex');
-                    const actual = fn(data).toString('hex');
+                    const data = fromHex(f.hex);
+                    const actual = toHex(fn(data));
 
                     assert.strictEqual(actual, expected);
                 });
@@ -24,11 +25,11 @@ describe('crypto', () => {
 
     describe('taggedHash', () => {
         fixtures.taggedHash.forEach((f) => {
-            const bytes = Buffer.from(f.hex, 'hex');
-            const expected = Buffer.from(f.result, 'hex');
+            const bytes = fromHex(f.hex);
+            const expected = fromHex(f.result);
             it(`returns ${f.result} for taggedHash "${f.tag}" of ${f.hex}`, () => {
                 const actual = bcrypto.taggedHash(f.tag as TaggedHashPrefix, bytes);
-                assert.strictEqual(actual.toString('hex'), expected.toString('hex'));
+                assert.strictEqual(toHex(actual), toHex(expected));
             });
         });
     });
@@ -36,15 +37,22 @@ describe('crypto', () => {
     describe('TAGGED_HASH_PREFIXES', () => {
         const taggedHashPrefixes = Object.fromEntries(
             TAGS.map((tag: TaggedHashPrefix) => {
-                const tagHash = sha256(Buffer.from(tag));
-                return [tag, Buffer.concat([tagHash, tagHash])];
+                const tagHash = sha256(fromUtf8(tag));
+                return [tag, concat([tagHash, tagHash])];
             }),
         );
         it('stored the result of operation', () => {
-            assert.strictEqual(
-                JSON.stringify(TAGGED_HASH_PREFIXES),
-                JSON.stringify(taggedHashPrefixes),
-            );
+            // Compare that all keys match and all values are equal
+            const storedKeys = Object.keys(TAGGED_HASH_PREFIXES);
+            const computedKeys = Object.keys(taggedHashPrefixes);
+            assert.deepStrictEqual(storedKeys.sort(), computedKeys.sort());
+
+            for (const key of storedKeys) {
+                assert.ok(
+                    equals(TAGGED_HASH_PREFIXES[key as TaggedHashPrefix], taggedHashPrefixes[key]),
+                    `Mismatch for tag ${key}`,
+                );
+            }
         });
     });
 });

package/test/fixtures/p2pk.json

@@ -72,14 +72,6 @@
             "exception": "Not enough data",
             "arguments": {}
         },
-        {
-            "description": "Non-canonical signature",
-            "exception": "Expected property \"signature\" of type \\?isCanonicalScriptSignature, got Buffer",
-            "arguments": {
-                "pubkey": "030000000000000000000000000000000000000000000000000000000000000001",
-                "signature": "3044"
-            }
-        },
         {
             "description": "Unexpected OP_RESERVED",
             "exception": "Output is invalid",

package/test/fixtures/p2pkh.json

@@ -124,7 +124,7 @@
         },
         {
             "description": "Non-minimally encoded (non BIP62 compliant)",
-            "exception": "Expected property \"output\" of type Buffer\\(Length: 25\\), got Buffer\\(Length: 26\\)",
+            "exception": "Output is invalid",
             "arguments": {
                 "outputHex": "76a94c14aa4d7985c57e011a8b3dd8e0e5a73aaef41629c588ac"
             }

package/test/fixtures/p2sh.json

@@ -204,7 +204,7 @@
         },
         {
             "description": "Non-minimally encoded (non BIP62 compliant)",
-            "exception": "Expected property \"output\" of type Buffer\\(Length: 23\\), got Buffer\\(Length: 24\\)",
+            "exception": "Output is invalid",
             "arguments": {
                 "outputHex": "a94c14c286a1af0947f58d1ad787385b1c2c4a976f9e7187"
             }

package/test/fixtures/script.json

@@ -457,7 +457,7 @@
         ],
         "fromASM": [
             {
-                "description": "Expected Hex, got String \"0xff\"",
+                "description": "Expected hex string",
                 "script": "0xff OP_CHECKSIG"
             }
         ]

package/test/fixtures/transaction.json

@@ -892,12 +892,12 @@
     "invalid": {
         "addInput": [
             {
-                "exception": "Expected property \"0\" of type Buffer\\(Length: 32\\), got Buffer\\(Length: 30\\)",
+                "exception": "Expected 32-byte hash",
                 "hash": "0aed1366a73b6057ee7800d737bff1bdf8c448e98d86bc0998f2b009816d",
                 "index": 0
             },
             {
-                "exception": "Expected property \"0\" of type Buffer\\(Length: 32\\), got Buffer\\(Length: 34\\)",
+                "exception": "Expected 32-byte hash",
                 "hash": "0aed1366a73b6057ee7800d737bff1bdf8c448e98d86bc0998f2b009816da9b0ffff",
                 "index": 0
             }

package/test/integration/_regtest.ts

@@ -4,3 +4,28 @@ const APIPASS = process.env.APIPASS || 'satoshi';
 const APIURL = process.env.APIURL || 'https://regtest.bitbank.cc/1';
 
 export const regtestUtils = new RegtestUtils({ APIPASS, APIURL });
+
+/**
+ * Broadcast with retry logic.
+ * The regtest node sometimes returns Bad Request when the faucet
+ * transaction hasn't fully propagated yet (race with indexer).
+ */
+export async function broadcastAndVerify(
+    txHex: string,
+    verify: () => Promise<void>,
+    maxRetries: number = 3,
+): Promise<void> {
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+            await regtestUtils.broadcast(txHex);
+            await verify();
+            return;
+        } catch (err: unknown) {
+            if (attempt === maxRetries - 1) throw err;
+            const msg = err instanceof Error ? err.message : String(err);
+            if (msg !== 'Bad Request') throw err;
+            console.log(`Bad Request, retry #${attempt + 1}`);
+            await new Promise((r) => setTimeout(r, 200 * (attempt + 1)));
+        }
+    }
+}

package/test/integration/addresses.spec.ts

@@ -3,6 +3,7 @@ import { ECPairFactory } from 'ecpair';
 import * as ecc from 'tiny-secp256k1';
 import { describe, it } from 'vitest';
 import * as bitcoin from '../../src/index.js';
+import type { PublicKey } from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
 
 const ECPair = ECPairFactory(ecc);
@@ -48,7 +49,7 @@ describe('bitcoinjs-lib (addresses)', () => {
             '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
             '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
             '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9',
-        ].map((hex) => Buffer.from(hex, 'hex'));
+        ].map((hex) => Buffer.from(hex, 'hex')) as unknown as PublicKey[];
         const { address } = bitcoin.payments.p2sh({
             redeem: bitcoin.payments.p2ms({ m: 2, pubkeys }),
         });
@@ -80,7 +81,7 @@ describe('bitcoinjs-lib (addresses)', () => {
             '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
             '023e4740d0ba639e28963f3476157b7cf2fb7c6fdf4254f97099cf8670b505ea59',
             '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9',
-        ].map((hex) => Buffer.from(hex, 'hex'));
+        ].map((hex) => Buffer.from(hex, 'hex')) as unknown as PublicKey[];
         const { address } = bitcoin.payments.p2wsh({
             redeem: bitcoin.payments.p2ms({ m: 3, pubkeys }),
         });
@@ -95,7 +96,7 @@ describe('bitcoinjs-lib (addresses)', () => {
         const pubkeys = [
             '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
             '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
-        ].map((hex) => Buffer.from(hex, 'hex'));
+        ].map((hex) => Buffer.from(hex, 'hex')) as unknown as PublicKey[];
         const { address } = bitcoin.payments.p2sh({
             redeem: bitcoin.payments.p2wsh({
                 redeem: bitcoin.payments.p2ms({ m: 2, pubkeys }),

package/test/integration/bip32.spec.ts

@@ -4,6 +4,7 @@ import * as ecc from 'tiny-secp256k1';
 import * as bip39 from 'bip39';
 import { describe, it } from 'vitest';
 import * as bitcoin from '../../src/index.js';
+import type { PublicKey } from '../../src/index.js';
 
 const bip32 = BIP32Factory(ecc);
 
@@ -90,7 +91,7 @@ describe('bitcoinjs-lib (BIP32)', () => {
 
         const { address } = bitcoin.payments.p2sh({
             redeem: bitcoin.payments.p2wpkh({
-                pubkey: child.publicKey,
+                pubkey: child.publicKey as PublicKey,
                 network: bitcoin.networks.testnet,
             }),
             network: bitcoin.networks.testnet,

package/test/integration/blocks.spec.ts

@@ -22,7 +22,7 @@ describe('bitcoinjs-lib (blocks)', () => {
 
         assert.strictEqual(script[0], 0x03);
         const heightBuffer = script.slice(1, 4);
-        const height = bitcoin.script.number.decode(heightBuffer);
+        const height = bitcoin.script.number.decode(heightBuffer as Buffer);
         assert.strictEqual(height, 498303);
     });
 });

package/test/integration/cltv.spec.ts

@@ -3,6 +3,8 @@ import { ECPairFactory } from 'ecpair';
 import * as ecc from 'tiny-secp256k1';
 import { beforeAll, describe, it } from 'vitest';
 import * as bitcoin from '../../src/index.js';
+import { toHex, fromHex, reverseCopy } from '../../src/index.js';
+import type { Script, Bytes32, Satoshi } from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
 
 // @ts-ignore
@@ -11,12 +13,12 @@ import bip65 from 'bip65';
 const ECPair = ECPairFactory(ecc);
 const regtest = regtestUtils.network;
 
-function toOutputScript(address: string): Buffer {
-    return bitcoin.address.toOutputScript(address, regtest);
+function toOutputScript(address: string): Script {
+    return bitcoin.address.toOutputScript(address, regtest) as Script;
 }
 
-function idToHash(txid: string): Buffer {
-    return Buffer.from(txid, 'hex').reverse();
+function idToHash(txid: string): Bytes32 {
+    return reverseCopy(fromHex(txid)) as Bytes32;
 }
 
 const alice = ECPair.fromWIF('cScfkGjbzzoeewVWmU2hYPUHeVGJRDdFt7WhmrVVGkxpmPP8BHWe', regtest);
@@ -31,10 +33,10 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
     const hashType = bitcoin.Transaction.SIGHASH_ALL;
 
     interface KeyPair {
-        publicKey: Buffer;
+        publicKey: Uint8Array;
     }
 
-    function cltvCheckSigOutput(aQ: KeyPair, bQ: KeyPair, lockTime: number): Buffer {
+    function cltvCheckSigOutput(aQ: KeyPair, bQ: KeyPair, lockTime: number): Script {
         return bitcoin.script.fromASM(
             `
       OP_IF
@@ -42,10 +44,10 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
           OP_CHECKLOCKTIMEVERIFY
           OP_DROP
       OP_ELSE
-          ${bQ.publicKey.toString('hex')}
+          ${toHex(bQ.publicKey)}
           OP_CHECKSIGVERIFY
       OP_ENDIF
-      ${aQ.publicKey.toString('hex')}
+      ${toHex(aQ.publicKey)}
       OP_CHECKSIG
     `
                 .trim()
@@ -76,7 +78,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
             tx.locktime = lockTime;
             // Note: nSequence MUST be <= 0xfffffffe otherwise OP_CHECKLOCKTIMEVERIFY will fail.
             tx.addInput(idToHash(unspent.txId), unspent.vout, 0xfffffffe);
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 7e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 70000n as Satoshi);
 
             // {Alice's signature} OP_TRUE
             const signatureHash = tx.hashForSignature(0, redeemScript, hashType);
@@ -89,7 +91,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
                     output: redeemScript,
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             await regtestUtils.broadcast(tx.toHex());
 
@@ -122,7 +124,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
             tx.locktime = lockTime;
             // Note: nSequence MUST be <= 0xfffffffe otherwise OP_CHECKLOCKTIMEVERIFY will fail.
             tx.addInput(idToHash(unspent.txId), unspent.vout, 0xfffffffe);
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 7e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 70000n as Satoshi);
 
             // {Alice's signature} OP_TRUE
             const signatureHash = tx.hashForSignature(0, redeemScript, hashType);
@@ -135,7 +137,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
                     output: redeemScript,
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             // TODO: test that it failures _prior_ to expiry, unfortunately, race conditions when run concurrently
             // ...
@@ -170,7 +172,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
             tx.locktime = lockTime;
             // Note: nSequence MUST be <= 0xfffffffe otherwise OP_CHECKLOCKTIMEVERIFY will fail.
             tx.addInput(idToHash(unspent.txId), unspent.vout, 0xfffffffe);
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 8e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 80000n as Satoshi);
 
             // {Alice's signature} {Bob's signature} OP_FALSE
             const signatureHash = tx.hashForSignature(0, redeemScript, hashType);
@@ -184,7 +186,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
                     output: redeemScript,
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             await regtestUtils.broadcast(tx.toHex());
             await regtestUtils.verify({
@@ -215,7 +217,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
             tx.locktime = lockTime;
             // Note: nSequence MUST be <= 0xfffffffe otherwise OP_CHECKLOCKTIMEVERIFY will fail.
             tx.addInput(idToHash(unspent.txId), unspent.vout, 0xfffffffe);
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 1e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 10000n as Satoshi);
 
             // {Alice's signature} OP_TRUE
             const signatureHash = tx.hashForSignature(0, redeemScript, hashType);
@@ -229,7 +231,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', () => {
                     output: redeemScript,
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             await regtestUtils.broadcast(tx.toHex()).catch((err: unknown) => {
                 assert.throws(() => {

package/test/integration/csv.spec.ts

@@ -4,21 +4,24 @@ import * as ecc from 'tiny-secp256k1';
 import { beforeAll, describe, it } from 'vitest';
 import * as bitcoin from '../../src/index.js';
 import type { PsbtInput } from '../../src/index.js';
+import { toHex, fromHex, reverseCopy } from '../../src/index.js';
+import type { Script, Bytes32, Satoshi } from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
 
 // @ts-ignore
 import bip68 from 'bip68';
-import * as varuint from 'varuint-bitcoin';
+
+
 
 const ECPair = ECPairFactory(ecc);
 const regtest = regtestUtils.network;
 
-function toOutputScript(address: string): Buffer {
-    return bitcoin.address.toOutputScript(address, regtest);
+function toOutputScript(address: string): Script {
+    return bitcoin.address.toOutputScript(address, regtest) as Script;
 }
 
-function idToHash(txid: string): Buffer {
-    return Buffer.from(txid, 'hex').reverse();
+function idToHash(txid: string): Bytes32 {
+    return reverseCopy(fromHex(txid)) as Bytes32;
 }
 
 const alice = ECPair.fromWIF('cScfkGjbzzoeewVWmU2hYPUHeVGJRDdFt7WhmrVVGkxpmPP8BHWe', regtest);
@@ -35,11 +38,11 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
     const hashType = bitcoin.Transaction.SIGHASH_ALL;
 
     interface KeyPair {
-        publicKey: Buffer;
+        publicKey: Uint8Array;
     }
 
     // IF MTP (from when confirmed) > seconds, _alice can redeem
-    function csvCheckSigOutput(_alice: KeyPair, _bob: KeyPair, sequence: number): Buffer {
+    function csvCheckSigOutput(_alice: KeyPair, _bob: KeyPair, sequence: number): Script {
         return bitcoin.script.fromASM(
             `
       OP_IF
@@ -47,10 +50,10 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
           OP_CHECKSEQUENCEVERIFY
           OP_DROP
       OP_ELSE
-          ${_bob.publicKey.toString('hex')}
+          ${toHex(_bob.publicKey)}
           OP_CHECKSIGVERIFY
       OP_ENDIF
-      ${_alice.publicKey.toString('hex')}
+      ${toHex(_alice.publicKey)}
       OP_CHECKSIG
     `
                 .trim()
@@ -73,7 +76,7 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
         _dave: KeyPair,
         sequence1: number,
         sequence2: number,
-    ): Buffer {
+    ): Script {
         return bitcoin.script.fromASM(
             `
       OP_IF
@@ -83,20 +86,20 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
               ${bitcoin.script.number.encode(sequence1).toString('hex')}
               OP_CHECKSEQUENCEVERIFY
               OP_DROP
-              ${_alice.publicKey.toString('hex')}
+              ${toHex(_alice.publicKey)}
               OP_CHECKSIGVERIFY
               OP_1
           OP_ENDIF
-          ${_bob.publicKey.toString('hex')}
-          ${_charles.publicKey.toString('hex')}
-          ${_dave.publicKey.toString('hex')}
+          ${toHex(_bob.publicKey)}
+          ${toHex(_charles.publicKey)}
+          ${toHex(_dave.publicKey)}
           OP_3
           OP_CHECKMULTISIG
       OP_ELSE
           ${bitcoin.script.number.encode(sequence2).toString('hex')}
           OP_CHECKSEQUENCEVERIFY
           OP_DROP
-          ${_alice.publicKey.toString('hex')}
+          ${toHex(_alice.publicKey)}
           OP_CHECKSIG
       OP_ENDIF
     `
@@ -123,7 +126,7 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
             const unspent = await regtestUtils.faucet(p2sh.address!, 1e5);
             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');
+            const nonWitnessUtxo = fromHex(utx.txHex);
 
             // This is an example of using the finalizeInput second parameter to
             // define how you finalize the inputs, allowing for any type of script.
@@ -138,10 +141,10 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
                 })
                 .addOutput({
                     address: regtestUtils.RANDOM_ADDRESS,
-                    value: 7e4,
+                    value: 70000n as Satoshi,
                 })
                 .signInput(0, alice)
-                .finalizeInput(0, csvGetFinalScripts) // See csvGetFinalScripts below
+                .finalizeInput(0, csvGetFinalScripts as any) // See csvGetFinalScripts below
                 .extractTransaction();
 
             // TODO: test that it failures _prior_ to expiry, unfortunately, race conditions when run concurrently
@@ -180,10 +183,10 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
             const tx = new bitcoin.Transaction();
             tx.version = 2;
             tx.addInput(idToHash(unspent.txId), unspent.vout, sequence);
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 1e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 10000n as Satoshi);
 
             // {Alice's signature} OP_TRUE
-            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output!, hashType);
+            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output! as Script, hashType);
             const redeemScriptSig = bitcoin.payments.p2sh({
                 network: regtest,
                 redeem: {
@@ -196,7 +199,7 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
                     ]),
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             await regtestUtils.broadcast(tx.toHex()).catch((err: unknown) => {
                 assert.throws(() => {
@@ -228,10 +231,10 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
             const tx = new bitcoin.Transaction();
             tx.version = 2;
             tx.addInput(idToHash(unspent.txId), unspent.vout);
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 7e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 70000n as Satoshi);
 
             // OP_0 {Bob sig} {Charles sig} OP_TRUE OP_TRUE
-            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output!, hashType);
+            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output! as Script, hashType);
             const redeemScriptSig = bitcoin.payments.p2sh({
                 network: regtest,
                 redeem: {
@@ -246,7 +249,7 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
                     ]),
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             await regtestUtils.broadcast(tx.toHex());
 
@@ -281,10 +284,10 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
             const tx = new bitcoin.Transaction();
             tx.version = 2;
             tx.addInput(idToHash(unspent.txId), unspent.vout, sequence1); // Set sequence1 for input
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 7e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 70000n as Satoshi);
 
             // OP_0 {Bob sig} {Alice mediator sig} OP_FALSE OP_TRUE
-            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output!, hashType);
+            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output! as Script, hashType);
             const redeemScriptSig = bitcoin.payments.p2sh({
                 network: regtest,
                 redeem: {
@@ -299,7 +302,7 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
                     ]),
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             // Wait 2 blocks
             await regtestUtils.mine(2);
@@ -337,10 +340,10 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
             const tx = new bitcoin.Transaction();
             tx.version = 2;
             tx.addInput(idToHash(unspent.txId), unspent.vout, sequence2); // Set sequence2 for input
-            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 7e4);
+            tx.addOutput(toOutputScript(regtestUtils.RANDOM_ADDRESS), 70000n as Satoshi);
 
             // {Alice mediator sig} OP_FALSE
-            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output!, hashType);
+            const signatureHash = tx.hashForSignature(0, p2sh.redeem!.output! as Script, hashType);
             const redeemScriptSig = bitcoin.payments.p2sh({
                 network: regtest,
                 redeem: {
@@ -352,7 +355,7 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
                     ]),
                 },
             }).input;
-            tx.setInputScript(0, redeemScriptSig!);
+            tx.setInputScript(0, redeemScriptSig! as Script);
 
             // Wait 5 blocks
             await regtestUtils.mine(5);
@@ -374,13 +377,13 @@ describe('bitcoinjs-lib (transactions w/ CSV)', () => {
 function csvGetFinalScripts(
     inputIndex: number,
     input: PsbtInput,
-    script: Buffer,
+    script: Script,
     isSegwit: boolean,
     isP2SH: boolean,
     isP2WSH: boolean,
 ): {
-    finalScriptSig: Buffer | undefined;
-    finalScriptWitness: Buffer | undefined;
+    finalScriptSig: Script | undefined;
+    finalScriptWitness: Uint8Array | undefined;
 } {
     // Step 1: Check to make sure the meaningful script matches what you expect.
     const decompiled = bitcoin.script.decompile(script);
@@ -412,41 +415,11 @@ function csvGetFinalScripts(
             redeem: payment,
         });
 
-    function witnessStackToScriptWitness(witness: Buffer[]): Buffer {
-        let buffer = Buffer.allocUnsafe(0);
-
-        function writeSlice(slice: Buffer): void {
-            buffer = Buffer.concat([buffer, Buffer.from(slice)]);
-        }
-
-        function writeVarInt(i: number): void {
-            const currentLen = buffer.length;
-            const varintLen = varuint.encodingLength(i);
-
-            buffer = Buffer.concat([buffer, Buffer.allocUnsafe(varintLen)]);
-            varuint.encode(i, buffer, currentLen);
-        }
-
-        function writeVarSlice(slice: Buffer): void {
-            writeVarInt(slice.length);
-            writeSlice(slice);
-        }
-
-        function writeVector(vector: Buffer[]): void {
-            writeVarInt(vector.length);
-            vector.forEach(writeVarSlice);
-        }
-
-        writeVector(witness);
-
-        return buffer;
-    }
-
     return {
         finalScriptSig: payment.input,
         finalScriptWitness:
             payment.witness && payment.witness.length > 0
-                ? witnessStackToScriptWitness(payment.witness)
+                ? bitcoin.witnessStackToScriptWitness(payment.witness)
                 : undefined,
     };
 }

package/test/integration/payments.spec.ts

@@ -2,6 +2,8 @@ import { ECPairFactory } from 'ecpair';
 import * as ecc from 'tiny-secp256k1';
 import { describe, it } from 'vitest';
 import * as bitcoin from '../../src/index.js';
+import { fromHex } from '../../src/index.js';
+import type { Satoshi } from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
 import * as fs from 'node:fs';
 
@@ -15,20 +17,20 @@ async function buildAndSign(
     redeemScript: any,
     witnessScript: any,
 ): Promise<null> {
-    const unspent = await regtestUtils.faucetComplex(prevOutput, 5e4);
+    const unspent = await regtestUtils.faucetComplex(Buffer.from(prevOutput), 5e4);
     const utx = await regtestUtils.fetch(unspent.txId);
 
     const psbt = new bitcoin.Psbt({ network: NETWORK })
         .addInput({
             hash: unspent.txId,
             index: unspent.vout,
-            nonWitnessUtxo: Buffer.from(utx.txHex, 'hex'),
+            nonWitnessUtxo: fromHex(utx.txHex),
             ...(redeemScript ? { redeemScript } : {}),
             ...(witnessScript ? { witnessScript } : {}),
         })
         .addOutput({
             address: regtestUtils.RANDOM_ADDRESS,
-            value: 2e4,
+            value: 20000n as Satoshi,
         });
 
     if (depends.signatures) {