Merge pull request knowm#2744 from andre77/gateio-fundshistory

timmolter · web-flow · commit 96dd5d19a0cb · 2018-08-13T08:25:07.000-06:00
[gateio] Added support for funding history
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioAdapters.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioAdapters.java
@@ -13,6 +13,8 @@
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.Order.OrderType;
 import org.knowm.xchange.dto.account.Balance;
+import org.knowm.xchange.dto.account.FundingRecord;
+import org.knowm.xchange.dto.account.FundingRecord.Status;
 import org.knowm.xchange.dto.account.Wallet;
 import org.knowm.xchange.dto.marketdata.OrderBook;
 import org.knowm.xchange.dto.marketdata.Ticker;
@@ -26,6 +28,7 @@
 import org.knowm.xchange.dto.trade.UserTrade;
 import org.knowm.xchange.dto.trade.UserTrades;
 import org.knowm.xchange.gateio.dto.GateioOrderType;
+import org.knowm.xchange.gateio.dto.account.GateioDepositsWithdrawals;
 import org.knowm.xchange.gateio.dto.account.GateioFunds;
 import org.knowm.xchange.gateio.dto.marketdata.GateioDepth;
 import org.knowm.xchange.gateio.dto.marketdata.GateioMarketInfoWrapper.GateioMarketInfo;
@@ -237,4 +240,59 @@ public static ExchangeMetaData adaptToExchangeMetaData(
 
     return exchangeMetaData;
   }
+
+  public static List<FundingRecord> adaptDepositsWithdrawals(
+      GateioDepositsWithdrawals depositsWithdrawals) {
+    List<FundingRecord> result = new ArrayList<>();
+
+    depositsWithdrawals
+        .getDeposits()
+        .forEach(
+            d -> {
+              FundingRecord r =
+                  new FundingRecord(
+                      d.address,
+                      d.getTimestamp(),
+                      Currency.getInstance(d.currency),
+                      d.amount,
+                      d.id,
+                      d.txid,
+                      FundingRecord.Type.DEPOSIT,
+                      status(d.status),
+                      null,
+                      null,
+                      null);
+              result.add(r);
+            });
+    depositsWithdrawals
+        .getWithdraws()
+        .forEach(
+            w -> {
+              FundingRecord r =
+                  new FundingRecord(
+                      w.address,
+                      w.getTimestamp(),
+                      Currency.getInstance(w.currency),
+                      w.amount,
+                      w.id,
+                      w.txid,
+                      FundingRecord.Type.WITHDRAWAL,
+                      status(w.status),
+                      null,
+                      null,
+                      null);
+              result.add(r);
+            });
+
+    return result;
+  }
+
+  private static FundingRecord.Status status(String gateioStatus) {
+    switch (gateioStatus) {
+      case "DONE":
+        return Status.COMPLETE;
+      default:
+        return Status.PROCESSING; // @TODO which statusses are possible at gate.io?
+    }
+  }
 }
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioAuthenticated.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioAuthenticated.java
@@ -11,13 +11,13 @@
 import javax.ws.rs.core.MediaType;
 import org.knowm.xchange.gateio.dto.GateioBaseResponse;
 import org.knowm.xchange.gateio.dto.account.GateioDepositAddress;
+import org.knowm.xchange.gateio.dto.account.GateioDepositsWithdrawals;
 import org.knowm.xchange.gateio.dto.account.GateioFunds;
 import org.knowm.xchange.gateio.dto.trade.GateioOpenOrders;
 import org.knowm.xchange.gateio.dto.trade.GateioOrderStatus;
 import org.knowm.xchange.gateio.dto.trade.GateioPlaceOrderReturn;
 import org.knowm.xchange.gateio.dto.trade.GateioTradeHistoryReturn;
 import si.mazi.rescu.ParamsDigest;
-import si.mazi.rescu.SynchronizedValueFactory;
 
 @Path("api2/1")
 @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@@ -26,10 +26,7 @@ public interface GateioAuthenticated extends Gateio {
 
   @POST
   @Path("private/balances")
-  GateioFunds getFunds(
-      @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+  GateioFunds getFunds(@HeaderParam("KEY") String apiKey, @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 
   @POST
@@ -46,7 +43,7 @@ GateioBaseResponse withdraw(
       @HeaderParam("KEY") String apiKey,
       @HeaderParam("SIGN") ParamsDigest signer,
       @FormParam("currency") String currency,
-      @FormParam("amount") String amount,
+      @FormParam("amount") BigDecimal amount,
       @FormParam("address") String address)
       throws IOException;
 
@@ -56,8 +53,7 @@ GateioBaseResponse cancelOrder(
       @FormParam("orderNumber") String orderNumber,
       @FormParam("currencyPair") String currencyPair,
       @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+      @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 
   @POST
@@ -66,8 +62,7 @@ GateioBaseResponse cancelAllOrders(
       @FormParam("type") String type,
       @FormParam("currencyPair") String currencyPair,
       @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+      @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 
   @POST
@@ -77,8 +72,7 @@ GateioPlaceOrderReturn buy(
       @FormParam("rate") BigDecimal rate,
       @FormParam("amount") BigDecimal amount,
       @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+      @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 
   @POST
@@ -88,33 +82,37 @@ GateioPlaceOrderReturn sell(
       @FormParam("rate") BigDecimal rate,
       @FormParam("amount") BigDecimal amount,
       @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+      @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 
   @POST
   @Path("private/openOrders")
   GateioOpenOrders getOpenOrders(
-      @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+      @HeaderParam("KEY") String apiKey, @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 
   @POST
   @Path("private/tradeHistory")
   GateioTradeHistoryReturn getUserTradeHistory(
       @HeaderParam("KEY") String apiKey,
       @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce,
       @FormParam("currencyPair") String currencyPair)
       throws IOException;
 
+  @POST
+  @Path("private/depositsWithdrawals")
+  GateioDepositsWithdrawals getDepositsWithdrawals(
+      @HeaderParam("KEY") String apiKey,
+      @HeaderParam("SIGN") ParamsDigest signer,
+      @FormParam("start") Long startUnixTime,
+      @FormParam("end") Long endUnixTime)
+      throws IOException;
+
   @POST
   @Path("private/getorder")
   GateioOrderStatus getOrderStatus(
       @FormParam("order_id") String orderId,
       @HeaderParam("KEY") String apiKey,
-      @HeaderParam("SIGN") ParamsDigest signer,
-      @FormParam("nonce") SynchronizedValueFactory<Long> nonce)
+      @HeaderParam("SIGN") ParamsDigest signer)
       throws IOException;
 }
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioExchange.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/GateioExchange.java
@@ -6,19 +6,16 @@
 import org.knowm.xchange.Exchange;
 import org.knowm.xchange.ExchangeSpecification;
 import org.knowm.xchange.currency.CurrencyPair;
+import org.knowm.xchange.exceptions.ExchangeException;
 import org.knowm.xchange.gateio.dto.marketdata.GateioMarketInfoWrapper.GateioMarketInfo;
 import org.knowm.xchange.gateio.service.GateioAccountService;
 import org.knowm.xchange.gateio.service.GateioMarketDataService;
 import org.knowm.xchange.gateio.service.GateioMarketDataServiceRaw;
 import org.knowm.xchange.gateio.service.GateioTradeService;
-import org.knowm.xchange.utils.nonce.AtomicLongIncrementalTime2013NonceFactory;
 import si.mazi.rescu.SynchronizedValueFactory;
 
 public class GateioExchange extends BaseExchange implements Exchange {
 
-  private SynchronizedValueFactory<Long> nonceFactory =
-      new AtomicLongIncrementalTime2013NonceFactory();
-
   @Override
   protected void initServices() {
     this.marketDataService = new GateioMarketDataService(this);
@@ -41,7 +38,7 @@ public ExchangeSpecification getDefaultExchangeSpecification() {
   @Override
   public SynchronizedValueFactory<Long> getNonceFactory() {
 
-    return nonceFactory;
+    throw new ExchangeException("Gate.io does not require a nonce factory.");
   }
 
   @Override
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/dto/account/GateioDeposit.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/dto/account/GateioDeposit.java
@@ -0,0 +1,56 @@
+package org.knowm.xchange.gateio.dto.account;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GateioDeposit {
+
+  public final String id;
+  public final String currency;
+  public final String address;
+  public final BigDecimal amount;
+  public final String txid;
+  public final long timestamp;
+  public final String status;
+
+  public GateioDeposit(
+      @JsonProperty("id") String id,
+      @JsonProperty("currency") String currency,
+      @JsonProperty("address") String address,
+      @JsonProperty("amount") BigDecimal amount,
+      @JsonProperty("txid") String txid,
+      @JsonProperty("timestamp") long timestamp,
+      @JsonProperty("status") String status) {
+    this.id = id;
+    this.currency = currency;
+    this.address = address;
+    this.amount = amount;
+    this.txid = txid;
+    this.timestamp = timestamp;
+    this.status = status;
+  }
+
+  public Date getTimestamp() {
+    return new Date(timestamp * 1000);
+  }
+
+  @Override
+  public String toString() {
+    return "GateioDeposit [id="
+        + id
+        + ", currency="
+        + currency
+        + ", address="
+        + address
+        + ", amount="
+        + amount
+        + ", txid="
+        + txid
+        + ", status="
+        + status
+        + ", getTimestamp()="
+        + getTimestamp()
+        + "]";
+  }
+}
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/dto/account/GateioDepositsWithdrawals.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/dto/account/GateioDepositsWithdrawals.java
@@ -0,0 +1,34 @@
+package org.knowm.xchange.gateio.dto.account;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import org.knowm.xchange.gateio.dto.GateioBaseResponse;
+
+public class GateioDepositsWithdrawals extends GateioBaseResponse {
+
+  private final List<GateioDeposit> deposits;
+  private final List<GateioWithdrawal> withdraws;
+
+  public GateioDepositsWithdrawals(
+      @JsonProperty("result") boolean result,
+      @JsonProperty("deposits") List<GateioDeposit> deposits,
+      @JsonProperty("withdraws") List<GateioWithdrawal> withdraws,
+      @JsonProperty("message") final String message) {
+    super(result, message);
+    this.deposits = deposits;
+    this.withdraws = withdraws;
+  }
+
+  public List<GateioDeposit> getDeposits() {
+    return deposits;
+  }
+
+  public List<GateioWithdrawal> getWithdraws() {
+    return withdraws;
+  }
+
+  @Override
+  public String toString() {
+    return "GateioDepositsWithdrawals [deposits=" + deposits + ", withdraws=" + withdraws + "]";
+  }
+}
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/dto/account/GateioWithdrawal.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/dto/account/GateioWithdrawal.java
@@ -0,0 +1,56 @@
+package org.knowm.xchange.gateio.dto.account;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GateioWithdrawal {
+
+  public final String id;
+  public final String currency;
+  public final String address;
+  public final BigDecimal amount;
+  public final String txid;
+  public final long timestamp;
+  public final String status;
+
+  public GateioWithdrawal(
+      @JsonProperty("id") String id,
+      @JsonProperty("currency") String currency,
+      @JsonProperty("address") String address,
+      @JsonProperty("amount") BigDecimal amount,
+      @JsonProperty("txid") String txid,
+      @JsonProperty("timestamp") long timestamp,
+      @JsonProperty("status") String status) {
+    this.id = id;
+    this.currency = currency;
+    this.address = address;
+    this.amount = amount;
+    this.txid = txid;
+    this.timestamp = timestamp;
+    this.status = status;
+  }
+
+  public Date getTimestamp() {
+    return new Date(timestamp * 1000);
+  }
+
+  @Override
+  public String toString() {
+    return "GateioDeposit [id="
+        + id
+        + ", currency="
+        + currency
+        + ", address="
+        + address
+        + ", amount="
+        + amount
+        + ", txid="
+        + txid
+        + ", status="
+        + status
+        + ", getTimestamp()="
+        + getTimestamp()
+        + "]";
+  }
+}
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioAccountService.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioAccountService.java
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioAccountServiceRaw.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioAccountServiceRaw.java
diff --git a/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioTradeServiceRaw.java b/xchange-gateio/src/main/java/org/knowm/xchange/gateio/service/GateioTradeServiceRaw.java
