Don't use all of our money to buy
This commit is contained in:
parent
abf3931f04
commit
315f4c3036
2 changed files with 17 additions and 9 deletions
7
main.py
7
main.py
|
@ -1,5 +1,4 @@
|
||||||
import time, threading
|
import time, threading, pandas, numpy
|
||||||
import pandas
|
|
||||||
|
|
||||||
from api.kraken import Kraken
|
from api.kraken import Kraken
|
||||||
from api.fake import Fake
|
from api.fake import Fake
|
||||||
|
@ -21,7 +20,7 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
#print("Main loop")
|
#print("Main loop")
|
||||||
current_price = float(k.krakenWrapper.get_ticker_information(currency_pair)["c"][0][0])
|
current_price = numpy.float64(k.krakenWrapper.get_ticker_information(currency_pair)["c"][0][0])
|
||||||
new_row = pandas.DataFrame([[current_price]], index=[pandas.to_datetime(time.time(), unit = "s")])
|
new_row = pandas.DataFrame([[current_price]], index=[pandas.to_datetime(time.time(), unit = "s")])
|
||||||
|
|
||||||
k.prices = pandas.concat([k.prices, pandas.DataFrame(new_row)], ignore_index=False)
|
k.prices = pandas.concat([k.prices, pandas.DataFrame(new_row)], ignore_index=False)
|
||||||
|
@ -41,7 +40,7 @@ if __name__ == "__main__":
|
||||||
# If short term goes above long term, buy
|
# If short term goes above long term, buy
|
||||||
if(float(k.shortEMA.tail(1)[0]) > float(k.longEMA.tail(1)[0])):
|
if(float(k.shortEMA.tail(1)[0]) > float(k.longEMA.tail(1)[0])):
|
||||||
print("Buying shit")
|
print("Buying shit")
|
||||||
k.buyOrder(currency_pair, currency_buy, currency_sell, k.balances["vol"][currency_sell] * (1/k.prices.tail(1)[0][0]))
|
k.buyOrder(currency_pair, currency_buy, currency_sell, k.balances["vol"][currency_sell] * 0.95 * (1/k.prices.tail(1)[0][0]))
|
||||||
print(k.balances)
|
print(k.balances)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
19
plot.py
19
plot.py
|
@ -11,14 +11,23 @@ if __name__ == "__main__":
|
||||||
currency_pair = "XXBTZUSD"
|
currency_pair = "XXBTZUSD"
|
||||||
|
|
||||||
k = Kraken()
|
k = Kraken()
|
||||||
print("1")
|
print(1)
|
||||||
k.getBalances()
|
|
||||||
print("2")
|
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
k.getPrices(currency_pair, time=round(time.time())-(24*3600), interval=1)
|
k.getPrices(currency_pair, time=round(time.time())-(24*3600), interval=1)
|
||||||
print("3")
|
print(2)
|
||||||
|
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
current_price = float(k.krakenWrapper.get_ticker_information(currency_pair)["c"][0][0])
|
||||||
|
new_row = pandas.DataFrame([[current_price]], index=[pandas.to_datetime(time.time(), unit = "s")])
|
||||||
|
|
||||||
|
k.prices = pandas.concat([k.prices, pandas.DataFrame(new_row)], ignore_index=False)
|
||||||
|
print(3)
|
||||||
|
|
||||||
k.calculateEMA()
|
k.calculateEMA()
|
||||||
print("4")
|
print(4)
|
||||||
|
|
||||||
plt.plot(k.shortEMA)
|
plt.plot(k.shortEMA)
|
||||||
plt.plot(k.longEMA)
|
plt.plot(k.longEMA)
|
||||||
|
|
Loading…
Reference in a new issue