@btc-vision/transaction 1.0.118 → 1.0.120

package/browser/keypair/Address.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 export declare class Address extends Uint8Array {
     #private;
@@ -11,6 +11,7 @@ export declare class Address extends Uint8Array {
     static fromString(pubKey: string): Address;
     static wrap(bytes: ArrayLike<number>): Address;
     toHex(): string;
+    toBuffer(): Buffer;
     equals(a: Address): boolean;
     lessThan(a: Address): boolean;
     greaterThan(a: Address): boolean;

package/browser/keypair/AddressVerificator.d.ts

@@ -1,8 +1,6 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare enum AddressTypes {
     P2PKH = "P2PKH",
-    P2SH = "P2SH",
-    P2SH_P2WPKH = "P2SH-P2WPKH",
     P2SH_OR_P2SH_P2WPKH = "P2SH_OR_P2SH-P2WPKH",
     P2PK = "P2PK",
     P2TR = "P2TR",
@@ -13,5 +11,6 @@ export declare class AddressVerificator {
     static isP2WPKHAddress(inAddress: string, network: Network): boolean;
     static isP2PKHOrP2SH(addy: string, network: Network): boolean;
     static isValidPublicKey(input: string, network: Network): boolean;
-    static validateBitcoinAddress(addy: string, network: Network): AddressTypes | null;
+    static requireRedeemScript(addy: string, network: Network): boolean;
+    static detectAddressType(addy: string, network: Network): AddressTypes | null;
 }

package/browser/keypair/EcKeyPair.d.ts

@@ -1,5 +1,5 @@
 import { BIP32API, BIP32Interface } from 'bip32';
-import { Network, Signer } from 'bitcoinjs-lib';
+import { Network, Signer } from '@btc-vision/bitcoin';
 import { ECPairAPI, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
 export declare class EcKeyPair {

package/browser/keypair/Wallet.d.ts

@@ -1,6 +1,6 @@
 import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
 export declare class Wallet {
     readonly network: Network;

package/browser/metadata/ContractBaseMetadata.d.ts

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

package/browser/metadata/contracts/wBTC.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { ChainId } from '../../network/ChainId.js';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
 export declare class wBTC extends ContractBaseMetadata {

package/browser/opnet.d.ts

@@ -2,6 +2,7 @@ export { version } from './_version.js';
 export * from './bytecode/Compressor.js';
 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/browser/signer/TweakedSigner.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 export interface TweakSettings {
     readonly network?: Network;

package/browser/transaction/TransactionFactory.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from 'bitcoinjs-lib';
+import { Transaction } from '@btc-vision/bitcoin';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { ICustomTransactionParameters } from './builders/CustomScriptTransaction.js';
 import { FundingTransaction } from './builders/FundingTransaction.js';

package/browser/transaction/browser/BrowserSignerBase.d.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt, Signer } from 'bitcoinjs-lib';
+import { Network, Psbt, Signer } from '@btc-vision/bitcoin';
 export declare abstract class CustomKeypair implements Signer {
     abstract network: Network;
     abstract publicKey: Buffer;

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

@@ -1,4 +1,4 @@
-import { Network, Psbt } from 'bitcoinjs-lib';
+import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { Unisat } from '../types/Unisat.js';
 declare global {

package/browser/transaction/builders/CustomScriptTransaction.d.ts

@@ -1,7 +1,7 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt, Stack } from 'bitcoinjs-lib';
+import { Payment, Psbt, Stack } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export interface ICustomTransactionParameters extends SharedInteractionParameters {
     readonly script: (Buffer | Stack)[];

package/browser/transaction/builders/DeploymentTransaction.d.ts

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt } from 'bitcoinjs-lib';
+import { Payment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';

package/browser/transaction/builders/FundingTransaction.d.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';
 export declare class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {

package/browser/transaction/builders/InteractionTransaction.d.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/browser/transaction/builders/MultiSignTransaction.d.ts

@@ -1,5 +1,5 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } 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';

package/browser/transaction/builders/SharedInteractionTransaction.d.ts

@@ -1,5 +1,5 @@
-import { Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { 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';

package/browser/transaction/builders/TransactionBuilder.d.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters, ITransactionParameters } from '../interfaces/ITransactionParameters.js';

package/browser/transaction/builders/UnwrapSegwitTransaction.d.ts

@@ -1,8 +1,8 @@
-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 { Psbt } from 'bitcoinjs-lib';
+import { Psbt } from '@btc-vision/bitcoin';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 export declare class UnwrapSegwitTransaction extends SharedInteractionTransaction<TransactionType.WBTC_UNWRAP> {
     private static readonly UNWRAP_SELECTOR;

package/browser/transaction/builders/UnwrapTransaction.d.ts

@@ -1,8 +1,8 @@
-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 { Network, Payment, Psbt, PsbtInput } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput } from '@btc-vision/bitcoin';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 export declare class UnwrapTransaction extends SharedInteractionTransaction<TransactionType.WBTC_UNWRAP> {
     private static readonly UNWRAP_SELECTOR;

package/browser/transaction/builders/WrapTransaction.d.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';

package/browser/transaction/interfaces/ITransactionParameters.d.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;
     readonly to?: string;

package/browser/transaction/interfaces/Tap.d.ts

@@ -1,4 +1,4 @@
-import { PsbtInput as _PsbtInput, PsbtInputUpdate as _PsbtInputUpdate, PsbtOutput as _PsbtOutput, TapBip32Derivation as _TapBip32Derivation, TapInternalKey as _TapInternalKey, TapKeySig as _TapKeySig, TapLeaf as _TapLeaf, TapLeafScript as _TapLeafScript, TapMerkleRoot as _TapMerkleRoot, TapScriptSig as _TapScriptSig, TapTree as _TapTree } from 'bitcoinjs-lib';
+import { PsbtInput as _PsbtInput, PsbtInputUpdate as _PsbtInputUpdate, PsbtOutput as _PsbtOutput, TapBip32Derivation as _TapBip32Derivation, TapInternalKey as _TapInternalKey, TapKeySig as _TapKeySig, TapLeaf as _TapLeaf, TapLeafScript as _TapLeafScript, TapMerkleRoot as _TapMerkleRoot, TapScriptSig as _TapScriptSig, TapTree as _TapTree } from '@btc-vision/bitcoin';
 export interface TapLeafScript {
     readonly leafVersion: number;
     readonly controlBlock: Buffer;

package/browser/transaction/processor/PsbtTransaction.d.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly psbt: Psbt;

package/browser/transaction/shared/P2TR_MS.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare class P2TR_MS {
     static generateMultiSigAddress(pubKeys: Buffer[], minimumSignatureRequired: number, network?: Network): string;
 }

package/browser/transaction/shared/TweakedTransaction.d.ts

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
@@ -54,5 +54,14 @@ export declare abstract class TweakedTransaction extends Logger {
     protected internalInit(): void;
     protected tweakSigner(): void;
     protected getTweakedSigner(useTweakedHash?: boolean, signer?: Signer | ECPairInterface): ECPairInterface | undefined;
+    protected generateP2SHRedeemScript(customWitnessScript: Buffer): Buffer | undefined;
+    protected generateP2SHRedeemScriptLegacy(inputAddr: string): {
+        redeemScript: Buffer;
+        outputScript: Buffer;
+    } | undefined;
     protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended;
+    protected customFinalizerP2SH: (inputIndex: number, input: PsbtInput, scriptA: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean) => {
+        finalScriptSig: Buffer | undefined;
+        finalScriptWitness: Buffer | undefined;
+    };
 }

package/browser/utxo/OPNetLimitedProvider.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Address, Wallet } from '../opnet.js';
 import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
 import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';

package/browser/utxo/interfaces/IUTXO.d.ts

@@ -4,6 +4,9 @@ export interface UTXO {
     readonly outputIndex: number;
     readonly value: bigint;
     readonly scriptPubKey: ScriptPubKey;
+    redeemScript?: string | Buffer;
+    witnessScript?: string | Buffer;
+    nonWitnessUtxo?: string | Buffer;
 }
 export interface FetchUTXOParams {
     readonly address: string;

package/browser/verification/TapscriptVerificator.d.ts

@@ -1,5 +1,5 @@
-import { Network } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Network } from '@btc-vision/bitcoin';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 export interface ContractAddressVerificationParams {
     readonly deployerPubKey: Buffer;
     readonly contractSaltPubKey: Buffer;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.118";
+export declare const version = "1.0.120";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.118';
+export const version = '1.0.120';

package/build/event/NetEvent.d.ts

@@ -1,5 +1,5 @@
 export declare class NetEvent {
-    readonly eventType: string;
-    readonly eventData: Uint8Array;
-    constructor(eventType: string, eventData: Uint8Array);
+    readonly type: string;
+    readonly data: Uint8Array;
+    constructor(type: string, data: Uint8Array);
 }

package/build/event/NetEvent.js

@@ -1,6 +1,6 @@
 export class NetEvent {
-    constructor(eventType, eventData) {
-        this.eventType = eventType;
-        this.eventData = eventData;
+    constructor(type, data) {
+        this.type = type;
+        this.data = data;
     }
 }

package/build/generators/AddressGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare class AddressGenerator {
     static generatePKSH(sha256Hash: Buffer, network: Network): string;
     static generateTaprootAddress(pubKey: Buffer, network: {

package/build/generators/AddressGenerator.js

@@ -1,7 +1,7 @@
 import { bech32, bech32m } from 'bech32';
-import { initEccLib } from 'bitcoinjs-lib';
+import { initEccLib } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { ripemd160 } from 'bitcoinjs-lib/src/crypto.js';
+import { ripemd160 } from '@btc-vision/bitcoin/src/crypto.js';
 initEccLib(ecc);
 export class AddressGenerator {
     static generatePKSH(sha256Hash, network) {

package/build/generators/Features.js

@@ -1,4 +1,4 @@
-import { opcodes } from 'bitcoinjs-lib';
+import { opcodes } from '@btc-vision/bitcoin';
 export var Features;
 (function (Features) {
     Features[Features["UNWRAP"] = 0] = "UNWRAP";

package/build/generators/Generator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare abstract class Generator {
     static readonly DATA_CHUNK_SIZE: number;
     static readonly MAGIC: Buffer;

package/build/generators/Generator.js

@@ -1,5 +1,5 @@
-import { networks } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { networks } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 export class Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         this.network = networks.bitcoin;

package/build/generators/builders/CalldataGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Features } from '../Features.js';
 import { Generator } from '../Generator.js';
 export declare class CalldataGenerator extends Generator {

package/build/generators/builders/CalldataGenerator.js

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

package/build/generators/builders/CustomGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network, Stack } from 'bitcoinjs-lib';
+import { Network, Stack } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export declare class CustomGenerator extends Generator {
     constructor(senderPubKey: Buffer, network?: Network);

package/build/generators/builders/CustomGenerator.js

@@ -1,4 +1,4 @@
-import { networks, script } from 'bitcoinjs-lib';
+import { networks, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export class CustomGenerator extends Generator {
     constructor(senderPubKey, network = networks.bitcoin) {

package/build/generators/builders/DeploymentGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export declare class DeploymentGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);

package/build/generators/builders/DeploymentGenerator.js

@@ -1,4 +1,4 @@
-import { crypto, networks, opcodes, script } from 'bitcoinjs-lib';
+import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export class DeploymentGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {

package/build/generators/builders/LegacyCalldataGenerator.d.ts

@@ -0,0 +1,8 @@
+import { Network } from '@btc-vision/bitcoin';
+import { Features } from '../Features.js';
+import { Generator } from '../Generator.js';
+export declare class LegacyCalldataGenerator extends Generator {
+    constructor(senderPubKey: Buffer, network?: Network);
+    static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, features?: Features[], vaultPublicKeys?: Buffer[], minimumSignatures?: number): Buffer;
+}

package/build/generators/builders/LegacyCalldataGenerator.js

@@ -0,0 +1,75 @@
+import { networks, opcodes, script } from '@btc-vision/bitcoin';
+import { Compressor } from '../../bytecode/Compressor.js';
+import { EcKeyPair } from '../../keypair/EcKeyPair.js';
+import { FeatureOpCodes } from '../Features.js';
+import { Generator } from '../Generator.js';
+export class LegacyCalldataGenerator extends Generator {
+    constructor(senderPubKey, network = networks.bitcoin) {
+        super(senderPubKey, Buffer.alloc(0), network);
+    }
+    static getPubKeyAsBuffer(witnessKeys, network) {
+        let finalBuffer = Buffer.alloc(0);
+        for (const pubKey of witnessKeys) {
+            const key = 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]);
+        }
+        const compressed = Compressor.compress(finalBuffer);
+        if (compressed.byteLength >= finalBuffer.byteLength) {
+            return finalBuffer;
+        }
+        return compressed;
+    }
+    compile(calldata, contractSecret, features = [], vaultPublicKeys = [], minimumSignatures = 0) {
+        const dataChunks = 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,
+        ];
+        if (vaultPublicKeys.length > 0) {
+            const pubKeyBuffer = LegacyCalldataGenerator.getPubKeyAsBuffer(vaultPublicKeys, this.network);
+            const pubKeyDataChunks = this.splitBufferIntoChunks(pubKeyBuffer);
+            compiledData = compiledData.concat(...[
+                opcodes.OP_0,
+                ...pubKeyDataChunks,
+            ]);
+            if (minimumSignatures) {
+                if (minimumSignatures > 255) {
+                    throw new Error('Minimum signatures cannot exceed 255');
+                }
+                const minSigBuffer = Buffer.alloc(2);
+                minSigBuffer.writeUint16LE(minimumSignatures, 0);
+                compiledData = compiledData.concat(...[
+                    opcodes.OP_1,
+                    minSigBuffer,
+                ]);
+            }
+            else {
+                throw new Error('Minimum signatures must be provided');
+            }
+        }
+        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]);
+        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);
+        const decompiled = script.decompile(compiled);
+        if (!decompiled) {
+            throw new Error('Failed to decompile script??');
+        }
+        return compiled;
+    }
+}

package/build/generators/builders/MultiSignGenerator.js

@@ -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';
 export class MultiSignGenerator {
     static compile(vaultPublicKeys, minimumSignatures = 0, internal) {
         if (minimumSignatures < 2) {

package/build/keypair/Address.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 export declare class Address extends Uint8Array {
     #private;
@@ -11,6 +11,7 @@ export declare class Address extends Uint8Array {
     static fromString(pubKey: string): Address;
     static wrap(bytes: ArrayLike<number>): Address;
     toHex(): string;
+    toBuffer(): Buffer;
     equals(a: Address): boolean;
     lessThan(a: Address): boolean;
     greaterThan(a: Address): boolean;

package/build/keypair/Address.js

@@ -13,7 +13,7 @@ var _Address_p2tr, _Address_network, _Address_tweakedBytes;
 import { EcKeyPair } from './EcKeyPair.js';
 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 {
     constructor(bytes) {
         super(bytes?.length || ADDRESS_BYTE_LENGTH);
@@ -53,6 +53,9 @@ export class Address extends Uint8Array {
     toHex() {
         return '0x' + Buffer.from(this).toString('hex');
     }
+    toBuffer() {
+        return Buffer.from(this);
+    }
     equals(a) {
         const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
         const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");

package/build/keypair/AddressVerificator.d.ts

@@ -1,8 +1,6 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare enum AddressTypes {
     P2PKH = "P2PKH",
-    P2SH = "P2SH",
-    P2SH_P2WPKH = "P2SH-P2WPKH",
     P2SH_OR_P2SH_P2WPKH = "P2SH_OR_P2SH-P2WPKH",
     P2PK = "P2PK",
     P2TR = "P2TR",
@@ -13,5 +11,6 @@ export declare class AddressVerificator {
     static isP2WPKHAddress(inAddress: string, network: Network): boolean;
     static isP2PKHOrP2SH(addy: string, network: Network): boolean;
     static isValidPublicKey(input: string, network: Network): boolean;
-    static validateBitcoinAddress(addy: string, network: Network): AddressTypes | null;
+    static requireRedeemScript(addy: string, network: Network): boolean;
+    static detectAddressType(addy: string, network: Network): AddressTypes | null;
 }

package/build/keypair/AddressVerificator.js

@@ -1,12 +1,10 @@
-import { address, initEccLib } from 'bitcoinjs-lib';
+import { address, initEccLib } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from './EcKeyPair.js';
 initEccLib(ecc);
 export var AddressTypes;
 (function (AddressTypes) {
     AddressTypes["P2PKH"] = "P2PKH";
-    AddressTypes["P2SH"] = "P2SH";
-    AddressTypes["P2SH_P2WPKH"] = "P2SH-P2WPKH";
     AddressTypes["P2SH_OR_P2SH_P2WPKH"] = "P2SH_OR_P2SH-P2WPKH";
     AddressTypes["P2PK"] = "P2PK";
     AddressTypes["P2TR"] = "P2TR";
@@ -73,7 +71,19 @@ export class AddressVerificator {
         }
         return false;
     }
-    static validateBitcoinAddress(addy, network) {
+    static requireRedeemScript(addy, network) {
+        try {
+            const decodedBase58 = address.fromBase58Check(addy);
+            if (decodedBase58.version === network.pubKeyHash) {
+                return false;
+            }
+            return decodedBase58.version === network.scriptHash;
+        }
+        catch {
+            return false;
+        }
+    }
+    static detectAddressType(addy, network) {
         if (AddressVerificator.isValidPublicKey(addy, network)) {
             return AddressTypes.P2PK;
         }

package/build/keypair/EcKeyPair.d.ts

@@ -1,5 +1,5 @@
 import { BIP32API, BIP32Interface } from 'bip32';
-import { Network, Signer } from 'bitcoinjs-lib';
+import { Network, Signer } from '@btc-vision/bitcoin';
 import { ECPairAPI, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
 export declare class EcKeyPair {

package/build/keypair/EcKeyPair.js

@@ -1,10 +1,10 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
 import bip32, { BIP32Factory } from 'bip32';
-import { address, initEccLib, networks, payments } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { address, initEccLib, networks, payments } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairFactory } from 'ecpair';
 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);
 const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
 if (!BIP32factory) {

package/build/keypair/Wallet.d.ts

@@ -1,6 +1,6 @@
 import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
 export declare class Wallet {
     readonly network: Network;