@btc-vision/transaction 1.5.1 → 1.5.3

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

@@ -23,7 +23,6 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
-    protected generateSecret(): Buffer;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;

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

@@ -14,6 +14,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     optionalInputs?: UTXO[];
     optionalOutputs?: PsbtOutputExtended[];
     chainId?: ChainId;
+    noSignatures?: boolean;
     readonly feeRate: number;
     readonly priorityFee: bigint;
     readonly gasSatFee: bigint;
@@ -36,6 +37,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
     readonly to: string;
+    readonly contract?: string;
 }
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;

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

@@ -10,6 +10,8 @@ export interface ITweakedTransactionData {
     readonly network: Network;
     readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
+    readonly noSignatures?: boolean;
+    readonly unlockScript?: Buffer[];
 }
 export declare enum TransactionSequence {
     REPLACE_BY_FEE = 4294967293,
@@ -33,6 +35,8 @@ export declare abstract class TweakedTransaction extends Logger {
     protected readonly isBrowser: boolean;
     protected regenerated: boolean;
     protected ignoreSignatureErrors: boolean;
+    protected noSignatures: boolean;
+    protected unlockScript: Buffer[] | undefined;
     protected constructor(data: ITweakedTransactionData);
     static readScriptWitnessToWitnessStack(Buffer: Buffer): Buffer[];
     static preEstimateTaprootTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numWitnessElements: bigint, witnessElementSize: bigint, emptyWitness: bigint, taprootControlWitnessSize?: bigint, taprootScriptSize?: bigint): bigint;
@@ -65,7 +69,7 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
-    protected generatePsbtInputExtended(utxo: UTXO, i: number, extra?: boolean): PsbtInputExtended;
+    protected generatePsbtInputExtended(utxo: UTXO, i: number, _extra?: boolean): PsbtInputExtended;
     protected customFinalizerP2SH: (inputIndex: number, input: PsbtInput, scriptA: Buffer, isSegwit: boolean, isP2SH: boolean, isP2WSH: boolean) => {
         finalScriptSig: Buffer | undefined;
         finalScriptWitness: Buffer | undefined;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.0";
+export declare const version = "1.5.3";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.4.0';
+export const version = '1.5.3';

package/build/keypair/AddressVerificator.js

@@ -103,7 +103,9 @@ export class AddressVerificator {
         catch { }
         try {
             const decodedBech32 = address.fromBech32(addy);
-            if (decodedBech32.prefix === network.bech32Opnet && decodedBech32.version === 16) {
+            if ((decodedBech32.prefix === network.bech32Opnet ||
+                decodedBech32.prefix === network.bech32) &&
+                decodedBech32.version === 16) {
                 return AddressTypes.P2OP;
             }
             if (decodedBech32.prefix === network.bech32) {

package/build/transaction/builders/DeploymentTransaction.js

@@ -129,11 +129,11 @@ export class DeploymentTransaction extends TransactionBuilder {
         await signer.multiSignPsbt([transaction]);
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                transaction.finalizeInput(i, this.customFinalizer);
+                transaction.finalizeInput(i, this.customFinalizer.bind(this));
             }
             else {
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 }
                 catch (e) {
                     transaction.finalizeInput(i);
@@ -154,12 +154,12 @@ export class DeploymentTransaction extends TransactionBuilder {
             if (i === 0) {
                 transaction.signInput(0, this.contractSigner);
                 transaction.signInput(0, this.getSignerKey());
-                transaction.finalizeInput(0, this.customFinalizer);
+                transaction.finalizeInput(0, this.customFinalizer.bind(this));
             }
             else {
                 transaction.signInput(i, this.getSignerKey());
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 }
                 catch (e) {
                     transaction.finalizeInput(i);

package/build/transaction/builders/InteractionTransaction.js

@@ -6,7 +6,13 @@ export class InteractionTransaction extends SharedInteractionTransaction {
         super(parameters);
         this.type = TransactionType.INTERACTION;
         this.tapLeafScript = null;
-        this.contractSecret = this.generateSecret();
+        if (!parameters.contract) {
+            throw new Error('parameters.contract is required for interaction transaction.');
+        }
+        this.contractSecret = Buffer.from(parameters.contract.replace('0x', ''), 'hex');
+        if (this.contractSecret.length !== 32) {
+            throw new Error('Invalid contract secret length. Expected 32 bytes.');
+        }
         this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.preimage, this.priorityFee, this.generateFeatures(parameters));
         this.scriptTree = this.getScriptTree();
         this.internalInit();

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

@@ -23,7 +23,6 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
-    protected generateSecret(): Buffer;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,4 +1,4 @@
-import { address, PaymentType, toXOnly } from '@btc-vision/bitcoin';
+import { PaymentType, toXOnly } from '@btc-vision/bitcoin';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder } from './TransactionBuilder.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { Compressor } from '../../bytecode/Compressor.js';
@@ -48,14 +48,6 @@ export class SharedInteractionTransaction extends TransactionBuilder {
     getPreimage() {
         return this.preimage;
     }
-    generateSecret() {
-        if (!this.to)
-            throw new Error('To address is required');
-        if (this.to.startsWith('0x')) {
-            throw new Error(`Legacy not support at this time. Reserved for future use.`);
-        }
-        return address.fromBech32(this.to).data;
-    }
     scriptSignerXOnlyPubKey() {
         return toXOnly(Buffer.from(this.scriptSigner.publicKey));
     }
@@ -155,11 +147,11 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         await signer.multiSignPsbt([transaction]);
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                transaction.finalizeInput(i, this.customFinalizer);
+                transaction.finalizeInput(i, this.customFinalizer.bind(this));
             }
             else {
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 }
                 catch (e) {
                     transaction.finalizeInput(i);
@@ -172,12 +164,12 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             if (i === 0) {
                 await this.signInput(transaction, transaction.data.inputs[i], i, this.scriptSigner);
                 await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
-                transaction.finalizeInput(0, this.customFinalizer);
+                transaction.finalizeInput(0, this.customFinalizer.bind(this));
             }
             else {
                 await this.signInput(transaction, transaction.data.inputs[i], i, this.signer);
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 }
                 catch (e) {
                     transaction.finalizeInput(i);

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -14,6 +14,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     optionalInputs?: UTXO[];
     optionalOutputs?: PsbtOutputExtended[];
     chainId?: ChainId;
+    noSignatures?: boolean;
     readonly feeRate: number;
     readonly priorityFee: bigint;
     readonly gasSatFee: bigint;
@@ -36,6 +37,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
     readonly to: string;
+    readonly contract?: string;
 }
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;

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

@@ -10,6 +10,8 @@ export interface ITweakedTransactionData {
     readonly network: Network;
     readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
+    readonly noSignatures?: boolean;
+    readonly unlockScript?: Buffer[];
 }
 export declare enum TransactionSequence {
     REPLACE_BY_FEE = 4294967293,
@@ -33,6 +35,8 @@ export declare abstract class TweakedTransaction extends Logger {
     protected readonly isBrowser: boolean;
     protected regenerated: boolean;
     protected ignoreSignatureErrors: boolean;
+    protected noSignatures: boolean;
+    protected unlockScript: Buffer[] | undefined;
     protected constructor(data: ITweakedTransactionData);
     static readScriptWitnessToWitnessStack(Buffer: Buffer): Buffer[];
     static preEstimateTaprootTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numWitnessElements: bigint, witnessElementSize: bigint, emptyWitness: bigint, taprootControlWitnessSize?: bigint, taprootScriptSize?: bigint): bigint;
@@ -65,7 +69,7 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
-    protected generatePsbtInputExtended(utxo: UTXO, i: number, extra?: boolean): PsbtInputExtended;
+    protected generatePsbtInputExtended(utxo: UTXO, i: number, _extra?: boolean): 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,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, opcodes, payments, PaymentType, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
+import { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, isUnknownSegwitVersion, opcodes, payments, PaymentType, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
 import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
 export var TransactionSequence;
@@ -21,6 +21,7 @@ export class TweakedTransaction extends Logger {
         this.isBrowser = false;
         this.regenerated = false;
         this.ignoreSignatureErrors = false;
+        this.noSignatures = false;
         this.customFinalizerP2SH = (inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH) => {
             const inputDecoded = this.inputs[inputIndex];
             if (isP2SH && input.partialSig && inputDecoded && inputDecoded.redeemScript) {
@@ -31,11 +32,13 @@ export class TweakedTransaction extends Logger {
                     finalScriptWitness: undefined,
                 };
             }
-            return getFinalScripts(inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH);
+            return getFinalScripts(inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH, true, this.unlockScript);
         };
         this.signer = data.signer;
         this.network = data.network;
+        this.noSignatures = data.noSignatures || false;
         this.nonWitnessUtxo = data.nonWitnessUtxo;
+        this.unlockScript = data.unlockScript;
         this.isBrowser = typeof window !== 'undefined';
     }
     static readScriptWitnessToWitnessStack(Buffer) {
@@ -216,24 +219,26 @@ export class TweakedTransaction extends Logger {
         const txs = transaction.data.inputs;
         const batchSize = 20;
         const batches = this.splitArray(txs, batchSize);
-        for (let i = 0; i < batches.length; i++) {
-            const batch = batches[i];
-            const promises = [];
-            const offset = i * batchSize;
-            for (let j = 0; j < batch.length; j++) {
-                const index = offset + j;
-                const input = batch[j];
-                try {
-                    promises.push(this.signInput(transaction, input, index, this.signer));
-                }
-                catch (e) {
-                    this.log(`Failed to sign input ${index}: ${e.stack}`);
+        if (!this.noSignatures) {
+            for (let i = 0; i < batches.length; i++) {
+                const batch = batches[i];
+                const promises = [];
+                const offset = i * batchSize;
+                for (let j = 0; j < batch.length; j++) {
+                    const index = offset + j;
+                    const input = batch[j];
+                    try {
+                        promises.push(this.signInput(transaction, input, index, this.signer));
+                    }
+                    catch (e) {
+                        this.log(`Failed to sign input ${index}: ${e.stack}`);
+                    }
                 }
+                await Promise.all(promises);
             }
-            await Promise.all(promises);
         }
         for (let i = 0; i < transaction.data.inputs.length; i++) {
-            transaction.finalizeInput(i, this.customFinalizerP2SH);
+            transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
         }
         this.finalized = true;
     }
@@ -329,7 +334,7 @@ export class TweakedTransaction extends Logger {
         }
         return;
     }
-    generatePsbtInputExtended(utxo, i, extra = false) {
+    generatePsbtInputExtended(utxo, i, _extra = false) {
         const script = Buffer.from(utxo.scriptPubKey.hex, 'hex');
         const input = {
             hash: utxo.transactionId,
@@ -350,7 +355,7 @@ export class TweakedTransaction extends Logger {
                 throw new Error('Missing nonWitnessUtxo for P2PKH UTXO');
             }
         }
-        else if (isP2WPKH(script)) {
+        else if (isP2WPKH(script) || isUnknownSegwitVersion(script)) {
         }
         else if (isP2WSHScript(script)) {
             if (!utxo.witnessScript) {
@@ -440,7 +445,7 @@ export class TweakedTransaction extends Logger {
         const signer = this.signer;
         await signer.multiSignPsbt([transaction]);
         for (let i = 0; i < transaction.data.inputs.length; i++) {
-            transaction.finalizeInput(i, this.customFinalizerP2SH);
+            transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
         }
         this.finalized = true;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.5.1",
+    "version": "1.5.3",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -64,17 +64,17 @@
         "docs": "typedoc --out docs --exclude 'src/tests/*.ts' --tsconfig tsconfig.json --readme README.md --name OPNet --plugin typedoc-material-theme --themeColor '#cb9820' --exclude src/tests/test.ts --exclude src/index.ts src"
     },
     "devDependencies": {
-        "@babel/core": "^7.27.3",
+        "@babel/core": "^7.27.4",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-transform-runtime": "^7.27.3",
+        "@babel/plugin-transform-runtime": "^7.27.4",
         "@babel/preset-env": "^7.27.2",
         "@babel/preset-flow": "^7.27.1",
         "@babel/preset-react": "^7.27.1",
         "@babel/preset-typescript": "^7.27.1",
-        "@types/node": "^22.15.26",
+        "@types/node": "^22.15.29",
         "@types/sha.js": "^2.4.4",
-        "eslint": "^9.27.0",
-        "gulp": "^5.0.0",
+        "eslint": "^9.28.0",
+        "gulp": "^5.0.1",
         "gulp-cached": "^1.1.1",
         "gulp-typescript": "^6.0.0-alpha.1",
         "https-browserify": "^1.0.0",
@@ -88,11 +88,11 @@
     },
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-        "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bitcoin": "^6.4.5",
+        "@bitcoinerlab/secp256k1": "^1.2.0",
+        "@btc-vision/bitcoin": "^6.4.6",
         "@btc-vision/bitcoin-rpc": "^1.0.1",
         "@btc-vision/logger": "^1.0.6",
-        "@eslint/js": "^9.27.0",
+        "@eslint/js": "^9.28.0",
         "@noble/secp256k1": "^2.2.3",
         "assert": "^2.1.0",
         "babel-loader": "^10.0.0",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.4.0';
+export const version = '1.5.3';

package/src/keypair/AddressVerificator.ts

@@ -184,7 +184,11 @@ export class AddressVerificator {
         try {
             // Try to decode as a Bech32 or Bech32m address (P2WPKH or P2TR)
             const decodedBech32 = address.fromBech32(addy);
-            if (decodedBech32.prefix === network.bech32Opnet && decodedBech32.version === 16) {
+            if (
+                (decodedBech32.prefix === network.bech32Opnet ||
+                    decodedBech32.prefix === network.bech32) &&
+                decodedBech32.version === 16
+            ) {
                 return AddressTypes.P2OP;
             }
 

package/src/transaction/builders/DeploymentTransaction.ts

@@ -290,10 +290,10 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         // Then, we finalize every input.
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                transaction.finalizeInput(i, this.customFinalizer);
+                transaction.finalizeInput(i, this.customFinalizer.bind(this));
             } else {
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 } catch (e) {
                     transaction.finalizeInput(i);
                 }
@@ -324,12 +324,12 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
                 transaction.signInput(0, this.contractSigner);
                 transaction.signInput(0, this.getSignerKey());
 
-                transaction.finalizeInput(0, this.customFinalizer);
+                transaction.finalizeInput(0, this.customFinalizer.bind(this));
             } else {
                 transaction.signInput(i, this.getSignerKey());
 
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 } catch (e) {
                     transaction.finalizeInput(i);
                 }

package/src/transaction/builders/InteractionTransaction.ts

@@ -26,7 +26,15 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
     public constructor(parameters: IInteractionParameters) {
         super(parameters);
 
-        this.contractSecret = this.generateSecret();
+        if (!parameters.contract) {
+            throw new Error('parameters.contract is required for interaction transaction.');
+        }
+
+        this.contractSecret = Buffer.from(parameters.contract.replace('0x', ''), 'hex');
+        
+        if (this.contractSecret.length !== 32) {
+            throw new Error('Invalid contract secret length. Expected 32 bytes.');
+        }
 
         this.compiledTargetScript = this.calldataGenerator.compile(
             this.calldata,

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -1,4 +1,4 @@
-import { address, P2TRPayment, PaymentType, Psbt, PsbtInput, Signer, Taptree, toXOnly } from '@btc-vision/bitcoin';
+import { P2TRPayment, PaymentType, Psbt, PsbtInput, Signer, Taptree, toXOnly } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -120,7 +120,8 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer} The secret
      * @throws {Error} If the to address is invalid
      */
-    protected generateSecret(): Buffer {
+
+    /*protected generateSecret(): Buffer {
         if (!this.to) throw new Error('To address is required');
 
         if (this.to.startsWith('0x')) {
@@ -128,7 +129,7 @@ export abstract class SharedInteractionTransaction<
         }
 
         return address.fromBech32(this.to).data;
-    }
+    }*/
 
     /**
      * Get the internal pubkey as an x-only key
@@ -319,10 +320,10 @@ export abstract class SharedInteractionTransaction<
         // Then, we finalize every input.
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                transaction.finalizeInput(i, this.customFinalizer);
+                transaction.finalizeInput(i, this.customFinalizer.bind(this));
             } else {
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 } catch (e) {
                     transaction.finalizeInput(i);
                 }
@@ -342,12 +343,12 @@ export abstract class SharedInteractionTransaction<
                     this.getSignerKey(),
                 );
 
-                transaction.finalizeInput(0, this.customFinalizer);
+                transaction.finalizeInput(0, this.customFinalizer.bind(this));
             } else {
                 await this.signInput(transaction, transaction.data.inputs[i], i, this.signer);
 
                 try {
-                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
                 } catch (e) {
                     transaction.finalizeInput(i);
                 }

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -20,6 +20,7 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     optionalOutputs?: PsbtOutputExtended[];
 
     chainId?: ChainId;
+    noSignatures?: boolean;
 
     readonly feeRate: number;
     readonly priorityFee: bigint;
@@ -52,6 +53,7 @@ export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
 
     readonly to: string;
+    readonly contract?: string;
 }
 
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {

package/src/transaction/shared/TweakedTransaction.ts

@@ -10,6 +10,7 @@ import {
     isP2TR,
     isP2WPKH,
     isP2WSHScript,
+    isUnknownSegwitVersion,
     Network,
     opcodes,
     P2TRPayment,
@@ -43,6 +44,8 @@ export interface ITweakedTransactionData {
     readonly network: Network;
     readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
+    readonly noSignatures?: boolean;
+    readonly unlockScript?: Buffer[];
 }
 
 /**
@@ -126,6 +129,8 @@ export abstract class TweakedTransaction extends Logger {
 
     protected regenerated: boolean = false;
     protected ignoreSignatureErrors: boolean = false;
+    protected noSignatures: boolean = false;
+    protected unlockScript: Buffer[] | undefined;
 
     protected constructor(data: ITweakedTransactionData) {
         super();
@@ -133,7 +138,9 @@ export abstract class TweakedTransaction extends Logger {
         this.signer = data.signer;
         this.network = data.network;
 
+        this.noSignatures = data.noSignatures || false;
         this.nonWitnessUtxo = data.nonWitnessUtxo;
+        this.unlockScript = data.unlockScript;
 
         this.isBrowser = typeof window !== 'undefined';
     }
@@ -476,27 +483,29 @@ export abstract class TweakedTransaction extends Logger {
         const batchSize: number = 20;
         const batches = this.splitArray(txs, batchSize);
 
-        for (let i = 0; i < batches.length; i++) {
-            const batch = batches[i];
-            const promises: Promise<void>[] = [];
-            const offset = i * batchSize;
+        if (!this.noSignatures) {
+            for (let i = 0; i < batches.length; i++) {
+                const batch = batches[i];
+                const promises: Promise<void>[] = [];
+                const offset = i * batchSize;
 
-            for (let j = 0; j < batch.length; j++) {
-                const index = offset + j;
-                const input = batch[j];
+                for (let j = 0; j < batch.length; j++) {
+                    const index = offset + j;
+                    const input = batch[j];
 
-                try {
-                    promises.push(this.signInput(transaction, input, index, this.signer));
-                } catch (e) {
-                    this.log(`Failed to sign input ${index}: ${(e as Error).stack}`);
+                    try {
+                        promises.push(this.signInput(transaction, input, index, this.signer));
+                    } catch (e) {
+                        this.log(`Failed to sign input ${index}: ${(e as Error).stack}`);
+                    }
                 }
-            }
 
-            await Promise.all(promises);
+                await Promise.all(promises);
+            }
         }
 
         for (let i = 0; i < transaction.data.inputs.length; i++) {
-            transaction.finalizeInput(i, this.customFinalizerP2SH);
+            transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
         }
 
         this.finalized = true;
@@ -654,14 +663,14 @@ export abstract class TweakedTransaction extends Logger {
      * Generate the PSBT input extended, supporting various script types
      * @param {UTXO} utxo The UTXO
      * @param {number} i The index of the input
-     * @param {UTXO} extra Extra UTXO
+     * @param {UTXO} _extra Extra UTXO
      * @protected
      * @returns {PsbtInputExtended} The PSBT input extended
      */
     protected generatePsbtInputExtended(
         utxo: UTXO,
         i: number,
-        extra: boolean = false,
+        _extra: boolean = false,
     ): PsbtInputExtended {
         const script = Buffer.from(utxo.scriptPubKey.hex, 'hex');
 
@@ -689,7 +698,7 @@ export abstract class TweakedTransaction extends Logger {
         }
 
         // Handle P2WPKH (SegWit)
-        else if (isP2WPKH(script)) {
+        else if (isP2WPKH(script) || isUnknownSegwitVersion(script)) {
             // No redeemScript required for pure P2WPKH
             // witnessUtxo is enough, no nonWitnessUtxo needed.
         }
@@ -849,7 +858,16 @@ export abstract class TweakedTransaction extends Logger {
             };
         }
 
-        return getFinalScripts(inputIndex, input, scriptA, isSegwit, isP2SH, isP2WSH);
+        return getFinalScripts(
+            inputIndex,
+            input,
+            scriptA,
+            isSegwit,
+            isP2SH,
+            isP2WSH,
+            true,
+            this.unlockScript,
+        );
     };
 
     protected async signInputsWalletBased(transaction: Psbt): Promise<void> {
@@ -860,7 +878,7 @@ export abstract class TweakedTransaction extends Logger {
 
         // Then, we finalize every input.
         for (let i = 0; i < transaction.data.inputs.length; i++) {
-            transaction.finalizeInput(i, this.customFinalizerP2SH);
+            transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
         }
 
         this.finalized = true;