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

feat: money printing machine - improved scalping with 1h/4h timeframes, trend filter, and better risk management

Browse Source
This commit is contained in:
mindesbunister
2025-07-29 19:03:11 +02:00
parent 035017faff
commit 7522baa0f1
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/automation-v2/page.js
View File

@@ -18,7 +18,7 @@ export default function AutomationPageV2() {
mode: 'LIVE',
dexProvider: 'DRIFT',
symbol: 'SOLUSD',
selectedTimeframes: ['5', '15', '30'], // Default to scalping preset
selectedTimeframes: ['60', '240'], // Default to improved scalping preset (1h, 4h)
tradingAmount: 100,
balancePercentage: 100, // Default to 100% of available balance
})
@@ -772,35 +772,35 @@ Based on comprehensive technical analysis across multiple timeframes:
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
<button
type="button"
onClick={() => setConfig({...config, selectedTimeframes: ['5', '15', '30']})}
onClick={() => setConfig({...config, selectedTimeframes: ['60', '240']})}
disabled={status?.isActive}
className="group p-6 rounded-xl bg-gradient-to-br from-green-600/20 to-emerald-600/10 border-2 border-green-600/30 hover:border-green-500/50 hover:from-green-600/30 hover:to-emerald-600/20 transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed text-left hover:scale-105"
>
<div className="flex items-center justify-between mb-3">
<div className="text-3xl group-hover:scale-110 transition-transform duration-200">📈</div>
<div className="text-xs text-green-400 bg-green-500/20 px-2 py-1 rounded-lg">FAST</div>
<div className="text-3xl group-hover:scale-110 transition-transform duration-200"><EFBFBD></div>
<div className="text-xs text-green-400 bg-green-500/20 px-2 py-1 rounded-lg">SMART</div>
</div>
<h4 className="text-lg font-bold text-green-300 mb-2">Scalping</h4>
<p className="text-sm text-gray-300 mb-3">Quick trades on short timeframes</p>
<h4 className="text-lg font-bold text-green-300 mb-2">Smart Scalping</h4>
<p className="text-sm text-gray-300 mb-3">High-probability scalping with trend filter</p>
<div className="text-xs text-green-400/80 font-mono bg-green-900/30 px-2 py-1 rounded">
5m • 15m • 30m
1h • 4h
</div>
</button>
<button
type="button"
onClick={() => setConfig({...config, selectedTimeframes: ['60', '120']})}
onClick={() => setConfig({...config, selectedTimeframes: ['5', '15', '30']})}
disabled={status?.isActive}
className="group p-6 rounded-xl bg-gradient-to-br from-blue-600/20 to-indigo-600/10 border-2 border-blue-600/30 hover:border-blue-500/50 hover:from-blue-600/30 hover:to-indigo-600/20 transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed text-left hover:scale-105"
>
<div className="flex items-center justify-between mb-3">
<div className="text-3xl group-hover:scale-110 transition-transform duration-200">⚡</div>
<div className="text-xs text-blue-400 bg-blue-500/20 px-2 py-1 rounded-lg">MEDIUM</div>
<div className="text-xs text-blue-400 bg-blue-500/20 px-2 py-1 rounded-lg">FAST</div>
</div>
<h4 className="text-lg font-bold text-blue-300 mb-2">Day Trading</h4>
<p className="text-sm text-gray-300 mb-3">Intraday momentum strategies</p>
<h4 className="text-lg font-bold text-blue-300 mb-2">Speed Scalping</h4>
<p className="text-sm text-gray-300 mb-3">Very fast trades (higher risk)</p>
<div className="text-xs text-blue-400/80 font-mono bg-blue-900/30 px-2 py-1 rounded">
1h • 2h
5m • 15m • 30m
</div>
</button>

22
lib/simple-automation.js
View File

@@ -606,17 +606,23 @@ class SimpleAutomation {
console.warn('⚠️ Could not determine position status for confidence adjustment');
}
// 🎯 AGGRESSIVE SCALPING CONFIDENCE when NO POSITION
let minConfidence = 75; // Default confidence
// 🎯 IMPROVED CONFIDENCE THRESHOLDS - Higher standards to reduce losses
let minConfidence = 80; // Increased default confidence
if (!hasActivePosition) {
// NO POSITION = Lower confidence threshold for faster re-entry
if (this.config.selectedTimeframes?.includes('5m')) {
minConfidence = 65; // Very aggressive for 5m scalping
console.log('🏃‍♂️ SCALPING MODE: Using aggressive 65% confidence (no position)');
// NO POSITION = Still require high confidence for quality entries
if (this.config.selectedTimeframes?.includes('1h')) {
minConfidence = 75; // 1h timeframe - medium confidence
console.log('📊 1H TRADING: Using 75% confidence threshold (no position)');
} else if (this.config.selectedTimeframes?.includes('4h')) {
minConfidence = 70; // 4h timeframe - lower confidence OK due to higher reliability
console.log('📈 4H TRADING: Using 70% confidence threshold (no position)');
} else if (this.config.selectedTimeframes?.includes('5m')) {
minConfidence = 80; // 5m requires very high confidence due to noise
console.log('⚡ 5M SCALPING: Using high 80% confidence (noisy timeframe)');
} else if (this.config.selectedTimeframes?.includes('15m')) {
minConfidence = 70; // Aggressive for 15m scalping
console.log('⚡ SCALPING MODE: Using aggressive 70% confidence (no position)');
minConfidence = 78; // 15m also requires high confidence
console.log('🏃‍♂️ 15M SCALPING: Using high 78% confidence (noisy timeframe)');
} else {
minConfidence = 72; // Slightly lower for day trading
console.log('📈 DAY TRADING: Using 72% confidence (no position)');

BIN
prisma/prisma/dev.db
View File

Binary file not shown.