From 83b87cb812c14076c154ce8e6f9678e27c3412f2 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 16 Nov 2024 11:54:28 +0100 Subject: [PATCH] feat: add explicit funding_fee_candle_limit for simplified overriding --- freqtrade/exchange/exchange.py | 7 +++++-- freqtrade/exchange/exchange_types.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index 6a17b07e6..a973f4856 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -459,15 +459,18 @@ class Exchange: Exchange ohlcv candle limit Uses ohlcv_candle_limit_per_timeframe if the exchange has different limits per timeframe (e.g. bittrex), otherwise falls back to ohlcv_candle_limit - TODO: this is most likely no longer needed since only bittrex needed this. :param timeframe: Timeframe to check :param candle_type: Candle-type :param since_ms: Starting timestamp :return: Candle limit as integer """ + + fallback_val = self._ft_has.get("ohlcv_candle_limit") + if candle_type == CandleType.FUNDING_RATE: + fallback_val = self._ft_has.get("funding_fee_candle_limit", fallback_val) return int( self._ft_has.get("ohlcv_candle_limit_per_timeframe", {}).get( - timeframe, str(self._ft_has.get("ohlcv_candle_limit")) + timeframe, str(fallback_val) ) ) diff --git a/freqtrade/exchange/exchange_types.py b/freqtrade/exchange/exchange_types.py index 2e490e1bd..69741dc65 100644 --- a/freqtrade/exchange/exchange_types.py +++ b/freqtrade/exchange/exchange_types.py @@ -42,6 +42,7 @@ class FtHas(TypedDict, total=False): mark_ohlcv_price: str mark_ohlcv_timeframe: str funding_fee_timeframe: str + funding_fee_candle_limit: int floor_leverage: bool needs_trading_fees: bool order_props_in_contracts: list[Literal["amount", "cost", "filled", "remaining"]]