@btc-vision/transaction 1.6.10 → 1.6.12

package/browser/opnet.d.ts

@@ -34,6 +34,7 @@ export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
+export * from './transaction/builders/CancelTransaction.js';
 export * from './epoch/interfaces/IChallengeSolution.js';
 export * from './epoch/validator/EpochValidator.js';
 export * from './epoch/ChallengeSolution.js';

package/browser/transaction/TransactionFactory.d.ts

@@ -30,7 +30,10 @@ export interface InteractionResponse {
     readonly interactionTransaction: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly fundingUTXOs: UTXO[];
     readonly challenge: RawChallenge;
+    readonly interactionAddress: string | null;
+    readonly compiledTargetScript: string | null;
 }
 export interface BitcoinTransferResponse extends BitcoinTransferBase {
     readonly original: FundingTransaction;

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

@@ -0,0 +1,28 @@
+import { TransactionType } from '../enums/TransactionType.js';
+import { P2TRPayment, Psbt, PsbtInput, Taptree } from '@btc-vision/bitcoin';
+import { TransactionBuilder } from './TransactionBuilder.js';
+import { TapLeafScript } from '../interfaces/Tap.js';
+import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
+export interface ICancelTransactionParameters extends Omit<ITransactionParameters, 'priorityFee' | 'gasSatFee'> {
+    readonly compiledTargetScript: string | Buffer;
+}
+export declare class CancelTransaction extends TransactionBuilder<TransactionType.CANCEL> {
+    type: TransactionType.CANCEL;
+    protected tapLeafScript: TapLeafScript | null;
+    protected readonly compiledTargetScript: Buffer;
+    protected readonly scriptTree: Taptree;
+    protected readonly contractSecret: Buffer;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
+    constructor(parameters: ICancelTransactionParameters);
+    protected buildTransaction(): Promise<void>;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
+    protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {
+        finalScriptWitness: Buffer<ArrayBufferLike>;
+    };
+    protected signInputs(transaction: Psbt): Promise<void>;
+    protected signInputsWalletBased(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
+    private getMinimalScriptTree;
+    private generateLeftoverFundsRedeem;
+}

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

@@ -21,6 +21,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected readonly scriptSigner: Signer | ECPairInterface;
     protected readonly disableAutoRefund: boolean;
     protected constructor(parameters: SharedInteractionParameters);
+    exportCompiledTargetScript(): Buffer;
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
     getChallenge(): ChallengeSolution;

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

@@ -11,11 +11,11 @@ export declare const MINIMUM_AMOUNT_REWARD: bigint;
 export declare const MINIMUM_AMOUNT_CA: bigint;
 export declare const ANCHOR_SCRIPT: Buffer<ArrayBuffer>;
 export declare abstract class TransactionBuilder<T extends TransactionType> extends TweakedTransaction {
-    static readonly LOCK_LEAF_SCRIPT: Buffer;
     static readonly MINIMUM_DUST: bigint;
     abstract readonly type: T;
     readonly logColor: string;
     debugFees: boolean;
+    LOCK_LEAF_SCRIPT: Buffer;
     overflowFees: bigint;
     transactionFee: bigint;
     estimatedFees: bigint;
@@ -61,7 +61,8 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     getInputs(): PsbtInputExtended[];
     getOutputs(): PsbtOutputExtended[];
     getOptionalOutputValue(): bigint;
-    protected addRefundOutput(amountSpent: bigint): Promise<void>;
+    protected addRefundOutput(amountSpent: bigint, expectRefund?: boolean): Promise<void>;
+    protected defineLockScript(): Buffer;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
     protected calculateTotalUTXOAmount(): bigint;

package/browser/transaction/enums/TransactionType.d.ts

@@ -5,5 +5,5 @@ export declare enum TransactionType {
     INTERACTION = 3,
     MULTI_SIG = 4,
     CUSTOM_CODE = 5,
-    CHALLENGE_SOLUTION = 6
+    CANCEL = 6
 }

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

@@ -33,6 +33,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     readonly challenge: ChallengeSolution;
     readonly randomBytes?: Buffer;
     readonly loadedStorage?: LoadedStorage;
+    readonly isCancellation?: boolean;
 }
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.6.9";
+export declare const version = "1.6.12";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.6.9';
+export const version = '1.6.12';

package/build/opnet.d.ts

@@ -34,6 +34,7 @@ export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
+export * from './transaction/builders/CancelTransaction.js';
 export * from './epoch/interfaces/IChallengeSolution.js';
 export * from './epoch/validator/EpochValidator.js';
 export * from './epoch/ChallengeSolution.js';

package/build/opnet.js

@@ -33,6 +33,7 @@ export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
+export * from './transaction/builders/CancelTransaction.js';
 export * from './epoch/interfaces/IChallengeSolution.js';
 export * from './epoch/validator/EpochValidator.js';
 export * from './epoch/ChallengeSolution.js';

package/build/transaction/TransactionFactory.d.ts

@@ -30,7 +30,10 @@ export interface InteractionResponse {
     readonly interactionTransaction: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
+    readonly fundingUTXOs: UTXO[];
     readonly challenge: RawChallenge;
+    readonly interactionAddress: string | null;
+    readonly compiledTargetScript: string | null;
 }
 export interface BitcoinTransferResponse extends BitcoinTransferBase {
     readonly original: FundingTransaction;

package/build/transaction/TransactionFactory.js

@@ -126,9 +126,10 @@ export class TransactionFactory {
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
+        const fundingUTXO = this.getUTXOAsTransaction(signedTransaction.tx, finalTransaction.getScriptAddress(), 0);
         const newParams = {
             ...interactionParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, finalTransaction.getScriptAddress(), 0),
+            utxos: fundingUTXO,
             randomBytes: finalTransaction.getRndBytes(),
             challenge: challenge,
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
@@ -138,11 +139,14 @@ export class TransactionFactory {
         const interactionTx = new InteractionTransaction(newParams);
         const outTx = await interactionTx.signTransaction();
         return {
+            interactionAddress: finalTransaction.getScriptAddress(),
             fundingTransaction: signedTransaction.tx.toHex(),
             interactionTransaction: outTx.toHex(),
             estimatedFees: interactionTx.transactionFee,
             nextUTXOs: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.from, 1),
             challenge: challenge.toRaw(),
+            fundingUTXOs: fundingUTXO,
+            compiledTargetScript: interactionTx.exportCompiledTargetScript().toString('hex'),
         };
     }
     async signDeployment(deploymentParameters) {
@@ -341,11 +345,14 @@ export class TransactionFactory {
         const signedTx = await p2wdaTransaction.signTransaction();
         const txHex = signedTx.toHex();
         return {
+            interactionAddress: null,
             fundingTransaction: null,
             interactionTransaction: txHex,
             estimatedFees: p2wdaTransaction.estimatedFees,
             nextUTXOs: this.getUTXOAsTransaction(signedTx, interactionParameters.from, signedTx.outs.length - 1),
+            fundingUTXOs: [...interactionParameters.utxos, ...inputs],
             challenge: interactionParameters.challenge.toRaw(),
+            compiledTargetScript: null,
         };
     }
     getPriorityFee(params) {

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

@@ -0,0 +1,28 @@
+import { TransactionType } from '../enums/TransactionType.js';
+import { P2TRPayment, Psbt, PsbtInput, Taptree } from '@btc-vision/bitcoin';
+import { TransactionBuilder } from './TransactionBuilder.js';
+import { TapLeafScript } from '../interfaces/Tap.js';
+import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
+export interface ICancelTransactionParameters extends Omit<ITransactionParameters, 'priorityFee' | 'gasSatFee'> {
+    readonly compiledTargetScript: string | Buffer;
+}
+export declare class CancelTransaction extends TransactionBuilder<TransactionType.CANCEL> {
+    type: TransactionType.CANCEL;
+    protected tapLeafScript: TapLeafScript | null;
+    protected readonly compiledTargetScript: Buffer;
+    protected readonly scriptTree: Taptree;
+    protected readonly contractSecret: Buffer;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
+    constructor(parameters: ICancelTransactionParameters);
+    protected buildTransaction(): Promise<void>;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
+    protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {
+        finalScriptWitness: Buffer<ArrayBufferLike>;
+    };
+    protected signInputs(transaction: Psbt): Promise<void>;
+    protected signInputsWalletBased(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
+    private getMinimalScriptTree;
+    private generateLeftoverFundsRedeem;
+}

package/build/transaction/builders/CancelTransaction.js

@@ -0,0 +1,154 @@
+import { TransactionType } from '../enums/TransactionType.js';
+import { PaymentType } from '@btc-vision/bitcoin';
+import { TransactionBuilder } from './TransactionBuilder.js';
+export class CancelTransaction extends TransactionBuilder {
+    constructor(parameters) {
+        super({
+            ...parameters,
+            gasSatFee: 1n,
+            isCancellation: true,
+            priorityFee: 1n,
+            calldata: Buffer.alloc(0),
+        });
+        this.type = TransactionType.CANCEL;
+        this.tapLeafScript = null;
+        this.leftOverFundsScriptRedeem = null;
+        this.customFinalizer = (_inputIndex, input) => {
+            if (!this.tapLeafScript) {
+                throw new Error('Tap leaf script is required');
+            }
+            if (!input.tapScriptSig || input.tapScriptSig.length === 0) {
+                throw new Error('Tap script signature is required');
+            }
+            const scriptSolution = [input.tapScriptSig[0].signature];
+            const witness = scriptSolution
+                .concat(this.tapLeafScript.script)
+                .concat(this.tapLeafScript.controlBlock);
+            return {
+                finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witness),
+            };
+        };
+        this.contractSecret = Buffer.alloc(0);
+        if (Buffer.isBuffer(parameters.compiledTargetScript)) {
+            this.compiledTargetScript = parameters.compiledTargetScript;
+        }
+        else {
+            this.compiledTargetScript = Buffer.from(parameters.compiledTargetScript, 'hex');
+        }
+        this.scriptTree = this.getMinimalScriptTree();
+        this.internalInit();
+    }
+    async buildTransaction() {
+        if (!this.from) {
+            throw new Error('From address is required');
+        }
+        if (!this.leftOverFundsScriptRedeem) {
+            throw new Error('Left over funds script redeem is required');
+        }
+        if (!this.leftOverFundsScriptRedeem.redeemVersion) {
+            throw new Error('Left over funds script redeem version is required');
+        }
+        if (!this.leftOverFundsScriptRedeem.output) {
+            throw new Error('Left over funds script redeem output is required');
+        }
+        this.tapLeafScript = {
+            leafVersion: this.leftOverFundsScriptRedeem.redeemVersion,
+            script: this.leftOverFundsScriptRedeem.output,
+            controlBlock: this.getWitness(),
+        };
+        this.addInputsFromUTXO();
+        await this.addRefundOutput(0n, true);
+        if (!this.feeOutput) {
+            throw new Error('Must add extra UTXOs to cancel this transaction');
+        }
+    }
+    generateScriptAddress() {
+        return {
+            internalPubkey: this.internalPubKeyToXOnly(),
+            network: this.network,
+            scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
+        };
+    }
+    generateTapData() {
+        const selectedRedeem = this.leftOverFundsScriptRedeem;
+        if (!selectedRedeem) {
+            throw new Error('Left over funds script redeem is required');
+        }
+        if (!this.scriptTree) {
+            throw new Error('Script tree is required');
+        }
+        return {
+            internalPubkey: this.internalPubKeyToXOnly(),
+            network: this.network,
+            scriptTree: this.scriptTree,
+            redeem: selectedRedeem,
+            name: PaymentType.P2TR,
+        };
+    }
+    async signInputs(transaction) {
+        if ('multiSignPsbt' in this.signer) {
+            await this.signInputsWalletBased(transaction);
+        }
+        else {
+            await this.signInputsNonWalletBased(transaction);
+        }
+    }
+    async signInputsWalletBased(transaction) {
+        const signer = this.signer;
+        await signer.multiSignPsbt([transaction]);
+        for (let i = 0; i < transaction.data.inputs.length; i++) {
+            if (i === 0) {
+                transaction.finalizeInput(i, this.customFinalizer.bind(this));
+            }
+            else {
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH.bind(this));
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
+            }
+        }
+    }
+    async signInputsNonWalletBased(transaction) {
+        for (let i = 0; i < transaction.data.inputs.length; i++) {
+            if (i === 0) {
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
+                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.bind(this));
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
+            }
+        }
+    }
+    getMinimalScriptTree() {
+        this.generateLeftoverFundsRedeem();
+        if (!this.leftOverFundsScriptRedeem || !this.leftOverFundsScriptRedeem.output) {
+            throw new Error('Failed to generate leftover funds redeem script');
+        }
+        return [
+            {
+                output: this.compiledTargetScript,
+                version: 192,
+            },
+            {
+                output: this.leftOverFundsScriptRedeem.output,
+                version: 192,
+            },
+        ];
+    }
+    generateLeftoverFundsRedeem() {
+        this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
+            output: this.LOCK_LEAF_SCRIPT,
+            redeemVersion: 192,
+        };
+    }
+}

package/build/transaction/builders/CustomScriptTransaction.js

@@ -36,6 +36,7 @@ export class CustomScriptTransaction extends TransactionBuilder {
             throw new Error('Witness(es) are required');
         this.witnesses = parameters.witnesses;
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
+        this.LOCK_LEAF_SCRIPT = this.defineLockScript();
         this.scriptSeed = this.getContractSeed();
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.scriptSeed, this.network);
         this.generator = new CustomGenerator(this.internalPubKeyToXOnly(), this.network);
@@ -166,7 +167,7 @@ export class CustomScriptTransaction extends TransactionBuilder {
         };
     }
     getLeafScript() {
-        return TransactionBuilder.LOCK_LEAF_SCRIPT;
+        return this.LOCK_LEAF_SCRIPT;
     }
     getScriptTree() {
         this.generateRedeemScripts();

package/build/transaction/builders/DeploymentTransaction.js

@@ -46,6 +46,7 @@ export class DeploymentTransaction extends TransactionBuilder {
             throw new Error('Challenge solution is required');
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
         this.challenge = parameters.challenge;
+        this.LOCK_LEAF_SCRIPT = this.defineLockScript();
         this.epochChallenge = TimeLockGenerator.generateTimeLockAddress(this.challenge.publicKey.originalPublicKeyBuffer(), this.network);
         this.contractSeed = this.getContractSeed();
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);
@@ -231,7 +232,7 @@ export class DeploymentTransaction extends TransactionBuilder {
         };
     }
     getLeafScript() {
-        return TransactionBuilder.LOCK_LEAF_SCRIPT;
+        return this.LOCK_LEAF_SCRIPT;
     }
     getScriptTree() {
         if (!this.bytecode) {

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

@@ -21,6 +21,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected readonly scriptSigner: Signer | ECPairInterface;
     protected readonly disableAutoRefund: boolean;
     protected constructor(parameters: SharedInteractionParameters);
+    exportCompiledTargetScript(): Buffer;
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
     getChallenge(): ChallengeSolution;

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -32,6 +32,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             throw new Error('Challenge solution is required');
         }
         this.challenge = parameters.challenge;
+        this.LOCK_LEAF_SCRIPT = this.defineLockScript();
         this.disableAutoRefund = parameters.disableAutoRefund || false;
         this.epochChallenge = TimeLockGenerator.generateTimeLockAddress(this.challenge.publicKey.originalPublicKeyBuffer(), this.network);
         this.calldata = Compressor.compress(parameters.calldata);
@@ -39,6 +40,9 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         this.scriptSigner = this.generateKeyPairFromSeed();
         this.calldataGenerator = new CalldataGenerator(Buffer.from(this.signer.publicKey), this.scriptSignerXOnlyPubKey(), this.network);
     }
+    exportCompiledTargetScript() {
+        return this.compiledTargetScript;
+    }
     getContractSecret() {
         return this.contractSecret;
     }
@@ -107,6 +111,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         if (!this.scriptTree) {
             throw new Error('Script tree is required');
         }
+        console.log('internalPubkey', this.internalPubKeyToXOnly().toString('hex'));
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
@@ -136,7 +141,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
                 version: 192,
             },
             {
-                output: SharedInteractionTransaction.LOCK_LEAF_SCRIPT,
+                output: this.LOCK_LEAF_SCRIPT,
                 version: 192,
             },
         ];
@@ -203,7 +208,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         };
         this.leftOverFundsScriptRedeem = {
             name: PaymentType.P2TR,
-            output: SharedInteractionTransaction.LOCK_LEAF_SCRIPT,
+            output: this.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };
     }

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

@@ -11,11 +11,11 @@ export declare const MINIMUM_AMOUNT_REWARD: bigint;
 export declare const MINIMUM_AMOUNT_CA: bigint;
 export declare const ANCHOR_SCRIPT: Buffer<ArrayBuffer>;
 export declare abstract class TransactionBuilder<T extends TransactionType> extends TweakedTransaction {
-    static readonly LOCK_LEAF_SCRIPT: Buffer;
     static readonly MINIMUM_DUST: bigint;
     abstract readonly type: T;
     readonly logColor: string;
     debugFees: boolean;
+    LOCK_LEAF_SCRIPT: Buffer;
     overflowFees: bigint;
     transactionFee: bigint;
     estimatedFees: bigint;
@@ -61,7 +61,8 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     getInputs(): PsbtInputExtended[];
     getOutputs(): PsbtOutputExtended[];
     getOptionalOutputValue(): bigint;
-    protected addRefundOutput(amountSpent: bigint): Promise<void>;
+    protected addRefundOutput(amountSpent: bigint, expectRefund?: boolean): Promise<void>;
+    protected defineLockScript(): Buffer;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
     protected calculateTotalUTXOAmount(): bigint;

package/build/transaction/builders/TransactionBuilder.js

@@ -1,4 +1,4 @@
-import bitcoin, { getFinalScripts, initEccLib, opcodes, Psbt, script, Transaction, varuint, } from '@btc-vision/bitcoin';
+import bitcoin, { getFinalScripts, initEccLib, opcodes, Psbt, script, toXOnly, Transaction, varuint, } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -33,6 +33,7 @@ export class TransactionBuilder extends TweakedTransaction {
         this.optionalInputs = parameters.optionalInputs || [];
         this.to = parameters.to || undefined;
         this.debugFees = parameters.debugFees || false;
+        this.LOCK_LEAF_SCRIPT = this.defineLockScript();
         if (parameters.note) {
             if (typeof parameters.note === 'string') {
                 this.note = Buffer.from(parameters.note, 'utf8');
@@ -402,7 +403,7 @@ export class TransactionBuilder extends TweakedTransaction {
         }
         return total;
     }
-    async addRefundOutput(amountSpent) {
+    async addRefundOutput(amountSpent, expectRefund = false) {
         if (this.note) {
             this.addOPReturn(this.note);
         }
@@ -413,11 +414,12 @@ export class TransactionBuilder extends TweakedTransaction {
         let estimatedFee = 0n;
         let iterations = 0;
         const maxIterations = 5;
+        let sendBackAmount = 0n;
         while (iterations < maxIterations && estimatedFee !== previousFee) {
             previousFee = estimatedFee;
             estimatedFee = await this.estimateTransactionFees();
             const totalSpent = amountSpent + estimatedFee;
-            const sendBackAmount = this.totalInputAmount - totalSpent;
+            sendBackAmount = this.totalInputAmount - totalSpent;
             if (this.debugFees) {
                 this.log(`Iteration ${iterations + 1}: inputAmount=${this.totalInputAmount}, totalSpent=${totalSpent}, sendBackAmount=${sendBackAmount}`);
             }
@@ -450,7 +452,7 @@ export class TransactionBuilder extends TweakedTransaction {
             else {
                 this.feeOutput = null;
                 this.overflowFees = 0n;
-                if (sendBackAmount < 0n) {
+                if (sendBackAmount < 0n && iterations === maxIterations) {
                     throw new Error(`Insufficient funds: need ${totalSpent} sats but only have ${this.totalInputAmount} sats`);
                 }
                 if (this.debugFees) {
@@ -459,6 +461,9 @@ export class TransactionBuilder extends TweakedTransaction {
             }
             iterations++;
         }
+        if (expectRefund && sendBackAmount < 0n) {
+            throw new Error(`Insufficient funds: need at least ${-sendBackAmount} more sats to cover fees.`);
+        }
         if (iterations >= maxIterations) {
             this.warn(`Fee calculation did not stabilize after ${maxIterations} iterations`);
         }
@@ -467,6 +472,9 @@ export class TransactionBuilder extends TweakedTransaction {
             this.log(`Final fee: ${estimatedFee} sats, Change output: ${this.feeOutput ? `${this.feeOutput.value} sats` : 'none'}`);
         }
     }
+    defineLockScript() {
+        return script.compile([toXOnly(Buffer.from(this.signer.publicKey)), opcodes.OP_CHECKSIG]);
+    }
     addValueToToOutput(value) {
         if (value < TransactionBuilder.MINIMUM_DUST) {
             throw new Error(`Value to send is less than the minimum dust ${value} < ${TransactionBuilder.MINIMUM_DUST}`);
@@ -667,8 +675,4 @@ export class TransactionBuilder extends TweakedTransaction {
         return false;
     }
 }
-TransactionBuilder.LOCK_LEAF_SCRIPT = script.compile([
-    opcodes.OP_FALSE,
-    opcodes.OP_VERIFY,
-]);
 TransactionBuilder.MINIMUM_DUST = 330n;

package/build/transaction/enums/TransactionType.d.ts

@@ -5,5 +5,5 @@ export declare enum TransactionType {
     INTERACTION = 3,
     MULTI_SIG = 4,
     CUSTOM_CODE = 5,
-    CHALLENGE_SOLUTION = 6
+    CANCEL = 6
 }

package/build/transaction/enums/TransactionType.js

@@ -6,5 +6,5 @@ export var TransactionType;
     TransactionType[TransactionType["INTERACTION"] = 3] = "INTERACTION";
     TransactionType[TransactionType["MULTI_SIG"] = 4] = "MULTI_SIG";
     TransactionType[TransactionType["CUSTOM_CODE"] = 5] = "CUSTOM_CODE";
-    TransactionType[TransactionType["CHALLENGE_SOLUTION"] = 6] = "CHALLENGE_SOLUTION";
+    TransactionType[TransactionType["CANCEL"] = 6] = "CANCEL";
 })(TransactionType || (TransactionType = {}));

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

@@ -33,6 +33,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     readonly challenge: ChallengeSolution;
     readonly randomBytes?: Buffer;
     readonly loadedStorage?: LoadedStorage;
+    readonly isCancellation?: boolean;
 }
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;

package/build/verification/TapscriptVerificator.js

@@ -1,18 +1,21 @@
-import { crypto as bitCrypto, networks, payments, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, networks, opcodes, payments, script, toXOnly, } from '@btc-vision/bitcoin';
 import { DeploymentGenerator } from '../generators/builders/DeploymentGenerator.js';
-import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.js';
 export class TapscriptVerificator {
     static getContractAddress(params) {
         const network = params.network || networks.bitcoin;
         const scriptBuilder = new DeploymentGenerator(params.deployerPubKey, toXOnly(params.contractSaltPubKey), network);
         const compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt, params.challenge, params.priorityFee, params.calldata, params.features);
+        const lockLeafScript = script.compile([
+            toXOnly(params.deployerPubKey),
+            opcodes.OP_CHECKSIG,
+        ]);
         const scriptTree = [
             {
                 output: compiledTargetScript,
                 version: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },
             {
-                output: TransactionBuilder.LOCK_LEAF_SCRIPT,
+                output: lockLeafScript,
                 version: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },
         ];
@@ -22,13 +25,17 @@ export class TapscriptVerificator {
         const network = params.network || networks.bitcoin;
         const scriptBuilder = new DeploymentGenerator(params.deployerPubKey, toXOnly(params.contractSaltPubKey), network);
         const compiledTargetScript = scriptBuilder.compile(params.bytecode, params.originalSalt, params.challenge, params.priorityFee, params.calldata, params.features);
+        const lockLeafScript = script.compile([
+            toXOnly(params.deployerPubKey),
+            opcodes.OP_CHECKSIG,
+        ]);
         const scriptTree = [
             {
                 output: compiledTargetScript,
                 version: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },
             {
-                output: TransactionBuilder.LOCK_LEAF_SCRIPT,
+                output: lockLeafScript,
                 version: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },
         ];

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.6.10",
+    "version": "1.6.12",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.6.9';
+export const version = '1.6.12';

package/src/opnet.ts

@@ -52,6 +52,7 @@ export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';
+export * from './transaction/builders/CancelTransaction.js';
 
 /** Epoch */
 export * from './epoch/interfaces/IChallengeSolution.js';