Merge branch 'develop'

# Conflicts:
#	xchange-cryptopia/src/main/java/org/knowm/xchange/cryptopia/service/CryptopiaMarketDataService.java

Author: NITRO5\Corey

xchange-core/src/main/java/org/knowm/xchange/currency/CurrencyPair.java

@@ -80,9 +80,17 @@ public class CurrencyPair implements Comparable<CurrencyPair>, Serializable {
     public static final CurrencyPair BCH_BTC = new CurrencyPair(Currency.BCH, Currency.BTC);
     public static final CurrencyPair BCH_ETH = new CurrencyPair(Currency.BCH, Currency.ETH);
 
+  public static final CurrencyPair BCA_USD = new CurrencyPair(Currency.BCA, Currency.USD);
+  public static final CurrencyPair BCA_EUR = new CurrencyPair(Currency.BCA, Currency.EUR);
+  public static final CurrencyPair BCA_CNY = new CurrencyPair(Currency.BCA, Currency.CNY);
+  public static final CurrencyPair BCA_JPY = new CurrencyPair(Currency.BCA, Currency.JPY);
+  public static final CurrencyPair BCA_BTC = new CurrencyPair(Currency.BCA, Currency.BTC);
+  public static final CurrencyPair BCA_ETH = new CurrencyPair(Currency.BCA, Currency.ETH);
+
     public static final CurrencyPair ETH_BTC = new CurrencyPair(Currency.ETH, Currency.BTC);
     public static final CurrencyPair ETH_GBP = new CurrencyPair(Currency.ETH, Currency.GBP);
     public static final CurrencyPair ETH_USD = new CurrencyPair(Currency.ETH, Currency.USD);
+  public static final CurrencyPair ETH_USDT = new CurrencyPair(Currency.ETH, Currency.USDT);
     public static final CurrencyPair ETH_EUR = new CurrencyPair(Currency.ETH, Currency.EUR);
     public static final CurrencyPair ETH_JPY = new CurrencyPair(Currency.ETH, Currency.JPY);
     public static final CurrencyPair ETH_CNY = new CurrencyPair(Currency.ETH, Currency.CNY);
@@ -211,6 +219,14 @@ public class CurrencyPair implements Comparable<CurrencyPair>, Serializable {
     public static final CurrencyPair OMG_USD = new CurrencyPair(Currency.OMG, Currency.USD);
     public static final CurrencyPair OMG_BTC = new CurrencyPair(Currency.OMG, Currency.BTC);
     public static final CurrencyPair OMG_ETH = new CurrencyPair(Currency.OMG, Currency.ETH);
+  // end
+
+  // NEO
+  public static final CurrencyPair NEO_USD = new CurrencyPair(Currency.NEO, Currency.USD);
+  public static final CurrencyPair NEO_USDT = new CurrencyPair(Currency.NEO, Currency.USDT);
+  public static final CurrencyPair NEO_BTC = new CurrencyPair(Currency.NEO, Currency.BTC);
+  public static final CurrencyPair NEO_ETH = new CurrencyPair(Currency.NEO, Currency.ETH);
+  // end
 
     // not real currencies, but tradable commodities (GH/s)
     public static final CurrencyPair GHs_BTC = new CurrencyPair(Currency.GHs, Currency.BTC);
@@ -250,6 +266,9 @@ public class CurrencyPair implements Comparable<CurrencyPair>, Serializable {
     public static final CurrencyPair ZEC_USD = new CurrencyPair(Currency.ZEC, Currency.USD);
     public static final CurrencyPair ZEC_BTC = new CurrencyPair(Currency.ZEC, Currency.BTC);
 
+  public static final CurrencyPair ZEN_USD = new CurrencyPair(Currency.ZEN, Currency.USD);
+  public static final CurrencyPair ZEN_BTC = new CurrencyPair(Currency.ZEN, Currency.BTC);
+
     public static final CurrencyPair GNO_ETH = new CurrencyPair(Currency.GNO, Currency.ETH);
     public static final CurrencyPair GNO_BTC = new CurrencyPair(Currency.GNO, Currency.BTC);
 

xchange-cryptopia/src/main/java/org/knowm/xchange/cryptopia/service/CryptopiaMarketDataService.java

@@ -1,5 +1,8 @@
 package org.knowm.xchange.cryptopia.service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.knowm.xchange.Exchange;
 import org.knowm.xchange.cryptopia.CryptopiaAdapters;
 import org.knowm.xchange.cryptopia.CryptopiaExchange;
@@ -9,9 +12,10 @@
 import org.knowm.xchange.dto.marketdata.Ticker;
 import org.knowm.xchange.dto.marketdata.Trades;
 import org.knowm.xchange.service.marketdata.MarketDataService;
+import org.knowm.xchange.service.marketdata.params.CurrencyPairsParam;
 import org.knowm.xchange.service.marketdata.params.Params;
 import org.knowm.xchange.utils.Assert;
-
+import org.knowm.xchange.utils.jackson.CurrencyPairDeserializer;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -37,15 +41,21 @@ public Ticker getTicker(CurrencyPair currencyPair, Object... args) throws IOExce
         return CryptopiaAdapters.adaptTicker(getCryptopiaTicker(currencyPair));
     }
 
-    @Override
-    public List<Ticker> getTickers(Params params) throws IOException {
-        return getCryptopiaMarkets().stream()
-                .map(CryptopiaAdapters::adaptTicker)
-                .collect(Collectors.toList());
+  @Override
+  public List<Ticker> getTickers(Params params) throws IOException {
+    final List<CurrencyPair> currencyPairs = new ArrayList<>();
+    if (params instanceof CurrencyPairsParam) {
+      currencyPairs.addAll(((CurrencyPairsParam) params).getCurrencyPairs());
     }
-
-    private CryptopiaExchange getCryptopiaExchange() {
-        return (CryptopiaExchange) exchange;
+    return getCryptopiaMarkets()
+        .stream()
+        .map(
+            cryptopiaTicker ->
+                CryptopiaAdapters.adaptTicker(
+                    cryptopiaTicker))
+        .filter(
+            ticker -> currencyPairs.size() == 0 || currencyPairs.contains(ticker.getCurrencyPair()))
+        .collect(Collectors.toList());
     }
 
     @Override

xchange-livecoin/src/main/java/org/knowm/xchange/livecoin/LivecoinAdapters.java

@@ -273,15 +273,24 @@ public static List<Wallet> adaptWallets(List<Map> data) {
             String ccy = balance.get("currency").toString();
             String value = balance.get("value").toString();
 
+      // Livecoin has a currency Bricktox (XBT) which is different from XChange Bitcoin (XBT). See
+      // Currency.XBT.
+      // The "get all currencies" call to Livecoin returns all currencies including those with 0
+      // balance.
+      // As a result, XBT overrides BTC, so BTC becomes 0 (in most cases).
+      // Excluding XBT.
+      if (ccy.equals("XBT")) {
+        continue;
+      }
+
             Currency curr = getInstance(ccy);
 
             WalletBuilder builder = wallets.get(curr);
             if (builder == null) {
                 builder = new WalletBuilder(curr);
+        wallets.put(curr, builder);
             }
             builder.add(type, value);
-
-            wallets.put(curr, builder);
         }
 
         List<Wallet> res = new ArrayList<>();