@byreal-io/byreal-cli-realclaw 0.3.3 → 0.3.4

package/README.md

@@ -24,7 +24,7 @@ npm install -g @byreal-io/byreal-cli-realclaw
 
 ## Features
 
-- **Pools** — List, search, and inspect CLMM pools. View K-line charts, APR, TVL, volume, and run comprehensive pool analysis (risk, volatility, range recommendations).
+- **Pools** — List, search, and inspect CLMM pools. View K-line charts, Est. APR (fee + reward incentive breakdown), TVL, volume, and run comprehensive pool analysis (risk, volatility, range recommendations).
 - **Tokens** — List tokens, search by symbol/name, get real-time prices.
 - **Swap** — Preview and execute token swaps with slippage control and price impact estimation.
 - **Positions** — Open, close, and manage CLMM positions. Claim fees and rewards. Analyze position performance. Copy top farmers' positions with one command.

package/dist/index.cjs

@@ -3033,7 +3033,7 @@ var INJECTED_VERSION, VERSION, CLI_NAME, NPM_PACKAGE, API_BASE_URL, API_ENDPOINT
 var init_constants = __esm({
   "src/core/constants.ts"() {
     "use strict";
-    INJECTED_VERSION = true ? "0.3.3" : void 0;
+    INJECTED_VERSION = true ? "0.3.4" : void 0;
     VERSION = INJECTED_VERSION ?? process.env.npm_package_version ?? "0.0.0";
     CLI_NAME = "byreal-cli";
     NPM_PACKAGE = "@byreal-io/byreal-cli-realclaw";
@@ -82380,12 +82380,48 @@ var apiClient = {
 // src/api/endpoints.ts
 init_constants();
 init_errors();
+function transformReward(r) {
+  const isNewFormat = r.token !== void 0;
+  const mintInfo = isNewFormat ? r.token?.mintInfo : r.mint;
+  const mint = mintInfo?.address || "";
+  const symbol = mintInfo?.symbol || "";
+  const priceUsd = isNewFormat ? parseFloat(r.token?.price || "0") : 0;
+  const apr = parseFloat(r.apr || "0") * 100;
+  const rawEndTime = isNewFormat ? r.endTimestamp || 0 : r.rewardEndTime || 0;
+  const endTime = rawEndTime > 1e12 ? Math.floor(rawEndTime / 1e3) : rawEndTime;
+  const rawOpenTime = r.rewardOpenTime || 0;
+  const openTime = rawOpenTime > 1e12 ? Math.floor(rawOpenTime / 1e3) : rawOpenTime;
+  let dailyAmount = r.dailyAmountDisplay || r.dailyMaxAmount || "";
+  if (!dailyAmount && r.rewardPerSecond) {
+    const rps = parseFloat(r.rewardPerSecond);
+    if (rps > 0) {
+      dailyAmount = (rps * 86400).toString();
+    }
+  }
+  const dailyAmountNum = parseFloat(dailyAmount || "0");
+  const dailyAmountUsd = dailyAmountNum * priceUsd;
+  return {
+    mint,
+    symbol,
+    rewardPerSecond: r.rewardPerSecond || "0",
+    openTime,
+    endTime,
+    apr,
+    daily_amount: dailyAmount,
+    daily_amount_usd: dailyAmountUsd,
+    price_usd: priceUsd
+  };
+}
 function transformPool(apiPool) {
   const mintA = apiPool.mintA?.mintInfo || {};
   const mintB = apiPool.mintB?.mintInfo || {};
   const baseMintPrice = parseFloat(apiPool.baseMint?.price || apiPool.mintA?.price || "0");
   const quoteMintPrice = parseFloat(apiPool.quoteMint?.price || apiPool.mintB?.price || "0");
   const poolPrice = quoteMintPrice > 0 ? baseMintPrice / quoteMintPrice : 0;
+  const now = Math.floor(Date.now() / 1e3);
+  const activeRewards = (apiPool.rewards || []).map(transformReward).filter((r) => r.endTime > now || r.endTime === 0);
+  const feeApr = parseFloat(apiPool.feeApr24h || "0") * 100;
+  const rewardApr = activeRewards.reduce((sum3, r) => sum3 + r.apr, 0);
   return {
     id: apiPool.poolAddress,
     pair: `${mintA.symbol || "Unknown"}/${mintB.symbol || "Unknown"}`,
@@ -82411,13 +82447,15 @@ function transformPool(apiPool) {
     fee_rate_bps: parseInt(apiPool.feeRate?.fixFeeRate || "0", 10) / 100,
     // fixFeeRate is in 1/100 bps
     fee_24h_usd: parseFloat(apiPool.feeUsd1d || apiPool.feeUsd24h || "0"),
-    apr: parseFloat(apiPool.feeApr24h || "0") * 100,
-    // 转换为百分比
+    apr: feeApr,
+    reward_apr: rewardApr,
+    total_apr: feeApr + rewardApr,
     current_price: poolPrice,
     created_at: apiPool.openTime ? new Date(apiPool.openTime).toISOString() : "",
     price_change_1h: apiPool.priceChange1h ? parseFloat(apiPool.priceChange1h) * 100 : void 0,
     price_change_24h: apiPool.priceChange1d ? parseFloat(apiPool.priceChange1d) * 100 : void 0,
-    price_change_7d: apiPool.priceChange7d ? parseFloat(apiPool.priceChange7d) * 100 : void 0
+    price_change_7d: apiPool.priceChange7d ? parseFloat(apiPool.priceChange7d) * 100 : void 0,
+    rewards: activeRewards.length > 0 ? activeRewards : void 0
   };
 }
 function transformToken(apiToken) {
@@ -82505,13 +82543,6 @@ async function getPoolInfo(poolId) {
     };
   }
   const pool = transformPool(poolData);
-  const rewards = (poolData.rewards || []).map((r) => ({
-    mint: r.mint?.address || "",
-    symbol: r.mint?.symbol || "",
-    rewardPerSecond: r.rewardPerSecond || "0",
-    openTime: r.rewardOpenTime || 0,
-    endTime: r.rewardEndTime || 0
-  }));
   return {
     ok: true,
     value: {
@@ -82524,8 +82555,7 @@ async function getPoolInfo(poolId) {
       price_change_24h: parseFloat(poolData.priceChange1d || "0") * 100,
       price_change_7d: parseFloat(poolData.priceChange7d || "0") * 100,
       fee_7d_usd: parseFloat(poolData.feeUsd7d || "0"),
-      category: poolData.category,
-      rewards: rewards.length > 0 ? rewards : void 0
+      category: poolData.category
     }
   };
 }
@@ -82968,20 +82998,26 @@ function formatApr(value) {
   return color(`${value.toFixed(2)}%`);
 }
 function outputPoolsTable(pools, total) {
-  const table = createTable(["Pair", "Pool ID", "TVL", "Volume 24h", "APR", "Fee Rate"]);
+  const table = createTable(["Pair", "Pool ID", "TVL", "Volume 24h", "Est. APR", "Fee Rate"]);
   for (const pool of pools) {
+    const hasRewards = pool.reward_apr > 0;
+    const aprDisplay = formatApr(pool.total_apr) + (hasRewards ? source_default.magenta(" (+R)") : "");
     table.push([
       source_default.white.bold(pool.pair),
       source_default.gray(pool.id),
       formatUsd(pool.tvl_usd),
       formatUsd(pool.volume_24h_usd),
-      formatApr(pool.apr),
+      aprDisplay,
       `${(pool.fee_rate_bps / 100).toFixed(2)}%`
     ]);
   }
   console.log(table.toString());
   console.log(source_default.gray(`
 Showing ${pools.length} of ${total} pools`));
+  const hasAnyRewards = pools.some((p) => p.reward_apr > 0);
+  if (hasAnyRewards) {
+    console.log(source_default.magenta("(+R)") + source_default.gray(" = includes reward incentives"));
+  }
 }
 function outputPoolDetail(pool) {
   console.log(source_default.cyan.bold(`
@@ -82995,9 +83031,26 @@ ${pool.pair}`));
     ["Volume (7d)", formatUsd(pool.volume_7d_usd)],
     ["Fees (24h)", formatUsd(pool.fee_24h_usd)],
     ["Fee Rate", `${(pool.fee_rate_bps / 100).toFixed(2)}%`],
-    ["APR", formatApr(pool.apr)]
+    ["Fee APR", formatApr(pool.apr)],
+    ["Reward APR", pool.reward_apr > 0 ? formatApr(pool.reward_apr) : source_default.gray("None")],
+    ["Total APR", source_default.bold(formatApr(pool.total_apr))]
   );
   console.log(table.toString());
+  if (pool.rewards && pool.rewards.length > 0) {
+    console.log(source_default.cyan("\nActive Rewards:"));
+    const rewardsTable = createTable(["Token", "APR", "Daily Amount", "Daily USD", "Ends"]);
+    for (const r of pool.rewards) {
+      const endDate = r.endTime > 0 ? new Date(r.endTime * 1e3).toISOString().slice(0, 10) : "Ongoing";
+      rewardsTable.push([
+        source_default.white.bold(r.symbol || r.mint),
+        formatApr(r.apr),
+        r.daily_amount ? parseFloat(r.daily_amount).toLocaleString() : "-",
+        r.daily_amount_usd > 0 ? formatUsd(r.daily_amount_usd) : "-",
+        source_default.gray(endDate)
+      ]);
+    }
+    console.log(rewardsTable.toString());
+  }
   console.log(source_default.cyan("\nPrices:"));
   const priceTable = createTable(["Token", "Price (USD)", "Mint"]);
   priceTable.push(
@@ -83427,6 +83480,8 @@ Pool Analysis: ${data.pool.pair}`));
     ["Fees (24h)", `$${data.metrics.fee24h}`],
     ["Fees (7d)", `$${data.metrics.fee7d}`],
     ["Fee APR (24h)", data.metrics.feeApr24h],
+    ["Reward APR", data.metrics.rewardApr || source_default.gray("None")],
+    ["Total APR", source_default.bold(data.metrics.totalApr)],
     ["Volume/TVL", data.metrics.volumeToTvl]
   );
   console.log(metricsTable.toString());
@@ -83439,9 +83494,15 @@ Pool Analysis: ${data.pool.pair}`));
   console.log(volTable.toString());
   if (data.rewards && data.rewards.length > 0) {
     console.log(source_default.cyan.bold("\nRewards"));
-    const rewardsTable = createTable(["Token", "End Date"]);
+    const rewardsTable = createTable(["Token", "APR", "Daily Amount", "Daily USD", "End Date"]);
     for (const r of data.rewards) {
-      rewardsTable.push([r.token, r.endTime]);
+      rewardsTable.push([
+        r.token,
+        r.apr || "-",
+        r.dailyAmount || "-",
+        r.dailyAmountUsd || "-",
+        r.endTime
+      ]);
     }
     console.log(rewardsTable.toString());
   }
@@ -83793,14 +83854,15 @@ function createPoolsAnalyzeCommand() {
       const dayPriceLow = pool.price_range_24h.low;
       const dayPriceHigh = pool.price_range_24h.high;
       const dayPriceRangePercent = currentPrice > 0 ? (dayPriceHigh - dayPriceLow) / currentPrice * 100 : 0;
-      const now = Math.floor(Date.now() / 1e3);
-      const rewardsOutput = (pool.rewards || []).filter((r) => r.endTime > now).map((r) => {
-        return {
-          token: r.symbol || r.mint,
-          rewardPerSecond: r.rewardPerSecond,
-          endTime: new Date(r.endTime * 1e3).toISOString().slice(0, 10)
-        };
-      });
+      const activeRewards = pool.rewards || [];
+      const totalRewardApr = pool.reward_apr;
+      const rewardsOutput = activeRewards.map((r) => ({
+        token: r.symbol || r.mint,
+        apr: `${r.apr.toFixed(2)}%`,
+        dailyAmount: r.daily_amount ? parseFloat(r.daily_amount).toLocaleString() : "-",
+        dailyAmountUsd: r.daily_amount_usd > 0 ? `$${r.daily_amount_usd.toFixed(2)}` : "-",
+        endTime: r.endTime > 0 ? new Date(r.endTime * 1e3).toISOString().slice(0, 10) : "Ongoing"
+      }));
       const rangeAprs = calculateRangeAprs2({
         percentRanges: rangePercents,
         volume24h: pool.volume_24h_usd,
@@ -83850,8 +83912,7 @@ function createPoolsAnalyzeCommand() {
           priceLower: alignedPriceLower.toFixed(8).replace(/0+$/, "").replace(/\.$/, ""),
           priceUpper: alignedPriceUpper.toFixed(8).replace(/0+$/, "").replace(/\.$/, ""),
           estimatedFeeApr: `${feeApr.toFixed(1)}%`,
-          estimatedTotalApr: `${feeApr.toFixed(1)}%`,
-          // same as feeApr if no rewards calculated
+          estimatedTotalApr: `${(feeApr + totalRewardApr).toFixed(1)}%`,
           inRangeLikelihood,
           rebalanceFrequency
         };
@@ -83860,7 +83921,7 @@ function createPoolsAnalyzeCommand() {
       const volatilityRisk = assessVolatilityRisk(dayPriceRangePercent);
       const riskSummary = buildRiskSummary(pool, dayPriceRangePercent);
       const projectionRange = rangePercents.includes(10) ? 10 : rangePercents[Math.floor(rangePercents.length / 2)];
-      const projectionApr = rangeAprs[projectionRange] || 0;
+      const projectionApr = (rangeAprs[projectionRange] || 0) + totalRewardApr;
       const dailyFee = projectionApr / 100 / 365 * investAmount;
       const weeklyFee = dailyFee * 7;
       const monthlyFee = dailyFee * 30;
@@ -83881,6 +83942,8 @@ function createPoolsAnalyzeCommand() {
           fee24h: fee24h.toFixed(2),
           fee7d: fee7d.toFixed(2),
           feeApr24h: `${feeApr24h.toFixed(2)}%`,
+          rewardApr: totalRewardApr > 0 ? `${totalRewardApr.toFixed(2)}%` : void 0,
+          totalApr: `${(feeApr24h + totalRewardApr).toFixed(2)}%`,
           volumeToTvl: volumeToTvl.toFixed(2)
         },
         volatility: {
@@ -84221,7 +84284,7 @@ Byreal CLI provides on-chain data only. For complete analysis, **you (the AI age
 ## Commands
 
 ### pools list
-Query available liquidity pools with sorting and filtering.
+Query available liquidity pools with Est. APR (fee + reward incentive breakdown), sorting and filtering.
 
 \`\`\`bash
 byreal-cli pools list [options]
@@ -84248,7 +84311,7 @@ byreal-cli pools list --category 1 -o json
 \`\`\`
 
 ### pools info
-Get detailed information about a specific pool.
+Get detailed information about a specific pool, including Fee APR, Reward APR, Total APR breakdown and active reward incentives (token, APR, daily amount, daily USD, end date).
 
 \`\`\`bash
 byreal-cli pools info <pool-id> -o json
@@ -84629,7 +84692,7 @@ Response includes:
 - **pool**: Basic info (address, pair, category, currentPrice, feeRate, tickSpacing)
 - **metrics**: TVL, volume (24h/7d), fees (24h/7d), feeApr24h, volumeToTvl ratio
 - **volatility**: 24h price range (low/high) and dayPriceRangePercent
-- **rewards**: Active reward programs (token, endTime)
+- **rewards**: Active reward programs (token, APR, daily amount, daily USD value, end date)
 - **rangeAnalysis**: For each range %, shows priceLower/Upper, estimated fee APR, in-range likelihood, rebalance frequency
 - **riskFactors**: TVL risk, volatility risk, and human-readable summary
 - **wallet**: Wallet address, balanceUsd, and optional low-balance warning (included when --wallet-address is provided)
@@ -84914,7 +84977,7 @@ var CAPABILITIES = [
   {
     id: "dex.pool.list",
     name: "List Pools",
-    description: "Query available liquidity pools with sorting and filtering",
+    description: "Query available liquidity pools with Est. APR (fee + reward incentive), sorting and filtering",
     category: "query",
     auth_required: false,
     command: "byreal-cli pools list",
@@ -84955,7 +85018,7 @@ var CAPABILITIES = [
   {
     id: "dex.pool.analyze",
     name: "Pool Analysis",
-    description: "Comprehensive pool analysis: metrics, volatility, multi-range APR comparison, risk assessment, and investment projection",
+    description: "Comprehensive pool analysis: metrics (fee APR, reward APR, total APR), volatility, multi-range APR comparison, risk assessment, and investment projection",
     category: "analyze",
     auth_required: false,
     command: "byreal-cli pools analyze <pool-id>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byreal-io/byreal-cli-realclaw",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "AI-native CLI for Byreal CLMM DEX on Solana",
   "type": "module",
   "main": "dist/index.cjs",