adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proper fee for DCA entries

Browse Source
This commit is contained in:
Matthias 2022-03-27 17:00:45 +02:00
parent 30cff1bd2c
commit d1f61c4cf9
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
freqtrade/freqtradebot.py
View File

@ -511,7 +511,7 @@ class FreqtradeBot(LoggingMixin):
return return
else: else:
logger.debug("Max adjustment entries is set to unlimited.") logger.debug("Max adjustment entries is set to unlimited.")
current_rate = self.exchange.get_rate(trade.pair, refresh=True, side="buy") current_rate = self.exchange.get_rate(trade.pair, refresh=True, side=trade.enter_side)
current_profit = trade.calc_profit_ratio(current_rate) current_profit = trade.calc_profit_ratio(current_rate)
min_stake_amount = self.exchange.get_min_pair_stake_amount(trade.pair, min_stake_amount = self.exchange.get_min_pair_stake_amount(trade.pair,
@ -536,12 +536,7 @@ class FreqtradeBot(LoggingMixin):
logger.error(f"Unable to decrease trade position / sell partially" logger.error(f"Unable to decrease trade position / sell partially"
f" for pair {trade.pair}, feature not implemented.") f" for pair {trade.pair}, feature not implemented.")
def _check_depth_of_market( def _check_depth_of_market(self, pair: str, conf: Dict, side: SignalDirection) -> bool:
self,
pair: str,
conf: Dict,
side: SignalDirection
) -> bool:
""" """
Checks depth of market before executing a buy Checks depth of market before executing a buy
""" """

3
tests/test_integration.py
View File

@ -311,8 +311,7 @@ def test_dca_short(default_conf_usdt, ticker_usdt, fee, mocker) -> None:
# Reduce bid amount # Reduce bid amount
ticker_usdt_modif = ticker_usdt.return_value ticker_usdt_modif = ticker_usdt.return_value
ticker_usdt_modif['ask'] = ticker_usdt_modif['ask'] * 1.015 ticker_usdt_modif['ask'] = ticker_usdt_modif['ask'] * 1.004
ticker_usdt_modif['bid'] = ticker_usdt_modif['bid'] * 1.0125
mocker.patch('freqtrade.exchange.Exchange.fetch_ticker', return_value=ticker_usdt_modif) mocker.patch('freqtrade.exchange.Exchange.fetch_ticker', return_value=ticker_usdt_modif)
# additional buy order # additional buy order