@btc-vision/transaction 1.4.0 → 1.5.1

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -1,4 +1,4 @@
-import { address, Payment, Psbt, PsbtInput, Signer, Taptree, toXOnly } from '@btc-vision/bitcoin';
+import { address, P2TRPayment, PaymentType, Psbt, PsbtInput, Signer, Taptree, toXOnly } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -25,8 +25,8 @@ export abstract class SharedInteractionTransaction<
      */
     public readonly randomBytes: Buffer;
 
-    protected targetScriptRedeem: Payment | null = null;
-    protected leftOverFundsScriptRedeem: Payment | null = null;
+    protected targetScriptRedeem: P2TRPayment | null = null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null = null;
 
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
@@ -207,15 +207,16 @@ export abstract class SharedInteractionTransaction<
         }
     }
 
-    protected override generateScriptAddress(): Payment {
+    protected override generateScriptAddress(): P2TRPayment {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
 
-    protected override generateTapData(): Payment {
+    protected override generateTapData(): P2TRPayment {
         const selectedRedeem = this.scriptSigner
             ? this.targetScriptRedeem
             : this.leftOverFundsScriptRedeem;
@@ -233,6 +234,7 @@ export abstract class SharedInteractionTransaction<
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
 
@@ -416,11 +418,13 @@ export abstract class SharedInteractionTransaction<
      */
     private generateRedeemScripts(): void {
         this.targetScriptRedeem = {
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
 
         this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
             output: SharedInteractionTransaction.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };

package/src/transaction/builders/TransactionBuilder.ts

@@ -27,7 +27,7 @@ import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 initEccLib(ecc);
 
 export const MINIMUM_AMOUNT_REWARD: bigint = 540n;
-export const MINIMUM_AMOUNT_CA: bigint = 330n;
+export const MINIMUM_AMOUNT_CA: bigint = 297n;
 
 /**
  * Allows to build a transaction like you would on Ethereum.
@@ -36,9 +36,10 @@ export const MINIMUM_AMOUNT_CA: bigint = 330n;
  * @class TransactionBuilder
  */
 export abstract class TransactionBuilder<T extends TransactionType> extends TweakedTransaction {
+    // Cancel script
     public static readonly LOCK_LEAF_SCRIPT: Buffer = script.compile([
-        opcodes.OP_0,
-        //opcodes.OP_VERIFY, - verify that this is not needed.
+        opcodes.OP_FALSE,
+        opcodes.OP_VERIFY,
     ]);
 
     public static readonly MINIMUM_DUST: bigint = 50n;

package/src/transaction/shared/TweakedTransaction.ts

@@ -12,8 +12,10 @@ import {
     isP2WSHScript,
     Network,
     opcodes,
+    P2TRPayment,
     Payment,
     payments,
+    PaymentType,
     Psbt,
     PsbtInput,
     PsbtInputExtended,
@@ -91,11 +93,11 @@ export abstract class TweakedTransaction extends Logger {
     /**
      * @description The script data of the transaction
      */
-    protected scriptData: Payment | null = null;
+    protected scriptData: P2TRPayment | null = null;
     /**
      * @description The tap data of the transaction
      */
-    protected tapData: Payment | null = null;
+    protected tapData: P2TRPayment | null = null;
     /**
      * @description The inputs of the transaction
      */
@@ -151,8 +153,8 @@ export abstract class TweakedTransaction extends Logger {
 
         function readVarInt(): number {
             const varint = varuint.decode(Buffer, offset);
-            offset += varuint.decode.bytes;
-            return varint;
+            offset += varint.bytes;
+            return varint.numberValue || 0;
         }
 
         function readVarSlice(): Buffer {
@@ -345,10 +347,11 @@ export abstract class TweakedTransaction extends Logger {
         return vSize * feeRate;
     }
 
-    protected generateTapData(): Payment {
+    protected generateTapData(): P2TRPayment {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
+            name: PaymentType.P2TR,
         };
     }
 
@@ -357,10 +360,11 @@ export abstract class TweakedTransaction extends Logger {
      * @protected
      * @returns {Payment}
      */
-    protected generateScriptAddress(): Payment {
+    protected generateScriptAddress(): P2TRPayment {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
+            name: PaymentType.P2TR,
         };
     }
 

package/src/verification/TapscriptVerificator.ts

@@ -91,7 +91,7 @@ export class TapscriptVerificator {
             network: network,
             scriptTree: scriptTree,
             redeem: {
-                pubkeys: [params.deployerPubKey, params.contractSaltPubKey],
+                //pubkeys: [params.deployerPubKey, params.contractSaltPubKey],
                 output: compiledTargetScript,
                 redeemVersion: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },