@btc-vision/transaction 1.0.87 → 1.0.89

package/browser/transaction/TransactionFactory.d.ts

@@ -1,6 +1,10 @@
+import { Transaction } from 'bitcoinjs-lib';
 import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { FundingTransaction } from './builders/FundingTransaction.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { TransactionBuilder } from './builders/TransactionBuilder.js';
+import { TransactionType } from './enums/TransactionType.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: Address;
@@ -14,6 +18,18 @@ export interface WrapResult {
     readonly receiverAddress: Address;
     readonly utxos: UTXO[];
 }
+export interface FundingTransactionResponse {
+    readonly tx: Transaction;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
+export interface BitcoinTransferResponse {
+    readonly tx: string;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
 export interface UnwrapResult {
     readonly fundingTransaction: string;
     readonly psbt: string;
@@ -27,11 +43,8 @@ export declare class TransactionFactory {
     wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
-    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
-        estimatedFees: bigint;
-        tx: string;
-        nextUTXOs: UTXO[];
-    }>;
+    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
+    getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: Address): UTXO[];
     private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;

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

@@ -4,8 +4,10 @@ import { Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export declare class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     readonly type: TransactionType.FUNDING;
-    protected childTransactionRequiredFees: bigint;
+    protected amount: bigint;
+    protected splitInputsInto: number;
     constructor(parameters: IFundingTransactionParameters);
     protected buildTransaction(): Promise<void>;
+    protected splitInputs(amountSpent: bigint): Promise<void>;
     protected getSignerKey(): Signer;
 }

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

@@ -44,6 +44,8 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     estimateTransactionFees(): Promise<bigint>;
     rebuildFromBase64(base64: string): Promise<Psbt>;
     setPSBT(psbt: Psbt): void;
+    getInputs(): PsbtInputExtended[];
+    getOutputs(): PsbtOutputExtended[];
     protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
@@ -55,8 +57,6 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected updateInput(input: UpdateInput): void;
     protected getWitness(): Buffer;
     protected getTapOutput(): Buffer;
-    protected getInputs(): PsbtInputExtended[];
-    protected getOutputs(): PsbtOutputExtended[];
     protected verifyUTXOValidity(): void;
     protected setFeeOutput(output: PsbtOutputExtended): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;

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

@@ -13,10 +13,11 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     estimatedFees?: bigint;
     chainId?: ChainId;
     readonly feeRate: number;
-    readonly priorityFee: bigint;
+    readonly priorityFee?: bigint;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
     amount: bigint;
+    splitInputsInto?: number;
 }
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer | undefined;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.87";
+export declare const version = "1.0.89";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.87';
+export const version = '1.0.89';

package/build/transaction/TransactionFactory.d.ts

@@ -1,6 +1,10 @@
+import { Transaction } from 'bitcoinjs-lib';
 import { IDeploymentParameters, IFundingTransactionParameters, IInteractionParameters, IUnwrapParameters, IWrapParameters } from './interfaces/ITransactionParameters.js';
+import { FundingTransaction } from './builders/FundingTransaction.js';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { TransactionBuilder } from './builders/TransactionBuilder.js';
+import { TransactionType } from './enums/TransactionType.js';
 export interface DeploymentResult {
     readonly transaction: [string, string];
     readonly contractAddress: Address;
@@ -14,6 +18,18 @@ export interface WrapResult {
     readonly receiverAddress: Address;
     readonly utxos: UTXO[];
 }
+export interface FundingTransactionResponse {
+    readonly tx: Transaction;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
+export interface BitcoinTransferResponse {
+    readonly tx: string;
+    readonly original: FundingTransaction;
+    readonly estimatedFees: bigint;
+    readonly nextUTXOs: UTXO[];
+}
 export interface UnwrapResult {
     readonly fundingTransaction: string;
     readonly psbt: string;
@@ -27,11 +43,8 @@ export declare class TransactionFactory {
     wrap(warpParameters: Omit<IWrapParameters, 'calldata'>): Promise<WrapResult>;
     unwrapSegwit(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
     unwrap(unwrapParameters: IUnwrapParameters): Promise<UnwrapResult>;
-    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
-        estimatedFees: bigint;
-        tx: string;
-        nextUTXOs: UTXO[];
-    }>;
+    createBTCTransfer(parameters: IFundingTransactionParameters): Promise<BitcoinTransferResponse>;
+    getAllNewUTXOs(original: TransactionBuilder<TransactionType>, tx: Transaction, to: Address): UTXO[];
     private createFundTransaction;
     private calculateNumSignatures;
     private calculateNumInputs;

package/build/transaction/TransactionFactory.js

@@ -230,11 +230,30 @@ export class TransactionFactory {
         const resp = await this.createFundTransaction(parameters);
         return {
             estimatedFees: resp.estimatedFees,
+            original: resp.original,
             tx: resp.tx.toHex(),
-            nextUTXOs: this.getUTXOAsTransaction(resp.tx, parameters.from, 1),
+            nextUTXOs: this.getAllNewUTXOs(resp.original, resp.tx, parameters.from),
         };
     }
+    getAllNewUTXOs(original, tx, to) {
+        const outputs = original.getOutputs();
+        const utxos = [];
+        for (let i = 0; i < tx.outs.length; i++) {
+            const output = outputs[i];
+            if ('address' in output) {
+                if (output.address !== to)
+                    continue;
+            }
+            else {
+                continue;
+            }
+            utxos.push(...this.getUTXOAsTransaction(tx, to, i));
+        }
+        return utxos;
+    }
     async createFundTransaction(parameters) {
+        if (!parameters.to)
+            throw new Error('Field "to" not provided.');
         const fundingTransaction = new FundingTransaction(parameters);
         const signedTransaction = await fundingTransaction.signTransaction();
         if (!signedTransaction) {
@@ -243,7 +262,8 @@ export class TransactionFactory {
         return {
             tx: signedTransaction,
             original: fundingTransaction,
-            estimatedFees: await fundingTransaction.estimateTransactionFees(),
+            estimatedFees: fundingTransaction.estimatedFees,
+            nextUTXOs: this.getUTXOAsTransaction(signedTransaction, parameters.to, 0),
         };
     }
     calculateNumSignatures(vault) {

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

@@ -4,8 +4,10 @@ import { Signer } from 'bitcoinjs-lib';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export declare class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {
     readonly type: TransactionType.FUNDING;
-    protected childTransactionRequiredFees: bigint;
+    protected amount: bigint;
+    protected splitInputsInto: number;
     constructor(parameters: IFundingTransactionParameters);
     protected buildTransaction(): Promise<void>;
+    protected splitInputs(amountSpent: bigint): Promise<void>;
     protected getSignerKey(): Signer;
 }

package/build/transaction/builders/FundingTransaction.js

@@ -2,10 +2,12 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export class FundingTransaction extends TransactionBuilder {
     type = TransactionType.FUNDING;
-    childTransactionRequiredFees;
+    amount;
+    splitInputsInto;
     constructor(parameters) {
         super(parameters);
-        this.childTransactionRequiredFees = parameters.amount;
+        this.amount = parameters.amount;
+        this.splitInputsInto = parameters.splitInputsInto ?? 1;
         this.internalInit();
     }
     async buildTransaction() {
@@ -13,13 +15,38 @@ export class FundingTransaction extends TransactionBuilder {
             throw new Error('Recipient address is required');
         }
         this.addInputsFromUTXO();
-        const amountSpent = this.getTransactionOPNetFee() + this.childTransactionRequiredFees;
-        this.addOutput({
-            value: Number(amountSpent),
-            address: this.to,
-        });
+        let amountSpent = this.amount;
+        if (this.getTransactionOPNetFee() === TransactionBuilder.MINIMUM_DUST) {
+            if (amountSpent < TransactionBuilder.MINIMUM_DUST) {
+                amountSpent += TransactionBuilder.MINIMUM_DUST;
+            }
+        }
+        else {
+            amountSpent += this.getTransactionOPNetFee();
+        }
+        if (this.splitInputsInto > 1) {
+            await this.splitInputs(amountSpent);
+        }
+        else {
+            this.addOutput({
+                value: Number(amountSpent),
+                address: this.to,
+            });
+        }
         await this.addRefundOutput(amountSpent);
     }
+    async splitInputs(amountSpent) {
+        if (!this.to) {
+            throw new Error('Recipient address is required');
+        }
+        const splitAmount = amountSpent / BigInt(this.splitInputsInto);
+        for (let i = 0; i < this.splitInputsInto; i++) {
+            this.addOutput({
+                value: Number(splitAmount),
+                address: this.to,
+            });
+        }
+    }
     getSignerKey() {
         return this.signer;
     }

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

@@ -44,6 +44,8 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     estimateTransactionFees(): Promise<bigint>;
     rebuildFromBase64(base64: string): Promise<Psbt>;
     setPSBT(psbt: Psbt): void;
+    getInputs(): PsbtInputExtended[];
+    getOutputs(): PsbtOutputExtended[];
     protected addRefundOutput(amountSpent: bigint): Promise<void>;
     protected addValueToToOutput(value: number | bigint): void;
     protected getTransactionOPNetFee(): bigint;
@@ -55,8 +57,6 @@ export declare abstract class TransactionBuilder<T extends TransactionType> exte
     protected updateInput(input: UpdateInput): void;
     protected getWitness(): Buffer;
     protected getTapOutput(): Buffer;
-    protected getInputs(): PsbtInputExtended[];
-    protected getOutputs(): PsbtOutputExtended[];
     protected verifyUTXOValidity(): void;
     protected setFeeOutput(output: PsbtOutputExtended): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt): Promise<boolean>;

package/build/transaction/builders/TransactionBuilder.js

@@ -35,9 +35,12 @@ export class TransactionBuilder extends TweakedTransaction {
         this.signer = parameters.signer;
         this.network = parameters.network;
         this.feeRate = parameters.feeRate;
-        this.priorityFee = parameters.priorityFee;
+        this.priorityFee = parameters.priorityFee ?? 0n;
         this.utxos = parameters.utxos;
         this.to = parameters.to || undefined;
+        if (!this.utxos.length) {
+            throw new Error('No UTXOs specified');
+        }
         this.from = TransactionBuilder.getFrom(parameters.from, this.signer, this.network);
         this.totalInputAmount = this.calculateTotalUTXOAmount();
         const totalVOut = this.calculateTotalVOutAmount();
@@ -83,7 +86,7 @@ export class TransactionBuilder extends TweakedTransaction {
             signer: this.signer,
             network: this.network,
             feeRate: this.feeRate,
-            priorityFee: this.priorityFee,
+            priorityFee: this.priorityFee ?? 0n,
             from: this.from,
             amount: this.estimatedFees,
         };
@@ -177,6 +180,15 @@ export class TransactionBuilder extends TweakedTransaction {
     setPSBT(psbt) {
         this.transaction = psbt;
     }
+    getInputs() {
+        return this.inputs;
+    }
+    getOutputs() {
+        const outputs = [...this.outputs];
+        if (this.feeOutput)
+            outputs.push(this.feeOutput);
+        return outputs;
+    }
     async addRefundOutput(amountSpent) {
         const sendBackAmount = this.totalInputAmount - amountSpent;
         if (sendBackAmount >= TransactionBuilder.MINIMUM_DUST) {
@@ -263,15 +275,6 @@ export class TransactionBuilder extends TweakedTransaction {
         }
         return this.tapData.output;
     }
-    getInputs() {
-        return this.inputs;
-    }
-    getOutputs() {
-        const outputs = [...this.outputs];
-        if (this.feeOutput)
-            outputs.push(this.feeOutput);
-        return outputs;
-    }
     verifyUTXOValidity() {
         for (let utxo of this.utxos) {
             if (!utxo.scriptPubKey) {

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

@@ -13,10 +13,11 @@ export interface ITransactionParameters extends ITweakedTransactionData {
     estimatedFees?: bigint;
     chainId?: ChainId;
     readonly feeRate: number;
-    readonly priorityFee: bigint;
+    readonly priorityFee?: bigint;
 }
 export interface IFundingTransactionParameters extends ITransactionParameters {
     amount: bigint;
+    splitInputsInto?: number;
 }
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer | undefined;

package/build/utxo/OPNetLimitedProvider.js

@@ -101,27 +101,22 @@ export class OPNetLimitedProvider {
             }),
         };
         const url = `${this.opnetAPIUrl}/api/v1/${this.rpc}`;
-        try {
-            const resp = await fetch(url, params);
-            if (!resp.ok) {
-                throw new Error(`Failed to fetch to rpc: ${resp.statusText}`);
-            }
-            const fetchedData = await resp.json();
-            if (!fetchedData) {
-                throw new Error('No data fetched');
-            }
-            const result = fetchedData.result;
-            if (!result) {
-                throw new Error('No rpc parameters found');
-            }
-            if ('error' in result) {
-                throw new Error(`Error in fetching to rpc ${result.error}`);
-            }
-            return result;
+        const resp = await fetch(url, params);
+        if (!resp.ok) {
+            throw new Error(`Failed to fetch to rpc: ${resp.statusText}`);
         }
-        catch (e) {
-            console.error(`Failed to fetch wrap parameters: ${e.stack}`);
+        const fetchedData = await resp.json();
+        if (!fetchedData) {
+            throw new Error('No data fetched');
+        }
+        const result = fetchedData.result;
+        if (!result) {
+            throw new Error('No rpc parameters found');
         }
+        if ('error' in result) {
+            throw new Error(`Error in fetching to rpc ${result.error}`);
+        }
+        return result;
     }
     async fetchWrapParameters(amount) {
         if (amount < currentConsensusConfig.VAULT_MINIMUM_AMOUNT) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.87",
+    "version": "1.0.89",
     "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.0.87';
+export const version = '1.0.89';