@t2000/sdk 0.16.14 → 0.16.16

package/dist/index.js

@@ -2133,7 +2133,7 @@ var SuilendAdapter = class {
     const deposited = dep ? dep.ctokenAmount * ratio / 10 ** reserve.mintDecimals : 0;
     const effectiveAmount = Math.min(amount, deposited);
     if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on Suilend`);
-    const ctokenAmount = dep && effectiveAmount >= deposited * 0.999 ? dep.ctokenAmount : Math.floor(effectiveAmount * 10 ** reserve.mintDecimals / ratio);
+    const rawAmount = Math.floor(effectiveAmount * 10 ** reserve.mintDecimals);
     const tx = new Transaction();
     tx.setSender(address);
     const [ctokens] = tx.moveCall({
@@ -2144,7 +2144,7 @@ var SuilendAdapter = class {
         tx.pure.u64(reserve.arrayIndex),
         tx.object(caps[0].id),
         tx.object(CLOCK2),
-        tx.pure.u64(ctokenAmount)
+        tx.pure.u64(rawAmount)
       ]
     });
     const exemptionType = `${SUILEND_PACKAGE}::lending_market::RateLimiterExemption<${LENDING_MARKET_TYPE}, ${assetInfo.type}>`;
@@ -2180,7 +2180,7 @@ var SuilendAdapter = class {
     const deposited = dep ? dep.ctokenAmount * ratio / 10 ** reserve.mintDecimals : 0;
     const effectiveAmount = Math.min(amount, deposited);
     if (effectiveAmount <= 0) throw new T2000Error("NO_COLLATERAL", `Nothing to withdraw for ${assetInfo.displayName} on Suilend`);
-    const ctokenAmount = dep && effectiveAmount >= deposited * 0.999 ? dep.ctokenAmount : Math.floor(effectiveAmount * 10 ** reserve.mintDecimals / ratio);
+    const rawAmount = Math.floor(effectiveAmount * 10 ** reserve.mintDecimals);
     const [ctokens] = tx.moveCall({
       target: `${pkg}::lending_market::withdraw_ctokens`,
       typeArguments: [LENDING_MARKET_TYPE, assetInfo.type],
@@ -2189,7 +2189,7 @@ var SuilendAdapter = class {
         tx.pure.u64(reserve.arrayIndex),
         tx.object(caps[0].id),
         tx.object(CLOCK2),
-        tx.pure.u64(ctokenAmount)
+        tx.pure.u64(rawAmount)
       ]
     });
     const exemptionType = `${SUILEND_PACKAGE}::lending_market::RateLimiterExemption<${LENDING_MARKET_TYPE}, ${assetInfo.type}>`;
@@ -3445,15 +3445,21 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
           investmentCostBasis += pos.costBasis;
         }
       }
+      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;
-          if (sp.asset === "SUI") continue;
           const price = assetPrices[sp.asset] ?? 0;
           investmentValue += sp.totalAmount * price;
           investmentCostBasis += sp.costBasis;
+          if (sp.asset === "SUI") strategySuiTotal += sp.totalAmount;
         }
       }
+      if (strategySuiTotal > 0) {
+        const suiPrice2 = assetPrices["SUI"] ?? 0;
+        const gasSui = Math.max(0, bal.gasReserve.sui - strategySuiTotal);
+        bal.gasReserve = { sui: gasSui, usdEquiv: gasSui * suiPrice2 };
+      }
       bal.investment = investmentValue;
       bal.investmentPnL = investmentValue - investmentCostBasis;
     } catch {