@btc-vision/transaction 1.5.0 → 1.5.1

package/src/transaction/builders/DeploymentTransaction.ts

@@ -2,7 +2,8 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
 import {
     crypto as bitCrypto,
-    Payment,
+    P2TRPayment,
+    PaymentType,
     Psbt,
     PsbtInput,
     Signer,
@@ -15,7 +16,10 @@ import {
     TransactionBuilder,
 } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
-import { DeploymentGenerator } from '../../generators/builders/DeploymentGenerator.js';
+import {
+    DeploymentGenerator,
+    versionBuffer,
+} from '../../generators/builders/DeploymentGenerator.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
@@ -25,11 +29,11 @@ import { Address } from '../../keypair/Address.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
 import { ChallengeGenerator, IMineableReward } from '../mineable/ChallengeGenerator.js';
 
-const p = 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2fn;
-
 export class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     public static readonly MAXIMUM_CONTRACT_SIZE = 128 * 1024;
+
     public type: TransactionType.DEPLOYMENT = TransactionType.DEPLOYMENT;
+
     protected readonly preimage: Buffer; // ALWAYS 128 bytes for the preimage
     protected readonly rewardChallenge: IMineableReward;
     /**
@@ -47,12 +51,12 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * The target script redeem
      * @private
      */
-    private targetScriptRedeem: Payment | null = null;
+    private targetScriptRedeem: P2TRPayment | null = null;
     /**
      * The left over funds script redeem
      * @private
      */
-    private leftOverFundsScriptRedeem: Payment | null = null;
+    private leftOverFundsScriptRedeem: P2TRPayment | null = null;
     /**
      * The compiled target script
      * @private
@@ -107,10 +111,10 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
     private _computedAddress: string | undefined;
 
     public constructor(parameters: IDeploymentParameters) {
-        // TODO: Add legacy deployment, this is only p2tr.
         super(parameters);
 
-        this.bytecode = Compressor.compress(parameters.bytecode);
+        this.bytecode = Compressor.compress(Buffer.concat([versionBuffer, parameters.bytecode]));
+
         this.verifyBytecode();
 
         if (parameters.calldata) {
@@ -337,8 +341,9 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * Get the tap output
      * @protected
      */
-    protected override generateScriptAddress(): Payment {
+    protected override generateScriptAddress(): P2TRPayment {
         return {
+            name: PaymentType.P2TR,
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
@@ -349,7 +354,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      * Generate the tap data
      * @protected
      */
-    protected override generateTapData(): Payment {
+    protected override generateTapData(): P2TRPayment {
         const selectedRedeem = this.contractSigner
             ? this.targetScriptRedeem
             : this.leftOverFundsScriptRedeem;
@@ -363,6 +368,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
         }
 
         return {
+            name: PaymentType.P2TR,
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
@@ -454,13 +460,15 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
      */
     private generateRedeemScripts(): void {
         this.targetScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
+            //pubkeys: this.getPubKeys(),
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
 
         this.leftOverFundsScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
+            //pubkeys: this.getPubKeys(),
             output: this.getLeafScript(),
             redeemVersion: 192,
         };

package/src/transaction/builders/MultiSignTransaction.ts

@@ -1,7 +1,8 @@
 import {
     crypto as bitcoinCrypto,
     opcodes,
-    Payment,
+    P2TRPayment,
+    PaymentType,
     Psbt,
     PsbtInput,
     PsbtInputExtended,
@@ -58,8 +59,8 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
 
     public type: TransactionType.MULTI_SIG = TransactionType.MULTI_SIG;
 
-    protected targetScriptRedeem: Payment | null = null;
-    protected leftOverFundsScriptRedeem: Payment | null = null;
+    protected targetScriptRedeem: P2TRPayment | null = null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null = null;
 
     protected readonly compiledTargetScript: Buffer;
     protected readonly scriptTree: Taptree;
@@ -545,16 +546,16 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
      */
     protected override async signInputs(_transaction: Psbt): Promise<void> {}
 
-    protected override generateScriptAddress(): Payment {
+    protected override generateScriptAddress(): P2TRPayment {
         return {
             internalPubkey: toXOnly(MultiSignTransaction.numsPoint), //this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
-            //pubkeys: this.publicKeys,
+            name: PaymentType.P2TR,
         };
     }
 
-    protected override generateTapData(): Payment {
+    protected override generateTapData(): P2TRPayment {
         const selectedRedeem = this.targetScriptRedeem;
         if (!selectedRedeem) {
             throw new Error('Left over funds script redeem is required');
@@ -569,6 +570,7 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
 
@@ -662,11 +664,13 @@ export class MultiSignTransaction extends TransactionBuilder<TransactionType.MUL
      */
     private generateRedeemScripts(): void {
         this.targetScriptRedeem = {
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
 
         this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
             output: MultiSignTransaction.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };

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/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
      */
@@ -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,
             },