don't spend the whole coin balance when selling

freqtrade/rpc/telegram.py

@@ -114,20 +114,18 @@ def _status(bot: Bot, update: Update) -> None:
     if get_state() != State.RUNNING:
         send_msg('*Status:* `trader is not running`', bot=bot)
     elif not trades:
-        send_msg('*Status:* `no active order`', bot=bot)
+        send_msg('*Status:* `no active trade`', bot=bot)
     else:
         for trade in trades:
-            # calculate profit and send message to user
-            current_rate = exchange.get_ticker(trade.pair)['bid']
-            current_profit = 100 * ((current_rate - trade.open_rate) / trade.open_rate)
-            orders = exchange.get_open_orders(trade.pair)
-            orders = [o for o in orders if o['id'] == trade.open_order_id]
-            order = orders[0] if orders else None
-
-            fmt_close_profit = '{:.2f}%'.format(
-                round(trade.close_profit, 2)
-            ) if trade.close_profit else None
-            message = """
+            order = exchange.get_order(trade.open_order_id)
+            if trade.open_rate:
+                # calculate profit and send message to user
+                current_rate = exchange.get_ticker(trade.pair)['bid']
+                current_profit = trade.calc_profit(current_rate)
+                fmt_close_profit = '{:.2f}%'.format(
+                    round(trade.close_profit * 100, 2)
+                ) if trade.close_profit else None
+                message = """
 *Trade ID:* `{trade_id}`
 *Current Pair:* [{pair}]({market_url})
 *Open Since:* `{date}`
@@ -138,19 +136,38 @@ def _status(bot: Bot, update: Update) -> None:
 *Close Profit:* `{close_profit}`
 *Current Profit:* `{current_profit:.2f}%`
 *Open Order:* `{open_order}`
-            """.format(
-                trade_id=trade.id,
-                pair=trade.pair,
-                market_url=exchange.get_pair_detail_url(trade.pair),
-                date=arrow.get(trade.open_date).humanize(),
-                open_rate=trade.open_rate,
-                close_rate=trade.close_rate,
-                current_rate=current_rate,
-                amount=round(trade.amount, 8),
-                close_profit=fmt_close_profit,
-                current_profit=round(current_profit, 2),
-                open_order='{} ({})'.format(order['remaining'], order['type']) if order else None,
-            )
+                """.format(
+                    trade_id=trade.id,
+                    pair=trade.pair,
+                    market_url=exchange.get_pair_detail_url(trade.pair),
+                    date=arrow.get(trade.open_date).humanize(),
+                    open_rate=trade.open_rate,
+                    close_rate=trade.close_rate,
+                    current_rate=current_rate,
+                    amount=round(trade.amount, 8),
+                    close_profit=fmt_close_profit,
+                    current_profit=round(current_profit * 100, 2),
+                    open_order='{} ({})'.format(
+                        order['remaining'], order['type']
+                    ) if order else None,
+                )
+            else:
+                message = """
+*Trade ID:* `{trade_id}`
+*Current Pair:* [{pair}]({market_url})
+*Open Since:* `{date}`
+*Open Order:* `{open_order}`
+
+`Waiting until order is fulfilled.`
+                """.format(
+                    trade_id=trade.id,
+                    pair=trade.pair,
+                    market_url=exchange.get_pair_detail_url(trade.pair),
+                    date=arrow.get(trade.open_date).humanize(),
+                    open_order='{} ({})'.format(
+                        order['remaining'], order['type']
+                    ) if order else None,
+                )
             send_msg(message, bot=bot)
 
 
@@ -169,6 +186,8 @@ def _profit(bot: Bot, update: Update) -> None:
     profits = []
     durations = []
     for trade in trades:
+        if not trade.open_rate:
+            continue
         if trade.close_date:
             durations.append((trade.close_date - trade.open_date).total_seconds())
         if trade.close_profit:
@@ -176,9 +195,9 @@ def _profit(bot: Bot, update: Update) -> None:
         else:
             # Get current rate
             current_rate = exchange.get_ticker(trade.pair)['bid']
-            profit = 100 * ((current_rate - trade.open_rate) / trade.open_rate)
+            profit = trade.calc_profit(current_rate)
 
-        profit_amounts.append((profit / 100) * trade.stake_amount)
+        profit_amounts.append(profit * trade.stake_amount)
         profits.append(profit)
 
     best_pair = Trade.session.query(Trade.pair, func.sum(Trade.close_profit).label('profit_sum')) \
@@ -193,7 +212,7 @@ def _profit(bot: Bot, update: Update) -> None:
 
     bp_pair, bp_rate = best_pair
     markdown_msg = """
-*ROI:* `{profit_btc:.2f} ({profit:.2f}%)`
+*ROI:* `{profit_btc:.6f} ({profit:.2f}%)`
 *Trade Count:* `{trade_count}`
 *First Trade opened:* `{first_trade_date}`
 *Latest Trade opened:* `{latest_trade_date}`
@@ -201,13 +220,13 @@ def _profit(bot: Bot, update: Update) -> None:
 *Best Performing:* `{best_pair}: {best_rate:.2f}%`
     """.format(
         profit_btc=round(sum(profit_amounts), 8),
-        profit=round(sum(profits), 2),
+        profit=round(sum(profits) * 100, 2),
         trade_count=len(trades),
         first_trade_date=arrow.get(trades[0].open_date).humanize(),
         latest_trade_date=arrow.get(trades[-1].open_date).humanize(),
         avg_duration=str(timedelta(seconds=sum(durations) / float(len(durations)))).split('.')[0],
         best_pair=bp_pair,
-        best_rate=round(bp_rate, 2),
+        best_rate=round(bp_rate * 100, 2),
     )
     send_msg(markdown_msg, bot=bot)
 
@@ -291,20 +310,8 @@ def _forcesell(bot: Bot, update: Update) -> None:
             return
         # Get current rate
         current_rate = exchange.get_ticker(trade.pair)['bid']
-        # Get available balance
-        currency = trade.pair.split('_')[1]
-        balance = exchange.get_balance(currency)
-        # Execute sell
-        profit = trade.exec_sell_order(current_rate, balance)
-        message = '*{}:* Selling [{}]({}) at rate `{:f} (profit: {}%)`'.format(
-            trade.exchange,
-            trade.pair.replace('_', '/'),
-            exchange.get_pair_detail_url(trade.pair),
-            trade.close_rate,
-            round(profit, 2)
-        )
-        logger.info(message)
-        send_msg(message)
+        from freqtrade.main import execute_sell
+        execute_sell(trade, current_rate)
 
     except ValueError:
         send_msg('Invalid argument. Usage: `/forcesell <trade_id>`')
@@ -333,7 +340,7 @@ def _performance(bot: Bot, update: Update) -> None:
     stats = '\n'.join('{index}. <code>{pair}\t{profit:.2f}%</code>'.format(
         index=i + 1,
         pair=pair,
-        profit=round(rate, 2)
+        profit=round(rate * 100, 2)
     ) for i, (pair, rate) in enumerate(pair_rates))
 
     message = '<b>Performance:</b>\n{}\n'.format(stats)