BTC-E api implemented

br0x · br0x · commit f34bf372ca24 · 2013-11-14T20:05:02.000+02:00
diff --git a/xchange-bitcoincharts/src/main/java/com/xeiam/xchange/bitcoincharts/service/polling/BitcoinChartsPollingMarketDataService.java b/xchange-bitcoincharts/src/main/java/com/xeiam/xchange/bitcoincharts/service/polling/BitcoinChartsPollingMarketDataService.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import com.xeiam.xchange.dto.ExchangeInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -123,7 +124,13 @@ public Trades getTrades(String tradableIdentifier, String currency, Object... ar
     throw new NotAvailableFromExchangeException();
   }
 
-  /**
+  @Override
+  public ExchangeInfo getExchangeInfo() throws IOException {
+
+    return null;
+  }
+
+    /**
    * Verify
    * 
    * @param tradableIdentifier The tradable identifier (e.g. BTC in BTC/USD)
diff --git a/xchange-bitcurex/src/main/java/com/xeiam/xchange/bitcurex/service/polling/BitcurexPollingMarketDataService.java b/xchange-bitcurex/src/main/java/com/xeiam/xchange/bitcurex/service/polling/BitcurexPollingMarketDataService.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import com.xeiam.xchange.dto.ExchangeInfo;
 import si.mazi.rescu.RestProxyFactory;
 
 import com.xeiam.xchange.ExchangeSpecification;
@@ -111,7 +112,13 @@ public Trades getTrades(String tradableIdentifier, String currency, Object... ar
     return BitcurexAdapters.adaptTrades(bitcurexTrades, currency, tradableIdentifier);
   }
 
-  /**
+  @Override
+  public ExchangeInfo getExchangeInfo() throws IOException {
+
+    return null;
+  }
+
+    /**
    * Verify
    * 
    * @param tradableIdentifier The tradable identifier (e.g. BTC in BTC/USD)
diff --git a/xchange-bitstamp/src/main/java/com/xeiam/xchange/bitstamp/service/polling/BitstampPollingMarketDataService.java b/xchange-bitstamp/src/main/java/com/xeiam/xchange/bitstamp/service/polling/BitstampPollingMarketDataService.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import com.xeiam.xchange.dto.ExchangeInfo;
 import si.mazi.rescu.RestProxyFactory;
 
 import com.xeiam.xchange.ExchangeException;
@@ -107,7 +108,13 @@ else if (args.length == 1) {
     return BitstampAdapters.adaptTrades(transactions, tradableIdentifier, currency);
   }
 
-  /**
+  @Override
+  public ExchangeInfo getExchangeInfo() throws IOException {
+
+    return null;
+  }
+
+    /**
    * Verify
    * 
    * @param tradableIdentifier The tradable identifier (e.g. BTC in BTC/USD)
diff --git a/xchange-btcchina/src/main/java/com/xeiam/xchange/btcchina/service/polling/BTCChinaPollingMarketDataService.java b/xchange-btcchina/src/main/java/com/xeiam/xchange/btcchina/service/polling/BTCChinaPollingMarketDataService.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import com.xeiam.xchange.dto.ExchangeInfo;
 import si.mazi.rescu.RestProxyFactory;
 
 import com.xeiam.xchange.ExchangeSpecification;
@@ -112,7 +113,12 @@ public Trades getTrades(String tradableIdentifier, String currency, Object... ar
     return BTCChinaAdapters.adaptTrades(btcChinaTrades, currency, tradableIdentifier);
   }
 
-  /**
+  @Override
+  public ExchangeInfo getExchangeInfo() throws IOException {
+    return null;
+  }
+
+    /**
    * Verify
    * 
    * @param tradableIdentifier The tradable identifier (e.g. BTC in BTC/USD)
diff --git a/xchange-btce/src/main/java/com/xeiam/xchange/btce/BTCE.java b/xchange-btce/src/main/java/com/xeiam/xchange/btce/BTCE.java
@@ -53,10 +53,10 @@ public interface BTCE {
 
   @GET
   @Path("3/depth/{pairs}")
-  BTCEDepthV3 getDepthV3(@PathParam("pairs") String pairs, @DefaultValue("") @QueryParam("limit") int limit, @DefaultValue("1") @QueryParam("ignore_invalid") int ignoreInvalid) throws IOException;
+  BTCEDepthV3 getDepthV3(@PathParam("pairs") String pairs, @DefaultValue("1") @QueryParam("limit") int limit, @DefaultValue("1") @QueryParam("ignore_invalid") int ignoreInvalid) throws IOException;
 
   @GET
   @Path("3/trades/{pairs}")
-  BTCETradesV3 getTradesV3(@PathParam("pairs") String pairs, @DefaultValue("") @QueryParam("limit") int limit, @DefaultValue("1") @QueryParam("ignore_invalid") int ignoreInvalid) throws IOException;
+  BTCETradesV3 getTradesV3(@PathParam("pairs") String pairs, @DefaultValue("1") @QueryParam("limit") int limit, @DefaultValue("1") @QueryParam("ignore_invalid") int ignoreInvalid) throws IOException;
 
 }
diff --git a/xchange-btce/src/main/java/com/xeiam/xchange/btce/BTCEAdapters.java b/xchange-btce/src/main/java/com/xeiam/xchange/btce/BTCEAdapters.java
@@ -22,12 +22,12 @@
 package com.xeiam.xchange.btce;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
+import com.xeiam.xchange.btce.dto.marketdata.BTCEInfoV3;
+import com.xeiam.xchange.currency.CurrencyPair;
+import com.xeiam.xchange.dto.ExchangeInfo;
 import org.joda.money.BigMoney;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.IllegalCurrencyException;
@@ -216,7 +216,17 @@ public static Trades adaptTradeHistory(Map<Long, BTCETradeHistoryResult> tradeHi
       trades.add(new Trade(type, tradableAmount, tradableIdentifier, transactionCurrency, price, timeStamp, entry.getKey()));
     }
     return new Trades(trades);
+  }
+
+  public static ExchangeInfo adaptExchangeInfo(BTCEInfoV3 infoV3) {
 
+    Set<String> btcePairs = infoV3.getPairs().keySet();
+    List<CurrencyPair> pairs = new ArrayList<CurrencyPair>();
+    for (String s : btcePairs) {
+      String[] p = s.split("_");
+      pairs.add(new CurrencyPair(p[0].toUpperCase(), p[1].toUpperCase()));
+    }
+    return new ExchangeInfo(pairs);
   }
 
 }
diff --git a/xchange-btce/src/main/java/com/xeiam/xchange/btce/dto/marketdata/BTCEInfoV3.java b/xchange-btce/src/main/java/com/xeiam/xchange/btce/dto/marketdata/BTCEInfoV3.java
@@ -21,31 +21,40 @@
  */
 package com.xeiam.xchange.btce.dto.marketdata;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Map;
+
 /**
  * Author: brox
- * Since: 11/14/13 1:00 AM
+ *
+ * Takes public BTC-E exchange info, such as valid currency pairs, fees, etc
  */
 public class BTCEInfoV3 {
-    // TODO: implement me
+
+  private final long serverTime;
+  private final Map<String, BTCEPairInfo> pairs;
+
+  public BTCEInfoV3(@JsonProperty("server_time") long serverTime, @JsonProperty("pairs") Map<String, BTCEPairInfo> pairs) {
+
+    this.serverTime = serverTime;
+    this.pairs = pairs;
+  }
+
+  public long getServerTime() {
+
+    return serverTime;
+  }
+
+  public Map<String, BTCEPairInfo> getPairs() {
+
+    return pairs;
+  }
+
+  @Override
+  public String toString() {
+
+    return "BTCEInfoV3 [serverTime=" + serverTime + "pairs=" + pairs.toString() + "]";
+  }
+
 }
-/*
-{"server_time":1384383452,"pairs":{
-"btc_usd":{"decimal_places":3,"min_price":0.1,"max_price":800,"min_amount":0.01,"hidden":0,"fee":0.2},
-"btc_rur":{"decimal_places":5,"min_price":1,"max_price":24000,"min_amount":0.1,"hidden":0,"fee":0.2},
-"btc_eur":{"decimal_places":5,"min_price":0.1,"max_price":800,"min_amount":0.1,"hidden":0,"fee":0.2},
-"ltc_btc":{"decimal_places":5,"min_price":0.0001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"ltc_usd":{"decimal_places":6,"min_price":0.0001,"max_price":100,"min_amount":0.1,"hidden":0,"fee":0.2},
-"ltc_rur":{"decimal_places":5,"min_price":0.1,"max_price":1000,"min_amount":0.1,"hidden":0,"fee":0.2},
-"ltc_eur":{"decimal_places":3,"min_price":0.0001,"max_price":100,"min_amount":0.1,"hidden":0,"fee":0.2},
-"nmc_btc":{"decimal_places":5,"min_price":0.0001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"nmc_usd":{"decimal_places":3,"min_price":0.001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"nvc_btc":{"decimal_places":5,"min_price":0.0001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"nvc_usd":{"decimal_places":3,"min_price":0.001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"usd_rur":{"decimal_places":5,"min_price":25,"max_price":40,"min_amount":0.1,"hidden":0,"fee":0.5},
-"eur_usd":{"decimal_places":5,"min_price":1,"max_price":2,"min_amount":0.1,"hidden":0,"fee":0.2},
-"trc_btc":{"decimal_places":5,"min_price":0.0001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"ppc_btc":{"decimal_places":5,"min_price":0.0001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"ftc_btc":{"decimal_places":5,"min_price":0.00001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2},
-"xpm_btc":{"decimal_places":5,"min_price":0.0001,"max_price":10,"min_amount":0.1,"hidden":0,"fee":0.2}
-}}
-*/
diff --git a/xchange-btce/src/main/java/com/xeiam/xchange/btce/dto/marketdata/BTCEPairInfo.java b/xchange-btce/src/main/java/com/xeiam/xchange/btce/dto/marketdata/BTCEPairInfo.java
@@ -0,0 +1,70 @@
+package com.xeiam.xchange.btce.dto.marketdata;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Author: brox
+ */
+
+public class BTCEPairInfo {
+
+  private final int decimals;
+  private final BigDecimal minPrice;
+  private final BigDecimal maxPrice;
+  private final BigDecimal minAmount;
+  private final int hidden;
+  private final BigDecimal fee;
+
+  public BTCEPairInfo(@JsonProperty("decimal_places") int decimals,
+                      @JsonProperty("min_price") BigDecimal minPrice,
+                      @JsonProperty("max_price") BigDecimal maxPrice,
+                      @JsonProperty("min_amount") BigDecimal minAmount,
+                      @JsonProperty("hidden") int hidden,
+                      @JsonProperty("fee") BigDecimal fee) {
+    this.decimals = decimals;
+    this.minPrice = minPrice;
+    this.maxPrice = maxPrice;
+    this.minAmount = minAmount;
+    this.hidden = hidden;
+    this.fee = fee;
+  }
+
+  public int getDecimals() {
+
+    return decimals;
+  }
+
+  public BigDecimal getMinPrice() {
+
+    return minPrice;
+  }
+
+  public BigDecimal getMaxPrice() {
+
+    return maxPrice;
+  }
+
+  public BigDecimal getMinAmount() {
+
+    return minAmount;
+  }
+
+  public int getHidden() {
+
+    return hidden;
+  }
+
+  public BigDecimal getFee() {
+
+    return fee;
+  }
+
+  @Override
+  public String toString() {
+
+    return "BTCEPairInfo [decimals=" + decimals + ", minPrice=" + minPrice + ", maxPrice=" + maxPrice + ", minAmount=" + minAmount + ", hidden=" + hidden + ", fee=" + fee + "]";
+  }
+
+}
diff --git a/xchange-btce/src/main/java/com/xeiam/xchange/btce/service/polling/BTCEPollingMarketDataService.java b/xchange-btce/src/main/java/com/xeiam/xchange/btce/service/polling/BTCEPollingMarketDataService.java
@@ -24,11 +24,11 @@
 import java.io.IOException;
 import java.util.List;
 
-import com.xeiam.xchange.btce.dto.marketdata.BTCEDepthV3;
+import com.xeiam.xchange.btce.dto.marketdata.*;
+import com.xeiam.xchange.dto.ExchangeInfo;
 import si.mazi.rescu.RestProxyFactory;
 
 import com.xeiam.xchange.ExchangeSpecification;
-import com.xeiam.xchange.NotAvailableFromExchangeException;
 import com.xeiam.xchange.btce.BTCE;
 import com.xeiam.xchange.btce.BTCEAdapters;
 import com.xeiam.xchange.btce.BTCEUtils;
@@ -131,4 +131,10 @@ public List<CurrencyPair> getExchangeSymbols() {
     return BTCEUtils.CURRENCY_PAIRS;
   }
 
+  public ExchangeInfo getExchangeInfo() throws IOException {
+
+    BTCEInfoV3 infoV3 = btce.getInfoV3();
+    return BTCEAdapters.adaptExchangeInfo(infoV3);
+  }
+
 }
diff --git a/xchange-campbx/src/main/java/com/xeiam/xchange/campbx/service/polling/CampBXPollingMarketDataService.java b/xchange-campbx/src/main/java/com/xeiam/xchange/campbx/service/polling/CampBXPollingMarketDataService.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import com.xeiam.xchange.dto.ExchangeInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -107,7 +108,13 @@ public Trades getTrades(String tradableIdentifier, String currency, Object... ar
     throw new NotAvailableFromExchangeException();
   }
 
-  /**
+  @Override
+  public ExchangeInfo getExchangeInfo() throws IOException {
+
+    return null;
+  }
+
+    /**
    * Verify
    * 
    * @param tradableIdentifier The tradable identifier (e.g. BTC in BTC/USD)
diff --git a/xchange-cavirtex/src/main/java/com/xeiam/xchange/virtex/service/polling/VirtExPollingMarketDataService.java b/xchange-cavirtex/src/main/java/com/xeiam/xchange/virtex/service/polling/VirtExPollingMarketDataService.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import com.xeiam.xchange.dto.ExchangeInfo;
 import si.mazi.rescu.RestProxyFactory;
 
 import com.xeiam.xchange.ExchangeSpecification;
@@ -111,7 +112,13 @@ public Trades getTrades(String tradableIdentifier, String currency, Object... ar
     return VirtExAdapters.adaptTrades(virtExTrades, currency, tradableIdentifier);
   }
 
-  /**
+  @Override
+  public ExchangeInfo getExchangeInfo() throws IOException {
+
+    return null;
+  }
+
+    /**
    * Verify
    * 
    * @param tradableIdentifier The tradable identifier (e.g. BTC in BTC/USD)
diff --git a/xchange-core/src/main/java/com/xeiam/xchange/dto/ExchangeInfo.java b/xchange-core/src/main/java/com/xeiam/xchange/dto/ExchangeInfo.java
@@ -0,0 +1,29 @@
+package com.xeiam.xchange.dto;
+
+import com.xeiam.xchange.currency.CurrencyPair;
+
+import java.util.List;
+
+/**
+ * Author: brox
+ *
+ * Returns public info about exchange, such as allowed currency pairs, fees etc.
+ */
+// TODO: implement me
+public class ExchangeInfo {
+
+  private final List<CurrencyPair> pairs;
+
+
+  public ExchangeInfo(List<CurrencyPair> pairs) {
+
+    this.pairs = pairs;
+  }
+
+  @Override
+  public String toString() {
+
+    return "ExchangeInfo [pairs=" + pairs + "]";
+  }
+
+}
diff --git a/xchange-core/src/main/java/com/xeiam/xchange/service/polling/PollingMarketDataService.java b/xchange-core/src/main/java/com/xeiam/xchange/service/polling/PollingMarketDataService.java
@@ -29,6 +29,7 @@
 import com.xeiam.xchange.NotAvailableFromExchangeException;
 import com.xeiam.xchange.NotYetImplementedForExchangeException;
 import com.xeiam.xchange.currency.CurrencyPair;
+import com.xeiam.xchange.dto.ExchangeInfo;
 import com.xeiam.xchange.dto.marketdata.OrderBook;
 import com.xeiam.xchange.dto.marketdata.Ticker;
 import com.xeiam.xchange.dto.marketdata.Trades;
@@ -115,4 +116,14 @@ public interface PollingMarketDataService {
    */
   Trades getTrades(String tradableIdentifier, String currency, Object... args) throws ExchangeException, NotAvailableFromExchangeException, NotYetImplementedForExchangeException, IOException;
 
+  /**
+   * <p>
+   * Get public exchange info, such as allowed currency pairs, fees etc.
+   * </p>
+   *
+   * @return ExchangeInfo object
+   * @throws IOException
+   */
+  public ExchangeInfo getExchangeInfo() throws IOException;
+
 }
diff --git a/xchange-examples/src/main/java/com/xeiam/xchange/examples/btce/marketdata/InfoV3Demo.java b/xchange-examples/src/main/java/com/xeiam/xchange/examples/btce/marketdata/InfoV3Demo.java
diff --git a/xchange-kraken/src/main/java/com/xeiam/xchange/kraken/service/polling/KrakenPollingMarketDataService.java b/xchange-kraken/src/main/java/com/xeiam/xchange/kraken/service/polling/KrakenPollingMarketDataService.java
diff --git a/xchange-mtgox/src/main/java/com/xeiam/xchange/mtgox/v0/service/marketdata/polling/MtGoxPollingMarketDataService.java b/xchange-mtgox/src/main/java/com/xeiam/xchange/mtgox/v0/service/marketdata/polling/MtGoxPollingMarketDataService.java
diff --git a/xchange-mtgox/src/main/java/com/xeiam/xchange/mtgox/v1/service/marketdata/polling/MtGoxPollingMarketDataService.java b/xchange-mtgox/src/main/java/com/xeiam/xchange/mtgox/v1/service/marketdata/polling/MtGoxPollingMarketDataService.java
diff --git a/xchange-mtgox/src/main/java/com/xeiam/xchange/mtgox/v2/service/polling/MtGoxPollingMarketDataService.java b/xchange-mtgox/src/main/java/com/xeiam/xchange/mtgox/v2/service/polling/MtGoxPollingMarketDataService.java
diff --git a/xchange-openexchangerates/src/main/java/com/xeiam/xchange/oer/service/polling/OERPollingMarketDataService.java b/xchange-openexchangerates/src/main/java/com/xeiam/xchange/oer/service/polling/OERPollingMarketDataService.java
