bitunix-automated-crypto-trading 3.3.4__tar.gz → 3.3.5__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/PKG-INFO +1 -1
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/README.md +4 -3
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/BitunixSignal.py +3 -3
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/config.py +2 -2
- bitunix_automated_crypto_trading-3.3.5/bitunix_automated_crypto_trading/version.py +1 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading.egg-info/PKG-INFO +1 -1
- bitunix_automated_crypto_trading-3.3.4/bitunix_automated_crypto_trading/version.py +0 -1
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/AsyncThreadRunner.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/BitunixApi.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/BitunixWebSocket.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/DataFrameHtmlRenderer.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/NotificationManager.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/SupportResistance.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/ThreadManager.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/TickerManager.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/__init__.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/bitunix.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading/logger.py +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading.egg-info/SOURCES.txt +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading.egg-info/dependency_links.txt +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading.egg-info/entry_points.txt +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading.egg-info/requires.txt +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/bitunix_automated_crypto_trading.egg-info/top_level.txt +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/setup.cfg +0 -0
- {bitunix_automated_crypto_trading-3.3.4 → bitunix_automated_crypto_trading-3.3.5}/setup.py +0 -0
@@ -61,9 +61,9 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
|
|
61
61
|
- `LOSS_AMOUNT`: Maximum loss amount
|
62
62
|
- `PROFIT_PERCENTAGE`: Target profit ROI percentage
|
63
63
|
- `LOSS_PERCENTAGE`: Maximum loss ROI percentage
|
64
|
-
- `
|
64
|
+
- `BOT_CONTROLS_TP_SL`: True or False
|
65
65
|
if false then take profit and stop loss will be placed by the bot when TP or SL is reached, if true then take profit and stop loss will be placed when the trade is opened
|
66
|
-
- `
|
66
|
+
- `BOT_TRAIL_TP_SL`: True or False
|
67
67
|
if set to True then bot will move the stop loss to breakeven when the trade is reaches 50% of the target profit and then move the stop loss to the 50% of the target profit when the trade reaches 90% of the target profit.
|
68
68
|
- `PROFIT_LOSS_PRICE_TYPE`: "MARK_PRICE" or "LAST_PRICE"
|
69
69
|
- `PROFIT_LOSS_ORDER_TYPE`: "MARKET" or "LIMIT"
|
@@ -181,7 +181,8 @@ The platform can be configured through the `config.py` file or `config.txt`. Key
|
|
181
181
|
- You can control the study like Moving Average, MACD, Bollinger Band, RSI or close proximity to high or low of the candle using the env file
|
182
182
|
- You can control the trading strategy using the CalculateStudy function in TickerManager.py and AutoTradeProcess function in BitunixSignal.py
|
183
183
|
- Changes are activated by unchecking and checking the AutoTrade checkbox
|
184
|
-
-
|
184
|
+
- BOT controled take profit and stop loss or take_profit and stop_loss create when order is created
|
185
|
+
- Trailing TP and SL in the direction of profit, if BOT_TRAIL_TP_SL to True and BOT_TAKE_PROFIT_STOP_LOSS to False in the config file
|
185
186
|
|
186
187
|
## Auto Trading
|
187
188
|
|
@@ -784,7 +784,7 @@ class BitunixSignal:
|
|
784
784
|
f'{colors.YELLOW} Opening {"long" if side=="BUY" else "short"} position for {row.symbol} with {qty} qty @ {price})'
|
785
785
|
)
|
786
786
|
datajs = None
|
787
|
-
if self.settings.
|
787
|
+
if self.settings.BOT_CONTROLS_TP_SL:
|
788
788
|
datajs = await self.bitunixApi.PlaceOrder(row.symbol, qty, price, side)
|
789
789
|
else:
|
790
790
|
if tpPrice == 0 and slPrice == 0:
|
@@ -846,7 +846,7 @@ class BitunixSignal:
|
|
846
846
|
|
847
847
|
if select and int(self.settings.MAX_AUTO_TRADES)!=0:
|
848
848
|
|
849
|
-
if self.settings.
|
849
|
+
if self.settings.BOT_TRAIL_TP_SL and self.settings.PROFIT_PERCENTAGE > 0 and self.settings.LOSS_PERCENTAGE > 0:
|
850
850
|
last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)
|
851
851
|
price = (bid if side == "BUY" else ask if side == "SELL" else last) if bid<=last<=ask else last
|
852
852
|
decimal_places = abs(Decimal(str(price)).as_tuple().exponent)
|
@@ -913,7 +913,7 @@ class BitunixSignal:
|
|
913
913
|
)
|
914
914
|
|
915
915
|
|
916
|
-
if self.settings.
|
916
|
+
if self.settings.BOT_CONTROLS_TP_SL:
|
917
917
|
# check take profit amount or accept loss amount
|
918
918
|
if float(self.settings.LOSS_AMOUNT) > 0 and total_pnl < -float(self.settings.LOSS_AMOUNT):
|
919
919
|
last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)
|
@@ -21,8 +21,8 @@ class Settings(BaseSettings):
|
|
21
21
|
LOSS_PERCENTAGE: float = Field(default=10, ge=0.0)
|
22
22
|
PROFIT_AMOUNT: float = Field(default=0, ge=0.0)
|
23
23
|
LOSS_AMOUNT: float = Field(default=5.0, ge=0.0)
|
24
|
-
|
25
|
-
|
24
|
+
BOT_CONTROLS_TP_SL: bool = Field(default=False)
|
25
|
+
BOT_TRAIL_TP_SL: bool = Field(default=False)
|
26
26
|
TP_STOP_TYPE: str = Field(default="MARK_PRICE")
|
27
27
|
TP_ORDER_TYPE: str = Field(default="LIMIT")
|
28
28
|
SL_STOP_TYPE: str = Field(default="MARK_PRICE")
|
@@ -0,0 +1 @@
|
|
1
|
+
__version__ = "3.3.5"
|
@@ -1 +0,0 @@
|
|
1
|
-
__version__ = "3.3.4"
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|