diff --git a/.env b/.env index b742c6f..791c2ab 100644 --- a/.env +++ b/.env @@ -138,8 +138,8 @@ MIN_TP1_PERCENT=0.5 # Never below +0.5% MAX_TP1_PERCENT=1.5 # Never above +1.5% # TP2 bounds -MIN_TP2_PERCENT=1.0 # Never below +1.0% -MAX_TP2_PERCENT=3.0 # Never above +3.0% +MIN_TP2_PERCENT=1 +MAX_TP2_PERCENT=3 # SL bounds MIN_SL_PERCENT=0.8 # Never tighter than -0.8% @@ -411,4 +411,5 @@ TRAILING_STOP_MIN_PERCENT=0.25 TRAILING_STOP_MAX_PERCENT=0.9 USE_PERCENTAGE_SIZE=false -BREAKEVEN_TRIGGER_PERCENT=0.4 \ No newline at end of file +BREAKEVEN_TRIGGER_PERCENT=0 +ATR_MULTIPLIER_FOR_TP2=2 \ No newline at end of file diff --git a/telegram_command_bot.py b/telegram_command_bot.py index 3887a19..f65c9f8 100644 --- a/telegram_command_bot.py +++ b/telegram_command_bot.py @@ -59,14 +59,14 @@ SYMBOL_MAP = { MANUAL_METRICS = { 'long': { - 'atr': 0.45, + 'atr': 0.43, # Updated Nov 17, 2025: Based on 162 SOL trades, median = 0.43 (~0.32% of price) 'adx': 32, 'rsi': 58, 'volumeRatio': 1.25, 'pricePosition': 55, }, 'short': { - 'atr': 0.45, + 'atr': 0.43, # Updated Nov 17, 2025: Based on 162 SOL trades, median = 0.43 (~0.32% of price) 'adx': 32, 'rsi': 42, 'volumeRatio': 1.25,