@btc-vision/transaction 1.0.118 → 1.0.120

package/build/keypair/Wallet.js

@@ -1,6 +1,6 @@
 import { EcKeyPair } from './EcKeyPair.js';
-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';
 import { Address } from './Address.js';
 export class Wallet {
     constructor(wallet, network = networks.bitcoin) {

package/build/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/build/metadata/ContractBaseMetadata.js

@@ -1,4 +1,4 @@
-import { networks } from 'bitcoinjs-lib';
+import { networks } from '@btc-vision/bitcoin';
 export class ContractBaseMetadata {
     constructor(network = networks.bitcoin) {
         this.network = network;

package/build/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/build/metadata/contracts/wBTC.js

@@ -1,4 +1,4 @@
-import { networks } from 'bitcoinjs-lib';
+import { 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/build/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/build/opnet.js

@@ -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/build/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/build/signer/TweakedSigner.js

@@ -1,7 +1,7 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { initEccLib } from 'bitcoinjs-lib';
-import { tapTweakHash } from 'bitcoinjs-lib/src/payments/bip341.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { initEccLib } 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 { EcKeyPair } from '../keypair/EcKeyPair.js';
 initEccLib(ecc);
 export class TweakedSigner {

package/build/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/build/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/build/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/build/transaction/browser/extensions/UnisatSigner.js

@@ -1,4 +1,4 @@
-import { networks, Psbt } from 'bitcoinjs-lib';
+import { networks, Psbt } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { UnisatNetwork } from '../types/Unisat.js';

package/build/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/build/transaction/builders/CustomScriptTransaction.js

@@ -1,11 +1,11 @@
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto } from 'bitcoinjs-lib';
+import { crypto as bitCrypto } 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';
 export class CustomScriptTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/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/build/transaction/builders/DeploymentTransaction.js

@@ -1,8 +1,8 @@
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto } from 'bitcoinjs-lib';
+import { crypto as bitCrypto } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.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/build/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/build/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/build/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/build/transaction/builders/MultiSignTransaction.js

@@ -1,8 +1,8 @@
-import { crypto as bitcoinCrypto, opcodes, Psbt, script, } from 'bitcoinjs-lib';
+import { crypto as bitcoinCrypto, opcodes, Psbt, script, } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.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';
 export class MultiSignTransaction extends TransactionBuilder {
     constructor(parameters) {

package/build/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/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,10 +1,10 @@
-import { address } from 'bitcoinjs-lib';
+import { address } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 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';
 export class SharedInteractionTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/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/build/transaction/builders/TransactionBuilder.js

@@ -1,5 +1,5 @@
-import { initEccLib, opcodes, Psbt, script, Transaction, } from 'bitcoinjs-lib';
-import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
+import { initEccLib, opcodes, Psbt, script, Transaction, } from '@btc-vision/bitcoin';
+import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -343,4 +343,4 @@ export class TransactionBuilder extends TweakedTransaction {
 TransactionBuilder.LOCK_LEAF_SCRIPT = script.compile([
     opcodes.OP_0,
 ]);
-TransactionBuilder.MINIMUM_DUST = 330n;
+TransactionBuilder.MINIMUM_DUST = 50n;

package/build/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/build/transaction/builders/UnwrapSegwitTransaction.js

@@ -2,7 +2,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { payments } from 'bitcoinjs-lib';
+import { payments } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { PsbtTransaction } from '../processor/PsbtTransaction.js';
 import { currentConsensusConfig } from '../../consensus/ConsensusConfig.js';

package/build/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/build/transaction/builders/UnwrapTransaction.js

@@ -2,12 +2,12 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
-import { payments, } from 'bitcoinjs-lib';
+import { payments, } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { PsbtTransaction } 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/build/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/build/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/build/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/build/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/build/transaction/processor/PsbtTransaction.js

@@ -1,4 +1,4 @@
-import { Psbt, } from 'bitcoinjs-lib';
+import { Psbt, } from '@btc-vision/bitcoin';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 export class PsbtTransaction extends TweakedTransaction {
     constructor(data) {

package/build/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/build/transaction/shared/P2TR_MS.js

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

package/build/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/build/transaction/shared/TweakedTransaction.js

@@ -1,9 +1,9 @@
 import { Logger } from '@btc-vision/logger';
-import { payments, } from 'bitcoinjs-lib';
+import { address as bitAddress, crypto as bitCrypto, getFinalScripts, opcodes, payments, script, } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
-import { AddressVerificator } from '../../keypair/AddressVerificator.js';
-import { varuint } from 'bitcoinjs-lib/src/bufferutils.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { AddressTypes, AddressVerificator } from '../../keypair/AddressVerificator.js';
+import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
 export var TransactionSequence;
 (function (TransactionSequence) {
     TransactionSequence[TransactionSequence["REPLACE_BY_FEE"] = 4294967293] = "REPLACE_BY_FEE";
@@ -23,6 +23,21 @@ export class TweakedTransaction extends Logger {
         this.isBrowser = false;
         this.regenerated = false;
         this.ignoreSignatureErrors = false;
+        this.customFinalizerP2SH = (inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH) => {
+            const inputDecoded = this.inputs[inputIndex];
+            if (isP2SH && input.partialSig && inputDecoded && inputDecoded.redeemScript) {
+                const signatures = input.partialSig.map((sig) => sig.signature);
+                const scriptSig = script.compile([
+                    ...signatures,
+                    inputDecoded.redeemScript,
+                ]);
+                return {
+                    finalScriptSig: scriptSig,
+                    finalScriptWitness: undefined,
+                };
+            }
+            return getFinalScripts(inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH);
+        };
         this.signer = data.signer;
         this.network = data.network;
         this.nonWitnessUtxo = data.nonWitnessUtxo;
@@ -223,6 +238,7 @@ export class TweakedTransaction extends Logger {
             }
             await Promise.all(promises);
         }
+        transaction.finalizeInput(0, this.customFinalizerP2SH);
         try {
             transaction.finalizeAllInputs();
             this.finalized = true;
@@ -255,16 +271,90 @@ export class TweakedTransaction extends Logger {
         }
         return TweakedSigner.tweakSigner(signer, settings);
     }
+    generateP2SHRedeemScript(customWitnessScript) {
+        const p2wsh = payments.p2wsh({
+            redeem: { output: customWitnessScript },
+            network: this.network,
+        });
+        const p2sh = payments.p2sh({
+            redeem: p2wsh,
+            network: this.network,
+        });
+        return p2sh.output;
+    }
+    generateP2SHRedeemScriptLegacy(inputAddr) {
+        const pubKeyHash = bitCrypto.hash160(this.signer.publicKey);
+        const redeemScript = script.compile([
+            opcodes.OP_DUP,
+            opcodes.OP_HASH160,
+            pubKeyHash,
+            opcodes.OP_EQUALVERIFY,
+            opcodes.OP_CHECKSIG,
+        ]);
+        const redeemScriptHash = bitCrypto.hash160(redeemScript);
+        const outputScript = script.compile([
+            opcodes.OP_HASH160,
+            redeemScriptHash,
+            opcodes.OP_EQUAL,
+        ]);
+        const p2wsh = payments.p2wsh({
+            redeem: { output: redeemScript },
+            network: this.network,
+        });
+        const p2sh = payments.p2sh({
+            redeem: p2wsh,
+            network: this.network,
+        });
+        const address = bitAddress.fromOutputScript(outputScript, this.network);
+        if (address === inputAddr && p2sh.redeem && p2sh.redeem.output) {
+            return {
+                redeemScript,
+                outputScript: p2sh.redeem.output,
+            };
+        }
+        return;
+    }
     generatePsbtInputExtended(utxo, i) {
         const input = {
             hash: utxo.transactionId,
             index: utxo.outputIndex,
+            sequence: this.sequence,
             witnessUtxo: {
                 value: Number(utxo.value),
                 script: Buffer.from(utxo.scriptPubKey.hex, 'hex'),
             },
-            sequence: this.sequence,
         };
+        if (utxo.scriptPubKey.address) {
+            try {
+                const addressType = AddressVerificator.detectAddressType(utxo.scriptPubKey.address, this.network);
+                if (addressType === AddressTypes.P2SH_OR_P2SH_P2WPKH) {
+                    const redeemScript = this.generateP2SHRedeemScriptLegacy(utxo.scriptPubKey.address);
+                    if (!redeemScript) {
+                        throw new Error('Failed to generate redeem script');
+                    }
+                    input.redeemScript = redeemScript.outputScript;
+                    input.witnessScript = redeemScript.redeemScript;
+                }
+            }
+            catch (e) {
+                this.error(`Failed to detect address type for ${utxo.scriptPubKey.address} - ${e}`);
+            }
+        }
+        if (utxo.nonWitnessUtxo) {
+            input.nonWitnessUtxo = Buffer.isBuffer(utxo.nonWitnessUtxo)
+                ? utxo.nonWitnessUtxo
+                : Buffer.from(utxo.nonWitnessUtxo, 'hex');
+        }
+        if (utxo.redeemScript) {
+            input.redeemScript = Buffer.isBuffer(utxo.redeemScript)
+                ? utxo.redeemScript
+                : Buffer.from(utxo.redeemScript, 'hex');
+            if (utxo.witnessScript) {
+                input.witnessScript = Buffer.isBuffer(utxo.witnessScript)
+                    ? utxo.witnessScript
+                    : Buffer.from(utxo.witnessScript, 'hex');
+            }
+        }
         if (this.sighashTypes) {
             const inputSign = TweakedTransaction.calculateSignHash(this.sighashTypes);
             if (inputSign)

package/build/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/build/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/build/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/verification/TapscriptVerificator.js

@@ -1,5 +1,5 @@
-import { crypto as bitCrypto, networks, payments } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { crypto as bitCrypto, networks, payments } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { DeploymentGenerator } from '../generators/builders/DeploymentGenerator.js';
 import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.js';
 import { Address } from '../keypair/Address.js';

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.118",
+    "version": "1.0.120",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -92,6 +92,7 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
+        "@btc-vision/bitcoin": "^6.3.0",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.29",
         "@btc-vision/logger": "^1.0.6",
         "@eslint/js": "^9.10.0",
@@ -104,7 +105,6 @@
         "bech32": "^2.0.0",
         "bignumber.js": "^9.1.2",
         "bip32": "^4.0.0",
-        "bitcoinjs-lib": "github:btc-vision/bitcoinjs-lib",
         "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",
         "ecpair": "^2.1.0",

package/src/_version.ts

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

package/src/event/NetEvent.ts

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

package/src/generators/AddressGenerator.ts

@@ -1,7 +1,7 @@
 import { bech32, bech32m } from 'bech32';
-import { initEccLib, Network } from 'bitcoinjs-lib';
+import { initEccLib, Network } 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);
 

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 {