beignet 0.0.19 → 0.0.21

package/src/wallet/index.ts

@@ -2,7 +2,6 @@ import * as bitcoin from 'bitcoinjs-lib';
 import { Network, networks } from 'bitcoinjs-lib';
 import BIP32Factory, { BIP32Interface } from 'bip32';
 import * as ecc from '@bitcoinerlab/secp256k1';
-//import { getExchangeRates } from "../utils/exchange-rate";
 import {
 	EAddressType,
 	EAvailableNetworks,
@@ -15,7 +14,6 @@ import {
 	IBoostedTransactions,
 	ICustomGetAddress,
 	ICustomGetScriptHash,
-	IExchangeRates,
 	IFormattedTransaction,
 	IFormattedTransactions,
 	IGenerateAddresses,
@@ -68,7 +66,6 @@ import {
 	getDataFallback,
 	getDefaultWalletData,
 	getDefaultWalletDataKeys,
-	getExchangeRates,
 	getHighestUsedIndexFromTxHashes,
 	getKeyDerivationPath,
 	getKeyDerivationPathObject,
@@ -85,7 +82,8 @@ import {
 	validateAddress,
 	validateMnemonic,
 	getAddressesFromPrivateKey,
-	getAddressFromKeyPair
+	getAddressFromKeyPair,
+	getElectrumNetwork
 } from '../utils';
 import {
 	addressTypes,
@@ -141,7 +139,6 @@ export class Wallet {
 	};
 	public electrum: Electrum;
 	public addressType: EAddressType;
-	public exchangeRates: IExchangeRates;
 	public sendMessage: TOnMessage;
 	public transaction: Transaction;
 	public feeEstimates: IOnchainFees;
@@ -186,7 +183,6 @@ export class Wallet {
 		this.id = generateWalletId(this._seed);
 		this.name = name ?? this.id;
 		this.addressType = addressType;
-		this.exchangeRates = {};
 		this.transaction = new Transaction({
 			wallet: this
 		});
@@ -233,7 +229,6 @@ export class Wallet {
 			if (wallet._disableMessagesOnCreate) wallet.disableMessages = true;
 			const res = await wallet.setWalletData();
 			if (res.isErr()) return err(res.error.message);
-			wallet.updateExchangeRates();
 			wallet.updateFeeEstimates();
 			console.log('Syncing Wallet...');
 			await wallet.refreshWallet({});
@@ -470,9 +465,6 @@ export class Wallet {
 						case 'selectedFeeId':
 							walletData[key] = data as EFeeId;
 							break;
-						case 'exchangeRates':
-							walletData[key] = data as IExchangeRates;
-							break;
 						case 'feeEstimates':
 							walletData[key] = data as IOnchainFees;
 							break;
@@ -524,7 +516,7 @@ export class Wallet {
 				const data = {
 					path,
 					type: addressType,
-					selectedNetwork: this.electrum.getElectrumNetwork(this._network)
+					selectedNetwork: getElectrumNetwork(this._network)
 				};
 				const res = await this._customGetAddress(data);
 				if (res.isErr()) return err(res.error.message);
@@ -696,7 +688,7 @@ export class Wallet {
 		network: EAvailableNetworks;
 	}): Promise<string> {
 		if (this._customGetScriptHash) {
-			const selectedNetwork = this.electrum.getElectrumNetwork(network);
+			const selectedNetwork = getElectrumNetwork(network);
 			return await this._customGetScriptHash({ address, selectedNetwork });
 		}
 		return getScriptHash({ address, network });
@@ -2406,22 +2398,6 @@ export class Wallet {
 		}
 	}
 
-	/**
-	 * Returns exchange rate data from storage.
-	 * @param {string} currency
-	 * @returns {number}
-	 */
-	public getExchangeRate(currency = 'EUR'): number {
-		try {
-			if (currency in this.exchangeRates) {
-				return this.exchangeRates[currency]?.rate ?? 0;
-			}
-			return 0;
-		} catch {
-			return 0;
-		}
-	}
-
 	/**
 	 * Attempts to validate a given address.
 	 * @param {string} address
@@ -3370,20 +3346,6 @@ export class Wallet {
 		}
 	}
 
-	/**
-	 * Updates the exchange rates for the current network.
-	 * @public
-	 * @async
-	 * @returns {Promise<Result<IExchangeRates>>}
-	 */
-	public async updateExchangeRates(): Promise<Result<IExchangeRates>> {
-		const exchangeRates = await getExchangeRates();
-		if (exchangeRates.isErr()) return err(exchangeRates.error.message);
-		this.exchangeRates = exchangeRates.value;
-		await this.saveWalletData('exchangeRates', this.exchangeRates);
-		return ok(this.exchangeRates);
-	}
-
 	/**
 	 * Updates the fee estimates for the current network.
 	 * @public

package/src/utils/exchange-rate.ts

@@ -1,70 +0,0 @@
-import { ok, err, Result } from './result';
-import { BLOCKTANK_HOST } from '../wallet/constants';
-import { IExchangeRates } from '../types';
-
-export const mostUsedExchangeTickers = {
-	USD: {
-		currencySymbol: '$',
-		quote: 'USD',
-		quoteName: 'US Dollar'
-	},
-	GBP: {
-		currencySymbol: '£',
-		quote: 'GBP',
-		quoteName: 'Great British Pound'
-	},
-	CAD: {
-		currencySymbol: '$',
-		quote: 'CAD',
-		quoteName: 'Canadian Dollar'
-	},
-	CNY: {
-		currencySymbol: '¥',
-		quote: 'CNY',
-		quoteName: 'Chinese Yuan Renminbi'
-	},
-	EUR: { currencySymbol: '€', quote: 'EUR', quoteName: 'Euro' }
-};
-
-type TTicker = {
-	symbol: string;
-	lastPrice: string;
-	base: string;
-	baseName: string;
-	quote: string;
-	quoteName: string;
-	currencySymbol: string;
-	currencyFlag: string;
-	lastUpdatedAt: number;
-};
-
-/**
- * Returns the exchange rate for the given currency
- * @returns {Promise<Result<IExchangeRates>>}
- */
-export const getExchangeRates = async (): Promise<Result<IExchangeRates>> => {
-	try {
-		const response = await fetch(`${BLOCKTANK_HOST}/fx/rates/btc`);
-		const { tickers } = await response.json();
-
-		const rates: IExchangeRates = tickers.reduce(
-			(acc: IExchangeRates, ticker: TTicker) => {
-				return {
-					...acc,
-					[ticker.quote]: {
-						currencySymbol: ticker.currencySymbol,
-						quote: ticker.quote,
-						quoteName: ticker.quoteName,
-						rate: Math.round(Number(ticker.lastPrice) * 100) / 100,
-						lastUpdatedAt: ticker.lastUpdatedAt
-					}
-				};
-			},
-			{}
-		);
-
-		return ok(rates);
-	} catch (e) {
-		return err(e);
-	}
-};