From 0ed4b07f4a5e54689465ee5e5df033f29512eaab Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 22 Jun 2017 15:25:15 +0200 Subject: [PATCH] Adjust fees for ltc --- .../main/java/io/bisq/common/app/DevEnv.java | 2 +- .../java/io/bisq/core/btc/Restrictions.java | 2 +- .../io/bisq/core/provider/fee/FeeService.java | 10 +++++----- .../createoffer/CreateOfferViewModel.java | 18 ++++++++++++++++-- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/io/bisq/common/app/DevEnv.java b/common/src/main/java/io/bisq/common/app/DevEnv.java index 227d3605c3..c3fa1a506b 100644 --- a/common/src/main/java/io/bisq/common/app/DevEnv.java +++ b/common/src/main/java/io/bisq/common/app/DevEnv.java @@ -20,7 +20,7 @@ public class DevEnv { @SuppressWarnings("PointlessBooleanExpression") public static final boolean DEV_MODE = STRESS_TEST_MODE || true; - public static final boolean DAO_ACTIVATED = true; + public static final boolean DAO_ACTIVATED = false; public static final boolean DAO_PHASE2_ACTIVATED = false; } diff --git a/core/src/main/java/io/bisq/core/btc/Restrictions.java b/core/src/main/java/io/bisq/core/btc/Restrictions.java index 93c8b30b05..78ca5573ee 100644 --- a/core/src/main/java/io/bisq/core/btc/Restrictions.java +++ b/core/src/main/java/io/bisq/core/btc/Restrictions.java @@ -56,7 +56,7 @@ public class Restrictions { MIN_TRADE_AMOUNT = Coin.valueOf(10_000); // 0.25 EUR cent @ 2500 EUR/BTC break; case "LTC": - MIN_TRADE_AMOUNT = Coin.valueOf(12_000); // 0.24 EUR cent @ 40 EUR/BTC + MIN_TRADE_AMOUNT = Coin.valueOf(625_000); // 0.25 EUR cent @ 40 EUR/LTC break; case "DOGE": MIN_TRADE_AMOUNT = Coin.valueOf(8_000_000_000L);// 0.24 USD at DOGE price 0.003 USD; diff --git a/core/src/main/java/io/bisq/core/provider/fee/FeeService.java b/core/src/main/java/io/bisq/core/provider/fee/FeeService.java index aa046505af..d051ea5530 100644 --- a/core/src/main/java/io/bisq/core/provider/fee/FeeService.java +++ b/core/src/main/java/io/bisq/core/provider/fee/FeeService.java @@ -82,17 +82,17 @@ public class FeeService { switch (baseCurrencyCode) { case "BTC": - MIN_MAKER_FEE_IN_BASE_CUR = 10_000; // 0.25 USD at BTC price 2500 USD + MIN_MAKER_FEE_IN_BASE_CUR = 10_000; // 0.25 USD at BTC price 2500 USD for 1 BTC MIN_TAKER_FEE_IN_BASE_CUR = 10_000; DEFAULT_MAKER_FEE_IN_BASE_CUR = 100_000; // 2.50 USD at BTC price 2500 USD DEFAULT_TAKER_FEE_IN_BASE_CUR = 150_000; // 3.25 USD at BTC price 2500 USD txFeePerByte = BTC_DEFAULT_TX_FEE; break; case "LTC": - MIN_MAKER_FEE_IN_BASE_CUR = 600_000; // 0.24 USD at LTC price 40 USD - MIN_TAKER_FEE_IN_BASE_CUR = 600_000; - DEFAULT_MAKER_FEE_IN_BASE_CUR = 6_000_000; // 2.4 USD at LTC price 40 USD - DEFAULT_TAKER_FEE_IN_BASE_CUR = 9_000_000; // 3.6 USD at LTC price 40 USD + MIN_MAKER_FEE_IN_BASE_CUR = 12_500; // 0.25 USD at LTC price 40 USD for 50 LTC + MIN_TAKER_FEE_IN_BASE_CUR = 12_500; + DEFAULT_MAKER_FEE_IN_BASE_CUR = 125_000; // 2.5 USD at LTC price 40 USD + DEFAULT_TAKER_FEE_IN_BASE_CUR = 187_500; // 3.6 USD at LTC price 40 USD txFeePerByte = LTC_DEFAULT_TX_FEE; break; case "DOGE": diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java index ccd5a45a17..01efd02d0d 100644 --- a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java @@ -27,6 +27,7 @@ import io.bisq.common.monetary.Altcoin; import io.bisq.common.monetary.Price; import io.bisq.common.monetary.Volume; import io.bisq.common.util.MathUtils; +import io.bisq.core.app.BisqEnvironment; import io.bisq.core.btc.Restrictions; import io.bisq.core.offer.Offer; import io.bisq.core.offer.OfferPayload; @@ -193,9 +194,22 @@ class CreateOfferViewModel extends ActivatableWithDataModel { - amount.set("500000"); + switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { + case "BTC": + amount.set("1"); + price.set("2500"); + break; + case "LTC": + amount.set("50"); + price.set("40"); + break; + case "DOGE": + amount.set("800000"); + price.set("0.003"); + break; + } + minAmount.set(amount.get()); - price.set("0.0029"); onFocusOutPriceAsPercentageTextField(true, false); applyMakerFee(); updateButtonDisableState();