@t2000/sdk 0.16.23 → 0.16.25

package/dist/adapters/index.js

@@ -408,12 +408,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();
@@ -497,7 +502,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));
@@ -540,7 +545,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));
@@ -711,8 +716,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;
@@ -799,8 +804,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",
@@ -832,7 +837,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) {