aether-hub 1.2.6 → 1.2.8

package/commands/validators.js

@@ -13,10 +13,15 @@
  *   aether validators list --sort stake  Sort by stake (default: score)
  *
  * Requires AETHER_RPC env var (default: http://127.0.0.1:8899)
+ * 
+ * SDK wired to: GET /v1/validators, GET /v1/epoch, GET /v1/supply
  */
 
-const http = require('http');
-const https = require('https');
+const path = require('path');
+
+// Import SDK for real blockchain RPC calls
+const sdkPath = path.join(__dirname, '..', 'sdk', 'index.js');
+const aether = require(sdkPath);
 
 // ANSI colours
 const C = {
@@ -31,56 +36,12 @@ const C = {
   magenta: '\x1b[35m',
 };
 
-const DEFAULT_RPC = process.env.AETHER_RPC || 'http://127.0.0.1:8899';
-
-// ---------------------------------------------------------------------------
-// HTTP helpers
-// ---------------------------------------------------------------------------
-
-function httpRequest(rpcUrl, path) {
-  return new Promise((resolve, reject) => {
-    const url = new URL(path, rpcUrl);
-    const lib = url.protocol === 'https:' ? https : http;
-    const req = lib.request({
-      hostname: url.hostname,
-      port: url.port || (url.protocol === 'https:' ? 443 : 80),
-      path: url.pathname + url.search,
-      method: 'GET',
-      timeout: 8000,
-      headers: { 'Content-Type': 'application/json' },
-    }, (res) => {
-      let data = '';
-      res.on('data', (chunk) => data += chunk);
-      res.on('end', () => { try { resolve(JSON.parse(data)); } catch { resolve({ raw: data }); } });
-    });
-    req.on('error', reject);
-    req.on('timeout', () => { req.destroy(); reject(new Error('Request timeout')); });
-    req.end();
-  });
+function getDefaultRpc() {
+  return process.env.AETHER_RPC || aether.DEFAULT_RPC_URL || 'http://127.0.0.1:8899';
 }
 
-function httpPost(rpcUrl, path, body) {
-  return new Promise((resolve, reject) => {
-    const url = new URL(path, rpcUrl);
-    const lib = url.protocol === 'https:' ? https : http;
-    const bodyStr = JSON.stringify(body);
-    const req = lib.request({
-      hostname: url.hostname,
-      port: url.port || (url.protocol === 'https:' ? 443 : 80),
-      path: url.pathname + url.search,
-      method: 'POST',
-      timeout: 8000,
-      headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(bodyStr) },
-    }, (res) => {
-      let data = '';
-      res.on('data', (chunk) => data += chunk);
-      res.on('end', () => { try { resolve(JSON.parse(data)); } catch { resolve(data); } });
-    });
-    req.on('error', reject);
-    req.on('timeout', () => { req.destroy(); reject(new Error('Request timeout')); });
-    req.write(bodyStr);
-    req.end();
-  });
+function createClient(rpcUrl) {
+  return new aether.AetherClient({ rpcUrl });
 }
 
 // ---------------------------------------------------------------------------
@@ -90,7 +51,7 @@ function httpPost(rpcUrl, path, body) {
 function parseArgs() {
   const args = process.argv.slice(3); // [node, index.js, validators, list, ...]
   const opts = {
-    rpc: DEFAULT_RPC,
+    rpc: getDefaultRpc(),
     subcmd: 'list',
     tier: null,
     asJson: false,
@@ -137,6 +98,7 @@ function parseArgs() {
 }
 
 function showHelp() {
+  const defaultRpc = getDefaultRpc();
   console.log(`
 ${C.bright}${C.cyan}aether-cli validators${C.reset} - List and inspect Aether validators
 
@@ -148,17 +110,22 @@ ${C.bright}Options (list):${C.reset}
   -t, --tier <type>   Filter by tier: full, lite, observer
   -s, --sort <field>  Sort by: stake, score, apy, uptime, name (default: score)
   -l, --limit <n>     Max validators to show (default: 100, max: 500)
-  -r, --rpc <url>     RPC endpoint (default: ${DEFAULT_RPC} or $AETHER_RPC)
+  -r, --rpc <url>     RPC endpoint (default: ${defaultRpc} or $AETHER_RPC)
   -j, --json          Output raw JSON (for scripting)
   -h, --help          Show this help message
 
 ${C.bright}Options (rank):${C.reset}
   -t, --tier <type>   Filter by tier: full, lite, observer
   -l, --limit <n>     Max validators to show (default: 50, max: 200)
-  -r, --rpc <url>     RPC endpoint (default: ${DEFAULT_RPC} or $AETHER_RPC)
+  -r, --rpc <url>     RPC endpoint (default: ${defaultRpc} or $AETHER_RPC)
   -j, --json          Output raw JSON (for scripting)
   -h, --help          Show this help message
 
+${C.bright}SDK Methods Used:${C.reset}
+  client.getValidators()  → GET /v1/validators
+  client.getEpochInfo()   → GET /v1/epoch
+  client.getSupply()      → GET /v1/supply
+
 ${C.bright}Examples:${C.reset}
   aether validators list                  # All validators, sorted by score
   aether validators list --tier full       # Full validators only
@@ -173,46 +140,40 @@ ${C.bright}Examples:${C.reset}
 }
 
 // ---------------------------------------------------------------------------
-// Data fetchers
+// Data fetchers using SDK - Real blockchain RPC calls
 // ---------------------------------------------------------------------------
 
-/** Fetch all validators from the network */
+/** Fetch all validators from the network using SDK */
 async function fetchValidators(rpc) {
   try {
-    // Try /v1/validators first (standard Aether RPC endpoint)
-    const res = await httpRequest(rpc, '/v1/validators');
-    if (res && !res.error) {
-      if (Array.isArray(res)) return res;
-      if (res.validators && Array.isArray(res.validators)) return res.validators;
-      if (res.accounts && Array.isArray(res.accounts)) return res.accounts;
-    }
-    // Fallback: POST to a validators query endpoint
-    const res2 = await httpPost(rpc, '/v1/validators', {});
-    if (res2 && !res2.error) {
-      if (Array.isArray(res2)) return res2;
-      if (res2.validators && Array.isArray(res2.validators)) return res2.validators;
-    }
-    return [];
+    const client = createClient(rpc);
+    // SDK getValidators() → GET /v1/validators
+    const result = await client.getValidators();
+    return Array.isArray(result) ? result : [];
   } catch {
     return [];
   }
 }
 
-/** Fetch epoch info for APY calculations */
+/** Fetch epoch info for APY calculations using SDK */
 async function fetchEpochInfo(rpc) {
   try {
-    const res = await httpRequest(rpc, '/v1/epoch-info');
-    return res;
+    const client = createClient(rpc);
+    // SDK getEpochInfo() → GET /v1/epoch
+    const result = await client.getEpochInfo();
+    return result || null;
   } catch {
     return null;
   }
 }
 
-/** Fetch network-wide stake totals for APY estimation */
+/** Fetch network-wide stake totals for APY estimation using SDK */
 async function fetchSupply(rpc) {
   try {
-    const res = await httpRequest(rpc, '/v1/supply');
-    return res;
+    const client = createClient(rpc);
+    // SDK getSupply() → GET /v1/supply
+    const result = await client.getSupply();
+    return result || null;
   } catch {
     return null;
   }

package/commands/wallet.js

@@ -19,6 +19,9 @@ const bip39 = require('bip39');
 const nacl = require('tweetnacl');
 const bs58 = require('bs58').default;
 
+// Import SDK for blockchain RPC calls
+const aether = require('../sdk');
+
 // ANSI colours
 const C = {
   reset: '\x1b[0m',
@@ -541,37 +544,11 @@ async function connectWallet(rl) {
 
 // ---------------------------------------------------------------------------
 // BALANCE
-// Query chain RPC GET /v1/account/<addr> for real AETH balance
+// Query chain RPC GET /v1/account/<addr> for real AETH balance using SDK
 // ---------------------------------------------------------------------------
 
 function getDefaultRpc() {
-  return process.env.AETHER_RPC || 'http://127.0.0.1:8899';
-}
-
-/**
- * Make HTTP GET request to the RPC endpoint
- */
-function httpRequest(rpcUrl, path) {
-  return new Promise((resolve, reject) => {
-    const url = new URL(path, rpcUrl);
-    const lib = url.protocol === 'https:' ? require('https') : require('http');
-    const req = lib.request({
-      hostname: url.hostname,
-      port: url.port || (url.protocol === 'https:' ? 443 : 80),
-      path: url.pathname + url.search,
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json' },
-    }, (res) => {
-      let data = '';
-      res.on('data', (chunk) => data += chunk);
-      res.on('end', () => {
-        try { resolve(JSON.parse(data)); }
-        catch { resolve(data); }
-      });
-    });
-    req.on('error', reject);
-    req.end();
-  });
+  return process.env.AETHER_RPC || aether.DEFAULT_RPC_URL || 'http://127.0.0.1:8899';
 }
 
 /**
@@ -612,9 +589,11 @@ async function balanceWallet(rl) {
   console.log();
 
   try {
+    // Use SDK for real blockchain RPC call
+    const client = new aether.AetherClient({ rpcUrl });
     // Strip ATH prefix if present for API call
     const rawAddr = address.startsWith('ATH') ? address.slice(3) : address;
-    const account = await httpRequest(rpcUrl, `/v1/account/${rawAddr}`);
+    const account = await client.getAccountInfo(rawAddr);
     
     if (!account || account.error) {
       console.log(`  ${C.yellow}⚠ Account not found on chain or RPC error.${C.reset}`);

package/index.js

@@ -30,6 +30,13 @@ const { broadcastCommand } = require('./commands/broadcast');
 const { apyCommand } = require('./commands/apy');
 const { statsCommand } = require('./commands/stats');
 const { txHistoryCommand } = require('./commands/tx-history');
+const { feesCommand } = require('./commands/fees');
+const { tpsCommand } = require('./commands/tps');
+const { blockhashCommand } = require('./commands/blockhash');
+const { sdkTestCommand } = require('./commands/sdk-test');
+const { balanceCommand } = require('./commands/balance');
+const { transferCommand } = require('./commands/transfer');
+const { slotCommand } = require('./commands/slot');
 const readline = require('readline');
 
 // CLI version
@@ -204,6 +211,13 @@ const COMMANDS = {
       stakePositionsCommand();
     },
   },
+  'stake-info': {
+    description: 'Get staking info for an address via real chain RPC — aether stake-info <address>',
+    handler: () => {
+      const { stakeInfoCommand } = require('./commands/stake-info');
+      stakeInfoCommand();
+    },
+  },
   unstake: {
     description: 'Unstake AETH — deactivate a stake account — aether unstake --account <stakeAcct> [--amount <aeth>]',
     handler: () => {
@@ -227,11 +241,7 @@ const COMMANDS = {
   transfer: {
     description: 'Transfer AETH to another address — aether transfer --to <addr> --amount <aeth>',
     handler: () => {
-      const { walletCommand } = require('./commands/wallet');
-      const originalArgv = process.argv;
-      process.argv = [...originalArgv.slice(0, 2), 'wallet', 'transfer', ...originalArgv.slice(3)];
-      walletCommand();
-      process.argv = originalArgv;
+      transferCommand();
     },
   },
   tx: {
@@ -246,6 +256,20 @@ const COMMANDS = {
       txHistoryCommand();
     },
   },
+  blockhash: {
+    description: 'Get the latest blockhash from the chain (required for signing TXs) — aether blockhash [--json] [--watch]',
+    handler: () => {
+      const { blockhashCommand } = require('./commands/blockhash');
+      blockhashCommand();
+    },
+  },
+  balance: {
+    description: 'Query account balance — aether balance [address] [--json] [--lamports] [--rpc <url>]',
+    handler: () => {
+      const { balanceCommand } = require('./commands/balance');
+      balanceCommand();
+    },
+  },
   network: {
     description: 'Aether network status — slot, block height, peers, TPS, epoch info',
     handler: () => {
@@ -394,6 +418,37 @@ const COMMANDS = {
       emergencyCommand();
     },
   },
+  fees: {
+    description: 'Network fee estimates — aether fees [--json] [--verbose] [--rpc <url>]',
+    handler: () => {
+      feesCommand();
+    },
+  },
+  tps: {
+    description: 'Transactions per second monitor — aether tps [--monitor] [--interval 2] [--json]',
+    handler: () => {
+      tpsCommand();
+    },
+  },
+  slot: {
+    description: 'Get current slot number — aether slot [--json] [--rpc <url>]',
+    handler: () => {
+      slotCommand();
+    },
+  },
+  claim: {
+    description: 'Claim accumulated staking rewards — aether claim --address <addr> [--json] [--dry-run]',
+    handler: () => {
+      const { claimCommand } = require('./commands/claim');
+      claimCommand();
+    },
+  },
+  'sdk-test': {
+    description: 'Test SDK with real RPC calls — aether sdk-test [--rpc <url>] [--quick] [--json]',
+    handler: () => {
+      sdkTestCommand();
+    },
+  },
   help: {
     description: 'Show this help message',
     handler: showHelp,
@@ -448,7 +503,7 @@ function parseArgs() {
   const args = process.argv.slice(2);
 
   // Handle version flag
-  if (args.includes('--version') || args.includes('-v')) {
+  if (args.includes('--version') || args.includes('-v') || args.includes('-V')) {
     return 'version';
   }
 
@@ -484,5 +539,7 @@ function main() {
   }
 }
 
-// Run CLI
-main();
+// Run CLI only if executed directly
+if (require.main === module) {
+  main();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aether-hub",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "AeTHer Validator CLI — tiered validators (Full/Lite/Observer), system checks, onboarding, and node management",
   "main": "index.js",
   "bin": {
@@ -18,8 +18,6 @@
     "test": "node test/doctor.test.js",
     "start": "node index.js",
     "doctor": "node index.js doctor",
-    "price": "node index.js price",
-    "build": "node -e \"require('./commands/price'); require('./commands/account'); require('./commands/emergency')\" && echo \"Build OK\"",
     "postinstall": "node -e \"console.log('\\n\\n  [Aether] aether-hub installed!\\n\\n  Run: aether start\\n  Docs: https://github.com/jelly-legs-ai/Jelly-legs-unsteady-workshop\\n')\""
   },
   "keywords": [