CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 08:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12434 from freqtrade/dependabot/pip/develop/ccxt-4.5.12

Browse Source 
chore(deps): bump ccxt from 4.5.11 to 4.5.12
This commit is contained in:
Matthias
2025-10-27 20:06:12 +01:00
committed by GitHub
parent dc736da971 5ae0328722
commit 609ac560fb
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/exchange/okx.py
View File

@@ -11,7 +11,7 @@ from freqtrade.exceptions import (
RetryableOrderError, RetryableOrderError,
TemporaryError, TemporaryError,
) )
from freqtrade.exchange import Exchange, date_minus_candles from freqtrade.exchange import Exchange
from freqtrade.exchange.common import API_RETRY_COUNT, retrier from freqtrade.exchange.common import API_RETRY_COUNT, retrier
from freqtrade.exchange.exchange_types import CcxtOrder, FtHas from freqtrade.exchange.exchange_types import CcxtOrder, FtHas
from freqtrade.misc import safe_value_fallback2 from freqtrade.misc import safe_value_fallback2
@@ -80,11 +80,6 @@ class Okx(Exchange):
if candle_type in (CandleType.FUTURES, CandleType.SPOT): if candle_type in (CandleType.FUTURES, CandleType.SPOT):
return 300 return 300
if candle_type in (CandleType.MARK, CandleType.PREMIUMINDEX) and (
not since_ms or since_ms > (date_minus_candles(timeframe, 300).timestamp() * 1000)
):
return 300
return super().ohlcv_candle_limit(timeframe, candle_type, since_ms) return super().ohlcv_candle_limit(timeframe, candle_type, since_ms)
@retrier @retrier

2
requirements.txt
View File

@@ -7,7 +7,7 @@ ft-pandas-ta==0.3.16
ta-lib==0.6.8 ta-lib==0.6.8
technical==1.5.3 technical==1.5.3
ccxt==4.5.11 ccxt==4.5.12
cryptography==46.0.3 cryptography==46.0.3
aiohttp==3.13.1 aiohttp==3.13.1
SQLAlchemy==2.0.44 SQLAlchemy==2.0.44

3
tests/exchange/test_exchange.py
View File

@@ -2176,9 +2176,6 @@ def test_get_historic_ohlcv(default_conf, mocker, caplog, exchange_name, candle_
since = date_minus_candles("5m", candle_limit) since = date_minus_candles("5m", candle_limit)
ret = exchange.get_historic_ohlcv(pair, "5m", dt_ts(since), candle_type=candle_type) ret = exchange.get_historic_ohlcv(pair, "5m", dt_ts(since), candle_type=candle_type)
if exchange_name == "okx" and candle_type == "mark":
expected = 4
else:
expected = 2 expected = 2
assert exchange._async_get_candle_history.call_count == expected assert exchange._async_get_candle_history.call_count == expected
# Returns twice the above OHLCV data after truncating the open candle. # Returns twice the above OHLCV data after truncating the open candle.

4
tests/exchange/test_okx.py
View File

@@ -20,7 +20,7 @@ def test_okx_ohlcv_candle_limit(default_conf, mocker):
for timeframe in timeframes: for timeframe in timeframes:
assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT) == 300
assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUTURES) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUTURES) == 300
assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK) == 100
assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUNDING_RATE) == 100 assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUNDING_RATE) == 100
assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT, start_time) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT, start_time) == 300
@@ -36,7 +36,7 @@ def test_okx_ohlcv_candle_limit(default_conf, mocker):
assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT, one_call) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.SPOT, one_call) == 300
assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUTURES, one_call) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.FUTURES, one_call) == 300
assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK, one_call) == 300 assert exchange.ohlcv_candle_limit(timeframe, CandleType.MARK, one_call) == 100
one_call = int( one_call = int(
( (