Update wallet endpoints

pom.xml

@@ -15,6 +15,10 @@
   </licenses>
 
   <properties>
+    <java.version>11</java.version>
+    <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <com.squareup.retrofit2.version>2.4.0</com.squareup.retrofit2.version>
   </properties>
 
@@ -52,11 +56,26 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.7.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

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

@@ -264,28 +264,46 @@ public interface BinanceApiAsyncRestClient {
    * @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, String addressTag, BinanceApiCallback<WithdrawResult> callback);
+  void withdraw(String coin, String clientOrderId, String network, String address, String addressTag,
+                String amount, Boolean feeFlag, String name, BinanceApiCallback<WithdrawResult> callback);
 
   /**
    * Fetch account deposit history.
    *
    * @param callback the callback that handles the response and returns the deposit history
    */
-  void getDepositHistory(String asset, BinanceApiCallback<DepositHistory> callback);
+  void getDepositHistory(String coin, BinanceApiCallback<DepositHistory> callback);
+
+
+  /**
+   * Fetch account deposit history.
+   *
+   * @param callback the callback that handles the response and returns the deposit history
+   */
+  void getDepositHistory(String coin, int status, Long startTime, Long endTime,
+                         int offset, int limit, BinanceApiCallback<DepositHistory> callback);
+
+  /**
+   * Fetch account withdraw history.
+   *
+   * @param callback the callback that handles the response and returns the withdraw history
+   */
+  void getWithdrawHistory(String coin, BinanceApiCallback<WithdrawHistory> callback);
 
   /**
    * Fetch account withdraw history.
    *
    * @param callback the callback that handles the response and returns the withdraw history
    */
-  void getWithdrawHistory(String asset, BinanceApiCallback<WithdrawHistory> callback);
+  void getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
+                          int offset, int limit, BinanceApiCallback<WithdrawHistory> callback);
 
   /**
    * Fetch deposit address.
    *
    * @param callback the callback that handles the response and returns the deposit address
    */
-   void getDepositAddress(String asset, BinanceApiCallback<DepositAddress> callback);
+   void getDepositAddress(String asset, String network, BinanceApiCallback<DepositAddress> callback);
 
   // User stream endpoints
 

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

@@ -11,6 +11,7 @@
 import com.binance.api.client.domain.market.OrderBook;
 import com.binance.api.client.domain.market.TickerPrice;
 import com.binance.api.client.domain.market.TickerStatistics;
+import retrofit2.http.Query;
 
 import java.util.List;
 
@@ -265,13 +266,14 @@ public interface BinanceApiRestClient {
    *
    * Enable Withdrawals option has to be active in the API settings.
    *
-   * @param asset asset symbol to withdraw
+   * @param coin asset symbol to withdraw
    * @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.
    */
-  WithdrawResult withdraw(String asset, String address, String amount, String name, String addressTag);
+  WithdrawResult withdraw(String coin, String clientOrderId, String network, String address, String amount,
+                          String name, String addressTag, Boolean feeFlag);
 
   /**
    * Conver a list of assets to BNB
@@ -284,14 +286,30 @@ public interface BinanceApiRestClient {
    *
    * @return deposit history, containing a list of deposits
    */
-  DepositHistory getDepositHistory(String asset);
+  DepositHistory getDepositHistory(String coin);
+
+  /**
+   * Fetch account deposit history.
+   *
+   * @return deposit history, containing a list of deposits
+   */
+  DepositHistory getDepositHistory(String coin, int status, Long startTime, Long endTime,
+                                   int offset, int limit);
 
   /**
    * Fetch account withdraw history.
    *
    * @return withdraw history, containing a list of withdrawals
    */
-  WithdrawHistory getWithdrawHistory(String asset);
+  WithdrawHistory getWithdrawHistory(String coin);
+
+  /**
+   * Fetch account withdraw history.
+   *
+   * @return withdraw history, containing a list of withdrawals
+   */
+  WithdrawHistory getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
+                                     int offset, int limit);
 
   /**
    * Fetch sub-account transfer history.
@@ -301,11 +319,12 @@ public interface BinanceApiRestClient {
   List<SubAccountTransfer> getSubAccountTransfers();
 
   /**
-   * Fetch deposit address.
-   *
-   * @return deposit address for a given asset.
+   * Fetch deposit address supported network.
+   * @param asset coin property
+   * @param network network property
+   * @return deposit address for given network and asset
    */
-  DepositAddress getDepositAddress(String asset);
+  DepositAddress getDepositAddress(String asset, String network);
 
   // User stream endpoints
 

src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java

@@ -209,26 +209,47 @@ public void getMyTrades(String symbol, BinanceApiCallback<List<Trade>> callback)
   }
 
   @Override
-  public void withdraw(String asset, String address, String amount, String name, String addressTag, BinanceApiCallback<WithdrawResult> callback) {
-    binanceApiService.withdraw(asset, address, amount, name, addressTag, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
+  public void withdraw(String coin, String clientOrderId, String network, String address, String addressTag,
+                       String amount, Boolean feeFlag, String name, BinanceApiCallback<WithdrawResult> callback) {
+    binanceApiService.withdraw(coin, clientOrderId, network, address, addressTag, amount, feeFlag, name,
+            BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
         .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 
+
+  @Override
+  public void getDepositHistory(String coin, BinanceApiCallback<DepositHistory> callback) {
+    binanceApiService.getDepositHistory(coin, 0, null, null, 0, 1000,
+            BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
+            .enqueue(new BinanceApiCallbackAdapter<>(callback));
+  }
+
   @Override
-  public void getDepositHistory(String asset, BinanceApiCallback<DepositHistory> callback) {
-    binanceApiService.getDepositHistory(asset, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
+  public void getDepositHistory(String coin, int status, Long startTime, Long endTime,
+                                int offset, int limit, BinanceApiCallback<DepositHistory> callback) {
+    binanceApiService.getDepositHistory(coin, status, startTime, endTime, offset, limit,
+            BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
         .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 
   @Override
-  public void getWithdrawHistory(String asset, BinanceApiCallback<WithdrawHistory> callback) {
-    binanceApiService.getWithdrawHistory(asset, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
+  public void getWithdrawHistory(String coin, BinanceApiCallback<WithdrawHistory> callback) {
+    binanceApiService.getWithdrawHistory(coin, 0, null, null, 0, 1000,
+            BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
+            .enqueue(new BinanceApiCallbackAdapter<>(callback));
+  }
+
+  @Override
+  public void getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
+                                 int offset, int limit, BinanceApiCallback<WithdrawHistory> callback) {
+    binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, offset, limit,
+            BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
         .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 
   @Override
-  public void getDepositAddress(String asset, BinanceApiCallback<DepositAddress> callback) {
-    binanceApiService.getDepositAddress(asset, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
+  public void getDepositAddress(String asset, String network, BinanceApiCallback<DepositAddress> callback) {
+    binanceApiService.getDepositAddress(asset, network, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
         .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 

src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java

@@ -229,8 +229,10 @@ public List<Trade> getMyTrades(String symbol, Long fromId) {
 	}
 
 	@Override
-	public WithdrawResult withdraw(String asset, String address, String amount, String name, String addressTag) {
-		return executeSync(binanceApiService.withdraw(asset, address, amount, name, addressTag,
+	public WithdrawResult withdraw(String coin, String clientOrderId, String network, String address, String amount,
+								   String name, String addressTag, Boolean feeFlag) {
+		return executeSync(binanceApiService.withdraw(coin, clientOrderId, network, address,
+				addressTag, amount, feeFlag, name,
 				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
 	}
 
@@ -240,15 +242,29 @@ public DustTransferResponse dustTranfer(List<String> asset) {
 	}
 
 	@Override
-	public DepositHistory getDepositHistory(String asset) {
-		return executeSync(binanceApiService.getDepositHistory(asset, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW,
-				System.currentTimeMillis()));
+	public DepositHistory getDepositHistory(String coin) {
+		return executeSync(binanceApiService.getDepositHistory(coin, 0, null, null, 0, 1000,
+				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
 	}
 
 	@Override
-	public WithdrawHistory getWithdrawHistory(String asset) {
-		return executeSync(binanceApiService.getWithdrawHistory(asset, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW,
-				System.currentTimeMillis()));
+	public DepositHistory getDepositHistory(String coin, int status, Long startTime, Long endTime,
+											int offset, int limit) {
+		return executeSync(binanceApiService.getDepositHistory(coin, status, startTime, endTime, offset, limit,
+				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
+	}
+
+	@Override
+	public WithdrawHistory getWithdrawHistory(String coin) {
+		return executeSync(binanceApiService.getWithdrawHistory(coin, 0, null, null, 0, 1000,
+				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
+	}
+
+	@Override
+	public WithdrawHistory getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
+											  int offset, int limit) {
+		return executeSync(binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, offset, limit,
+				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
 	}
 
 	@Override
@@ -257,8 +273,8 @@ public List<SubAccountTransfer> getSubAccountTransfers() {
 	}
 
 	@Override
-	public DepositAddress getDepositAddress(String asset) {
-		return executeSync(binanceApiService.getDepositAddress(asset, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW,
+	public DepositAddress getDepositAddress(String asset, String network) {
+		return executeSync(binanceApiService.getDepositAddress(asset, network, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW,
 				System.currentTimeMillis()));
 	}
 

src/main/java/com/binance/api/client/impl/BinanceApiService.java

@@ -152,22 +152,31 @@ Call<List<Trade>> getMyTrades(@Query("symbol") String symbol, @Query("limit") In
                                   @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
-    @POST("/wapi/v3/withdraw.html")
-    Call<WithdrawResult> withdraw(@Query("asset") String asset, @Query("address") String address, @Query("amount") String amount, @Query("name") String name, @Query("addressTag") String addressTag,
+    @POST("/sapi/v1/capital/withdraw/apply")
+    Call<WithdrawResult> withdraw(@Query("coin") String coin,@Query("withdrawOrderId") String clientOrderId,
+                                  @Query("network") String network, @Query("address") String address,
+                                  @Query("addressTag") String addressTag, @Query("amount") String amount,
+                                  @Query("transactionFeeFlag") Boolean feeFlag, @Query("name") String name,
                                   @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
 
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
-    @GET("/wapi/v3/depositHistory.html")
-    Call<DepositHistory> getDepositHistory(@Query("asset") String asset, @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
+    @GET("/sapi/v1/capital/deposit/hisrec")
+    Call<DepositHistory> getDepositHistory(@Query("coin") String coin, @Query("status") int status,
+                                           @Query("startTime") Long startTime, @Query("endTime") Long endTime,
+                                           @Query("offset") int offset, @Query("limit") int limit,
+                                           @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
-    @GET("/wapi/v3/withdrawHistory.html")
-    Call<WithdrawHistory> getWithdrawHistory(@Query("asset") String asset, @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
+    @GET("/sapi/v1/capital/withdraw/history")
+    Call<WithdrawHistory> getWithdrawHistory(@Query("coin") String coin, @Query("status") int status,
+                                             @Query("startTime") Long startTime, @Query("endTime") Long endTime,
+                                             @Query("offset") int offset, @Query("limit") int limit,
+                                             @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
-    @GET("/wapi/v3/depositAddress.html")
-    Call<DepositAddress> getDepositAddress(@Query("asset") String asset, @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
+    @GET("/sapi/v1/capital/deposit/address")
+    Call<DepositAddress> getDepositAddress(@Query("coin") String asset, @Query("network") String network, @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
     @POST("/sapi/v1/asset/dust")

src/test/java/com/binance/api/examples/AccountEndpointsExample.java

@@ -32,9 +32,9 @@ public static void main(String[] args) {
     System.out.println(client.getDepositHistory("ETH"));
 
     // Get deposit address
-    System.out.println(client.getDepositAddress("ETH"));
+    System.out.println(client.getDepositAddress("ETH", null));
 
     // Withdraw
-    client.withdraw("ETH", "0x123", "0.1", null, null);
+    client.withdraw("ETH", null, "ERC20", "0x123", "0.1", null, null, false);
   }
 }

src/test/java/com/binance/api/examples/AccountEndpointsExampleAsync.java

@@ -26,6 +26,6 @@ public static void main(String[] args) {
     client.getDepositHistory("ETH", response -> System.out.println(response));
 
     // Withdraw (async)
-    client.withdraw("ETH", "0x123", "0.1", null, null, response -> {});
+    client.withdraw("ETH", null, "ERC20", "0x123", null, "0.1", false, null, response -> {});
   }
 }