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

Merge branch 'develop' into rpc-refactor

Browse Source
This commit is contained in:
kryofly
2018-01-29 14:33:46 +01:00
parent 9dd7c24eac e6c215104f
commit 9a5414b6eb
17 changed files with 238 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
freqtrade/rpc/__init__.py
View File

@@ -322,7 +322,10 @@ def rpc_balance(fiat_display_currency):
if coin == 'BTC':
currency["Rate"] = 1.0
else:
currency["Rate"] = exchange.get_ticker('BTC_' + coin, False)['bid']
if coin == 'USDT':
currency["Rate"] = 1.0 / exchange.get_ticker('USDT_BTC', False)['bid']
else:
currency["Rate"] = exchange.get_ticker('BTC_' + coin, False)['bid']
currency['BTC'] = currency["Rate"] * currency["Balance"]
total = total + currency['BTC']
output.append({'currency': currency['Currency'],

2
freqtrade/rpc/telegram.py
View File

@@ -244,7 +244,6 @@ def _profit(bot: Bot, update: Update) -> None:
def _balance(bot: Bot, update: Update) -> None:
"""
Handler for /balance
Returns current account balance per crypto
"""
(error, result) = rpc_balance(_CONF['fiat_display_currency'])
if error:
@@ -259,7 +258,6 @@ def _balance(bot: Bot, update: Update) -> None:
*Balance*: {balance}
*Pending*: {pending}
*Est. BTC*: {est_btc: .8f}
""".format(**currency)
output += """*Estimated Value*: