formatting

This commit is contained in:
Death916 2018-07-10 00:56:47 -07:00
parent 118ce341df
commit 214bcd1f48

View file

@ -1,8 +1,8 @@
#! python3 #! python3
import json import json
from bittrex.bittrex import Bittrex, API_V2_0 from bittrex import Bittrex
from bittrex import Bittrex as trex1
import history as hist import history as hist
amount = 0 amount = 0
@ -14,37 +14,39 @@ with open('D:/code/emailtrade/keys.json') as k:
api_key = keys['api_key'] api_key = keys['api_key']
priv_key = keys['priv_key'] priv_key = keys['priv_key']
ticker = 'BTC-ETH' ticker = 'BTC-ETH'
trex = Bittrex(api_key, priv_key, api_version=API_V2_0) trex = Bittrex(api_key, priv_key)
def marketcheck(ticker): def marketcheck(ticker):
markets = trex.get_latest_candle(ticker, 'fiveMin') markets = trex.get_ticker(ticker)
#price = markets['result']['Ask'] price = markets['result']['Ask']
print(markets) #print(markets)
return price return price
def open_trade(amount): def open_trade(amount):
global buyprice global buyprice
buyprice = marketcheck(ticker) buyprice = marketcheck(ticker)
trex.buy_limit(ticker, amount, rate = buyprice) #print(trex.buy_limit(ticker, amount, rate=price))
print('buying', amount, 'of', ticker) print('buying', amount, 'of', ticker)
hist.tradehist('bought ' + amount + ' of ' + ticker + ' at ' + str(buyprice)) hist.tradehist('bought ' + str(amount) + ' of ' + ticker + ' at ' + str(buyprice))
print(buyprice) print(buyprice)
return
def close_trade(amount): def close_trade(amount):
global sellprice global sellprice
sellprice = marketcheck(ticker) sellprice = marketcheck(ticker)
trex.sell_limit(ticker, amount, rate = None) #print(trex.sell_limit(ticker, amount, rate = None))
print('selling', amount, 'of', ticker) print('selling', amount, 'of', ticker)
hist.tradehist('sold ' + amount + ' of ' + ticker + ' at ' + str(sellprice)) hist.tradehist('sold ' + str(amount) + ' of ' + ticker + ' at ' + str(sellprice))
hist.tradehist('profit = ' + str(sellprice - buyprice)) hist.tradehist('profit = ' + '{:.20f}'.format((sellprice * amount) - (buyprice * amount)))
def open_orders(): def open_orders():
trex.get_open_orders() trex.get_open_orders()
return
#open_trade('.00051') #open_trade('.00051')
#close_trade('1') #close_trade('1')
marketcheck(ticker) #marketcheck(ticker)