Fix Drift balance calculation and implement multi-RPC failover system
- Fixed balance calculation: corrected precision factor for Drift scaledBalance (5.69 vs wrong 0,678.76) - Implemented multi-RPC failover system with 4 endpoints (Helius, Solana official, Alchemy, Ankr) - Updated automation page with balance sync, leverage-based position sizing, and removed daily trade limits - Added RPC status monitoring endpoint - Updated balance and positions APIs to use failover system - All Drift APIs now working correctly with accurate balance data
This commit is contained in:
@@ -11,16 +11,24 @@ export default function AutomationPage() {
|
||||
maxLeverage: 5,
|
||||
stopLossPercent: 2,
|
||||
takeProfitPercent: 6,
|
||||
maxDailyTrades: 5,
|
||||
riskPercentage: 2
|
||||
})
|
||||
|
||||
const [status, setStatus] = useState(null)
|
||||
const [balance, setBalance] = useState(null)
|
||||
const [positions, setPositions] = useState([])
|
||||
const [isLoading, setIsLoading] = useState(false)
|
||||
const [balanceLoading, setBalanceLoading] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
fetchStatus()
|
||||
const interval = setInterval(fetchStatus, 30000)
|
||||
fetchBalance()
|
||||
fetchPositions()
|
||||
const interval = setInterval(() => {
|
||||
fetchStatus()
|
||||
fetchBalance()
|
||||
fetchPositions()
|
||||
}, 30000)
|
||||
return () => clearInterval(interval)
|
||||
}, [])
|
||||
|
||||
@@ -36,6 +44,70 @@ export default function AutomationPage() {
|
||||
}
|
||||
}
|
||||
|
||||
const fetchBalance = async () => {
|
||||
if (config.dexProvider !== 'DRIFT') return
|
||||
|
||||
setBalanceLoading(true)
|
||||
try {
|
||||
const response = await fetch('/api/drift/balance')
|
||||
const data = await response.json()
|
||||
if (data.success) {
|
||||
setBalance(data)
|
||||
// Auto-calculate position size based on available balance and leverage
|
||||
const maxPositionSize = (data.availableBalance * config.maxLeverage) * 0.9 // Use 90% of max
|
||||
const suggestedSize = Math.max(10, Math.min(maxPositionSize, config.tradingAmount))
|
||||
|
||||
setConfig(prev => ({
|
||||
...prev,
|
||||
tradingAmount: Math.round(suggestedSize)
|
||||
}))
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch balance:', error)
|
||||
} finally {
|
||||
setBalanceLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const fetchPositions = async () => {
|
||||
if (config.dexProvider !== 'DRIFT') return
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/drift/positions')
|
||||
const data = await response.json()
|
||||
if (data.success) {
|
||||
setPositions(data.positions || [])
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch positions:', error)
|
||||
}
|
||||
}
|
||||
|
||||
const handleLeverageChange = (newLeverage) => {
|
||||
const leverage = parseFloat(newLeverage)
|
||||
|
||||
// Auto-calculate position size when leverage changes
|
||||
if (balance?.availableBalance) {
|
||||
const maxPositionSize = (balance.availableBalance * leverage) * 0.9 // Use 90% of max
|
||||
const suggestedSize = Math.max(10, maxPositionSize)
|
||||
|
||||
setConfig(prev => ({
|
||||
...prev,
|
||||
maxLeverage: leverage,
|
||||
tradingAmount: Math.round(suggestedSize)
|
||||
}))
|
||||
} else {
|
||||
setConfig(prev => ({
|
||||
...prev,
|
||||
maxLeverage: leverage
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
const hasOpenPosition = positions.some(pos =>
|
||||
pos.symbol.includes(config.symbol.replace('USD', '')) && pos.size > 0.001
|
||||
)
|
||||
|
||||
const handleStart = async () => {
|
||||
setIsLoading(true)
|
||||
try {
|
||||
@@ -149,10 +221,17 @@ export default function AutomationPage() {
|
||||
|
||||
{/* Leverage */}
|
||||
<div className="space-y-3">
|
||||
<label className="block text-sm font-bold text-purple-400">Leverage</label>
|
||||
<label className="block text-sm font-bold text-purple-400">
|
||||
Leverage
|
||||
{balance && (
|
||||
<span className="ml-2 text-xs text-gray-400">
|
||||
(Max position: ${(balance.availableBalance * config.maxLeverage * 0.9).toFixed(0)})
|
||||
</span>
|
||||
)}
|
||||
</label>
|
||||
<select
|
||||
value={config.maxLeverage}
|
||||
onChange={(e) => setConfig({...config, maxLeverage: parseFloat(e.target.value)})}
|
||||
onChange={(e) => handleLeverageChange(e.target.value)}
|
||||
className="w-full p-3 bg-gray-700 border border-gray-600 rounded-lg text-white focus:border-purple-400"
|
||||
disabled={status?.isActive}
|
||||
>
|
||||
@@ -190,7 +269,13 @@ export default function AutomationPage() {
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">Position Size ($)</label>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Position Size ($)
|
||||
{balanceLoading && <span className="ml-2 text-xs text-blue-400">Syncing...</span>}
|
||||
{balance && !balanceLoading && (
|
||||
<span className="ml-2 text-xs text-green-400">Auto-calculated</span>
|
||||
)}
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
value={config.tradingAmount}
|
||||
@@ -200,6 +285,12 @@ export default function AutomationPage() {
|
||||
min="10"
|
||||
step="10"
|
||||
/>
|
||||
{balance && (
|
||||
<div className="mt-1 text-xs text-gray-400">
|
||||
Available: ${balance.availableBalance?.toFixed(2)} •
|
||||
Using {((config.tradingAmount / balance.availableBalance) * 100).toFixed(0)}% of balance
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@@ -253,16 +344,26 @@ export default function AutomationPage() {
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">Max Daily Trades</label>
|
||||
<input
|
||||
type="number"
|
||||
value={config.maxDailyTrades}
|
||||
onChange={(e) => setConfig({...config, maxDailyTrades: parseInt(e.target.value)})}
|
||||
className="w-full p-3 bg-gray-700 border border-gray-600 rounded-lg text-white focus:border-blue-500"
|
||||
disabled={status?.isActive}
|
||||
min="1"
|
||||
max="50"
|
||||
/>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Automation Mode
|
||||
{hasOpenPosition && (
|
||||
<span className="ml-2 text-xs text-yellow-400">Position Open</span>
|
||||
)}
|
||||
</label>
|
||||
<div className="w-full p-3 bg-gray-700 border border-gray-600 rounded-lg text-white">
|
||||
<div className="flex items-center justify-between">
|
||||
<span>AI-Driven Trading</span>
|
||||
<div className="flex items-center space-x-2">
|
||||
<div className={`w-2 h-2 rounded-full ${hasOpenPosition ? 'bg-yellow-400' : 'bg-green-400'}`}></div>
|
||||
<span className="text-sm text-gray-300">
|
||||
{hasOpenPosition ? 'Monitoring Position' : 'Ready to Trade'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-2 text-xs text-gray-400">
|
||||
Bot will enter trades based on AI analysis when no position is open
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -274,7 +375,64 @@ export default function AutomationPage() {
|
||||
<div className="space-y-6">
|
||||
|
||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
||||
<h3 className="text-xl font-bold text-white mb-4">Status</h3>
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h3 className="text-xl font-bold text-white">Account Status</h3>
|
||||
<button
|
||||
onClick={fetchBalance}
|
||||
disabled={balanceLoading}
|
||||
className="px-3 py-1 bg-blue-600 text-white rounded hover:bg-blue-700 transition-colors disabled:opacity-50 text-sm"
|
||||
>
|
||||
{balanceLoading ? 'Syncing...' : 'Sync'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{balance ? (
|
||||
<div className="space-y-3">
|
||||
<div className="flex justify-between items-center">
|
||||
<span className="text-gray-300">Available Balance:</span>
|
||||
<span className="text-green-400 font-semibold">${balance.availableBalance?.toFixed(2)}</span>
|
||||
</div>
|
||||
<div className="flex justify-between items-center">
|
||||
<span className="text-gray-300">Account Value:</span>
|
||||
<span className="text-blue-400 font-semibold">${balance.accountValue?.toFixed(2)}</span>
|
||||
</div>
|
||||
<div className="flex justify-between items-center">
|
||||
<span className="text-gray-300">Unrealized P&L:</span>
|
||||
<span className={`font-semibold ${balance.unrealizedPnl >= 0 ? 'text-green-400' : 'text-red-400'}`}>
|
||||
{balance.unrealizedPnl >= 0 ? '+' : ''}${balance.unrealizedPnl?.toFixed(2)}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between items-center">
|
||||
<span className="text-gray-300">Open Positions:</span>
|
||||
<span className="text-yellow-400 font-semibold">{positions.length}</span>
|
||||
</div>
|
||||
{positions.length > 0 && (
|
||||
<div className="mt-3 p-3 bg-gray-700 rounded-lg">
|
||||
<div className="text-sm text-gray-300 mb-2">Active Positions:</div>
|
||||
{positions.map((pos, idx) => (
|
||||
<div key={idx} className="flex justify-between items-center text-xs">
|
||||
<span className="text-gray-400">{pos.symbol}</span>
|
||||
<span className={`font-semibold ${pos.side === 'long' ? 'text-green-400' : 'text-red-400'}`}>
|
||||
{pos.side.toUpperCase()} {pos.size?.toFixed(4)}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="text-center py-4">
|
||||
{balanceLoading ? (
|
||||
<div className="text-gray-400">Loading account data...</div>
|
||||
) : (
|
||||
<div className="text-gray-400">No account data available</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
||||
<h3 className="text-xl font-bold text-white mb-4">Bot Status</h3>
|
||||
{status ? (
|
||||
<div className="space-y-3">
|
||||
<div className="flex justify-between items-center">
|
||||
@@ -316,23 +474,29 @@ export default function AutomationPage() {
|
||||
</div>
|
||||
|
||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
||||
<h3 className="text-xl font-bold text-white mb-4">Performance</h3>
|
||||
<h3 className="text-xl font-bold text-white mb-4">Trading Metrics</h3>
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-green-400">0</div>
|
||||
<div className="text-xs text-gray-400">Trades</div>
|
||||
<div className="text-2xl font-bold text-green-400">
|
||||
{balance?.accountValue ? `$${balance.accountValue.toFixed(0)}` : '$0'}
|
||||
</div>
|
||||
<div className="text-xs text-gray-400">Portfolio</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-blue-400">0%</div>
|
||||
<div className="text-xs text-gray-400">Win Rate</div>
|
||||
<div className="text-2xl font-bold text-blue-400">
|
||||
{balance?.leverage ? `${(balance.leverage * 100).toFixed(1)}%` : '0%'}
|
||||
</div>
|
||||
<div className="text-xs text-gray-400">Leverage Used</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-purple-400">$0.00</div>
|
||||
<div className="text-xs text-gray-400">P&L</div>
|
||||
<div className={`text-2xl font-bold ${balance?.unrealizedPnl >= 0 ? 'text-green-400' : 'text-red-400'}`}>
|
||||
{balance?.unrealizedPnl ? `$${balance.unrealizedPnl.toFixed(2)}` : '$0.00'}
|
||||
</div>
|
||||
<div className="text-xs text-gray-400">Unrealized P&L</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-yellow-400">0</div>
|
||||
<div className="text-xs text-gray-400">Active</div>
|
||||
<div className="text-2xl font-bold text-yellow-400">{positions.length}</div>
|
||||
<div className="text-xs text-gray-400">Open Positions</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user