@t2000/sdk 0.21.10 → 0.21.12

package/dist/index.js

@@ -2351,21 +2351,52 @@ var T2000 = class _T2000 extends EventEmitter {
     const toDecimals = toEntry ? toEntry[1].decimals : toType === "0x2::sui::SUI" ? 9 : 6;
     const fromAmount = Number(route.amountIn) / 10 ** fromDecimals;
     let toAmount = Number(route.amountOut) / 10 ** toDecimals;
+    const toTypeSuffix = toType.split("::").slice(1).join("::");
     try {
-      const txBlock = await this.client.getTransactionBlock({
+      const fullTx = await this.client.waitForTransaction({
         digest: gasResult.digest,
-        options: { showBalanceChanges: true }
+        options: { showBalanceChanges: true },
+        timeout: 8e3,
+        pollInterval: 400
+      });
+      const changes = fullTx.balanceChanges ?? [];
+      console.error(`[swap] balanceChanges count=${changes.length}, toType=${toType}`);
+      for (const c of changes) {
+        console.error(`[swap]   coinType=${c.coinType} amount=${c.amount} owner=${JSON.stringify(c.owner)}`);
+      }
+      const received = changes.find((c) => {
+        if (BigInt(c.amount) <= 0n) return false;
+        const ownerAddr = c.owner?.AddressOwner;
+        if (!ownerAddr || ownerAddr.toLowerCase() !== this._address.toLowerCase()) return false;
+        if (c.coinType === toType) return true;
+        return c.coinType.endsWith(toTypeSuffix);
       });
-      const changes = txBlock.balanceChanges ?? [];
-      const received = changes.find(
-        (c) => c.coinType === toType && BigInt(c.amount) > 0n && c.owner.AddressOwner === this._address
-      );
       if (received) {
         const actual = Number(BigInt(received.amount)) / 10 ** toDecimals;
         if (actual > 0) toAmount = actual;
+        console.error(`[swap] Approach 1 success: toAmount=${toAmount}`);
+      } else {
+        console.error(`[swap] Approach 1: no matching balance change found`);
+      }
+    } catch (err) {
+      console.error(`[swap] Approach 1 failed:`, err);
+    }
+    const cetusEstimate = Number(route.amountOut) / 10 ** toDecimals;
+    if (Math.abs(toAmount - cetusEstimate) < 1e-3) {
+      console.error(`[swap] toAmount still equals Cetus estimate (${cetusEstimate}), trying balance diff`);
+      try {
+        await new Promise((r) => setTimeout(r, 2e3));
+        const postBal = await this.client.getBalance({ owner: this._address, coinType: toType });
+        const postRaw = BigInt(postBal.totalBalance);
+        const human = Number(postRaw) / 10 ** toDecimals;
+        console.error(`[swap] Approach 2: postBalance raw=${postRaw} human=${human}`);
+        if (human > toAmount * 10) {
+          toAmount = human;
+          console.error(`[swap] Approach 2: using total balance as estimate: ${toAmount}`);
+        }
+      } catch (err) {
+        console.error(`[swap] Approach 2 failed:`, err);
       }
-    } catch {
-      console.warn("[swap] Could not read balance changes, using route estimate");
     }
     const fromName = fromEntry ? fromEntry[0] : this._resolveTokenName(fromType, params.from);
     const toName = toEntry ? toEntry[0] : this._resolveTokenName(toType, params.to);