Fix Sim Sell messages and additional Market checks

Sim Sell messages were showing 0 and modified one more section for checking valid market to allow new base symbols.
room3622 · Dec 7, 2021 · 95ac705 · 95ac705
1 parent f9588ba
commit 95ac705
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/models/TradingAccount.py b/models/TradingAccount.py
@@ -60,15 +60,15 @@ def _checkMarketSyntax(self, market):
             market to check
         """
         if self.app.getExchange() == Exchange.COINBASEPRO and market != "":
-            p = re.compile(r"^[1-9A-Z]{2,5}\-[1-9A-Z]{2,5}$")
+            p = re.compile(r"^[0-9A-Z]{1,10}\-[1-9A-Z]{2,5}$")
             if not p.match(market):
                 raise TypeError("Coinbase Pro market is invalid.")
         elif self.app.getExchange() == Exchange.BINANCE:
-            p = re.compile(r"^[1-9A-Z]{5,12}$")
+            p = re.compile(r"^[0-9A-Z]{4,17}$")
             if not p.match(market):
                 raise TypeError("Binance market is invalid.")
         elif self.app.getExchange() == Exchange.KUCOIN:
-            p = re.compile(r"^[1-9A-Z]{2,5}\-[1-9A-Z]{2,5}$")
+            p = re.compile(r"^[0-9A-Z]{1,10}\-[1-9A-Z]{2,5}$")
             if not p.match(market):
                 raise TypeError("Kucoin market is invalid.")
 

diff --git a/pycryptobot.py b/pycryptobot.py
@@ -456,7 +456,7 @@ def executeJob(
 
                     if (
                         _app.getExchange() == Exchange.COINBASEPRO
-                        or _app.getExchange() == Exchange.COINBASEPRO
+                        or _app.getExchange() == Exchange.KUCOIN
                     ):
                         if _state.last_buy_fee != exchange_last_buy["fee"]:
                             _state.last_buy_fee = exchange_last_buy["fee"]
@@ -1425,7 +1425,7 @@ def executeJob(
                         + ") "
                         + str(current_sim_date)
                         + "\n - TEST SELL at "
-                        + str(_truncate(price_text, 4))
+                        + str(price_text)
                         + " (margin: "
                         + margin_text
                         + ", delta: "