@t2000/sdk 0.16.8 → 0.16.10

package/dist/index.js

@@ -3441,8 +3441,22 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         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") {
+            const actualHeld = Math.min(sp.totalAmount, bal.gasReserve.sui);
+            investmentValue += actualHeld * price;
+            if (actualHeld < sp.totalAmount && sp.totalAmount > 0) {
+              investmentCostBasis += sp.costBasis * (actualHeld / sp.totalAmount);
+            } else {
+              investmentCostBasis += sp.costBasis;
+            }
+            bal.gasReserve = {
+              sui: Math.max(0, bal.gasReserve.sui - sp.totalAmount),
+              usdEquiv: Math.max(0, bal.gasReserve.sui - sp.totalAmount) * price
+            };
+          } else {
+            investmentValue += sp.totalAmount * price;
+            investmentCostBasis += sp.costBasis;
+          }
         }
       }
       bal.investment = investmentValue;
@@ -3665,10 +3679,13 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
   }
   async withdrawAllProtocols() {
     const allPositions = await this.registry.allPositions(this._address);
+    const earningAssets = new Set(
+      this.portfolio.getPositions().filter((p) => p.earning).map((p) => p.asset)
+    );
     const withdrawable = [];
     for (const pos of allPositions) {
       for (const supply of pos.positions.supplies) {
-        if (supply.amount > 0.01) {
+        if (supply.amount > 0.01 && !earningAssets.has(supply.asset)) {
           withdrawable.push({ protocolId: pos.protocolId, asset: supply.asset, amount: supply.amount });
         }
       }
@@ -4319,9 +4336,7 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (!adapter) {
       throw new T2000Error("PROTOCOL_UNAVAILABLE", `Lending protocol ${pos.earningProtocol} not found`);
     }
-    const positions = await adapter.getPositions(this._address);
-    const supply = positions.supplies.find((s) => s.asset === params.asset);
-    const withdrawAmount = supply?.amount ?? pos.totalAmount;
+    const withdrawAmount = pos.totalAmount;
     const protocolName = adapter.name;
     let effectiveAmount = withdrawAmount;
     const gasResult = await executeWithGas(this.client, this.keypair, async () => {
@@ -5057,14 +5072,24 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
   // -- Helpers --
   async getFreeBalance(asset) {
     if (!(asset in INVESTMENT_ASSETS)) return Infinity;
+    let walletInvested = 0;
     const pos = this.portfolio.getPosition(asset);
-    const invested = pos?.totalAmount ?? 0;
-    if (invested <= 0) return Infinity;
+    if (pos && pos.totalAmount > 0 && !pos.earning) {
+      walletInvested += pos.totalAmount;
+    }
+    for (const key of this.portfolio.getAllStrategyKeys()) {
+      for (const sp of this.portfolio.getStrategyPositions(key)) {
+        if (sp.asset === asset && sp.totalAmount > 0) {
+          walletInvested += sp.totalAmount;
+        }
+      }
+    }
+    if (walletInvested <= 0 && (!pos || pos.totalAmount <= 0)) return Infinity;
     const assetInfo = SUPPORTED_ASSETS[asset];
     const balance = await this.client.getBalance({ owner: this._address, coinType: assetInfo.type });
     const walletAmount = Number(balance.totalBalance) / 10 ** assetInfo.decimals;
     const gasReserve = asset === "SUI" ? GAS_RESERVE_MIN : 0;
-    return Math.max(0, walletAmount - invested - gasReserve);
+    return Math.max(0, walletAmount - walletInvested - gasReserve);
   }
   async resolveLending(protocol, asset, capability) {
     if (protocol) {