@btc-vision/transaction 1.1.11 → 1.1.13

package/browser/keypair/Address.d.ts

@@ -18,5 +18,6 @@ export declare class Address extends Uint8Array {
     p2pkh(network: Network): string;
     p2shp2wpkh(network: Network): string;
     toString(): string;
+    toJSON(): string;
     p2tr(network: Network): string;
 }

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

@@ -47,6 +47,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     setPSBT(psbt: Psbt): void;
     getInputs(): PsbtInputExtended[];
     getOutputs(): PsbtOutputExtended[];
+    getOptionalOutputValue(): bigint;
     protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;

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

@@ -22,7 +22,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     disableAutoRefund?: boolean;
     readonly randomBytes?: Buffer;
 }
-export interface IInteractionParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
+export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
     readonly to: string;
 }

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.1.11";
+export declare const version = "1.1.13";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.1.11';
+export const version = '1.1.13';

package/build/deterministic/AddressMap.js

@@ -1,7 +1,7 @@
 import { Map } from './Map.js';
 export class AddressMap extends Map {
     set(key, value) {
-        const index = this._keys.indexOf(key);
+        const index = this.indexOf(key);
         if (index == -1) {
             this._keys.push(key);
             this._values.push(value);

package/build/keypair/Address.d.ts

@@ -18,5 +18,6 @@ export declare class Address extends Uint8Array {
     p2pkh(network: Network): string;
     p2shp2wpkh(network: Network): string;
     toString(): string;
+    toJSON(): string;
     p2tr(network: Network): string;
 }

package/build/keypair/Address.js

@@ -133,6 +133,9 @@ export class Address extends Uint8Array {
     toString() {
         return this.toHex();
     }
+    toJSON() {
+        return this.toHex();
+    }
     p2tr(network) {
         if (__classPrivateFieldGet(this, _Address_p2tr, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
             return __classPrivateFieldGet(this, _Address_p2tr, "f");

package/build/transaction/TransactionFactory.js

@@ -21,7 +21,8 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-                this.getPriorityFee(interactionParameters);
+                this.getPriorityFee(interactionParameters) +
+                preTransaction.getOptionalOutputValue();
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -63,7 +64,8 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-                this.getPriorityFee(interactionParameters);
+                this.getPriorityFee(interactionParameters) +
+                preTransaction.getOptionalOutputValue();
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
@@ -95,7 +97,8 @@ export class TransactionFactory {
         const parameters = await preTransaction.getFundingTransactionParameters();
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-                this.getPriorityFee(deploymentParameters);
+                this.getPriorityFee(deploymentParameters) +
+                preTransaction.getOptionalOutputValue();
         const fundingTransaction = new FundingTransaction(parameters);
         const signedTransaction = await fundingTransaction.signTransaction();
         if (!signedTransaction) {

package/build/transaction/builders/CustomScriptTransaction.js

@@ -78,7 +78,7 @@ export class CustomScriptTransaction extends TransactionBuilder {
             value: Number(amountSpent),
             address: this.to,
         });
-        await this.addRefundOutput(amountSpent);
+        await this.addRefundOutput(amountSpent + this.addOptionalOutputsAndGetAmount());
     }
     async signInputs(transaction) {
         if (!this.contractSigner) {

package/build/transaction/builders/DeploymentTransaction.js

@@ -93,7 +93,7 @@ export class DeploymentTransaction extends TransactionBuilder {
             value: Number(amountSpent),
             address: this.contractAddress.p2tr(this.network),
         });
-        await this.addRefundOutput(amountSpent);
+        await this.addRefundOutput(amountSpent + this.addOptionalOutputsAndGetAmount());
     }
     async signInputsWalletBased(transaction) {
         const signer = this.signer;

package/build/transaction/builders/FundingTransaction.js

@@ -28,7 +28,7 @@ export class FundingTransaction extends TransactionBuilder {
                 address: this.to,
             });
         }
-        await this.addRefundOutput(this.amount);
+        await this.addRefundOutput(this.amount + this.addOptionalOutputsAndGetAmount());
     }
     splitInputs(amountSpent) {
         if (!this.to) {

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -79,8 +79,9 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             value: Number(amountSpent),
             address: this.to,
         });
+        const amount = this.addOptionalOutputsAndGetAmount();
         if (!this.disableAutoRefund) {
-            await this.addRefundOutput(amountSpent);
+            await this.addRefundOutput(amountSpent + amount);
         }
     }
     async signInputs(transaction) {

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

@@ -47,6 +47,7 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     setPSBT(psbt: Psbt): void;
     getInputs(): PsbtInputExtended[];
     getOutputs(): PsbtOutputExtended[];
+    getOptionalOutputValue(): bigint;
     protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;

package/build/transaction/builders/TransactionBuilder.js

@@ -186,8 +186,17 @@ export class TransactionBuilder extends TweakedTransaction {
             outputs.push(this.feeOutput);
         return outputs;
     }
+    getOptionalOutputValue() {
+        if (!this.optionalOutputs)
+            return 0n;
+        let total = 0n;
+        for (let i = 0; i < this.optionalOutputs.length; i++) {
+            total += BigInt(this.optionalOutputs[i].value);
+        }
+        return total;
+    }
     async addRefundOutput(amountSpent) {
-        const sendBackAmount = this.totalInputAmount - amountSpent - this.addOptionalOutputsAndGetAmount();
+        const sendBackAmount = this.totalInputAmount - amountSpent;
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
             if (AddressVerificator.isValidP2TRAddress(this.from, this.network)) {
                 await this.setFeeOutput({

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

@@ -22,7 +22,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     disableAutoRefund?: boolean;
     readonly randomBytes?: Buffer;
 }
-export interface IInteractionParameters extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
+export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
     readonly to: string;
 }

package/package.json

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

package/src/deterministic/AddressMap.ts

@@ -4,7 +4,7 @@ import { Map } from './Map.js';
 
 export class AddressMap<V> extends Map<Address, V> {
     public set(key: Address, value: V): void {
-        const index: i32 = this._keys.indexOf(key);
+        const index: i32 = this.indexOf(key);
         if (index == -1) {
             this._keys.push(key);
             this._values.push(value);

package/src/keypair/Address.ts

@@ -228,6 +228,13 @@ export class Address extends Uint8Array {
     public toString(): string {
         return this.toHex();
     }
+    
+    /**
+     * Convert the address to a JSON string
+     */
+    public toJSON(): string {
+        return this.toHex();
+    }
 
     /**
      * Get the address in p2tr format

package/src/transaction/TransactionFactory.ts

@@ -91,7 +91,8 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-            this.getPriorityFee(interactionParameters);
+            this.getPriorityFee(interactionParameters) +
+            preTransaction.getOptionalOutputValue();
 
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
@@ -151,7 +152,6 @@ export class TransactionFactory {
         });
 
         // we don't sign that transaction, we just need the parameters.
-
         await preTransaction.generateTransactionMinimalSignatures();
 
         const parameters: IFundingTransactionParameters =
@@ -160,7 +160,8 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-            this.getPriorityFee(interactionParameters);
+            this.getPriorityFee(interactionParameters) +
+            preTransaction.getOptionalOutputValue();
 
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
@@ -219,7 +220,8 @@ export class TransactionFactory {
 
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-            this.getPriorityFee(deploymentParameters);
+            this.getPriorityFee(deploymentParameters) +
+            preTransaction.getOptionalOutputValue();
 
         const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
         const signedTransaction: Transaction = await fundingTransaction.signTransaction();

package/src/transaction/builders/CustomScriptTransaction.ts

@@ -177,7 +177,7 @@ export class CustomScriptTransaction extends TransactionBuilder<TransactionType.
             address: this.to,
         });
 
-        await this.addRefundOutput(amountSpent);
+        await this.addRefundOutput(amountSpent + this.addOptionalOutputsAndGetAmount());
     }
 
     /**

package/src/transaction/builders/DeploymentTransaction.ts

@@ -201,7 +201,7 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
             address: this.contractAddress.p2tr(this.network),
         });
 
-        await this.addRefundOutput(amountSpent);
+        await this.addRefundOutput(amountSpent + this.addOptionalOutputsAndGetAmount());
     }
 
     protected override async signInputsWalletBased(transaction: Psbt): Promise<void> {

package/src/transaction/builders/FundingTransaction.ts

@@ -40,7 +40,7 @@ export class FundingTransaction extends TransactionBuilder<TransactionType.FUNDI
             });
         }
 
-        await this.addRefundOutput(this.amount);
+        await this.addRefundOutput(this.amount + this.addOptionalOutputsAndGetAmount());
     }
 
     protected splitInputs(amountSpent: bigint): void {

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -170,8 +170,9 @@ export abstract class SharedInteractionTransaction<
             address: this.to,
         });
 
+        const amount = this.addOptionalOutputsAndGetAmount();
         if (!this.disableAutoRefund) {
-            await this.addRefundOutput(amountSpent);
+            await this.addRefundOutput(amountSpent + amount);
         }
     }
 

package/src/transaction/builders/TransactionBuilder.ts

@@ -444,6 +444,17 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
         return outputs;
     }
 
+    public getOptionalOutputValue(): bigint {
+        if (!this.optionalOutputs) return 0n;
+
+        let total = 0n;
+        for (let i = 0; i < this.optionalOutputs.length; i++) {
+            total += BigInt(this.optionalOutputs[i].value);
+        }
+
+        return total;
+    }
+
     /**
      * @description Adds the refund output to the transaction
      * @param {bigint} amountSpent - The amount spent
@@ -452,8 +463,7 @@ export abstract class TransactionBuilder<T extends TransactionType> extends Twea
      */
     protected async addRefundOutput(amountSpent: bigint): Promise<void> {
         /** Add the refund output */
-        const sendBackAmount: bigint =
-            this.totalInputAmount - amountSpent - this.addOptionalOutputsAndGetAmount();
+        const sendBackAmount: bigint = this.totalInputAmount - amountSpent;
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
             if (AddressVerificator.isValidP2TRAddress(this.from, this.network)) {
                 await this.setFeeOutput({

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -33,8 +33,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     readonly randomBytes?: Buffer;
 }
 
-export interface IInteractionParameters
-    extends Omit<SharedInteractionParameters, 'optionalOutputs'> {
+export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;
 
     readonly to: string;