merge from official

pom.xml

@@ -6,10 +6,16 @@
 
   <groupId>com.binance.api</groupId>
   <artifactId>binance-api-client</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
+  <licenses>
+    <license>
+      <name>The MIT License</name>
+      <url>https://opensource.org/licenses/MIT</url>
+    </license>
+  </licenses>
 
   <properties>
-    <com.squareup.retrofit2.version>2.3.0</com.squareup.retrofit2.version>
+    <com.squareup.retrofit2.version>2.4.0</com.squareup.retrofit2.version>
   </properties>
 
   <dependencies>
@@ -26,17 +32,17 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
+      <version>1.15</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.6</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -54,4 +60,4 @@
     </plugins>
   </build>
 
-</project>
+</project>

src/main/java/com/binance/api/client/BinanceApiAsyncMarginRestClient.java

@@ -0,0 +1,109 @@
+package com.binance.api.client;
+
+import com.binance.api.client.domain.TransferType;
+import com.binance.api.client.domain.account.*;
+import com.binance.api.client.domain.account.request.CancelOrderRequest;
+import com.binance.api.client.domain.account.request.CancelOrderResponse;
+import com.binance.api.client.domain.account.request.OrderRequest;
+import com.binance.api.client.domain.account.request.OrderStatusRequest;
+import com.binance.api.client.domain.event.ListenKey;
+
+import java.util.List;
+
+/**
+ * Binance API façade, supporting asynchronous/non-blocking access Binance's Margin REST API.
+ */
+public interface BinanceApiAsyncMarginRestClient {
+
+  // Account endpoints
+
+  /**
+   * Get current margin account information (async).
+   */
+  void getAccount(Long recvWindow, Long timestamp, BinanceApiCallback<MarginAccount> callback);
+
+  /**
+   * Get current margin account information using default parameters (async).
+   */
+  void getAccount(BinanceApiCallback<MarginAccount> callback);
+
+  /**
+   * Get all open orders on margin account for a symbol (async).
+   *
+   * @param orderRequest order request parameters
+   * @param callback the callback that handles the response
+   */
+  void getOpenOrders(OrderRequest orderRequest, BinanceApiCallback<List<Order>> callback);
+
+  /**
+   * Send in a new margin order (async).
+   *
+   * @param order the new order to submit.
+   * @return a response containing details about the newly placed order.
+   */
+  void newOrder(MarginNewOrder order, BinanceApiCallback<MarginNewOrderResponse> callback);
+
+  /**
+   * Cancel an active margin order (async).
+   *
+   * @param cancelOrderRequest order status request parameters
+   */
+  void cancelOrder(CancelOrderRequest cancelOrderRequest, BinanceApiCallback<CancelOrderResponse> callback);
+
+  /**
+   * Check margin order's status (async).
+   *
+   * @param orderStatusRequest order status request options/filters
+   * @return an order
+   */
+  void getOrderStatus(OrderStatusRequest orderStatusRequest, BinanceApiCallback<Order> callback);
+
+  /**
+   * Get margin trades for a specific symbol (async).
+   *
+   * @param symbol symbol to get trades from
+   * @return a list of trades
+   */
+  void getMyTrades(String symbol, BinanceApiCallback<List<Trade>> callback);
+
+  // User stream endpoints
+
+  /**
+   * Start a new user data stream (async).
+   *
+   * @return a listen key that can be used with data streams
+   */
+  void startUserDataStream(BinanceApiCallback<ListenKey> callback);
+
+  /**
+   * PING a user data stream to prevent a time out (async).
+   *
+   * @param listenKey listen key that identifies a data stream
+   */
+  void keepAliveUserDataStream(String listenKey, BinanceApiCallback<Void> callback);
+
+  /**
+   * Execute transfer between spot account and margin account
+   * @param asset asset to repay
+   * @param amount amount to repay
+   * @return transaction id
+   */
+  void transfer(String asset, String amount, TransferType type, BinanceApiCallback<MarginTransaction> callback);
+
+  /**
+   * Apply for a loan
+   * @param asset asset to repay
+   * @param amount amount to repay
+   * @return transaction id
+   */
+  void borrow(String asset, String amount, BinanceApiCallback<MarginTransaction> callback);
+
+  /**
+   * Repay loan for margin account
+   * @param asset asset to repay
+   * @param amount amount to repay
+   * @return transaction id
+   */
+  void repay(String asset, String amount, BinanceApiCallback<MarginTransaction> callback);
+
+}

src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java

@@ -9,11 +9,14 @@
 import com.binance.api.client.domain.account.Trade;
 import com.binance.api.client.domain.account.TradeHistoryItem;
 import com.binance.api.client.domain.account.WithdrawHistory;
+import com.binance.api.client.domain.account.WithdrawResult;
 import com.binance.api.client.domain.account.request.AllOrdersRequest;
 import com.binance.api.client.domain.account.request.CancelOrderRequest;
+import com.binance.api.client.domain.account.request.CancelOrderResponse;
 import com.binance.api.client.domain.account.request.OrderRequest;
 import com.binance.api.client.domain.account.request.OrderStatusRequest;
 import com.binance.api.client.domain.event.ListenKey;
+import com.binance.api.client.domain.general.Asset;
 import com.binance.api.client.domain.general.ExchangeInfo;
 import com.binance.api.client.domain.general.ServerTime;
 import com.binance.api.client.domain.market.AggTrade;
@@ -27,7 +30,7 @@
 import java.util.List;
 
 /**
- * Binance API façade, supporting asynchronous/non-blocking access Binance's REST API.
+ * Binance API facade, supporting asynchronous/non-blocking access Binance's REST API.
  */
 public interface BinanceApiAsyncRestClient {
 
@@ -48,6 +51,11 @@ public interface BinanceApiAsyncRestClient {
    */
   void getExchangeInfo(BinanceApiCallback<ExchangeInfo> callback);
 
+  /**
+   * ALL supported assets and whether or not they can be withdrawn.
+   */
+  void getAllAssets(BinanceApiCallback<List<Asset>> callback);
+
   // Market Data endpoints
 
   /**
@@ -63,7 +71,7 @@ public interface BinanceApiAsyncRestClient {
    * Get recent trades (up to last 500). Weight: 1
    *
    * @param symbol ticker symbol (e.g. ETHBTC)
-   * @param limit of last trades (Default 500; max 500.)
+   * @param limit of last trades (Default 500; max 1000.)
    * @param callback the callback that handles the response
    */
   void getTrades(String symbol, Integer limit, BinanceApiCallback<List<TradeHistoryItem>> callback);
@@ -72,7 +80,7 @@ public interface BinanceApiAsyncRestClient {
    * Get older trades. Weight: 5
    *
    * @param symbol ticker symbol (e.g. ETHBTC)
-   * @param limit of last trades (Default 500; max 500.)
+   * @param limit of last trades (Default 500; max 1000.)
    * @param fromId TradeId to fetch from. Default gets most recent trades.
    * @param callback the callback that handles the response
    */
@@ -87,7 +95,7 @@ public interface BinanceApiAsyncRestClient {
    *
    * @param symbol symbol to aggregate (mandatory)
    * @param fromId ID to get aggregate trades from INCLUSIVE (optional)
-   * @param limit Default 500; max 500 (optional)
+   * @param limit Default 500; max 1000 (optional)
    * @param startTime Timestamp in ms to get aggregate trades from INCLUSIVE (optional).
    * @param endTime Timestamp in ms to get aggregate trades until INCLUSIVE (optional).
    * @param callback the callback that handles the response
@@ -107,7 +115,7 @@ public interface BinanceApiAsyncRestClient {
    *
    * @param symbol symbol to aggregate (mandatory)
    * @param interval candlestick interval (mandatory)
-   * @param limit Default 500; max 500 (optional)
+   * @param limit Default 500; max 1000 (optional)
    * @param startTime Timestamp in ms to get candlestick bars from INCLUSIVE (optional).
    * @param endTime Timestamp in ms to get candlestick bars until INCLUSIVE (optional).
    * @param callback the callback that handles the response containing a candlestick bar for the given symbol and interval
@@ -190,7 +198,7 @@ public interface BinanceApiAsyncRestClient {
    * @param cancelOrderRequest order status request parameters
    * @param callback the callback that handles the response
    */
-  void cancelOrder(CancelOrderRequest cancelOrderRequest, BinanceApiCallback<Void> callback);
+  void cancelOrder(CancelOrderRequest cancelOrderRequest, BinanceApiCallback<CancelOrderResponse> callback);
 
   /**
    * Get all open orders on a symbol (asynchronous).
@@ -222,7 +230,7 @@ public interface BinanceApiAsyncRestClient {
    * Get trades for a specific account and symbol.
    *
    * @param symbol symbol to get trades from
-   * @param limit default 500; max 500
+   * @param limit default 500; max 1000
    * @param fromId TradeId to fetch from. Default gets most recent trades.
    * @param callback the callback that handles the response with a list of trades
    */
@@ -232,7 +240,7 @@ public interface BinanceApiAsyncRestClient {
    * Get trades for a specific account and symbol.
    *
    * @param symbol symbol to get trades from
-   * @param limit default 500; max 500
+   * @param limit default 500; max 1000
    * @param callback the callback that handles the response with a list of trades
    */
   void getMyTrades(String symbol, Integer limit, BinanceApiCallback<List<Trade>> callback);
@@ -254,8 +262,9 @@ public interface BinanceApiAsyncRestClient {
    * @param address address to withdraw to
    * @param amount amount to withdraw
    * @param name description/alias of the address
+   * @param addressTag Secondary address identifier for coins like XRP,XMR etc.
    */
-  void withdraw(String asset, String address, String amount, String name, BinanceApiCallback<Void> callback);
+  void withdraw(String asset, String address, String amount, String name, String addressTag, BinanceApiCallback<WithdrawResult> callback);
 
   /**
    * Fetch account deposit history.

src/main/java/com/binance/api/client/BinanceApiCallback.java

@@ -1,24 +1,24 @@
-package com.binance.api.client;
-
-/**
- * BinanceApiCallback is a functional interface used together with the BinanceApiAsyncClient to provide a non-blocking REST client.
- *
- * @param <T> the return type from the callback
- */
-@FunctionalInterface
-public interface BinanceApiCallback<T> {
-
-    /**
-     * Called whenever a response comes back from the Binance API.
-     *
-     * @param response the expected response object
-     */
-    void onResponse(T response);
-
-    /**
-     * Called whenever an error occurs.
-     *
-     * @param cause the cause of the failure
-     */
-    default void onFailure(Throwable cause) {}
+package com.binance.api.client;
+
+/**
+ * BinanceApiCallback is a functional interface used together with the BinanceApiAsyncClient to provide a non-blocking REST client.
+ *
+ * @param <T> the return type from the callback
+ */
+@FunctionalInterface
+public interface BinanceApiCallback<T> {
+
+    /**
+     * Called whenever a response comes back from the Binance API.
+     *
+     * @param response the expected response object
+     */
+    void onResponse(T response);
+
+    /**
+     * Called whenever an error occurs.
+     *
+     * @param cause the cause of the failure
+     */
+    default void onFailure(Throwable cause) {}
 }