@t2000/sdk 0.16.7 → 0.16.9

package/dist/index.js

@@ -3665,10 +3665,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 +4322,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 () => {
@@ -5064,7 +5065,8 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     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);
+    const walletInvested = pos?.earning ? 0 : invested;
+    return Math.max(0, walletAmount - walletInvested - gasReserve);
   }
   async resolveLending(protocol, asset, capability) {
     if (protocol) {