1.3.6

DogsTailFarmer · Sep 24, 2023 · 830c7da · 830c7da
1 parent d717f46
commit 830c7da
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 1.3.6 2023-09-24
+### Fix
+* Due to a rounding error, the order status was incorrectly fetched if it was partially completed
+
+### Update
+* Up requirements for exchanges-wrapper==1.3.7.post1
+
+### Added for new features
+* To boost trade in case of low market volatility: TP order is updated once every 15 minutes,
+    and in Reverse cycle grid update once an hour
+
+## 1.3.5-1.dev1
+* Fix: Error getting internal id while re-placing grid order
+
+## 1.3.5-1.dev0
+* Update: On-the-fly update assets with withdrawal and deposit operations also for Reverse cycle
+
 ## 1.3.5 2023-09-19
 ### Fix
 * Fix: Incorrect calculated depo volume for grid update, not include held grid orders volume

diff --git 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__ = "1.3.5"
+__version__ = "1.3.6"
 __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 

diff --git a/martin_binance/executor.py b/martin_binance/executor.py
diff --git a/martin_binance/margin_wrapper.py b/martin_binance/margin_wrapper.py
@@ -4,7 +4,7 @@
 __author__ = "Jerry Fedorenko"
 __copyright__ = "Copyright © 2021 Jerry Fedorenko aka VM"
 __license__ = "MIT"
-__version__ = "1.3.5"
+__version__ = "1.3.6"
 __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 
@@ -23,7 +23,7 @@
 import psutil
 
 from colorama import init as color_init
-from decimal import Decimal
+from decimal import Decimal, ROUND_FLOOR
 from pathlib import Path
 from datetime import datetime, timedelta
 from tqdm import tqdm
@@ -131,7 +131,7 @@ def order_trades_sum(_order_id: int) -> Decimal:
     for _trade in StrategyBase.trades:
         if _trade.order_id == _order_id:
             saved_filled_quantity += Decimal(str(_trade.amount))
-    return saved_filled_quantity
+    return saved_filled_quantity.quantize(Decimal("1.01234567"), rounding=ROUND_FLOOR)
 
 
 class PrivateTrade:
@@ -1025,7 +1025,8 @@ async def buffered_orders():
                 _id = int(order['orderId'])
                 exch_orders.append(_id)
                 if (order.get('status') == 'PARTIALLY_FILLED'
-                        and order_trades_sum(_id) < Decimal(order['executedQty'])):
+                        and order_trades_sum(_id) < Decimal(order['executedQty']).quantize(Decimal("1.01234567"),
+                                                                                           rounding=ROUND_FLOOR)):
                     diff_id.add(_id)
 
             # Missed fill event list

diff --git a/martin_binance/service/relaunch.py b/martin_binance/service/relaunch.py
@@ -6,7 +6,7 @@
 __author__ = "Jerry Fedorenko"
 __copyright__ = "Copyright © 2021 Jerry Fedorenko aka VM"
 __license__ = "MIT"
-__version__ = "1.3.4"
+__version__ = "1.3.6"
 __maintainer__ = "Jerry Fedorenko"
 __contact__ = 'https://github.com/DogsTailFarmer'
 ##################################################################
@@ -18,9 +18,7 @@
 time.sleep(10)
 
 server = libtmux.Server()
-session = [s for s in server.sessions if s.name == "Trade"][0]
-
-if session:
+if session := [s for s in server.sessions if s.name == "Trade"][0]:
     for window in session.windows:
         if window.name == 'srv':
             window.attached_pane.send_keys('exchanges-wrapper-srv', enter=True)

diff --git a/pyproject.toml b/pyproject.toml
@@ -17,7 +17,7 @@ dynamic = ["version", "description"]
 requires-python = ">=3.8"
 
 dependencies = [
-    "exchanges-wrapper==1.3.7",
+    "exchanges-wrapper==1.3.7.post1",
     "margin-strategy-sdk==0.0.11",
     "jsonpickle==3.0.2",
     "psutil==5.9.5",

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-exchanges-wrapper==1.3.7
+exchanges-wrapper==1.3.7.post1
 margin-strategy-sdk==0.0.11
 jsonpickle==3.0.2
 psutil==5.9.5