Merge branch 'develop' into feat/new_args_system

freqtrade/configuration/config_validation.py

@@ -5,7 +5,7 @@ from jsonschema import Draft4Validator, validators
 from jsonschema.exceptions import ValidationError, best_match
 
 from freqtrade import constants, OperationalException
-
+from freqtrade.state import RunMode
 
 logger = logging.getLogger(__name__)
 
@@ -64,6 +64,7 @@ def validate_config_consistency(conf: Dict[str, Any]) -> None:
     # validating trailing stoploss
     _validate_trailing_stoploss(conf)
     _validate_edge(conf)
+    _validate_whitelist(conf)
 
 
 def _validate_trailing_stoploss(conf: Dict[str, Any]) -> None:
@@ -111,3 +112,15 @@ def _validate_edge(conf: Dict[str, Any]) -> None:
             "Edge and VolumePairList are incompatible, "
             "Edge will override whatever pairs VolumePairlist selects."
         )
+
+
+def _validate_whitelist(conf: Dict[str, Any]) -> None:
+    """
+    Dynamic whitelist does not require pair_whitelist to be set - however StaticWhitelist does.
+    """
+    if conf.get('runmode', RunMode.OTHER) in [RunMode.OTHER, RunMode.PLOT]:
+        return
+
+    if (conf.get('pairlist', {}).get('method', 'StaticPairList') == 'StaticPairList'
+       and not conf.get('exchange', {}).get('pair_whitelist')):
+        raise OperationalException("StaticPairList requires pair_whitelist to be set.")

freqtrade/configuration/configuration.py

@@ -183,6 +183,9 @@ class Configuration:
             config['exchange']['name'] = self.args["exchange"]
             logger.info(f"Using exchange {config['exchange']['name']}")
 
+        if 'pair_whitelist' not in config['exchange']:
+            config['exchange']['pair_whitelist'] = []
+
         if 'user_data_dir' in self.args and self.args["user_data_dir"]:
             config.update({'user_data_dir': self.args["user_data_dir"]})
         elif 'user_data_dir' not in config:

freqtrade/configuration/timerange.py

@@ -1,11 +1,14 @@
 """
 This module contains the argument manager class
 """
+import logging
 import re
 from typing import Optional
 
 import arrow
 
+logger = logging.getLogger(__name__)
+
 
 class TimeRange:
     """
@@ -27,6 +30,34 @@ class TimeRange:
         return (self.starttype == other.starttype and self.stoptype == other.stoptype
                 and self.startts == other.startts and self.stopts == other.stopts)
 
+    def subtract_start(self, seconds) -> None:
+        """
+        Subtracts <seconds> from startts if startts is set.
+        :param seconds: Seconds to subtract from starttime
+        :return: None (Modifies the object in place)
+        """
+        if self.startts:
+            self.startts = self.startts - seconds
+
+    def adjust_start_if_necessary(self, ticker_interval_secs: int, startup_candles: int,
+                                  min_date: arrow.Arrow) -> None:
+        """
+        Adjust startts by <startup_candles> candles.
+        Applies only if no startup-candles have been available.
+        :param ticker_interval_secs: Ticker interval in seconds e.g. `timeframe_to_seconds('5m')`
+        :param startup_candles: Number of candles to move start-date forward
+        :param min_date: Minimum data date loaded. Key kriterium to decide if start-time
+                         has to be moved
+        :return: None (Modifies the object in place)
+        """
+        if (not self.starttype or (startup_candles
+                                   and min_date.timestamp >= self.startts)):
+            # If no startts was defined, or backtest-data starts at the defined backtest-date
+            logger.warning("Moving start-date by %s candles to account for startup time.",
+                           startup_candles)
+            self.startts = (min_date.timestamp + ticker_interval_secs * startup_candles)
+            self.starttype = 'date'
+
     @staticmethod
     def parse_timerange(text: Optional[str]):
         """