mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Obtain trade fee settings from filter

Browse source
This commit is contained in:
jmacxx 2022-02-15 13:23:33 -06:00
parent b44a562875
commit f601e0f42f
No known key found for this signature in database
GPG key ID: 155297BABFE94A1B
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/app/DomainInitialisation.java
View file

@ -240,7 +240,7 @@ public class DomainInitialisation {
p2PService.onAllServicesInitialized();
feeService.onAllServicesInitialized();
feeService.onAllServicesInitialized(filterManager);
if (DevEnv.isDaoActivated()) {
daoSetup.onAllServicesInitialized(errorMessage -> {

30
core/src/main/java/bisq/core/provider/fee/FeeService.java
View file

@ -20,6 +20,7 @@ package bisq.core.provider.fee;
import bisq.core.dao.governance.param.Param;
import bisq.core.dao.governance.period.PeriodService;
import bisq.core.dao.state.DaoStateService;
import bisq.core.filter.FilterManager;
import bisq.common.UserThread;
import bisq.common.config.Config;
@ -68,9 +69,31 @@ public class FeeService {
private static final long MIN_PAUSE_BETWEEN_REQUESTS_IN_MIN = 2;
private static DaoStateService daoStateService;
private static PeriodService periodService;
private static FilterManager filterManager = null;
private static Coin getFeeFromParamAsCoin(Param parm) {
return daoStateService != null && periodService != null ? daoStateService.getParamValueAsCoin(parm, periodService.getChainHeight()) : Coin.ZERO;
private static Coin getFeeFromParamAsCoin(Param param) {
// if specified, filter values take precedence
Coin fromFilter = getFilterFromParamAsCoin(param);
if (fromFilter.isGreaterThan(Coin.ZERO)) {
return fromFilter;
}
return daoStateService != null && periodService != null ? daoStateService.getParamValueAsCoin(param, periodService.getChainHeight()) : Coin.ZERO;
}
private static Coin getFilterFromParamAsCoin(Param param) {
Coin filterVal = Coin.ZERO;
if (filterManager != null) {
if (param == Param.DEFAULT_MAKER_FEE_BTC) {
filterVal = Coin.valueOf(filterManager.getFilter().getMakerFeeBtc());
} else if (param == Param.DEFAULT_TAKER_FEE_BTC) {
filterVal = Coin.valueOf(filterManager.getFilter().getTakerFeeBtc());
} else if (param == Param.DEFAULT_MAKER_FEE_BSQ) {
filterVal = Coin.valueOf(filterManager.getFilter().getMakerFeeBsq());
} else if (param == Param.DEFAULT_TAKER_FEE_BSQ) {
filterVal = Coin.valueOf(filterManager.getFilter().getTakerFeeBsq());
}
}
return filterVal;
}
public static Coin getMakerFeePerBtc(boolean currencyForFeeIsBtc) {
@ -122,7 +145,8 @@ public class FeeService {
// API
///////////////////////////////////////////////////////////////////////////////////////////
public void onAllServicesInitialized() {
public void onAllServicesInitialized(FilterManager providedFilterManager) {
filterManager = providedFilterManager;
minFeePerVByte = Config.baseCurrencyNetwork().getDefaultMinFeePerVbyte();
requestFees();