@btc-vision/transaction 1.0.118 → 1.0.120

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

@@ -0,0 +1,141 @@
+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';
+import { FeatureOpCodes, Features } from '../Features.js';
+import { Generator } from '../Generator.js';
+
+/**
+ * Class to generate bitcoin script for interaction transactions
+ */
+export class LegacyCalldataGenerator extends Generator {
+    constructor(senderPubKey: Buffer, network: Network = networks.bitcoin) {
+        super(senderPubKey, Buffer.alloc(0), network);
+    }
+
+    /**
+     * Get the public key as a buffer
+     * @param {Buffer[]} witnessKeys - The public keys
+     * @param {Network} network - The network to use
+     * @private
+     * @returns {Buffer} - The public key as a buffer
+     */
+    public static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer {
+        let finalBuffer: Buffer = Buffer.alloc(0);
+
+        for (const pubKey of witnessKeys) {
+            const key: ECPairInterface = EcKeyPair.fromPublicKey(pubKey, network);
+
+            if (!key.compressed) {
+                throw new Error('Public key must be compressed');
+            }
+
+            if (pubKey.byteLength !== 33) {
+                throw new Error(`Public key must be 33 bytes, got ${pubKey.byteLength} bytes.`);
+            }
+
+            finalBuffer = Buffer.concat([finalBuffer, pubKey]);
+        }
+
+        // compress the public keys
+        const compressed: Buffer = Compressor.compress(finalBuffer);
+        if (compressed.byteLength >= finalBuffer.byteLength) {
+            // we ensure that the user pays the smallest amount of fees. [micro-optimization]
+            return finalBuffer;
+        }
+
+        // if compressed is smaller, return compressed.
+        return compressed;
+    }
+
+    /**
+     * Compile an interaction bitcoin script
+     * @param {Buffer} calldata - The calldata to use
+     * @param {Buffer} contractSecret - The contract secret
+     * @param {number[]} [features=[]] - The features to use (optional)
+     * @param {Buffer[]} [vaultPublicKeys=[]] - The public keys of the vault (optional)
+     * @param {number} [minimumSignatures=0] - The minimum number of signatures (optional)
+     * @returns {Buffer} - The compiled script
+     * @throws {Error} - If something goes wrong
+     */
+    public compile(
+        calldata: Buffer,
+        contractSecret: Buffer,
+        features: Features[] = [],
+        vaultPublicKeys: Buffer[] = [],
+        minimumSignatures: number = 0,
+    ): Buffer {
+        const dataChunks: Buffer[][] = this.splitBufferIntoChunks(calldata);
+        if (!dataChunks.length) throw new Error('No data chunks found');
+
+        let compiledData = [
+            this.senderPubKey,
+            opcodes.OP_CHECKSIGVERIFY,
+
+            contractSecret,
+            opcodes.OP_TOALTSTACK,
+
+            opcodes.OP_DEPTH,
+            opcodes.OP_1,
+            opcodes.OP_NUMEQUAL,
+            opcodes.OP_IF,
+
+            Generator.MAGIC,
+        ];
+
+        // write pub keys, when requested.
+        if (vaultPublicKeys.length > 0) {
+            const pubKeyBuffer = LegacyCalldataGenerator.getPubKeyAsBuffer(
+                vaultPublicKeys,
+                this.network,
+            );
+            const pubKeyDataChunks: Buffer[][] = this.splitBufferIntoChunks(pubKeyBuffer);
+
+            compiledData = compiledData.concat(
+                ...[
+                    opcodes.OP_0, // provide opnet public keys
+                    ...pubKeyDataChunks,
+                ],
+            );
+
+            if (minimumSignatures) {
+                // verify that the minimum is not greater than 255
+                if (minimumSignatures > 255) {
+                    throw new Error('Minimum signatures cannot exceed 255');
+                }
+
+                // we use a 2 bytes buffer even if we limit to 255 so it does not use an opcode for the number
+                const minSigBuffer = Buffer.alloc(2);
+                minSigBuffer.writeUint16LE(minimumSignatures, 0);
+
+                compiledData = compiledData.concat(
+                    ...[
+                        opcodes.OP_1, // provide minimum signatures
+                        minSigBuffer,
+                    ],
+                );
+            } else {
+                throw new Error('Minimum signatures must be provided');
+            }
+        }
+
+        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]); // Get the opcodes for the features
+
+        // Write calldata
+        compiledData = compiledData.concat(
+            ...featureOpcodes,
+            ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF],
+        );
+
+        const asm = compiledData.flat();
+        const compiled = script.compile(asm);
+
+        /** Verify the validity of the script */
+        const decompiled = script.decompile(compiled);
+        if (!decompiled) {
+            throw new Error('Failed to decompile script??');
+        }
+
+        return compiled;
+    }
+}

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,9 +1,9 @@
-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';
 
 export class Address extends Uint8Array {
     private isP2TROnly: boolean = false;
@@ -82,6 +82,14 @@ export class Address extends Uint8Array {
         return '0x' + Buffer.from(this).toString('hex');
     }
 
+    /**
+     * Converts the address to a buffer
+     * @returns {Buffer} The buffer
+     */
+    public toBuffer(): Buffer {
+        return Buffer.from(this);
+    }
+
     public equals(a: Address): boolean {
         const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
         const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);

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';
 
@@ -6,8 +6,6 @@ initEccLib(ecc);
 
 export enum AddressTypes {
     P2PKH = 'P2PKH',
-    P2SH = 'P2SH',
-    P2SH_P2WPKH = 'P2SH-P2WPKH',
     P2SH_OR_P2SH_P2WPKH = 'P2SH_OR_P2SH-P2WPKH',
     P2PK = 'P2PK',
     P2TR = 'P2TR',
@@ -125,6 +123,27 @@ export class AddressVerificator {
         return false; // Not a valid public key
     }
 
+    /**
+     * Checks if the address requires a redeem script to spend funds.
+     * @param {string} addy - The address to check.
+     * @param {Network} network - The network to validate against.
+     * @returns {boolean} - True if the address requires a redeem script, false otherwise.
+     */
+    public static requireRedeemScript(addy: string, network: Network): boolean {
+        try {
+            // First, try to decode as a Base58Check address (P2PKH, P2SH, or P2SH-P2WPKH)
+            const decodedBase58 = address.fromBase58Check(addy);
+
+            if (decodedBase58.version === network.pubKeyHash) {
+                return false;
+            }
+
+            return decodedBase58.version === network.scriptHash;
+        } catch {
+            return false;
+        }
+    }
+
     /**
      * Validates if a given Bitcoin address is of the specified type and network.
      * - P2PKH (Legacy address starting with '1' for mainnet or 'm/n' for testnet)
@@ -138,7 +157,7 @@ export class AddressVerificator {
      * @param network - The Bitcoin network to validate against (mainnet, testnet, etc.).
      * @returns - The type of the valid Bitcoin address, or null if invalid.
      */
-    public static validateBitcoinAddress(addy: string, network: Network): AddressTypes | null {
+    public static detectAddressType(addy: string, network: Network): AddressTypes | null {
         if (AddressVerificator.isValidPublicKey(addy, network)) {
             return AddressTypes.P2PK;
         }

package/src/keypair/EcKeyPair.ts

@@ -1,11 +1,11 @@
 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 { taggedHash } from '@btc-vision/bitcoin/src/crypto.js';
 
 initEccLib(ecc);
 

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';
 
 /**

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/opnet.ts

@@ -6,6 +6,7 @@ export * from './bytecode/Compressor.js';
 /** Generators */
 export * from './generators/Generator.js';
 export * from './generators/builders/CalldataGenerator.js';
+export * from './generators/builders/LegacyCalldataGenerator.js';
 export * from './generators/builders/DeploymentGenerator.js';
 export * from './generators/builders/CustomGenerator.js';
 export * from './generators/builders/MultiSignGenerator.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';
@@ -37,7 +37,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         //opcodes.OP_VERIFY, - verify that this is not needed.
     ]);
 
-    public static readonly MINIMUM_DUST: bigint = 330n;
+    public static readonly MINIMUM_DUST: bigint = 50n;
 
     public abstract readonly type: T;
     public readonly logColor: string = '#785def';

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';