From c6e77ec554a0249820658539fd005752052e8346 Mon Sep 17 00:00:00 2001 From: DogsTailFarmer Date: Tue, 13 Aug 2024 22:31:38 +0300 Subject: [PATCH] 3.0.12 --- CHANGELOG.md | 6 ++++++ martin_binance/__init__.py | 2 +- martin_binance/executor.py | 18 ++++++++---------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0830a07..77c9fd5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.0.12 - 2024-08-13 +### Fix +* Calculating`self.reverse_price` before immediately starting Reverse cycle also. It can be used later in +`on_balance_update_ex` +* `on_balance_update_ex`: initial balance update logic + ## 3.0.11 - 2024-07-13 ### Added new features * [Maintaining a supply of BNB in sub-account to pay fees](https://github.com/DogsTailFarmer/martin-binance/wiki/How-it's-work#maintaining-a-supply-of-bnb-in-a-sub-account-to-pay-fees) diff --git a/martin_binance/__init__.py b/martin_binance/__init__.py index ddf29f3..68239dd 100755 --- a/martin_binance/__init__.py +++ b/martin_binance/__init__.py @@ -6,7 +6,7 @@ __author__ = "Jerry Fedorenko" __copyright__ = "Copyright © 2021 Jerry Fedorenko aka VM" __license__ = "MIT" -__version__ = "3.0.11" +__version__ = "3.0.12" __maintainer__ = "Jerry Fedorenko" __contact__ = "https://github.com/DogsTailFarmer" diff --git a/martin_binance/executor.py b/martin_binance/executor.py index f125a4e..965caa0 100644 --- a/martin_binance/executor.py +++ b/martin_binance/executor.py @@ -4,7 +4,7 @@ __author__ = "Jerry Fedorenko" __copyright__ = "Copyright © 2021 Jerry Fedorenko aka VM" __license__ = "MIT" -__version__ = "3.0.11" +__version__ = "3.0.12" __maintainer__ = "Jerry Fedorenko" __contact__ = 'https://github.com/DogsTailFarmer' ################################################################## @@ -1825,13 +1825,13 @@ def reverse_after_grid_ending(self): self.message_log(f"For Reverse cycle set target return amount: {self.reverse_target_amount}" f" with profit: {tp.get('profit')}%", color=Style.B_WHITE) self.debug_output() + self.reverse_price = self.get_buffered_ticker().last_price if (self.cycle_buy and trend_down) or (not self.cycle_buy and trend_up): self.message_log('Start reverse cycle', tlg=True) self.reverse = True self.command = 'stop' if REVERSE_STOP else None else: self.message_log('Hold reverse cycle', color=Style.B_WHITE) - self.reverse_price = self.get_buffered_ticker().last_price self.reverse_hold = True self.place_profit_order() if not self.reverse_hold: @@ -2281,10 +2281,10 @@ def on_balance_update_ex(self, balance: Dict) -> None: if delta > 0: self.shift_grid_threshold = None deposit_add = self.round_truncate(delta * self.avg_rate, base=False) + self.deposit_second += deposit_add if self.reverse: profit = (self.reverse_target_amount - self.reverse_init_amount) / self.reverse_init_amount self.deposit_first += delta - self.deposit_second += deposit_add self.initial_reverse_second += deposit_add self.reverse_init_amount += delta self.reverse_target_amount = self.round_truncate( @@ -2293,13 +2293,12 @@ def on_balance_update_ex(self, balance: Dict) -> None: _rounding=ROUND_CEILING ) else: - self.deposit_second += deposit_add self.initial_second += deposit_add self.update_sum_amount(-delta, -deposit_add) self.place_profit_order() - - self.initial_first += delta + else: + self.initial_first += delta else: if asset == self.f_currency: restart = True @@ -2331,9 +2330,9 @@ def on_balance_update_ex(self, balance: Dict) -> None: if delta > 0: self.shift_grid_threshold = None deposit_add = self.round_truncate(delta / self.avg_rate, base=True) + self.deposit_first += deposit_add if self.reverse: profit = (self.reverse_target_amount - self.reverse_init_amount) / self.reverse_init_amount - self.deposit_first += deposit_add self.deposit_second += delta self.initial_reverse_first += deposit_add self.reverse_init_amount += delta @@ -2343,13 +2342,12 @@ def on_balance_update_ex(self, balance: Dict) -> None: _rounding=ROUND_CEILING ) else: - self.deposit_first += deposit_add self.initial_first += deposit_add self.update_sum_amount(-deposit_add, -delta) self.place_profit_order() - - self.initial_second += delta + else: + self.initial_second += delta self.debug_output()