diff --git a/src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java b/src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java index 65b307c29..c1f09a801 100755 --- a/src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java +++ b/src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java @@ -244,19 +244,19 @@ public interface BinanceApiAsyncRestClient { */ void getMyTrades(String symbol, BinanceApiCallback> callback); - /** - * Submit a withdraw request. - * - * Enable Withdrawals option has to be active in the API settings. - * - * @param asset 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. - */ - void withdraw(String coin, String clientOrderId, String network, String address, String addressTag, - String amount, Boolean feeFlag, String name, BinanceApiCallback callback); + /** + * Submit a withdraw request. + *

+ * Enable Withdrawals option has to be active in the API settings. + * + * @param coin coin 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. + */ + void withdraw(String coin, String withdrawOrderId, String network, String address, String addressTag, + String amount, Boolean feeFlag, String name, BinanceApiCallback callback); /** * Fetch account deposit history. @@ -266,13 +266,13 @@ void withdraw(String coin, String clientOrderId, String network, String address, void getDepositHistory(String coin, BinanceApiCallback> 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> callback); + /** + * Fetch account deposit history. + * + * @param callback the callback that handles the response and returns the deposit history + */ + void getDepositHistory(String coin, Integer status, Long startTime, Long endTime, + int offset, int limit, BinanceApiCallback> callback); /** * Fetch account withdraw history. @@ -281,13 +281,13 @@ void getDepositHistory(String coin, int status, Long startTime, Long endTime, */ void getWithdrawHistory(String coin, BinanceApiCallback> callback); - /** - * Fetch account withdraw history. - * - * @param callback the callback that handles the response and returns the withdraw history - */ - void getWithdrawHistory(String coin, int status, Long startTime, Long endTime, - int offset, int limit, BinanceApiCallback> callback); + /** + * Fetch account withdraw history. + * + * @param callback the callback that handles the response and returns the withdraw history + */ + void getWithdrawHistory(String coin, Integer status, Long startTime, Long endTime, String withdrawOrderId, + int offset, int limit, BinanceApiCallback> callback); /** * Fetch deposit address. diff --git a/src/main/java/com/binance/api/client/BinanceApiRestClient.java b/src/main/java/com/binance/api/client/BinanceApiRestClient.java index 258344eb8..15a4f463b 100755 --- a/src/main/java/com/binance/api/client/BinanceApiRestClient.java +++ b/src/main/java/com/binance/api/client/BinanceApiRestClient.java @@ -296,13 +296,13 @@ List getDepositHistory(String coin, int status, Long startTime, Long en */ List getWithdrawHistory(String coin); - /** - * Fetch account withdraw history. - * - * @return withdraw history, containing a list of withdrawals - */ - List getWithdrawHistory(String coin, int status, Long startTime, Long endTime, - int offset, int limit); + /** + * Fetch account withdraw history. + * + * @return withdraw history, containing a list of withdrawals + */ + List getWithdrawHistory(String coin, Integer status, Long startTime, Long endTime, String withdrawOrderId, + int offset, int limit); /** * Fetch sub-account transfer history. diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java b/src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java index 25484fe70..87d4499bf 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java @@ -199,44 +199,45 @@ public void getMyTrades(String symbol, BinanceApiCallback> callback) getMyTrades(symbol, null, null, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis(), callback); } - @Override - public void withdraw(String coin, String clientOrderId, String network, String address, String addressTag, - String amount, Boolean feeFlag, String name, BinanceApiCallback callback) { - binanceApiService.withdraw(coin, clientOrderId, network, address, addressTag, amount, feeFlag, name, - BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) - .enqueue(new BinanceApiCallbackAdapter<>(callback)); - } + @Override + public void withdraw(String coin, String withdrawOrderId, String network, String address, String addressTag, + String amount, Boolean feeFlag, String name, BinanceApiCallback callback) { + binanceApiService.withdraw(coin, withdrawOrderId, network, address, addressTag, amount, feeFlag, name, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) + .enqueue(new BinanceApiCallbackAdapter<>(callback)); + } - @Override - public void getDepositHistory(String coin, BinanceApiCallback> callback) { - binanceApiService.getDepositHistory(coin, 0, null, null, 0, 1000, - BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) - .enqueue(new BinanceApiCallbackAdapter<>(callback)); - } + @Override + public void getDepositHistory(String coin, BinanceApiCallback> callback) { + binanceApiService.getDepositHistory(coin, null, null, null, 0, 1000, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) + .enqueue(new BinanceApiCallbackAdapter<>(callback)); + } - @Override - public void getDepositHistory(String coin, int status, Long startTime, Long endTime, - int offset, int limit, BinanceApiCallback> callback) { - binanceApiService.getDepositHistory(coin, status, startTime, endTime, offset, limit, - BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) - .enqueue(new BinanceApiCallbackAdapter<>(callback)); - } + @Override + public void getDepositHistory(String coin, Integer status, Long startTime, Long endTime, + int offset, int limit, BinanceApiCallback> callback) { + binanceApiService.getDepositHistory(coin, status, startTime, endTime, offset, limit, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) + .enqueue(new BinanceApiCallbackAdapter<>(callback)); + } - @Override - public void getWithdrawHistory(String coin, BinanceApiCallback> 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, BinanceApiCallback> callback) { + binanceApiService.getWithdrawHistory(coin, null, null, 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> callback) { - binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, offset, limit, - BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) - .enqueue(new BinanceApiCallbackAdapter<>(callback)); - } + + @Override + public void getWithdrawHistory(String coin, Integer status, Long startTime, Long endTime, String withdrawOrderId, + int offset, int limit, BinanceApiCallback> callback) { + binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, withdrawOrderId, offset, limit, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()) + .enqueue(new BinanceApiCallbackAdapter<>(callback)); + } @Override public void getDepositAddress(String asset, String network, BinanceApiCallback callback) { diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java b/src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java index 69403e076..258023ad8 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java @@ -228,13 +228,13 @@ public List getMyTrades(String symbol, Long fromId) { System.currentTimeMillis()); } - @Override - 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())); - } + @Override + public WithdrawResult withdraw(String coin, String withdrawOrderId, String network, String address, String amount, + String name, String addressTag, Boolean feeFlag) { + return executeSync(binanceApiService.withdraw(coin, withdrawOrderId, network, address, + addressTag, amount, feeFlag, name, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())); + } @Override public DustTransferResponse dustTranfer(List asset) { @@ -254,18 +254,18 @@ public List getDepositHistory(String coin, int status, Long startTime, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())); } - @Override - public List getWithdrawHistory(String coin) { - return executeSync(binanceApiService.getWithdrawHistory(coin, 0, null, null, 0, 1000, - BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())); - } + @Override + public List getWithdrawHistory(String coin) { + return executeSync(binanceApiService.getWithdrawHistory(coin, 0, null, null, null, 0, 1000, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())); + } - @Override - public List 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 + public List getWithdrawHistory(String coin, Integer status, Long startTime, Long endTime, String withdrawOrderId, + int offset, int limit) { + return executeSync(binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, withdrawOrderId, offset, limit, + BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())); + } @Override public List getSubAccountTransfers() { diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiService.java b/src/main/java/com/binance/api/client/impl/BinanceApiService.java index 621886125..20e553f66 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiService.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiService.java @@ -153,7 +153,7 @@ Call> getMyTrades(@Query("symbol") String symbol, @Query("limit") In @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER) @POST("/sapi/v1/capital/withdraw/apply") - Call withdraw(@Query("coin") String coin,@Query("withdrawOrderId") String clientOrderId, + Call withdraw(@Query("coin") String coin, @Query("withdrawOrderId") String withdrawOrderId, @Query("network") String network, @Query("address") String address, @Query("addressTag") String addressTag, @Query("amount") String amount, @Query("transactionFeeFlag") Boolean feeFlag, @Query("name") String name, @@ -162,17 +162,17 @@ Call withdraw(@Query("coin") String coin,@Query("withdrawOrderId @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER) @GET("/sapi/v1/capital/deposit/hisrec") - Call> 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); + Call> getDepositHistory(@Query("coin") String coin, @Query("status") Integer 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("/sapi/v1/capital/withdraw/history") - Call> 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); + Call> getWithdrawHistory(@Query("coin") String coin, @Query("status") Integer status, + @Query("startTime") Long startTime, @Query("endTime") Long endTime, @Query("withdrawOrderId") String withdrawOrderId, + @Query("offset") int offset, @Query("limit") int limit, + @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp); @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER) @GET("/sapi/v1/capital/deposit/address")