@btc-vision/transaction 1.3.2 → 1.3.4

package/src/transaction/builders/TransactionBuilder.ts

@@ -118,6 +118,12 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      */
     protected utxos: UTXO[];
 
+    /**
+     * @description The inputs of the transaction
+     * @protected
+     */
+    protected optionalInputs: UTXO[];
+
     /**
      * @description The address where the transaction is sent to
      * @protected
@@ -154,6 +160,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         this.priorityFee = parameters.priorityFee ?? 0n;
         this.gasSatFee = parameters.gasSatFee ?? 0n;
         this.utxos = parameters.utxos;
+        this.optionalInputs = parameters.optionalInputs || [];
         this.to = parameters.to || undefined;
 
         this.isPubKeyDestination = this.to
@@ -236,6 +243,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             from: this.from,
             amount: this.estimatedFees,
             optionalOutputs: this.optionalOutputs,
+            optionalInputs: this.optionalInputs,
         };
     }
 
@@ -551,6 +559,11 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         for (const utxo of this.utxos) {
             total += utxo.value;
         }
+
+        for (const utxo of this.optionalInputs) {
+            total += utxo.value;
+        }
+
         return total;
     }
 
@@ -565,6 +578,10 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
             total += utxo.value;
         }
 
+        for (const utxo of this.optionalInputs) {
+            total += utxo.value;
+        }
+
         return total;
     }
 
@@ -607,6 +624,19 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 this.addInput(input);
             }
         }
+
+        if (this.optionalInputs) {
+            for (
+                let i = this.utxos.length;
+                i < this.optionalInputs.length + this.utxos.length;
+                i++
+            ) {
+                const utxo = this.optionalInputs[i - this.utxos.length];
+                const input = this.generatePsbtInputExtended(utxo, i, true);
+
+                this.addInput(input);
+            }
+        }
     }
 
     /**
@@ -676,6 +706,12 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 throw new Error('Address is required');
             }
         }
+
+        for (const utxo of this.optionalInputs) {
+            if (!utxo.scriptPubKey) {
+                throw new Error('Address is required');
+            }
+        }
     }
 
     /**

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -11,7 +11,8 @@ export interface ITransactionParameters extends ITweakedTransactionData {
 
     nonWitnessUtxo?: Buffer;
     estimatedFees?: bigint;
-
+    
+    optionalInputs?: UTXO[];
     optionalOutputs?: PsbtOutputExtended[];
 
     chainId?: ChainId;

package/src/transaction/shared/TweakedTransaction.ts

@@ -462,6 +462,10 @@ export abstract class TweakedTransaction extends Logger {
             return;
         }
 
+        await this.signInputsNonWalletBased(transaction);
+    }
+
+    protected async signInputsNonWalletBased(transaction: Psbt): Promise<void> {
         // non web based signing.
         const txs: PsbtInput[] = transaction.data.inputs;
 
@@ -646,10 +650,15 @@ 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
      * @protected
      * @returns {PsbtInputExtended} The PSBT input extended
      */
-    protected generatePsbtInputExtended(utxo: UTXO, i: number): PsbtInputExtended {
+    protected generatePsbtInputExtended(
+        utxo: UTXO,
+        i: number,
+        extra: boolean = false,
+    ): PsbtInputExtended {
         const script = Buffer.from(utxo.scriptPubKey.hex, 'hex');
 
         const input: PsbtInputExtended = {
@@ -788,9 +797,11 @@ export abstract class TweakedTransaction extends Logger {
             this.error(`Unknown or unsupported script type for output: ${utxo.scriptPubKey.hex}`);
         }
 
-        // TapLeafScript if available
-        if (this.tapLeafScript) {
-            input.tapLeafScript = [this.tapLeafScript];
+        if (i === 0) {
+            // TapLeafScript if available
+            if (this.tapLeafScript) {
+                input.tapLeafScript = [this.tapLeafScript];
+            }
         }
 
         // If the first input and we have a global nonWitnessUtxo not yet set
@@ -798,6 +809,18 @@ export abstract class TweakedTransaction extends Logger {
             input.nonWitnessUtxo = this.nonWitnessUtxo;
         }
 
+        /*if (utxo.nonWitnessUtxo && extra) {
+            const witness = Buffer.isBuffer(utxo.nonWitnessUtxo)
+                ? utxo.nonWitnessUtxo
+                : typeof utxo.nonWitnessUtxo === 'string'
+                  ? Buffer.from(utxo.nonWitnessUtxo, 'hex')
+                  : (utxo.nonWitnessUtxo as unknown) instanceof Uint8Array
+                    ? Buffer.from(utxo.nonWitnessUtxo)
+                    : undefined;
+
+            input.nonWitnessUtxo = witness;
+        }*/
+
         return input;
     }
 
@@ -861,7 +884,16 @@ export abstract class TweakedTransaction extends Logger {
             }
 
             if (tweakedSigner) {
-                await this.signTaprootInput(tweakedSigner, transaction, i);
+                try {
+                    await this.signTaprootInput(tweakedSigner, transaction, i);
+                } catch (e) {
+                    tweakedSigner = this.getTweakedSigner(false, this.signer);
+                    if (!tweakedSigner) {
+                        throw new Error(`Failed to obtain tweaked signer for input ${i}.`);
+                    }
+
+                    await this.signTaprootInput(tweakedSigner, transaction, i);
+                }
             } else {
                 this.error(`Failed to obtain tweaked signer for input ${i}.`);
             }