diff --git a/config.py b/config.py index f5685f42..ff6d7cf3 100644 --- a/config.py +++ b/config.py @@ -32,7 +32,6 @@ class Bot(BaseModel): symbol: str violent_multiplier: float = 2.00 wallet_exposure: float = 1.00 - wallet_exposure_limit: float = 0.01 @validator("min_volume") def minimum_min_volume(cls, v): diff --git a/configs/config_example.json b/configs/config_example.json index 65b75531..71c577a8 100644 --- a/configs/config_example.json +++ b/configs/config_example.json @@ -11,8 +11,7 @@ "min_volume": 15000, "symbol": "BTCUSDT", "violent_multiplier": 2.00, - "wallet_exposure": 1.00, - "wallet_exposure_limit": 0.10 + "wallet_exposure": 1.00 }, "exchanges": [ { diff --git a/directionalscalper/core/strategies/bybit/bybit_auto_hedge.py b/directionalscalper/core/strategies/bybit/bybit_auto_hedge.py index b26faa1d..b7c69991 100644 --- a/directionalscalper/core/strategies/bybit/bybit_auto_hedge.py +++ b/directionalscalper/core/strategies/bybit/bybit_auto_hedge.py @@ -11,7 +11,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False self.checked_amount_validity = False diff --git a/directionalscalper/core/strategies/bybit/bybit_hedge.py b/directionalscalper/core/strategies/bybit/bybit_hedge.py index 30c46b05..c3af1cc9 100644 --- a/directionalscalper/core/strategies/bybit/bybit_hedge.py +++ b/directionalscalper/core/strategies/bybit/bybit_hedge.py @@ -3,8 +3,6 @@ from decimal import Decimal, InvalidOperation, ROUND_HALF_UP, ROUND_DOWN from ..strategy import Strategy from typing import Tuple -#from ...tables import create_strategy_table, start_live_table -#from directionalscalper.core.tables import create_strategy_table, start_live_table import threading import os @@ -13,7 +11,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_leverage.py b/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_leverage.py index eeb690c6..1343e9e7 100644 --- a/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_leverage.py +++ b/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_leverage.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False self.checked_amount_validity = False diff --git a/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_table.py b/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_table.py index 38ad9951..d5e6ff6c 100644 --- a/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_table.py +++ b/directionalscalper/core/strategies/bybit/bybit_hedge_dynamic_table.py @@ -13,7 +13,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False self.checked_amount_validity = False diff --git a/directionalscalper/core/strategies/bybit/bybit_hedge_grid.py b/directionalscalper/core/strategies/bybit/bybit_hedge_grid.py index 6ad72b6a..3928f40b 100644 --- a/directionalscalper/core/strategies/bybit/bybit_hedge_grid.py +++ b/directionalscalper/core/strategies/bybit/bybit_hedge_grid.py @@ -11,7 +11,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_hedge_unified.py b/directionalscalper/core/strategies/bybit/bybit_hedge_unified.py index 693e699a..d6329856 100644 --- a/directionalscalper/core/strategies/bybit/bybit_hedge_unified.py +++ b/directionalscalper/core/strategies/bybit/bybit_hedge_unified.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_longonly.py b/directionalscalper/core/strategies/bybit/bybit_longonly.py index 79261e53..8125b9e7 100644 --- a/directionalscalper/core/strategies/bybit/bybit_longonly.py +++ b/directionalscalper/core/strategies/bybit/bybit_longonly.py @@ -13,7 +13,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic.py b/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic.py index 9494e66e..e89a13a7 100644 --- a/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic.py +++ b/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic_leverage.py b/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic_leverage.py index bb2af0b7..64ac26cc 100644 --- a/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic_leverage.py +++ b/directionalscalper/core/strategies/bybit/bybit_longonly_dynamic_leverage.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False self.checked_amount_validity = False diff --git a/directionalscalper/core/strategies/bybit/bybit_shortonly.py b/directionalscalper/core/strategies/bybit/bybit_shortonly.py index c9fe2910..05055b46 100644 --- a/directionalscalper/core/strategies/bybit/bybit_shortonly.py +++ b/directionalscalper/core/strategies/bybit/bybit_shortonly.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic.py b/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic.py index b7aee6a2..86d044e4 100644 --- a/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic.py +++ b/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False diff --git a/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic_leverage.py b/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic_leverage.py index 8e1c6b6a..9bdb6fdf 100644 --- a/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic_leverage.py +++ b/directionalscalper/core/strategies/bybit/bybit_shortonly_dynamic_leverage.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False self.checked_amount_validity = False diff --git a/directionalscalper/core/strategies/bybit/bybit_violent.py b/directionalscalper/core/strategies/bybit/bybit_violent.py index 0cf6a056..50f2d360 100644 --- a/directionalscalper/core/strategies/bybit/bybit_violent.py +++ b/directionalscalper/core/strategies/bybit/bybit_violent.py @@ -9,7 +9,6 @@ def __init__(self, exchange, manager, config): super().__init__(exchange, config, manager) self.manager = manager self.last_cancel_time = 0 - self.wallet_exposure_limit = self.config.wallet_exposure_limit self.current_wallet_exposure = 1.0 self.printed_trade_quantities = False