aether-hub 1.2.8 → 1.3.0

package/commands/multisig.js

@@ -25,19 +25,15 @@ const bs58 = require('bs58').default;
 const bip39 = require('bip39');
 const nacl = require('tweetnacl');
 
-// ANSI colours
-const C = {
-  reset: '\x1b[0m',
-  bright: '\x1b[1m',
-  dim: '\x1b[2m',
-  red: '\x1b[31m',
-  green: '\x1b[32m',
-  yellow: '\x1b[33m',
-  cyan: '\x1b[36m',
-  magenta: '\x1b[35m',
-};
-
-const CLI_VERSION = '1.2.5';
+// Import theme
+const theme = require('../theme');
+const { C, BANNERS, ICONS } = theme;
+
+// Import SDK
+const sdkPath = path.join(__dirname, '..', 'sdk', 'index.js');
+const { AetherClient } = require(sdkPath);
+
+const CLI_VERSION = '1.3.0';
 const MULTISIG_VERSION = 1;
 
 // ---------------------------------------------------------------------------
@@ -109,53 +105,19 @@ function getDefaultRpc() {
   return process.env.AETHER_RPC || 'http://127.0.0.1:8899';
 }
 
-function httpRequest(rpcUrl, pathStr, timeoutMs = 10000) {
-  return new Promise((resolve, reject) => {
-    const url = new URL(pathStr, 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',
-      timeout: timeoutMs,
-      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 createClient(rpcUrl) {
+  return new AetherClient({ rpcUrl });
 }
 
-function httpPost(rpcUrl, pathStr, body, timeoutMs = 15000) {
-  return new Promise((resolve, reject) => {
-    const url = new URL(pathStr, rpcUrl);
-    const lib = url.protocol === 'https:' ? require('https') : require('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: timeoutMs,
-      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({ _raw: data }); } });
-    });
-    req.on('error', reject);
-    req.on('timeout', () => { req.destroy(); reject(new Error('Request timeout')); });
-    req.write(bodyStr);
-    req.end();
-  });
+/** Fetch balance using SDK */
+async function fetchBalance(rpc, address) {
+  const client = createClient(rpc);
+  try {
+    const account = await client.getAccountInfo(address);
+    return account.lamports || 0;
+  } catch {
+    return null;
+  }
 }
 
 function formatAether(lamports) {
@@ -243,7 +205,7 @@ function askMnemonic(rl, label = 'wallet passphrase') {
 // ---------------------------------------------------------------------------
 
 async function createMultisig(rl, args) {
-  console.log(`\n${C.bright}${C.cyan}── Create Multi-Signature Wallet ─────────────────────────${C.reset}\n`);
+  console.log(`\n${BANNERS.multisig}\n`);
 
   // Parse --threshold and --signers from args
   let threshold = null;
@@ -337,7 +299,7 @@ async function createMultisig(rl, args) {
 // ---------------------------------------------------------------------------
 
 async function listMultisig(rl, args) {
-  console.log(`\n${C.bright}${C.cyan}── Multi-Signature Wallets ────────────────────────────${C.reset}\n`);
+  console.log(`\n${BANNERS.multisig} (List)\n`);
 
   const all = listAllMultisig();
 
@@ -356,12 +318,12 @@ async function listMultisig(rl, args) {
     console.log(`  ${C.dim}  Threshold: ${ms.threshold}/${ms.signers.length}  Signers: ${ms.signers.length}${C.reset}`);
     console.log(`  ${C.dim}  Created:   ${new Date(ms.created_at).toLocaleString()}${C.reset}`);
 
-    // Fetch on-chain balance
+    // Fetch on-chain balance using SDK
     try {
       const rawAddr = ms.address.startsWith('ATH') ? ms.address.slice(3) : ms.address;
-      const account = await httpRequest(rpcUrl, `/v1/account/${rawAddr}`);
-      if (!account.error && account.lamports !== undefined) {
-        console.log(`  ${C.green}✓ Balance:${C.reset} ${C.bright}${formatAether(account.lamports)}${C.reset}`);
+      const balance = await fetchBalance(rpcUrl, rawAddr);
+      if (balance !== null) {
+        console.log(`  ${C.green}${ICONS.success} Balance:${C.reset} ${C.bright}${formatAether(balance)}${C.reset}`);
       }
     } catch {}
 
@@ -374,7 +336,7 @@ async function listMultisig(rl, args) {
 // ---------------------------------------------------------------------------
 
 async function infoMultisig(rl, args) {
-  console.log(`\n${C.bright}${C.cyan}── Multi-Signature Wallet Info ─────────────────────────${C.reset}\n`);
+  console.log(`\n${BANNERS.multisig} (Info)\n`);
 
   let address = null;
   for (let i = 0; i < args.length; i++) {
@@ -390,21 +352,21 @@ async function infoMultisig(rl, args) {
   }
 
   if (!address) {
-    console.log(`  ${C.red}✗ No address specified.${C.reset}`);
+    console.log(`  ${ICONS.error} ${C.red}No address specified.${C.reset}`);
     console.log(`  ${C.dim}Usage: aether multisig info --address <addr>${C.reset}\n`);
     return;
   }
 
   const ms = loadMultisig(address);
   if (!ms) {
-    console.log(`  ${C.red}✗ Multisig wallet not found:${C.reset} ${address}`);
+    console.log(`  ${ICONS.error} ${C.red}Multisig wallet not found:${C.reset} ${address}`);
     console.log(`  ${C.dim}Check your wallets: aether multisig list${C.reset}\n`);
     return;
   }
 
   const rpcUrl = getDefaultRpc();
-  console.log(`  ${C.green}★${C.reset} Address:    ${C.bright}${ms.address}${C.reset}`);
-  console.log(`  ${C.green}★${C.reset} Threshold: ${C.bright}${ms.threshold} of ${ms.signers.length}${C.reset}`);
+  console.log(`  ${ICONS.success} ${C.green}Address:${C.reset}    ${C.bright}${ms.address}${C.reset}`);
+  console.log(`  ${ICONS.success} ${C.green}Threshold:${C.reset} ${C.bright}${ms.threshold} of ${ms.signers.length}${C.reset}`);
   console.log(`  ${C.dim}  Public key: ${ms.public_key}${C.reset}`);
   console.log(`  ${C.dim}  Created:    ${new Date(ms.created_at).toLocaleString()}${C.reset}`);
   console.log(`  ${C.dim}  Version:    ${ms.version}${C.reset}`);
@@ -414,25 +376,22 @@ async function infoMultisig(rl, args) {
   for (let i = 0; i < ms.signers.length; i++) {
     const s = ms.signers[i];
     const isYou = s === loadConfig().defaultWallet;
-    const marker = isYou ? ` ${C.green}★ you${C.reset}` : '';
+    const marker = isYou ? ` ${C.green}${ICONS.success} you${C.reset}` : '';
     console.log(`  ${i + 1}. ${C.cyan}${s}${C.reset}${marker}`);
   }
   console.log();
 
-  // On-chain balance
+  // On-chain balance using SDK
   try {
     const rawAddr = ms.address.startsWith('ATH') ? ms.address.slice(3) : ms.address;
-    const account = await httpRequest(rpcUrl, `/v1/account/${rawAddr}`);
-    if (!account.error && account.lamports !== undefined) {
-      console.log(`  ${C.green}✓ Balance:${C.reset} ${C.bright}${formatAether(account.lamports)}${C.reset}`);
-      if (account.owner) {
-        console.log(`  ${C.dim}  Owner: ${account.owner}${C.reset}`);
-      }
+    const balance = await fetchBalance(rpcUrl, rawAddr);
+    if (balance !== null) {
+      console.log(`  ${ICONS.success} ${C.green}Balance:${C.reset} ${C.bright}${formatAether(balance)}${C.reset}`);
     } else {
-      console.log(`  ${C.yellow}⚠ Account not found on chain (may have 0 balance).${C.reset}`);
+      console.log(`  ${ICONS.warning} ${C.yellow}Account not found on chain (may have 0 balance).${C.reset}`);
     }
   } catch (err) {
-    console.log(`  ${C.yellow}⚠ Could not fetch balance: ${err.message}${C.reset}`);
+    console.log(`  ${ICONS.warning} ${C.yellow}Could not fetch balance: ${err.message}${C.reset}`);
   }
 
   console.log();
@@ -443,7 +402,7 @@ async function infoMultisig(rl, args) {
 // ---------------------------------------------------------------------------
 
 async function addSignerMultisig(rl, args) {
-  console.log(`\n${C.bright}${C.cyan}── Add Signer to Multi-Signature Wallet ─────────────────${C.reset}\n`);
+  console.log(`\n${BANNERS.multisig} (Add Signer)\n`);
 
   let address = null;
   let newSigner = null;
@@ -454,29 +413,29 @@ async function addSignerMultisig(rl, args) {
   }
 
   if (!address || !newSigner) {
-    console.log(`  ${C.red}✗ Missing required arguments.${C.reset}`);
+    console.log(`  ${ICONS.error} ${C.red}Missing required arguments.${C.reset}`);
     console.log(`  ${C.dim}Usage: aether multisig add-signer --address <msAddr> --signer <newAddr>${C.reset}\n`);
     return;
   }
 
   const ms = loadMultisig(address);
   if (!ms) {
-    console.log(`  ${C.red}✗ Multisig wallet not found:${C.reset} ${address}\n`);
+    console.log(`  ${ICONS.error} ${C.red}Multisig wallet not found:${C.reset} ${address}\n`);
     return;
   }
 
   if (!isValidAddress(newSigner)) {
-    console.log(`  ${C.red}✗ Invalid signer address:${C.reset} ${newSigner}\n`);
+    console.log(`  ${ICONS.error} ${C.red}Invalid signer address:${C.reset} ${newSigner}\n`);
     return;
   }
 
   if (ms.signers.includes(newSigner)) {
-    console.log(`  ${C.yellow}⚠ Signer already in wallet:${C.reset} ${newSigner}\n`);
+    console.log(`  ${ICONS.warning} ${C.yellow}Signer already in wallet:${C.reset} ${newSigner}\n`);
     return;
   }
 
-  console.log(`  ${C.green}★${C.reset} Multisig:  ${C.bright}${shortAddress(address)}${C.reset}`);
-  console.log(`  ${C.green}★${C.reset} Adding:    ${C.bright}${shortAddress(newSigner)}${C.reset}`);
+  console.log(`  ${ICONS.success} ${C.green}Multisig:${C.reset}  ${C.bright}${shortAddress(address)}${C.reset}`);
+  console.log(`  ${ICONS.success} ${C.green}Adding:${C.reset}    ${C.bright}${shortAddress(newSigner)}${C.reset}`);
   console.log(`  ${C.dim}  Current threshold: ${ms.threshold}/${ms.signers.length}${C.reset}`);
   console.log();
 
@@ -494,8 +453,8 @@ async function addSignerMultisig(rl, args) {
 
   saveMultisig(newMs);
 
-  console.log(`${C.green}✓ Signer added.${C.reset}`);
-  console.log(`  ${C.yellow}⚠ Important: Changing signers creates a NEW wallet address.${C.reset}`);
+  console.log(`${C.green}${ICONS.success} Signer added.${C.reset}`);
+  console.log(`  ${ICONS.warning} ${C.yellow}Important: Changing signers creates a NEW wallet address.${C.reset}`);
   console.log(`  ${C.dim}  Old address: ${ms.address}${C.reset}`);
   console.log(`  ${C.dim}  New address: ${newAddress}${C.reset}`);
   console.log(`  ${C.dim}  Transfer all funds to the new address.${C.reset}`);