@t2000/sdk 0.16.26 → 0.16.28

package/dist/index.js

@@ -3485,6 +3485,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
       }
       let investmentValue = 0;
       let investmentCostBasis = 0;
+      let trackedValue = 0;
       const trackedAmounts = {};
       const trackedCostBasis = {};
       const earningAssetSet = /* @__PURE__ */ new Set();
@@ -3508,6 +3509,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         if (asset === "SUI") {
           const actualSui = earningAssetSet.has("SUI") ? tracked : Math.min(tracked, bal.gasReserve.sui);
           investmentValue += actualSui * price;
+          trackedValue += actualSui * price;
           if (actualSui < tracked && tracked > 0) {
             investmentCostBasis += costBasis * (actualSui / tracked);
           } else {
@@ -3521,11 +3523,12 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
           const onChainAmount = bal.assets[asset] ?? 0;
           const effectiveAmount = Math.max(tracked, onChainAmount);
           investmentValue += effectiveAmount * price;
+          trackedValue += tracked * price;
           investmentCostBasis += costBasis;
         }
       }
       bal.investment = investmentValue;
-      bal.investmentPnL = investmentValue - investmentCostBasis;
+      bal.investmentPnL = trackedValue - investmentCostBasis;
     } catch {
       bal.investment = 0;
       bal.investmentPnL = 0;
@@ -3760,14 +3763,20 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     if (withdrawable.length === 0) {
       throw new T2000Error("NO_COLLATERAL", "No savings to withdraw across any protocol");
     }
+    const protocolMaxes = /* @__PURE__ */ new Map();
     const entries = [];
     for (const entry of withdrawable) {
       const adapter = this.registry.getLending(entry.protocolId);
       if (!adapter) continue;
-      const maxResult = await adapter.maxWithdraw(this._address, entry.asset);
-      const perAssetMax = Math.min(entry.amount, maxResult.maxAmount);
+      if (!protocolMaxes.has(entry.protocolId)) {
+        const maxResult = await adapter.maxWithdraw(this._address, entry.asset);
+        protocolMaxes.set(entry.protocolId, maxResult.maxAmount);
+      }
+      const remaining = protocolMaxes.get(entry.protocolId);
+      const perAssetMax = Math.min(entry.amount, remaining);
       if (perAssetMax > 0.01) {
         entries.push({ ...entry, maxAmount: perAssetMax, adapter });
+        protocolMaxes.set(entry.protocolId, remaining - perAssetMax);
       }
     }
     if (entries.length === 0) {
@@ -3781,6 +3790,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         const tx = new Transaction();
         tx.setSender(this._address);
         const usdcCoins = [];
+        const nonUsdcCoins = [];
         for (const entry of entries) {
           const { coin, effectiveAmount } = await entry.adapter.addWithdrawToTx(
             tx,
@@ -3788,26 +3798,23 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
             entry.maxAmount,
             entry.asset
           );
-          if (entry.asset !== "USDC" && swapAdapter?.addSwapToTx) {
-            const { outputCoin, estimatedOut, toDecimals } = await swapAdapter.addSwapToTx(
-              tx,
-              this._address,
-              coin,
-              entry.asset,
-              "USDC",
-              effectiveAmount
-            );
-            totalUsdcReceived += estimatedOut / 10 ** toDecimals;
-            usdcCoins.push(outputCoin);
-          } else {
+          if (entry.asset === "USDC") {
             totalUsdcReceived += effectiveAmount;
             usdcCoins.push(coin);
+          } else {
+            totalUsdcReceived += effectiveAmount;
+            nonUsdcCoins.push(coin);
           }
         }
         if (usdcCoins.length > 1) {
           tx.mergeCoins(usdcCoins[0], usdcCoins.slice(1));
         }
-        tx.transferObjects([usdcCoins[0]], this._address);
+        if (usdcCoins.length > 0) {
+          tx.transferObjects([usdcCoins[0]], this._address);
+        }
+        for (const coin of nonUsdcCoins) {
+          tx.transferObjects([coin], this._address);
+        }
         return tx;
       }
       let lastTx;