Merge pull request #5887 from samgermain/common-ccxt-config

Common ccxt config

freqtrade/exchange/bibox.py

@@ -23,6 +23,8 @@ class Bibox(Exchange):
     @property
     def _ccxt_config(self) -> Dict:
         # Parameters to add directly to ccxt sync/async initialization.
-        return {"has": {"fetchCurrencies": False}}
+        config = {"has": {"fetchCurrencies": False}}
+        config.update(super()._ccxt_config)
+        return config
 
     funding_fee_times: List[int] = [0, 8, 16]  # hours of the day

freqtrade/exchange/binance.py

@@ -27,6 +27,7 @@ class Binance(Exchange):
         "trades_pagination": "id",
         "trades_pagination_arg": "fromId",
         "l2_limit_range": [5, 10, 20, 50, 100, 500, 1000],
+        "ccxt_futures_name": "future"
     }
     funding_fee_times: List[int] = [0, 8, 16]  # hours of the day
     # but the schedule won't check within this timeframe
@@ -39,24 +40,6 @@ class Binance(Exchange):
         # (TradingMode.FUTURES, Collateral.ISOLATED)
     ]
 
-    @property
-    def _ccxt_config(self) -> Dict:
-        # Parameters to add directly to ccxt sync/async initialization.
-        if self.trading_mode == TradingMode.MARGIN:
-            return {
-                "options": {
-                    "defaultType": "margin"
-                }
-            }
-        elif self.trading_mode == TradingMode.FUTURES:
-            return {
-                "options": {
-                    "defaultType": "future"
-                }
-            }
-        else:
-            return {}
-
     def stoploss_adjust(self, stop_loss: float, order: Dict, side: str) -> bool:
         """
         Verify stop_loss against stoploss-order value (limit or price)

freqtrade/exchange/bybit.py

@@ -21,6 +21,7 @@ class Bybit(Exchange):
 
     _ft_has: Dict = {
         "ohlcv_candle_limit": 200,
+        "ccxt_futures_name": "linear"
     }
 
     funding_fee_times: List[int] = [0, 8, 16]  # hours of the day

freqtrade/exchange/exchange.py

@@ -69,6 +69,7 @@ class Exchange:
         "trades_pagination_arg": "since",
         "l2_limit_range": None,
         "l2_limit_range_required": True,  # Allow Empty L2 limit (kucoin)
+        "ccxt_futures_name": "swap"
     }
     _ft_has: Dict = {}
 
@@ -234,7 +235,20 @@ class Exchange:
     @property
     def _ccxt_config(self) -> Dict:
         # Parameters to add directly to ccxt sync/async initialization.
-        return {}
+        if self.trading_mode == TradingMode.MARGIN:
+            return {
+                "options": {
+                    "defaultType": "margin"
+                }
+            }
+        elif self.trading_mode == TradingMode.FUTURES:
+            return {
+                "options": {
+                    "defaultType": self._ft_has["ccxt_futures_name"]
+                }
+            }
+        else:
+            return {}
 
     @property
     def name(self) -> str:

freqtrade/exchange/gateio.py

@@ -36,24 +36,6 @@ class Gateio(Exchange):
         # (TradingMode.FUTURES, Collateral.ISOLATED)
     ]
 
-    @property
-    def _ccxt_config(self) -> Dict:
-        # Parameters to add directly to ccxt sync/async initialization.
-        if self.trading_mode == TradingMode.MARGIN:
-            return {
-                "options": {
-                    "defaultType": "margin"
-                }
-            }
-        elif self.trading_mode == TradingMode.FUTURES:
-            return {
-                "options": {
-                    "defaultType": "swap"
-                }
-            }
-        else:
-            return {}
-
     def validate_ordertypes(self, order_types: Dict) -> None:
         super().validate_ordertypes(order_types)
 

freqtrade/exchange/okex.py

@@ -26,21 +26,3 @@ class Okex(Exchange):
         # (TradingMode.FUTURES, Collateral.CROSS),
         # (TradingMode.FUTURES, Collateral.ISOLATED)
     ]
-
-    @property
-    def _ccxt_config(self) -> Dict:
-        # Parameters to add directly to ccxt sync/async initialization.
-        if self.trading_mode == TradingMode.MARGIN:
-            return {
-                "options": {
-                    "defaultType": "margin"
-                }
-            }
-        elif self.trading_mode == TradingMode.FUTURES:
-            return {
-                "options": {
-                    "defaultType": "swap"
-                }
-            }
-        else:
-            return {}

tests/exchange/test_exchange.py

@@ -3253,16 +3253,16 @@ def test_validate_trading_mode_and_collateral(
     ("binance", "spot", {}),
     ("binance", "margin", {"options": {"defaultType": "margin"}}),
     ("binance", "futures", {"options": {"defaultType": "future"}}),
-    ("kraken", "spot", {}),
-    ("kraken", "margin", {}),
-    ("kraken", "futures", {}),
-    ("ftx", "spot", {}),
-    ("ftx", "margin", {}),
-    ("ftx", "futures", {}),
-    ("bittrex", "spot", {}),
-    ("gateio", "spot", {}),
-    ("gateio", "margin", {"options": {"defaultType": "margin"}}),
+    ("bibox", "spot", {"has": {"fetchCurrencies": False}}),
+    ("bibox", "margin", {"has": {"fetchCurrencies": False}, "options": {"defaultType": "margin"}}),
+    ("bibox", "futures", {"has": {"fetchCurrencies": False}, "options": {"defaultType": "swap"}}),
+    ("bybit", "futures", {"options": {"defaultType": "linear"}}),
+    ("ftx", "futures", {"options": {"defaultType": "swap"}}),
     ("gateio", "futures", {"options": {"defaultType": "swap"}}),
+    ("hitbtc", "futures", {"options": {"defaultType": "swap"}}),
+    ("kraken", "futures", {"options": {"defaultType": "swap"}}),
+    ("kucoin", "futures", {"options": {"defaultType": "swap"}}),
+    ("okex", "futures", {"options": {"defaultType": "swap"}}),
 ])
 def test__ccxt_config(
     default_conf,