@darksol/terminal 0.5.2 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darksol/terminal",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "DARKSOL Terminal — unified CLI for all DARKSOL services. Market intel, trading, oracle, casino, and more.",
   "type": "module",
   "bin": {

package/src/services/cards.js

@@ -6,6 +6,42 @@ import { showSection } from '../ui/banner.js';
 
 const BASE = () => getServiceURL('cards') || 'https://acp.darksol.net';
 
+// Verified working ticker/network combos (tested against Trocador API)
+const VALID_CRYPTO = {
+  'usdc':  { network: 'base', display: 'USDC on Base' },
+  'usdc_base': { ticker: 'usdc', network: 'base', display: 'USDC on Base' },
+  'usdc_erc20': { ticker: 'usdc', network: 'ERC20', display: 'USDC on Ethereum' },
+  'usdt':  { network: 'trc20', display: 'USDT on Tron' },
+  'usdt_trc20': { ticker: 'usdt', network: 'trc20', display: 'USDT on Tron' },
+  'btc':   { network: 'Mainnet', display: 'Bitcoin' },
+  'eth':   { network: 'ERC20', display: 'ETH on Ethereum' },
+  'sol':   { network: 'Mainnet', display: 'Solana' },
+  'xmr':   { network: 'Mainnet', display: 'Monero' },
+};
+
+// Map user-friendly network names to Trocador-compatible ones
+const NETWORK_MAP = {
+  'base': 'base',
+  'ethereum': 'ERC20', 'eth': 'ERC20', 'erc20': 'ERC20',
+  'tron': 'trc20', 'trc20': 'trc20',
+  'mainnet': 'Mainnet', 'btc': 'Mainnet', 'sol': 'Mainnet', 'xmr': 'Mainnet',
+};
+
+function resolveTickerNetwork(ticker, network) {
+  const t = (ticker || '').toLowerCase();
+  const n = (network || '').toLowerCase();
+
+  // If just ticker provided, use known defaults
+  if (t && !n) {
+    const known = VALID_CRYPTO[t];
+    if (known) return { ticker: known.ticker || t, network: known.network };
+  }
+
+  // Map network to Trocador format
+  const mappedNetwork = NETWORK_MAP[n] || network;
+  return { ticker: t, network: mappedNetwork };
+}
+
 export async function cardsCatalog() {
   const spin = spinner('Loading card catalog...').start();
   try {
@@ -58,9 +94,13 @@ export async function cardsOrder(provider, amount, opts = {}) {
       amount: Number(amount),
       email: opts.email,
     };
-    // Optional: custom crypto + network
-    if (opts.ticker) body.tickerFrom = opts.ticker;
-    if (opts.network) body.networkFrom = opts.network;
+    // Resolve ticker/network to Trocador-compatible values
+    if (opts.ticker) {
+      const resolved = resolveTickerNetwork(opts.ticker, opts.network);
+      body.tickerFrom = resolved.ticker;
+      body.networkFrom = resolved.network;
+      info(`Payment: ${resolved.ticker.toUpperCase()} on ${resolved.network}`);
+    }
 
     const data = await fetchJSON(`${BASE()}/api/cards/order`, {
       method: 'POST',

package/src/trading/swap.js

@@ -58,7 +58,8 @@ const TOKENS = {
     OP: '0x4200000000000000000000000000000000000042',
   },
   polygon: {
-    ETH: ethers.ZeroAddress,
+    MATIC: ethers.ZeroAddress,
+    POL: ethers.ZeroAddress,
     WETH: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',
     WMATIC: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
     USDC: '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359',
@@ -76,12 +77,20 @@ const ERC20_ABI = [
   'function name() view returns (string)',
 ];
 
-// Uniswap V3 SwapRouter ABI (exactInputSingle)
-const SWAP_ROUTER_ABI = [
+// Uniswap V3 SwapRouter ABIs
+// V1 SwapRouter (ETH, Arb, OP, Polygon) — has deadline IN the struct
+const SWAP_ROUTER_V1_ABI = [
   'function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 deadline, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)',
+];
+// V2 SwapRouter02 (Base) — NO deadline in struct, uses multicall wrapper
+const SWAP_ROUTER_V2_ABI = [
+  'function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)',
   'function multicall(uint256 deadline, bytes[] data) external payable returns (bytes[])',
 ];
 
+// Which chains use V2 SwapRouter02 (no deadline in struct)
+const V2_ROUTER_CHAINS = new Set(['base']);
+
 // Uniswap V3 Quoter V2 ABI (for getting expected output)
 const QUOTER_ABI = [
   'function quoteExactInputSingle((address tokenIn, address tokenOut, uint256 amountIn, uint24 fee, uint160 sqrtPriceLimitX96)) external returns (uint256 amountOut, uint160 sqrtPriceX96After, uint32 initializedTicksCrossed, uint256 gasEstimate)',
@@ -232,7 +241,6 @@ export async function executeSwap(opts = {}) {
 
     // Execute swap
     swapSpin.text = 'Getting quote for slippage protection...';
-    const swapRouter = new ethers.Contract(router, SWAP_ROUTER_ABI, signer);
     const actualTokenOut = tokenOutAddr === ethers.ZeroAddress ? TOKENS[chain]?.WETH : tokenOutAddr;
 
     const deadline = Math.floor(Date.now() / 1000) + 300; // 5 min
@@ -276,19 +284,41 @@ export async function executeSwap(opts = {}) {
     }
 
     swapSpin.text = 'Sending swap transaction...';
-    const swapParams = {
-      tokenIn: actualTokenIn,
-      tokenOut: actualTokenOut,
-      fee: 3000, // 0.3% fee tier
-      recipient: address,
-      deadline,
-      amountIn,
-      amountOutMinimum: amountOutMin,
-      sqrtPriceLimitX96: 0,
-    };
-
+    const isV2Router = V2_ROUTER_CHAINS.has(chain);
+    const routerABI = isV2Router ? SWAP_ROUTER_V2_ABI : SWAP_ROUTER_V1_ABI;
+    const swapRouter = new ethers.Contract(router, routerABI, signer);
     const txOpts = isNativeIn ? { value: amountIn } : {};
-    const tx = await swapRouter.exactInputSingle(swapParams, txOpts);
+
+    let tx;
+    if (isV2Router) {
+      // SwapRouter02: no deadline in struct, use multicall wrapper
+      const swapParams = {
+        tokenIn: actualTokenIn,
+        tokenOut: actualTokenOut,
+        fee: 3000,
+        recipient: address,
+        amountIn,
+        amountOutMinimum: amountOutMin,
+        sqrtPriceLimitX96: 0,
+      };
+      // Encode the swap call, then wrap in multicall with deadline
+      const swapIface = new ethers.Interface(SWAP_ROUTER_V2_ABI);
+      const swapData = swapIface.encodeFunctionData('exactInputSingle', [swapParams]);
+      tx = await swapRouter.multicall(deadline, [swapData], txOpts);
+    } else {
+      // V1 SwapRouter: deadline is in the struct
+      const swapParams = {
+        tokenIn: actualTokenIn,
+        tokenOut: actualTokenOut,
+        fee: 3000,
+        recipient: address,
+        deadline,
+        amountIn,
+        amountOutMinimum: amountOutMin,
+        sqrtPriceLimitX96: 0,
+      };
+      tx = await swapRouter.exactInputSingle(swapParams, txOpts);
+    }
 
     swapSpin.text = 'Waiting for confirmation...';
     const receipt = await tx.wait();