@t2000/sdk 0.18.0 → 0.18.4

package/dist/index.cjs

@@ -1674,15 +1674,20 @@ var ProtocolRegistry = class {
   }
   async allPositions(address) {
     const results = [];
+    const errors = [];
     for (const adapter of this.lending.values()) {
       try {
         const positions = await adapter.getPositions(address);
         if (positions.supplies.length > 0 || positions.borrows.length > 0) {
           results.push({ protocol: adapter.name, protocolId: adapter.id, positions });
         }
-      } catch {
+      } catch (err) {
+        errors.push(`${adapter.name}: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
+    if (results.length === 0 && errors.length > 0) {
+      throw new T2000Error("PROTOCOL_UNAVAILABLE", `Protocol queries failed (${errors.length}/${this.lending.size}): ${errors.join("; ")}`);
+    }
     return results;
   }
   getLending(id) {
@@ -3848,7 +3853,7 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     );
     try {
       const positions = await this.positions();
-      const savings = positions.positions.filter((p) => p.type === "save").filter((p) => !earningAssets.has(p.asset)).reduce((sum, p) => sum + p.amount, 0);
+      const savings = positions.positions.filter((p) => p.type === "save").filter((p) => !earningAssets.has(p.asset)).filter((p) => !(p.asset in INVESTMENT_ASSETS)).reduce((sum, p) => sum + p.amount, 0);
       const debt = positions.positions.filter((p) => p.type === "borrow").reduce((sum, p) => sum + p.amount, 0);
       bal.savings = savings;
       bal.debt = debt;
@@ -4184,7 +4189,8 @@ 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 swapAdapter = this.registry.listSwap()[0];
+    const hasNonUsdc = entries.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);
     let totalUsdcReceived = 0;
     const gasResult = await executeWithGas(this.client, this.keypair, async () => {
@@ -4192,7 +4198,6 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         const tx = new transactions.Transaction();
         tx.setSender(this._address);
         const usdcCoins = [];
-        const nonUsdcCoins = [];
         for (const entry of entries) {
           const { coin, effectiveAmount } = await entry.adapter.addWithdrawToTx(
             tx,
@@ -4203,9 +4208,20 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
           if (entry.asset === "USDC") {
             totalUsdcReceived += effectiveAmount;
             usdcCoins.push(coin);
+          } else if (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 {
             totalUsdcReceived += effectiveAmount;
-            nonUsdcCoins.push(coin);
+            tx.transferObjects([coin], this._address);
           }
         }
         if (usdcCoins.length > 1) {
@@ -4214,9 +4230,6 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         if (usdcCoins.length > 0) {
           tx.transferObjects([usdcCoins[0]], this._address);
         }
-        for (const coin of nonUsdcCoins) {
-          tx.transferObjects([coin], this._address);
-        }
         return tx;
       }
       let lastTx;
@@ -4225,6 +4238,9 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
         totalUsdcReceived += built.effectiveAmount;
         lastTx = built.tx;
       }
+      if (hasNonUsdc && swapAdapter) {
+        await this._convertWalletStablesToUsdc(await queryBalance(this.client, this._address));
+      }
       return lastTx;
     });
     if (totalUsdcReceived <= 0) {