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

Improve /status message (show Total profit)

Browse Source
This commit is contained in:
Matthias
2023-02-28 19:54:47 +01:00
parent 2f1c5cf143
commit 386915378b
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
freqtrade/rpc/rpc.py
View File

@@ -169,6 +169,7 @@ class RPC:
for trade in trades:
order: Optional[Order] = None
current_profit_fiat: Optional[float] = None
combined_profit_fiat: Optional[float] = None
if trade.open_order_id:
order = trade.select_order_by_order_id(trade.open_order_id)
# calculate profit and send message to user
@@ -190,6 +191,7 @@ class RPC:
current_rate = trade.close_rate
current_profit = trade.close_profit
current_profit_abs = trade.close_profit_abs
combined_profit_abs = trade.realized_profit + current_profit_abs
# Calculate fiat profit
if not isnan(current_profit_abs) and self._fiat_converter:
@@ -198,6 +200,11 @@ class RPC:
self._freqtrade.config['stake_currency'],
self._freqtrade.config['fiat_display_currency']
)
combined_profit_fiat = self._fiat_converter.convert_amount(
combined_profit_abs,
self._freqtrade.config['stake_currency'],
self._freqtrade.config['fiat_display_currency']
)
# Calculate guaranteed profit (in case of trailing stop)
stoploss_entry_dist = trade.calc_profit(trade.stop_loss)
@@ -215,6 +222,8 @@ class RPC:
profit_abs=current_profit_abs,
profit_fiat=current_profit_fiat,
combined_profit_abs=combined_profit_abs,
combined_profit_fiat=combined_profit_fiat,
stoploss_current_dist=stoploss_current_dist,
stoploss_current_dist_ratio=round(stoploss_current_dist_ratio, 8),
stoploss_current_dist_pct=round(stoploss_current_dist_ratio * 100, 2),