@hypurrquant/defi-cli 1.0.10 → 1.0.12

package/dist/index.js

@@ -1968,12 +1968,16 @@ var init_dist2 = __esm({
           functionName: "add_liquidity",
           args: [[params.amount_a, params.amount_b], 0n]
         });
+        const approvals = [];
+        if (params.amount_a > 0n) approvals.push({ token: params.token_a, spender: this.router, amount: params.amount_a });
+        if (params.amount_b > 0n) approvals.push({ token: params.token_b, spender: this.router, amount: params.amount_b });
         return {
           description: `[${this.protocolName}] Curve add liquidity`,
           to: this.router,
           data,
           value: 0n,
-          gas_estimate: 4e5
+          gas_estimate: 4e5,
+          approvals
         };
       }
       async buildRemoveLiquidity(params) {
@@ -7333,11 +7337,29 @@ var Executor = class _Executor {
   static applyGasBuffer(gas) {
     return gas * GAS_BUFFER_BPS / 10000n;
   }
+  /**
+   * EIP-1559 max-fee formula: `baseFee * 1.25 + priorityFee`.
+   * Extracted as a static so the math is unit-testable without mocking viem.
+   */
+  static computeMaxFee(baseFeePerGas, priorityFee) {
+    return baseFeePerGas * 125n / 100n + priorityFee;
+  }
   /**
    * Check allowance for a single token/spender pair and send an approve tx if needed.
    * Only called in broadcast mode (not dry-run).
    */
+  /**
+   * Recognize the standard native-token sentinels:
+   * - 0x0000…0000 — defi-cli's internal marker for native gas tokens
+   * - 0xeeee…eeee — 1inch / KyberSwap / OpenOcean canonical sentinel
+   * Any address normalised to lowercase matches case-insensitively.
+   */
+  static isNativeSentinel(token) {
+    const t = token.toLowerCase();
+    return t === "0x0000000000000000000000000000000000000000" || t === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+  }
   async checkAndApprove(token, spender, amount, owner, publicClient, walletClient) {
+    if (_Executor.isNativeSentinel(token)) return;
     const allowance = await publicClient.readContract({
       address: token,
       abi: ERC20_ABI,
@@ -7418,9 +7440,12 @@ var Executor = class _Executor {
   /**
    * Fetch EIP-1559 fee params. Returns [maxFeePerGas, maxPriorityFeePerGas].
    *
-   * Strategy: read the latest block's `baseFeePerGas` and use the canonical
-   * EIP-1559 formula `maxFee = baseFee * 2 + priorityFee` (1 block of head-room
-   * after a 12.5% bump). Falls back to `getGasPrice() + priorityFee` only when
+   * Strategy: read the latest block's `baseFeePerGas` and apply the conservative
+   * formula `maxFee = baseFee * 1.25 + priorityFee` (one block of head-room — the
+   * 12.5% per-block max bump). The canonical 2× wastes budget on chains where
+   * baseFee is already elevated (e.g., Mantle ~50 gwei → 100 gwei doubled the
+   * MNT requirement and broke multi-step flows). Falls back to
+   * `getGasPrice() + priorityFee` only when
    * the chain doesn't expose `baseFeePerGas` (pre-1559).
    *
    * Why not gasPrice * 2: `getGasPrice()` returns `baseFee + priorityFee`, so
@@ -7439,8 +7464,7 @@ var Executor = class _Executor {
       try {
         const block = await client.getBlock({ blockTag: "latest" });
         if (block.baseFeePerGas !== null && block.baseFeePerGas !== void 0) {
-          const maxFee = block.baseFeePerGas * 125n / 100n + priorityFee;
-          return [maxFee, priorityFee];
+          return [_Executor.computeMaxFee(block.baseFeePerGas, priorityFee), priorityFee];
         }
       } catch {
       }
@@ -7483,6 +7507,7 @@ var Executor = class _Executor {
     if (tx.approvals && tx.approvals.length > 0) {
       const pendingApprovals = [];
       for (const approval of tx.approvals) {
+        if (_Executor.isNativeSentinel(approval.token)) continue;
         try {
           const allowance = await client.readContract({
             address: approval.token,
@@ -8261,7 +8286,8 @@ function handleSchema(params) {
 function registerSchema(parent, getOpts) {
   parent.command("schema [command]").description("Output JSON schema for a command (agent-friendly)").option("--all", "Show all schemas").action(async (command, opts) => {
     const mode = getOpts();
-    const action = opts.all ? "all" : command ?? "all";
+    const raw = opts.all ? "all" : command ?? "all";
+    const action = raw.replace(/-/g, ".");
     const params = { action };
     const schema = handleSchema(params);
     printOutput(schema, mode);
@@ -8452,6 +8478,11 @@ function buildPipelineSteps(p, input = {}) {
     ["--protocol", slug, "slug"],
     ["--gauge", input.gauge, "gauge-from-voter.gaugeForPool"]
   ]);
+  const claimAutoStakeNftGauge = () => `defi ${chainFlag}lp claim ` + buildCmd([
+    ["--protocol", slug, "slug"],
+    ["--gauge", input.gauge, "gauge-from-voter.gaugeForPool"],
+    ["--token-id", input.tokenId, "token-id-from-mint-result"]
+  ]);
   switch (p.reward_strategy) {
     case "lp_fee_only":
       return [
@@ -8476,11 +8507,18 @@ function buildPipelineSteps(p, input = {}) {
         { step: "stake", function: "gauge.deposit(amount)", cli_command: baseFarm },
         { step: "claim", function: "gauge.earned(token, account) \u2192 gauge.getReward(account, tokens[])", cli_command: claimWithGauge() }
       ];
-    case "auto_stake":
+    case "auto_stake": {
+      const isNftAutoStake = p.interface === "uniswap_v3";
       return [
         { step: "mint", function: "Router.addLiquidity / NPM.mint", note: "LP automatically receives x(3,3) emissions \u2014 no separate stake step", cli_command: baseAdd },
-        { step: "claim", function: "gauge.getReward(account, tokens[])", note: "Multi-token reward (xRAM + WHYPE on Ramses HL)", cli_command: claimWithGauge() }
+        {
+          step: "claim",
+          function: isNftAutoStake ? "NPM.getPeriodReward(currentEpoch, tokenId, tokens[], receiver)" : "gauge.getReward(account, tokens[])",
+          note: isNftAutoStake ? "Ramses CL: claim via NPM with --token-id; gauge.getReward* reverts NOT_AUTHORIZED_CLAIMER for EOAs" : "Multi-token reward (xRAM + WHYPE on Ramses HL)",
+          cli_command: isNftAutoStake ? claimAutoStakeNftGauge() : claimWithGauge()
+        }
       ];
+    }
     case "on_chain_masterchef":
       return [
         { step: "mint", function: "NPM.mint or pool.mint", cli_command: baseAdd },
@@ -9191,7 +9229,7 @@ function registerLP(parent, getOpts, makeExecutor2) {
       note: "Plan output. Run each cli_command sequentially. After the mint step, broadcast mode prints `details.minted_token_id` \u2014 feed that into the next step's --token-id."
     }, getOpts());
   });
-  lp.command("remove").description("Auto-unstake (if staked) and remove liquidity from a pool").requiredOption("--protocol <protocol>", "Protocol slug").requiredOption("--token-a <token>", "First token symbol or address").requiredOption("--token-b <token>", "Second token symbol or address").requiredOption("--liquidity <amount>", "Liquidity amount to remove in wei").option("--pool <address>", "Pool address (needed to resolve gauge)").option("--gauge <address>", "Gauge contract address (for solidly/hybra unstake)").option("--token-id <id>", "NFT tokenId (for CL gauge or farming positions)").option("--recipient <address>", "Recipient address").option("--redeem-type <n>", "Hybra: 0=instant exit (with penalty), 1=lock into 2-year veHYBR (default \u2014 WARNING: long lock)").option("--bins <binIds>", "Merchant Moe LB: comma-separated bin IDs to withdraw").option("--amounts <wei>", "Merchant Moe LB: comma-separated bin amounts (parallel to --bins, default: full balance)").action(async (opts) => {
+  lp.command("remove").description("Auto-unstake (if staked) and remove liquidity from a pool").requiredOption("--protocol <protocol>", "Protocol slug").option("--token-a <token>", "First token symbol or address (required for V2/Curve/LB)").option("--token-b <token>", "Second token symbol or address (required for V2/Curve/LB)").option("--liquidity <amount>", "Liquidity amount to remove in wei (required for V2/Curve/LB)").option("--pool <address>", "Pool address (needed to resolve gauge)").option("--gauge <address>", "Gauge contract address (for solidly/hybra unstake)").option("--token-id <id>", "NFT tokenId (for CL gauge or farming positions)").option("--recipient <address>", "Recipient address").option("--redeem-type <n>", "Hybra: 0=instant exit (with penalty), 1=lock into 2-year veHYBR (default \u2014 WARNING: long lock)").option("--bins <binIds>", "Merchant Moe LB: comma-separated bin IDs to withdraw").option("--amounts <wei>", "Merchant Moe LB: comma-separated bin amounts (parallel to --bins, default: full balance)").action(async (opts) => {
     const executor = makeExecutor2();
     const chainName = parent.opts().chain;
     if (!chainName) {
@@ -9207,6 +9245,9 @@ function registerLP(parent, getOpts, makeExecutor2) {
     if (iface === "uniswap_v2" && protocol.contracts?.["lb_factory"]) {
       if (!opts.pool) throw new Error(`--pool is required for ${protocol.name} (Liquidity Book \u2014 pass --pool <addr>)`);
       if (!opts.bins) throw new Error("--bins <id1,id2,...> is required for Merchant Moe LB remove");
+      if (!opts.tokenA || !opts.tokenB) {
+        throw new Error(`--token-a and --token-b are required for ${protocol.name} (Liquidity Book) remove`);
+      }
       const lbAdapter = createMerchantMoeLB(protocol, rpcUrl);
       const tokenA2 = opts.tokenA.startsWith("0x") ? opts.tokenA : registry.resolveToken(chainName, opts.tokenA).address;
       const tokenB2 = opts.tokenB.startsWith("0x") ? opts.tokenB : registry.resolveToken(chainName, opts.tokenB).address;
@@ -9249,8 +9290,22 @@ function registerLP(parent, getOpts, makeExecutor2) {
       printOutput({ step: "lb_remove", ...result }, getOpts());
       return;
     }
-    const tokenA = opts.tokenA.startsWith("0x") ? opts.tokenA : registry.resolveToken(chainName, opts.tokenA).address;
-    const tokenB = opts.tokenB.startsWith("0x") ? opts.tokenB : registry.resolveToken(chainName, opts.tokenB).address;
+    const NFT_REMOVE_IFACES = /* @__PURE__ */ new Set(["uniswap_v3", "algebra_v3", "thena_cl", "hybra"]);
+    const isNftRemove = !!opts.tokenId && NFT_REMOVE_IFACES.has(iface);
+    if (!isNftRemove) {
+      const missing = [];
+      if (!opts.tokenA) missing.push("--token-a");
+      if (!opts.tokenB) missing.push("--token-b");
+      if (!opts.liquidity) missing.push("--liquidity");
+      if (missing.length > 0) {
+        printOutput({
+          error: `${missing.join(", ")} required for ${protocol.name} remove (or pass --token-id for V3/CL NFT-based remove).`
+        }, getOpts());
+        return;
+      }
+    }
+    const tokenA = opts.tokenA ? opts.tokenA.startsWith("0x") ? opts.tokenA : registry.resolveToken(chainName, opts.tokenA).address : void 0;
+    const tokenB = opts.tokenB ? opts.tokenB.startsWith("0x") ? opts.tokenB : registry.resolveToken(chainName, opts.tokenB).address : void 0;
     const poolAddr = opts.pool ? opts.pool : void 0;
     let didUnstake = false;
     if (iface === "algebra_v3" && protocol.contracts?.["farming_center"] && opts.tokenId && poolAddr) {
@@ -9300,7 +9355,7 @@ function registerLP(parent, getOpts, makeExecutor2) {
         if (iface === "hybra" && (!wOpts || wOpts.redeemType === 1)) {
           process.stderr.write("WARNING: Hybra default redeemType=1 locks rewards into 2-year veHYBR NFT. Pass --redeem-type 0 for instant exit (with penalty).\n");
         }
-        const withdrawTx = await gaugeAdapter.buildWithdraw(gaugeAddr, BigInt(opts.liquidity), tokenId, wOpts);
+        const withdrawTx = await gaugeAdapter.buildWithdraw(gaugeAddr, opts.liquidity ? BigInt(opts.liquidity) : 0n, tokenId, wOpts);
         const withdrawResult = await executor.execute(withdrawTx);
         printOutput({ step: "unstake_gauge", ...withdrawResult }, getOpts());
         if (withdrawResult.status !== "confirmed" && withdrawResult.status !== "simulated") {
@@ -9315,11 +9370,31 @@ function registerLP(parent, getOpts, makeExecutor2) {
     }
     process.stderr.write("Step 2/2: Removing liquidity...\n");
     const dexAdapter = createDex(protocol, rpcUrl);
+    let removeLiquidity = opts.liquidity ? BigInt(opts.liquidity) : 0n;
+    if (isNftRemove && removeLiquidity === 0n) {
+      const npm = protocol.contracts?.["position_manager"];
+      if (npm) {
+        const c = createPublicClient23({ transport: http23(rpcUrl) });
+        const pos = await detectV3Liquidity(c, npm, BigInt(opts.tokenId));
+        if (pos) {
+          removeLiquidity = pos.liquidity;
+          process.stderr.write(`  Read live liquidity ${removeLiquidity} from NPM.positions(${opts.tokenId}).
+`);
+        }
+      }
+    }
+    if (isNftRemove && removeLiquidity === 0n) {
+      printOutput({
+        error: `tokenId ${opts.tokenId} has zero liquidity (already removed?). Pass --liquidity explicitly to override, or pick a different tokenId.`
+      }, getOpts());
+      return;
+    }
+    const ZERO = "0x0000000000000000000000000000000000000000";
     const removeTx = await dexAdapter.buildRemoveLiquidity({
       protocol: protocol.name,
-      token_a: tokenA,
-      token_b: tokenB,
-      liquidity: BigInt(opts.liquidity),
+      token_a: tokenA ?? ZERO,
+      token_b: tokenB ?? ZERO,
+      liquidity: removeLiquidity,
       recipient,
       token_id: opts.tokenId ? BigInt(opts.tokenId) : void 0
     });
@@ -9698,12 +9773,20 @@ function resolveTokenAddress(registry, chainName, tokenOrAddress) {
   return registry.resolveToken(chainName, tokenOrAddress).address;
 }
 var FALLBACK_ADDRESS = "0x0000000000000000000000000000000000000001";
+var warnedFallback = false;
 function resolveWallet(override) {
   if (override) return override;
   try {
     const { address } = resolveWalletWithSigner();
     return address;
   } catch {
+    if (!warnedFallback) {
+      process.stderr.write(
+        `WARNING: no wallet configured (set DEFI_WALLET_ADDRESS or DEFI_PRIVATE_KEY, or use --wallet <name>). Using placeholder ${FALLBACK_ADDRESS} for dry-run preview ONLY \u2014 do NOT pass --broadcast with this address.
+`
+      );
+      warnedFallback = true;
+    }
     return FALLBACK_ADDRESS;
   }
 }
@@ -9806,7 +9889,8 @@ function resolveAsset(registry, chain, asset) {
 }
 async function collectLendingRates(registry, chainName, rpc, assetAddr) {
   const protos = registry.getProtocolsForChain(chainName).filter((p) => p.category === ProtocolCategory.Lending);
-  const results = [];
+  const rates = [];
+  const errors = [];
   let first = true;
   for (const proto of protos) {
     if (!first) {
@@ -9815,19 +9899,22 @@ async function collectLendingRates(registry, chainName, rpc, assetAddr) {
     first = false;
     try {
       const lending = createLending(proto, rpc);
-      const rates = await lending.getRates(assetAddr);
-      results.push(rates);
+      const r = await lending.getRates(assetAddr);
+      rates.push(r);
     } catch (err) {
       process.stderr.write(`Warning: ${proto.name} rates unavailable: ${err}
 `);
+      errors.push({ protocol: proto.name, type: "lending_supply", reason: errMsg(err) });
     }
   }
-  return results;
+  return { rates, errors };
 }
 async function collectAllYields(registry, chainName, rpc, asset, assetAddr) {
   const opportunities = [];
-  const lendingRates = await collectLendingRates(registry, chainName, rpc, assetAddr);
-  for (const r of lendingRates) {
+  const errors = [];
+  const lendingResult = await collectLendingRates(registry, chainName, rpc, assetAddr);
+  errors.push(...lendingResult.errors);
+  for (const r of lendingResult.rates) {
     if (r.supply_apy > 0) {
       opportunities.push({
         protocol: r.protocol,
@@ -9853,7 +9940,8 @@ async function collectAllYields(registry, chainName, rpc, asset, assetAddr) {
             utilization: rates.utilization
           });
         }
-      } catch {
+      } catch (e) {
+        errors.push({ protocol: proto.name, type: "morpho_vault", reason: errMsg(e) });
       }
     }
   }
@@ -9869,7 +9957,8 @@ async function collectAllYields(registry, chainName, rpc, asset, assetAddr) {
           apy: info.apy ?? 0,
           total_assets: info.total_assets.toString()
         });
-      } catch {
+      } catch (e) {
+        errors.push({ protocol: proto.name, type: "vault", reason: errMsg(e) });
       }
     }
   }
@@ -9878,7 +9967,7 @@ async function collectAllYields(registry, chainName, rpc, asset, assetAddr) {
     const ba = b["apy"] ?? 0;
     return ba - aa;
   });
-  return opportunities;
+  return { opportunities, errors };
 }
 async function runYieldScan(registry, asset, output) {
   const t0 = Date.now();
@@ -10020,10 +10109,13 @@ function registerYield(parent, getOpts, makeExecutor2) {
       const chain = registry.getChain(chainName);
       const rpc = chain.effectiveRpcUrl();
       const assetAddr = resolveAsset(registry, chainName, opts.asset);
-      const results = await collectLendingRates(registry, chainName, rpc, assetAddr);
+      const { rates: results, errors: ratesErrors } = await collectLendingRates(registry, chainName, rpc, assetAddr);
       if (results.length === 0) {
         printOutput(
-          { error: `No lending rate data available for asset '${opts.asset}'` },
+          ratesErrors.length > 0 ? {
+            error: `Could not collect lending rates for '${opts.asset}': ${ratesErrors.length} probe(s) failed (likely RPC throttling). Retry, or set ${chainName.toUpperCase()}_RPC_URL.`,
+            failed_probes: ratesErrors
+          } : { error: `No lending rate data available for asset '${opts.asset}'` },
           getOpts()
         );
         process.exit(1);
@@ -10265,9 +10357,16 @@ function registerYield(parent, getOpts, makeExecutor2) {
       const assetAddr = resolveAsset(registry, chainName, asset);
       const strategy = opts.strategy ?? "auto";
       if (strategy === "auto") {
-        const opportunities = await collectAllYields(registry, chainName, rpc, asset, assetAddr);
+        const { opportunities, errors } = await collectAllYields(registry, chainName, rpc, asset, assetAddr);
         if (opportunities.length === 0) {
-          printOutput({ error: `No yield opportunities found for '${asset}'` }, getOpts());
+          if (errors.length > 0) {
+            printOutput({
+              error: `Could not collect yield data for '${asset}': ${errors.length} probe(s) failed (likely RPC throttling or transport error). Retry, or set a private RPC URL via ${chainName.toUpperCase()}_RPC_URL.`,
+              failed_probes: errors
+            }, getOpts());
+          } else {
+            printOutput({ error: `No yield opportunities found for '${asset}'` }, getOpts());
+          }
           process.exit(1);
           return;
         }
@@ -10297,9 +10396,12 @@ function registerYield(parent, getOpts, makeExecutor2) {
           getOpts()
         );
       } else if (strategy === "best-supply") {
-        const results = await collectLendingRates(registry, chainName, rpc, assetAddr);
+        const { rates: results, errors: rErr } = await collectLendingRates(registry, chainName, rpc, assetAddr);
         if (results.length === 0) {
-          printOutput({ error: `No lending rate data available for asset '${asset}'` }, getOpts());
+          printOutput(
+            rErr.length > 0 ? { error: `Could not collect lending rates for '${asset}': ${rErr.length} probe(s) failed (RPC throttling likely).`, failed_probes: rErr } : { error: `No lending rate data available for asset '${asset}'` },
+            getOpts()
+          );
           process.exit(1);
           return;
         }
@@ -10322,9 +10424,12 @@ function registerYield(parent, getOpts, makeExecutor2) {
           getOpts()
         );
       } else if (strategy === "leverage-loop") {
-        const results = await collectLendingRates(registry, chainName, rpc, assetAddr);
+        const { rates: results, errors: lErr } = await collectLendingRates(registry, chainName, rpc, assetAddr);
         if (results.length === 0) {
-          printOutput({ error: `No lending rate data available for asset '${asset}'` }, getOpts());
+          printOutput(
+            lErr.length > 0 ? { error: `Could not collect lending rates for '${asset}': ${lErr.length} probe(s) failed (RPC throttling likely).`, failed_probes: lErr } : { error: `No lending rate data available for asset '${asset}'` },
+            getOpts()
+          );
           process.exit(1);
           return;
         }
@@ -10388,14 +10493,14 @@ function registerYield(parent, getOpts, makeExecutor2) {
 
 // src/commands/portfolio.ts
 init_dist();
-import { encodeFunctionData as encodeFunctionData29, parseAbi as parseAbi33 } from "viem";
+import { createPublicClient as createPublicClient25, encodeFunctionData as encodeFunctionData29, http as http25, parseAbi as parseAbi33 } from "viem";
 
 // src/portfolio-tracker.ts
 init_dist();
 import { mkdirSync, writeFileSync, readdirSync as readdirSync2, readFileSync as readFileSync3, existsSync as existsSync2 } from "fs";
 import { homedir } from "os";
 import { resolve as resolve3 } from "path";
-import { encodeFunctionData as encodeFunctionData28, parseAbi as parseAbi31 } from "viem";
+import { createPublicClient as createPublicClient24, encodeFunctionData as encodeFunctionData28, http as http24, parseAbi as parseAbi31 } from "viem";
 var ERC20_ABI4 = parseAbi31([
   "function balanceOf(address owner) external view returns (uint256)"
 ]);
@@ -10446,7 +10551,16 @@ async function takeSnapshot(chainName, wallet, registry) {
   const oracleEntry = registry.getProtocolsForChain(chainName).find((p) => p.interface === "aave_v3" && p.contracts?.["oracle"]);
   const oracleAddr = oracleEntry?.contracts?.["oracle"];
   const wrappedNative = chain.wrapped_native ?? "0x5555555555555555555555555555555555555555";
+  const priceTokens = [];
   if (oracleAddr) {
+    for (const t of tokenEntries) {
+      calls.push([
+        oracleAddr,
+        encodeFunctionData28({ abi: ORACLE_ABI4, functionName: "getAssetPrice", args: [t.address] })
+      ]);
+      callLabels.push(`price:${t.address}`);
+      priceTokens.push(t.address);
+    }
     calls.push([
       oracleAddr,
       encodeFunctionData28({ abi: ORACLE_ABI4, functionName: "getAssetPrice", args: [wrappedNative] })
@@ -10457,10 +10571,19 @@ async function takeSnapshot(chainName, wallet, registry) {
   if (calls.length > 0) {
     results = await multicallRead(rpc, calls);
   }
+  const balanceCount = tokenEntries.length;
+  const lendingCount = lendingProtocols.length;
+  const priceStartIdx = balanceCount + lendingCount;
   let nativePriceUsd = 0;
+  const priceByToken = /* @__PURE__ */ new Map();
   if (oracleAddr) {
-    const priceData = results[results.length - 1] ?? null;
-    nativePriceUsd = Number(decodeU256Word(priceData)) / 1e8;
+    for (let i = 0; i < priceTokens.length; i++) {
+      const priceData = results[priceStartIdx + i] ?? null;
+      const px = Number(decodeU256Word(priceData)) / 1e8;
+      if (px > 0) priceByToken.set(priceTokens[i].toLowerCase(), px);
+    }
+    const nativePriceData = results[priceStartIdx + priceTokens.length] ?? null;
+    nativePriceUsd = Number(decodeU256Word(nativePriceData)) / 1e8;
   }
   let idx = 0;
   const tokens = [];
@@ -10470,8 +10593,20 @@ async function takeSnapshot(chainName, wallet, registry) {
     const balance = decodeU256Word(results[idx] ?? null);
     const balF64 = Number(balance) / 10 ** entry.decimals;
     const symbolUpper = entry.symbol.toUpperCase();
-    const priceUsd = symbolUpper.includes("USD") ? 1 : nativePriceUsd;
-    const valueUsd = balF64 * priceUsd;
+    const tokenAddrLower = entry.address.toLowerCase();
+    let priceUsd;
+    let valueUsd;
+    if (symbolUpper.includes("USD")) {
+      priceUsd = 1;
+      valueUsd = balF64;
+    } else if (tokenAddrLower === wrappedNative.toLowerCase()) {
+      priceUsd = nativePriceUsd;
+      valueUsd = balF64 * nativePriceUsd;
+    } else {
+      const px = priceByToken.get(tokenAddrLower);
+      priceUsd = px ?? 0;
+      valueUsd = px && px > 0 ? balF64 * px : 0;
+    }
     totalValueUsd += valueUsd;
     tokens.push({
       token: entry.address,
@@ -10512,6 +10647,23 @@ async function takeSnapshot(chainName, wallet, registry) {
     }
     idx++;
   }
+  try {
+    const client = createPublicClient24({ transport: http24(rpc) });
+    const nativeBalance = await client.getBalance({ address: user });
+    if (nativeBalance > 0n) {
+      const nativeF64 = Number(nativeBalance) / 1e18;
+      const nativeValueUsd = nativeF64 * nativePriceUsd;
+      totalValueUsd += nativeValueUsd;
+      tokens.push({
+        token: wrappedNative,
+        symbol: chain.native_token ?? "NATIVE",
+        balance: nativeBalance,
+        value_usd: nativeValueUsd,
+        price_usd: nativePriceUsd
+      });
+    }
+  } catch {
+  }
   return {
     timestamp: Date.now(),
     chain: chainName,
@@ -10629,6 +10781,10 @@ function registerPortfolio(parent, getOpts) {
     const calls = [];
     const callLabels = [];
     const tokenSymbols = (registry.tokens.get(chainName) ?? []).map((t) => t.symbol);
+    const tokenAddrsByCallIdx = [];
+    const oracleEntry = registry.getProtocolsForChain(chainName).find((p) => p.interface === "aave_v3" && p.contracts?.["oracle"]);
+    const oracleAddr = oracleEntry?.contracts?.["oracle"];
+    const wrappedNative = chain.wrapped_native ?? "0x5555555555555555555555555555555555555555";
     for (const symbol of tokenSymbols) {
       let entry;
       try {
@@ -10642,6 +10798,7 @@ function registerPortfolio(parent, getOpts) {
         encodeFunctionData29({ abi: ERC20_ABI5, functionName: "balanceOf", args: [user] })
       ]);
       callLabels.push(`balance:${symbol}`);
+      tokenAddrsByCallIdx.push(entry.address);
     }
     const lendingProtocols = registry.getProtocolsForChain(chainName).filter((p) => p.category === ProtocolCategory.Lending && p.interface === "aave_v3").filter((p) => p.contracts?.["pool"]);
     for (const p of lendingProtocols) {
@@ -10651,10 +10808,16 @@ function registerPortfolio(parent, getOpts) {
       ]);
       callLabels.push(`lending:${p.name}`);
     }
-    const oracleEntry = registry.getProtocolsForChain(chainName).find((p) => p.interface === "aave_v3" && p.contracts?.["oracle"]);
-    const oracleAddr = oracleEntry?.contracts?.["oracle"];
-    const wrappedNative = chain.wrapped_native ?? "0x5555555555555555555555555555555555555555";
+    const priceTokens = [];
     if (oracleAddr) {
+      for (const tokenAddr of tokenAddrsByCallIdx) {
+        calls.push([
+          oracleAddr,
+          encodeFunctionData29({ abi: ORACLE_ABI5, functionName: "getAssetPrice", args: [tokenAddr] })
+        ]);
+        callLabels.push(`price:${tokenAddr}`);
+        priceTokens.push(tokenAddr);
+      }
       calls.push([
         oracleAddr,
         encodeFunctionData29({ abi: ORACLE_ABI5, functionName: "getAssetPrice", args: [wrappedNative] })
@@ -10679,10 +10842,19 @@ function registerPortfolio(parent, getOpts) {
       printOutput({ error: `Multicall failed: ${errMsg(e)}` }, mode);
       return;
     }
+    const balanceCallCount = tokenAddrsByCallIdx.length;
+    const lendingCallCount = lendingProtocols.length;
+    const priceStartIdx = balanceCallCount + lendingCallCount;
     let nativePriceUsd = 0;
+    const priceByToken = /* @__PURE__ */ new Map();
     if (oracleAddr) {
-      const priceData = results[results.length - 1] ?? null;
-      nativePriceUsd = Number(decodeU2562(priceData)) / 1e8;
+      for (let i = 0; i < priceTokens.length; i++) {
+        const priceData = results[priceStartIdx + i] ?? null;
+        const px = Number(decodeU2562(priceData)) / 1e8;
+        if (px > 0) priceByToken.set(priceTokens[i].toLowerCase(), px);
+      }
+      const nativePriceData = results[priceStartIdx + priceTokens.length] ?? null;
+      nativePriceUsd = Number(decodeU2562(nativePriceData)) / 1e8;
     }
     let totalValueUsd = 0;
     let idx = 0;
@@ -10701,12 +10873,21 @@ function registerPortfolio(parent, getOpts) {
         const decimals = entry.decimals;
         const balF64 = Number(balance) / 10 ** decimals;
         const symbolUpper = symbol.toUpperCase();
-        const valueUsd = symbolUpper.includes("USD") || symbolUpper.includes("usd") ? balF64 : balF64 * nativePriceUsd;
-        totalValueUsd += valueUsd;
+        const tokenAddrLower = entry.address.toLowerCase();
+        let valueUsd;
+        if (symbolUpper.includes("USD")) {
+          valueUsd = balF64;
+        } else if (tokenAddrLower === wrappedNative.toLowerCase()) {
+          valueUsd = balF64 * nativePriceUsd;
+        } else {
+          const px = priceByToken.get(tokenAddrLower);
+          valueUsd = px && px > 0 ? balF64 * px : null;
+        }
+        if (valueUsd !== null) totalValueUsd += valueUsd;
         tokenBalances.push({
           symbol,
           balance: balF64.toFixed(4),
-          value_usd: valueUsd.toFixed(2)
+          value_usd: valueUsd !== null ? valueUsd.toFixed(2) : null
         });
       }
       idx++;
@@ -10736,11 +10917,23 @@ function registerPortfolio(parent, getOpts) {
       }
       idx++;
     }
+    let nativeBalance = 0n;
+    let nativeValueUsd = 0;
+    try {
+      const client = createPublicClient25({ transport: http25(rpc) });
+      nativeBalance = await client.getBalance({ address: user });
+      const nativeF64 = Number(nativeBalance) / 1e18;
+      nativeValueUsd = nativeF64 * nativePriceUsd;
+      if (nativeBalance > 0n) totalValueUsd += nativeValueUsd;
+    } catch {
+    }
     printOutput(
       {
         address: user,
         chain: chain.name,
         native_price_usd: nativePriceUsd.toFixed(2),
+        native_balance: (Number(nativeBalance) / 1e18).toFixed(6),
+        native_value_usd: nativeValueUsd.toFixed(2),
         total_value_usd: totalValueUsd.toFixed(2),
         token_balances: tokenBalances,
         lending_positions: lendingPositions
@@ -11006,38 +11199,50 @@ function registerPrice(parent, getOpts) {
 
 // src/commands/wallet.ts
 init_dist();
-import { createPublicClient as createPublicClient24, http as http24, formatEther } from "viem";
+import { createPublicClient as createPublicClient26, http as http26, formatEther } from "viem";
+function resolveCurrentAddress(override) {
+  if (override) return { address: override, source: "flag" };
+  try {
+    const { address, signer } = resolveWalletWithSigner();
+    return { address, source: signer ? "ows" : process.env["DEFI_PRIVATE_KEY"] ? "private_key" : "env" };
+  } catch {
+    return { address: null, source: "none" };
+  }
+}
 function registerWallet(parent, getOpts) {
   const wallet = parent.command("wallet").description("Wallet management");
-  wallet.command("balance").description("Show native token balance").option("--address <address>", "Wallet address (defaults to DEFI_WALLET_ADDRESS)").action(async (opts) => {
+  wallet.command("balance").description("Show native token balance").option("--address <address>", "Wallet address (defaults to OWS vault, DEFI_PRIVATE_KEY, or DEFI_WALLET_ADDRESS)").action(async (opts) => {
     const chainName = requireChain(parent, getOpts);
     if (!chainName) return;
-    const addr = opts.address ?? process.env["DEFI_WALLET_ADDRESS"];
+    const { address: addr, source } = resolveCurrentAddress(opts.address);
     if (!addr) {
-      printOutput({ error: "--address required (or set DEFI_WALLET_ADDRESS)" }, getOpts());
+      printOutput({
+        error: "No wallet configured. Set DEFI_WALLET_ADDRESS, set DEFI_PRIVATE_KEY, or pass --address."
+      }, getOpts());
       return;
     }
     const registry = Registry.loadEmbedded();
     const chain = registry.getChain(chainName);
-    const client = createPublicClient24({ transport: http24(chain.effectiveRpcUrl()) });
+    const client = createPublicClient26({ transport: http26(chain.effectiveRpcUrl()) });
     const balance = await client.getBalance({ address: addr });
     printOutput({
       chain: chain.name,
       address: addr,
+      wallet_source: source,
       native_token: chain.native_token,
       balance_wei: balance,
       balance_formatted: formatEther(balance)
     }, getOpts());
   });
   wallet.command("address").description("Show configured wallet address").action(async () => {
-    const addr = process.env.DEFI_WALLET_ADDRESS ?? "(not set)";
-    printOutput({ address: addr }, getOpts());
+    const { address, source } = resolveCurrentAddress();
+    printOutput({ address, source }, getOpts());
   });
 }
 
 // src/commands/token.ts
 init_dist();
-import { createPublicClient as createPublicClient25, http as http25, maxUint256 } from "viem";
+import { createPublicClient as createPublicClient27, http as http27, maxUint256 } from "viem";
 function registerToken(parent, getOpts, makeExecutor2) {
   const token = parent.command("token").description("Token operations: approve, allowance, transfer, balance");
   token.command("balance").description("Query token balance for an address").requiredOption("--token <token>", "Token symbol or address").option("--owner <address>", "Wallet address (defaults to DEFI_WALLET_ADDRESS)").action(async (opts) => {
@@ -11050,7 +11255,7 @@ function registerToken(parent, getOpts, makeExecutor2) {
     }
     const registry = Registry.loadEmbedded();
     const chain = registry.getChain(chainName);
-    const client = createPublicClient25({ transport: http25(chain.effectiveRpcUrl()) });
+    const client = createPublicClient27({ transport: http27(chain.effectiveRpcUrl()) });
     const tokenAddr = resolveTokenAddress(registry, chainName, opts.token);
     const [balance, symbol, decimals] = await Promise.all([
       client.readContract({ address: tokenAddr, abi: erc20Abi, functionName: "balanceOf", args: [owner] }),
@@ -11086,7 +11291,7 @@ function registerToken(parent, getOpts, makeExecutor2) {
     }
     const registry = Registry.loadEmbedded();
     const chain = registry.getChain(chainName);
-    const client = createPublicClient25({ transport: http25(chain.effectiveRpcUrl()) });
+    const client = createPublicClient27({ transport: http27(chain.effectiveRpcUrl()) });
     const tokenAddr = resolveTokenAddress(registry, chainName, opts.token);
     const allowance = await client.readContract({
       address: tokenAddr,
@@ -11204,6 +11409,17 @@ var CCTP_USDC_ADDRESSES = {
   base: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
   polygon: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359"
 };
+function cctpMinFeeGuard(amountWei, maxFeeSubunits, feeUsdc) {
+  if (amountWei <= maxFeeSubunits) {
+    const amountUsdc = Number(amountWei) / 1e6;
+    return {
+      error: `CCTP: amount ${amountWei.toString()} (${amountUsdc} USDC) is below the minimum bridge fee of ${maxFeeSubunits} (${feeUsdc} USDC). Increase --amount.`,
+      minimum_amount_wei: maxFeeSubunits.toString(),
+      minimum_amount_usdc: feeUsdc
+    };
+  }
+  return null;
+}
 async function getCctpFeeEstimate(srcDomain, dstDomain, amountUsdc) {
   try {
     const res = await fetch(`${CCTP_FEE_API}/${srcDomain}/${dstDomain}`);
@@ -11292,12 +11508,9 @@ function registerBridge(parent, getOpts) {
         }
         const amountUsdc = Number(BigInt(opts.amount)) / 1e6;
         const { fee, maxFeeSubunits } = await getCctpFeeEstimate(srcDomain, dstDomain, amountUsdc);
-        if (BigInt(opts.amount) <= maxFeeSubunits) {
-          printOutput({
-            error: `CCTP: amount ${opts.amount} (${amountUsdc} USDC) is below the minimum bridge fee of ${maxFeeSubunits} (${fee} USDC). Increase --amount.`,
-            minimum_amount_wei: maxFeeSubunits.toString(),
-            minimum_amount_usdc: fee
-          }, getOpts());
+        const guardErr = cctpMinFeeGuard(BigInt(opts.amount), maxFeeSubunits, fee);
+        if (guardErr) {
+          printOutput(guardErr, getOpts());
           return;
         }
         const recipientPadded = `0x${"0".repeat(24)}${recipient.replace("0x", "").toLowerCase()}`;
@@ -11578,12 +11791,14 @@ function registerSwap(parent, getOpts, makeExecutor2) {
           slippagePct,
           wallet
         );
+        const fromLower = fromAddr.toLowerCase();
+        const isNativeInput = fromLower === "0x0000000000000000000000000000000000000000" || fromLower === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
         const tx = {
           description: `OpenOcean: swap ${opts.amount} of ${fromAddr} -> ${toAddr}`,
           to: swap.to,
           data: swap.data,
           value: parseBigIntValue(swap.value),
-          approvals: [{ token: fromAddr, spender: swap.to, amount: BigInt(opts.amount) }]
+          ...isNativeInput ? {} : { approvals: [{ token: fromAddr, spender: swap.to, amount: BigInt(opts.amount) }] }
         };
         const result = await executor.execute(tx);
         printOutput({
@@ -11675,7 +11890,8 @@ import pc2 from "picocolors";
 import { createInterface } from "readline";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { resolve as resolve4 } from "path";
-var DEFI_DIR = resolve4(process.env.HOME || "~", ".defi");
+import { homedir as homedir2 } from "os";
+var DEFI_DIR = resolve4(homedir2(), ".defi");
 var ENV_FILE = resolve4(DEFI_DIR, ".env");
 function ensureDefiDir() {
   if (!existsSync3(DEFI_DIR)) mkdirSync2(DEFI_DIR, { recursive: true, mode: 448 });
@@ -11710,6 +11926,44 @@ function writeEnvFile(env) {
 function ask(rl, question) {
   return new Promise((res) => rl.question(question, (answer) => res(answer.trim())));
 }
+function askSecret(rl, question) {
+  const stdin = process.stdin;
+  if (!stdin.isTTY) return ask(rl, question);
+  process.stdout.write(question);
+  const rlAny = rl;
+  const original = rlAny._writeToOutput;
+  rlAny._writeToOutput = (s) => {
+    if (s.includes("\n") || s.includes("\r")) {
+      original?.call(rl, s);
+    }
+  };
+  return new Promise((res) => {
+    rl.question("", (answer) => {
+      rlAny._writeToOutput = original;
+      process.stdout.write("\n");
+      res(answer.trim());
+    });
+  });
+}
+function maskRpcUrl(s) {
+  try {
+    const u = new URL(s);
+    if (u.pathname && u.pathname !== "/" && u.pathname.length > 1) {
+      return `${u.protocol}//${u.host}/***`;
+    }
+    return `${u.protocol}//${u.host}`;
+  } catch {
+    return "***";
+  }
+}
+function isValidRpcUrl(s) {
+  try {
+    const u = new URL(s);
+    return u.protocol === "http:" || u.protocol === "https:";
+  } catch {
+    return false;
+  }
+}
 function isValidAddress(s) {
   return /^0x[0-9a-fA-F]{40}$/.test(s);
 }
@@ -11734,7 +11988,14 @@ function registerSetup(program2) {
       if (Object.keys(existing).length > 0) {
         console.log(pc2.white("  Current configuration:"));
         for (const [key, value] of Object.entries(existing)) {
-          const masked = key.toLowerCase().includes("key") ? value.slice(0, 6) + "..." + value.slice(-4) : value;
+          let masked;
+          if (key.toLowerCase().includes("key")) {
+            masked = value.slice(0, 6) + "..." + value.slice(-4);
+          } else if (key.endsWith("RPC_URL")) {
+            masked = maskRpcUrl(value);
+          } else {
+            masked = value;
+          }
           console.log(`    ${pc2.cyan(key.padEnd(24))} ${pc2.gray(masked)}`);
         }
         console.log();
@@ -11748,7 +12009,7 @@ function registerSetup(program2) {
       }
       const newEnv = {};
       console.log(pc2.cyan(pc2.bold("  Wallet")));
-      const privateKey = await ask(rl, "  Private key (optional, for --broadcast, 0x...): ");
+      const privateKey = await askSecret(rl, "  Private key (optional, for --broadcast, 0x... \u2014 input hidden): ");
       if (privateKey) {
         const normalized = privateKey.startsWith("0x") ? privateKey : `0x${privateKey}`;
         if (!isValidPrivateKey(normalized)) {
@@ -11784,6 +12045,10 @@ function registerSetup(program2) {
       for (const { env, label } of rpcPrompts) {
         const value = await ask(rl, `  ${label} RPC URL: `);
         if (value) {
+          if (!isValidRpcUrl(value)) {
+            console.log(pc2.yellow(`  Invalid URL (${value}). Skipped \u2014 re-run setup to retry.`));
+            continue;
+          }
           newEnv[env] = value;
           console.log(`  ${pc2.green("OK")} ${label} RPC set`);
         }
@@ -11807,7 +12072,7 @@ function registerSetup(program2) {
       ];
       for (const [k, label] of rpcSummary) {
         const v = finalEnv[k];
-        if (v) console.log(`  ${label}: ${pc2.gray(v)}`);
+        if (v) console.log(`  ${label}: ${pc2.gray(maskRpcUrl(v))}`);
       }
       console.log(pc2.bold(pc2.white("\n  Next steps:")));
       console.log(`    ${pc2.green("defi portfolio")}          view balances & positions`);
@@ -11826,11 +12091,11 @@ function registerSetup(program2) {
 // src/commands/ows.ts
 import pc3 from "picocolors";
 init_dist();
-import { createPublicClient as createPublicClient26, http as http26, formatEther as formatEther2 } from "viem";
+import { createPublicClient as createPublicClient28, http as http28, formatEther as formatEther2 } from "viem";
 async function getEvmBalance(address, chainName) {
   const registry = Registry.loadEmbedded();
   const chain = registry.getChain(chainName);
-  const client = createPublicClient26({ transport: http26(chain.effectiveRpcUrl()) });
+  const client = createPublicClient28({ transport: http28(chain.effectiveRpcUrl()) });
   const balance = await client.getBalance({ address });
   return {
     native_token: chain.native_token,