Adjust fees and sec. deposit

This commit is contained in:
Manfred Karrer 2017-11-28 18:53:19 -05:00
parent fe92092f9c
commit bf87dc3713
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
3 changed files with 11 additions and 11 deletions

View file

@ -49,7 +49,7 @@ public class Restrictions {
if (MIN_TRADE_AMOUNT == null) if (MIN_TRADE_AMOUNT == null)
switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
case "BTC": case "BTC":
MIN_TRADE_AMOUNT = Coin.valueOf(10_000); // 0.25 EUR @ 2500 EUR/BTC MIN_TRADE_AMOUNT = Coin.valueOf(10_000); // 1 USD @ 10000 USD/BTC
break; break;
case "LTC": case "LTC":
MIN_TRADE_AMOUNT = Coin.valueOf(100_000); // 0.04 EUR @ 40 EUR/LTC MIN_TRADE_AMOUNT = Coin.valueOf(100_000); // 0.04 EUR @ 40 EUR/LTC
@ -69,7 +69,7 @@ public class Restrictions {
if (MAX_BUYER_SECURITY_DEPOSIT == null) if (MAX_BUYER_SECURITY_DEPOSIT == null)
switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
case "BTC": case "BTC":
MAX_BUYER_SECURITY_DEPOSIT = Coin.valueOf(5_000_000); // 250 EUR @ 5000 EUR/BTC MAX_BUYER_SECURITY_DEPOSIT = Coin.valueOf(5_000_000); // 500 USD @ 10000 USD/BTC
break; break;
case "LTC": case "LTC":
MAX_BUYER_SECURITY_DEPOSIT = Coin.valueOf(1_200_000_000); // 500 EUR @ 40 EUR/LTC MAX_BUYER_SECURITY_DEPOSIT = Coin.valueOf(1_200_000_000); // 500 EUR @ 40 EUR/LTC
@ -89,7 +89,7 @@ public class Restrictions {
if (MIN_BUYER_SECURITY_DEPOSIT == null) if (MIN_BUYER_SECURITY_DEPOSIT == null)
switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
case "BTC": case "BTC":
MIN_BUYER_SECURITY_DEPOSIT = Coin.valueOf(50_000); // 2.5 EUR @ 5000 EUR/BTC MIN_BUYER_SECURITY_DEPOSIT = Coin.valueOf(50_000); // 5 USD @ 10000 USD/BTC
break; break;
case "LTC": case "LTC":
MIN_BUYER_SECURITY_DEPOSIT = Coin.valueOf(6_000_000); // 2.4 EUR @ 40 EUR/LTC MIN_BUYER_SECURITY_DEPOSIT = Coin.valueOf(6_000_000); // 2.4 EUR @ 40 EUR/LTC
@ -108,7 +108,7 @@ public class Restrictions {
if (DEFAULT_BUYER_SECURITY_DEPOSIT == null) if (DEFAULT_BUYER_SECURITY_DEPOSIT == null)
switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
case "BTC": case "BTC":
DEFAULT_BUYER_SECURITY_DEPOSIT = Coin.valueOf(1_000_000); // 50 EUR @ 5000 EUR/BTC DEFAULT_BUYER_SECURITY_DEPOSIT = Coin.valueOf(1_000_000); // 100 EUR @ 10000 USD/BTC
break; break;
case "LTC": case "LTC":
DEFAULT_BUYER_SECURITY_DEPOSIT = Coin.valueOf(200_000_000); // 75 EUR @ 40 EUR/LTC DEFAULT_BUYER_SECURITY_DEPOSIT = Coin.valueOf(200_000_000); // 75 EUR @ 40 EUR/LTC
@ -127,7 +127,7 @@ public class Restrictions {
if (SELLER_SECURITY_DEPOSIT == null) if (SELLER_SECURITY_DEPOSIT == null)
switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
case "BTC": case "BTC":
SELLER_SECURITY_DEPOSIT = Coin.valueOf(300_000); // 15 EUR @ 5000 EUR/BTC SELLER_SECURITY_DEPOSIT = Coin.valueOf(300_000); // 30 USD @ 10000 USD/BTC
break; break;
case "LTC": case "LTC":
SELLER_SECURITY_DEPOSIT = Coin.valueOf(60_000_000); // 25 EUR @ 40 EUR/LTC SELLER_SECURITY_DEPOSIT = Coin.valueOf(60_000_000); // 25 EUR @ 40 EUR/LTC

View file

@ -67,8 +67,8 @@ public class FeeService {
private static final long MIN_MAKER_FEE_IN_MBSQ = 50; // about 0.05 EUR if 1 BSQ = 1 EUR private static final long MIN_MAKER_FEE_IN_MBSQ = 50; // about 0.05 EUR if 1 BSQ = 1 EUR
private static final long MIN_TAKER_FEE_IN_MBSQ = 50; private static final long MIN_TAKER_FEE_IN_MBSQ = 50;
private static final long DEFAULT_MAKER_FEE_IN_MBSQ = 500; // about 0.5 EUR if 1 BSQ = 1 EUR private static final long DEFAULT_MAKER_FEE_IN_MBSQ = 2000; // about 2 USD at BTC price 10000 USD for 1 BTC if 1 BSQ = 1 USD -> 10% of BTC fee
private static final long DEFAULT_TAKER_FEE_IN_MBSQ = 500; private static final long DEFAULT_TAKER_FEE_IN_MBSQ = 2000;
// 0.00216 btc is for 3 x tx fee for taker -> about 2 EUR! // 0.00216 btc is for 3 x tx fee for taker -> about 2 EUR!
@ -101,10 +101,10 @@ public class FeeService {
*/ */
switch (baseCurrencyCode) { switch (baseCurrencyCode) {
case "BTC": case "BTC":
MIN_MAKER_FEE_IN_BASE_CUR = 20_000; // 1 USD at BTC price 5000 USD MIN_MAKER_FEE_IN_BASE_CUR = 20_000; // 2 USD at BTC price 10000 USD
MIN_TAKER_FEE_IN_BASE_CUR = 20_000; MIN_TAKER_FEE_IN_BASE_CUR = 20_000;
DEFAULT_MAKER_FEE_IN_BASE_CUR = 200_000; // 10 USD at BTC price 5000 USD for 1 BTC (maxTradeAmount) DEFAULT_MAKER_FEE_IN_BASE_CUR = 200_000; // 20 USD at BTC price 10000 USD for 1 BTC (maxTradeAmount)
DEFAULT_TAKER_FEE_IN_BASE_CUR = 200_000; // 10 USD at BTC price 5000 USD DEFAULT_TAKER_FEE_IN_BASE_CUR = 200_000; // 20 USD at BTC price 10000 USD
txFeePerByte = BTC_DEFAULT_TX_FEE; txFeePerByte = BTC_DEFAULT_TX_FEE;
break; break;
case "LTC": case "LTC":

View file

@ -194,7 +194,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) { switch (BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode()) {
case "BTC": case "BTC":
amount.set("0.1"); amount.set("0.1");
price.set("0.00001"); price.set("0.0001");
break; break;
case "LTC": case "LTC":
amount.set("50"); amount.set("50");