@t2000/sdk 0.17.17 → 0.17.18

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

@@ -363,6 +363,7 @@ interface ClaimRewardsResult {
     tx: string;
     rewards: PendingReward$1[];
     totalValueUsd: number;
+    usdcReceived: number;
     gasCost: number;
     gasMethod: GasMethod;
 }

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

@@ -363,6 +363,7 @@ interface ClaimRewardsResult {
     tx: string;
     rewards: PendingReward$1[];
     totalValueUsd: number;
+    usdcReceived: number;
     gasCost: number;
     gasMethod: GasMethod;
 }

package/dist/index.cjs

@@ -1899,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({
@@ -3654,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;
 }
@@ -4855,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);
@@ -4868,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();