Skip to content

Sync fork issue #5144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yanyasha228 wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Sync fork issue #5144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d86b353
New jit
Jul 20, 2024
fb6902a
Binance Fix
Jul 20, 2024
3c2530b
Fix Asset Problem
Jul 20, 2024
3a80690
Merge branch 'knowm:develop' into develop
yanyasha228 Aug 23, 2024
228b84b
Merge branch 'knowm:develop' into develop
yanyasha228 Apr 30, 2025
b66a7e4
Merge branch 'develop' into develop
yanyasha228 Sep 26, 2025
082f6a9
Pom change for Git Repo
Sep 26, 2025
15f6aeb
Installation fix
Sep 26, 2025
8d43ead
Merge branch 'knowm:develop' into develop
yanyasha228 Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceFuturesAuthenticated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ public interface BinanceFuturesAuthenticated extends BinanceFutures {
String SIGNATURE = "signature";
String X_MBX_APIKEY = "X-MBX-APIKEY";

@GET
@Path("fapi/v1/klines")
List<Object[]> klines(
@QueryParam("symbol") String symbol,
@QueryParam("interval") String interval,
@QueryParam("limit") Integer limit,
@QueryParam("startTime") Long startTime,
@QueryParam("endTime") Long endTime)
throws IOException, BinanceException;

/**
* Get current futures account information.
*
Expand Down Expand Up @@ -327,6 +337,17 @@ List<BinanceOrder> futureOpenOrders(
@QueryParam(SIGNATURE) ParamsDigest signature)
throws IOException, BinanceException;


@GET
@Path("fapi/v1/allOrders")
List<BinanceOrder> futureAllOrders(
@QueryParam("symbol") String symbol,
@QueryParam("recvWindow") Long recvWindow,
@QueryParam("timestamp") SynchronizedValueFactory<Long> timestamp,
@HeaderParam(X_MBX_APIKEY) String apiKey,
@QueryParam(SIGNATURE) ParamsDigest signature)
throws IOException, BinanceException;

/**
* Get future open orders on a symbol.
*
Expand Down
2 changes: 1 addition & 1 deletion xchange-binance/src/main/java/org/knowm/xchange/binance/dto/trade/BinanceOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public BinanceOrder(
@JsonProperty("price") BigDecimal price,
@JsonProperty("origQty") BigDecimal origQty,
@JsonProperty("executedQty") BigDecimal executedQty,
@JsonProperty("cummulativeQuoteQty") BigDecimal cummulativeQuoteQty,
@JsonProperty("cumQuote") BigDecimal cummulativeQuoteQty,
@JsonProperty("status") OrderStatus status,
@JsonProperty("timeInForce") TimeInForce timeInForce,
@JsonProperty("type") OrderType type,
Expand Down
3 changes: 2 additions & 1 deletion xchange-binance/src/main/java/org/knowm/xchange/binance/dto/trade/TimeInForce.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ public enum TimeInForce implements IOrderFlags {
GTC,
GTX,
FOK,
IOC;
IOC,
GTE_GTC;
Copy link
Contributor

@rizer1980 rizer1980 Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no GTE_GTC in Binance


@JsonCreator
public static TimeInForce getTimeInForce(String s) {
Expand Down
29 changes: 29 additions & 0 deletions ...-binance/src/main/java/org/knowm/xchange/binance/service/BinanceMarketDataServiceRaw.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,18 @@ public BinanceKline lastKline(CurrencyPair pair, KlineInterval interval) throws
return klines(pair, interval, 1, null, null).stream().collect(StreamUtils.singletonCollector());
}

public BinanceKline lastKline(Instrument pair, KlineInterval interval) throws IOException {
return klines(pair, interval, 1, null, null).stream().collect(StreamUtils.singletonCollector());
}

public List<BinanceKline> klines(CurrencyPair pair, KlineInterval interval) throws IOException {
return klines(pair, interval, null, null, null);
}

public List<BinanceKline> klines(Instrument pair, KlineInterval interval) throws IOException {
return klines(pair, interval, null, null, null);
}

public List<BinanceKline> klines(
CurrencyPair pair, KlineInterval interval, Integer limit, Long startTime, Long endTime)
throws IOException {
Expand All @@ -108,6 +116,27 @@ public List<BinanceKline> klines(
.collect(Collectors.toList());
}

public List<BinanceKline> klines(
Instrument pair, KlineInterval interval, Integer limit, Long startTime, Long endTime)
throws IOException {
List<Object[]> raw =
decorateApiCall(
() ->
(pair instanceof FuturesContract) ?
binanceFutures.klines(
BinanceAdapters.toSymbol(pair), interval.code(), limit, startTime, endTime)

:
binance.klines(
BinanceAdapters.toSymbol(pair), interval.code(), limit, startTime, endTime))
.withRetry(retry("klines"))
.withRateLimiter(rateLimiter(REQUEST_WEIGHT_RATE_LIMITER))
.call();
return raw.stream()
.map(obj -> new BinanceKline(pair, interval, obj))
.collect(Collectors.toList());
}

public List<BinanceTicker24h> ticker24hAllProducts(boolean isFutures) throws IOException {
if(isFutures)
return decorateApiCall(binanceFutures::ticker24h)
Expand Down
27 changes: 27 additions & 0 deletions xchange-binance/src/main/java/org/knowm/xchange/binance/service/BinanceTradeServiceRaw.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,33 @@ public List<BinanceOrder> openOrdersAllProducts() throws BinanceException, IOExc
return openOrdersAllProducts(null);
}

public List<BinanceOrder> allOrders(Instrument pair)
throws BinanceException, IOException {

return decorateApiCall(
() ->
(pair instanceof FuturesContract)
?
binanceFutures.futureAllOrders(
Optional.of(pair).map(BinanceAdapters::toSymbol).orElse(null),
getRecvWindow(),
getTimestampFactory(),
apiKey,
signatureCreator)
: binance.allOrders(
Optional.ofNullable(pair).map(BinanceAdapters::toSymbol).orElse(null),
null,
null,
getRecvWindow(),
getTimestampFactory(),
apiKey,
signatureCreator))
.withRetry(retry("allOrders"))
.withRateLimiter(rateLimiter(REQUEST_WEIGHT_RATE_LIMITER))
.call();

}

public List<BinanceOrder> openOrdersAllProducts(Instrument pair)
throws BinanceException, IOException {
if (exchange.isPortfolioMarginEnabled()) {
Expand Down