diff --git a/exchange_wrapper.py b/exchange_wrapper.py index 1efb1ea..b2b3f75 100755 --- a/exchange_wrapper.py +++ b/exchange_wrapper.py @@ -109,29 +109,6 @@ class broker: return 1 - # def return_last_n_deals_timestamps(self, pair, amount, no_retries=False): - # ''' - # Returns a list containing the last n deals timestamps. - # ''' - - # retries = self.retries - # while retries>0: - # try: - # database_connection = sqlite3.connect("profits/profits_database.db") - # database_cursor = database_connection.cursor() - # database_cursor.execute(f"SELECT * FROM profits_table WHERE pair = '{pair}' ORDER BY timestamp DESC LIMIT {amount};") - # rows = database_cursor.fetchall() - # database_connection.close() - # return [item[0] for item in rows] - # except Exception as e: - # self.logger.log_this(f"Exception in return_last_n_deals_timestamps: {e}",1) - # if no_retries: - # break - # retries-=1 - # time.sleep(self.wait_time) - # return [] - - def check_for_duplicate_profit_in_db(self,order,no_retries=False): ''' SQLite implementation of check_for_duplicate_profit(): @@ -728,16 +705,6 @@ class broker: if side=="buy": to_buy = float(size) if not amount_in_base: - #order_book = self.get_order_book(symbol) - #if order_book=={}: - # self.logger.log_this(f"new_market_order - Orderbook request returned an empty dictionary - Not using orderbook. Switching to a less precise method.",1,symbol) - # price = self.get_ticker_price(symbol) - #else: - # price = self.average_price_depth(order_book,size,side) - # if price is None: - # #Something failed, back to the basics - # self.logger.log_this(f"new_market_order - average_price_depth returned None. Switching to a less precise method.",1,symbol) - # price = self.get_ticker_price(symbol) to_buy = float(size)/self.get_top_ask_price(pair) amount = self.amount_to_precision(pair,to_buy) else: @@ -746,12 +713,6 @@ class broker: order_to_send = self.exchange.create_order(pair,"market",side,amount) time.sleep(self.wait_time) return self.get_order(order_to_send["id"],pair) - # Because Kucoin "order does not exist" problem - #if order_to_send["amount"] is not None: # - # return self.get_order(order_to_send["id"],pair) # - #self.logger.log_this(f"Error sending order: Null order returned",2,pair) # - #self.cancel_order(order_to_send["id"],symbol,no_retries=True) # - #retries-=1 # except Exception as e: self.logger.log_this(f"Exception in new_market_order: {e}",1,pair) if no_retries: @@ -1039,19 +1000,5 @@ class logger: self.send_tg_message(f"{self.broker_config['exchange'].capitalize()} | {pair_data}{message}",ignore_config=level==-1) return 0 - - - #def log_this_API_fail(self,message): - # ''' - # Records the message object to a log file. - # ''' - # - # try: - # with open(f"logs/{self.exchange_name}.api_errors.log","a") as log_file: - # log_file.write(message+"\n") - # except Exception as e: - # print("Can't write API log file") - # print(e) - # - # return 0 + \ No newline at end of file diff --git a/trader.py b/trader.py index 8c5fd78..a14109d 100755 --- a/trader.py +++ b/trader.py @@ -1748,76 +1748,4 @@ class trader: self.status_dict["pause_reason"] = "" self.update_status(True) return 0 - - -''' -class imported_trader(trader): - def __init__(self,broker,config_file,status_file): - self.broker = broker - self.config_dict = config_file - self.status_dict = status_file - self.restart = False - self.last_time_seen = time.time() - self.pair = self.config_dict["pair"] - self.market = self.broker.fetch_market(self.pair) - self.market_load_time = int(time.time()) - self.market_reload_period = 86400 - if self.load_values()==1: - self.broker.logger.log_this("Error loading values",2,self.pair) - self.quit = True - self.warnings = { - "short_price_exceeds_old_long": False, - "speol_notified": False - } - self.update_status(True) - - def load_values(self): - self.is_short = self.config_dict["is_short"] - self.base,self.quote = self.pair.split("/") - self.tp_order = self.broker.get_order(self.status_dict["tp_order_id"],self.pair) - if self.status_dict["so_order_id"]=="": - self.so = self.broker.get_empty_order() - else: - self.so = self.broker.get_order(self.status_dict["so_order_id"],self.pair) - self.total_amount_of_quote = self.status_dict["quote_spent"] - self.total_amount_of_base = self.status_dict["base_bought"] - self.safety_order_index = self.status_dict["so_amount"] - self.config_dict["no_of_safety_orders"] = self.status_dict["no_of_safety_orders"] #If this is not loaded from status_dict, it will ignore if safety orders were added - #at runtime. - self.take_profit_price = self.status_dict["take_profit_price"] - self.safety_price_table = self.status_dict["safety_price_table"] - self.fees_paid_in_base = self.status_dict["fees_paid_in_base"] - self.fees_paid_in_quote = self.status_dict["fees_paid_in_quote"] - self.start_price = self.status_dict["start_price"] - self.start_time = self.status_dict["start_time"] - self.deal_start_time = self.status_dict["deal_start_time"] - self.stop_when_profit = self.status_dict["stop_when_profit"] - - if "deal_order_history" not in self.status_dict: - self.status_dict["deal_order_history"] = [] - - #I need to revise this two conditionals - if self.so==self.broker.get_empty_order() and self.safety_order_index