@t2000/sdk 0.18.8 → 0.18.10

package/dist/index.js

@@ -4098,7 +4098,12 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     if (supplies.length === 0) {
       throw new T2000Error("NO_COLLATERAL", "No savings to withdraw");
     }
-    supplies.sort((a, b) => a.apy - b.apy);
+    supplies.sort((a, b) => {
+      const aIsUsdc = a.asset === "USDC" ? 0 : 1;
+      const bIsUsdc = b.asset === "USDC" ? 0 : 1;
+      if (aIsUsdc !== bIsUsdc) return aIsUsdc - bIsUsdc;
+      return a.apy - b.apy;
+    });
     const target = supplies[0];
     const adapter = this.registry.getLending(target.protocolId);
     if (!adapter) throw new T2000Error("PROTOCOL_UNAVAILABLE", `Protocol ${target.protocolId} not found`);
@@ -4144,7 +4149,8 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
             coin,
             target.asset,
             "USDC",
-            effectiveAmount
+            effectiveAmount,
+            500
           );
           finalAmount = estimatedOut / 10 ** toDecimals;
           tx.transferObjects([outputCoin], this._address);
@@ -4201,16 +4207,19 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     if (entries.length === 0) {
       throw new T2000Error("NO_COLLATERAL", "No savings to withdraw across any protocol");
     }
-    const hasNonUsdc = entries.some((e) => e.asset !== "USDC");
+    const DUST_SWAP_THRESHOLD = 1;
+    const swappableEntries = entries.filter((e) => e.asset === "USDC" || e.maxAmount >= DUST_SWAP_THRESHOLD);
+    const dustEntries = entries.filter((e) => e.asset !== "USDC" && e.maxAmount < DUST_SWAP_THRESHOLD);
+    const hasNonUsdc = swappableEntries.some((e) => e.asset !== "USDC");
     const swapAdapter = hasNonUsdc ? this.registry.listSwap()[0] : void 0;
-    const canPTB = entries.every((e) => e.adapter.addWithdrawToTx) && (!swapAdapter || swapAdapter.addSwapToTx);
+    const canPTB = swappableEntries.every((e) => e.adapter.addWithdrawToTx) && (!swapAdapter || swapAdapter.addSwapToTx);
     let totalUsdcReceived = 0;
     const gasResult = await executeWithGas(this.client, this.keypair, async () => {
       if (canPTB) {
         const tx = new Transaction();
         tx.setSender(this._address);
         const usdcCoins = [];
-        for (const entry of entries) {
+        for (const entry of swappableEntries) {
           const { coin, effectiveAmount } = await entry.adapter.addWithdrawToTx(
             tx,
             this._address,
@@ -4227,7 +4236,8 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
               coin,
               entry.asset,
               "USDC",
-              effectiveAmount
+              effectiveAmount,
+              500
             );
             totalUsdcReceived += estimatedOut / 10 ** toDecimals;
             usdcCoins.push(outputCoin);
@@ -4236,6 +4246,18 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
             tx.transferObjects([coin], this._address);
           }
         }
+        for (const dust of dustEntries) {
+          if (dust.adapter.addWithdrawToTx) {
+            const { coin, effectiveAmount } = await dust.adapter.addWithdrawToTx(
+              tx,
+              this._address,
+              dust.maxAmount,
+              dust.asset
+            );
+            totalUsdcReceived += effectiveAmount;
+            tx.transferObjects([coin], this._address);
+          }
+        }
         if (usdcCoins.length > 1) {
           tx.mergeCoins(usdcCoins[0], usdcCoins.slice(1));
         }