@btc-vision/transaction 1.5.0 → 1.5.1

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Stack } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Stack } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
@@ -30,8 +30,8 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     private getContractSeed;
     private customFinalizer;

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

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';
@@ -36,8 +36,8 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected buildTransaction(): Promise<void>;
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     private verifyCalldata;
     private verifyBytecode;
     private getContractSeed;

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
@@ -21,8 +21,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     static readonly signHashTypesArray: number[];
     static readonly numsPoint: Buffer<ArrayBuffer>;
     type: TransactionType.MULTI_SIG;
-    protected targetScriptRedeem: Payment | null;
-    protected leftOverFundsScriptRedeem: Payment | null;
+    protected targetScriptRedeem: P2TRPayment | null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected readonly compiledTargetScript: Buffer;
     protected readonly scriptTree: Taptree;
     protected readonly publicKeys: Buffer[];
@@ -49,8 +49,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     protected buildTransaction(): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt, checkPartialSigs?: boolean): Promise<boolean>;
     protected signInputs(_transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     private getTotalOutputAmount;

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -8,8 +8,8 @@ import { IMineableReward } from '../mineable/ChallengeGenerator.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
     static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
-    protected targetScriptRedeem: Payment | null;
-    protected leftOverFundsScriptRedeem: Payment | null;
+    protected targetScriptRedeem: P2TRPayment | null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
     protected readonly preimage: Buffer;
@@ -28,8 +28,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {

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

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
+import { Network, P2TRPayment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
@@ -24,8 +24,8 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signed: boolean;
     protected abstract readonly transaction: Psbt;
     protected sighashTypes: number[] | undefined;
-    protected scriptData: Payment | null;
-    protected tapData: Payment | null;
+    protected scriptData: P2TRPayment | null;
+    protected tapData: P2TRPayment | null;
     protected readonly inputs: PsbtInputExtended[];
     protected sequence: number;
     protected tapLeafScript: TapLeafScript | null;
@@ -45,8 +45,8 @@ export declare abstract class TweakedTransaction extends Logger {
     disableRBF(): void;
     getTweakerHash(): Buffer | undefined;
     preEstimateTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numSignatures: bigint, numPubkeys: bigint): bigint;
-    protected generateTapData(): Payment;
-    protected generateScriptAddress(): Payment;
+    protected generateTapData(): P2TRPayment;
+    protected generateScriptAddress(): P2TRPayment;
     protected getSignerKey(): Signer | ECPairInterface;
     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[][];

package/build/generators/builders/DeploymentGenerator.d.ts

@@ -1,5 +1,7 @@
 import { Network } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
+export declare const OPNET_DEPLOYMENT_VERSION = 0;
+export declare const versionBuffer: Buffer<ArrayBuffer>;
 export declare class DeploymentGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
     compile(contractBytecode: Buffer, contractSalt: Buffer, preimage: Buffer, maxPriority: bigint, calldata?: Buffer): Buffer;

package/build/generators/builders/DeploymentGenerator.js

@@ -1,5 +1,7 @@
 import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
+export const OPNET_DEPLOYMENT_VERSION = 0x00;
+export const versionBuffer = Buffer.from([OPNET_DEPLOYMENT_VERSION]);
 export class DeploymentGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         super(senderPubKey, contractSaltPubKey, network);

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Stack } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Stack } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
@@ -30,8 +30,8 @@ export declare class CustomScriptTransaction extends TransactionBuilder<Transact
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     private getContractSeed;
     private customFinalizer;

package/build/transaction/builders/CustomScriptTransaction.js

@@ -1,4 +1,4 @@
-import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, PaymentType, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
@@ -110,6 +110,7 @@ export class CustomScriptTransaction extends TransactionBuilder {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
     generateTapData() {
@@ -127,6 +128,7 @@ export class CustomScriptTransaction extends TransactionBuilder {
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
     getScriptSolution(input) {
@@ -153,12 +155,12 @@ export class CustomScriptTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.getLeafScript(),
             redeemVersion: 192,
         };

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

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';
@@ -36,8 +36,8 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected buildTransaction(): Promise<void>;
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     private verifyCalldata;
     private verifyBytecode;
     private getContractSeed;

package/build/transaction/builders/DeploymentTransaction.js

@@ -1,14 +1,13 @@
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, PaymentType, toXOnly, } from '@btc-vision/bitcoin';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder, } from './TransactionBuilder.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';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { Address } from '../../keypair/Address.js';
 import { ChallengeGenerator } from '../mineable/ChallengeGenerator.js';
-const p = 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2fn;
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);
@@ -36,7 +35,7 @@ export class DeploymentTransaction extends TransactionBuilder {
                 finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witness),
             };
         };
-        this.bytecode = Compressor.compress(parameters.bytecode);
+        this.bytecode = Compressor.compress(Buffer.concat([versionBuffer, parameters.bytecode]));
         this.verifyBytecode();
         if (parameters.calldata) {
             this.calldata = parameters.calldata;
@@ -170,6 +169,7 @@ export class DeploymentTransaction extends TransactionBuilder {
     }
     generateScriptAddress() {
         return {
+            name: PaymentType.P2TR,
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
@@ -186,6 +186,7 @@ export class DeploymentTransaction extends TransactionBuilder {
             throw new Error('Script tree is required');
         }
         return {
+            name: PaymentType.P2TR,
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
@@ -224,12 +225,12 @@ export class DeploymentTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.getLeafScript(),
             redeemVersion: 192,
         };

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
@@ -21,8 +21,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     static readonly signHashTypesArray: number[];
     static readonly numsPoint: Buffer<ArrayBuffer>;
     type: TransactionType.MULTI_SIG;
-    protected targetScriptRedeem: Payment | null;
-    protected leftOverFundsScriptRedeem: Payment | null;
+    protected targetScriptRedeem: P2TRPayment | null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected readonly compiledTargetScript: Buffer;
     protected readonly scriptTree: Taptree;
     protected readonly publicKeys: Buffer[];
@@ -49,8 +49,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     protected buildTransaction(): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt, checkPartialSigs?: boolean): Promise<boolean>;
     protected signInputs(_transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     private getTotalOutputAmount;

package/build/transaction/builders/MultiSignTransaction.js

@@ -1,4 +1,4 @@
-import { crypto as bitcoinCrypto, opcodes, Psbt, script, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitcoinCrypto, opcodes, PaymentType, Psbt, script, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
@@ -256,6 +256,7 @@ export class MultiSignTransaction extends TransactionBuilder {
             internalPubkey: toXOnly(MultiSignTransaction.numsPoint),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
     generateTapData() {
@@ -271,6 +272,7 @@ export class MultiSignTransaction extends TransactionBuilder {
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
     getScriptSolution(input) {
@@ -307,10 +309,12 @@ export class MultiSignTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
             output: MultiSignTransaction.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -8,8 +8,8 @@ import { IMineableReward } from '../mineable/ChallengeGenerator.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
     static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
-    protected targetScriptRedeem: Payment | null;
-    protected leftOverFundsScriptRedeem: Payment | null;
+    protected targetScriptRedeem: P2TRPayment | null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
     protected readonly preimage: Buffer;
@@ -28,8 +28,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,4 +1,4 @@
-import { address, toXOnly } from '@btc-vision/bitcoin';
+import { address, PaymentType, toXOnly } from '@btc-vision/bitcoin';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder } from './TransactionBuilder.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { Compressor } from '../../bytecode/Compressor.js';
@@ -102,6 +102,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
     generateTapData() {
@@ -119,6 +120,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
     getScriptSolution(input) {
@@ -219,10 +221,12 @@ export class SharedInteractionTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
             output: SharedInteractionTransaction.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };

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

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
+import { Network, P2TRPayment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
@@ -24,8 +24,8 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signed: boolean;
     protected abstract readonly transaction: Psbt;
     protected sighashTypes: number[] | undefined;
-    protected scriptData: Payment | null;
-    protected tapData: Payment | null;
+    protected scriptData: P2TRPayment | null;
+    protected tapData: P2TRPayment | null;
     protected readonly inputs: PsbtInputExtended[];
     protected sequence: number;
     protected tapLeafScript: TapLeafScript | null;
@@ -45,8 +45,8 @@ export declare abstract class TweakedTransaction extends Logger {
     disableRBF(): void;
     getTweakerHash(): Buffer | undefined;
     preEstimateTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numSignatures: bigint, numPubkeys: bigint): bigint;
-    protected generateTapData(): Payment;
-    protected generateScriptAddress(): Payment;
+    protected generateTapData(): P2TRPayment;
+    protected generateScriptAddress(): P2TRPayment;
     protected getSignerKey(): Signer | ECPairInterface;
     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[][];

package/build/transaction/shared/TweakedTransaction.js

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, opcodes, payments, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
+import { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, opcodes, payments, PaymentType, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
 import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
 export var TransactionSequence;
@@ -140,12 +140,14 @@ export class TweakedTransaction extends Logger {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
+            name: PaymentType.P2TR,
         };
     }
     generateScriptAddress() {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
+            name: PaymentType.P2TR,
         };
     }
     getSignerKey() {

package/build/verification/TapscriptVerificator.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -64,14 +64,14 @@
         "docs": "typedoc --out docs --exclude 'src/tests/*.ts' --tsconfig tsconfig.json --readme README.md --name OPNet --plugin typedoc-material-theme --themeColor '#cb9820' --exclude src/tests/test.ts --exclude src/index.ts src"
     },
     "devDependencies": {
-        "@babel/core": "^7.27.1",
+        "@babel/core": "^7.27.3",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-transform-runtime": "^7.27.1",
+        "@babel/plugin-transform-runtime": "^7.27.3",
         "@babel/preset-env": "^7.27.2",
         "@babel/preset-flow": "^7.27.1",
         "@babel/preset-react": "^7.27.1",
         "@babel/preset-typescript": "^7.27.1",
-        "@types/node": "^22.15.21",
+        "@types/node": "^22.15.26",
         "@types/sha.js": "^2.4.4",
         "eslint": "^9.27.0",
         "gulp": "^5.0.0",
@@ -83,13 +83,13 @@
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
         "typedoc": "^0.28.5",
-        "typescript-eslint": "^8.32.1",
+        "typescript-eslint": "^8.33.0",
         "webpack-cli": "^6.0.1"
     },
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bitcoin": "^6.4.1",
+        "@btc-vision/bitcoin": "^6.4.5",
         "@btc-vision/bitcoin-rpc": "^1.0.1",
         "@btc-vision/logger": "^1.0.6",
         "@eslint/js": "^9.27.0",

package/src/generators/builders/DeploymentGenerator.ts

@@ -2,6 +2,9 @@ import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin'
 import { Generator } from '../Generator.js';
 import { Feature, Features } from '../Features.js';
 
+export const OPNET_DEPLOYMENT_VERSION = 0x00;
+export const versionBuffer = Buffer.from([OPNET_DEPLOYMENT_VERSION]);
+
 export class DeploymentGenerator extends Generator {
     constructor(
         senderPubKey: Buffer,
@@ -52,6 +55,7 @@ export class DeploymentGenerator extends Generator {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(contractBytecode);
+
         const calldataChunks: Buffer[][] = calldata ? this.splitBufferIntoChunks(calldata) : [];
 
         const featuresList: Features[] = [];

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -1,6 +1,8 @@
 import {
     crypto as bitCrypto,
+    P2TRPayment,
     Payment,
+    PaymentType,
     Psbt,
     PsbtInput,
     Signer,
@@ -49,12 +51,12 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * 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
@@ -158,7 +160,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
             this.to = this.getScriptAddress();
         }
 
-        const selectedRedeem = this.contractSigner
+        const selectedRedeem: Payment | null = this.contractSigner
             ? this.targetScriptRedeem
             : this.leftOverFundsScriptRedeem;
 
@@ -224,11 +226,12 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * Get the tap output
      * @protected
      */
-    protected override generateScriptAddress(): Payment {
+    protected override generateScriptAddress(): P2TRPayment {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
 
@@ -236,7 +239,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      * Generate the tap data
      * @protected
      */
-    protected override generateTapData(): Payment {
+    protected override generateTapData(): P2TRPayment {
         const selectedRedeem = this.contractSigner
             ? this.targetScriptRedeem
             : this.leftOverFundsScriptRedeem;
@@ -254,6 +257,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
 
@@ -329,13 +333,15 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
      */
     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,
         };