@t2000/sdk 0.17.16 → 0.17.18

package/dist/{index-xQEri-Eu.d.cts → index-DdtOBw42.d.cts}

@@ -352,6 +352,7 @@ interface AutoInvestRunResult {
 }
 interface PendingReward$1 {
     protocol: string;
+    asset: string;
     coinType: string;
     symbol: string;
     amount: number;
@@ -362,6 +363,7 @@ interface ClaimRewardsResult {
     tx: string;
     rewards: PendingReward$1[];
     totalValueUsd: number;
+    usdcReceived: number;
     gasCost: number;
     gasMethod: GasMethod;
 }
@@ -506,6 +508,7 @@ interface LendingAdapter {
 }
 interface PendingReward {
     protocol: string;
+    asset: string;
     coinType: string;
     symbol: string;
     amount: number;

package/dist/{index-xQEri-Eu.d.ts → index-DdtOBw42.d.ts}

@@ -352,6 +352,7 @@ interface AutoInvestRunResult {
 }
 interface PendingReward$1 {
     protocol: string;
+    asset: string;
     coinType: string;
     symbol: string;
     amount: number;
@@ -362,6 +363,7 @@ interface ClaimRewardsResult {
     tx: string;
     rewards: PendingReward$1[];
     totalValueUsd: number;
+    usdcReceived: number;
     gasCost: number;
     gasMethod: GasMethod;
 }
@@ -506,6 +508,7 @@ interface LendingAdapter {
 }
 interface PendingReward {
     protocol: string;
+    asset: string;
     coinType: string;
     symbol: string;
     amount: number;

package/dist/index.cjs

@@ -1246,15 +1246,13 @@ function stripPrefix(coinType) {
   return coinType.replace(/^0x0*/, "");
 }
 async function getPendingRewards(client, address) {
-  const [pools, states, rules] = await Promise.all([
+  const [pools, states] = await Promise.all([
     getPools(),
-    getUserState(client, address),
-    getIncentiveRules(client)
+    getUserState(client, address)
   ]);
   const rewards = [];
   const deposited = states.filter((s) => s.supplyBalance > 0n);
   if (deposited.length === 0) return rewards;
-  const rewardTotals = /* @__PURE__ */ new Map();
   for (const state of deposited) {
     const pool = pools.find((p) => p.id === state.assetId);
     if (!pool) continue;
@@ -1263,20 +1261,14 @@ async function getPendingRewards(client, address) {
     const rewardCoins = pool.supplyIncentiveApyInfo?.rewardCoin;
     if (!Array.isArray(rewardCoins) || rewardCoins.length === 0) continue;
     const rewardType = rewardCoins[0];
-    const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex, pool);
-    const price = pool.token?.price ?? 0;
-    const depositUsd = supplyBal * price;
-    const annualRewardUsd = depositUsd * (boostedApr / 100);
-    const estimatedUsd = annualRewardUsd / 365;
-    rewardTotals.set(rewardType, (rewardTotals.get(rewardType) ?? 0) + estimatedUsd);
-  }
-  for (const [coinType, dailyUsd] of rewardTotals) {
+    const assetSymbol = resolvePoolSymbol(pool);
     rewards.push({
       protocol: "navi",
-      coinType,
-      symbol: REWARD_SYMBOLS[coinType] ?? coinType.split("::").pop() ?? "UNKNOWN",
+      asset: assetSymbol,
+      coinType: rewardType,
+      symbol: REWARD_SYMBOLS[rewardType] ?? rewardType.split("::").pop() ?? "UNKNOWN",
       amount: 0,
-      estimatedValueUsd: dailyUsd
+      estimatedValueUsd: 0
     });
   }
   return rewards;
@@ -1337,6 +1329,7 @@ async function addClaimRewardsToTx(tx, client, address) {
     tx.transferObjects([coin], address);
     claimed.push({
       protocol: "navi",
+      asset: assets.join(", "),
       coinType: rewardType,
       symbol: REWARD_SYMBOLS[rewardType] ?? "UNKNOWN",
       amount: 0,
@@ -1906,6 +1899,45 @@ async function addSwapToTx(params) {
     toDecimals: toInfo.decimals
   };
 }
+async function buildRawSwapTx(params) {
+  const { client, address, fromCoinType, toCoinType, amount, toDecimals, maxSlippageBps = 500 } = params;
+  const aggClient = createAggregatorClient(client, address);
+  const _origLog = console.log;
+  console.log = () => {
+  };
+  let result;
+  try {
+    result = await aggClient.findRouters({
+      from: fromCoinType,
+      target: toCoinType,
+      amount,
+      byAmountIn: true
+    });
+  } finally {
+    console.log = _origLog;
+  }
+  if (!result || result.insufficientLiquidity) {
+    throw new T2000Error("ASSET_NOT_SUPPORTED", `No swap route for reward token \u2192 USDC`);
+  }
+  const tx = new transactions.Transaction();
+  const slippage = maxSlippageBps / 1e4;
+  console.log = () => {
+  };
+  try {
+    await aggClient.fastRouterSwap({
+      router: result,
+      txb: tx,
+      slippage
+    });
+  } finally {
+    console.log = _origLog;
+  }
+  return {
+    tx,
+    estimatedOut: Number(result.amountOut.toString()),
+    toDecimals
+  };
+}
 async function getPoolPrice(client) {
   try {
     const pool = await client.getObject({
@@ -2697,45 +2729,24 @@ var SuilendAdapter = class {
       this.fetchObligation(caps[0].obligationId)
     ]);
     const rewards = [];
-    const rewardEstimates = /* @__PURE__ */ new Map();
     for (const dep of obligation.deposits) {
       const reserve = reserves[dep.reserveIdx];
       if (!reserve) continue;
-      const ratio = cTokenRatio(reserve);
-      const amount = dep.ctokenAmount * ratio / 10 ** reserve.mintDecimals;
-      const price = reserve.price;
-      const depositUsd = amount * price;
       for (const rw of reserve.depositPoolRewards) {
         if (!this.isClaimableReward(rw.coinType)) continue;
-        const rewardReserve = reserves.find((r) => {
-          try {
-            return utils.normalizeStructTag(r.coinType) === utils.normalizeStructTag(rw.coinType);
-          } catch {
-            return false;
-          }
-        });
-        const rewardPrice = rewardReserve?.price ?? 0;
-        const rewardDecimals = rewardReserve?.mintDecimals ?? 9;
         const durationMs = rw.endTimeMs - rw.startTimeMs;
         if (durationMs <= 0) continue;
-        const annualTokens = rw.totalRewards / 10 ** rewardDecimals * (MS_PER_YEAR / durationMs);
-        const totalDepositValue = reserve.depositTotalShares / 10 ** reserve.mintDecimals * price;
-        if (totalDepositValue <= 0) continue;
-        const userShare = depositUsd / totalDepositValue;
-        const dailyRewardUsd = annualTokens * rewardPrice / 365 * userShare;
-        rewardEstimates.set(rw.coinType, (rewardEstimates.get(rw.coinType) ?? 0) + dailyRewardUsd);
+        const assetSymbol = this.resolveSymbol(reserve.coinType);
+        rewards.push({
+          protocol: "suilend",
+          asset: assetSymbol,
+          coinType: rw.coinType,
+          symbol: rw.coinType.includes("spring_sui") ? "sSUI" : rw.coinType.includes("deep::") ? "DEEP" : rw.coinType.split("::").pop() ?? "UNKNOWN",
+          amount: 0,
+          estimatedValueUsd: 0
+        });
       }
     }
-    for (const [coinType, dailyUsd] of rewardEstimates) {
-      const symbol = coinType.includes("spring_sui") ? "SPRING_SUI" : coinType.includes("deep::") ? "DEEP" : coinType.split("::").pop() ?? "UNKNOWN";
-      rewards.push({
-        protocol: "suilend",
-        coinType,
-        symbol,
-        amount: 0,
-        estimatedValueUsd: dailyUsd
-      });
-    }
     return rewards;
   }
   async addClaimRewardsToTx(tx, address) {
@@ -2778,6 +2789,7 @@ var SuilendAdapter = class {
       const symbol = coinType.includes("spring_sui") ? "SPRING_SUI" : coinType.includes("deep::") ? "DEEP" : coinType.split("::").pop() ?? "UNKNOWN";
       claimed.push({
         protocol: "suilend",
+        asset: "",
         coinType,
         symbol,
         amount: 0,
@@ -3681,6 +3693,11 @@ var AutoInvestManager = class {
   }
 };
 var LOW_LIQUIDITY_ASSETS = /* @__PURE__ */ new Set(["GOLD"]);
+var REWARD_TOKEN_DECIMALS = {
+  "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT": 9,
+  "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP": 6,
+  "0x83556891f4a0f233ce7b05cfe7f957d4020492a34f5405b2cb9377d060bef4bf::spring_sui::SPRING_SUI": 9
+};
 function defaultSlippage(asset) {
   return LOW_LIQUIDITY_ASSETS.has(asset) ? 0.05 : 0.03;
 }
@@ -4882,7 +4899,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     this.enforcer.assertNotLocked();
     const adapters = this.registry.listLending().filter((a) => a.addClaimRewardsToTx);
     if (adapters.length === 0) {
-      return { success: true, tx: "", rewards: [], totalValueUsd: 0, gasCost: 0, gasMethod: "none" };
+      return { success: true, tx: "", rewards: [], totalValueUsd: 0, usdcReceived: 0, gasCost: 0, gasMethod: "none" };
     }
     const tx = new transactions.Transaction();
     tx.setSender(this._address);
@@ -4895,18 +4912,52 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       }
     }
     if (allRewards.length === 0) {
-      return { success: true, tx: "", rewards: [], totalValueUsd: 0, gasCost: 0, gasMethod: "none" };
+      return { success: true, tx: "", rewards: [], totalValueUsd: 0, usdcReceived: 0, gasCost: 0, gasMethod: "none" };
     }
-    const gasResult = await executeWithGas(this.client, this.keypair, async () => tx);
+    const claimResult = await executeWithGas(this.client, this.keypair, async () => tx);
+    await this.client.waitForTransaction({ digest: claimResult.digest });
+    const usdcReceived = await this.swapRewardTokensToUsdc(allRewards);
     return {
       success: true,
-      tx: gasResult.digest,
+      tx: claimResult.digest,
       rewards: allRewards,
-      totalValueUsd: allRewards.reduce((s, r) => s + r.estimatedValueUsd, 0),
-      gasCost: gasResult.gasCostSui,
-      gasMethod: gasResult.gasMethod
+      totalValueUsd: usdcReceived,
+      usdcReceived,
+      gasCost: claimResult.gasCostSui,
+      gasMethod: claimResult.gasMethod
     };
   }
+  async swapRewardTokensToUsdc(rewards) {
+    const uniqueTokens = [...new Set(rewards.map((r) => r.coinType))];
+    const usdcType = SUPPORTED_ASSETS.USDC.type;
+    const usdcDecimals = SUPPORTED_ASSETS.USDC.decimals;
+    let totalUsdc = 0;
+    for (const coinType of uniqueTokens) {
+      try {
+        const balResult = await this.client.getBalance({
+          owner: this._address,
+          coinType
+        });
+        const rawBalance = BigInt(balResult.totalBalance);
+        if (rawBalance <= 0n) continue;
+        const decimals = REWARD_TOKEN_DECIMALS[coinType] ?? 9;
+        const swapResult = await buildRawSwapTx({
+          client: this.client,
+          address: this._address,
+          fromCoinType: coinType,
+          fromDecimals: decimals,
+          toCoinType: usdcType,
+          toDecimals: usdcDecimals,
+          amount: rawBalance
+        });
+        const gasResult = await executeWithGas(this.client, this.keypair, async () => swapResult.tx);
+        await this.client.waitForTransaction({ digest: gasResult.digest });
+        totalUsdc += swapResult.estimatedOut / 10 ** usdcDecimals;
+      } catch {
+      }
+    }
+    return totalUsdc;
+  }
   // -- Strategies --
   async investStrategy(params) {
     this.enforcer.assertNotLocked();