@t2000/sdk 0.18.5 → 0.18.7

package/dist/index.js

@@ -3854,48 +3854,47 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
   }
   async balance() {
     const bal = await queryBalance(this.client, this._address);
+    const portfolioPositions = this.portfolio.getPositions();
     const earningAssets = new Set(
-      this.portfolio.getPositions().filter((p) => p.earning).map((p) => p.asset)
+      portfolioPositions.filter((p) => p.earning).map((p) => p.asset)
     );
-    try {
-      const positions = await this.positions();
-      const savings = positions.positions.filter((p) => p.type === "save").filter((p) => !earningAssets.has(p.asset)).reduce((sum, p) => sum + p.amount, 0);
-      const debt = positions.positions.filter((p) => p.type === "borrow").reduce((sum, p) => sum + p.amount, 0);
-      bal.savings = savings;
-      bal.debt = debt;
-    } catch {
-    }
-    try {
-      const portfolioPositions = this.portfolio.getPositions();
-      const suiPrice = bal.gasReserve.sui > 0 ? bal.gasReserve.usdEquiv / bal.gasReserve.sui : 0;
-      const assetPrices = { SUI: suiPrice };
-      const swapAdapter = this.registry.listSwap()[0];
-      const investedAssets = /* @__PURE__ */ new Set();
-      for (const pos of portfolioPositions) {
-        if (pos.asset in INVESTMENT_ASSETS) investedAssets.add(pos.asset);
-      }
-      for (const key of this.portfolio.getAllStrategyKeys()) {
-        for (const sp of this.portfolio.getStrategyPositions(key)) {
-          if (sp.asset in INVESTMENT_ASSETS) investedAssets.add(sp.asset);
+    const suiPrice = bal.gasReserve.sui > 0 ? bal.gasReserve.usdEquiv / bal.gasReserve.sui : 0;
+    const assetPrices = { SUI: suiPrice };
+    const swapAdapter = this.registry.listSwap()[0];
+    for (const asset of Object.keys(INVESTMENT_ASSETS)) {
+      if (asset === "SUI") continue;
+      try {
+        if (swapAdapter) {
+          const quote = await swapAdapter.getQuote("USDC", asset, 1);
+          assetPrices[asset] = quote.expectedOutput > 0 ? 1 / quote.expectedOutput : 0;
         }
+      } catch {
+        assetPrices[asset] = 0;
       }
-      for (const asset of Object.keys(INVESTMENT_ASSETS)) {
-        if ((bal.assets[asset] ?? 0) > 0) investedAssets.add(asset);
-      }
-      for (const asset of investedAssets) {
-        if (asset === "SUI" || asset in assetPrices) continue;
-        try {
-          if (swapAdapter) {
-            const quote = await swapAdapter.getQuote("USDC", asset, 1);
-            assetPrices[asset] = quote.expectedOutput > 0 ? 1 / quote.expectedOutput : 0;
+    }
+    const toUsd = (asset, amount) => asset in INVESTMENT_ASSETS ? amount * (assetPrices[asset] ?? 0) : amount;
+    let chainTotal = bal.available + bal.gasReserve.usdEquiv;
+    for (const asset of Object.keys(INVESTMENT_ASSETS)) {
+      if (asset === "SUI") continue;
+      chainTotal += (bal.assets[asset] ?? 0) * (assetPrices[asset] ?? 0);
+    }
+    try {
+      const positions = await this.positions();
+      for (const pos of positions.positions) {
+        const usdValue = toUsd(pos.asset, pos.amount);
+        if (pos.type === "save") {
+          chainTotal += usdValue;
+          if (!earningAssets.has(pos.asset)) {
+            bal.savings += usdValue;
           }
-        } catch {
-          assetPrices[asset] = 0;
+        } else if (pos.type === "borrow") {
+          chainTotal -= usdValue;
+          bal.debt += usdValue;
         }
       }
-      let investmentValue = 0;
-      let investmentCostBasis = 0;
-      let trackedValue = 0;
+    } catch {
+    }
+    try {
       const trackedAmounts = {};
       const trackedCostBasis = {};
       const earningAssetSet = /* @__PURE__ */ new Set();
@@ -3912,6 +3911,9 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
           trackedCostBasis[sp.asset] = (trackedCostBasis[sp.asset] ?? 0) + sp.costBasis;
         }
       }
+      let investmentValue = 0;
+      let investmentCostBasis = 0;
+      let trackedValue = 0;
       for (const asset of Object.keys(INVESTMENT_ASSETS)) {
         const price = assetPrices[asset] ?? 0;
         const tracked = trackedAmounts[asset] ?? 0;
@@ -3949,7 +3951,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     } catch {
       bal.pendingRewards = 0;
     }
-    bal.total = bal.available + bal.savings - bal.debt + bal.investment + bal.gasReserve.usdEquiv;
+    bal.total = chainTotal;
     return bal;
   }
   async history(params) {
@@ -4846,7 +4848,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     });
     const walletAmount = Number(assetBalance.totalBalance) / 10 ** assetInfo.decimals;
     const gasReserve = params.asset === "SUI" ? GAS_RESERVE_MIN : 0;
-    const depositAmount = Math.max(0, walletAmount - gasReserve);
+    const depositAmount = Math.min(pos.totalAmount, Math.max(0, walletAmount - gasReserve));
     if (pos.earning && depositAmount <= 0) {
       return {
         success: true,
@@ -5767,7 +5769,12 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
         }
       }
     }
-    const bestRate = allRates.reduce(
+    const stableSet = new Set(STABLE_ASSETS);
+    const stableRates = allRates.filter((r) => stableSet.has(r.asset));
+    if (stableRates.length === 0) {
+      throw new T2000Error("PROTOCOL_UNAVAILABLE", "No stablecoin lending rates available for rebalance");
+    }
+    const bestRate = stableRates.reduce(
       (best, r) => r.rates.saveApy > best.rates.saveApy ? r : best
     );
     const current = savePositions.reduce(