Semantics improvements

This commit is contained in:
Aleksandr Kraiz
2023-05-18 22:33:20 +04:00
parent dba7169828
commit ab36c0b26b
21 changed files with 71 additions and 55 deletions

View File

@@ -5,23 +5,23 @@ import calculateServiceFeeInFeeAsset from './calculateServiceFeeInFeeAsset.js';
const calculateFeeInFeeAsset = (
amount: BigNumber.Value,
feeAssetPriceInOrn: BigNumber.Value,
baseAssetPriceInOrn: BigNumber.Value,
baseCurrencyPriceInOrn: BigNumber.Value,
feeAssetPriceInServiceToken: BigNumber.Value,
baseAssetPriceInServiceToken: BigNumber.Value,
baseCurrencyPriceInServiceToken: BigNumber.Value,
gasPriceGwei: BigNumber.Value,
feePercent: BigNumber.Value,
) => {
const serviceFeeInFeeAsset = calculateServiceFeeInFeeAsset(
amount,
feeAssetPriceInOrn,
baseAssetPriceInOrn,
feeAssetPriceInServiceToken,
baseAssetPriceInServiceToken,
feePercent,
);
const networkFeeInFeeAsset = calculateNetworkFeeInFeeAsset(
gasPriceGwei,
FILL_ORDERS_GAS_LIMIT,
baseCurrencyPriceInOrn,
feeAssetPriceInOrn,
baseCurrencyPriceInServiceToken,
feeAssetPriceInServiceToken,
);
return {

View File

@@ -4,16 +4,16 @@ import calculateNetworkFee from './calculateNetworkFee.js';
const calculateNetworkFeeInFeeAsset = (
gasPriceGwei: BigNumber.Value,
gasLimit: BigNumber.Value,
baseCurrencyPriceInOrn: BigNumber.Value,
feeAssetPriceInOrn: BigNumber.Value,
baseCurrencyPriceInServiceToken: BigNumber.Value,
feeAssetPriceInServiceToken: BigNumber.Value,
) => {
const networkFee = calculateNetworkFee(gasPriceGwei, gasLimit);
const networkFeeInOrn = new BigNumber(networkFee).multipliedBy(baseCurrencyPriceInOrn);
const networkFeeInFeeAsset = networkFeeInOrn
const networkFeeInServiceToken = new BigNumber(networkFee).multipliedBy(baseCurrencyPriceInServiceToken);
const networkFeeInFeeAsset = networkFeeInServiceToken
.multipliedBy(
new BigNumber(1)
.div(feeAssetPriceInOrn),
.div(feeAssetPriceInServiceToken),
);
return networkFeeInFeeAsset.toString();

View File

@@ -2,14 +2,14 @@ import { BigNumber } from 'bignumber.js';
export default function calculateServiceFeeInFeeAsset(
amount: BigNumber.Value,
feeAssetPriceInOrn: BigNumber.Value,
baseAssetPriceInOrn: BigNumber.Value,
feeAssetPriceInServiceToken: BigNumber.Value,
baseAssetPriceInServiceToken: BigNumber.Value,
feePercent: BigNumber.Value,
) {
const result = new BigNumber(amount)
.multipliedBy(new BigNumber(feePercent).div(100))
.multipliedBy(baseAssetPriceInOrn)
.multipliedBy(new BigNumber(1).div(feeAssetPriceInOrn))
.multipliedBy(baseAssetPriceInServiceToken)
.multipliedBy(new BigNumber(1).div(feeAssetPriceInServiceToken))
.toString();
return result;