Merge branch 'develop' of https://github.com/Surfableio/freqtrade into develop

freqtrade/templates/subtemplates/strategy_methods_advanced.j2

@@ -161,6 +161,7 @@ def confirm_trade_entry(self, pair: str, order_type: str, amount: float, rate: f
     :param order_type: Order type (as configured in order_types). usually limit or market.
     :param amount: Amount in target (base) currency that's going to be traded.
     :param rate: Rate that's going to be used when using limit orders
+                 or current rate for market orders.
     :param time_in_force: Time in force. Defaults to GTC (Good-til-cancelled).
     :param current_time: datetime object, containing the current datetime
     :param entry_tag: Optional entry_tag (buy_tag) if provided with the buy signal.
@@ -188,6 +189,7 @@ def confirm_trade_exit(self, pair: str, trade: 'Trade', order_type: str, amount:
     :param order_type: Order type (as configured in order_types). usually limit or market.
     :param amount: Amount in base currency.
     :param rate: Rate that's going to be used when using limit orders
+                 or current rate for market orders.
     :param time_in_force: Time in force. Defaults to GTC (Good-til-cancelled).
     :param exit_reason: Exit reason.
         Can be any of ['roi', 'stop_loss', 'stoploss_on_exchange', 'trailing_stop_loss',
@@ -267,8 +269,8 @@ def adjust_trade_position(self, trade: 'Trade', current_time: 'datetime',
     return None
 
 def leverage(self, pair: str, current_time: datetime, current_rate: float,
-                proposed_leverage: float, max_leverage: float, side: str,
-                **kwargs) -> float:
+             proposed_leverage: float, max_leverage: float, entry_tag: Optional[str],
+             side: str, **kwargs) -> float:
     """
     Customize leverage for each new trade. This method is only called in futures mode.
 
@@ -277,6 +279,7 @@ def leverage(self, pair: str, current_time: datetime, current_rate: float,
     :param current_rate: Rate, calculated based on pricing settings in exit_pricing.
     :param proposed_leverage: A leverage proposed by the bot.
     :param max_leverage: Max leverage allowed on this pair
+    :param entry_tag: Optional entry_tag (buy_tag) if provided with the buy signal.
     :param side: 'long' or 'short' - indicating the direction of the proposed trade
     :return: A leverage amount, which is between 1.0 and max_leverage.
     """