Merge branch 'develop' into BASE64

freqtrade/strategy/resolver.py

@@ -37,6 +37,7 @@ class StrategyResolver(object):
         # Verify the strategy is in the configuration, otherwise fallback to the default strategy
         strategy_name = config.get('strategy') or constants.DEFAULT_STRATEGY
         self.strategy: IStrategy = self._load_strategy(strategy_name,
+                                                       config=config,
                                                        extra_dir=config.get('strategy_path'))
 
         # Set attributes
@@ -44,12 +45,16 @@ class StrategyResolver(object):
         if 'minimal_roi' in config:
             self.strategy.minimal_roi = config['minimal_roi']
             logger.info("Override strategy \'minimal_roi\' with value in config file.")
+        else:
+            config['minimal_roi'] = self.strategy.minimal_roi
 
         if 'stoploss' in config:
             self.strategy.stoploss = config['stoploss']
             logger.info(
                 "Override strategy \'stoploss\' with value in config file: %s.", config['stoploss']
             )
+        else:
+            config['stoploss'] = self.strategy.stoploss
 
         if 'ticker_interval' in config:
             self.strategy.ticker_interval = config['ticker_interval']
@@ -57,6 +62,8 @@ class StrategyResolver(object):
                 "Override strategy \'ticker_interval\' with value in config file: %s.",
                 config['ticker_interval']
             )
+        else:
+            config['ticker_interval'] = self.strategy.ticker_interval
 
         # Sort and apply type conversions
         self.strategy.minimal_roi = OrderedDict(sorted(
@@ -65,10 +72,11 @@ class StrategyResolver(object):
         self.strategy.stoploss = float(self.strategy.stoploss)
 
     def _load_strategy(
-            self, strategy_name: str, extra_dir: Optional[str] = None) -> IStrategy:
+            self, strategy_name: str, config: dict, extra_dir: Optional[str] = None) -> IStrategy:
         """
         Search and loads the specified strategy.
         :param strategy_name: name of the module to import
+        :param config: configuration for the strategy
         :param extra_dir: additional directory to search for the given strategy
         :return: Strategy instance or None
         """
@@ -100,10 +108,17 @@ class StrategyResolver(object):
 
         for path in abs_paths:
             try:
-                strategy = self._search_strategy(path, strategy_name)
+                strategy = self._search_strategy(path, strategy_name=strategy_name, config=config)
                 if strategy:
                     logger.info('Using resolved strategy %s from \'%s\'', strategy_name, path)
-                    return import_strategy(strategy)
+                    strategy._populate_fun_len = len(
+                        inspect.getfullargspec(strategy.populate_indicators).args)
+                    strategy._buy_fun_len = len(
+                        inspect.getfullargspec(strategy.populate_buy_trend).args)
+                    strategy._sell_fun_len = len(
+                        inspect.getfullargspec(strategy.populate_sell_trend).args)
+
+                    return import_strategy(strategy, config=config)
             except FileNotFoundError:
                 logger.warning('Path "%s" does not exist', path)
 
@@ -133,7 +148,7 @@ class StrategyResolver(object):
         return next(valid_strategies_gen, None)
 
     @staticmethod
-    def _search_strategy(directory: str, strategy_name: str) -> Optional[IStrategy]:
+    def _search_strategy(directory: str, strategy_name: str, config: dict) -> Optional[IStrategy]:
         """
         Search for the strategy_name in the given directory
         :param directory: relative or absolute directory path
@@ -149,5 +164,5 @@ class StrategyResolver(object):
                 os.path.abspath(os.path.join(directory, entry)), strategy_name
             )
             if strategy:
-                return strategy()
+                return strategy(config)
         return None