@t2000/sdk 0.17.10 → 0.17.12

package/dist/index.js

@@ -4344,7 +4344,10 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     }
     const didAutoWithdraw = !!(pos.earning && pos.earningProtocol);
     if (didAutoWithdraw) {
-      await this.investUnearn({ asset: params.asset });
+      const unearnResult = await this.investUnearn({ asset: params.asset });
+      if (unearnResult.tx) {
+        await this.client.waitForTransaction({ digest: unearnResult.tx, options: { showEffects: true } });
+      }
     }
     const assetInfo = SUPPORTED_ASSETS[params.asset];
     const gasReserve = params.asset === "SUI" ? GAS_RESERVE_MIN : 0;
@@ -4355,8 +4358,8 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
         coinType: assetInfo.type
       });
       walletAmount = Number(assetBalance.totalBalance) / 10 ** assetInfo.decimals;
-      if (!didAutoWithdraw || walletAmount > gasReserve || attempt >= 3) break;
-      await new Promise((r) => setTimeout(r, 1e3));
+      if (!didAutoWithdraw || walletAmount > gasReserve || attempt >= 5) break;
+      await new Promise((r) => setTimeout(r, 1500));
     }
     const maxSellable = Math.max(0, walletAmount - gasReserve);
     let sellAmountAsset;
@@ -4627,25 +4630,33 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (!swapAdapter?.addSwapToTx) {
       throw new T2000Error("PROTOCOL_UNAVAILABLE", "Swap adapter does not support composable PTB");
     }
+    for (const pos of stratPositions) {
+      const directPos = this.portfolio.getPosition(pos.asset);
+      if (directPos?.earning && directPos.earningProtocol) {
+        await this.investUnearn({ asset: pos.asset });
+        await new Promise((r) => setTimeout(r, 1500));
+      }
+    }
     let swapMetas = [];
-    const gasResult = await executeWithGas(this.client, this.keypair, async () => {
+    const buildSellPtb = async () => {
       swapMetas = [];
       const tx = new Transaction();
       tx.setSender(this._address);
       const usdcOutputs = [];
       for (const pos of stratPositions) {
         const assetInfo = SUPPORTED_ASSETS[pos.asset];
+        const bal = await this.client.getBalance({ owner: this._address, coinType: assetInfo.type });
+        const walletAmount = Number(bal.totalBalance) / 10 ** assetInfo.decimals;
         const gasReserve = pos.asset === "SUI" ? GAS_RESERVE_MIN : 0;
-        const sellAmount = Math.max(0, pos.totalAmount - gasReserve);
+        const sellAmount = Math.max(0, Math.min(pos.totalAmount, walletAmount) - gasReserve);
+        if (sellAmount <= 0) continue;
         const rawAmount = BigInt(Math.floor(sellAmount * 10 ** assetInfo.decimals));
         let splitCoin;
         if (pos.asset === "SUI") {
           [splitCoin] = tx.splitCoins(tx.gas, [rawAmount]);
         } else {
           const coins = await this._fetchCoins(assetInfo.type);
-          if (coins.length === 0) {
-            throw new T2000Error("INSUFFICIENT_BALANCE", `No ${pos.asset} coins in wallet`);
-          }
+          if (coins.length === 0) continue;
           const merged = this._mergeCoinsInTx(tx, coins);
           [splitCoin] = tx.splitCoins(merged, [rawAmount]);
         }
@@ -4662,12 +4673,31 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
         usdcOutputs.push(outputCoin);
         swapMetas.push({ asset: pos.asset, amount: sellAmount, estimatedOut, toDecimals });
       }
+      if (usdcOutputs.length === 0) {
+        throw new T2000Error("INSUFFICIENT_BALANCE", "No assets available to sell");
+      }
       if (usdcOutputs.length > 1) {
         tx.mergeCoins(usdcOutputs[0], usdcOutputs.slice(1));
       }
       tx.transferObjects([usdcOutputs[0]], this._address);
       return tx;
-    });
+    };
+    let gasResult;
+    const MAX_RETRIES = 3;
+    for (let attempt = 0; ; attempt++) {
+      try {
+        gasResult = await executeWithGas(this.client, this.keypair, buildSellPtb);
+        break;
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const isSlippage = msg.includes("slippage") || msg.includes("amount_out_slippage");
+        if (isSlippage && attempt < MAX_RETRIES) {
+          await new Promise((r) => setTimeout(r, 2e3 * (attempt + 1)));
+          continue;
+        }
+        throw err;
+      }
+    }
     const digest = gasResult.digest;
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const sells = [];
@@ -4702,6 +4732,9 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       totalProceeds += usdValue;
       totalPnL += pnl;
     }
+    if (this.portfolio.hasStrategyPositions(params.strategy)) {
+      this.portfolio.clearStrategy(params.strategy);
+    }
     return {
       success: true,
       strategy: params.strategy,
@@ -4775,8 +4808,11 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       const usdcCoins = [];
       for (const sell of sellOps) {
         const assetInfo = SUPPORTED_ASSETS[sell.asset];
+        const bal = await this.client.getBalance({ owner: this._address, coinType: assetInfo.type });
+        const walletAmount = Number(bal.totalBalance) / 10 ** assetInfo.decimals;
         const gasReserve = sell.asset === "SUI" ? GAS_RESERVE_MIN : 0;
-        const sellAmount = Math.max(0, sell.assetAmount - gasReserve);
+        const sellAmount = Math.max(0, Math.min(sell.assetAmount, walletAmount) - gasReserve);
+        if (sellAmount <= 0) continue;
         const rawAmount = BigInt(Math.floor(sellAmount * 10 ** assetInfo.decimals));
         let splitCoin;
         if (sell.asset === "SUI") {