@t2000/sdk 0.16.28 → 0.16.29

package/dist/index.cjs

@@ -1611,12 +1611,20 @@ async function buildSwapTx(params) {
   }
   const rawAmount = BigInt(Math.floor(amount * 10 ** fromInfo.decimals));
   const aggClient = createAggregatorClient(client, address);
-  const result = await aggClient.findRouters({
-    from: fromInfo.type,
-    target: toInfo.type,
-    amount: rawAmount,
-    byAmountIn: true
-  });
+  const _origLog = console.log;
+  console.log = () => {
+  };
+  let result;
+  try {
+    result = await aggClient.findRouters({
+      from: fromInfo.type,
+      target: toInfo.type,
+      amount: rawAmount,
+      byAmountIn: true
+    });
+  } finally {
+    console.log = _origLog;
+  }
   if (!result || result.insufficientLiquidity) {
     throw new T2000Error(
       "ASSET_NOT_SUPPORTED",
@@ -1625,11 +1633,17 @@ async function buildSwapTx(params) {
   }
   const tx = new transactions.Transaction();
   const slippage = maxSlippageBps / 1e4;
-  await aggClient.fastRouterSwap({
-    router: result,
-    txb: tx,
-    slippage
-  });
+  console.log = () => {
+  };
+  try {
+    await aggClient.fastRouterSwap({
+      router: result,
+      txb: tx,
+      slippage
+    });
+  } finally {
+    console.log = _origLog;
+  }
   const estimatedOut = Number(result.amountOut.toString());
   return {
     tx,
@@ -1646,12 +1660,20 @@ async function addSwapToTx(params) {
   }
   const rawAmount = BigInt(Math.floor(amount * 10 ** fromInfo.decimals));
   const aggClient = createAggregatorClient(client, address);
-  const result = await aggClient.findRouters({
-    from: fromInfo.type,
-    target: toInfo.type,
-    amount: rawAmount,
-    byAmountIn: true
-  });
+  const _origLog = console.log;
+  console.log = () => {
+  };
+  let result;
+  try {
+    result = await aggClient.findRouters({
+      from: fromInfo.type,
+      target: toInfo.type,
+      amount: rawAmount,
+      byAmountIn: true
+    });
+  } finally {
+    console.log = _origLog;
+  }
   if (!result || result.insufficientLiquidity) {
     throw new T2000Error(
       "ASSET_NOT_SUPPORTED",
@@ -1659,12 +1681,19 @@ async function addSwapToTx(params) {
     );
   }
   const slippage = maxSlippageBps / 1e4;
-  const outputCoin = await aggClient.routerSwap({
-    router: result,
-    txb: tx,
-    inputCoin,
-    slippage
-  });
+  console.log = () => {
+  };
+  let outputCoin;
+  try {
+    outputCoin = await aggClient.routerSwap({
+      router: result,
+      txb: tx,
+      inputCoin,
+      slippage
+    });
+  } finally {
+    console.log = _origLog;
+  }
   const estimatedOut = Number(result.amountOut.toString());
   return {
     outputCoin,
@@ -4308,7 +4337,8 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       const quote = await swapAdapter.getQuote("USDC", params.asset, 1);
       const assetPrice = 1 / quote.expectedOutput;
       sellAmountAsset = params.usdAmount / assetPrice;
-      sellAmountAsset = Math.min(sellAmountAsset, pos.totalAmount);
+      const maxPosition = params._strategyOnly ? maxSellable : pos.totalAmount;
+      sellAmountAsset = Math.min(sellAmountAsset, maxPosition);
       if (sellAmountAsset > maxSellable) {
         throw new T2000Error(
           "INSUFFICIENT_INVESTMENT",
@@ -4338,7 +4368,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       tx: swapResult.tx,
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
     });
-    if (params.usdAmount === "all") {
+    if (params.usdAmount === "all" && !params._strategyOnly) {
       this.portfolio.closePosition(params.asset);
     }
     const updatedPos = this.portfolio.getPosition(params.asset);
@@ -4560,7 +4590,25 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     let gasMethod = "self-funded";
     for (const pos of stratPositions) {
       const fullAmount = pos.totalAmount;
-      const result = await this.investSell({ asset: pos.asset, usdAmount: "all" });
+      const swapAdapter = this.registry.listSwap()[0];
+      let assetPrice = 1;
+      try {
+        if (swapAdapter) {
+          if (pos.asset === "SUI") {
+            assetPrice = await swapAdapter.getPoolPrice();
+          } else {
+            const q = await swapAdapter.getQuote("USDC", pos.asset, 1);
+            assetPrice = q.expectedOutput > 0 ? 1 / q.expectedOutput : 1;
+          }
+        }
+      } catch {
+      }
+      const strategyUsdValue = fullAmount * assetPrice;
+      const result = await this.investSell({
+        asset: pos.asset,
+        usdAmount: strategyUsdValue,
+        _strategyOnly: true
+      });
       const pnl = this.portfolio.recordStrategySell(params.strategy, {
         id: `strat_sell_${Date.now()}_${pos.asset}`,
         type: "sell",
@@ -4880,7 +4928,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       this.portfolio.getPositions().filter((p) => p.earning).map((p) => p.asset)
     );
     const savePositions = allPositions.flatMap(
-      (p) => p.positions.supplies.filter((s) => s.amount > 0.01).filter((s) => !earningAssets.has(s.asset)).map((s) => ({
+      (p) => p.positions.supplies.filter((s) => s.amount > 0.01).filter((s) => !earningAssets.has(s.asset)).filter((s) => !(s.asset in INVESTMENT_ASSETS)).map((s) => ({
         protocolId: p.protocolId,
         protocol: p.protocol,
         asset: s.asset,
@@ -5159,19 +5207,18 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
   // -- Helpers --
   async getFreeBalance(asset) {
     if (!(asset in INVESTMENT_ASSETS)) return Infinity;
-    let walletInvested = 0;
     const pos = this.portfolio.getPosition(asset);
-    if (pos && pos.totalAmount > 0 && !pos.earning) {
-      walletInvested += pos.totalAmount;
-    }
+    const directAmount = pos && pos.totalAmount > 0 && !pos.earning ? pos.totalAmount : 0;
+    let strategyTotal = 0;
     for (const key of this.portfolio.getAllStrategyKeys()) {
       for (const sp of this.portfolio.getStrategyPositions(key)) {
         if (sp.asset === asset && sp.totalAmount > 0) {
-          walletInvested += sp.totalAmount;
+          strategyTotal += sp.totalAmount;
         }
       }
     }
-    if (walletInvested <= 0 && (!pos || pos.totalAmount <= 0)) return Infinity;
+    const walletInvested = Math.max(directAmount, strategyTotal);
+    if (walletInvested <= 0) return Infinity;
     const assetInfo = SUPPORTED_ASSETS[asset];
     const balance = await this.client.getBalance({ owner: this._address, coinType: assetInfo.type });
     const walletAmount = Number(balance.totalBalance) / 10 ** assetInfo.decimals;