@btc-vision/transaction 1.5.1 → 1.5.2

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

@@ -23,7 +23,6 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
-    protected generateSecret(): Buffer;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;

package/browser/transaction/interfaces/ITransactionParameters.d.ts

@@ -36,6 +36,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
     readonly to: string;
+    readonly contract?: string;
 }
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.0";
+export declare const version = "1.5.2";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.4.0';
+export const version = '1.5.2';

package/build/transaction/builders/InteractionTransaction.js

@@ -6,7 +6,13 @@ export class InteractionTransaction extends SharedInteractionTransaction {
         super(parameters);
         this.type = TransactionType.INTERACTION;
         this.tapLeafScript = null;
-        this.contractSecret = this.generateSecret();
+        if (!parameters.contract) {
+            throw new Error('parameters.contract is required for interaction transaction.');
+        }
+        this.contractSecret = Buffer.from(parameters.contract.replace('0x', ''), 'hex');
+        if (this.contractSecret.length !== 32) {
+            throw new Error('Invalid contract secret length. Expected 32 bytes.');
+        }
         this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.preimage, this.priorityFee, this.generateFeatures(parameters));
         this.scriptTree = this.getScriptTree();
         this.internalInit();

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

@@ -23,7 +23,6 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
-    protected generateSecret(): Buffer;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,4 +1,4 @@
-import { address, PaymentType, toXOnly } from '@btc-vision/bitcoin';
+import { 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';
@@ -48,14 +48,6 @@ export class SharedInteractionTransaction extends TransactionBuilder {
     getPreimage() {
         return this.preimage;
     }
-    generateSecret() {
-        if (!this.to)
-            throw new Error('To address is required');
-        if (this.to.startsWith('0x')) {
-            throw new Error(`Legacy not support at this time. Reserved for future use.`);
-        }
-        return address.fromBech32(this.to).data;
-    }
     scriptSignerXOnlyPubKey() {
         return toXOnly(Buffer.from(this.scriptSigner.publicKey));
     }

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -36,6 +36,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
     readonly to: string;
+    readonly contract?: string;
 }
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {
     readonly bytecode: Buffer;

package/package.json

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

package/src/transaction/builders/InteractionTransaction.ts

@@ -26,7 +26,15 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
     public constructor(parameters: IInteractionParameters) {
         super(parameters);
 
-        this.contractSecret = this.generateSecret();
+        if (!parameters.contract) {
+            throw new Error('parameters.contract is required for interaction transaction.');
+        }
+
+        this.contractSecret = Buffer.from(parameters.contract.replace('0x', ''), 'hex');
+        
+        if (this.contractSecret.length !== 32) {
+            throw new Error('Invalid contract secret length. Expected 32 bytes.');
+        }
 
         this.compiledTargetScript = this.calldataGenerator.compile(
             this.calldata,

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -1,4 +1,4 @@
-import { address, P2TRPayment, PaymentType, Psbt, PsbtInput, Signer, Taptree, toXOnly } from '@btc-vision/bitcoin';
+import { 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';
@@ -120,7 +120,8 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer} The secret
      * @throws {Error} If the to address is invalid
      */
-    protected generateSecret(): Buffer {
+
+    /*protected generateSecret(): Buffer {
         if (!this.to) throw new Error('To address is required');
 
         if (this.to.startsWith('0x')) {
@@ -128,7 +129,7 @@ export abstract class SharedInteractionTransaction<
         }
 
         return address.fromBech32(this.to).data;
-    }
+    }*/
 
     /**
      * Get the internal pubkey as an x-only key

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -52,6 +52,7 @@ export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
 
     readonly to: string;
+    readonly contract?: string;
 }
 
 export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'> {