@btc-vision/transaction 1.3.3 → 1.3.4

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

@@ -36,8 +36,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
         finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     private createMineableRewardOutputs;
-    private signInputsNonWalletBased;
     private getPubKeys;
     private generateRedeemScripts;
 }

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

@@ -51,6 +51,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
     protected internalInit(): void;
     protected tweakSigner(): void;
@@ -64,7 +65,7 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
-    protected generatePsbtInputExtended(utxo: UTXO, i: number): 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/TransactionFactory.js

@@ -70,9 +70,22 @@ export class TransactionFactory {
         if (!('signer' in interactionParameters)) {
             throw new Error('Field "signer" not provided, OP_WALLET not detected.');
         }
+        const inputs = (interactionParameters.optionalInputs || []).map((input) => {
+            let nonWitness = input.nonWitnessUtxo;
+            if (nonWitness &&
+                !(nonWitness instanceof Uint8Array) &&
+                typeof nonWitness === 'object') {
+                nonWitness = Buffer.from(Uint8Array.from(Object.values(input.nonWitnessUtxo)));
+            }
+            return {
+                ...input,
+                nonWitnessUtxo: nonWitness,
+            };
+        });
         const preTransaction = new InteractionTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]],
+            optionalInputs: inputs,
         });
         await preTransaction.generateTransactionMinimalSignatures();
         const parameters = await preTransaction.getFundingTransactionParameters();
@@ -101,11 +114,14 @@ export class TransactionFactory {
         interactionParameters.utxos = this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0);
         const newParams = {
             ...interactionParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            utxos: [
+                ...this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            ],
             randomBytes: preTransaction.getRndBytes(),
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
             estimatedFees: preTransaction.estimatedFees,
+            optionalInputs: inputs,
         };
         const finalTransaction = new InteractionTransaction(newParams);
         const outTx = await finalTransaction.signTransaction();
@@ -215,7 +231,7 @@ export class TransactionFactory {
         return utxos;
     }
     async detectInteractionOPWallet(interactionParameters) {
-        if (typeof window === 'undefined' || !window.opnet || !window.opnet.web3) {
+        if (typeof window === 'undefined' || !window || !window.opnet || !window.opnet.web3) {
             return null;
         }
         const opnet = window.opnet.web3;

package/build/transaction/browser/extensions/UnisatSigner.js

@@ -42,6 +42,8 @@ export class UnisatSigner extends CustomKeypair {
         return this._network;
     }
     get unisat() {
+        if (!window)
+            throw new Error('Window not found');
         const module = window.unisat;
         if (!module) {
             throw new Error('Unisat extension not found');

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

@@ -36,8 +36,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
         finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     private createMineableRewardOutputs;
-    private signInputsNonWalletBased;
     private getPubKeys;
     private generateRedeemScripts;
 }

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -156,7 +156,30 @@ export class SharedInteractionTransaction extends TransactionBuilder {
                 transaction.finalizeInput(i, this.customFinalizer);
             }
             else {
-                transaction.finalizeInput(i);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                }
+                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.scriptSigner);
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
+                transaction.finalizeInput(0, this.customFinalizer);
+            }
+            else {
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.signer);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                }
+                catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }
@@ -187,19 +210,6 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             await this.addRefundOutput(amountSpent + amount);
         }
     }
-    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.scriptSigner);
-                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
-                transaction.finalizeInput(i, this.customFinalizer);
-            }
-            else {
-                await this.signInput(transaction, transaction.data.inputs[i], i, this.getSignerKey());
-                transaction.finalizeInput(i);
-            }
-        }
-    }
     getPubKeys() {
         const pubKeys = [Buffer.from(this.signer.publicKey)];
         if (this.scriptSigner) {

package/build/transaction/builders/TransactionBuilder.js

@@ -293,9 +293,9 @@ export class TransactionBuilder extends TweakedTransaction {
             }
         }
         if (this.optionalInputs) {
-            for (let i = 0; i < this.optionalInputs.length; i++) {
-                const utxo = this.optionalInputs[i];
-                const input = this.generatePsbtInputExtended(utxo, i);
+            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);
             }
         }

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

@@ -51,6 +51,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
+    protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;
     protected internalInit(): void;
     protected tweakSigner(): void;
@@ -64,7 +65,7 @@ export declare abstract class TweakedTransaction extends Logger {
         redeemScript: Buffer;
         outputScript: Buffer;
     } | undefined;
-    protected generatePsbtInputExtended(utxo: UTXO, i: number): 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

@@ -208,6 +208,9 @@ export class TweakedTransaction extends Logger {
             await this.signInputsWalletBased(transaction);
             return;
         }
+        await this.signInputsNonWalletBased(transaction);
+    }
+    async signInputsNonWalletBased(transaction) {
         const txs = transaction.data.inputs;
         const batchSize = 20;
         const batches = this.splitArray(txs, batchSize);
@@ -324,7 +327,7 @@ export class TweakedTransaction extends Logger {
         }
         return;
     }
-    generatePsbtInputExtended(utxo, i) {
+    generatePsbtInputExtended(utxo, i, extra = false) {
         const script = Buffer.from(utxo.scriptPubKey.hex, 'hex');
         const input = {
             hash: utxo.transactionId,
@@ -421,8 +424,10 @@ export class TweakedTransaction extends Logger {
         else {
             this.error(`Unknown or unsupported script type for output: ${utxo.scriptPubKey.hex}`);
         }
-        if (this.tapLeafScript) {
-            input.tapLeafScript = [this.tapLeafScript];
+        if (i === 0) {
+            if (this.tapLeafScript) {
+                input.tapLeafScript = [this.tapLeafScript];
+            }
         }
         if (i === 0 && this.nonWitnessUtxo) {
             input.nonWitnessUtxo = this.nonWitnessUtxo;
@@ -453,7 +458,16 @@ export class TweakedTransaction extends Logger {
                 tweakedSigner = this.tweakedSigner;
             }
             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}.`);

package/package.json

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

package/src/transaction/TransactionFactory.ts

@@ -174,9 +174,30 @@ export class TransactionFactory {
             throw new Error('Field "signer" not provided, OP_WALLET not detected.');
         }
 
+        const inputs = (interactionParameters.optionalInputs || []).map((input) => {
+            let nonWitness = input.nonWitnessUtxo;
+            if (
+                nonWitness &&
+                !(nonWitness instanceof Uint8Array) &&
+                typeof nonWitness === 'object'
+            ) {
+                nonWitness = Buffer.from(
+                    Uint8Array.from(
+                        Object.values(input.nonWitnessUtxo as unknown as Record<number, number>),
+                    ),
+                );
+            }
+
+            return {
+                ...input,
+                nonWitnessUtxo: nonWitness,
+            };
+        });
+
         const preTransaction: InteractionTransaction = new InteractionTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]], // we simulate one input here.
+            optionalInputs: inputs,
         });
 
         // we don't sign that transaction, we just need the parameters.
@@ -221,11 +242,14 @@ export class TransactionFactory {
 
         const newParams: IInteractionParameters = {
             ...interactionParameters,
-            utxos: this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0), // always 0
+            utxos: [
+                ...this.getUTXOAsTransaction(signedTransaction.tx, interactionParameters.to, 0),
+            ], // always 0
             randomBytes: preTransaction.getRndBytes(),
             preimage: preTransaction.getPreimage(),
             nonWitnessUtxo: signedTransaction.tx.toBuffer(),
             estimatedFees: preTransaction.estimatedFees,
+            optionalInputs: inputs,
         };
 
         const finalTransaction: InteractionTransaction = new InteractionTransaction(newParams);
@@ -399,7 +423,7 @@ export class TransactionFactory {
     private async detectInteractionOPWallet(
         interactionParameters: IInteractionParameters | InteractionParametersWithoutSigner,
     ): Promise<InteractionResponse | null> {
-        if (typeof window === 'undefined' || !window.opnet || !window.opnet.web3) {
+        if (typeof window === 'undefined' || !window || !window.opnet || !window.opnet.web3) {
             return null;
         }
 
@@ -426,6 +450,7 @@ export class TransactionFactory {
         const challengeTransaction: ChallengeSolutionTransaction = new ChallengeSolutionTransaction(
             parameters,
         );
+
         const signedTransaction: Transaction = await challengeTransaction.signTransaction();
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');

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

@@ -83,6 +83,8 @@ export class UnisatSigner extends CustomKeypair {
     }
 
     public get unisat(): Unisat {
+        if (!window) throw new Error('Window not found');
+
         const module = window.unisat;
         if (!module) {
             throw new Error('Unisat extension not found');

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -67,7 +67,7 @@ export abstract class SharedInteractionTransaction<
             throw new Error('Calldata is required');
         }
 
-        if(!parameters.preimage) {
+        if (!parameters.preimage) {
             throw new Error('Preimage is required');
         }
 
@@ -319,7 +319,36 @@ export abstract class SharedInteractionTransaction<
             if (i === 0) {
                 transaction.finalizeInput(i, this.customFinalizer);
             } else {
-                transaction.finalizeInput(i);
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                } catch (e) {
+                    transaction.finalizeInput(i);
+                }
+            }
+        }
+    }
+
+    protected override async signInputsNonWalletBased(transaction: Psbt): Promise<void> {
+        for (let i = 0; i < transaction.data.inputs.length; i++) {
+            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);
+            } else {
+                await this.signInput(transaction, transaction.data.inputs[i], i, this.signer);
+
+                try {
+                    transaction.finalizeInput(i, this.customFinalizerP2SH);
+                } catch (e) {
+                    transaction.finalizeInput(i);
+                }
             }
         }
     }
@@ -359,32 +388,6 @@ export abstract class SharedInteractionTransaction<
         }
     }
 
-    private async signInputsNonWalletBased(transaction: Psbt): Promise<void> {
-        for (let i = 0; i < transaction.data.inputs.length; i++) {
-            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(i, this.customFinalizer);
-            } else {
-                await this.signInput(
-                    transaction,
-                    transaction.data.inputs[i],
-                    i,
-                    this.getSignerKey(),
-                );
-
-                transaction.finalizeInput(i);
-            }
-        }
-    }
-
     /**
      * Get the public keys
      * @private

package/src/transaction/builders/TransactionBuilder.ts

@@ -626,9 +626,13 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         }
 
         if (this.optionalInputs) {
-            for (let i = 0; i < this.optionalInputs.length; i++) {
-                const utxo = this.optionalInputs[i];
-                const input = this.generatePsbtInputExtended(utxo, i);
+            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);
             }

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}.`);
             }