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

package/test/fixtures/script.json

@@ -3,9 +3,7 @@
         {
             "asm": "OP_1NEGATE",
             "script": "4f",
-            "stack": [
-                "81"
-            ]
+            "stack": ["81"]
         },
         {
             "asm": "304402207515cf147d201f411092e6be5a64a6006f9308fad7b2a8fdaab22cd86ce764c202200974b8aca7bf51dbf54150d3884e1ae04f675637b926ec33bf75939446f6ca2801",
@@ -74,18 +72,12 @@
         {
             "asm": "OP_0 aa4d7985c57e011a8b3dd8e0e5a73aaef41629c5",
             "script": "0014aa4d7985c57e011a8b3dd8e0e5a73aaef41629c5",
-            "stack": [
-                "",
-                "aa4d7985c57e011a8b3dd8e0e5a73aaef41629c5"
-            ]
+            "stack": ["", "aa4d7985c57e011a8b3dd8e0e5a73aaef41629c5"]
         },
         {
             "asm": "OP_0 32447752937d355ca2defddcd1f6b4fc53d182f8901cebbcff42f5e381bf0b80",
             "script": "002032447752937d355ca2defddcd1f6b4fc53d182f8901cebbcff42f5e381bf0b80",
-            "stack": [
-                "",
-                "32447752937d355ca2defddcd1f6b4fc53d182f8901cebbcff42f5e381bf0b80"
-            ]
+            "stack": ["", "32447752937d355ca2defddcd1f6b4fc53d182f8901cebbcff42f5e381bf0b80"]
         },
         {
             "asm": "OP_RETURN 06deadbeef03f895a2ad89fb6d696497af486cb7c644a27aa568c7a18dd06113401115185474",
@@ -112,12 +104,7 @@
         {
             "asm": "OP_0 OP_0 OP_0 OP_0",
             "script": "00000000",
-            "stack": [
-                "",
-                "",
-                "",
-                ""
-            ]
+            "stack": ["", "", "", ""]
         },
         {
             "asm": "OP_0 OP_0 30450221009c92c1ae1767ac04e424da7f6db045d979b08cde86b1ddba48621d59a109d818022004f5bb21ad72255177270abaeb2d7940ac18f1e5ca1f53db4f3fd1045647a8a801 52410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b84104c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a52ae",
@@ -140,24 +127,17 @@
         {
             "asm": "OP_0",
             "script": "00",
-            "stack": [
-                ""
-            ]
+            "stack": [""]
         },
         {
             "asm": "OP_0 00",
             "script": "000100",
-            "stack": [
-                "",
-                "00"
-            ]
+            "stack": ["", "00"]
         },
         {
             "asm": "OP_6",
             "script": "56",
-            "stack": [
-                "06"
-            ],
+            "stack": ["06"],
             "nonstandard": {
                 "scriptSig": "OP_6",
                 "scriptSigHex": "0106"
@@ -306,9 +286,7 @@
         },
         {
             "type": "nulldata",
-            "data": [
-                "deadffffffffffffffffffffffffffffffffbeef"
-            ],
+            "data": ["deadffffffffffffffffffffffffffffffffbeef"],
             "output": "OP_RETURN deadffffffffffffffffffffffffffffffffbeef",
             "outputHex": "6a14deadffffffffffffffffffffffffffffffffbeef"
         },
@@ -342,19 +320,10 @@
                 "02b80011a883a0fd621ad46dfc405df1e74bf075cbaf700fd4aebef6e96f848340",
                 "024289801366bcee6172b771cf5a7f13aaecd237a0b9a1ff9d769cabc2e6b70a34"
             ],
-            "signatures": [
-                null,
-                null,
-                null
-            ],
+            "signatures": [null, null, null],
             "input": "OP_0 OP_0 OP_0 OP_0",
             "inputHex": "00000000",
-            "inputStack": [
-                "",
-                "",
-                "",
-                ""
-            ]
+            "inputStack": ["", "", "", ""]
         },
         {
             "type": "scripthash",
@@ -406,10 +375,7 @@
             "type": "nonstandard",
             "input": "OP_0 00",
             "inputHex": "000100",
-            "inputStack": [
-                "",
-                "00"
-            ]
+            "inputStack": ["", "00"]
         },
         {
             "type": "nonstandard",
@@ -419,9 +385,7 @@
                 "input": "06",
                 "inputHex": "0106"
             },
-            "inputStack": [
-                "06"
-            ]
+            "inputStack": ["06"]
         },
         {
             "type": "nonstandard",

package/test/integration/addresses.spec.ts

@@ -1,12 +1,18 @@
 import assert from 'assert';
-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 * as bitcoin from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
-
-const ECPair = ECPairFactory(ecc);
+import { ECPairSigner, createNobleBackend } from '@btc-vision/ecpair';
+import type { Network } from '../../src/networks.js';
+
+const backend = createNobleBackend();
+const ECPair = {
+    makeRandom: (opts?: { network?: Network }) =>
+        ECPairSigner.makeRandom(backend, opts?.network ?? bitcoin.networks.bitcoin),
+    fromWIF: (wif: string, network?: Network | Network[]) =>
+        ECPairSigner.fromWIF(backend, wif, network ?? bitcoin.networks.bitcoin),
+};
 const dhttp = regtestUtils.dhttp;
 const TESTNET = bitcoin.networks.testnet;
 

package/test/integration/bip32.spec.ts

@@ -3,8 +3,8 @@ import { BIP32Factory } from '@btc-vision/bip32';
 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';
+import * as bitcoin from '../../src/index.js';
 
 const bip32 = BIP32Factory(ecc);
 

package/test/integration/cltv.spec.ts

@@ -1,16 +1,20 @@
 import assert from 'assert';
-import { ECPairFactory } from 'ecpair';
-import * as ecc from 'tiny-secp256k1';
 import { beforeAll, describe, it } from 'vitest';
+import type { Bytes32, Satoshi, Script } from '../../src/index.js';
 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 { fromHex, reverseCopy, toHex } from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
 
 // @ts-ignore
 import bip65 from 'bip65';
-
-const ECPair = ECPairFactory(ecc);
+import { ECPairSigner, createNobleBackend } from '@btc-vision/ecpair';
+import type { Network } from '../../src/networks.js';
+
+const backend = createNobleBackend();
+const ECPair = {
+    fromWIF: (wif: string, network?: Network | Network[]) =>
+        ECPairSigner.fromWIF(backend, wif, network ?? bitcoin.networks.bitcoin),
+};
 const regtest = regtestUtils.network;
 
 function toOutputScript(address: string): Script {

package/test/integration/csv.spec.ts

@@ -1,19 +1,20 @@
 import assert from 'assert';
-import { ECPairFactory } from 'ecpair';
-import * as ecc from 'tiny-secp256k1';
 import { beforeAll, describe, it } from 'vitest';
+import type { Bytes32, PsbtInput, Satoshi, Script } from '../../src/index.js';
 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 { fromHex, reverseCopy, toHex } from '../../src/index.js';
 import { regtestUtils } from './_regtest.js';
 
 // @ts-ignore
 import bip68 from 'bip68';
-
-
-
-const ECPair = ECPairFactory(ecc);
+import { ECPairSigner, createNobleBackend } from '@btc-vision/ecpair';
+import type { Network } from '../../src/networks.js';
+
+const backend = createNobleBackend();
+const ECPair = {
+    fromWIF: (wif: string, network?: Network | Network[]) =>
+        ECPairSigner.fromWIF(backend, wif, network ?? bitcoin.networks.bitcoin),
+};
 const regtest = regtestUtils.network;
 
 function toOutputScript(address: string): Script {

package/test/integration/payments.spec.ts

@@ -1,13 +1,17 @@
-import { ECPairFactory } from 'ecpair';
-import * as ecc from 'tiny-secp256k1';
+import { ECPairSigner, createNobleBackend } from '@btc-vision/ecpair';
 import { describe, it } from 'vitest';
+import type { Satoshi } from '../../src/index.js';
 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';
+import type { Network } from '../../src/networks.js';
 
-const ECPair = ECPairFactory(ecc);
+const backend = createNobleBackend();
+const ECPair = {
+    makeRandom: (opts?: { network?: Network }) =>
+        ECPairSigner.makeRandom(backend, opts?.network ?? bitcoin.networks.bitcoin),
+};
 const NETWORK = regtestUtils.network;
 const keyPairs = [ECPair.makeRandom({ network: NETWORK }), ECPair.makeRandom({ network: NETWORK })];
 

package/test/integration/taproot.spec.ts

@@ -3,10 +3,19 @@ import { BIP32Factory } from '@btc-vision/bip32';
 import * as bip39 from 'bip39';
 import * as ecc from 'tiny-secp256k1';
 import { describe, it } from 'vitest';
-import { regtestUtils, broadcastAndVerify } from './_regtest.js';
+import { broadcastAndVerify, regtestUtils } from './_regtest.js';
+import type {
+    EccLib,
+    PsbtInput,
+    PublicKey,
+    Satoshi,
+    TapLeaf,
+    TapLeafScript,
+    Taptree,
+    XOnlyPublicKey,
+} from '../../src/index.js';
 import * as bitcoin from '../../src/index.js';
-import { toHex, fromHex, concat } from '../../src/index.js';
-import type { PsbtInput, TapLeaf, TapLeafScript, Taptree, XOnlyPublicKey, PublicKey, Satoshi, Bytes32, EccLib } from '../../src/index.js';
+import { concat, fromHex, toHex } from '../../src/index.js';
 import { LEAF_VERSION_TAPSCRIPT } from '../../src/payments/bip341.js';
 import { tapTreeFromList, tapTreeToList } from '../../src/psbt/bip371.js';
 import { witnessStackToScriptWitness } from '../../src/psbt/psbtutils.js';
@@ -59,7 +68,10 @@ describe('bitcoinjs-lib (transaction with taproot)', () => {
         // amount to send
         const sendAmount = amount - 1e4;
         // Send some sats to the address via faucet. Get the hash and index. (txid/vout)
-        const { txId: hash, vout: index } = await regtestUtils.faucetComplex(Buffer.from(output), amount);
+        const { txId: hash, vout: index } = await regtestUtils.faucetComplex(
+            Buffer.from(output),
+            amount,
+        );
         // Sent 420000 sats to taproot address
 
         const psbt = new bitcoin.Psbt({ network: regtest })
@@ -583,7 +595,11 @@ describe('bitcoinjs-lib (transaction with taproot)', () => {
     });
 
     it('should fail validating invalid signatures for taproot (See issue #1931)', () => {
-        const schnorrValidator = (pubkey: Uint8Array, msghash: Uint8Array, signature: Uint8Array) => {
+        const schnorrValidator = (
+            pubkey: Uint8Array,
+            msghash: Uint8Array,
+            signature: Uint8Array,
+        ) => {
             return ecc.verifySchnorr(msghash, pubkey, signature);
         };
 
@@ -607,7 +623,11 @@ describe('bitcoinjs-lib (transaction with taproot)', () => {
     });
 
     it('should succeed validating valid signatures for taproot (See issue #1934)', () => {
-        const schnorrValidator = (pubkey: Uint8Array, msghash: Uint8Array, signature: Uint8Array) => {
+        const schnorrValidator = (
+            pubkey: Uint8Array,
+            msghash: Uint8Array,
+            signature: Uint8Array,
+        ) => {
             return ecc.verifySchnorr(msghash, pubkey, signature);
         };
 

package/test/integration/transactions.spec.ts

@@ -1,22 +1,33 @@
 import assert from 'assert';
 import { BIP32Factory } from '@btc-vision/bip32';
 import * as ecc from 'tiny-secp256k1';
-import { ECPairFactory } from 'ecpair';
 import { describe, it } from 'vitest';
+import type { MessageHash, PrivateKey, PublicKey, Satoshi, Signature } from '../../src/index.js';
 import * as bitcoin from '../../src/index.js';
-import { fromHex, compare } from '../../src/index.js';
-import type { Satoshi, PublicKey } from '../../src/index.js';
+import { compare, fromHex } from '../../src/index.js';
 import type { HDSigner } from '../../src/psbt/types.js';
-import { regtestUtils, broadcastAndVerify } from './_regtest.js';
+import { broadcastAndVerify, regtestUtils } from './_regtest.js';
 
 import rng from 'randombytes';
-
-const ECPair = ECPairFactory(ecc);
+import { ECPairSigner, createNobleBackend } from '@btc-vision/ecpair';
+import type { Network } from '../../src/networks.js';
+
+const backend = createNobleBackend();
+const ECPair = {
+    makeRandom: (opts?: { network?: Network }) =>
+        ECPairSigner.makeRandom(backend, opts?.network ?? bitcoin.networks.bitcoin),
+    fromWIF: (wif: string, network?: Network | Network[]) =>
+        ECPairSigner.fromWIF(backend, wif, network ?? bitcoin.networks.bitcoin),
+    fromPublicKey: (pubkey: Uint8Array, opts?: { network?: Network }) =>
+        ECPairSigner.fromPublicKey(backend, pubkey as PublicKey, opts?.network ?? bitcoin.networks.bitcoin),
+    fromPrivateKey: (key: Uint8Array, opts?: { network?: Network }) =>
+        ECPairSigner.fromPrivateKey(backend, key as PrivateKey, opts?.network ?? bitcoin.networks.bitcoin),
+};
 const regtest = { ...regtestUtils.network, bech32Opnet: 'opreg' };
 const bip32 = BIP32Factory(ecc);
 
 const validator = (pubkey: Uint8Array, msghash: Uint8Array, signature: Uint8Array): boolean =>
-    ECPair.fromPublicKey(pubkey).verify(msghash, signature);
+    ECPair.fromPublicKey(pubkey).verify(msghash as MessageHash, signature as Signature);
 
 // See bottom of file for some helper functions used to make the payment objects needed.
 
@@ -566,7 +577,10 @@ describe('bitcoinjs-lib (transactions with psbt)', () => {
             .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 as PublicKey), true);
+        assert.strictEqual(
+            psbt.validateSignaturesOfInput(0, validator, childNode.publicKey as PublicKey),
+            true,
+        );
         psbt.finalizeAllInputs();
 
         const tx = psbt.extractTransaction();

package/test/payments.spec.ts

@@ -1,8 +1,8 @@
 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 { initEccLib } 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';

package/test/payments.utils.ts

@@ -1,7 +1,7 @@
 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';
+import { fromHex as ioFromHex, toHex } from '../src/io/index.js';
 
 function tryHex(x: Uint8Array | Uint8Array[]): string | string[] {
     if (x instanceof Uint8Array) return toHex(x);