From 01b0a8fa42c42e48a7f3c1992190ddd2030f5642 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sat, 6 Dec 2025 16:15:32 +0100
Subject: [PATCH] fix: 1h should be the default for funding/mark candles

---
 freqtrade/exchange/bitget.py      | 2 --
 freqtrade/exchange/bybit.py       | 2 --
 freqtrade/exchange/exchange.py    | 4 ++--
 freqtrade/exchange/hyperliquid.py | 1 -
 freqtrade/exchange/kraken.py      | 1 -
 freqtrade/exchange/okx.py         | 2 --
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/freqtrade/exchange/bitget.py b/freqtrade/exchange/bitget.py
index aba2aa9b9..f0da55cb0 100644
--- a/freqtrade/exchange/bitget.py
+++ b/freqtrade/exchange/bitget.py
@@ -35,8 +35,6 @@ class Bitget(Exchange):
         "order_time_in_force": ["GTC", "FOK", "IOC", "PO"],
     }
     _ft_has_futures: FtHas = {
-        "mark_ohlcv_timeframe": "1h",
-        "funding_fee_timeframe": "1h",
         "funding_fee_candle_limit": 100,
         "has_delisting": True,
     }
diff --git a/freqtrade/exchange/bybit.py b/freqtrade/exchange/bybit.py
index 3ca44edbe..0184c6c42 100644
--- a/freqtrade/exchange/bybit.py
+++ b/freqtrade/exchange/bybit.py
@@ -38,8 +38,6 @@ class Bybit(Exchange):
     }
     _ft_has_futures: FtHas = {
         "ohlcv_has_history": True,
-        "mark_ohlcv_timeframe": "1h",
-        "funding_fee_timeframe": "1h",
         "funding_fee_candle_limit": 200,
         "stoploss_on_exchange": True,
         "stoploss_order_types": {"limit": "limit", "market": "market"},
diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py
index dd335b784..b5b2bff89 100644
--- a/freqtrade/exchange/exchange.py
+++ b/freqtrade/exchange/exchange.py
@@ -153,8 +153,8 @@ class Exchange:
         "l2_limit_range_required": True,  # Allow Empty L2 limit (kucoin)
         "l2_limit_upper": None,  # Upper limit for L2 limit
         "mark_ohlcv_price": "mark",
-        "mark_ohlcv_timeframe": "8h",
-        "funding_fee_timeframe": "8h",
+        "mark_ohlcv_timeframe": "1h",
+        "funding_fee_timeframe": "1h",
         "ccxt_futures_name": "swap",
         "needs_trading_fees": False,  # use fetch_trading_fees to cache fees
         "order_props_in_contracts": ["amount", "filled", "remaining"],
diff --git a/freqtrade/exchange/hyperliquid.py b/freqtrade/exchange/hyperliquid.py
index 212505b72..c72b79755 100644
--- a/freqtrade/exchange/hyperliquid.py
+++ b/freqtrade/exchange/hyperliquid.py
@@ -37,7 +37,6 @@ class Hyperliquid(Exchange):
         "stoploss_order_types": {"limit": "limit"},
         "stoploss_blocks_assets": False,
         "stop_price_prop": "stopPrice",
-        "funding_fee_timeframe": "1h",
         "funding_fee_candle_limit": 500,
         "uses_leverage_tiers": False,
     }
diff --git a/freqtrade/exchange/kraken.py b/freqtrade/exchange/kraken.py
index 1f8b3cc26..60efdf954 100644
--- a/freqtrade/exchange/kraken.py
+++ b/freqtrade/exchange/kraken.py
@@ -35,7 +35,6 @@ class Kraken(Exchange):
         "trades_pagination_arg": "since",
         "trades_pagination_overlap": False,
         "trades_has_history": True,
-        "mark_ohlcv_timeframe": "4h",
     }
 
     _supported_trading_mode_margin_pairs: list[tuple[TradingMode, MarginMode]] = [
diff --git a/freqtrade/exchange/okx.py b/freqtrade/exchange/okx.py
index c8c1130e5..07760bd32 100644
--- a/freqtrade/exchange/okx.py
+++ b/freqtrade/exchange/okx.py
@@ -29,8 +29,6 @@ class Okx(Exchange):
 
     _ft_has: FtHas = {
         "ohlcv_candle_limit": 100,  # Warning, special case with data prior to X months
-        "mark_ohlcv_timeframe": "4h",
-        "funding_fee_timeframe": "8h",
         "stoploss_order_types": {"limit": "limit"},
         "stoploss_on_exchange": True,
         "trades_has_history": False,  # Endpoint doesn't have a "since" parameter