Support trade fees defined DAO params

- Use DAO Params to get the trade fees
- Rename existing params
- Add min fee values
This commit is contained in:
Manfred Karrer 2018-10-10 15:02:38 -05:00
parent 048767af1a
commit aeebae9297
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
17 changed files with 139 additions and 102 deletions

View file

@ -68,13 +68,13 @@ public class ChangeParamValidator extends ProposalValidator {
case UNDEFINED:
break;
case BSQ_MAKER_FEE_IN_PERCENT:
case DEFAULT_MAKER_FEE_BSQ:
break;
case BSQ_TAKER_FEE_IN_PERCENT:
case DEFAULT_TAKER_FEE_BSQ:
break;
case BTC_MAKER_FEE_IN_PERCENT:
case DEFAULT_MAKER_FEE_BTC:
break;
case BTC_TAKER_FEE_IN_PERCENT:
case DEFAULT_TAKER_FEE_BTC:
break;
case PROPOSAL_FEE:

View file

@ -42,13 +42,22 @@ import static com.google.common.base.Preconditions.checkNotNull;
public enum Param {
UNDEFINED(0),
// TODO trade fee is not implemented yet to be actually used.
// FeeService is setting the fee atm....
// Value of 100 means 1%, value of 1 means 0.01%
BSQ_MAKER_FEE_IN_PERCENT(5), // 0.05%
BSQ_TAKER_FEE_IN_PERCENT(5),
BTC_MAKER_FEE_IN_PERCENT(20), // 0.2% base fee for 1% distance to market price
BTC_TAKER_FEE_IN_PERCENT(20), // 0.2%
// Fee in BSQ satoshi for a 1 BTC trade. 200 Satoshi = 2 BSQ = 0.02%.
// About 2 USD if 1 BSQ = 1 USD for a 1 BTC trade which is about 10% of the BTC fee.,
// Might need adjustment if BSQ/BTC rate changes.
DEFAULT_MAKER_FEE_BSQ(200), // 0.02%
DEFAULT_TAKER_FEE_BSQ(200),
// 0.05 BSQ (5 satoshi) for a 1 BTC trade. 0.05 USD if 1 BSQ = 1 USD, 10 % of the BTC fee
MIN_MAKER_FEE_BSQ(5), // 0.0005%.
MIN_TAKER_FEE_BSQ(5),
// Fee in BTC satoshi for a 1 BTC trade. 200_000 Satoshi = 0.00200000 BTC = 0.2%.
// 20 USD at BTC price 10_000 USD for a 1 BTC trade;
DEFAULT_MAKER_FEE_BTC(200_000),
DEFAULT_TAKER_FEE_BTC(200_000), // 0.2%
MIN_MAKER_FEE_BTC(5_000), // 0.005%.
MIN_TAKER_FEE_BTC(5_000),
// Fees proposal/voting. Atm we don't use diff. fees for diff. proposal types
// See https://github.com/bisq-network/proposals/issues/46

View file

@ -18,6 +18,9 @@
package bisq.core.provider.fee;
import bisq.core.app.BisqEnvironment;
import bisq.core.dao.state.BsqStateService;
import bisq.core.dao.state.governance.Param;
import bisq.core.dao.state.period.PeriodService;
import bisq.common.UserThread;
import bisq.common.handlers.FaultHandler;
@ -51,31 +54,54 @@ import static com.google.common.base.Preconditions.checkNotNull;
// TODO use dao parameters for fee
@Slf4j
public class FeeService {
///////////////////////////////////////////////////////////////////////////////////////////
// Static
///////////////////////////////////////////////////////////////////////////////////////////
// Miner fees are between 1-600 sat/byte. We try to stay on the safe side. BTC_DEFAULT_TX_FEE is only used if our
// fee service would not deliver data.
private static final long BTC_DEFAULT_TX_FEE = 50;
private static long MIN_MAKER_FEE_BTC = 5_000; // 0.005%. 0.5 USD at BTC price 10_000 USD;
private static long MIN_TAKER_FEE_BTC = 5_000;
private static long DEFAULT_MAKER_FEE_BTC = 200_000; // 0.2%. 20 USD at BTC price 10000 USD for a 1 BTC trade;
private static long DEFAULT_TAKER_FEE_BTC = 200_000;
// 0.05 BSQ (5 satoshi) for a 1 BTC trade -> 0.005%. 0.05 USD if 1 BSQ = 1 USD, 10 % of BTC fee
private static final long MIN_MAKER_FEE_BSQ = 5;
private static final long MIN_TAKER_FEE_BSQ = 5;
// 2 BSQ or 200 BSQ-satoshi. About 2 USD if 1 BSQ = 1 USD for a 1 BTC trade which is about 10% of a normal BTC fee.
private static final long DEFAULT_TAKER_FEE_BSQ = 200;
private static final long DEFAULT_MAKER_FEE_BSQ = 200;
private static final long MIN_PAUSE_BETWEEN_REQUESTS_IN_MIN = 2;
private static BsqStateService bsqStateService;
private static PeriodService periodService;
private static long getFeeFromParam(Param parm) {
return bsqStateService != null && periodService != null ? bsqStateService.getParamValue(parm, periodService.getChainHeight()) : 0;
}
public static Coin getMakerFeePerBtc(boolean currencyForFeeIsBtc) {
long fee = currencyForFeeIsBtc ? getFeeFromParam(Param.DEFAULT_MAKER_FEE_BTC) : getFeeFromParam(Param.DEFAULT_MAKER_FEE_BSQ);
return Coin.valueOf(fee);
}
public static Coin getMinMakerFee(boolean currencyForFeeIsBtc) {
long fee = currencyForFeeIsBtc ? getFeeFromParam(Param.MIN_MAKER_FEE_BTC) : getFeeFromParam(Param.MIN_MAKER_FEE_BSQ);
return Coin.valueOf(fee);
}
public static Coin getTakerFeePerBtc(boolean currencyForFeeIsBtc) {
long fee = currencyForFeeIsBtc ? getFeeFromParam(Param.DEFAULT_TAKER_FEE_BTC) : getFeeFromParam(Param.DEFAULT_TAKER_FEE_BSQ);
return Coin.valueOf(fee);
}
public static Coin getMinTakerFee(boolean currencyForFeeIsBtc) {
long fee = currencyForFeeIsBtc ? getFeeFromParam(Param.MIN_TAKER_FEE_BTC) : getFeeFromParam(Param.MIN_TAKER_FEE_BSQ);
return Coin.valueOf(fee);
}
///////////////////////////////////////////////////////////////////////////////////////////
// Class fields
///////////////////////////////////////////////////////////////////////////////////////////
private final FeeProvider feeProvider;
private final IntegerProperty feeUpdateCounter = new SimpleIntegerProperty(0);
private long txFeePerByte = BTC_DEFAULT_TX_FEE;
private Map<String, Long> timeStampMap;
private long epochInSecondAtLastRequest;
private long lastRequest;
private long minFeePerByte;
private long epochInSecondAtLastRequest;
///////////////////////////////////////////////////////////////////////////////////////////
@ -83,10 +109,17 @@ public class FeeService {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public FeeService(FeeProvider feeProvider) {
public FeeService(FeeProvider feeProvider, BsqStateService bsqStateService, PeriodService periodService) {
this.feeProvider = feeProvider;
FeeService.bsqStateService = bsqStateService;
FeeService.periodService = periodService;
}
///////////////////////////////////////////////////////////////////////////////////////////
// API
///////////////////////////////////////////////////////////////////////////////////////////
public void onAllServicesInitialized() {
minFeePerByte = BisqEnvironment.getBaseCurrencyNetwork().getDefaultMinFeePerByte();
@ -96,6 +129,7 @@ public class FeeService {
UserThread.runPeriodically(this::requestFees, 5, TimeUnit.MINUTES);
}
public void requestFees() {
requestFees(null, null);
}
@ -157,22 +191,6 @@ public class FeeService {
return Coin.valueOf(txFeePerByte);
}
public static Coin getMakerFeePerBtc(boolean currencyForMakerFeeIsBtc) {
return currencyForMakerFeeIsBtc ? Coin.valueOf(DEFAULT_MAKER_FEE_BTC) : Coin.valueOf(DEFAULT_MAKER_FEE_BSQ);
}
public static Coin getMinMakerFee(boolean currencyForMakerFeeIsBtc) {
return currencyForMakerFeeIsBtc ? Coin.valueOf(MIN_MAKER_FEE_BTC) : Coin.valueOf(MIN_MAKER_FEE_BSQ);
}
public static Coin getTakerFeePerBtc(boolean currencyForTakerFeeIsBtc) {
return currencyForTakerFeeIsBtc ? Coin.valueOf(DEFAULT_TAKER_FEE_BTC) : Coin.valueOf(DEFAULT_TAKER_FEE_BSQ);
}
public static Coin getMinTakerFee(boolean currencyForTakerFeeIsBtc) {
return currencyForTakerFeeIsBtc ? Coin.valueOf(MIN_TAKER_FEE_BTC) : Coin.valueOf(MIN_TAKER_FEE_BSQ);
}
public ReadOnlyIntegerProperty feeUpdateCounterProperty() {
return feeUpdateCounter;
}

View file

@ -123,10 +123,10 @@ public class BsqFormatter extends BSFormatter {
case UNDEFINED:
return Res.get("shared.na");
case BSQ_MAKER_FEE_IN_PERCENT:
case BSQ_TAKER_FEE_IN_PERCENT:
case BTC_MAKER_FEE_IN_PERCENT:
case BTC_TAKER_FEE_IN_PERCENT:
case DEFAULT_MAKER_FEE_BSQ:
case DEFAULT_TAKER_FEE_BSQ:
case DEFAULT_MAKER_FEE_BTC:
case DEFAULT_TAKER_FEE_BTC:
return formatToPercentWithSymbol(value / 10000d);
case PROPOSAL_FEE:
@ -172,10 +172,10 @@ public class BsqFormatter extends BSFormatter {
case UNDEFINED:
return 0;
case BSQ_MAKER_FEE_IN_PERCENT:
case BSQ_TAKER_FEE_IN_PERCENT:
case BTC_MAKER_FEE_IN_PERCENT:
case BTC_TAKER_FEE_IN_PERCENT:
case DEFAULT_MAKER_FEE_BSQ:
case DEFAULT_TAKER_FEE_BSQ:
case DEFAULT_MAKER_FEE_BTC:
case DEFAULT_TAKER_FEE_BTC:
return (long) (parsePercentStringToDouble(inputValue) * 10000);
case PROPOSAL_FEE:

View file

@ -1190,14 +1190,24 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Undefined
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=BSQ maker fee in %
dao.param.DEFAULT_MAKER_FEE_BSQ=BSQ maker fee
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=BSQ taker fee in %
dao.param.DEFAULT_TAKER_FEE_BSQ=BSQ taker fee
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=BTC maker fee in %
dao.param.MIN_MAKER_FEE_BSQ=Min. BSQ maker fee
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=BTC taker fee in %
dao.param.MIN_TAKER_FEE_BSQ=Min. BSQ taker fee
# suppress inspection "UnusedProperty"
dao.param.DEFAULT_MAKER_FEE_BTC=BTC maker fee
# suppress inspection "UnusedProperty"
dao.param.DEFAULT_TAKER_FEE_BTC=BTC taker fee
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"
dao.param.MIN_MAKER_FEE_BTC=Min. BTC maker fee
# suppress inspection "UnusedProperty"
dao.param.MIN_TAKER_FEE_BTC=Min. BTC taker fee
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Wahlergebnisse für gewählten Vorsch
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Undefiniert
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Erstellergebühr in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Erstellergebühr in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Abnehmergebühr in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Abnehmergebühr in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Erstellergebühr in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Erstellergebühr in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Abnehmergebühr in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Abnehmergebühr in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Ακαθόριστο
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Indefinido
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=تعریف نشده
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Határozatlan
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Indefinido
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Nedefinit
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Результаты голосова
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Неопределено
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Взнос BSQ создателя
dao.param.DEFAULT_MAKER_FEE_BSQ=Взнос BSQ создателя
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Взнос BSQ получателя
dao.param.DEFAULT_TAKER_FEE_BSQ=Взнос BSQ получателя
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Взнос BТС создателя
dao.param.DEFAULT_MAKER_FEE_BTC=Взнос BТС создателя
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Взнос BТС получателя
dao.param.DEFAULT_TAKER_FEE_BTC=Взнос BТС получателя
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Undefined
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=ไม่ได้กำหนด
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Không xác định
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"

View file

@ -1050,13 +1050,13 @@ dao.results.proposals.voting.detail.header=Vote results for selected proposal
# suppress inspection "UnusedProperty"
dao.param.UNDEFINED=Undefined
# suppress inspection "UnusedProperty"
dao.param.BSQ_MAKER_FEE_IN_PERCENT=Maker fee in BSQ
dao.param.DEFAULT_MAKER_FEE_BSQ=Maker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BSQ_TAKER_FEE_IN_PERCENT=Taker fee in BSQ
dao.param.DEFAULT_TAKER_FEE_BSQ=Taker fee in BSQ
# suppress inspection "UnusedProperty"
dao.param.BTC_MAKER_FEE_IN_PERCENT=Maker fee in BTC
dao.param.DEFAULT_MAKER_FEE_BTC=Maker fee in BTC
# suppress inspection "UnusedProperty"
dao.param.BTC_TAKER_FEE_IN_PERCENT=Taker fee in BTC
dao.param.DEFAULT_TAKER_FEE_BTC=Taker fee in BTC
# suppress inspection "UnusedProperty"
# suppress inspection "UnusedProperty"