decharge-scout 2.0.0 → 2.2.0

package/index.js

@@ -20,13 +20,11 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
 import dotenv from 'dotenv';
-import { readFileSync, writeFileSync, existsSync, readdirSync } from 'fs';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { createInterface } from 'readline';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
-import { Keypair } from '@solana/web3.js';
-import os from 'os';
 
 // Load environment variables
 dotenv.config();
@@ -47,8 +45,6 @@ const __dirname = dirname(__filename);
 // Configuration
 const STAKE_AMOUNT = parseFloat(process.env.STAKE_AMOUNT || '0.01');
 const CYCLE_INTERVAL_MS = 15 * 60 * 1000; // 15 minutes
-// Use current working directory for wallet by default (not package installation dir)
-const DEFAULT_WALLET_PATH = path.join(process.cwd(), 'wallet.json');
 
 // Global state
 let isRunning = true;
@@ -71,166 +67,6 @@ function generateAgentName() {
   return `Agent-${randomId}`;
 }
 
-/**
- * Search for existing Solana wallets in common locations
- */
-function findExistingWallets() {
-  const wallets = [];
-  const homeDir = os.homedir();
-  const cwd = process.cwd();
-
-  const searchPaths = [
-    // Current directory - most common
-    path.join(cwd, 'wallet.json'),
-    path.join(cwd, 'id.json'),
-    path.join(cwd, 'keypair.json'),
-    path.join(cwd, 'solana-wallet.json'),
-    path.join(cwd, 'my-wallet.json'),
-
-    // Package directory (for global installations)
-    path.join(__dirname, 'wallet.json'),
-    path.join(__dirname, 'id.json'),
-
-    // Solana CLI default locations
-    path.join(homeDir, '.config', 'solana', 'id.json'),
-    path.join(homeDir, '.solana', 'id.json'),
-    path.join(homeDir, '.solana', 'devnet.json'),
-    path.join(homeDir, '.solana', 'testnet.json'),
-
-    // Home directory
-    path.join(homeDir, 'wallet.json'),
-    path.join(homeDir, 'solana-wallet.json'),
-
-    // Downloads (users often save here)
-    path.join(homeDir, 'Downloads', 'wallet.json'),
-    path.join(homeDir, 'Downloads', 'solana-wallet.json'),
-    path.join(homeDir, 'Downloads', 'keypair.json'),
-  ];
-
-  for (const walletPath of searchPaths) {
-    if (existsSync(walletPath)) {
-      try {
-        const keyData = JSON.parse(readFileSync(walletPath, 'utf-8'));
-        if (Array.isArray(keyData) && keyData.length === 64) {
-          const keypair = Keypair.fromSecretKey(Uint8Array.from(keyData));
-          wallets.push({
-            path: walletPath,
-            publicKey: keypair.publicKey.toBase58(),
-            name: path.basename(walletPath),
-            location: path.dirname(walletPath)
-          });
-        }
-      } catch (error) {
-        // Skip invalid wallets
-      }
-    }
-  }
-
-  return wallets;
-}
-
-/**
- * Auto-create wallet if missing
- */
-async function ensureWallet(walletPath) {
-  if (existsSync(walletPath)) {
-    console.log(chalk.green(`✓ Using wallet: ${walletPath}`));
-    return walletPath;
-  }
-
-  console.log(chalk.yellow(`\n⚠️  No wallet found at ${walletPath}`));
-
-  // Search for existing wallets
-  console.log(chalk.blue('🔍 Searching for existing Solana wallets...'));
-  const existingWallets = findExistingWallets();
-
-  if (existingWallets.length > 0) {
-    console.log(chalk.green(`\n✓ Found ${existingWallets.length} existing wallet(s):\n`));
-
-    existingWallets.forEach((wallet, index) => {
-      console.log(chalk.cyan(`  ${index + 1}. ${wallet.name}`));
-      console.log(chalk.gray(`     Path: ${wallet.path}`));
-      console.log(chalk.gray(`     Public Key: ${wallet.publicKey}\n`));
-    });
-
-    const useExisting = await question('Use an existing wallet? (Enter number, or press Enter to create new): ');
-
-    if (useExisting.trim() && !isNaN(useExisting)) {
-      const index = parseInt(useExisting.trim()) - 1;
-      if (index >= 0 && index < existingWallets.length) {
-        const selectedWallet = existingWallets[index];
-        console.log(chalk.green(`✓ Using wallet: ${selectedWallet.publicKey}`));
-        return selectedWallet.path;
-      } else {
-        console.log(chalk.yellow('Invalid selection, creating new wallet...'));
-      }
-    }
-  } else {
-    console.log(chalk.yellow('⚠️  No existing wallets found in common locations.'));
-    console.log(chalk.gray('   Searched: ~/.solana/id.json, ./wallet.json, ./id.json, etc.\n'));
-  }
-
-  const answer = await question('Create a new wallet? (Y/n): ');
-
-  if (answer.toLowerCase() === 'n') {
-    console.log(chalk.blue('\n📥 Import existing wallet'));
-    const importAnswer = await question('Do you want to import an existing wallet private key? (Y/n): ');
-
-    if (importAnswer.toLowerCase() === 'n') {
-      console.log(chalk.blue('\nYou can create a wallet manually:'));
-      console.log(chalk.gray('  solana-keygen new --outfile ./wallet.json'));
-      console.log(chalk.gray('  Or run: node setup.js\n'));
-      process.exit(1);
-    }
-
-    console.log(chalk.yellow('\n⚠️  Enter your Solana wallet private key'));
-    console.log(chalk.gray('Format: [1,2,3,...] (array of 64 numbers)'));
-    const privateKeyInput = await question('Private key: ');
-
-    try {
-      // Parse the private key
-      const privateKey = JSON.parse(privateKeyInput.trim());
-
-      // Validate it's an array of numbers
-      if (!Array.isArray(privateKey) || privateKey.length !== 64) {
-        throw new Error('Invalid private key format');
-      }
-
-      // Create keypair to validate
-      const keypair = Keypair.fromSecretKey(Uint8Array.from(privateKey));
-
-      // Save to file
-      writeFileSync(walletPath, JSON.stringify(privateKey));
-
-      console.log(chalk.green(`✓ Wallet imported: ${keypair.publicKey.toBase58()}`));
-      console.log(chalk.blue(`📁 Wallet saved to: ${walletPath}`));
-      return walletPath;
-    } catch (error) {
-      console.log(chalk.red(`\n❌ Invalid private key: ${error.message}`));
-      console.log(chalk.gray('Expected format: [1,2,3,...] (array of 64 numbers)\n'));
-      process.exit(1);
-    }
-  }
-
-  console.log(chalk.blue('Generating new wallet...'));
-
-  const keypair = Keypair.generate();
-  const secretKey = Array.from(keypair.secretKey);
-
-  writeFileSync(walletPath, JSON.stringify(secretKey));
-
-  console.log(chalk.green(`✓ Wallet created: ${keypair.publicKey.toBase58()}`));
-  console.log(chalk.blue(`📁 Wallet saved to: ${walletPath}`));
-  console.log(chalk.yellow('⚠️  IMPORTANT: Backup this wallet file!'));
-  console.log(chalk.blue(`\nYou need devnet SOL. Get it from:`));
-  console.log(chalk.gray('  solana airdrop 1 ' + keypair.publicKey.toBase58() + ' --url devnet'));
-  console.log(chalk.gray('  Or visit: https://faucet.solana.com/\n'));
-
-  await question('Press Enter after funding your wallet...');
-
-  return walletPath;
-}
-
 /**
  * Auto-configure .env if needed
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decharge-scout",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "AI-powered energy grid data scout with Solana integration",
   "main": "index.js",
   "type": "module",

package/src/wallet-server.js

@@ -6,13 +6,15 @@
  */
 
 import express from 'express';
-import { WebSocketServer } from 'ws';
+import WebSocket from 'ws';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 import open from 'open';
 import chalk from 'chalk';
 
+const { WebSocketServer } = WebSocket;
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);