@btc-vision/transaction 1.1.0 → 1.1.1

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

@@ -47,7 +47,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected generateTapData(): Payment;
     protected generateScriptAddress(): Payment;
     protected getSignerKey(): Signer | ECPairInterface;
-    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer?: Signer | ECPairInterface): Promise<void>;
+    protected signInput(transaction: Psbt, _input: PsbtInput, i: number, signer: Signer | ECPairInterface): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.1.0";
+export declare const version = "1.1.1";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.1.0';
+export const version = '1.1.1';

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

@@ -47,7 +47,7 @@ export declare abstract class TweakedTransaction extends Logger {
     protected generateTapData(): Payment;
     protected generateScriptAddress(): Payment;
     protected getSignerKey(): Signer | ECPairInterface;
-    protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer?: Signer | ECPairInterface): Promise<void>;
+    protected signInput(transaction: Psbt, _input: PsbtInput, i: number, signer: Signer | ECPairInterface): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];
     protected signInputs(transaction: Psbt): Promise<void>;
     protected internalPubKeyToXOnly(): Buffer;

package/build/transaction/shared/TweakedTransaction.js

@@ -156,55 +156,22 @@ export class TweakedTransaction extends Logger {
     getSignerKey() {
         return this.signer;
     }
-    async signInput(transaction, input, i, signer) {
-        const signHash = this.sighashTypes && this.sighashTypes.length
-            ? [TweakedTransaction.calculateSignHash(this.sighashTypes)]
-            : undefined;
-        signer = signer || this.getSignerKey();
-        let testedTap = false;
-        if (input.tapInternalKey) {
-            if (!this.tweakedSigner)
-                this.tweakSigner();
-            let tweakedSigner;
-            if (signer !== this.signer) {
-                tweakedSigner = this.getTweakedSigner(true, signer);
-            }
-            else {
-                tweakedSigner = this.tweakedSigner;
-            }
-            if (tweakedSigner) {
-                testedTap = true;
-                try {
-                    if ('signTaprootInput' in signer) {
-                        return await signer.signTaprootInput(transaction, i, signHash);
-                    }
-                    else {
-                        transaction.signTaprootInput(i, tweakedSigner, undefined, signHash);
-                    }
-                    return;
-                }
-                catch { }
-            }
-        }
+    async signInput(transaction, _input, i, signer) {
         try {
             if ('signInput' in signer) {
-                return await signer.signInput(transaction, i, signHash);
-            }
-            else {
-                transaction.signInput(i, signer, signHash);
+                return await signer.signInput(transaction, i);
             }
+            transaction.signInput(i, signer);
         }
-        catch (e) {
-            if (!testedTap) {
+        catch {
+            try {
                 if ('signTaprootInput' in signer) {
-                    return await signer.signTaprootInput(transaction, i, signHash);
-                }
-                else if (this.tweakedSigner) {
-                    transaction.signTaprootInput(i, this.tweakedSigner, undefined, signHash);
-                }
-                else {
-                    throw e;
+                    return await signer.signTaprootInput(transaction, i);
                 }
+                transaction.signTaprootInput(i, signer);
+            }
+            catch {
+                throw new Error('Failed to sign input');
             }
         }
     }
@@ -230,7 +197,7 @@ export class TweakedTransaction extends Logger {
                 const index = offset + j;
                 const input = batch[j];
                 try {
-                    promises.push(this.signInput(transaction, input, index));
+                    promises.push(this.signInput(transaction, input, index, this.signer));
                 }
                 catch (e) {
                     this.log(`Failed to sign input ${index}: ${e.stack}`);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "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.1.0';
+export const version = '1.1.1';

package/src/transaction/shared/TweakedTransaction.ts

@@ -358,18 +358,38 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * Signs an input of the transaction.
      * @param {Psbt} transaction - The transaction to sign
-     * @param {PsbtInput} input - The input to sign
+     * @param {PsbtInput} _input - The input to sign
      * @param {number} i - The index of the input
-     * @param {Signer} [signer] - The signer to use
+     * @param {Signer} signer - The signer to use
      * @protected
      */
     protected async signInput(
         transaction: Psbt,
-        input: PsbtInput,
+        _input: PsbtInput,
         i: number,
-        signer?: Signer | ECPairInterface,
+        signer: Signer | ECPairInterface,
     ): Promise<void> {
-        const signHash =
+        try {
+            if ('signInput' in signer) {
+                // @ts-expect-error - we know it's a signer
+                return await (signer.signInput(transaction, i) as Promise<void>);
+            }
+
+            transaction.signInput(i, signer);
+        } catch {
+            try {
+                if ('signTaprootInput' in signer) {
+                    // @ts-expect-error - we know it's a taproot signer
+                    return await (signer.signTaprootInput(transaction, i) as Promise<void>);
+                }
+
+                transaction.signTaprootInput(i, signer);
+            } catch {
+                throw new Error('Failed to sign input');
+            }
+        }
+
+        /*const signHash =
             this.sighashTypes && this.sighashTypes.length
                 ? [TweakedTransaction.calculateSignHash(this.sighashTypes)]
                 : undefined;
@@ -431,7 +451,7 @@ export abstract class TweakedTransaction extends Logger {
                     throw e;
                 }
             }
-        }
+        }*/
     }
 
     protected splitArray<T>(arr: T[], chunkSize: number): T[][] {
@@ -470,7 +490,7 @@ export abstract class TweakedTransaction extends Logger {
                 const input = batch[j];
 
                 try {
-                    promises.push(this.signInput(transaction, input, index));
+                    promises.push(this.signInput(transaction, input, index, this.signer));
                 } catch (e) {
                     this.log(`Failed to sign input ${index}: ${(e as Error).stack}`);
                 }