merged remote

freqtrade/rpc/rpc.py

@@ -48,7 +48,7 @@ class RPC(object):
             for trade in trades:
                 order = None
                 if trade.open_order_id:
-                    order = exchange.get_order(trade.open_order_id)
+                    order = exchange.get_order(trade.open_order_id, trade.pair)
                 # calculate profit and send message to user
                 current_rate = exchange.get_ticker(trade.pair, False)['bid']
                 current_profit = trade.calc_profit_percent(current_rate)
@@ -76,8 +76,8 @@ class RPC(object):
                               amount=round(trade.amount, 8),
                               close_profit=fmt_close_profit,
                               current_profit=round(current_profit * 100, 2),
-                              open_order='({} rem={:.8f})'.format(
-                                  order['type'], order['remaining']
+                              open_order='({} {} rem={:.8f})'.format(
+                                  order['type'], order['side'], order['remaining']
                               ) if order else None,
                           )
                 result.append(message)
@@ -246,35 +246,34 @@ class RPC(object):
         """
         :return: current account balance per crypto
         """
-        balances = [
-            c for c in exchange.get_balances()
-            if c['Balance'] or c['Available'] or c['Pending']
-        ]
-        if not balances:
-            return True, '`All balances are zero.`'
-
         output = []
         total = 0.0
-        for currency in balances:
-            coin = currency['Currency']
+        for coin, balance in exchange.get_balances().items():
+            if not balance['total']:
+                continue
+
+            rate = None
             if coin == 'BTC':
-                currency["Rate"] = 1.0
+                rate = 1.0
             else:
                 if coin == 'USDT':
-                    currency["Rate"] = 1.0 / exchange.get_ticker('USDT_BTC', False)['bid']
+                    rate = 1.0 / exchange.get_ticker('BTC/USDT', False)['bid']
                 else:
-                    currency["Rate"] = exchange.get_ticker('BTC_' + coin, False)['bid']
-            currency['BTC'] = currency["Rate"] * currency["Balance"]
-            total = total + currency['BTC']
+                    rate = exchange.get_ticker(coin + '/BTC', False)['bid']
+            est_btc: float = rate * balance['total']
+            total = total + est_btc
             output.append(
                 {
-                    'currency': currency['Currency'],
-                    'available': currency['Available'],
-                    'balance': currency['Balance'],
-                    'pending': currency['Pending'],
-                    'est_btc': currency['BTC']
+                    'currency': coin,
+                    'available': balance['free'],
+                    'balance': balance['total'],
+                    'pending': balance['used'],
+                    'est_btc': est_btc
                 }
             )
+        if total == 0.0:
+            return True, '`All balances are zero.`'
+
         fiat = self.freqtrade.fiat_converter
         symbol = fiat_display_currency
         value = fiat.convert_amount(total, 'BTC', symbol)
@@ -310,17 +309,21 @@ class RPC(object):
         def _exec_forcesell(trade: Trade) -> None:
             # Check if there is there is an open order
             if trade.open_order_id:
-                order = exchange.get_order(trade.open_order_id)
+                order = exchange.get_order(trade.open_order_id, trade.pair)
 
                 # Cancel open LIMIT_BUY orders and close trade
-                if order and not order['closed'] and order['type'] == 'LIMIT_BUY':
-                    exchange.cancel_order(trade.open_order_id)
-                    trade.close(order.get('rate') or trade.open_rate)
+                if order and order['status'] == 'open' \
+                        and order['type'] == 'limit' \
+                        and order['side'] == 'buy':
+                    exchange.cancel_order(trade.open_order_id, trade.pair)
+                    trade.close(order.get('price') or trade.open_rate)
                     # TODO: sell amount which has been bought already
                     return
 
                 # Ignore trades with an attached LIMIT_SELL order
-                if order and not order['closed'] and order['type'] == 'LIMIT_SELL':
+                if order and order['status'] == 'open' \
+                        and order['type'] == 'limit' \
+                        and order['side'] == 'sell':
                     return
 
             # Get current rate and execute sell

freqtrade/rpc/telegram.py

@@ -264,17 +264,15 @@ class Telegram(RPC):
         (currencys, total, symbol, value) = result
         output = ''
         for currency in currencys:
-            output += """*Currency*: {currency}
-    *Available*: {available}
-    *Balance*: {balance}
-    *Pending*: {pending}
-    *Est. BTC*: {est_btc: .8f}
-    """.format(**currency)
+            output += "*{currency}:*\n" \
+                      "\t`Available: {available: .8f}`\n" \
+                      "\t`Balance: {balance: .8f}`\n" \
+                      "\t`Pending: {pending: .8f}`\n" \
+                      "\t`Est. BTC: {est_btc: .8f}`\n".format(**currency)
 
-        output += """*Estimated Value*:
-    *BTC*: {0: .8f}
-    *{1}*: {2: .2f}
-    """.format(total, symbol, value)
+        output += "\n*Estimated Value*:\n" \
+                  "\t`BTC: {0: .8f}`\n" \
+                  "\t`{1}: {2: .2f}`\n".format(total, symbol, value)
         self.send_msg(output)
 
     @authorized_only