root/trading_bot_v4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Change TP1 from 1.1% to 1.45% (FIXED - Jan 3, 2026)

Browse Source 
- Updated config/trading.ts defaults: takeProfit1Percent, minTp1Percent, maxTp1Percent all set to 1.45
- Updated .env: TAKE_PROFIT_1_PERCENT, MIN_TP1_PERCENT, MAX_TP1_PERCENT all set to 1.45
- Updated documentation: Exit strategy section reflects fixed 1.45% TP1 (no ATR variance)
- User requested fixed TP1 at 1.45% instead of ATR-based dynamic targets
- Container restarted to apply changes
This commit is contained in:
mindesbunister
2026-01-03 15:11:55 +01:00
parent 23db02de72
commit e1088b1218
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

@@ -100,7 +100,7 @@ HARD_STOP_PERCENT=-2.5
# Take Profit 1: Close X% of position at this profit level (FALLBACK) # Take Profit 1: Close X% of position at this profit level (FALLBACK)
# Example: +0.8% on 10x = +8% account gain # Example: +0.8% on 10x = +8% account gain
TAKE_PROFIT_1_PERCENT=1.1 TAKE_PROFIT_1_PERCENT=1.45
# Take Profit 1 Size: What % of position to close at TP1 # Take Profit 1 Size: What % of position to close at TP1
# 60 = close 60%, leave 40% for runner # 60 = close 60%, leave 40% for runner
@@ -135,8 +135,8 @@ ATR_MULTIPLIER_SL=3.0
# Safety bounds (prevent extreme values) # Safety bounds (prevent extreme values)
# TP1 bounds # TP1 bounds
MIN_TP1_PERCENT=1.1 # Clamp TP1 to requested 1.1% MIN_TP1_PERCENT=1.45 # Clamp TP1 to requested 1.1%
MAX_TP1_PERCENT=1.1 # Clamp TP1 to requested 1.1% MAX_TP1_PERCENT=1.45 # Clamp TP1 to requested 1.1%
# TP2 bounds # TP2 bounds
MIN_TP2_PERCENT=1 MIN_TP2_PERCENT=1

14
.github/copilot-instructions.md vendored
View File

@@ -103,21 +103,27 @@
- **Last Updated:** Dec 26, 2025 (indicator score bypass added) - **Last Updated:** Dec 26, 2025 (indicator score bypass added)
### Position Management & Exit Strategy ### Position Management & Exit Strategy
- **Active System:** TP2-as-Runner with ATR-Based Dynamic Targets - **Active System:** Fixed TP1 with ATR-Based TP2/Trailing
- **File:** `lib/trading/position-manager.ts` (2,027 lines) - **File:** `lib/trading/position-manager.ts` (2,027 lines)
- **Status:** ✅ PRODUCTION - **Status:** ✅ PRODUCTION
- **Exit Flow:** - **Exit Flow:**
1. TP1 at ATR × 2.0 (~0.86%) → Close 60% (configurable via `TAKE_PROFIT_1_SIZE_PERCENT`) 1. TP1 at **1.45% FIXED** → Close 100% (Jan 3, 2026 - MIN/MAX clamped to 1.45%)
2. Move SL to breakeven (ADX-based: 0% for ADX<20, -0.55% for ADX>25) 2. Move SL to breakeven (ADX-based: 0% for ADX<20, -0.55% for ADX>25)
3. TP2 at ATR × 4.0 (~1.72%) → Activate trailing stop (does NOT close position) 3. TP2 at ATR × 4.0 (~1.72%) → Activate trailing stop (does NOT close position)
4. Trailing Stop: ATR × 1.5 with real-time 1-min ADX adjustments + profit acceleration 4. Trailing Stop: ATR × 1.5 with real-time 1-min ADX adjustments + profit acceleration
5. Runner (40% default) exits via trailing stop or emergency SL 5. Runner exits via trailing stop or emergency SL
- **TP1 Configuration (Jan 3, 2026):**
* `TAKE_PROFIT_1_PERCENT=1.45` (target)
* `MIN_TP1_PERCENT=1.45` (floor - prevents going below)
* `MAX_TP1_PERCENT=1.45` (cap - prevents going above)
* `TAKE_PROFIT_1_SIZE_PERCENT=100` (close entire position at TP1)
* Rationale: User-requested fixed 1.45% TP1, no ATR variance
- **Key Features:** - **Key Features:**
* Adaptive trailing: Widens for strong ADX (>30), tightens for weak (<25) * Adaptive trailing: Widens for strong ADX (>30), tightens for weak (<25)
* ADX acceleration bonus: +5 points since entry = 1.3× wider trail * ADX acceleration bonus: +5 points since entry = 1.3× wider trail
* Peak tracking: Updates `peakPrice` every 2s for precise trailing calculations * Peak tracking: Updates `peakPrice` every 2s for precise trailing calculations
- **Critical Bug Fixed:** Bug #87 - State persistence (tp2Hit, trailingStopActive, peakPrice) now bulletproof - **Critical Bug Fixed:** Bug #87 - State persistence (tp2Hit, trailingStopActive, peakPrice) now bulletproof
- **Last Updated:** Dec 17, 2025 (state persistence fix - commit 341341d) - **Last Updated:** Jan 3, 2026 (TP1 fixed to 1.45%)
### Adaptive Leverage System ### Adaptive Leverage System
- **Status:** ❌ DISABLED (Jan 2, 2026) - Using fixed leverage (SOL 10x, ETH 5x) - **Status:** ❌ DISABLED (Jan 2, 2026) - Using fixed leverage (SOL 10x, ETH 5x)

6
config/trading.ts
View File

@@ -154,7 +154,7 @@ export const DEFAULT_TRADING_CONFIG: TradingConfig = {
// Risk parameters (LEGACY FALLBACK - used when ATR unavailable) // Risk parameters (LEGACY FALLBACK - used when ATR unavailable)
stopLossPercent: -2.8, // Fallback: -2.8% if no ATR stopLossPercent: -2.8, // Fallback: -2.8% if no ATR
takeProfit1Percent: 1.1, // Fallback: +1.1% if no ATR takeProfit1Percent: 1.45, // Fallback: +1.45% if no ATR
takeProfit2Percent: 1.8, // Fallback: +1.8% if no ATR takeProfit2Percent: 1.8, // Fallback: +1.8% if no ATR
emergencyStopPercent: -2.0, // Emergency hard stop (always active) emergencyStopPercent: -2.0, // Emergency hard stop (always active)
@@ -163,8 +163,8 @@ export const DEFAULT_TRADING_CONFIG: TradingConfig = {
atrMultiplierTp1: 2.0, // TP1 = ATR × 2.0 (Example: 0.45% ATR = 0.90% TP1) atrMultiplierTp1: 2.0, // TP1 = ATR × 2.0 (Example: 0.45% ATR = 0.90% TP1)
atrMultiplierTp2: 4.0, // TP2 = ATR × 4.0 (Example: 0.45% ATR = 1.80% TP2) atrMultiplierTp2: 4.0, // TP2 = ATR × 4.0 (Example: 0.45% ATR = 1.80% TP2)
atrMultiplierSl: 3.0, // SL = ATR × 3.0 (Example: 0.45% ATR = 1.35% SL) atrMultiplierSl: 3.0, // SL = ATR × 3.0 (Example: 0.45% ATR = 1.35% SL)
minTp1Percent: 1.1, // Floor: Never below +1.1% minTp1Percent: 1.45, // Floor: Never below +1.45%
maxTp1Percent: 1.1, // Cap: Fixed at +1.1% maxTp1Percent: 1.45, // Cap: Fixed at +1.45%
minTp2Percent: 1.0, // Floor: Never below +1.0% minTp2Percent: 1.0, // Floor: Never below +1.0%
maxTp2Percent: 3.0, // Cap: Never above +3.0% maxTp2Percent: 3.0, // Cap: Never above +3.0%
minSlPercent: 2.8, // Floor: Never tighter than -2.8% minSlPercent: 2.8, // Floor: Never tighter than -2.8%