mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename getFeeHistorical to calculateFee

Browse Source
This commit is contained in:
chimp1984 2021-11-14 14:49:03 +01:00
parent 5928b44843
commit b00d317e88
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/bisq/core/provider/mempool/TxValidator.java
View File

@ -202,7 +202,7 @@ public class TxValidator {
log.debug("BTC fee: {}", feeValue); log.debug("BTC fee: {}", feeValue);
Param minFeeParam = isMaker ? Param.MIN_MAKER_FEE_BTC : Param.MIN_TAKER_FEE_BTC; Param minFeeParam = isMaker ? Param.MIN_MAKER_FEE_BTC : Param.MIN_TAKER_FEE_BTC;
Coin expectedFee = getFeeHistorical(tradeAmount, Coin expectedFee = calculateFee(tradeAmount,
isMaker ? getMakerFeeRateBtc(blockHeight) : getTakerFeeRateBtc(blockHeight), isMaker ? getMakerFeeRateBtc(blockHeight) : getTakerFeeRateBtc(blockHeight),
minFeeParam); minFeeParam);
@ -264,7 +264,7 @@ public class TxValidator {
throw new JsonSyntaxException("vin/vout missing data"); throw new JsonSyntaxException("vin/vout missing data");
} }
Param minFeeParam = isMaker ? Param.MIN_MAKER_FEE_BSQ : Param.MIN_TAKER_FEE_BSQ; Param minFeeParam = isMaker ? Param.MIN_MAKER_FEE_BSQ : Param.MIN_TAKER_FEE_BSQ;
Coin expectedFee = getFeeHistorical(tradeAmount, Coin expectedFee = calculateFee(tradeAmount,
isMaker ? getMakerFeeRateBsq(blockHeight) : getTakerFeeRateBsq(blockHeight), isMaker ? getMakerFeeRateBsq(blockHeight) : getTakerFeeRateBsq(blockHeight),
minFeeParam); minFeeParam);
long feeValue = jsonVIn0Value.getAsLong() - jsonFeeValue.getAsLong(); long feeValue = jsonVIn0Value.getAsLong() - jsonFeeValue.getAsLong();
@ -405,7 +405,7 @@ public class TxValidator {
return 0L; // in mempool, not confirmed yet return 0L; // in mempool, not confirmed yet
} }
private Coin getFeeHistorical(Coin amount, Coin feeRatePerBtc, Param minFeeParam) { private Coin calculateFee(Coin amount, Coin feeRatePerBtc, Param minFeeParam) {
double feePerBtcAsDouble = (double) feeRatePerBtc.value; double feePerBtcAsDouble = (double) feeRatePerBtc.value;
double amountAsDouble = amount != null ? (double) amount.value : 0; double amountAsDouble = amount != null ? (double) amount.value : 0;
double btcAsDouble = (double) Coin.COIN.value; double btcAsDouble = (double) Coin.COIN.value;
@ -473,7 +473,7 @@ public class TxValidator {
Coin feeFromFilter, Coin feeFromFilter,
Param minFeeParam) { Param minFeeParam) {
long actualFeeAsLong = actualFeeValue.value; long actualFeeAsLong = actualFeeValue.value;
long feeFromFilterAsLong = getFeeHistorical(tradeAmount, feeFromFilter, minFeeParam).value; long feeFromFilterAsLong = calculateFee(tradeAmount, feeFromFilter, minFeeParam).value;
double deviation = actualFeeAsLong / (double) feeFromFilterAsLong; double deviation = actualFeeAsLong / (double) feeFromFilterAsLong;
// It can be that the filter has not been updated immediately after DAO param change, so we need a tolerance // It can be that the filter has not been updated immediately after DAO param change, so we need a tolerance
// Common change rate is 15-20% // Common change rate is 15-20%
@ -487,13 +487,13 @@ public class TxValidator {
Param defaultFeeParam, Param defaultFeeParam,
Param minFeeParam) { Param minFeeParam) {
for (Coin daoHistoricalRate : daoStateService.getParamChangeList(defaultFeeParam)) { for (Coin daoHistoricalRate : daoStateService.getParamChangeList(defaultFeeParam)) {
if (actualFeeValue.equals(getFeeHistorical(tradeAmount, daoHistoricalRate, minFeeParam))) { if (actualFeeValue.equals(calculateFee(tradeAmount, daoHistoricalRate, minFeeParam))) {
return true; return true;
} }
} }
// Finally, check the default rate used when we ask for the fee rate at genesis block height (it is hard coded in the Param enum) // Finally, check the default rate used when we ask for the fee rate at genesis block height (it is hard coded in the Param enum)
Coin defaultRate = daoStateService.getParamValueAsCoin(defaultFeeParam, daoStateService.getGenesisBlockHeight()); Coin defaultRate = daoStateService.getParamValueAsCoin(defaultFeeParam, daoStateService.getGenesisBlockHeight());
return actualFeeValue.equals(getFeeHistorical(tradeAmount, defaultRate, minFeeParam)); return actualFeeValue.equals(calculateFee(tradeAmount, defaultRate, minFeeParam));
} }
public TxValidator endResult(String title, boolean status) { public TxValidator endResult(String title, boolean status) {