From 57ed05a87e839f21a387f185f11cad0536c7b247 Mon Sep 17 00:00:00 2001 From: Fenix Date: Wed, 30 Dec 2020 14:31:39 +0700 Subject: [PATCH 1/5] Add new properties clientTag --- .../domain/account/MarginTransaction.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java b/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java index 116439379..0a7ce61e2 100755 --- a/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java +++ b/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java @@ -1,8 +1,6 @@ package com.binance.api.client.domain.account; -import com.binance.api.client.constant.BinanceApiConstants; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.apache.commons.lang3.builder.ToStringBuilder; /** * MarginTransaction information. @@ -10,6 +8,7 @@ @JsonIgnoreProperties public class MarginTransaction { + private String clientTag; private String tranId; public String getTranId() { @@ -20,10 +19,19 @@ public void setTranId(String tranId) { this.tranId = tranId; } + public String getClientTag() { + return clientTag; + } + + public void setClientTag(String clientTag) { + this.clientTag = clientTag; + } + @Override public String toString() { - return new ToStringBuilder(this, BinanceApiConstants.TO_STRING_BUILDER_STYLE) - .append("transactionId", tranId) - .toString(); + return "MarginTransaction{" + + "clientTag='" + clientTag + '\'' + + ", tranId='" + tranId + '\'' + + '}'; } } From 348c53b38179d7ca7b8e3cedca8a880e7de960c8 Mon Sep 17 00:00:00 2001 From: Fenix Date: Wed, 30 Dec 2020 14:35:01 +0700 Subject: [PATCH 2/5] Updated toString method --- .../api/client/domain/account/MarginTransaction.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java b/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java index 0a7ce61e2..484feb4c6 100755 --- a/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java +++ b/src/main/java/com/binance/api/client/domain/account/MarginTransaction.java @@ -1,6 +1,8 @@ package com.binance.api.client.domain.account; +import com.binance.api.client.constant.BinanceApiConstants; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * MarginTransaction information. @@ -29,9 +31,9 @@ public void setClientTag(String clientTag) { @Override public String toString() { - return "MarginTransaction{" + - "clientTag='" + clientTag + '\'' + - ", tranId='" + tranId + '\'' + - '}'; + return new ToStringBuilder(this, BinanceApiConstants.TO_STRING_BUILDER_STYLE) + .append("transactionId", tranId) + .append("clientTag", clientTag) + .toString(); } } From 50d51d4d11081e7bd2eb9ed74ed35ef9a9aa6dee Mon Sep 17 00:00:00 2001 From: Fenix Date: Tue, 2 Feb 2021 15:06:12 +0700 Subject: [PATCH 3/5] Implement endpoint get all margin orders --- .../api/client/BinanceApiMarginRestClient.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/binance/api/client/BinanceApiMarginRestClient.java b/src/main/java/com/binance/api/client/BinanceApiMarginRestClient.java index 6f100a365..f2d67c923 100755 --- a/src/main/java/com/binance/api/client/BinanceApiMarginRestClient.java +++ b/src/main/java/com/binance/api/client/BinanceApiMarginRestClient.java @@ -2,10 +2,7 @@ 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.account.request.*; import java.util.List; @@ -15,6 +12,13 @@ public interface BinanceApiMarginRestClient { */ MarginAccount getAccount(); + /** + * Get all orders on margin account. + * + * @param orderRequest order request parameters + */ + List getAllOrders(AllOrdersRequest orderRequest); + /** * Get all open orders on margin account for a symbol. * From 7cbbc567a21b6a24b7c5002a1900d7ded63f509d Mon Sep 17 00:00:00 2001 From: Fenix Date: Tue, 2 Feb 2021 15:06:29 +0700 Subject: [PATCH 4/5] Implement endpoint get all margin orders --- .../client/impl/BinanceApiMarginRestClientImpl.java | 12 ++++++++---- .../binance/api/client/impl/BinanceApiService.java | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiMarginRestClientImpl.java b/src/main/java/com/binance/api/client/impl/BinanceApiMarginRestClientImpl.java index 959fa2a5f..fbf448d06 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiMarginRestClientImpl.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiMarginRestClientImpl.java @@ -4,10 +4,7 @@ import com.binance.api.client.constant.BinanceApiConstants; 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.account.request.*; import java.util.List; @@ -58,6 +55,13 @@ public Order getOrderStatus(OrderStatusRequest orderStatusRequest) { orderStatusRequest.getRecvWindow(), orderStatusRequest.getTimestamp())); } + @Override + public List getAllOrders(AllOrdersRequest orderRequest) { + return executeSync(binanceApiService.getAllMarginOrders(orderRequest.getSymbol(), + orderRequest.getOrderId(), orderRequest.getLimit(), + orderRequest.getRecvWindow(), orderRequest.getTimestamp())); + } + @Override public List getMyTrades(String symbol) { return executeSync(binanceApiService.getMyTrades(symbol, null, null, BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())); 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 ede340457..4058fc856 100755 --- a/src/main/java/com/binance/api/client/impl/BinanceApiService.java +++ b/src/main/java/com/binance/api/client/impl/BinanceApiService.java @@ -229,6 +229,11 @@ Call> getMyMarginTrades(@Query("symbol") String symbol, @Query("limi @PUT("/sapi/v1/userDataStream") Call keepAliveMarginUserDataStream(@Query("listenKey") String listenKey); + @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER) + @GET("/sapi/v1/margin/allOrders") + Call> getAllMarginOrders(@Query("symbol") String symbol, @Query("orderId") Long orderId, + @Query("limit") Integer limit, @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp); + // Binance Liquidity Swap Pool endpoints @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_APIKEY_HEADER) From 40ce5ffb8316948706e110aa1b3c2eadbfab4a18 Mon Sep 17 00:00:00 2001 From: fenix Date: Thu, 1 Jul 2021 10:59:54 +0700 Subject: [PATCH 5/5] Add new value for RateLimitType --- .../com/binance/api/client/domain/general/RateLimitType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/binance/api/client/domain/general/RateLimitType.java b/src/main/java/com/binance/api/client/domain/general/RateLimitType.java index 25775dab5..fb5ee0e89 100755 --- a/src/main/java/com/binance/api/client/domain/general/RateLimitType.java +++ b/src/main/java/com/binance/api/client/domain/general/RateLimitType.java @@ -8,5 +8,6 @@ @JsonIgnoreProperties(ignoreUnknown = true) public enum RateLimitType { REQUEST_WEIGHT, - ORDERS + ORDERS, + RAW_REQUESTS }