@t2000/sdk 0.17.0 → 0.17.2

package/dist/index.js

@@ -589,7 +589,9 @@ SUPPORTED_ASSETS.USDC.type;
 var RATE_DECIMALS = 27;
 var LTV_DECIMALS = 27;
 var MIN_HEALTH_FACTOR = 1.5;
-var WITHDRAW_DUST_BUFFER = 1e-3;
+function withdrawDustBuffer(decimals) {
+  return 1e3 / 10 ** decimals;
+}
 var CLOCK = "0x06";
 var SUI_SYSTEM_STATE = "0x05";
 var NAVI_BALANCE_DECIMALS = 9;
@@ -712,6 +714,16 @@ function rateToApy(rawRate) {
   if (!rawRate || rawRate === "0") return 0;
   return Number(BigInt(rawRate)) / 10 ** RATE_DECIMALS * 100;
 }
+function poolSaveApy(pool) {
+  const incentive = parseFloat(pool.supplyIncentiveApyInfo?.apy ?? "0");
+  if (incentive > 0) return incentive;
+  return rateToApy(pool.currentSupplyRate);
+}
+function poolBorrowApy(pool) {
+  const incentive = parseFloat(pool.borrowIncentiveApyInfo?.apy ?? "0");
+  if (incentive > 0) return incentive;
+  return rateToApy(pool.currentBorrowRate);
+}
 function parseLtv(rawLtv) {
   if (!rawLtv || rawLtv === "0") return 0.75;
   return Number(BigInt(rawLtv)) / 10 ** LTV_DECIMALS;
@@ -821,7 +833,7 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
   ]);
   const assetState = states.find((s) => s.assetId === pool.id);
   const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex, pool) : 0;
-  const effectiveAmount = Math.min(amount, Math.max(0, deposited - WITHDRAW_DUST_BUFFER));
+  const effectiveAmount = Math.min(amount, Math.max(0, deposited - withdrawDustBuffer(assetInfo.decimals)));
   if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on NAVI`);
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
   if (rawAmount <= 0) {
@@ -864,7 +876,7 @@ async function addWithdrawToTx(tx, client, address, amount, options = {}) {
   ]);
   const assetState = states.find((s) => s.assetId === pool.id);
   const deposited = assetState ? compoundBalance(assetState.supplyBalance, pool.currentSupplyIndex, pool) : 0;
-  const effectiveAmount = Math.min(amount, Math.max(0, deposited - WITHDRAW_DUST_BUFFER));
+  const effectiveAmount = Math.min(amount, Math.max(0, deposited - withdrawDustBuffer(assetInfo.decimals)));
   if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on NAVI`);
   const rawAmount = Number(stableToRaw(effectiveAmount, assetInfo.decimals));
   if (rawAmount <= 0) {
@@ -1102,10 +1114,10 @@ async function getRates(client) {
       const targetType = SUPPORTED_ASSETS[asset].type;
       const pool = pools.find((p) => matchesCoinType(p.suiCoinType || p.coinType || "", targetType));
       if (!pool) continue;
-      let saveApy = rateToApy(pool.currentSupplyRate);
-      let borrowApy = rateToApy(pool.currentBorrowRate);
-      if (saveApy <= 0 || saveApy > 100) saveApy = 0;
-      if (borrowApy <= 0 || borrowApy > 100) borrowApy = 0;
+      let saveApy = poolSaveApy(pool);
+      let borrowApy = poolBorrowApy(pool);
+      if (saveApy <= 0 || saveApy > 200) saveApy = 0;
+      if (borrowApy <= 0 || borrowApy > 200) borrowApy = 0;
       result[asset] = { saveApy, borrowApy };
     }
     if (!result.USDC) result.USDC = { saveApy: 4, borrowApy: 6 };
@@ -1130,7 +1142,7 @@ async function getPositions(client, addressOrKeypair) {
         asset: symbol,
         type: "save",
         amount: supplyBal,
-        apy: rateToApy(pool.currentSupplyRate)
+        apy: poolSaveApy(pool)
       });
     }
     if (borrowBal > 1e-4) {
@@ -1139,7 +1151,7 @@ async function getPositions(client, addressOrKeypair) {
         asset: symbol,
         type: "borrow",
         amount: borrowBal,
-        apy: rateToApy(pool.currentBorrowRate)
+        apy: poolBorrowApy(pool)
       });
     }
   }
@@ -4425,10 +4437,6 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (!pos || pos.totalAmount <= 0) {
       throw new T2000Error("INSUFFICIENT_INVESTMENT", `No ${params.asset} position to earn on`);
     }
-    if (pos.earning) {
-      throw new T2000Error("INVEST_ALREADY_EARNING", `${params.asset} is already earning via ${pos.earningProtocol}`);
-    }
-    const { adapter, rate } = await this.registry.bestSaveRate(params.asset);
     const assetInfo = SUPPORTED_ASSETS[params.asset];
     const assetBalance = await this.client.getBalance({
       owner: this._address,
@@ -4437,9 +4445,13 @@ 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);
+    if (pos.earning && depositAmount <= 0) {
+      throw new T2000Error("INVEST_ALREADY_EARNING", `${params.asset} is already earning via ${pos.earningProtocol}`);
+    }
     if (depositAmount <= 0) {
       throw new T2000Error("INSUFFICIENT_BALANCE", `No ${params.asset} available to deposit (wallet: ${walletAmount}, gas reserve: ${gasReserve})`);
     }
+    const { adapter, rate } = await this.registry.bestSaveRate(params.asset);
     const gasResult = await executeWithGas(this.client, this.keypair, async () => {
       const { tx } = await adapter.buildSaveTx(this._address, depositAmount, params.asset);
       return tx;