trading
/
profit-trailer
mirror of https://github.com/taniman/profit-trailer.git
2
0
Fork 0
Code Issues Releases Wiki Activity

sell orders should not be immediate or cancel. make the option configurable

This commit is contained in:
elroy 2017-07-22 14:43:12 +02:00
parent 27bc607b1c
commit 70e564ba94
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/nl/komtek/gpi/services/GunbotProxyService.java
View File

@ -264,18 +264,7 @@ public class GunbotProxyService {
@Caching(evict = {@CacheEvict(value = "openOrders", allEntries = true), @Caching(evict = {@CacheEvict(value = "openOrders", allEntries = true),
@CacheEvict(value = "completeBalances", allEntries = true)}) @CacheEvict(value = "completeBalances", allEntries = true)})
public synchronized String buyOrder(String key, String currencyPair, BigDecimal buyPrice, BigDecimal amount) { public synchronized String buyOrder(String key, String currencyPair, BigDecimal buyPrice, BigDecimal amount) {
PoloniexTradingAPIClient tmpTradingAPIClient; return buyOrderWithProtection(key, currencyPair, buyPrice, amount);
if (isUsingMultipleMarkets()) {
tmpTradingAPIClient = getMultiMarketTradingClient(key);
} else {
tmpTradingAPIClient = getTradingClient("random");
}
final PoloniexTradingAPIClient tradingAPIClient = tmpTradingAPIClient;
String result = Failsafe.with(retryPolicy)
.onFailedAttempt(this::handleException)
.get(() -> analyzeResult(tradingAPIClient.buy(currencyPair, buyPrice, amount, false, false, false)));
logger.info(String.format("Buy order for %s -- %s", currencyPair, result));
return result;
} }
@Cacheable(value = "buyOrderProtection", key = "#currencyPair") @Cacheable(value = "buyOrderProtection", key = "#currencyPair")
@ -289,16 +278,18 @@ public class GunbotProxyService {
tmpTradingAPIClient = getTradingClient("random"); tmpTradingAPIClient = getTradingClient("random");
} }
final PoloniexTradingAPIClient tradingAPIClient = tmpTradingAPIClient; final PoloniexTradingAPIClient tradingAPIClient = tmpTradingAPIClient;
final Boolean fillOrKill = Boolean.valueOf(util.getConfigurationProperty("buy_fillOrKill", "false"));
final Boolean immediateOrCancel = Boolean.valueOf(util.getConfigurationProperty("buy_immediateOrCancel", "false"));
String result = Failsafe.with(retryPolicy) String result = Failsafe.with(retryPolicy)
.onFailedAttempt(this::handleException) .onFailedAttempt(this::handleException)
.get(() -> analyzeResult(tradingAPIClient.buy(currencyPair, buyPrice, amount, false, false, false))); .get(() -> analyzeResult(tradingAPIClient.buy(currencyPair, buyPrice, amount, fillOrKill, immediateOrCancel, false)));
logger.info(String.format("Buy order for %s -- %s", currencyPair, result)); logger.info(String.format("Buy order for %s -- %s", currencyPair, result));
return result; return result;
} }
@Caching(evict = {@CacheEvict(value = "openOrders", allEntries = true), @Caching(evict = {@CacheEvict(value = "openOrders", allEntries = true),
@CacheEvict(value = "completeBalances", allEntries = true)}) @CacheEvict(value = "completeBalances", allEntries = true)})
public synchronized String sellOrder(String key, String currencyPair, BigDecimal buyPrice, BigDecimal amount) { public synchronized String sellOrder(String key, String currencyPair, BigDecimal sellPrice, BigDecimal amount) {
PoloniexTradingAPIClient tmpTradingAPIClient; PoloniexTradingAPIClient tmpTradingAPIClient;
if (isUsingMultipleMarkets()) { if (isUsingMultipleMarkets()) {
tmpTradingAPIClient = getMultiMarketTradingClient(key); tmpTradingAPIClient = getMultiMarketTradingClient(key);
@ -306,9 +297,12 @@ public class GunbotProxyService {
tmpTradingAPIClient = getTradingClient("random"); tmpTradingAPIClient = getTradingClient("random");
} }
final PoloniexTradingAPIClient tradingAPIClient = tmpTradingAPIClient; final PoloniexTradingAPIClient tradingAPIClient = tmpTradingAPIClient;
final Boolean fillOrKill = Boolean.valueOf(util.getConfigurationProperty("sell_fillOrKill", "false"));
final Boolean immediateOrCancel = Boolean.valueOf(util.getConfigurationProperty("sell_immediateOrCancel", "false"));
String result = Failsafe.with(retryPolicy) String result = Failsafe.with(retryPolicy)
.onFailedAttempt(this::handleException) .onFailedAttempt(this::handleException)
.get(() -> analyzeResult(tradingAPIClient.sell(currencyPair, buyPrice, amount, false, true, false))); .get(() -> analyzeResult(tradingAPIClient.sell(currencyPair, sellPrice, amount, fillOrKill, immediateOrCancel, false)));
logger.info(String.format("Sell order for %s -- %s", currencyPair, result)); logger.info(String.format("Sell order for %s -- %s", currencyPair, result));
return result; return result;
} }