@btc-vision/transaction 1.0.119 → 1.0.121

package/src/generators/Features.ts

@@ -1,4 +1,4 @@
-import { opcodes } from 'bitcoinjs-lib';
+import { opcodes } from '@btc-vision/bitcoin';
 
 export enum Features {
     UNWRAP = 0, // random number just to set the first value

package/src/generators/Generator.ts

@@ -1,5 +1,5 @@
-import { Network, networks } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { Network, networks } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
 /** Bitcoin Script Generator */
 export abstract class Generator {

package/src/generators/builders/CalldataGenerator.ts

@@ -1,4 +1,4 @@
-import { crypto, Network, networks, opcodes, script } from 'bitcoinjs-lib';
+import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
@@ -99,7 +99,7 @@ export class CalldataGenerator extends Generator {
 
             Generator.MAGIC,
         ];
-        
+
         // write pub keys, when requested.
         if (vaultPublicKeys.length > 0) {
             const pubKeyBuffer = CalldataGenerator.getPubKeyAsBuffer(vaultPublicKeys, this.network);

package/src/generators/builders/CustomGenerator.ts

@@ -1,4 +1,4 @@
-import { Network, networks, script, Stack } from 'bitcoinjs-lib';
+import { Network, networks, script, Stack } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 
 /**

package/src/generators/builders/DeploymentGenerator.ts

@@ -1,4 +1,4 @@
-import { crypto, Network, networks, opcodes, script } from 'bitcoinjs-lib';
+import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 
 export class DeploymentGenerator extends Generator {

package/src/generators/builders/LegacyCalldataGenerator.ts

@@ -1,4 +1,4 @@
-import { Network, networks, opcodes, script } from 'bitcoinjs-lib';
+import { Network, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';

package/src/generators/builders/MultiSignGenerator.ts

@@ -1,5 +1,5 @@
-import { opcodes, script } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { opcodes, script } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
 /**
  * Generate a bitcoin script for a multisign interaction

package/src/keypair/Address.ts

@@ -1,15 +1,24 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { EcKeyPair } from './EcKeyPair.js';
 import { ECPairInterface } from 'ecpair';
 import { ADDRESS_BYTE_LENGTH } from '../utils/types.js';
 import { AddressVerificator } from './AddressVerificator.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
+const hexPattern = /^[0-9a-fA-F]+$/;
+const isHexadecimal = (input: string): boolean => {
+    return hexPattern.test(input);
+};
+
+/**
+ * Objects of type "Address" are the representation of tweaked public keys. They can be converted to different address formats.
+ * @category KeyPair
+ */
 export class Address extends Uint8Array {
-    private isP2TROnly: boolean = false;
     #p2tr: string | undefined;
     #network: Network | undefined;
-    #tweakedBytes: Uint8Array | undefined;
+    #originalPublicKey: Uint8Array | undefined;
+    #keyPair: ECPairInterface | undefined;
 
     public constructor(bytes?: ArrayLike<number>) {
         super(bytes?.length || ADDRESS_BYTE_LENGTH);
@@ -21,25 +30,24 @@ export class Address extends Uint8Array {
         this.set(bytes);
     }
 
-    private _keyPair: ECPairInterface | undefined;
+    /**
+     * If available, this will return the original public key associated with the address.
+     * @returns {Uint8Array} The original public key used to create the address.
+     */
+    public get originalPublicKey(): Uint8Array | undefined {
+        return this.#originalPublicKey;
+    }
 
     /**
      * Get the key pair for the address
+     * @description This is only for internal use. Please use address.tweakedBytes instead.
      */
-    public get keyPair(): ECPairInterface {
-        if (!this._keyPair) {
+    private get keyPair(): ECPairInterface {
+        if (!this.#keyPair) {
             throw new Error('Public key not set for address');
         }
 
-        return this._keyPair;
-    }
-
-    /**
-     * Get the tweaked bytes
-     * @returns {Uint8Array} The tweaked bytes
-     */
-    public get tweakedBytes(): Uint8Array {
-        return this.#tweakedBytes || this;
+        return this.#keyPair;
     }
 
     public static dead(): Address {
@@ -62,6 +70,12 @@ export class Address extends Uint8Array {
             pubKey = pubKey.slice(2);
         }
 
+        if (!isHexadecimal(pubKey)) {
+            throw new Error(
+                'You must only pass public keys in hexadecimal format. If you have an address such as bc1q... you must convert it to a public key first. Please refer to await provider.getPublicKeyInfo("bc1q..."). If the public key associated with the address is not found, you must force the user to enter the destination public key. It looks like: 0x020373626d317ae8788ce3280b491068610d840c23ecb64c14075bbb9f670af52c.',
+            );
+        }
+
         return new Address(Buffer.from(pubKey, 'hex'));
     }
 
@@ -91,15 +105,14 @@ export class Address extends Uint8Array {
     }
 
     public equals(a: Address): boolean {
-        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
-        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+        const b: Address = this as Address;
 
-        if (c.length !== b.length) {
+        if (a.length !== b.length) {
             return false;
         }
 
         for (let i = 0; i < b.length; i++) {
-            if (b[i] !== c[i]) {
+            if (b[i] !== a[i]) {
                 return false;
             }
         }
@@ -112,13 +125,11 @@ export class Address extends Uint8Array {
      * @returns {boolean} If bigger
      */
     public lessThan(a: Address): boolean {
-        // Compare the two addresses byte-by-byte, treating them as big-endian uint256
-        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
-        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+        const b: Address = this as Address;
 
         for (let i = 0; i < 32; i++) {
             const thisByte = b[i];
-            const aByte = c[i];
+            const aByte = a[i];
 
             if (thisByte < aByte) {
                 return true; // this is less than a
@@ -136,12 +147,11 @@ export class Address extends Uint8Array {
      */
     public greaterThan(a: Address): boolean {
         // Compare the two addresses byte-by-byte, treating them as big-endian uint256
-        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
-        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+        const b = this as Address;
 
         for (let i = 0; i < 32; i++) {
             const thisByte = b[i];
-            const aByte = c[i];
+            const aByte = a[i];
 
             if (thisByte > aByte) {
                 return true; // this is greater than a
@@ -164,23 +174,19 @@ export class Address extends Uint8Array {
         }
 
         if (publicKey.length === 32) {
-            this.isP2TROnly = true;
-
             const buf = Buffer.alloc(32);
             buf.set(publicKey);
 
             super.set(publicKey);
         } else {
-            this._keyPair = EcKeyPair.fromPublicKey(Uint8Array.from(publicKey));
+            this.#originalPublicKey = Uint8Array.from(publicKey);
+            this.#keyPair = EcKeyPair.fromPublicKey(this.#originalPublicKey);
 
-            this.#tweakedBytes = toXOnly(
-                Buffer.from(
-                    EcKeyPair.tweakPublicKey(this._keyPair.publicKey.toString('hex')),
-                    'hex',
-                ),
+            const tweakedBytes = toXOnly(
+                EcKeyPair.tweakPublicKey(Buffer.from(this.#originalPublicKey)),
             );
 
-            super.set(publicKey);
+            super.set(tweakedBytes);
         }
     }
 
@@ -237,10 +243,7 @@ export class Address extends Uint8Array {
             return this.#p2tr;
         }
 
-        const p2trAddy: string | undefined = EcKeyPair.tweakedPubKeyBufferToAddress(
-            this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array),
-            network,
-        );
+        const p2trAddy: string | undefined = EcKeyPair.tweakedPubKeyBufferToAddress(this, network);
 
         if (p2trAddy) {
             this.#network = network;

package/src/keypair/AddressVerificator.ts

@@ -1,4 +1,4 @@
-import { address, initEccLib, Network } from 'bitcoinjs-lib';
+import { address, initEccLib, Network } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from './EcKeyPair.js';
 

package/src/keypair/EcKeyPair.ts

@@ -1,20 +1,24 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
 import bip32, { BIP32API, BIP32Factory, BIP32Interface } from 'bip32';
-import { address, initEccLib, Network, networks, payments, Signer } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { address, initEccLib, Network, networks, payments, Signer } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairAPI, ECPairFactory, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
-import { CURVE, Point, utils } from '@noble/secp256k1';
-import { taggedHash } from 'bitcoinjs-lib/src/crypto.js';
+import { CURVE, ProjectivePoint as Point } from '@noble/secp256k1';
+import { taggedHash } from '@btc-vision/bitcoin/src/crypto.js';
 
 initEccLib(ecc);
 
 const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
-
 if (!BIP32factory) {
     throw new Error('Failed to load BIP32 library');
 }
 
+const mod = (a: bigint, b: bigint): bigint => {
+    const result = a % b;
+    return result >= 0n ? result : result + b;
+};
+
 /**
  * Class for handling EC key pairs
  * @class EcKeyPair
@@ -212,20 +216,24 @@ export class EcKeyPair {
 
     /**
      * Tweak a public key
-     * @param {string} compressedPubKeyHex - The compressed public key hex string
-     * @returns {string} - The tweaked public key hex string
+     * @param {string | Buffer} compressedPubKeyHex - The compressed public key hex string
+     * @returns {Buffer} - The tweaked public key hex string
      * @throws {Error} - If the public key cannot be tweaked
      */
-    public static tweakPublicKey(compressedPubKeyHex: string): string {
-        if (compressedPubKeyHex.startsWith('0x')) {
+    public static tweakPublicKey(compressedPubKeyHex: string | Buffer): Buffer {
+        if (typeof compressedPubKeyHex === 'string' && compressedPubKeyHex.startsWith('0x')) {
             compressedPubKeyHex = compressedPubKeyHex.slice(2);
         }
 
+        if (typeof compressedPubKeyHex !== 'string') {
+            compressedPubKeyHex = compressedPubKeyHex.toString('hex');
+        }
+
         // Convert the compressed public key hex string to a Point on the curve
         let P = Point.fromHex(compressedPubKeyHex);
 
         // Ensure the point has an even y-coordinate
-        if (!P.hasEvenY()) {
+        if ((P.y & 1n) !== 0n) {
             // Negate the point to get an even y-coordinate
             P = P.negate();
         }
@@ -235,13 +243,13 @@ export class EcKeyPair {
 
         // Compute the tweak t = H_tapTweak(x)
         const tHash = taggedHash('TapTweak', Buffer.from(x));
-        const t = utils.mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
+        const t = mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
 
         // Compute Q = P + t*G (where G is the generator point)
-        const Q = P.add(Point.BASE.multiply(t));
+        const Q = P.add(Point.BASE.mul(t));
 
         // Return the tweaked public key in compressed form (hex string)
-        return Q.toHex(true);
+        return Buffer.from(Q.toRawBytes(true));
     }
 
     /**
@@ -417,6 +425,6 @@ export class EcKeyPair {
         const privKey = fromSeed.privateKey;
         if (!privKey) throw new Error('Failed to generate key pair');
 
-        return this.ECPair.fromPrivateKey(privKey, { network });
+        return this.ECPair.fromPrivateKey(Buffer.from(privKey), { network });
     }
 }

package/src/keypair/Wallet.ts

@@ -1,8 +1,8 @@
 import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from './EcKeyPair.js';
-import { Network, networks } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { Network, networks } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { Address } from './Address.js';
 
 /**
@@ -68,10 +68,7 @@ export class Wallet {
         this._legacy = EcKeyPair.getLegacyAddress(this._keypair, this.network);
         this._segwitLegacy = EcKeyPair.getLegacySegwitAddress(this._keypair, this.network);
 
-        this._tweakedKey = Buffer.from(
-            EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex')),
-            'hex',
-        );
+        this._tweakedKey = EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex'));
 
         this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);

package/src/metadata/ContractBaseMetadata.ts

@@ -1,4 +1,4 @@
-import { Network, networks } from 'bitcoinjs-lib';
+import { Network, networks } from '@btc-vision/bitcoin';
 
 export abstract class ContractBaseMetadata {
     protected abstract readonly address: string;

package/src/metadata/contracts/wBTC.ts

@@ -1,4 +1,4 @@
-import { Network, networks } from 'bitcoinjs-lib';
+import { Network, networks } from '@btc-vision/bitcoin';
 import { ChainId } from '../../network/ChainId.js';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
 import { WBTC_ADDRESS_FRACTAL, WBTC_ADDRESS_REGTEST, WBTC_ADDRESS_TESTNET } from '../tokens.js';

package/src/signer/TweakedSigner.ts

@@ -1,7 +1,7 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { initEccLib, Network, Signer } from 'bitcoinjs-lib';
-import { tapTweakHash } from 'bitcoinjs-lib/src/payments/bip341.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { initEccLib, Network, Signer } from '@btc-vision/bitcoin';
+import { tapTweakHash } from '@btc-vision/bitcoin/src/payments/bip341.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../keypair/EcKeyPair.js';
 

package/src/transaction/TransactionFactory.ts

@@ -1,5 +1,5 @@
-import { Psbt, Transaction } from 'bitcoinjs-lib';
-import { Output } from 'bitcoinjs-lib/src/transaction.js';
+import { Psbt, Transaction } from '@btc-vision/bitcoin';
+import { Output } from '@btc-vision/bitcoin/src/transaction.js';
 import { currentConsensus, currentConsensusConfig } from '../consensus/ConsensusConfig.js';
 import { wBTC } from '../metadata/contracts/wBTC.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';

package/src/transaction/browser/BrowserSignerBase.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt, Signer } from 'bitcoinjs-lib';
+import { Network, Psbt, Signer } from '@btc-vision/bitcoin';
 
 /**
  * Create a custom keypair.

package/src/transaction/browser/extensions/UnisatSigner.ts

@@ -1,4 +1,4 @@
-import { Network, networks, Psbt, TapScriptSig } from 'bitcoinjs-lib';
+import { Network, networks, Psbt, TapScriptSig } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -1,14 +1,14 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { crypto as bitCrypto, Payment, Psbt, PsbtInput, Signer, Stack } from 'bitcoinjs-lib';
+import { crypto as bitCrypto, Payment, Psbt, PsbtInput, Signer, Stack } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressGenerator } from '../../generators/AddressGenerator.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairInterface } from 'ecpair';
 
 export interface ICustomTransactionParameters extends SharedInteractionParameters {

package/src/transaction/builders/DeploymentTransaction.ts

@@ -1,11 +1,11 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
-import { crypto as bitCrypto, Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
+import { crypto as bitCrypto, Payment, Psbt, PsbtInput, Signer } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { DeploymentGenerator } from '../../generators/builders/DeploymentGenerator.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';

package/src/transaction/builders/FundingTransaction.ts

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters } from '../interfaces/ITransactionParameters.js';
-import { Signer } from 'bitcoinjs-lib';
+import { Signer } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { ECPairInterface } from 'ecpair';
 

package/src/transaction/builders/InteractionTransaction.ts

@@ -1,4 +1,4 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';

package/src/transaction/builders/MultiSignTransaction.ts

@@ -9,14 +9,14 @@ import {
     script,
     Signer,
     TapScriptSig,
-} from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+} from '@btc-vision/bitcoin';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { ECPairInterface } from 'ecpair';
 

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -1,5 +1,5 @@
-import { address, Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { address, Payment, Psbt, PsbtInput, Signer } from '@btc-vision/bitcoin';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -8,7 +8,7 @@ import { SharedInteractionParameters } from '../interfaces/ITransactionParameter
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
 /**
  * Shared interaction transaction

package/src/transaction/builders/TransactionBuilder.ts

@@ -8,8 +8,8 @@ import {
     script,
     Signer,
     Transaction,
-} from 'bitcoinjs-lib';
-import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
+} from '@btc-vision/bitcoin';
+import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';

package/src/transaction/builders/UnwrapSegwitTransaction.ts

@@ -1,10 +1,10 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { payments, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer } from 'bitcoinjs-lib';
+import { payments, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { IWBTCUTXODocument, PsbtTransaction, VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';

package/src/transaction/builders/UnwrapTransaction.ts

@@ -1,4 +1,4 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
@@ -12,12 +12,12 @@ import {
     PsbtInput,
     PsbtInputExtended,
     PsbtOutputExtended,
-} from 'bitcoinjs-lib';
+} from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { IWBTCUTXODocument, PsbtTransaction, VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
 import { MultiSignTransaction } from './MultiSignTransaction.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';

package/src/transaction/builders/WrapTransaction.ts

@@ -1,4 +1,4 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IWrapParameters } from '../interfaces/ITransactionParameters.js';
@@ -6,7 +6,7 @@ import { SharedInteractionTransaction } from './SharedInteractionTransaction.js'
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { WrappedGeneration } from '../../wbtc/WrappedGenerationParameters.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { Network, PsbtOutputExtendedAddress } from 'bitcoinjs-lib';
+import { Network, PsbtOutputExtendedAddress } from '@btc-vision/bitcoin';
 import { P2TR_MS } from '../shared/P2TR_MS.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';
 import { Selector } from '../../utils/types.js';

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -4,7 +4,7 @@ import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
 import { Address } from '../../keypair/Address.js';
-import { PsbtOutputExtended } from 'bitcoinjs-lib';
+import { PsbtOutputExtended } from '@btc-vision/bitcoin';
 
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;

package/src/transaction/interfaces/Tap.ts

@@ -10,7 +10,7 @@ import {
     TapMerkleRoot as _TapMerkleRoot,
     TapScriptSig as _TapScriptSig,
     TapTree as _TapTree,
-} from 'bitcoinjs-lib';
+} from '@btc-vision/bitcoin';
 
 export interface TapLeafScript {
     readonly leafVersion: number;

package/src/transaction/processor/PsbtTransaction.ts

@@ -5,7 +5,7 @@ import {
     PsbtOutputExtended,
     Signer,
     Transaction,
-} from 'bitcoinjs-lib';
+} from '@btc-vision/bitcoin';
 import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 
 export interface PsbtTransactionData extends ITweakedTransactionData {

package/src/transaction/shared/P2TR_MS.ts

@@ -1,4 +1,4 @@
-import { Network, networks } from 'bitcoinjs-lib';
+import { Network, networks } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { MultiSignParameters, MultiSignTransaction } from '../builders/MultiSignTransaction.js';
 

package/src/transaction/shared/TweakedTransaction.ts

@@ -13,15 +13,15 @@ import {
     script,
     Signer,
     Transaction,
-} from 'bitcoinjs-lib';
+} from '@btc-vision/bitcoin';
 import { TweakedSigner, TweakSettings } from '../../signer/TweakedSigner.js';
 import { ECPairInterface } from 'ecpair';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { AddressTypes, AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { ChainId } from '../../network/ChainId.js';
-import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
+import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
 
 export interface ITweakedTransactionData {
     readonly signer: Signer | ECPairInterface;

package/src/utils/BitcoinUtils.ts

@@ -37,13 +37,9 @@ export class BitcoinUtils {
 
             return Buffer.from(array);
         } else {
-            // Fallback to Math.random() if window.crypto is not available
-            const randomValues = [];
-            for (let i = 0; i < length; i++) {
-                randomValues.push(Math.floor(Math.random() * 256));
-            }
-
-            return Buffer.from(randomValues);
+            throw new Error(
+                'No secure random number generator available. Please upgrade your environment.',
+            );
         }
     }