@t2000/sdk 0.16.25 → 0.16.27

package/dist/index.js

@@ -3668,7 +3668,9 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     for (const pos of allPositions) {
       if (params.protocol && pos.protocolId !== params.protocol) continue;
       for (const s of pos.positions.supplies) {
-        if (s.amount > 1e-3) supplies.push({ protocolId: pos.protocolId, asset: s.asset, amount: s.amount, apy: s.apy });
+        if (s.amount > 1e-3 && !(s.asset in INVESTMENT_ASSETS)) {
+          supplies.push({ protocolId: pos.protocolId, asset: s.asset, amount: s.amount, apy: s.apy });
+        }
       }
     }
     if (supplies.length === 0) {
@@ -3750,7 +3752,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     const withdrawable = [];
     for (const pos of allPositions) {
       for (const supply of pos.positions.supplies) {
-        if (supply.amount > 0.01 && !earningAssets.has(supply.asset)) {
+        if (supply.amount > 0.01 && !earningAssets.has(supply.asset) && !(supply.asset in INVESTMENT_ASSETS)) {
           withdrawable.push({ protocolId: pos.protocolId, asset: supply.asset, amount: supply.amount });
         }
       }
@@ -3758,14 +3760,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) {
@@ -3779,6 +3787,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,
@@ -3786,26 +3795,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;