Fix complete trading system: SL/TP working, live trading operational
- Fixed network connectivity and live trading mode - Updated Drift SDK integration with proper API methods - Fixed BN type conversions and minimum order size - Fixed stop loss & take profit conditional orders - Complete risk management system now functional
This commit is contained in:
mindesbunister
@@ -210,7 +210,9 @@ export async function POST(request) {
|
||||
// Store analysis for learning
|
||||
await storeAnalysisForLearning(symbol, analysis)
|
||||
} else {
|
||||
throw new Error('AI analysis returned null')
|
||||
console.log('⏳ AI analysis returned null (possibly rate limited) - continuing without analysis')
|
||||
progressTracker.updateStep(sessionId, 'analysis', 'skipped', 'AI analysis skipped due to rate limits or other issues')
|
||||
analysis = null
|
||||
}
|
||||
|
||||
} catch (analysisError) {
|
||||
|
||||
@@ -105,16 +105,48 @@ export async function POST(request) {
|
||||
// Real Drift trading implementation
|
||||
console.log('💰 Executing REAL Drift perpetual trade')
|
||||
|
||||
// Import Drift SDK components
|
||||
const { DriftClient, initialize, MarketType, PositionDirection, OrderType } = await import('@drift-labs/sdk')
|
||||
// Import Drift SDK components including Wallet and BN
|
||||
const { DriftClient, initialize, MarketType, PositionDirection, OrderType, OrderTriggerCondition, Wallet, BN } = await import('@drift-labs/sdk')
|
||||
const { Connection, Keypair } = await import('@solana/web3.js')
|
||||
const { Wallet } = await import('@coral-xyz/anchor')
|
||||
|
||||
// Initialize connection and wallet
|
||||
const connection = new Connection(
|
||||
process.env.SOLANA_RPC_URL || 'https://api.mainnet-beta.solana.com',
|
||||
'confirmed'
|
||||
)
|
||||
// Initialize connection and wallet with configured RPC endpoints in priority order
|
||||
const rpcEndpoints = [
|
||||
process.env.SOLANA_RPC_URL_PRIMARY, // Helius (best for trading)
|
||||
process.env.SOLANA_RPC_URL_SECONDARY, // Solana official
|
||||
process.env.SOLANA_RPC_URL_TERTIARY, // Alchemy
|
||||
process.env.SOLANA_RPC_URL_BACKUP, // Ankr
|
||||
process.env.SOLANA_RPC_URL, // Fallback env var
|
||||
'https://mainnet.helius-rpc.com/?api-key=5e236449-f936-4af7-ae38-f15e2f1a3757'
|
||||
].filter(Boolean)
|
||||
|
||||
let connection = null
|
||||
let connectionError = null
|
||||
|
||||
// Try each RPC endpoint until one works
|
||||
for (const endpoint of rpcEndpoints) {
|
||||
try {
|
||||
console.log(`🌐 Attempting to connect to RPC: ${endpoint}`)
|
||||
connection = new Connection(endpoint, 'confirmed')
|
||||
|
||||
// Test the connection
|
||||
await connection.getLatestBlockhash()
|
||||
console.log(`✅ Successfully connected to RPC: ${endpoint}`)
|
||||
break
|
||||
} catch (error) {
|
||||
console.log(`❌ RPC ${endpoint} failed: ${error.message}`)
|
||||
connectionError = error
|
||||
connection = null
|
||||
}
|
||||
}
|
||||
|
||||
if (!connection) {
|
||||
console.error('❌ All RPC endpoints failed:', connectionError)
|
||||
return NextResponse.json({
|
||||
success: false,
|
||||
error: 'Unable to connect to Solana network',
|
||||
details: connectionError?.message
|
||||
}, { status: 503 })
|
||||
}
|
||||
|
||||
if (!process.env.SOLANA_PRIVATE_KEY) {
|
||||
return NextResponse.json({
|
||||
@@ -155,13 +187,19 @@ export async function POST(request) {
|
||||
|
||||
// Calculate position size in base asset units
|
||||
const currentPrice = 166.75 // Get from oracle in production
|
||||
const baseAssetAmount = (amount * leverage) / currentPrice * 1e9 // Convert to lamports for SOL
|
||||
const calculatedAmount = (amount * leverage) / currentPrice * 1e9 // Convert to lamports for SOL
|
||||
|
||||
// Ensure minimum order size (Drift requires at least 10,000,000 units)
|
||||
const minOrderSize = 10000000 // 0.01 SOL in protocol units
|
||||
const baseAssetAmount = Math.max(calculatedAmount, minOrderSize)
|
||||
|
||||
console.log('📊 Trade parameters:', {
|
||||
marketIndex,
|
||||
direction: direction === PositionDirection.LONG ? 'LONG' : 'SHORT',
|
||||
requestedAmount: calculatedAmount.toString(),
|
||||
baseAssetAmount: baseAssetAmount.toString(),
|
||||
leverage
|
||||
leverage,
|
||||
minOrderSize: minOrderSize.toString()
|
||||
})
|
||||
|
||||
// Place market order
|
||||
@@ -169,12 +207,12 @@ export async function POST(request) {
|
||||
orderType: OrderType.MARKET,
|
||||
marketType: MarketType.PERP,
|
||||
direction,
|
||||
baseAssetAmount: Math.floor(baseAssetAmount),
|
||||
baseAssetAmount: new BN(Math.floor(baseAssetAmount)),
|
||||
marketIndex,
|
||||
}
|
||||
|
||||
console.log('🎯 Placing Drift market order...')
|
||||
const txSig = await driftClient.placeOrder(orderParams)
|
||||
console.log('🎯 Placing Drift perpetual market order...')
|
||||
const txSig = await driftClient.placeAndTakePerpOrder(orderParams)
|
||||
|
||||
console.log('✅ Drift order placed:', txSig)
|
||||
|
||||
@@ -185,17 +223,18 @@ export async function POST(request) {
|
||||
if (stopLoss) {
|
||||
try {
|
||||
const stopLossParams = {
|
||||
orderType: OrderType.LIMIT,
|
||||
orderType: OrderType.TRIGGER_LIMIT,
|
||||
marketType: MarketType.PERP,
|
||||
direction: direction === PositionDirection.LONG ? PositionDirection.SHORT : PositionDirection.LONG,
|
||||
baseAssetAmount: Math.floor(baseAssetAmount),
|
||||
price: stopLoss * 1e6, // Price in 6 decimal format
|
||||
baseAssetAmount: new BN(Math.floor(baseAssetAmount)),
|
||||
price: new BN(Math.floor(stopLoss * 1e6)), // Price in 6 decimal format
|
||||
marketIndex,
|
||||
triggerPrice: stopLoss * 1e6,
|
||||
triggerCondition: direction === PositionDirection.LONG ? 'below' : 'above',
|
||||
triggerPrice: new BN(Math.floor(stopLoss * 1e6)),
|
||||
triggerCondition: direction === PositionDirection.LONG ? OrderTriggerCondition.BELOW : OrderTriggerCondition.ABOVE,
|
||||
reduceOnly: true,
|
||||
}
|
||||
|
||||
const slTxSig = await driftClient.placeOrder(stopLossParams)
|
||||
const slTxSig = await driftClient.placePerpOrder(stopLossParams)
|
||||
stopLossOrderId = slTxSig
|
||||
console.log('🛑 Stop loss order placed:', slTxSig)
|
||||
} catch (slError) {
|
||||
@@ -206,17 +245,18 @@ export async function POST(request) {
|
||||
if (takeProfit) {
|
||||
try {
|
||||
const takeProfitParams = {
|
||||
orderType: OrderType.LIMIT,
|
||||
orderType: OrderType.TRIGGER_LIMIT,
|
||||
marketType: MarketType.PERP,
|
||||
direction: direction === PositionDirection.LONG ? PositionDirection.SHORT : PositionDirection.LONG,
|
||||
baseAssetAmount: Math.floor(baseAssetAmount),
|
||||
price: takeProfit * 1e6, // Price in 6 decimal format
|
||||
baseAssetAmount: new BN(Math.floor(baseAssetAmount)),
|
||||
price: new BN(Math.floor(takeProfit * 1e6)), // Price in 6 decimal format
|
||||
marketIndex,
|
||||
triggerPrice: takeProfit * 1e6,
|
||||
triggerCondition: direction === PositionDirection.LONG ? 'above' : 'below',
|
||||
triggerPrice: new BN(Math.floor(takeProfit * 1e6)),
|
||||
triggerCondition: direction === PositionDirection.LONG ? OrderTriggerCondition.ABOVE : OrderTriggerCondition.BELOW,
|
||||
reduceOnly: true,
|
||||
}
|
||||
|
||||
const tpTxSig = await driftClient.placeOrder(takeProfitParams)
|
||||
const tpTxSig = await driftClient.placePerpOrder(takeProfitParams)
|
||||
takeProfitOrderId = tpTxSig
|
||||
console.log('🎯 Take profit order placed:', tpTxSig)
|
||||
} catch (tpError) {
|
||||
|
||||
Reference in New Issue
Block a user