@btc-vision/transaction 1.0.85 → 1.0.87

package/src/keypair/Wallet.ts

@@ -1,97 +1,120 @@
-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;
+
+    /**
+     * Legacy address for the wallet
+     * @private
+     */
+    private readonly _legacy: 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);
+        this._legacy = EcKeyPair.getLegacyAddress(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 legacy address for the wallet
+     * @returns {Address}
+     */
+    public get legacy(): Address {
+        return this._legacy;
+    }
+
+    /**
+     * Get the addresses for the wallet
+     * @returns {Address[]}
+     */
+    public get addresses(): Address[] {
+        return [this.p2wpkh, this.p2tr, this.legacy];
+    }
+
+    /**
+     * 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/metadata/contracts/wBTC.ts

@@ -1,60 +1,60 @@
-import { Network, networks } from 'bitcoinjs-lib';
-import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
-import { Address } from '@btc-vision/bsi-binary';
-import { WBTC_ADDRESS_FRACTAL, WBTC_ADDRESS_REGTEST, WBTC_ADDRESS_TESTNET } from '../tokens.js';
-import { ChainId } from '../../network/ChainId.js';
-
-/**
- * @description Wrapped Bitcoin (wBTC) contract metadata.
- * */
-export class wBTC extends ContractBaseMetadata {
-    /**
-     * @description Token Name
-     */
-    public readonly tokenName: string = 'Wrapped Bitcoin';
-
-    /**
-     * @description Token Symbol
-     */
-    public readonly tokenSymbol: string = 'wBTC';
-
-    /**
-     * @description Token Decimals, same as Bitcoin
-     */
-    public readonly decimals: number = 8;
-
-    protected readonly address: Address;
-
-    constructor(
-        protected network: Network = networks.bitcoin,
-        chainId: ChainId = ChainId.Bitcoin,
-    ) {
-        super(network);
-
-        this.address = wBTC.getAddress(network, chainId);
-    }
-
-    public static getAddress(network: Network = networks.bitcoin, chainId?: ChainId): Address {
-        switch (network.bech32) {
-            case networks.bitcoin.bech32:
-                return this.getWBTCAddressForChain(chainId ?? ChainId.Bitcoin);
-            case networks.regtest.bech32:
-                return WBTC_ADDRESS_REGTEST;
-            case networks.testnet.bech32:
-                return WBTC_ADDRESS_TESTNET;
-            default:
-                throw new Error(`Invalid network: ${network}`);
-        }
-    }
-
-    private static getWBTCAddressForChain(chainId: ChainId): Address {
-        switch (chainId) {
-            case ChainId.Bitcoin:
-                return 'unknown';
-            case ChainId.Fractal:
-                return WBTC_ADDRESS_FRACTAL;
-            default:
-                throw new Error(`Invalid chainId: ${chainId}`);
-        }
-    }
-}
+import { Network, networks } from 'bitcoinjs-lib';
+import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
+import { Address } from '@btc-vision/bsi-binary';
+import { WBTC_ADDRESS_FRACTAL, WBTC_ADDRESS_REGTEST, WBTC_ADDRESS_TESTNET } from '../tokens.js';
+import { ChainId } from '../../network/ChainId.js';
+
+/**
+ * @description Wrapped Bitcoin (wBTC) contract metadata.
+ * */
+export class wBTC extends ContractBaseMetadata {
+    /**
+     * @description Token Name
+     */
+    public readonly tokenName: string = 'Wrapped Bitcoin';
+
+    /**
+     * @description Token Symbol
+     */
+    public readonly tokenSymbol: string = 'wBTC';
+
+    /**
+     * @description Token Decimals, same as Bitcoin
+     */
+    public readonly decimals: number = 8;
+
+    protected readonly address: Address;
+
+    constructor(
+        protected network: Network = networks.bitcoin,
+        chainId: ChainId = ChainId.Bitcoin,
+    ) {
+        super(network);
+
+        this.address = wBTC.getAddress(network, chainId);
+    }
+
+    public static getAddress(network: Network = networks.bitcoin, chainId?: ChainId): Address {
+        switch (network.bech32) {
+            case networks.bitcoin.bech32:
+                return this.getWBTCAddressForChain(chainId ?? ChainId.Bitcoin);
+            case networks.regtest.bech32:
+                return WBTC_ADDRESS_REGTEST;
+            case networks.testnet.bech32:
+                return WBTC_ADDRESS_TESTNET;
+            default:
+                throw new Error(`Invalid network: ${network}`);
+        }
+    }
+
+    private static getWBTCAddressForChain(chainId: ChainId): Address {
+        switch (chainId) {
+            case ChainId.Bitcoin:
+                return 'unknown';
+            case ChainId.Fractal:
+                return WBTC_ADDRESS_FRACTAL;
+            default:
+                throw new Error(`Invalid chainId: ${chainId}`);
+        }
+    }
+}

package/src/metadata/tokens.ts

@@ -18,7 +18,7 @@ export const ROUTER_ADDRESS_TESTNET: Address = 'tb1qnh9mj95nnej25dwhjvvsppwmdm0m
 // Addresses Fractal
 export const FACTORY_ADDRESS_FRACTAL: Address = 'bc1qr4g85824m58wu0zffjtnf56n425fp0e8azhc7q';
 export const POOL_ADDRESS_FRACTAL: Address = 'bc1qv55cht4zzlt29ea7vdgwsedsn63a2sxtkgpv6h';
-export const WBTC_ADDRESS_FRACTAL: Address = 'bc1qdtzlucslvrvu4useyh9r69supqrw3w4xn9t4yv';
+export const WBTC_ADDRESS_FRACTAL: Address = 'u fou';
 export const MOTO_ADDRESS_FRACTAL: Address = 'bc1qfzq6w5uvgg5489egv0lj4shlqx4dagqt0ewdnu';
 export const ROUTER_ADDRESS_FRACTAL: Address = 'bc1q9w2zvmkzlezt2fu34u57y9vuw6rll5sp2090kn';
 

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/transaction/TransactionFactory.ts

@@ -480,6 +480,8 @@ export class TransactionFactory {
     }
 
     private getUTXOAsTransaction(tx: Transaction, to: Address, index: number): UTXO[] {
+        if (!tx.outs[index]) return [];
+
         const out: Output = tx.outs[index];
         const newUtxo: UTXO = {
             transactionId: tx.getId(),

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[]>;
+}