@darksol/terminal 0.11.0 → 0.13.0

package/src/wallet/history.js

@@ -1,93 +1,94 @@
 import fetch from 'node-fetch';
 import { loadWallet } from './keystore.js';
-import { getConfig, getRPC } from '../config/store.js';
+import { getConfig } from '../config/store.js';
 import { theme } from '../ui/theme.js';
-import { spinner, kvDisplay, success, error, warn, info, table } from '../ui/components.js';
+import { spinner, error, info, table } from '../ui/components.js';
 import { showSection } from '../ui/banner.js';
 
-// ══════════════════════════════════════════════════
-// TRANSACTION HISTORY
-// ══════════════════════════════════════════════════
-
 const EXPLORER_APIS = {
-  base:     { api: 'https://api.basescan.org/api',                  explorer: 'https://basescan.org' },
-  ethereum: { api: 'https://api.etherscan.io/api',                  explorer: 'https://etherscan.io' },
-  arbitrum: { api: 'https://api.arbiscan.io/api',                   explorer: 'https://arbiscan.io' },
-  optimism: { api: 'https://api-optimistic.etherscan.io/api',       explorer: 'https://optimistic.etherscan.io' },
-  polygon:  { api: 'https://api.polygonscan.com/api',               explorer: 'https://polygonscan.com' },
+  base: { api: 'https://api.basescan.org/api', explorer: 'https://basescan.org' },
+  ethereum: { api: 'https://api.etherscan.io/api', explorer: 'https://etherscan.io' },
+  arbitrum: { api: 'https://api.arbiscan.io/api', explorer: 'https://arbiscan.io' },
+  optimism: { api: 'https://api-optimistic.etherscan.io/api', explorer: 'https://optimistic.etherscan.io' },
+  polygon: { api: 'https://api.polygonscan.com/api', explorer: 'https://polygonscan.com' },
 };
 
-/**
- * Show recent transaction history
- */
-export async function showHistory(walletName, opts = {}) {
+export async function fetchHistorySnapshot(walletName, opts = {}) {
   const name = walletName || getConfig('activeWallet');
   if (!name) {
-    error('No wallet specified. Use: darksol wallet history <name>');
-    return;
+    throw new Error('No wallet specified. Use: darksol wallet history <name>');
   }
 
   const walletData = loadWallet(name);
   const address = walletData.address;
   const chain = opts.chain || walletData.chain || getConfig('chain') || 'base';
-  const limit = parseInt(opts.limit || '10');
-
+  const limit = parseInt(opts.limit || '10', 10);
   const explorerConfig = EXPLORER_APIS[chain];
+
   if (!explorerConfig) {
-    error(`No explorer API for chain: ${chain}`);
+    throw new Error(`No explorer API for chain: ${chain}`);
+  }
+
+  const url = `${explorerConfig.api}?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=1&offset=${limit}&sort=desc`;
+  const resp = await fetch(url);
+  const data = await resp.json();
+
+  return {
+    name,
+    address,
+    chain,
+    explorer: explorerConfig.explorer,
+    status: data.status,
+    transactions: Array.isArray(data.result) ? data.result : [],
+  };
+}
+
+export async function showHistory(walletName, opts = {}) {
+  const name = walletName || getConfig('activeWallet');
+  if (!name) {
+    error('No wallet specified. Use: darksol wallet history <name>');
     return;
   }
 
+  const chain = opts.chain || getConfig('chain') || 'base';
   const spin = spinner(`Fetching history on ${chain}...`).start();
 
   try {
-    // Fetch normal transactions
-    const url = `${explorerConfig.api}?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=1&offset=${limit}&sort=desc`;
-    const resp = await fetch(url);
-    const data = await resp.json();
+    const snapshot = await fetchHistorySnapshot(name, opts);
+    const { address, chain: resolvedChain, explorer, status, transactions } = snapshot;
 
-    if (data.status !== '1' || !data.result?.length) {
+    if (status !== '1' || !transactions.length) {
       spin.succeed('No transactions found');
-      info(`No recent transactions on ${chain}`);
+      info(`No recent transactions on ${resolvedChain}`);
       return;
     }
 
-    spin.succeed(`Found ${data.result.length} transactions`);
+    spin.succeed(`Found ${transactions.length} transactions`);
 
     console.log('');
-    showSection(`HISTORY — ${name} (${chain})`);
+    showSection(`HISTORY - ${name} (${resolvedChain})`);
     console.log(theme.dim(`  ${address}`));
     console.log('');
 
-    const rows = data.result.map(tx => {
+    const rows = transactions.map((tx) => {
       const isOutgoing = tx.from.toLowerCase() === address.toLowerCase();
-      const direction = isOutgoing ? theme.accent('OUT →') : theme.success('← IN');
+      const direction = isOutgoing ? theme.accent('OUT ->') : theme.success('<- IN');
       const value = parseFloat(tx.value) / 1e18;
       const valueStr = value > 0 ? `${value.toFixed(4)} ETH` : theme.dim('0 ETH');
-      const status = tx.isError === '0' ? theme.success('✓') : theme.accent('✗');
-      const date = new Date(parseInt(tx.timeStamp) * 1000);
+      const statusMark = tx.isError === '0' ? theme.success('OK') : theme.accent('XX');
+      const date = new Date(parseInt(tx.timeStamp, 10) * 1000);
       const dateStr = date.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
       const timeStr = date.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit' });
       const counterparty = isOutgoing ? tx.to : tx.from;
-      const shortAddr = counterparty ? `${counterparty.slice(0, 6)}...${counterparty.slice(-4)}` : '—';
-      const method = tx.functionName ? tx.functionName.split('(')[0] : (value > 0 ? 'transfer' : '—');
-
-      return [
-        status,
-        direction,
-        valueStr,
-        shortAddr,
-        method.slice(0, 16),
-        `${dateStr} ${timeStr}`,
-      ];
+      const shortAddr = counterparty ? `${counterparty.slice(0, 6)}...${counterparty.slice(-4)}` : '--';
+      const method = tx.functionName ? tx.functionName.split('(')[0] : (value > 0 ? 'transfer' : '--');
+      return [statusMark, direction, valueStr, shortAddr, method.slice(0, 16), `${dateStr} ${timeStr}`];
     });
 
     table(['', 'Dir', 'Value', 'Address', 'Method', 'Date'], rows);
-
     console.log('');
-    info(`Explorer: ${explorerConfig.explorer}/address/${address}`);
+    info(`Explorer: ${explorer}/address/${address}`);
     console.log('');
-
   } catch (err) {
     spin.fail('Failed to fetch history');
     error(err.message);

package/src/wallet/portfolio.js

@@ -1,20 +1,16 @@
 import { ethers } from 'ethers';
-import { loadWallet, listWallets } from './keystore.js';
+import { loadWallet } from './keystore.js';
 import { getConfig, getRPC } from '../config/store.js';
 import { theme } from '../ui/theme.js';
-import { spinner, kvDisplay, success, error, warn, info, table } from '../ui/components.js';
+import { spinner, kvDisplay, error, info, table } from '../ui/components.js';
 import { showSection } from '../ui/banner.js';
 
-// ══════════════════════════════════════════════════
-// MULTI-CHAIN PORTFOLIO VIEW
-// ══════════════════════════════════════════════════
-
 const CHAINS = {
-  base:     { name: 'Base',     rpc: 'https://mainnet.base.org',        usdc: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', explorer: 'https://basescan.org' },
-  ethereum: { name: 'Ethereum', rpc: 'https://eth.llamarpc.com',        usdc: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', explorer: 'https://etherscan.io' },
-  arbitrum: { name: 'Arbitrum', rpc: 'https://arb1.arbitrum.io/rpc',    usdc: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831', explorer: 'https://arbiscan.io' },
-  optimism: { name: 'Optimism', rpc: 'https://mainnet.optimism.io',     usdc: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85', explorer: 'https://optimistic.etherscan.io' },
-  polygon:  { name: 'Polygon',  rpc: 'https://polygon-rpc.com',         usdc: '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359', explorer: 'https://polygonscan.com' },
+  base: { name: 'Base', rpc: 'https://mainnet.base.org', usdc: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', explorer: 'https://basescan.org' },
+  ethereum: { name: 'Ethereum', rpc: 'https://eth.llamarpc.com', usdc: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', explorer: 'https://etherscan.io' },
+  arbitrum: { name: 'Arbitrum', rpc: 'https://arb1.arbitrum.io/rpc', usdc: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831', explorer: 'https://arbiscan.io' },
+  optimism: { name: 'Optimism', rpc: 'https://mainnet.optimism.io', usdc: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85', explorer: 'https://optimistic.etherscan.io' },
+  polygon: { name: 'Polygon', rpc: 'https://polygon-rpc.com', usdc: '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359', explorer: 'https://polygonscan.com' },
 };
 
 const ERC20_ABI = [
@@ -22,68 +18,50 @@ const ERC20_ABI = [
   'function decimals() view returns (uint8)',
 ];
 
-/**
- * Show portfolio across all EVM chains
- */
-export async function showPortfolio(walletName, opts = {}) {
+export async function fetchPortfolioSnapshot(walletName) {
   const name = walletName || getConfig('activeWallet');
   if (!name) {
-    error('No wallet specified. Use: darksol wallet portfolio <name>');
-    return;
+    throw new Error('No wallet specified. Use: darksol wallet portfolio <name>');
   }
 
   const walletData = loadWallet(name);
   const address = walletData.address;
 
-  console.log('');
-  showSection(`PORTFOLIO — ${name}`);
-  console.log(theme.dim(`  ${address}`));
-  console.log('');
-
-  const spin = spinner('Scanning all chains...').start();
-  const results = [];
-  let totalUSD = 0;
-
-  // Fetch ETH price for USD conversion
   let ethPrice = 0;
   try {
     const fetch = (await import('node-fetch')).default;
     const priceResp = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd');
     const priceData = await priceResp.json();
     ethPrice = priceData.ethereum?.usd || 0;
-  } catch { ethPrice = 3000; /* fallback estimate */ }
+  } catch {
+    ethPrice = 3000;
+  }
 
-  // Scan each chain in parallel
-  const chainPromises = Object.entries(CHAINS).map(async ([chainId, chain]) => {
+  const chains = await Promise.all(Object.entries(CHAINS).map(async ([chainId, chain]) => {
     try {
       const rpc = getRPC(chainId) || chain.rpc;
       const provider = new ethers.JsonRpcProvider(rpc);
-
-      // ETH balance
       const balance = await provider.getBalance(address);
-      const ethBal = parseFloat(ethers.formatEther(balance));
+      const eth = parseFloat(ethers.formatEther(balance));
 
-      // USDC balance
-      let usdcBal = 0;
+      let usdc = 0;
       if (chain.usdc) {
         try {
-          const usdc = new ethers.Contract(chain.usdc, ERC20_ABI, provider);
-          const raw = await usdc.balanceOf(address);
-          const decimals = await usdc.decimals();
-          usdcBal = parseFloat(ethers.formatUnits(raw, decimals));
-        } catch { }
+          const usdcContract = new ethers.Contract(chain.usdc, ERC20_ABI, provider);
+          const raw = await usdcContract.balanceOf(address);
+          const decimals = await usdcContract.decimals();
+          usdc = parseFloat(ethers.formatUnits(raw, decimals));
+        } catch {}
       }
 
-      const ethUSD = ethBal * ethPrice;
-      const chainTotal = ethUSD + usdcBal;
-
+      const ethUSD = eth * ethPrice;
       return {
         chain: chain.name,
         chainId,
-        eth: ethBal,
-        usdc: usdcBal,
+        eth,
+        usdc,
         ethUSD,
-        total: chainTotal,
+        total: ethUSD + usdc,
         explorer: chain.explorer,
       };
     } catch (err) {
@@ -94,58 +72,68 @@ export async function showPortfolio(walletName, opts = {}) {
         usdc: 0,
         ethUSD: 0,
         total: 0,
+        explorer: chain.explorer,
         error: err.message,
       };
     }
-  });
-
-  const chainResults = await Promise.all(chainPromises);
-  spin.succeed('Scan complete');
-
-  // Build table
-  const rows = chainResults.map(r => {
-    const ethStr = r.eth > 0 ? `${r.eth.toFixed(6)} ETH` : theme.dim('0');
-    const usdcStr = r.usdc > 0 ? `$${r.usdc.toFixed(2)}` : theme.dim('$0');
-    const totalStr = r.total > 0.01 ? theme.gold(`$${r.total.toFixed(2)}`) : theme.dim('$0');
-    const status = r.error ? theme.accent('⚠') : (r.total > 0 ? theme.success('●') : theme.dim('○'));
-    totalUSD += r.total;
-
-    return [
-      `${status} ${r.chain}`,
-      ethStr,
-      usdcStr,
-      totalStr,
-    ];
-  });
+  }));
 
-  console.log('');
-  table(['Chain', 'ETH', 'USDC', 'Total USD'], rows);
+  const totalUSD = chains.reduce((sum, item) => sum + item.total, 0);
+  return { name, address, chains, totalUSD, ethPrice };
+}
+
+export async function showPortfolio(walletName) {
+  const name = walletName || getConfig('activeWallet');
+  if (!name) {
+    error('No wallet specified. Use: darksol wallet portfolio <name>');
+    return;
+  }
 
-  // Summary
   console.log('');
-  kvDisplay([
-    ['Total Value', theme.gold(`$${totalUSD.toFixed(2)}`)],
-    ['ETH Price', `$${ethPrice.toFixed(2)}`],
-    ['Chains', `${chainResults.filter(r => !r.error).length}/${Object.keys(CHAINS).length} connected`],
-  ]);
-
-  // Show explorer links for chains with balance
-  const withBalance = chainResults.filter(r => r.total > 0.01);
-  if (withBalance.length > 0) {
+  showSection(`PORTFOLIO - ${name}`);
+  const spin = spinner('Scanning all chains...').start();
+
+  try {
+    const snapshot = await fetchPortfolioSnapshot(name);
+    const { address, chains, totalUSD, ethPrice } = snapshot;
+    spin.succeed('Scan complete');
+
+    console.log(theme.dim(`  ${address}`));
     console.log('');
-    info('Explorer links:');
-    withBalance.forEach(r => {
-      console.log(theme.dim(`  ${r.chain}: ${r.explorer}/address/${address}`));
+
+    const rows = chains.map((item) => {
+      const ethStr = item.eth > 0 ? `${item.eth.toFixed(6)} ETH` : theme.dim('0');
+      const usdcStr = item.usdc > 0 ? `$${item.usdc.toFixed(2)}` : theme.dim('$0');
+      const totalStr = item.total > 0.01 ? theme.gold(`$${item.total.toFixed(2)}`) : theme.dim('$0');
+      const status = item.error ? theme.accent('!') : (item.total > 0 ? theme.success('*') : theme.dim('o'));
+      return [`${status} ${item.chain}`, ethStr, usdcStr, totalStr];
     });
-  }
 
-  console.log('');
-  return { address, chains: chainResults, totalUSD, ethPrice };
+    table(['Chain', 'ETH', 'USDC', 'Total USD'], rows);
+    console.log('');
+    kvDisplay([
+      ['Total Value', theme.gold(`$${totalUSD.toFixed(2)}`)],
+      ['ETH Price', `$${ethPrice.toFixed(2)}`],
+      ['Chains', `${chains.filter((item) => !item.error).length}/${Object.keys(CHAINS).length} connected`],
+    ]);
+
+    const withBalance = chains.filter((item) => item.total > 0.01);
+    if (withBalance.length > 0) {
+      console.log('');
+      info('Explorer links:');
+      withBalance.forEach((item) => {
+        console.log(theme.dim(`  ${item.chain}: ${item.explorer}/address/${address}`));
+      });
+    }
+
+    console.log('');
+    return { address, chains, totalUSD, ethPrice };
+  } catch (err) {
+    spin.fail('Scan failed');
+    error(err.message);
+  }
 }
 
-/**
- * Quick balance check (non-verbose, for status bar)
- */
 export async function quickBalance(walletName) {
   const name = walletName || getConfig('activeWallet');
   if (!name) return null;

package/src/web/commands.js

@@ -902,6 +902,8 @@ export async function handleCommand(cmd, ws) {
       return await cmdMarket(args, ws);
     case 'trade':
       return await cmdTrade(args, ws);
+    case 'arb':
+      return await cmdArb(args, ws);
     case 'bridge':
       return await cmdBridge(args, ws);
     case 'wallet':
@@ -1351,6 +1353,59 @@ async function cmdTrade(args, ws) {
   return {};
 }
 
+// ══════════════════════════════════════════════════
+// ARBITRAGE
+// ══════════════════════════════════════════════════
+async function cmdArb(args, ws) {
+  const sub = (args[0] || '').toLowerCase();
+
+  if (sub === 'scan') {
+    ws.sendLine(`  ${ANSI.dim}Running arb scan...${ANSI.reset}`);
+    try {
+      const { arbScan } = await import('../trading/arb.js');
+      await arbScan({ chain: args[1] || getConfig('chain') || 'base' });
+    } catch (e) {
+      ws.sendLine(`  ${ANSI.red}Scan failed: ${e.message}${ANSI.reset}`);
+    }
+    return {};
+  }
+
+  if (sub === 'stats') {
+    try {
+      const { arbStats } = await import('../trading/arb.js');
+      await arbStats({ days: args[1] || '7' });
+    } catch (e) {
+      ws.sendLine(`  ${ANSI.red}Stats failed: ${e.message}${ANSI.reset}`);
+    }
+    return {};
+  }
+
+  if (sub === 'info') {
+    try {
+      const { arbInfo } = await import('../trading/arb.js');
+      await arbInfo();
+    } catch (e) {
+      ws.sendLine(`  ${ANSI.red}${e.message}${ANSI.reset}`);
+    }
+    return {};
+  }
+
+  // Default: show arb menu
+  ws.sendLine(`${ANSI.gold}  ◆ ARBITRAGE${ANSI.reset}`);
+  ws.sendLine(`${ANSI.dim}  ${'─'.repeat(50)}${ANSI.reset}`);
+  ws.sendLine(`  ${ANSI.white}Cross-DEX arbitrage scanner${ANSI.reset}`);
+  ws.sendLine('');
+
+  ws.sendMenu('arb_action', '◆ Arb Actions', [
+    { value: 'arb scan', label: '🔍 Scan', desc: 'One-shot DEX price comparison' },
+    { value: 'arb stats', label: '📊 Stats', desc: 'View arb history & PnL' },
+    { value: 'arb info', label: '📖 Guide', desc: 'How arb works, setup tips, risks' },
+    { value: 'back', label: '← Back', desc: '' },
+  ]);
+
+  return {};
+}
+
 // ══════════════════════════════════════════════════
 // BRIDGE (LI.FI cross-chain)
 // ══════════════════════════════════════════════════