decharge-scout 1.2.1 → 1.4.0

package/index.js

@@ -20,12 +20,13 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
 import dotenv from 'dotenv';
-import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { readFileSync, writeFileSync, existsSync, readdirSync } 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();
@@ -68,6 +69,45 @@ function generateAgentName() {
   return `Agent-${randomId}`;
 }
 
+/**
+ * Search for existing Solana wallets in common locations
+ */
+function findExistingWallets() {
+  const wallets = [];
+  const searchPaths = [
+    // Current directory
+    path.join(process.cwd(), 'wallet.json'),
+    path.join(process.cwd(), 'id.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'),
+  ];
+
+  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
  */
@@ -77,13 +117,72 @@ async function ensureWallet(walletPath) {
   }
 
   console.log(chalk.yellow(`\n⚠️  No wallet found at ${walletPath}`));
+
+  // Search for existing 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...'));
+      }
+    }
+  }
+
   const answer = await question('Create a new wallet? (Y/n): ');
 
   if (answer.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.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()}`));
+      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...'));
@@ -124,7 +223,12 @@ async function ensureEnvironment() {
   // Check for EIA API key
   if (!process.env.EIA_API_KEY || process.env.EIA_API_KEY === 'your_eia_api_key_here') {
     console.log(chalk.yellow('\n⚠️  EIA_API_KEY not configured'));
-    console.log(chalk.blue('Get a free API key from: https://www.eia.gov/opendata/register.php'));
+    console.log(chalk.blue('\n📝 How to get a FREE EIA API key:'));
+    console.log(chalk.gray('  1. Visit: https://www.eia.gov/opendata/register.php'));
+    console.log(chalk.gray('  2. Fill out the registration form'));
+    console.log(chalk.gray('  3. Check your email and verify your email address'));
+    console.log(chalk.gray('  4. Your API key will be sent to your email'));
+    console.log(chalk.gray('  5. Copy the API key and paste it below\n'));
 
     const answer = await question('Enter your EIA API key (or press Enter to skip): ');
 
@@ -269,8 +373,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...`));
 
@@ -317,40 +422,38 @@ async function runQueryCycle(wallet, agentName, location, options) {
       console.log(chalk.blue('\n📊 Dashboard Data Structure:'));
       console.log(chalk.gray(JSON.stringify(submissionData, null, 2)));
 
-      // Optional: Submit to mock dashboard API
-      if (process.env.DASHBOARD_API_URL) {
-        try {
-          const dashboardSpinner = ora('Submitting to dashboard API...').start();
-          const apiUrl = process.env.DASHBOARD_API_URL;
+      // Submit to DeCharge Scout dashboard
+      try {
+        const dashboardSpinner = ora('Submitting to DeCharge Scout dashboard...').start();
+        const apiUrl = 'https://decharge-scout.vercel.app/api/agentone/submit';
+
+        console.log(chalk.blue(`\n🌐 Dashboard API URL: ${apiUrl}`));
+        console.log(chalk.gray(`📤 Submitting data...`));
+
+        const response = await fetch(apiUrl, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            ...submissionData,
+            wallet: wallet.publicKey.toBase58(),
+            run_number: totalRuns
+          })
+        });
 
-          console.log(chalk.blue(`\n🌐 Dashboard API URL: ${apiUrl}`));
-          console.log(chalk.gray(`📤 Submitting data: ${JSON.stringify(submissionData, null, 2)}`));
+        const responseText = await response.text();
+        console.log(chalk.blue(`📥 API Response Status: ${response.status}`));
 
-          const response = await fetch(apiUrl, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(submissionData)
-          });
-
-          const responseText = await response.text();
-          console.log(chalk.blue(`📥 API Response Status: ${response.status}`));
-          console.log(chalk.gray(`📥 API Response Body: ${responseText}`));
-
-          if (response.ok) {
-            dashboardSpinner.succeed(chalk.green('✅ Dashboard submission successful!'));
-            console.log(chalk.green(`🎉 Data should now appear at: https://decharge-scout.vercel.app/agentone`));
-          } else {
-            dashboardSpinner.warn(chalk.yellow(`⚠️  Dashboard API returned: ${response.status}`));
-            console.log(chalk.yellow(`Response: ${responseText}`));
-          }
-        } catch (error) {
-          // Silent fail for dashboard - it's optional
-          console.log(chalk.red(`❌ Dashboard API error: ${error.message}`));
-          console.log(chalk.gray(`Stack: ${error.stack}`));
+        if (response.ok) {
+          dashboardSpinner.succeed(chalk.green('✅ Dashboard submission successful!'));
+          console.log(chalk.green(`🎉 Data should now appear at: https://decharge-scout.vercel.app/agentone`));
+          console.log(chalk.gray(`Response: ${responseText}`));
+        } else {
+          dashboardSpinner.warn(chalk.yellow(`⚠️  Dashboard API returned: ${response.status}`));
+          console.log(chalk.yellow(`Response: ${responseText}`));
         }
-      } else {
-        console.log(chalk.yellow(`\n⚠️  DASHBOARD_API_URL not set - skipping dashboard submission`));
-        console.log(chalk.gray(`   To enable: Set DASHBOARD_API_URL in .env file`));
+      } catch (error) {
+        console.log(chalk.red(`❌ Dashboard submission failed: ${error.message}`));
+        console.log(chalk.gray(`This won't affect your oracle submission or points`));
       }
 
       // Award points

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decharge-scout",
-  "version": "1.2.1",
+  "version": "1.4.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}`
       };
     });