@btc-vision/transaction 1.6.7 → 1.6.9

package/build/_version.d.ts

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

package/build/_version.js

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

package/build/transaction/TransactionFactory.js

@@ -7,7 +7,6 @@ import { InteractionTransaction } from './builders/InteractionTransaction.js';
 import { TransactionBuilder } from './builders/TransactionBuilder.js';
 import { P2WDADetector } from '../p2wda/P2WDADetector.js';
 import { InteractionTransactionP2WDA } from './builders/InteractionTransactionP2WDA.js';
-import { ChallengeSolution } from '../epoch/ChallengeSolution.js';
 import { Address } from '../keypair/Address.js';
 import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 export class TransactionFactory {
@@ -423,10 +422,7 @@ export class TransactionFactory {
             finalPreTransaction = preTransaction;
             if ('getChallenge' in preTransaction &&
                 typeof preTransaction.getChallenge === 'function') {
-                const result = preTransaction.getChallenge();
-                if (result instanceof ChallengeSolution) {
-                    challenge = result;
-                }
+                challenge = preTransaction.getChallenge();
             }
             iterations++;
             if (this.debug) {

package/build/transaction/builders/TransactionBuilder.js

@@ -240,11 +240,23 @@ export class TransactionBuilder extends TweakedTransaction {
                     ]),
                 };
             }
-            if (!input.witnessUtxo && input.nonWitnessUtxo) {
-                return {
-                    finalScriptSig: bitcoin.script.compile([dummyEcdsaSig, dummyCompressedPubkey]),
-                    finalScriptWitness: undefined,
-                };
+            if (input.witnessUtxo) {
+                const script = input.witnessUtxo.script;
+                const decompiled = bitcoin.script.decompile(script);
+                if (decompiled &&
+                    decompiled.length === 5 &&
+                    decompiled[0] === opcodes.OP_DUP &&
+                    decompiled[1] === opcodes.OP_HASH160 &&
+                    decompiled[3] === opcodes.OP_EQUALVERIFY &&
+                    decompiled[4] === opcodes.OP_CHECKSIG) {
+                    return {
+                        finalScriptSig: bitcoin.script.compile([
+                            dummyEcdsaSig,
+                            dummyCompressedPubkey,
+                        ]),
+                        finalScriptWitness: undefined,
+                    };
+                }
             }
             if (input.witnessScript) {
                 if (this.csvInputIndices.has(inputIndex)) {

package/package.json

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

package/src/transaction/TransactionFactory.ts

@@ -703,10 +703,7 @@ export class TransactionFactory {
                 'getChallenge' in preTransaction &&
                 typeof preTransaction.getChallenge === 'function'
             ) {
-                const result = preTransaction.getChallenge();
-                if (result instanceof ChallengeSolution) {
-                    challenge = result;
-                }
+                challenge = preTransaction.getChallenge();
             }
 
             iterations++;

package/src/transaction/builders/TransactionBuilder.ts

@@ -523,11 +523,25 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
                 };
             }
 
-            if (!input.witnessUtxo && input.nonWitnessUtxo) {
-                return {
-                    finalScriptSig: bitcoin.script.compile([dummyEcdsaSig, dummyCompressedPubkey]),
-                    finalScriptWitness: undefined,
-                };
+            if (input.witnessUtxo) {
+                const script = input.witnessUtxo.script;
+                const decompiled = bitcoin.script.decompile(script);
+                if (
+                    decompiled &&
+                    decompiled.length === 5 &&
+                    decompiled[0] === opcodes.OP_DUP &&
+                    decompiled[1] === opcodes.OP_HASH160 &&
+                    decompiled[3] === opcodes.OP_EQUALVERIFY &&
+                    decompiled[4] === opcodes.OP_CHECKSIG
+                ) {
+                    return {
+                        finalScriptSig: bitcoin.script.compile([
+                            dummyEcdsaSig,
+                            dummyCompressedPubkey,
+                        ]),
+                        finalScriptWitness: undefined,
+                    };
+                }
             }
 
             if (input.witnessScript) {