From 18506dbaf324a83a4af0e642ade1e171def645ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20S=C3=A1nchez?= Date: Sat, 11 Oct 2025 22:48:26 -0300 Subject: [PATCH] 2025.10.11 --- changelog.txt | 4 ++++ main.py | 2 +- trader.py | 14 +++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/changelog.txt b/changelog.txt index f723eeb..24b9ac3 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2025.10.11: +. Minor simplification in do_cleanup. +. Removed a couple of (no longer needed?) pauses. + 2025.10.10: . New endpoint: /refresh_log_cache. . Fixed an error in /add_so endpoint that incremented the config setting but not the status setting. diff --git a/main.py b/main.py index 7a90449..6bc37b1 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ import exchange_wrapper import trader -version = "2025.10.10" +version = "2025.10.11" ''' Color definitions. If you want to change them, check the reference at https://en.wikipedia.org/wiki/ANSI_escape_code#Colors diff --git a/trader.py b/trader.py index d6c336d..e50df88 100755 --- a/trader.py +++ b/trader.py @@ -450,14 +450,10 @@ class trader: self.broker.logger.log_this("Can't fetch free base",1,self.status.get_pair()) return 1 - #If the balance is greater than the size of the first safety order, sell the difference. - # Sometimes when an order is filled the balance is not updated immediately, so having a bit of a buffer irons out a couple of issues. - min_size = self.config.get_order_size()/self.status.get_take_profit_price() - - if (balance_in_account-min_size)*self.status.get_start_price()>self.broker.get_min_quote_size(self.status.get_pair()): - self.broker.logger.log_this(f"Balance to clean: {balance_in_account-min_size} {self.base}",2,self.status.get_pair()) + if balance_in_account*self.status.get_start_price()>self.broker.get_min_quote_size(self.status.get_pair()): + self.broker.logger.log_this(f"Balance to clean: {balance_in_account} {self.base}",2,self.status.get_pair()) self.broker.logger.log_this("Sending cleanup order...",2,self.status.get_pair()) - cleanup_order = self.broker.new_limit_order(self.status.get_pair(),balance_in_account-min_size,"sell",self.status.get_take_profit_price(),no_retries=True,log="cleanup") + cleanup_order = self.broker.new_limit_order(self.status.get_pair(),balance_in_account,"sell",self.status.get_take_profit_price(),no_retries=True,log="cleanup") if cleanup_order is None: self.broker.logger.log_this("Problems with the cleanup order, new_limit_order returned None",1,self.status.get_pair()) return 1 @@ -1018,7 +1014,7 @@ class trader: self.status.set_fees_paid_in_base(self.status.get_fees_paid_in_base() + self.parse_fees(old_tp_order)[0]) #Cooldown - time.sleep(self.broker.get_wait_before_new_safety_order()) + #time.sleep(self.broker.get_wait_before_new_safety_order()) #Send new TP order if self.send_new_tp_order()==1: @@ -1028,7 +1024,7 @@ class trader: return 4 #Cooldown - time.sleep(self.broker.get_wait_before_new_safety_order()) + #time.sleep(self.broker.get_wait_before_new_safety_order()) #Send new safety order(s) #Do not send new orders if the max amount is reached or surpassed.