From 04d8af24c12cb14508814606ca5a7fc1f23067f6 Mon Sep 17 00:00:00 2001 From: Douggie Date: Mon, 19 Jun 2017 08:40:02 +0100 Subject: [PATCH 1/3] #1528 --- .../src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java index 2f9635d4886..77ad89ead8b 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java @@ -21,7 +21,7 @@ public class PoloniexUtils { public static String toPairString(CurrencyPair currencyPair) { - String pairString = currencyPair.base.getCurrencyCode().toUpperCase() + "_" + currencyPair.counter.getCurrencyCode().toUpperCase(); + String pairString = currencyPair.counter.getCurrencyCode().toUpperCase() + "_" + currencyPair.base.getCurrencyCode().toUpperCase(); return pairString; } From f0d758207e910429b77a5be5e11f607211fa4d07 Mon Sep 17 00:00:00 2001 From: Douggie Date: Mon, 19 Jun 2017 22:36:51 +0100 Subject: [PATCH 2/3] #1528 --- .../main/java/org/knowm/xchange/poloniex/PoloniexUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java index 2f9635d4886..7299f9a007a 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/PoloniexUtils.java @@ -21,14 +21,14 @@ public class PoloniexUtils { public static String toPairString(CurrencyPair currencyPair) { - String pairString = currencyPair.base.getCurrencyCode().toUpperCase() + "_" + currencyPair.counter.getCurrencyCode().toUpperCase(); - return pairString; + return currencyPair.counter.getCurrencyCode().toUpperCase() + "_" + currencyPair.base.getCurrencyCode().toUpperCase(); + // return currencyPair.counter.getCurrencyCode().toUpperCase() + "_" + currencyPair.base.getCurrencyCode().toUpperCase(); } public static CurrencyPair toCurrencyPair(String pair) { String[] currencies = pair.split("_"); - return new CurrencyPair(currencies[1], currencies[0]); + return new CurrencyPair(currencies[1], currencies[0].replace("USDT", "USD")); } public static Date stringToDate(String dateString) { From 4569e2b86c470511a0db744df1ed15daa249dded Mon Sep 17 00:00:00 2001 From: Douggie Date: Tue, 20 Jun 2017 22:58:30 +0100 Subject: [PATCH 3/3] #1231 * Fixed existing functionailty * Correct shorting support --- .../knowm/xchange/poloniex/service/PoloniexTradeService.java | 2 +- .../xchange/poloniex/service/PoloniexTradeServiceRaw.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java index d68fc0e8c5d..48db4a1f15f 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeService.java @@ -78,7 +78,7 @@ public String placeMarketOrder(MarketOrder marketOrder) throws IOException { public String placeLimitOrder(LimitOrder limitOrder) throws IOException { PoloniexTradeResponse response; - if (limitOrder.getType() == OrderType.BID) { + if (limitOrder.getType() == OrderType.BID || limitOrder.getType() == OrderType.EXIT_ASK) { response = buy(limitOrder); } else { response = sell(limitOrder); diff --git a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java index 39247353c1f..985003a8587 100644 --- a/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java +++ b/xchange-poloniex/src/main/java/org/knowm/xchange/poloniex/service/PoloniexTradeServiceRaw.java @@ -104,8 +104,8 @@ private PoloniexTradeResponse orderEntry(LimitOrder limitOrder, String name) thr PoloniexUtils.toPairString(limitOrder.getCurrencyPair()), lendingRate); return response; } else { - Method method = PoloniexAuthenticated.class.getDeclaredMethod("margin" + name.toUpperCase(), String.class, ParamsDigest.class, - SynchronizedValueFactory.class, String.class, String.class, String.class, Integer.class, Integer.class, Integer.class); + Method method = PoloniexAuthenticated.class.getDeclaredMethod(name, String.class, ParamsDigest.class, SynchronizedValueFactory.class, + String.class, String.class, String.class, Integer.class, Integer.class, Integer.class); PoloniexTradeResponse response = (PoloniexTradeResponse) method.invoke(poloniexAuthenticated, apiKey, signatureCreator, exchange.getNonceFactory(), limitOrder.getTradableAmount().toPlainString(), limitOrder.getLimitPrice().toPlainString(), PoloniexUtils.toPairString(limitOrder.getCurrencyPair()), fillOrKill, immediateOrCancel, postOnly);