@btc-vision/transaction 1.0.61 → 1.0.62

package/src/keypair/Wallet.ts

@@ -1,97 +1,97 @@
-import { IWallet } from './interfaces/IWallet.js';
-import { ECPairInterface } from 'ecpair';
-import { EcKeyPair } from './EcKeyPair.js';
-import { Network, networks } from 'bitcoinjs-lib';
-import { Address } from '@btc-vision/bsi-binary';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
-
-/**
- * Wallet class
- */
-export class Wallet {
-    /**
-     * Keypair for the wallet
-     * @private
-     */
-    private readonly _keypair: ECPairInterface;
-
-    /**
-     * P2WPKH address for the wallet
-     * @private
-     */
-    private readonly _p2wpkh: Address;
-
-    /**
-     * P2TR address for the wallet
-     * @private
-     */
-    private readonly _p2tr: Address;
-
-    constructor(
-        wallet: IWallet,
-        public readonly network: Network = networks.bitcoin,
-    ) {
-        this._keypair = EcKeyPair.fromWIF(wallet.privateKey, this.network);
-
-        this._p2wpkh = EcKeyPair.getP2WPKHAddress(this._keypair, this.network);
-        this._p2tr = EcKeyPair.getTaprootAddress(this._keypair, this.network);
-    }
-
-    /**
-     * Get the keypair for the wallet
-     * @returns {ECPairInterface}
-     */
-    public get keypair(): ECPairInterface {
-        if (!this._keypair) throw new Error('Keypair not set');
-
-        return this._keypair;
-    }
-
-    /**
-     * Get the P2WPKH address for the wallet
-     * @returns {Address}
-     */
-    public get p2wpkh(): Address {
-        return this._p2wpkh;
-    }
-
-    /**
-     * Get the P2TR address for the wallet
-     * @returns {Address}
-     */
-    public get p2tr(): Address {
-        return this._p2tr;
-    }
-
-    /**
-     * Get the public key for the wallet
-     * @protected
-     * @returns {Buffer}
-     */
-    public get publicKey(): Buffer {
-        if (!this.keypair) throw new Error('Keypair not set');
-
-        return this.keypair.publicKey;
-    }
-
-    /**
-     * Get the x-only public key for the wallet
-     * @public
-     * @returns {Buffer}
-     */
-    public get xOnly(): Buffer {
-        if (!this.keypair) throw new Error('Keypair not set');
-
-        return toXOnly(this.keypair.publicKey);
-    }
-
-    /**
-     * Create a wallet from a WIF
-     * @param {string} wif The WIF
-     * @param {Network} network The network
-     * @returns {Wallet} The wallet
-     */
-    public static fromWif(wif: string, network: Network = networks.bitcoin): Wallet {
-        return new Wallet({ privateKey: wif, address: '', publicKey: '' }, network);
-    }
-}
+import { IWallet } from './interfaces/IWallet.js';
+import { ECPairInterface } from 'ecpair';
+import { EcKeyPair } from './EcKeyPair.js';
+import { Network, networks } from 'bitcoinjs-lib';
+import { Address } from '@btc-vision/bsi-binary';
+import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+
+/**
+ * Wallet class
+ */
+export class Wallet {
+    /**
+     * Keypair for the wallet
+     * @private
+     */
+    private readonly _keypair: ECPairInterface;
+
+    /**
+     * P2WPKH address for the wallet
+     * @private
+     */
+    private readonly _p2wpkh: Address;
+
+    /**
+     * P2TR address for the wallet
+     * @private
+     */
+    private readonly _p2tr: Address;
+
+    constructor(
+        wallet: IWallet,
+        public readonly network: Network = networks.bitcoin,
+    ) {
+        this._keypair = EcKeyPair.fromWIF(wallet.privateKey, this.network);
+
+        this._p2wpkh = EcKeyPair.getP2WPKHAddress(this._keypair, this.network);
+        this._p2tr = EcKeyPair.getTaprootAddress(this._keypair, this.network);
+    }
+
+    /**
+     * Get the keypair for the wallet
+     * @returns {ECPairInterface}
+     */
+    public get keypair(): ECPairInterface {
+        if (!this._keypair) throw new Error('Keypair not set');
+
+        return this._keypair;
+    }
+
+    /**
+     * Get the P2WPKH address for the wallet
+     * @returns {Address}
+     */
+    public get p2wpkh(): Address {
+        return this._p2wpkh;
+    }
+
+    /**
+     * Get the P2TR address for the wallet
+     * @returns {Address}
+     */
+    public get p2tr(): Address {
+        return this._p2tr;
+    }
+
+    /**
+     * Get the public key for the wallet
+     * @protected
+     * @returns {Buffer}
+     */
+    public get publicKey(): Buffer {
+        if (!this.keypair) throw new Error('Keypair not set');
+
+        return this.keypair.publicKey;
+    }
+
+    /**
+     * Get the x-only public key for the wallet
+     * @public
+     * @returns {Buffer}
+     */
+    public get xOnly(): Buffer {
+        if (!this.keypair) throw new Error('Keypair not set');
+
+        return toXOnly(this.keypair.publicKey);
+    }
+
+    /**
+     * Create a wallet from a WIF
+     * @param {string} wif The WIF
+     * @param {Network} network The network
+     * @returns {Wallet} The wallet
+     */
+    public static fromWif(wif: string, network: Network = networks.bitcoin): Wallet {
+        return new Wallet({ privateKey: wif, address: '', publicKey: '' }, network);
+    }
+}

package/src/keypair/interfaces/IWallet.ts

@@ -1,19 +1,19 @@
-/**
- * Interface for the generated wallet
- */
-export interface IWallet {
-    /**
-     * The address of the wallet
-     */
-    readonly address: string;
-
-    /**
-     * The private key of the wallet
-     */
-    readonly privateKey: string;
-
-    /**
-     * The public key of the wallet
-     */
-    readonly publicKey: string;
-}
+/**
+ * Interface for the generated wallet
+ */
+export interface IWallet {
+    /**
+     * The address of the wallet
+     */
+    readonly address: string;
+
+    /**
+     * The private key of the wallet
+     */
+    readonly privateKey: string;
+
+    /**
+     * The public key of the wallet
+     */
+    readonly publicKey: string;
+}

package/src/metadata/ContractBaseMetadata.ts

@@ -1,23 +1,23 @@
-import { Address } from '@btc-vision/bsi-binary';
-import { Network, networks } from 'bitcoinjs-lib';
-
-export abstract class ContractBaseMetadata {
-    protected abstract readonly address: Address;
-
-    protected constructor(protected network: Network = networks.bitcoin) {}
-
-    /**
-     * @description Get the contract address
-     * @param {Network} network - The network to get the address for
-     */
-    public static getAddress(network: Network = networks.bitcoin): Address {
-        throw new Error('Method not implemented.');
-    }
-
-    /**
-     * @description Get the contract address
-     */
-    public getAddress(): Address {
-        return this.address;
-    }
-}
+import { Address } from '@btc-vision/bsi-binary';
+import { Network, networks } from 'bitcoinjs-lib';
+
+export abstract class ContractBaseMetadata {
+    protected abstract readonly address: Address;
+
+    protected constructor(protected network: Network = networks.bitcoin) {}
+
+    /**
+     * @description Get the contract address
+     * @param {Network} network - The network to get the address for
+     */
+    public static getAddress(network: Network = networks.bitcoin): Address {
+        throw new Error('Method not implemented.');
+    }
+
+    /**
+     * @description Get the contract address
+     */
+    public getAddress(): Address {
+        return this.address;
+    }
+}

package/src/network/NetworkInformation.ts

@@ -1,7 +1,7 @@
-import { IWallet } from '../keypair/interfaces/IWallet.js';
-import { BlockchainConfig } from '@btc-vision/bsi-common';
-
-export interface NetworkInformation {
-    readonly wallet: IWallet;
-    readonly config: BlockchainConfig;
-}
+import { IWallet } from '../keypair/interfaces/IWallet.js';
+import { BlockchainConfig } from '@btc-vision/bsi-common';
+
+export interface NetworkInformation {
+    readonly wallet: IWallet;
+    readonly config: BlockchainConfig;
+}

package/src/opnet.ts

@@ -1,84 +1,84 @@
-export { version } from './_version.js';
-
-/** Bytecode */
-export * from './bytecode/Compressor.js';
-
-/** Generators */
-export * from './generators/Generator.js';
-export * from './generators/builders/CalldataGenerator.js';
-export * from './generators/builders/DeploymentGenerator.js';
-export * from './generators/Features.js';
-
-/** Address */
-export * from './generators/AddressGenerator.js';
-export * from './verification/TapscriptVerificator.js';
-
-/** Key Pair */
-export * from './keypair/EcKeyPair.js';
-export * from './keypair/Wallet.js';
-export * from './keypair/interfaces/IWallet.js';
-export * from './keypair/AddressVerificator.js';
-
-/** Metadata */
-export * from './metadata/contracts/wBTC.js';
-export * from './metadata/ContractBaseMetadata.js';
-
-/** Network */
-export * from './network/NetworkInformation.js';
-
-/** Signer */
-export * from './signer/TweakedSigner.js';
-
-/** Transaction */
-export * from './transaction/TransactionFactory.js';
-export * from './transaction/interfaces/ITransactionParameters.js';
-export * from './transaction/interfaces/Tap.js';
-export * from './transaction/enums/TransactionType.js';
-
-/** Builders */
-export * from './transaction/builders/InteractionTransaction.js';
-export * from './transaction/builders/FundingTransaction.js';
-export * from './transaction/builders/TransactionBuilder.js';
-export * from './transaction/builders/WrapTransaction.js';
-export * from './transaction/builders/SharedInteractionTransaction.js';
-export * from './transaction/builders/DeploymentTransaction.js';
-
-/** wBTC */
-export * from './wbtc/WrappedGenerationParameters.js';
-export * from './wbtc/Generate.js';
-
-/** Utils */
-export * from './utils/BitcoinUtils.js';
-
-/** UTXO */
-export * from './utxo/interfaces/IUTXO.js';
-export * from './utxo/OPNetLimitedProvider.js';
-
-/** Processor */
-export * from './transaction/processor/PsbtTransaction.js';
-
-/** Shared */
-export * from './transaction/shared/TweakedTransaction.js';
-export * from './utxo/interfaces/BroadcastResponse.js';
-export * from './transaction/psbt/PSBTTypes.js';
-
-export * from './transaction/builders/MultiSignTransaction.js';
-export * from './generators/builders/MultiSignGenerator.js';
-
-export * from './transaction/shared/P2TR_MS.js';
-export * from './transaction/builders/UnwrapTransaction.js';
-
-export * from './wbtc/UnwrapGeneration.js';
-
-/** Consensus */
-export * from './consensus/ConsensusConfig.js';
-export * from './consensus/Consensus.js';
-export * from './consensus/metadata/RoswellConsensus.js';
-
-/** Custom signers */
-export * from './transaction/browser/BrowserSignerBase.js';
-export * from './transaction/browser/extensions/UnisatSigner.js';
-export * from './transaction/browser/types/Unisat.js';
-
-export * from './transaction/browser/Web3Provider.js';
-export * from './metadata/tokens.js';
+export { version } from './_version.js';
+
+/** Bytecode */
+export * from './bytecode/Compressor.js';
+
+/** Generators */
+export * from './generators/Generator.js';
+export * from './generators/builders/CalldataGenerator.js';
+export * from './generators/builders/DeploymentGenerator.js';
+export * from './generators/Features.js';
+
+/** Address */
+export * from './generators/AddressGenerator.js';
+export * from './verification/TapscriptVerificator.js';
+
+/** Key Pair */
+export * from './keypair/EcKeyPair.js';
+export * from './keypair/Wallet.js';
+export * from './keypair/interfaces/IWallet.js';
+export * from './keypair/AddressVerificator.js';
+
+/** Metadata */
+export * from './metadata/contracts/wBTC.js';
+export * from './metadata/ContractBaseMetadata.js';
+
+/** Network */
+export * from './network/NetworkInformation.js';
+
+/** Signer */
+export * from './signer/TweakedSigner.js';
+
+/** Transaction */
+export * from './transaction/TransactionFactory.js';
+export * from './transaction/interfaces/ITransactionParameters.js';
+export * from './transaction/interfaces/Tap.js';
+export * from './transaction/enums/TransactionType.js';
+
+/** Builders */
+export * from './transaction/builders/InteractionTransaction.js';
+export * from './transaction/builders/FundingTransaction.js';
+export * from './transaction/builders/TransactionBuilder.js';
+export * from './transaction/builders/WrapTransaction.js';
+export * from './transaction/builders/SharedInteractionTransaction.js';
+export * from './transaction/builders/DeploymentTransaction.js';
+
+/** wBTC */
+export * from './wbtc/WrappedGenerationParameters.js';
+export * from './wbtc/Generate.js';
+
+/** Utils */
+export * from './utils/BitcoinUtils.js';
+
+/** UTXO */
+export * from './utxo/interfaces/IUTXO.js';
+export * from './utxo/OPNetLimitedProvider.js';
+
+/** Processor */
+export * from './transaction/processor/PsbtTransaction.js';
+
+/** Shared */
+export * from './transaction/shared/TweakedTransaction.js';
+export * from './utxo/interfaces/BroadcastResponse.js';
+export * from './transaction/psbt/PSBTTypes.js';
+
+export * from './transaction/builders/MultiSignTransaction.js';
+export * from './generators/builders/MultiSignGenerator.js';
+
+export * from './transaction/shared/P2TR_MS.js';
+export * from './transaction/builders/UnwrapTransaction.js';
+
+export * from './wbtc/UnwrapGeneration.js';
+
+/** Consensus */
+export * from './consensus/ConsensusConfig.js';
+export * from './consensus/Consensus.js';
+export * from './consensus/metadata/RoswellConsensus.js';
+
+/** Custom signers */
+export * from './transaction/browser/BrowserSignerBase.js';
+export * from './transaction/browser/extensions/UnisatSigner.js';
+export * from './transaction/browser/types/Unisat.js';
+
+export * from './transaction/browser/Web3Provider.js';
+export * from './metadata/tokens.js';

package/src/transaction/TransactionFactory.ts

@@ -406,12 +406,18 @@ export class TransactionFactory {
     public async createBTCTransfer(parameters: IFundingTransactionParameters): Promise<{
         estimatedFees: bigint;
         tx: string;
+        nextUTXOs: UTXO[];
     }> {
+        if(!parameters.from) {
+            throw new Error('Field "from" not provided.');
+        }
+
         const resp = await this.createFundTransaction(parameters);
 
         return {
             estimatedFees: resp.estimatedFees,
             tx: resp.tx.toHex(),
+            nextUTXOs: this.getUTXOAsTransaction(resp.tx, parameters.from, 1),
         };
     }
 

package/src/transaction/browser/BrowserSignerBase.ts

@@ -1,37 +1,37 @@
-import { Network, Psbt, Signer } from 'bitcoinjs-lib';
-import { Address } from '@btc-vision/bsi-binary';
-
-/**
- * Create a custom keypair.
- * @class CustomKeypair
- */
-export abstract class CustomKeypair implements Signer {
-    public abstract network: Network;
-
-    public abstract publicKey: Buffer;
-
-    public abstract addresses: Address[];
-
-    public abstract p2tr: Address;
-    public abstract p2wpkh: Address;
-
-    protected constructor() {}
-
-    public abstract signTaprootInput(
-        transaction: Psbt,
-        i: number,
-        sighashTypes: number[],
-    ): Promise<void>;
-
-    public abstract signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
-
-    public abstract getPublicKey(): Buffer;
-
-    public abstract sign(hash: Buffer, lowR?: boolean): Buffer;
-
-    public abstract signSchnorr(hash: Buffer): Buffer;
-
-    public abstract verify(hash: Buffer, signature: Buffer): boolean;
-
-    public abstract init(): Promise<void>;
-}
+import { Network, Psbt, Signer } from 'bitcoinjs-lib';
+import { Address } from '@btc-vision/bsi-binary';
+
+/**
+ * Create a custom keypair.
+ * @class CustomKeypair
+ */
+export abstract class CustomKeypair implements Signer {
+    public abstract network: Network;
+
+    public abstract publicKey: Buffer;
+
+    public abstract addresses: Address[];
+
+    public abstract p2tr: Address;
+    public abstract p2wpkh: Address;
+
+    protected constructor() {}
+
+    public abstract signTaprootInput(
+        transaction: Psbt,
+        i: number,
+        sighashTypes: number[],
+    ): Promise<void>;
+
+    public abstract signInput(transaction: Psbt, i: number, sighashTypes: number[]): Promise<void>;
+
+    public abstract getPublicKey(): Buffer;
+
+    public abstract sign(hash: Buffer, lowR?: boolean): Buffer;
+
+    public abstract signSchnorr(hash: Buffer): Buffer;
+
+    public abstract verify(hash: Buffer, signature: Buffer): boolean;
+
+    public abstract init(): Promise<void>;
+}

package/src/transaction/browser/Web3Provider.ts

@@ -1,46 +1,46 @@
-import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { UTXO } from '../../utxo/interfaces/IUTXO.js';
-
-export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer'>; //| 'utxos'
-
-export interface BroadcastTransactionOptions {
-    raw: string;
-    psbt: boolean;
-}
-
-export interface BroadcastedTransaction {
-    /** Whether the transaction was successfully broadcasted. */
-    readonly success: boolean;
-
-    /**
-     * The result of the broadcasted transaction.
-     */
-    readonly result?: string;
-
-    /**
-     * The error message if the transaction was not successfully broadcasted.
-     */
-    readonly error?: string;
-
-    /**
-     * The number of peers that the transaction was broadcasted to.
-     */
-    readonly peers?: number;
-
-    /**
-     * The identifier of the transaction.
-     */
-    readonly identifier: bigint | string;
-}
-
-export interface Web3Provider {
-    signInteraction(
-        interactionParameters: InteractionParametersWithoutSigner,
-    ): Promise<[string, string, UTXO[]]>;
-
-    signAndBroadcastInteraction(
-        interactionParameters: InteractionParametersWithoutSigner,
-    ): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
-
-    broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
-}
+import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';
+import { UTXO } from '../../utxo/interfaces/IUTXO.js';
+
+export type InteractionParametersWithoutSigner = Omit<IInteractionParameters, 'signer'>; //| 'utxos'
+
+export interface BroadcastTransactionOptions {
+    raw: string;
+    psbt: boolean;
+}
+
+export interface BroadcastedTransaction {
+    /** Whether the transaction was successfully broadcasted. */
+    readonly success: boolean;
+
+    /**
+     * The result of the broadcasted transaction.
+     */
+    readonly result?: string;
+
+    /**
+     * The error message if the transaction was not successfully broadcasted.
+     */
+    readonly error?: string;
+
+    /**
+     * The number of peers that the transaction was broadcasted to.
+     */
+    readonly peers?: number;
+
+    /**
+     * The identifier of the transaction.
+     */
+    readonly identifier: bigint | string;
+}
+
+export interface Web3Provider {
+    signInteraction(
+        interactionParameters: InteractionParametersWithoutSigner,
+    ): Promise<[string, string, UTXO[]]>;
+
+    signAndBroadcastInteraction(
+        interactionParameters: InteractionParametersWithoutSigner,
+    ): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
+
+    broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
+}