Merge branch 'master' into master

.gitignore

@@ -4,4 +4,4 @@ keys.json
 log.txt 
 .vscode/
 __pycache__
-version.json
+version.json

PumpBot.py

@@ -10,7 +10,7 @@
 import urllib
 import os
 import ssl
-
+import time
 
 # UTILS
 def float_to_string(number, precision=10):
@@ -22,11 +22,9 @@ def log(information):
     currentTime = time.strftime("%H:%M:%S", time.localtime())
     logfile.writelines(str(currentTime) + " --- " + information)
 
-
 # make log file
 logfile = open("log.txt", "w+")
 
-
 # read json file
 try:
     f = open('keys.json', )
@@ -103,7 +101,7 @@ def log(information):
 
 # find amount of bitcoin to use
 try:
-    BTCBalance = float(client.get_asset_balance(asset='BTC')['free'])
+    BTCBalance = float(client.get_asset_balance(asset=coinPair)['free'])
 except (BinanceRequestException, BinanceAPIException):
     log("Invalid API keys.")
     sys.exit("Invalid API keys.")
@@ -125,7 +123,7 @@ def log(information):
                          | |                          
                          (_)                          ''')
 # wait until coin input
-print("\nInvesting amount for BTC: {}".format(BTCtoSell))
+print("\nInvesting amount for BTC: {}".format(float_to_string(BTCtoSell)))
 print("Investing amount in USD: {}".format(float_to_string((in_USD * BTCtoSell), 2)))
 tradingPair = input("\nCoin pair: ").upper() + coinPair
 

config.json

@@ -3,13 +3,6 @@
     "buyLimit": 1.15,
     "percentOfWallet": 25,
     "manualBTC": 0.00000000,
-    "profitMargin": 150,
-    "stopLoss": 0.90,
-
-
-
-
-
-    "comment": "DO NOT EDIT ANYTHING BELOW THIS LINE",
-    "currentVersion": 1
+    "profitMargin": 100,
+    "stopLoss": 0.90
 }