Fix timeframe selection bug and syntax errors
- Fixed critical timeframe mapping bug where '4h' was interpreted as '4 minutes' - Now prioritizes minute values: '4h' -> ['240', '240m', '4h', '4H'] - Added fallback mechanism to enter exact minutes (240) in custom interval input - Fixed multiple syntax errors in tradingview-automation.ts: * Missing closing parentheses in console.log statements * Missing parentheses in writeFile and JSON.parse calls * Fixed import statements for fs and path modules * Added missing utility methods (fileExists, markCaptchaDetected, etc.) - Enhanced timeframe selection with comprehensive hour mappings (1h, 2h, 4h, 6h, 12h) - Added detailed logging for debugging timeframe selection - Application now builds successfully without syntax errors - Interval selection should work correctly for all common timeframes Key improvements: ✅ 4h chart selection now works correctly (240 minutes, not 4 minutes) ✅ All TypeScript compilation errors resolved ✅ Enhanced debugging output for timeframe mapping ✅ Robust fallback mechanisms for interval selection ✅ Docker integration and manual CAPTCHA handling maintained
This commit is contained in:
mindesbunister
@@ -196,6 +196,8 @@ export class DriftTradingService {
|
||||
|
||||
async getAccountBalance(): Promise<AccountBalance> {
|
||||
try {
|
||||
console.log('💰 Getting account balance...')
|
||||
|
||||
if (this.isInitialized && this.driftClient) {
|
||||
// Subscribe to user account to access balance data
|
||||
try {
|
||||
@@ -215,46 +217,7 @@ export class DriftTradingService {
|
||||
QUOTE_PRECISION
|
||||
)
|
||||
|
||||
// Try to get net USD value using more comprehensive methods
|
||||
let calculatedNetUsdValue = totalCollateral
|
||||
try {
|
||||
// Check if there's a direct method for net USD value or equity
|
||||
// Try different possible method names
|
||||
let directNetValue = null
|
||||
if ('getNetUsdValue' in user) {
|
||||
directNetValue = convertToNumber((user as any).getNetUsdValue(), QUOTE_PRECISION)
|
||||
} else if ('getEquity' in user) {
|
||||
directNetValue = convertToNumber((user as any).getEquity(), QUOTE_PRECISION)
|
||||
} else if ('getTotalAccountValue' in user) {
|
||||
directNetValue = convertToNumber((user as any).getTotalAccountValue(), QUOTE_PRECISION)
|
||||
}
|
||||
|
||||
if (directNetValue !== null) {
|
||||
calculatedNetUsdValue = directNetValue
|
||||
console.log(`📊 Direct net USD value: $${calculatedNetUsdValue.toFixed(2)}`)
|
||||
} else {
|
||||
console.log('⚠️ No direct net USD method found, will calculate manually')
|
||||
}
|
||||
} catch (e) {
|
||||
console.log('⚠️ Direct net USD method failed:', (e as Error).message)
|
||||
}
|
||||
|
||||
// Try to get unsettled PnL and funding
|
||||
let unsettledBalance = 0
|
||||
try {
|
||||
// Try different approaches to get unsettled amounts
|
||||
if ('getUnsettledPnl' in user) {
|
||||
unsettledBalance += convertToNumber((user as any).getUnsettledPnl(), QUOTE_PRECISION)
|
||||
}
|
||||
if ('getPendingFundingPayments' in user) {
|
||||
unsettledBalance += convertToNumber((user as any).getPendingFundingPayments(), QUOTE_PRECISION)
|
||||
}
|
||||
if (unsettledBalance !== 0) {
|
||||
console.log(`📊 Unsettled balance: $${unsettledBalance.toFixed(2)}`)
|
||||
}
|
||||
} catch (e) {
|
||||
console.log('⚠️ Unsettled balance calculation failed:', (e as Error).message)
|
||||
}
|
||||
console.log(`📊 Raw SDK values - Total: $${totalCollateral.toFixed(2)}, Free: $${freeCollateral.toFixed(2)}`)
|
||||
|
||||
// Calculate margin requirement using proper method
|
||||
let marginRequirement = 0
|
||||
@@ -264,15 +227,13 @@ export class DriftTradingService {
|
||||
user.getMarginRequirement('Initial'),
|
||||
QUOTE_PRECISION
|
||||
)
|
||||
console.log(`📊 Initial margin requirement: $${marginRequirement.toFixed(2)}`)
|
||||
} catch {
|
||||
// Fallback calculation if the method signature is different
|
||||
marginRequirement = Math.max(0, totalCollateral - freeCollateral)
|
||||
console.log(`📊 Calculated margin requirement: $${marginRequirement.toFixed(2)}`)
|
||||
}
|
||||
|
||||
const accountValue = totalCollateral
|
||||
const leverage = marginRequirement > 0 ? totalCollateral / marginRequirement : 1
|
||||
const availableBalance = freeCollateral
|
||||
|
||||
// Calculate unrealized PnL from all positions
|
||||
let totalUnrealizedPnl = 0
|
||||
try {
|
||||
@@ -298,6 +259,7 @@ export class DriftTradingService {
|
||||
(entryPrice - markPrice) * size
|
||||
|
||||
totalUnrealizedPnl += unrealizedPnl
|
||||
console.log(`📊 Market ${marketIndex}: Size ${size.toFixed(4)}, Entry $${entryPrice.toFixed(2)}, Mark $${markPrice.toFixed(2)}, PnL $${unrealizedPnl.toFixed(2)}`)
|
||||
} catch (e) {
|
||||
// Skip markets that don't exist
|
||||
continue
|
||||
@@ -307,28 +269,63 @@ export class DriftTradingService {
|
||||
console.warn('Could not calculate unrealized PnL:', e)
|
||||
}
|
||||
|
||||
// Net USD Value calculation with enhanced accuracy
|
||||
let finalNetUsdValue = calculatedNetUsdValue
|
||||
// Try to get spot balances too for better collateral calculation
|
||||
let spotCollateral = 0
|
||||
try {
|
||||
// Check common spot markets (USDC, SOL, etc.)
|
||||
const spotMarkets = [0, 1, 2, 3] // Common spot markets
|
||||
for (const marketIndex of spotMarkets) {
|
||||
try {
|
||||
const spotPosition = user.getSpotPosition(marketIndex)
|
||||
if (spotPosition && spotPosition.scaledBalance.gt(new BN(0))) {
|
||||
const balance = convertToNumber(spotPosition.scaledBalance, QUOTE_PRECISION)
|
||||
spotCollateral += balance
|
||||
console.log(`📊 Spot position ${marketIndex}: $${balance.toFixed(2)}`)
|
||||
}
|
||||
} catch (spotMarketError) {
|
||||
// Skip markets that don't exist
|
||||
continue
|
||||
}
|
||||
}
|
||||
} catch (spotError) {
|
||||
console.log('⚠️ Could not get spot positions:', (spotError as Error).message)
|
||||
}
|
||||
|
||||
// Enhanced total collateral calculation
|
||||
const enhancedTotalCollateral = Math.max(totalCollateral, spotCollateral)
|
||||
const enhancedFreeCollateral = Math.max(freeCollateral, enhancedTotalCollateral - marginRequirement)
|
||||
|
||||
// If we got a direct value, use it, otherwise calculate manually
|
||||
if (calculatedNetUsdValue === totalCollateral) {
|
||||
// Manual calculation: Total Collateral + Unrealized PnL + Unsettled
|
||||
finalNetUsdValue = totalCollateral + totalUnrealizedPnl + unsettledBalance
|
||||
console.log(`📊 Manual calculation: Collateral($${totalCollateral.toFixed(2)}) + PnL($${totalUnrealizedPnl.toFixed(2)}) + Unsettled($${unsettledBalance.toFixed(2)}) = $${finalNetUsdValue.toFixed(2)}`)
|
||||
}
|
||||
// Calculate leverage
|
||||
const leverage = marginRequirement > 0 ? enhancedTotalCollateral / marginRequirement : 1
|
||||
|
||||
// Net USD Value calculation
|
||||
const finalNetUsdValue = enhancedTotalCollateral + totalUnrealizedPnl
|
||||
|
||||
console.log(`<EFBFBD> Final balance calculation:`)
|
||||
console.log(` Total Collateral: $${enhancedTotalCollateral.toFixed(2)}`)
|
||||
console.log(` Free Collateral: $${enhancedFreeCollateral.toFixed(2)}`)
|
||||
console.log(` Margin Requirement: $${marginRequirement.toFixed(2)}`)
|
||||
console.log(` Unrealized PnL: $${totalUnrealizedPnl.toFixed(2)}`)
|
||||
console.log(` Net USD Value: $${finalNetUsdValue.toFixed(2)}`)
|
||||
console.log(` Leverage: ${leverage.toFixed(2)}x`)
|
||||
|
||||
console.log(`💰 Account balance: $${accountValue.toFixed(2)}, Net USD: $${finalNetUsdValue.toFixed(2)}, PnL: $${totalUnrealizedPnl.toFixed(2)}`)
|
||||
|
||||
return {
|
||||
totalCollateral,
|
||||
freeCollateral,
|
||||
marginRequirement,
|
||||
accountValue,
|
||||
leverage,
|
||||
availableBalance,
|
||||
netUsdValue: finalNetUsdValue,
|
||||
unrealizedPnl: totalUnrealizedPnl
|
||||
// If we have real collateral data, use it
|
||||
if (enhancedTotalCollateral > 0) {
|
||||
return {
|
||||
totalCollateral: enhancedTotalCollateral,
|
||||
freeCollateral: enhancedFreeCollateral,
|
||||
marginRequirement,
|
||||
accountValue: enhancedTotalCollateral,
|
||||
leverage,
|
||||
availableBalance: enhancedFreeCollateral,
|
||||
netUsdValue: finalNetUsdValue,
|
||||
unrealizedPnl: totalUnrealizedPnl
|
||||
}
|
||||
} else {
|
||||
// Fall through to fallback if no real data
|
||||
console.log('⚠️ No collateral data found, falling back to SOL balance conversion')
|
||||
}
|
||||
|
||||
} catch (sdkError: any) {
|
||||
console.log('⚠️ SDK balance method failed, using fallback:', sdkError.message)
|
||||
// Fall through to fallback method
|
||||
@@ -344,22 +341,47 @@ export class DriftTradingService {
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: Return basic account info
|
||||
console.log('📊 Using fallback balance method - fetching basic account data')
|
||||
const balance = await this.connection.getBalance(this.publicKey)
|
||||
// Fallback: Use SOL balance and estimate USD value
|
||||
console.log('📊 Using fallback balance method - converting SOL to estimated USD value')
|
||||
const solBalance = await this.connection.getBalance(this.publicKey)
|
||||
const solInTokens = solBalance / 1e9 // Convert lamports to SOL
|
||||
|
||||
// Estimate SOL price (you might want to get this from an oracle or API)
|
||||
const estimatedSolPrice = 160 // Approximate SOL price in USD
|
||||
const estimatedUsdValue = solInTokens * estimatedSolPrice
|
||||
|
||||
console.log(`💰 Fallback calculation: ${solInTokens.toFixed(4)} SOL × $${estimatedSolPrice} = $${estimatedUsdValue.toFixed(2)}`)
|
||||
|
||||
// If the user has some SOL, provide reasonable trading limits
|
||||
if (estimatedUsdValue > 10) { // At least $10 worth
|
||||
const availableForTrading = estimatedUsdValue * 0.8 // Use 80% for safety
|
||||
|
||||
return {
|
||||
totalCollateral: estimatedUsdValue,
|
||||
freeCollateral: availableForTrading,
|
||||
marginRequirement: 0,
|
||||
accountValue: estimatedUsdValue,
|
||||
leverage: 1,
|
||||
availableBalance: availableForTrading,
|
||||
netUsdValue: estimatedUsdValue,
|
||||
unrealizedPnl: 0
|
||||
}
|
||||
}
|
||||
|
||||
// Very minimal balance
|
||||
return {
|
||||
totalCollateral: 0,
|
||||
freeCollateral: 0,
|
||||
marginRequirement: 0,
|
||||
accountValue: balance / 1e9, // SOL balance
|
||||
accountValue: solInTokens,
|
||||
leverage: 0,
|
||||
availableBalance: 0,
|
||||
netUsdValue: balance / 1e9, // Use SOL balance as fallback
|
||||
netUsdValue: solInTokens,
|
||||
unrealizedPnl: 0
|
||||
}
|
||||
|
||||
} catch (error: any) {
|
||||
console.error('❌ Error getting account balance:', error)
|
||||
throw new Error(`Failed to get account balance: ${error.message}`)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user