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

Don't use current rate for closed trades

This commit is contained in:
Matthias 2021-04-17 19:29:34 +02:00
parent 3b53c88dbe
commit 44bfb53668
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
freqtrade/rpc/api_server/api_schemas.py
View File

@ -189,7 +189,6 @@ class OpenTradeSchema(TradeSchema):
stoploss_current_dist_ratio: Optional[float] stoploss_current_dist_ratio: Optional[float]
stoploss_entry_dist: Optional[float] stoploss_entry_dist: Optional[float]
stoploss_entry_dist_ratio: Optional[float] stoploss_entry_dist_ratio: Optional[float]
base_currency: str
current_profit: float current_profit: float
current_profit_abs: float current_profit_abs: float
current_profit_pct: float current_profit_pct: float

11
freqtrade/rpc/rpc.py
View File

@ -167,10 +167,13 @@ class RPC:
if trade.open_order_id: if trade.open_order_id:
order = self._freqtrade.exchange.fetch_order(trade.open_order_id, trade.pair) order = self._freqtrade.exchange.fetch_order(trade.open_order_id, trade.pair)
# calculate profit and send message to user # calculate profit and send message to user
try: if trade.is_open:
current_rate = self._freqtrade.get_sell_rate(trade.pair, False) try:
except (ExchangeError, PricingError): current_rate = self._freqtrade.get_sell_rate(trade.pair, False)
current_rate = NAN except (ExchangeError, PricingError):
current_rate = NAN
else:
current_rate = trade.close_rate
current_profit = trade.calc_profit_ratio(current_rate) current_profit = trade.calc_profit_ratio(current_rate)
current_profit_abs = trade.calc_profit(current_rate) current_profit_abs = trade.calc_profit(current_rate)

1
tests/rpc/test_rpc_apiserver.py
View File

@ -773,7 +773,6 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
assert rc.json()[0] == { assert rc.json()[0] == {
'amount': 123.0, 'amount': 123.0,
'amount_requested': 123.0, 'amount_requested': 123.0,
'base_currency': 'BTC',
'close_date': None, 'close_date': None,
'close_timestamp': None, 'close_timestamp': None,
'close_profit': None, 'close_profit': None,