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

Update checkSetup to support multiple markets

This commit is contained in:
elroy 2017-07-30 22:15:41 +02:00
parent 21eb671769
commit bd1b3c0fbc
2 changed files with 63 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/main/java/nl/komtek/gpi/controllers/CheckSetupController.java
View File

@ -50,41 +50,22 @@ public class CheckSetupController {
private Map<String, String> setupData() {
Map<String, String> setupData = new HashMap<>();
try {
String keyName = "default_apiKey";
String secretName = "default_apiSecret";
String apiKey = util.getEnvProperty(keyName);
String apiSecret = util.getEnvProperty(secretName);
if (StringUtils.isEmpty(apiKey) || StringUtils.isEmpty(apiSecret)) {
setupData.put(keyName, String.format("Please setup %s and %s", keyName, secretName));
} else {
gunbotProxyService.analyzeResult(gunbotProxyService.checkDefaultKey("default"));
setupData.put("defaultKey", "Looking good!");
if (!gunbotProxyService.isUsingMultipleMarkets()) {
checkApiKeysForMarket(setupData, "");
} else {
if (gunbotProxyService.isActiveMarket("BTC")) {
checkApiKeysForMarket(setupData, "BTC_");
}
} catch (Exception e) {
setupData.put("defaultKey", e.getMessage());
}
for (int i = 1; i <= 10; i++) {
String keyName = String.format("apiKey%d", i);
String secretName = String.format("apiSecret%d", i);
String apiKey = util.getEnvProperty(keyName);
String apiSecret = util.getEnvProperty(secretName);
if (i == 1 && (StringUtils.isEmpty(apiKey) || StringUtils.isEmpty(apiSecret))) {
setupData.put(keyName, String.format("Please setup %s and %s", keyName, secretName));
break;
if (gunbotProxyService.isActiveMarket("ETH")) {
checkApiKeysForMarket(setupData, "ETH_");
}
if (StringUtils.isEmpty(apiKey) || StringUtils.isEmpty(apiSecret)) {
break;
if (gunbotProxyService.isActiveMarket("XMR")) {
checkApiKeysForMarket(setupData, "XMR_");
}
try {
gunbotProxyService.analyzeResult(gunbotProxyService.checkTradingKey(apiKey));
setupData.put(keyName, "Looking good!");
} catch (Exception e) {
setupData.put(keyName, e.getMessage());
if (gunbotProxyService.isActiveMarket("USDT")) {
checkApiKeysForMarket(setupData, "USDT_");
}
}
//check if hostfile was setup correctly
try {
InetAddress address = InetAddress.getByName("poloniex.com");
@ -125,4 +106,49 @@ public class CheckSetupController {
}
return setupData;
}
private void checkApiKeysForMarket(Map<String, String> setupData, String market) {
String keyName = String.format("default_%sapiKey", market);
String secretName = String.format("default_%sapiSecret", market);
try {
String apiKey = util.getEnvProperty(keyName);
String apiSecret = util.getEnvProperty(secretName);
if (StringUtils.isEmpty(apiKey) || StringUtils.isEmpty(apiSecret)) {
setupData.put(keyName, String.format("Please setup %s and %s", keyName, secretName));
} else {
String theMarket = market.replace("_", "");
if (StringUtils.isEmpty(theMarket)) {
theMarket = "default";
}
gunbotProxyService.analyzeResult(gunbotProxyService.checkDefaultKey(theMarket));
setupData.put(keyName, "Looking good!");
}
} catch (Exception e) {
setupData.put(keyName, e.getMessage());
}
for (int i = 1; i <= 10; i++) {
keyName = String.format("%sapiKey%d", market, i);
secretName = String.format("%sapiSecret%d", market, i);
String apiKey = util.getEnvProperty(keyName);
String apiSecret = util.getEnvProperty(secretName);
if (i == 1 && (StringUtils.isEmpty(apiKey) || StringUtils.isEmpty(apiSecret))) {
setupData.put(keyName, String.format("Please setup %s and %s", keyName, secretName));
break;
}
if (StringUtils.isEmpty(apiKey) || StringUtils.isEmpty(apiSecret)) {
break;
}
try {
if (StringUtils.isEmpty(market)) {
gunbotProxyService.analyzeResult(gunbotProxyService.checkTradingKey(apiKey));
} else {
gunbotProxyService.analyzeResult(gunbotProxyService.checkMultiMarketTradingKey(apiKey));
}
setupData.put(keyName, "Looking good!");
} catch (Exception e) {
setupData.put(keyName, e.getMessage());
}
}
}
}

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

@ -450,4 +450,11 @@ public class GunbotProxyService {
.onFailedAttempt(this::handleException)
.get(() -> analyzeResult(tradingAPIClient.returnOpenOrders("ALL")));
}
public String checkMultiMarketTradingKey(String apiKey) {
PoloniexTradingAPIClient tradingAPIClient = poloniexMultiMarketTradingAPIClients.get(apiKey);
return Failsafe.with(retryPolicy)
.onFailedAttempt(this::handleException)
.get(() -> analyzeResult(tradingAPIClient.returnOpenOrders("ALL")));
}
}