@t2000/sdk 0.16.24 → 0.16.26

package/dist/index.js

@@ -402,6 +402,7 @@ async function buildSendTx({
 }
 
 // src/wallet/balance.ts
+var SUI_PRICE_FALLBACK = 1;
 var _cachedSuiPrice = 0;
 var _priceLastFetched = 0;
 var PRICE_CACHE_TTL_MS = 6e4;
@@ -431,15 +432,15 @@ async function fetchSuiPrice(client) {
     }
   } catch {
   }
-  return _cachedSuiPrice;
+  return _cachedSuiPrice || SUI_PRICE_FALLBACK;
 }
 async function queryBalance(client, address) {
   const stableBalancePromises = STABLE_ASSETS.map(
-    (asset) => client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS[asset].type }).then((b) => ({ asset, amount: Number(b.totalBalance) / 10 ** SUPPORTED_ASSETS[asset].decimals }))
+    (asset) => client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS[asset].type }).then((b) => ({ asset, amount: Number(b.totalBalance) / 10 ** SUPPORTED_ASSETS[asset].decimals })).catch(() => ({ asset, amount: 0 }))
   );
   const nonSuiInvestmentAssets = Object.keys(INVESTMENT_ASSETS).filter((a) => a !== "SUI");
   const investBalancePromises = nonSuiInvestmentAssets.map(
-    (asset) => client.getBalance({ owner: address, coinType: INVESTMENT_ASSETS[asset].type }).then((b) => ({ asset, amount: Number(b.totalBalance) / 10 ** INVESTMENT_ASSETS[asset].decimals }))
+    (asset) => client.getBalance({ owner: address, coinType: INVESTMENT_ASSETS[asset].type }).then((b) => ({ asset, amount: Number(b.totalBalance) / 10 ** INVESTMENT_ASSETS[asset].decimals })).catch(() => ({ asset, amount: 0 }))
   );
   const [suiBalance, suiPriceUsd, ...rest] = await Promise.all([
     client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.SUI.type }),
@@ -1134,7 +1135,7 @@ async function maxWithdrawAmount(client, addressOrKeypair) {
     maxAmount = Math.max(0, hf.supplied - hf.borrowed * MIN_HEALTH_FACTOR / ltv);
   }
   const remainingSupply = hf.supplied - maxAmount;
-  const hfAfter = hf.borrowed > 0 ? remainingSupply / hf.borrowed : Infinity;
+  const hfAfter = hf.borrowed > 0 ? remainingSupply * ltv / hf.borrowed : Infinity;
   return { maxAmount, healthFactorAfter: hfAfter, currentHF: hf.healthFactor };
 }
 async function maxBorrowAmount(client, addressOrKeypair) {
@@ -2933,8 +2934,9 @@ var PortfolioManager = class {
       throw new T2000Error("INSUFFICIENT_INVESTMENT", `No ${trade.asset} position to sell`);
     }
     const sellAmount = Math.min(trade.amount, pos.totalAmount);
+    const effectiveUsdValue = trade.amount > 0 && sellAmount < trade.amount ? trade.usdValue * (sellAmount / trade.amount) : trade.usdValue;
     const costOfSold = pos.avgPrice * sellAmount;
-    const realizedPnL = trade.usdValue - costOfSold;
+    const realizedPnL = effectiveUsdValue - costOfSold;
     pos.totalAmount -= sellAmount;
     pos.costBasis -= costOfSold;
     if (pos.totalAmount < 1e-6) {
@@ -3032,8 +3034,9 @@ var PortfolioManager = class {
       throw new T2000Error("INSUFFICIENT_INVESTMENT", `No ${trade.asset} position in strategy '${strategyKey}'`);
     }
     const sellAmount = Math.min(trade.amount, pos.totalAmount);
+    const effectiveUsdValue = trade.amount > 0 && sellAmount < trade.amount ? trade.usdValue * (sellAmount / trade.amount) : trade.usdValue;
     const costOfSold = pos.avgPrice * sellAmount;
-    const realizedPnL = trade.usdValue - costOfSold;
+    const realizedPnL = effectiveUsdValue - costOfSold;
     pos.totalAmount -= sellAmount;
     pos.costBasis -= costOfSold;
     if (pos.totalAmount < 1e-6) {
@@ -3665,7 +3668,9 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     for (const pos of allPositions) {
       if (params.protocol && pos.protocolId !== params.protocol) continue;
       for (const s of pos.positions.supplies) {
-        if (s.amount > 1e-3) supplies.push({ protocolId: pos.protocolId, asset: s.asset, amount: s.amount, apy: s.apy });
+        if (s.amount > 1e-3 && !(s.asset in INVESTMENT_ASSETS)) {
+          supplies.push({ protocolId: pos.protocolId, asset: s.asset, amount: s.amount, apy: s.apy });
+        }
       }
     }
     if (supplies.length === 0) {
@@ -3747,7 +3752,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     const withdrawable = [];
     for (const pos of allPositions) {
       for (const supply of pos.positions.supplies) {
-        if (supply.amount > 0.01 && !earningAssets.has(supply.asset)) {
+        if (supply.amount > 0.01 && !earningAssets.has(supply.asset) && !(supply.asset in INVESTMENT_ASSETS)) {
           withdrawable.push({ protocolId: pos.protocolId, asset: supply.asset, amount: supply.amount });
         }
       }