@t2000/sdk 0.16.23 → 0.16.24

package/dist/index.js

@@ -437,11 +437,18 @@ 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 }))
   );
-  const [suiBalance, suiPriceUsd, ...stableResults] = await Promise.all([
+  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 }))
+  );
+  const [suiBalance, suiPriceUsd, ...rest] = await Promise.all([
     client.getBalance({ owner: address, coinType: SUPPORTED_ASSETS.SUI.type }),
     fetchSuiPrice(client),
-    ...stableBalancePromises
+    ...stableBalancePromises,
+    ...investBalancePromises
   ]);
+  const stableResults = rest.slice(0, STABLE_ASSETS.length);
+  const investResults = rest.slice(STABLE_ASSETS.length);
   const stables = {};
   let totalStables = 0;
   for (const { asset, amount } of stableResults) {
@@ -452,6 +459,13 @@ async function queryBalance(client, address) {
   const savings = 0;
   const usdEquiv = suiAmount * suiPriceUsd;
   const total = totalStables + savings + usdEquiv;
+  const assets = {
+    USDC: stables.USDC ?? 0,
+    SUI: suiAmount
+  };
+  for (const { asset, amount } of investResults) {
+    assets[asset] = amount;
+  }
   return {
     available: totalStables,
     savings,
@@ -464,10 +478,7 @@ async function queryBalance(client, address) {
     },
     total,
     stables,
-    assets: {
-      USDC: stables.USDC ?? 0,
-      SUI: suiAmount
-    }
+    assets
   };
 }
 
@@ -694,12 +705,17 @@ function normalizeHealthFactor(raw) {
   const v = raw / 10 ** RATE_DECIMALS;
   return v > 1e5 ? Infinity : v;
 }
-function compoundBalance(rawBalance, currentIndex) {
+function naviStorageDecimals(poolId, tokenDecimals) {
+  if (poolId <= 10) return NAVI_BALANCE_DECIMALS;
+  return tokenDecimals;
+}
+function compoundBalance(rawBalance, currentIndex, pool) {
   if (!rawBalance || !currentIndex || currentIndex === "0") return 0;
   const scale = BigInt("1" + "0".repeat(RATE_DECIMALS));
   const half = scale / 2n;
   const result = (rawBalance * BigInt(currentIndex) + half) / scale;
-  return Number(result) / 10 ** NAVI_BALANCE_DECIMALS;
+  const decimals = pool ? naviStorageDecimals(pool.id, pool.token.decimals) : NAVI_BALANCE_DECIMALS;
+  return Number(result) / 10 ** decimals;
 }
 async function getUserState(client, address) {
   const config = await getConfig();
@@ -783,7 +799,7 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
     getUserState(client, address)
   ]);
   const assetState = states.find((s) => s.assetId === pool.id);
-  const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex) : 0;
+  const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex, pool) : 0;
   const effectiveAmount = Math.min(amount, Math.max(0, deposited - WITHDRAW_DUST_BUFFER));
   if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on NAVI`);
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
@@ -826,7 +842,7 @@ async function addWithdrawToTx(tx, client, address, amount, options = {}) {
     getUserState(client, address)
   ]);
   const assetState = states.find((s) => s.assetId === pool.id);
-  const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex) : 0;
+  const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex, pool) : 0;
   const effectiveAmount = Math.min(amount, Math.max(0, deposited - WITHDRAW_DUST_BUFFER));
   if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on NAVI`);
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
@@ -997,8 +1013,8 @@ async function getHealthFactor(client, addressOrKeypair) {
   for (const state of states) {
     const pool = pools.find((p) => p.id === state.assetId);
     if (!pool) continue;
-    const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex);
-    const borrowBal = compoundBalance(state.borrowBalance, pool.currentBorrowIndex);
+    const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex, pool);
+    const borrowBal = compoundBalance(state.borrowBalance, pool.currentBorrowIndex, pool);
     const price = pool.token?.price ?? 1;
     supplied += supplyBal * price;
     borrowed += borrowBal * price;
@@ -1085,8 +1101,8 @@ async function getPositions(client, addressOrKeypair) {
     const pool = pools.find((p) => p.id === state.assetId);
     if (!pool) continue;
     const symbol = resolvePoolSymbol(pool);
-    const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex);
-    const borrowBal = compoundBalance(state.borrowBalance, pool.currentBorrowIndex);
+    const supplyBal = compoundBalance(state.supplyBalance, pool.currentSupplyIndex, pool);
+    const borrowBal = compoundBalance(state.borrowBalance, pool.currentBorrowIndex, pool);
     if (supplyBal > 1e-4) {
       positions.push({
         protocol: "navi",
@@ -3466,45 +3482,44 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
       }
       let investmentValue = 0;
       let investmentCostBasis = 0;
+      const trackedAmounts = {};
+      const trackedCostBasis = {};
+      const earningAssetSet = /* @__PURE__ */ new Set();
       for (const pos of portfolioPositions) {
         if (!(pos.asset in INVESTMENT_ASSETS)) continue;
-        const price = assetPrices[pos.asset] ?? 0;
-        if (pos.earning) {
-          investmentValue += pos.totalAmount * price;
-          investmentCostBasis += pos.costBasis;
-          if (pos.asset === "SUI") {
-            const gasSui = Math.max(0, bal.gasReserve.sui);
-            bal.gasReserve = { sui: gasSui, usdEquiv: gasSui * price };
-          }
-        } else if (pos.asset === "SUI") {
-          const actualHeld = Math.min(pos.totalAmount, bal.gasReserve.sui);
-          investmentValue += actualHeld * price;
-          if (actualHeld < pos.totalAmount && pos.totalAmount > 0) {
-            investmentCostBasis += pos.costBasis * (actualHeld / pos.totalAmount);
-          } else {
-            investmentCostBasis += pos.costBasis;
-          }
-          const gasSui = Math.max(0, bal.gasReserve.sui - pos.totalAmount);
-          bal.gasReserve = { sui: gasSui, usdEquiv: gasSui * price };
-        } else {
-          investmentValue += pos.totalAmount * price;
-          investmentCostBasis += pos.costBasis;
-        }
+        trackedAmounts[pos.asset] = (trackedAmounts[pos.asset] ?? 0) + pos.totalAmount;
+        trackedCostBasis[pos.asset] = (trackedCostBasis[pos.asset] ?? 0) + pos.costBasis;
+        if (pos.earning) earningAssetSet.add(pos.asset);
       }
-      let strategySuiTotal = 0;
       for (const key of this.portfolio.getAllStrategyKeys()) {
         for (const sp of this.portfolio.getStrategyPositions(key)) {
           if (!(sp.asset in INVESTMENT_ASSETS)) continue;
-          const price = assetPrices[sp.asset] ?? 0;
-          investmentValue += sp.totalAmount * price;
-          investmentCostBasis += sp.costBasis;
-          if (sp.asset === "SUI") strategySuiTotal += sp.totalAmount;
+          trackedAmounts[sp.asset] = (trackedAmounts[sp.asset] ?? 0) + sp.totalAmount;
+          trackedCostBasis[sp.asset] = (trackedCostBasis[sp.asset] ?? 0) + sp.costBasis;
         }
       }
-      if (strategySuiTotal > 0) {
-        const suiPrice2 = assetPrices["SUI"] ?? 0;
-        const gasSui = Math.max(0, bal.gasReserve.sui - strategySuiTotal);
-        bal.gasReserve = { sui: gasSui, usdEquiv: gasSui * suiPrice2 };
+      for (const asset of Object.keys(INVESTMENT_ASSETS)) {
+        const price = assetPrices[asset] ?? 0;
+        const tracked = trackedAmounts[asset] ?? 0;
+        const costBasis = trackedCostBasis[asset] ?? 0;
+        if (asset === "SUI") {
+          const actualSui = earningAssetSet.has("SUI") ? tracked : Math.min(tracked, bal.gasReserve.sui);
+          investmentValue += actualSui * price;
+          if (actualSui < tracked && tracked > 0) {
+            investmentCostBasis += costBasis * (actualSui / tracked);
+          } else {
+            investmentCostBasis += costBasis;
+          }
+          if (!earningAssetSet.has("SUI")) {
+            const gasSui = Math.max(0, bal.gasReserve.sui - tracked);
+            bal.gasReserve = { sui: gasSui, usdEquiv: gasSui * price };
+          }
+        } else {
+          const onChainAmount = bal.assets[asset] ?? 0;
+          const effectiveAmount = Math.max(tracked, onChainAmount);
+          investmentValue += effectiveAmount * price;
+          investmentCostBasis += costBasis;
+        }
       }
       bal.investment = investmentValue;
       bal.investmentPnL = investmentValue - investmentCostBasis;