httpcat-cli 0.2.13 → 0.3.0-rc.2

package/dist/commands/balances.js

@@ -1,12 +1,12 @@
 import chalk from "chalk";
 import { privateKeyToAccount } from "viem/accounts";
-import { formatEther, formatUnits } from "viem";
-import { getUSDCBalance } from "x402/shared/evm";
-import { evm } from "x402/types";
+import { formatEther } from "viem";
+// USDC balance checking using viem directly
 import { printCat } from "../interactive/art.js";
-import { formatAddress, printWarning } from "../utils/formatting.js";
 import inquirer from "inquirer";
 import { config } from "../config.js";
+import { getNetworkConfig } from "../utils/constants.js";
+import Table from 'cli-table3';
 /**
  * Checks and displays wallet balances for a given private key.
  * This mimics the behavior of promptForPrivateKey but without saving to config.
@@ -42,55 +42,85 @@ export async function checkBalance(privateKey, silent = false) {
     const account = privateKeyToAccount(pk);
     const address = account.address;
     try {
-        // Create signer to check balances
-        const signer = evm.createSignerSepolia(pk);
+        // Get network configuration
+        const network = config.get("network");
+        const { chain, usdcAddress } = await getNetworkConfig(network);
+        // Create signer using viem for balance checks
+        const { createPublicClient, http, parseAbi, formatUnits } = await import("viem");
+        const publicClient = createPublicClient({
+            chain,
+            transport: http(),
+        });
         // Check ETH balance
-        const ethBalance = await signer.getBalance({ address });
+        const ethBalance = await publicClient.getBalance({ address });
         const ethFormatted = formatEther(ethBalance);
-        // Check USDC balance
-        const usdcBalance = await getUSDCBalance(signer, address);
-        const usdcFormatted = (Number(usdcBalance) / 10 ** 6).toFixed(2);
-        // Fetch 402CAT token address from agent info
+        // Check USDC balance using ERC20 token contract
+        const ERC20_ABI = parseAbi([
+            "function balanceOf(address owner) view returns (uint256)",
+            "function decimals() view returns (uint8)",
+        ]);
+        const [usdcBalance, decimals] = await Promise.all([
+            publicClient.readContract({
+                address: usdcAddress,
+                abi: ERC20_ABI,
+                functionName: "balanceOf",
+                args: [address],
+            }).catch(() => BigInt(0)),
+            publicClient.readContract({
+                address: usdcAddress,
+                abi: ERC20_ABI,
+                functionName: "decimals",
+            }).catch(() => 6), // Default to 6 decimals for USDC
+        ]);
+        const usdcFormatted = formatUnits(usdcBalance, decimals);
+        // Fetch 402CAT token address from environment variable or agent info
         let cat402Balance = BigInt(0);
         let cat402Formatted = "0.00";
         let cat402Fetched = false;
         try {
-            const agentUrl = config.getAgentUrl();
-            const agentInfoResponse = await fetch(`${agentUrl}/api/agent/info`);
-            if (agentInfoResponse.ok) {
-                const agentInfo = await agentInfoResponse.json();
-                const catTokenAddress = agentInfo.catTokenAddress;
-                if (catTokenAddress) {
-                    // Get 402CAT balance using ERC20 balanceOf
-                    const { createPublicClient, http, parseAbi } = await import("viem");
-                    const { baseSepolia } = await import("viem/chains");
-                    const publicClient = createPublicClient({
-                        chain: baseSepolia,
-                        transport: http(),
-                    });
-                    const ERC20_ABI = parseAbi([
-                        "function balanceOf(address owner) view returns (uint256)",
-                        "function decimals() view returns (uint8)",
-                    ]);
-                    // Get balance and decimals
-                    const [balance, decimals] = await Promise.all([
-                        publicClient.readContract({
-                            address: catTokenAddress,
-                            abi: ERC20_ABI,
-                            functionName: "balanceOf",
-                            args: [address],
-                        }),
-                        publicClient.readContract({
-                            address: catTokenAddress,
-                            abi: ERC20_ABI,
-                            functionName: "decimals",
-                        }).catch(() => 18), // Default to 18 decimals if call fails
-                    ]);
-                    cat402Balance = balance;
-                    cat402Formatted = formatUnits(balance, decimals);
-                    cat402Fetched = true;
+            // Priority 1: Environment variable
+            let catTokenAddress = config.getPlatformTokenAddress();
+            // Priority 2: Fetch from agent /info endpoint if not in env var
+            if (!catTokenAddress) {
+                try {
+                    const agentInfo = await config.getAgentInfo();
+                    catTokenAddress = agentInfo.platform.platformAddress;
+                }
+                catch (error) {
+                    // Silently fail - will just not show CAT balance
                 }
             }
+            if (catTokenAddress) {
+                // Get 402CAT balance using ERC20 balanceOf
+                const { createPublicClient, http, parseAbi } = await import("viem");
+                const network = config.get("network");
+                const { chain } = await getNetworkConfig(network);
+                const publicClient = createPublicClient({
+                    chain,
+                    transport: http(config.getRpcUrl()),
+                });
+                const ERC20_ABI = parseAbi([
+                    "function balanceOf(address owner) view returns (uint256)",
+                    "function decimals() view returns (uint8)",
+                ]);
+                // Get balance and decimals
+                const [balance, decimals] = await Promise.all([
+                    publicClient.readContract({
+                        address: catTokenAddress,
+                        abi: ERC20_ABI,
+                        functionName: "balanceOf",
+                        args: [address],
+                    }),
+                    publicClient.readContract({
+                        address: catTokenAddress,
+                        abi: ERC20_ABI,
+                        functionName: "decimals",
+                    }).catch(() => 18), // Default to 18 decimals if call fails
+                ]);
+                cat402Balance = balance;
+                cat402Formatted = formatUnits(balance, decimals);
+                cat402Fetched = true;
+            }
         }
         catch (error) {
             // If we can't fetch 402CAT balance, just continue without it
@@ -103,46 +133,70 @@ export async function checkBalance(privateKey, silent = false) {
         if (!silent) {
             console.log();
             printCat("wizard");
-            console.log(chalk.bold.cyan("💰 Wallet Balances"));
-            console.log(chalk.dim("─".repeat(50)));
+            console.log(chalk.magenta.bold("💰 Wallet Balances"));
+            console.log(chalk.dim("─".repeat(80)));
             console.log();
-            // Format ETH with consistent alignment
-            const ethLabel = "ETH:".padEnd(8);
-            console.log(`  ${chalk.dim(ethLabel)}${chalk.yellow(ethFormatted.padStart(25))} ${chalk.dim("ETH")}`);
-            // Format USDC with consistent alignment
-            const usdcLabel = "USDC:".padEnd(8);
-            console.log(`  ${chalk.dim(usdcLabel)}${chalk.green(`$${usdcFormatted}`.padStart(25))} ${chalk.dim("USDC")}`);
-            // Format 402CAT if fetched
+            // Create colorful balances table
+            const balancesTable = new Table({
+                head: [
+                    chalk.blue.bold('Asset'),
+                    chalk.green.bold('Balance'),
+                    chalk.cyan.bold('Symbol')
+                ],
+                colAligns: ['left', 'right', 'left'],
+                style: {
+                    head: [],
+                    border: ['dim'],
+                },
+            });
+            // ETH balance row
+            const ethNum = Number(ethFormatted);
+            const ethIcon = ethNum < 0.001 ? '⚠️ ' : '⚡ ';
+            balancesTable.push([
+                chalk.yellow(ethIcon + 'Ethereum'),
+                ethNum < 0.001 ? chalk.red.bold(ethFormatted) : chalk.green(ethFormatted),
+                chalk.dim('ETH')
+            ]);
+            // USDC balance row
+            const usdcNum = Number(usdcFormatted);
+            const usdcDisplay = usdcNum.toFixed(2);
+            const usdcIcon = usdcNum < 1 ? '⚠️ ' : '💵 ';
+            balancesTable.push([
+                chalk.green(usdcIcon + 'USD Coin'),
+                usdcNum < 1 ? chalk.red.bold('$' + usdcDisplay) : chalk.green('$' + usdcDisplay),
+                chalk.dim('USDC')
+            ]);
+            // CAT balance row (if fetched)
             if (cat402Fetched) {
-                const catLabel = "CAT:".padEnd(8);
-                // Format the 402CAT amount to a reasonable precision
                 const catFormattedClean = parseFloat(cat402Formatted).toLocaleString('en-US', {
-                    maximumFractionDigits: 4,
+                    maximumFractionDigits: 2,
                     minimumFractionDigits: 0
                 });
-                console.log(`  ${chalk.dim(catLabel)}${chalk.cyan(catFormattedClean.padStart(25))} ${chalk.dim("CAT")}`);
+                balancesTable.push([
+                    chalk.cyan('🐱 402.CAT'),
+                    chalk.magenta(catFormattedClean),
+                    chalk.dim('CAT')
+                ]);
             }
+            console.log(balancesTable.toString());
             console.log();
-            console.log(chalk.dim(`  Wallet: ${formatAddress(address, 12)}`));
+            console.log(chalk.dim(`Wallet: ${address}`));
             console.log();
             // Show warnings if balances are low
-            const ethNum = Number(ethFormatted);
-            const usdcNum = Number(usdcFormatted);
             if (ethNum < 0.001 && usdcNum < 1) {
-                console.log();
-                printWarning("Low balances detected!");
+                console.log(chalk.yellow.bold("⚠️  Low balances detected!"));
                 console.log(chalk.dim("   You need Base Sepolia ETH for gas fees"));
                 console.log(chalk.dim("   You need Base Sepolia USDC for trading"));
                 console.log();
             }
             else if (ethNum < 0.001) {
-                console.log();
-                printWarning("Low ETH balance - you may not have enough for gas fees");
+                console.log(chalk.yellow.bold("⚠️  Low ETH balance"));
+                console.log(chalk.dim("   You may not have enough for gas fees"));
                 console.log();
             }
             else if (usdcNum < 1) {
-                console.log();
-                printWarning("Low USDC balance - you may not have enough for trades");
+                console.log(chalk.yellow.bold("⚠️  Low USDC balance"));
+                console.log(chalk.dim("   You may not have enough for trades"));
                 console.log();
             }
         }
@@ -152,7 +206,7 @@ export async function checkBalance(privateKey, silent = false) {
             usdcBalance: usdcBalance.toString(),
             cat402Balance: cat402Balance.toString(),
             ethFormatted,
-            usdcFormatted,
+            usdcFormatted: parseFloat(usdcFormatted).toFixed(2),
             cat402Formatted,
         };
     }

package/dist/commands/balances.js.map

@@ -1 +1 @@
-{"version":3,"file":"balances.js","sourceRoot":"","sources":["../../src/commands/balances.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"balances.js","sourceRoot":"","sources":["../../src/commands/balances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,WAAW,EAAe,MAAM,MAAM,CAAC;AAChD,4CAA4C;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,MAAM,YAAY,CAAC;AAY/B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,UAAgB,EAAE,SAAkB,KAAK;IAC1E,IAAI,EAAE,GAAG,UAAU,CAAC;IAEpB,qEAAqE;IACrE,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,+CAA+C;QAC/C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YACpC;gBACE,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,yBAAyB;gBAClC,IAAI,EAAE,GAAG;gBACT,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;wBACX,OAAO,yBAAyB,CAAC;oBACnC,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC5B,OAAO,gCAAgC,CAAC;oBAC1C,CAAC;oBACD,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;wBACxB,OAAO,4DAA4D,CAAC;oBACtE,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;aACF;SACF,CAAC,CAAC;QAEH,EAAE,GAAG,OAAO,CAAC,UAAiB,CAAC;IACjC,CAAC;IAED,wBAAwB;IACxB,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAEhC,IAAI,CAAC;QACH,4BAA4B;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAE/D,8CAA8C;QAC9C,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;QAEjF,MAAM,YAAY,GAAG,kBAAkB,CAAC;YACtC,KAAK;YACL,SAAS,EAAE,IAAI,EAAE;SAClB,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAE7C,gDAAgD;QAChD,MAAM,SAAS,GAAG,QAAQ,CAAC;YACzB,0DAA0D;YAC1D,0CAA0C;SAC3C,CAAC,CAAC;QAEH,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChD,YAAY,CAAC,YAAY,CAAC;gBACxB,OAAO,EAAE,WAAW;gBACpB,GAAG,EAAE,SAAS;gBACd,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,CAAC,OAAwB,CAAC;aACjC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACzB,YAAY,CAAC,YAAY,CAAC;gBACxB,OAAO,EAAE,WAAW;gBACpB,GAAG,EAAE,SAAS;gBACd,YAAY,EAAE,UAAU;aACzB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,iCAAiC;SACrD,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAEzD,qEAAqE;QACrE,IAAI,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,eAAe,GAAG,MAAM,CAAC;QAC7B,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC;YACH,mCAAmC;YACnC,IAAI,eAAe,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;YAEvD,gEAAgE;YAChE,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,IAAI,CAAC;oBACH,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;oBAC9C,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC;gBACvD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,iDAAiD;gBACnD,CAAC;YACH,CAAC;YAED,IAAI,eAAe,EAAE,CAAC;gBAClB,2CAA2C;gBAC3C,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;gBACpE,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACtC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;gBAElD,MAAM,YAAY,GAAG,kBAAkB,CAAC;oBACtC,KAAK;oBACL,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;iBACpC,CAAC,CAAC;gBAEH,MAAM,SAAS,GAAG,QAAQ,CAAC;oBACzB,0DAA0D;oBAC1D,0CAA0C;iBAC3C,CAAC,CAAC;gBAEH,2BAA2B;gBAC3B,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBAC5C,YAAY,CAAC,YAAY,CAAC;wBACxB,OAAO,EAAE,eAAgC;wBACzC,GAAG,EAAE,SAAS;wBACd,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE,CAAC,OAAwB,CAAC;qBACjC,CAAC;oBACF,YAAY,CAAC,YAAY,CAAC;wBACxB,OAAO,EAAE,eAAgC;wBACzC,GAAG,EAAE,SAAS;wBACd,YAAY,EAAE,UAAU;qBACzB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,uCAAuC;iBAC5D,CAAC,CAAC;gBAEH,aAAa,GAAG,OAAO,CAAC;gBACxB,eAAe,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACjD,aAAa,GAAG,IAAI,CAAC;YACvB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,6DAA6D;YAC7D,sCAAsC;YACtC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,CAAC,GAAG,EAAE,CAAC;YAEd,iCAAiC;YACjC,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC;gBAC9B,IAAI,EAAE;oBACJ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;oBACxB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;oBAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC1B;gBACD,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;gBACpC,KAAK,EAAE;oBACL,IAAI,EAAE,EAAE;oBACR,MAAM,EAAE,CAAC,KAAK,CAAC;iBAChB;aACF,CAAC,CAAC;YAEH,kBAAkB;YAClB,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9C,aAAa,CAAC,IAAI,CAAC;gBACjB,KAAK,CAAC,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;gBAClC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;gBACzE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;aACjB,CAAC,CAAC;YAEH,mBAAmB;YACnB,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7C,aAAa,CAAC,IAAI,CAAC;gBACjB,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;gBAClC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,GAAG,WAAW,CAAC;gBAChF,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,CAAC,CAAC;YAEH,+BAA+B;YAC/B,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,iBAAiB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE;oBAC5E,qBAAqB,EAAE,CAAC;oBACxB,qBAAqB,EAAE,CAAC;iBACzB,CAAC,CAAC;gBACH,aAAa,CAAC,IAAI,CAAC;oBACjB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;oBACxB,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC;oBAChC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;iBACjB,CAAC,CAAC;YACL,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtC,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,EAAE,CAAC;YAEd,oCAAoC;YACpC,IAAI,MAAM,GAAG,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC,CAAC;gBACpE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC,CAAC;gBACpE,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,CAAC;iBAAM,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC,CAAC;gBAClE,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,CAAC;iBAAM,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;gBAChE,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO;YACP,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;YACnC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;YACvC,YAAY;YACZ,aAAa,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACnD,eAAe;SAChB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iDAAiD;QACjD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CAAC,oDAAoD,CAAC,CACnE,CAAC;QACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAChE,CAAC;QACF,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,OAAoB;IACjD,uEAAuE;IACvE,0CAA0C;AAC5C,CAAC"}

package/dist/commands/buy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buy.d.ts","sourceRoot":"","sources":["../../src/commands/buy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA8D7C,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,eAAe,GAAG,YAAY,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAqCD,eAAO,MAAM,YAAY,UAA2B,CAAC;AACrD,eAAO,MAAM,YAAY,UAAuB,CAAC;AA2iBjD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,MAAM,EAAE,mCAAmC;AACvD,MAAM,EAAE,MAAM,EACd,UAAU,UAAO,EACjB,MAAM,UAAQ,EAAE,+CAA+C;AAC/D,UAAU,CAAC,EAAE,KAAK,MAAM,EAAE,GACzB,OAAO,CAAC,cAAc,CAAC,CAoNzB;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CA8E7D;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,EACtB,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAkBN"}
+{"version":3,"file":"buy.d.ts","sourceRoot":"","sources":["../../src/commands/buy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA+D7C,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,eAAe,GAAG,YAAY,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAqCD,eAAO,MAAM,YAAY,UAA2B,CAAC;AACrD,eAAO,MAAM,YAAY,UAAuB,CAAC;AA4iBjD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,MAAM,EAAE,mCAAmC;AACvD,MAAM,EAAE,MAAM,EACd,UAAU,UAAO,EACjB,MAAM,UAAQ,EAAE,+CAA+C;AAC/D,UAAU,CAAC,EAAE,KAAK,MAAM,EAAE,GACzB,OAAO,CAAC,cAAc,CAAC,CAkOzB;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,GAAE,OAAe,GAAG,IAAI,CAyG3F;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,EACtB,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAkBN"}

package/dist/commands/buy.js

@@ -1,12 +1,13 @@
 import chalk from "chalk";
 import { validateTokenId, validateAmount } from "../utils/validation.js";
 import { printBox, formatTokenAmount, formatCurrency, formatAddress, } from "../utils/formatting.js";
-import { printSuccess, printGraduationProgress } from "../interactive/art.js";
+import { printSuccess, printGraduationProgress, printGraduationInProgress } from "../interactive/art.js";
 import { resolveTokenId } from "../utils/token-resolver.js";
 import { getTokenInfo } from "./info.js";
 import { createPublicClient, createWalletClient, http, parseAbi, formatUnits, decodeAbiParameters, decodeFunctionData, decodeEventLog, } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { baseSepolia } from "viem/chains";
+import { config } from "../config.js";
 async function simulateAndExplainUniversalRouterRevert(args) {
     try {
         await args.publicClient.call({
@@ -44,7 +45,7 @@ const ERC20_ABI = parseAbi([
     "function balanceOf(address owner) view returns (uint256)",
     "function decimals() view returns (uint8)",
 ]);
-const USDC_ADDRESS = '0x036CbD53842c5426634e7929541eC2318f3dCF7e';
+import { getUSDCAddress } from '../utils/constants.js';
 const PERMIT2_ADDRESS = '0x000000000022D473030F116dDEE9F6B43aC78BA3';
 const PERMIT2_ABI = parseAbi([
     'function allowance(address owner, address token, address spender) view returns (uint160 amount, uint48 expiration, uint48 nonce)',
@@ -279,18 +280,18 @@ async function checkPriceImpact(priceImpact, silent) {
     // Will add proper confirmation in future refactor
     return;
 }
-async function executeUniswapBuy(swapData, privateKey, silent) {
+async function executeUniswapBuy(swapData, privateKey, silent, usdcAddress) {
     const account = privateKeyToAccount(privateKey);
     const userAddress = account.address;
     // Create clients
     const publicClient = createPublicClient({
         chain: baseSepolia,
-        transport: http(),
+        transport: http(config.getRpcUrl()),
     });
     const walletClient = createWalletClient({
         account,
         chain: baseSepolia,
-        transport: http(),
+        transport: http(config.getRpcUrl()),
     });
     // Approve tokens if needed
     for (const approval of swapData.approvals) {
@@ -326,7 +327,7 @@ async function executeUniswapBuy(swapData, privateKey, silent) {
         console.log(chalk.cyan(`  Executing swap via ${swapData.route}...`));
     }
     const usdcBefore = (await publicClient.readContract({
-        address: USDC_ADDRESS,
+        address: usdcAddress,
         abi: ERC20_ABI,
         functionName: 'balanceOf',
         args: [userAddress],
@@ -450,7 +451,7 @@ async function executeUniswapBuy(swapData, privateKey, silent) {
         try {
             const usdcDeltaFromLogs = getErc20NetDeltaFromReceipt({
                 receipt,
-                token: USDC_ADDRESS,
+                token: usdcAddress,
                 user: userAddress,
             });
             const tokenDeltaFromLogs = getErc20NetDeltaFromReceipt({
@@ -467,7 +468,7 @@ async function executeUniswapBuy(swapData, privateKey, silent) {
             if (usdcDelta === 0n || tokenDelta === 0n) {
                 try {
                     const usdcAfter = (await publicClient.readContract({
-                        address: USDC_ADDRESS,
+                        address: usdcAddress,
                         abi: ERC20_ABI,
                         functionName: 'balanceOf',
                         args: [userAddress],
@@ -511,6 +512,9 @@ export async function buyToken(client, identifier, // Can be token ID, name, or
 amount, isTestMode = true, silent = false, // Suppress resolver output for quiet/JSON mode
 privateKey // Private key for executing Uniswap swaps
 ) {
+    // Get USDC address for the current network
+    const network = client.getNetwork();
+    const USDC_ADDRESS = getUSDCAddress(network);
     // Resolve identifier to token ID (or contract address for external tokens)
     const tokenId = await resolveTokenId(identifier, client, silent);
     // Validate input
@@ -526,6 +530,9 @@ privateKey // Private key for executing Uniswap swaps
             const tokenInfo = await getTokenInfo(client, tokenId, undefined, silent);
             // It's one of our tokens! Continue with normal flow based on status
             if (tokenInfo.status === "graduating") {
+                if (!silent) {
+                    printGraduationInProgress(tokenInfo.name);
+                }
                 throw new Error("Token is currently graduating. Please wait for graduation to complete.");
             }
             if (tokenInfo.status === "graduated") {
@@ -542,13 +549,13 @@ privateKey // Private key for executing Uniswap swaps
                 const userAddress = account.address;
                 // Get transaction data from backend using universal swap
                 const input = { tokenIdentifier: tokenId, amount, slippage: 0.5, recipient: userAddress };
-                const { data } = await client.invoke("token_buy_universal", input);
+                const { data, payment } = await client.invoke("token_buy_universal", input);
                 // Check price impact (confirmation disabled for now)
                 if (data.priceImpact) {
                     await checkPriceImpact(data.priceImpact, silent);
                 }
                 // Execute the swap on-chain
-                const txHash = await executeUniswapBuy(data, privateKey, silent);
+                const txHash = await executeUniswapBuy(data, privateKey, silent, USDC_ADDRESS);
                 return {
                     tokenId: data.tokenId,
                     tokenAddress: data.tokenAddress,
@@ -559,6 +566,7 @@ privateKey // Private key for executing Uniswap swaps
                     newPrice: data.pricePerToken,
                     source: "uniswap_v2",
                     txHash,
+                    paymentTxHash: payment?.txHash,
                     slippage: data.slippage,
                     priceImpact: data.priceImpact,
                     route: data.route,
@@ -583,13 +591,13 @@ privateKey // Private key for executing Uniswap swaps
                 const userAddress = account.address;
                 // Get transaction data from backend using universal swap
                 const input = { tokenIdentifier: tokenId, amount, slippage: 0.5, recipient: userAddress };
-                const { data } = await client.invoke("token_buy_universal", input);
+                const { data, payment } = await client.invoke("token_buy_universal", input);
                 // Check price impact (confirmation disabled for now)
                 if (data.priceImpact) {
                     await checkPriceImpact(data.priceImpact, silent);
                 }
                 // Execute the swap on-chain
-                const txHash = await executeUniswapBuy(data, privateKey, silent);
+                const txHash = await executeUniswapBuy(data, privateKey, silent, USDC_ADDRESS);
                 return {
                     tokenId: data.tokenId,
                     tokenAddress: data.tokenAddress,
@@ -600,6 +608,7 @@ privateKey // Private key for executing Uniswap swaps
                     newPrice: data.pricePerToken,
                     source: "uniswap_v2",
                     txHash,
+                    paymentTxHash: payment?.txHash,
                     slippage: data.slippage,
                     priceImpact: data.priceImpact,
                     route: data.route,
@@ -618,6 +627,9 @@ privateKey // Private key for executing Uniswap swaps
         : await getTokenInfo(client, tokenId, undefined, silent);
     // Check token status and route accordingly
     if (tokenInfo.status === "graduating") {
+        if (!silent) {
+            printGraduationInProgress(tokenInfo.name);
+        }
         throw new Error("Token is currently graduating. Please wait for graduation to complete.");
     }
     if (tokenInfo.status === "graduated") {
@@ -631,13 +643,13 @@ privateKey // Private key for executing Uniswap swaps
         }
         // Get transaction data from backend using universal swap
         const input = { tokenIdentifier: tokenId, amount, slippage: 0.5 };
-        const { data } = await client.invoke("token_buy_universal", input);
+        const { data, payment } = await client.invoke("token_buy_universal", input);
         // Check price impact (confirmation disabled for now)
         if (data.priceImpact) {
             await checkPriceImpact(data.priceImpact, silent);
         }
         // Execute the swap on-chain
-        const txHash = await executeUniswapBuy(data, privateKey, silent);
+        const txHash = await executeUniswapBuy(data, privateKey, silent, USDC_ADDRESS);
         return {
             tokenId: data.tokenId,
             tokenAddress: data.tokenAddress,
@@ -648,6 +660,7 @@ privateKey // Private key for executing Uniswap swaps
             newPrice: data.pricePerToken,
             source: "uniswap_v2",
             txHash,
+            paymentTxHash: payment?.txHash,
             slippage: data.slippage,
             priceImpact: data.priceImpact,
             route: data.route,
@@ -668,7 +681,7 @@ privateKey // Private key for executing Uniswap swaps
         ? `token_buy_${normalizedAmount.replace(".", "_")}`
         : "token_buy";
     // Make request
-    const { data } = await client.invoke(entrypoint, input);
+    const { data, payment } = await client.invoke(entrypoint, input);
     // Add token info and source to result
     return {
         ...data,
@@ -676,27 +689,35 @@ privateKey // Private key for executing Uniswap swaps
         tokenName: tokenInfo.name,
         tokenSymbol: tokenInfo.symbol,
         source: "bonding_curve",
+        paymentTxHash: payment?.txHash,
     };
 }
-export function displayBuyResult(result) {
+export function displayBuyResult(result, interactive = false) {
     printSuccess("Tokens purchased successfully!", "money");
+    console.log();
     if (result.source === "uniswap_v2") {
         // Graduated token - Uniswap V2 display
+        console.log(chalk.magenta.bold("💰 Purchase Summary"));
+        console.log();
         const boxContent = {
-            Token: `${result.tokenName} (${result.tokenSymbol})`,
-            Contract: formatAddress(result.tokenAddress || ""),
-            Source: result.route ?? "Uniswap",
-            "Tokens Received": formatTokenAmount(result.tokensReceived),
-            "Amount Spent": formatCurrency(result.amountSpent, 6),
-            Price: formatCurrency(result.newPrice),
+            Token: chalk.blue(result.tokenName) + ` ${chalk.yellow.bold(`(${result.tokenSymbol})`)}`,
+            Contract: chalk.cyan(formatAddress(result.tokenAddress || "")),
+            Source: chalk.yellow(result.route ?? "Uniswap"),
+            "Tokens Received": chalk.green.bold(formatTokenAmount(result.tokensReceived)),
+            "Amount Spent": chalk.cyan(formatCurrency(result.amountSpent, 6)),
+            Price: chalk.cyan(formatCurrency(result.newPrice)),
         };
         if (result.slippage !== undefined) {
-            boxContent["Slippage"] = `${result.slippage}%`;
+            boxContent["Slippage"] = chalk.magenta(`${result.slippage}%`);
         }
+        printBox("Purchase Details", boxContent);
+        // Display transaction hash with block explorer link
         if (result.txHash) {
-            boxContent["Transaction"] = result.txHash;
+            console.log();
+            console.log(chalk.green.bold(`  ✅ Transaction Hash:`));
+            console.log(chalk.cyan(`     ${result.txHash}`));
+            console.log(chalk.dim(`     https://sepolia.basescan.org/tx/${result.txHash}`));
         }
-        printBox("💰 Purchase Summary", boxContent);
         // Display price impact warning
         if (result.priceImpact !== undefined) {
             console.log();
@@ -720,32 +741,48 @@ export function displayBuyResult(result) {
             const feePercent = result.routeFee ? (result.routeFee / 10000).toFixed(2) : 'N/A';
             console.log(chalk.cyan(`  Route:           ${result.route} (${feePercent}% fee)`));
         }
+        // Quick commands
+        const prefix = interactive ? "" : "httpcat ";
+        console.log();
+        console.log(chalk.magenta.bold("⚡ Quick commands:"));
+        console.log(`   ${chalk.cyan.bold(`💸 ${prefix}sell`)} ${chalk.yellow.bold(result.tokenSymbol)} ${chalk.dim("<amount>")}`);
+        console.log(`   ${chalk.cyan.bold(`ℹ️  ${prefix}info`)} ${chalk.yellow.bold(result.tokenSymbol)}`);
+        console.log();
     }
     else {
         // Active token - Bonding curve display
+        console.log(chalk.magenta.bold("💰 Purchase Summary"));
+        console.log();
         const graduationStatus = result.graduationReached
-            ? "✅ GRADUATED!"
-            : `${(result.graduationProgress || 0).toFixed(2)}%`;
+            ? chalk.green.bold("✅ GRADUATED!")
+            : chalk.magenta(`${(result.graduationProgress || 0).toFixed(2)}%`);
         const boxContent = {
-            Token: `${result.tokenName} (${result.tokenSymbol})`,
-            Contract: formatAddress(result.tokenAddress || ""),
-            Source: "Bonding Curve",
-            "Tokens Received": formatTokenAmount(result.tokensReceived),
-            "Amount Spent": formatCurrency(result.amountSpent, 6),
+            Token: chalk.blue(result.tokenName) + ` ${chalk.yellow.bold(`(${result.tokenSymbol})`)}`,
+            Contract: chalk.cyan(formatAddress(result.tokenAddress || "")),
+            Source: chalk.yellow("Bonding Curve"),
+            "Tokens Received": chalk.green.bold(formatTokenAmount(result.tokensReceived)),
+            "Amount Spent": chalk.cyan(formatCurrency(result.amountSpent, 6)),
         };
         if (result.fee) {
-            boxContent["Fee (1%)"] = formatCurrency(result.fee, 6);
+            boxContent["Fee (1%)"] = chalk.dim(formatCurrency(result.fee, 6));
         }
-        boxContent["New Price"] = formatCurrency(result.newPrice);
+        boxContent["New Price"] = chalk.cyan(formatCurrency(result.newPrice));
         if (result.newMcap) {
-            boxContent["New Market Cap"] = formatCurrency(result.newMcap);
+            boxContent["New Market Cap"] = chalk.green(formatCurrency(result.newMcap));
         }
         boxContent["Graduation"] = graduationStatus;
-        printBox("💰 Purchase Summary", boxContent);
+        printBox("Purchase Details", boxContent);
         console.log();
         if (result.graduationProgress !== undefined) {
             printGraduationProgress(result.graduationProgress);
         }
+        // Quick commands
+        const prefix = interactive ? "" : "httpcat ";
+        console.log();
+        console.log(chalk.magenta.bold("⚡ Quick commands:"));
+        console.log(`   ${chalk.cyan.bold(`💸 ${prefix}sell`)} ${chalk.yellow.bold(result.tokenSymbol)} ${chalk.dim("<amount>")}`);
+        console.log(`   ${chalk.cyan.bold(`ℹ️  ${prefix}info`)} ${chalk.yellow.bold(result.tokenSymbol)}`);
+        console.log();
     }
 }
 export function displayBuyResultCompact(result, buyNumber, totalBuys) {