diff --git a/main.py b/main.py index 96675ca..35ffd92 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ import exchange_wrapper import trader -version = "2025.08.31" +version = "2025.09.01" ''' 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 b43b789..af1bdf5 100755 --- a/trader.py +++ b/trader.py @@ -53,6 +53,9 @@ class trader: if is_import: self.load_imported_trader() return None + else: + #Only reloads the value from config file if the trader wasn't running previously. + self.status.set_no_of_safety_orders(self.config.get_no_of_safety_orders()) # An alternative would be to set up a variable like self.is_initalized to false and finish the initialization here. # Then, in the main loop, check if self.is_initalized is false. If it is, run start_trader. @@ -111,13 +114,13 @@ class trader: ''' #Perhaps we should search for open buy orders from a crashed trader and cancel them? - #Reset some variables + #Resets some variables self.status.set_so_amount(0) self.status.clear_deal_order_history() self.status.set_take_profit_order(self.broker.get_empty_order()) self.status.set_safety_orders([]) self.status.set_safety_orders_filled(0) - self.status.set_no_of_safety_orders(self.config.get_no_of_safety_orders()) + self.status.set_no_of_safety_orders(self.config.get_no_of_safety_orders()) #Reloads the market new_market_data = self.broker.fetch_market(self.status.get_pair()) @@ -1238,7 +1241,7 @@ class trader: tp_level = self.config.get_tp_table()[-1] tp_level = self.config.get_tp_level() elif self.config.get_tp_mode()==3: #Linear percentage table - profit_table = self.linear_space(self.config.get_tp_level()+0.005,self.config.get_tp_level()-0.005,self.config.get_no_of_safety_orders()) + profit_table = self.linear_space(self.config.get_tp_level()+0.005,self.config.get_tp_level()-0.005,self.status.get_no_of_safety_orders()) tp_level = profit_table[-1] if order_index