@t2000/sdk 0.17.12 → 0.17.14

package/dist/index.js

@@ -1906,6 +1906,26 @@ function computeRates(reserve) {
   const depositAprPct = utilizationPct / 100 * (borrowAprPct / 100) * (1 - reserve.spreadFeeBps / 1e4) * 100;
   return { borrowAprPct, depositAprPct };
 }
+var MS_PER_YEAR = 365.25 * 24 * 3600 * 1e3;
+function computeDepositRewardApr(reserve, allReserves) {
+  if (reserve.depositTotalShares <= 0 || reserve.price <= 0) return 0;
+  const totalDepositValue = reserve.depositTotalShares / 10 ** reserve.mintDecimals * reserve.price;
+  if (totalDepositValue <= 0) return 0;
+  const priceMap = /* @__PURE__ */ new Map();
+  for (const r of allReserves) {
+    if (r.price > 0) priceMap.set(r.coinType, { price: r.price, decimals: r.mintDecimals });
+  }
+  let rewardApr = 0;
+  for (const rw of reserve.depositPoolRewards) {
+    const info = priceMap.get(rw.coinType);
+    if (!info || info.price <= 0) continue;
+    const durationMs = rw.endTimeMs - rw.startTimeMs;
+    if (durationMs <= 0) continue;
+    const annualTokens = rw.totalRewards / 10 ** info.decimals * (MS_PER_YEAR / durationMs);
+    rewardApr += annualTokens * info.price / totalDepositValue * 100;
+  }
+  return rewardApr;
+}
 function cTokenRatio(reserve) {
   if (reserve.ctokenSupply === 0) return 1;
   const totalSupply = reserve.availableAmount + reserve.borrowedAmountWad / WAD - reserve.unclaimedSpreadFeesWad / WAD;
@@ -1925,6 +1945,18 @@ function parseReserve(raw, index) {
   const r = f(raw);
   const coinTypeField = f(r.coin_type);
   const config = f(f(r.config)?.element);
+  const dMgr = f(r.deposits_pool_reward_manager);
+  const rawRewards = Array.isArray(dMgr?.pool_rewards) ? dMgr.pool_rewards : [];
+  const now = Date.now();
+  const depositPoolRewards = rawRewards.filter((rw) => rw !== null).map((rw) => {
+    const rwf = f(rw);
+    return {
+      coinType: str(f(rwf.coin_type)?.name),
+      totalRewards: num(rwf.total_rewards),
+      startTimeMs: num(rwf.start_time_ms),
+      endTimeMs: num(rwf.end_time_ms)
+    };
+  }).filter((rw) => rw.endTimeMs > now && rw.totalRewards > 0);
   return {
     coinType: str(coinTypeField?.name),
     mintDecimals: num(r.mint_decimals),
@@ -1938,7 +1970,10 @@ function parseReserve(raw, index) {
     spreadFeeBps: num(config?.spread_fee_bps),
     interestRateUtils: Array.isArray(config?.interest_rate_utils) ? config.interest_rate_utils.map(num) : [],
     interestRateAprs: Array.isArray(config?.interest_rate_aprs) ? config.interest_rate_aprs.map(num) : [],
-    arrayIndex: index
+    arrayIndex: index,
+    price: num(f(r.price)?.value) / WAD,
+    depositTotalShares: num(dMgr?.total_shares),
+    depositPoolRewards
   };
 }
 function parseObligation(raw) {
@@ -2083,7 +2118,8 @@ var SuilendAdapter = class {
     const reserve = this.findReserve(reserves, asset);
     if (!reserve) throw new T2000Error("ASSET_NOT_SUPPORTED", `Suilend does not support ${asset}`);
     const { borrowAprPct, depositAprPct } = computeRates(reserve);
-    return { asset, saveApy: depositAprPct, borrowApy: borrowAprPct };
+    const rewardApr = computeDepositRewardApr(reserve, reserves);
+    return { asset, saveApy: depositAprPct + rewardApr, borrowApy: borrowAprPct };
   }
   async getPositions(address) {
     const supplies = [];
@@ -2100,7 +2136,8 @@ var SuilendAdapter = class {
       const ratio = cTokenRatio(reserve);
       const amount = dep.ctokenAmount * ratio / 10 ** reserve.mintDecimals;
       const { depositAprPct } = computeRates(reserve);
-      supplies.push({ asset: this.resolveSymbol(dep.coinType), amount, apy: depositAprPct });
+      const rewardApr = computeDepositRewardApr(reserve, reserves);
+      supplies.push({ asset: this.resolveSymbol(dep.coinType), amount, apy: depositAprPct + rewardApr });
     }
     for (const bor of obligation.borrows) {
       const reserve = reserves[bor.reserveIdx];
@@ -4279,13 +4316,28 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (bal.available < params.usdAmount) {
       throw new T2000Error("INSUFFICIENT_BALANCE", `Insufficient checking balance. Available: $${bal.available.toFixed(2)}, requested: $${params.usdAmount.toFixed(2)}`);
     }
-    const swapResult = await this.exchange({
-      from: "USDC",
-      to: params.asset,
-      amount: params.usdAmount,
-      maxSlippage: params.maxSlippage ?? defaultSlippage(params.asset),
-      _bypassInvestmentGuard: true
-    });
+    let swapResult;
+    const maxRetries = 3;
+    for (let attempt = 0; ; attempt++) {
+      try {
+        swapResult = await this.exchange({
+          from: "USDC",
+          to: params.asset,
+          amount: params.usdAmount,
+          maxSlippage: params.maxSlippage ?? defaultSlippage(params.asset),
+          _bypassInvestmentGuard: true
+        });
+        break;
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const isSlippage = msg.includes("slippage") || msg.includes("amount_out_slippage");
+        if (isSlippage && attempt < maxRetries) {
+          await new Promise((r) => setTimeout(r, 2e3 * (attempt + 1)));
+          continue;
+        }
+        throw err;
+      }
+    }
     if (swapResult.toAmount === 0) {
       throw new T2000Error("SWAP_FAILED", "Swap returned zero tokens \u2014 try a different amount or check liquidity");
     }
@@ -4383,13 +4435,28 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (sellAmountAsset <= 0) {
       throw new T2000Error("INSUFFICIENT_INVESTMENT", "Nothing to sell after gas reserve");
     }
-    const swapResult = await this.exchange({
-      from: params.asset,
-      to: "USDC",
-      amount: sellAmountAsset,
-      maxSlippage: params.maxSlippage ?? defaultSlippage(params.asset),
-      _bypassInvestmentGuard: true
-    });
+    let swapResult;
+    const maxRetries = 3;
+    for (let attempt = 0; ; attempt++) {
+      try {
+        swapResult = await this.exchange({
+          from: params.asset,
+          to: "USDC",
+          amount: sellAmountAsset,
+          maxSlippage: params.maxSlippage ?? defaultSlippage(params.asset),
+          _bypassInvestmentGuard: true
+        });
+        break;
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const isSlippage = msg.includes("slippage") || msg.includes("amount_out_slippage");
+        if (isSlippage && attempt < maxRetries) {
+          await new Promise((r) => setTimeout(r, 2e3 * (attempt + 1)));
+          continue;
+        }
+        throw err;
+      }
+    }
     const price = swapResult.toAmount / sellAmountAsset;
     const realizedPnL = this.portfolio.recordSell({
       id: `inv_${Date.now()}`,