decharge-scout 1.3.0 → 1.5.0

package/index.js

@@ -46,7 +46,8 @@ const __dirname = dirname(__filename);
 // Configuration
 const STAKE_AMOUNT = parseFloat(process.env.STAKE_AMOUNT || '0.01');
 const CYCLE_INTERVAL_MS = 15 * 60 * 1000; // 15 minutes
-const DEFAULT_WALLET_PATH = path.join(__dirname, 'wallet.json');
+// 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;
@@ -74,16 +75,35 @@ function generateAgentName() {
  */
 function findExistingWallets() {
   const wallets = [];
+  const homeDir = os.homedir();
+  const cwd = process.cwd();
+
   const searchPaths = [
-    // Current directory
-    path.join(process.cwd(), 'wallet.json'),
-    path.join(process.cwd(), 'id.json'),
+    // 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(os.homedir(), '.solana', 'id.json'),
-    path.join(os.homedir(), 'wallet.json'),
-    // Common wallet names in current dir
-    path.join(process.cwd(), 'solana-wallet.json'),
-    path.join(process.cwd(), 'keypair.json'),
+    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) {
@@ -119,10 +139,11 @@ async function ensureWallet(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`));
+    console.log(chalk.green(`\n✓ Found ${existingWallets.length} existing wallet(s):\n`));
 
     existingWallets.forEach((wallet, index) => {
       console.log(chalk.cyan(`  ${index + 1}. ${wallet.name}`));
@@ -142,6 +163,9 @@ async function ensureWallet(walletPath) {
         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): ');
@@ -177,6 +201,7 @@ async function ensureWallet(walletPath) {
       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}`));
@@ -193,6 +218,7 @@ async function ensureWallet(walletPath) {
   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'));
@@ -373,8 +399,9 @@ async function runQueryCycle(wallet, agentName, location, options) {
       let energyData;
 
       try {
-        energyData = await fetchEnergyData();
-        dataSpinner.succeed(chalk.green(`Fetched ${energyData.length} data points from EIA (ERCOT)`));
+        energyData = await fetchEnergyData(location);
+        const gridRegion = energyData[0]?.source?.split('-')[1] || 'Unknown';
+        dataSpinner.succeed(chalk.green(`Fetched ${energyData.length} data points from ${energyData[0]?.source || 'EIA'}`));
       } catch (error) {
         dataSpinner.warn(chalk.yellow(`EIA API failed, trying Electricity Maps...`));
 

package/package.json

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

package/src/energy-data.js

@@ -13,15 +13,48 @@ const EIA_API_KEY = process.env.EIA_API_KEY;
 const EIA_BASE_URL = 'https://api.eia.gov/v2';
 
 /**
- * Fetch energy data from EIA API (ERCOT)
+ * Map location to EIA grid region codes
  */
-export async function fetchEnergyData() {
+function getGridRegionForLocation(location) {
+  const locationLower = location.toLowerCase();
+
+  // Map states/regions to grid operators
+  if (locationLower.includes('texas') || locationLower.includes('tx') || locationLower.includes('dallas') || locationLower.includes('houston') || locationLower.includes('austin')) {
+    return 'ERCT'; // ERCOT (Texas)
+  } else if (locationLower.includes('california') || locationLower.includes('ca')) {
+    return 'CISO'; // California ISO
+  } else if (locationLower.includes('new york') || locationLower.includes('ny')) {
+    return 'NYIS'; // New York ISO
+  } else if (locationLower.includes('new england') || locationLower.includes('massachusetts') || locationLower.includes('ma')) {
+    return 'ISNE'; // ISO New England
+  } else if (locationLower.includes('pjm') || locationLower.includes('pennsylvania') || locationLower.includes('pa')) {
+    return 'PJM'; // PJM Interconnection
+  } else if (locationLower.includes('miso') || locationLower.includes('midwest')) {
+    return 'MISO'; // Midcontinent ISO
+  }
+
+  // Default to ERCOT if unknown
+  return 'ERCT';
+}
+
+/**
+ * Fetch energy data from EIA API
+ */
+export async function fetchEnergyData(location = 'Texas, USA') {
   if (!EIA_API_KEY || EIA_API_KEY === 'your_eia_api_key_here' || EIA_API_KEY.length < 20) {
     console.warn('⚠️  EIA_API_KEY not configured or invalid');
     console.warn('   Get a free key: https://www.eia.gov/opendata/register.php');
     throw new Error('EIA_API_KEY not configured');
   }
 
+  // Debug logging (show first 6 and last 4 chars of API key)
+  const keyPreview = `${EIA_API_KEY.substring(0, 6)}...${EIA_API_KEY.substring(EIA_API_KEY.length - 4)}`;
+  console.log(`📡 Using EIA API key: ${keyPreview}`);
+
+  // Determine grid region from location
+  const gridRegion = getGridRegionForLocation(location);
+  console.log(`🗺️  Location: ${location} → Grid Region: ${gridRegion}`);
+
   try {
     // Calculate time range (last 24 hours to next 24 hours for forecast)
     const now = new Date();
@@ -29,12 +62,12 @@ export async function fetchEnergyData() {
     const startDate = yesterday.toISOString().split('T')[0] + 'T00';
     const endDate = now.toISOString().split('T')[0] + 'T23';
 
-    // EIA API endpoint for ERCOT real-time data
+    // EIA API endpoint for regional real-time data
     const url = `${EIA_BASE_URL}/electricity/rto/region-data/data/?` +
       `api_key=${EIA_API_KEY}` +
       `&frequency=hourly` +
       `&data[0]=value` +
-      `&facets[respondent][]=ERCT` +
+      `&facets[respondent][]=${gridRegion}` +
       `&facets[type][]=D` + // Demand
       `&start=${startDate}` +
       `&end=${endDate}` +
@@ -42,6 +75,8 @@ export async function fetchEnergyData() {
       `&sort[0][direction]=desc` +
       `&length=48`;
 
+    console.log(`🔗 EIA API URL: ${url.replace(EIA_API_KEY, keyPreview)}`);
+
     const response = await fetch(url, {
       headers: {
         'Accept': 'application/json'
@@ -74,7 +109,7 @@ export async function fetchEnergyData() {
         hour: new Date(item.period).getHours(),
         demand: demand,
         price: Math.max(0.03, Math.min(0.15, price)), // Clamp between 3-15 cents
-        source: 'EIA-ERCOT'
+        source: `EIA-${gridRegion}`
       };
     });