@t2000/sdk 0.21.7 → 0.21.9

package/dist/index.d.cts

@@ -147,7 +147,7 @@ interface TxMetadata {
     operation: 'send' | 'save' | 'withdraw' | 'borrow' | 'repay' | 'pay';
     amount?: number;
 }
-declare const OUTBOUND_OPS: Set<"save" | "withdraw" | "borrow" | "repay" | "send" | "pay">;
+declare const OUTBOUND_OPS: Set<"save" | "borrow" | "send" | "withdraw" | "repay" | "pay">;
 declare const DEFAULT_SAFEGUARD_CONFIG: SafeguardConfig;
 
 declare class SafeguardEnforcer {
@@ -313,6 +313,7 @@ declare class T2000 extends EventEmitter<T2000Events> {
     }): Promise<WithdrawResult>;
     private withdrawAllProtocols;
     private _fetchCoins;
+    private _resolveTokenName;
     private _mergeCoinsInTx;
     private _lastFundDigest;
     private _autoFundFromSavings;
@@ -516,6 +517,7 @@ declare class SafeguardError extends T2000Error {
 interface GasExecutionResult {
     digest: string;
     effects: unknown;
+    balanceChanges?: unknown[];
     gasMethod: GasMethod;
     gasCostSui: number;
     /** Pre-TX SUI balance in MIST — used internally for proactive gas maintenance. */

package/dist/index.d.ts

@@ -147,7 +147,7 @@ interface TxMetadata {
     operation: 'send' | 'save' | 'withdraw' | 'borrow' | 'repay' | 'pay';
     amount?: number;
 }
-declare const OUTBOUND_OPS: Set<"save" | "withdraw" | "borrow" | "repay" | "send" | "pay">;
+declare const OUTBOUND_OPS: Set<"save" | "borrow" | "send" | "withdraw" | "repay" | "pay">;
 declare const DEFAULT_SAFEGUARD_CONFIG: SafeguardConfig;
 
 declare class SafeguardEnforcer {
@@ -313,6 +313,7 @@ declare class T2000 extends EventEmitter<T2000Events> {
     }): Promise<WithdrawResult>;
     private withdrawAllProtocols;
     private _fetchCoins;
+    private _resolveTokenName;
     private _mergeCoinsInTx;
     private _lastFundDigest;
     private _autoFundFromSavings;
@@ -516,6 +517,7 @@ declare class SafeguardError extends T2000Error {
 interface GasExecutionResult {
     digest: string;
     effects: unknown;
+    balanceChanges?: unknown[];
     gasMethod: GasMethod;
     gasCostSui: number;
     /** Pre-TX SUI balance in MIST — used internally for proactive gas maintenance. */

package/dist/index.js

@@ -1678,13 +1678,14 @@ async function trySelfFunded(client, signer, tx) {
   const result = await client.executeTransactionBlock({
     transactionBlock: toBase64(builtBytes),
     signature: [signature],
-    options: { showEffects: true }
+    options: { showEffects: true, showBalanceChanges: true }
   });
   await client.waitForTransaction({ digest: result.digest });
   await assertTxSuccess(result.effects, result.digest);
   return {
     digest: result.digest,
     effects: result.effects,
+    balanceChanges: result.balanceChanges,
     gasMethod: "self-funded",
     gasCostSui: extractGasCost(result.effects),
     preTxSuiMist: suiBalance
@@ -1703,13 +1704,14 @@ async function tryAutoTopUpThenSelfFund(client, signer, buildTx) {
   const result = await client.executeTransactionBlock({
     transactionBlock: toBase64(builtBytes),
     signature: [signature],
-    options: { showEffects: true }
+    options: { showEffects: true, showBalanceChanges: true }
   });
   await client.waitForTransaction({ digest: result.digest });
   await assertTxSuccess(result.effects, result.digest);
   return {
     digest: result.digest,
     effects: result.effects,
+    balanceChanges: result.balanceChanges,
     gasMethod: "auto-topup",
     gasCostSui: extractGasCost(result.effects),
     preTxSuiMist: suiAfterTopUp
@@ -1733,7 +1735,7 @@ async function trySponsored(client, signer, tx) {
   const result = await client.executeTransactionBlock({
     transactionBlock: sponsoredResult.txBytes,
     signature: [agentSig, sponsoredResult.sponsorSignature],
-    options: { showEffects: true }
+    options: { showEffects: true, showBalanceChanges: true }
   });
   await client.waitForTransaction({ digest: result.digest });
   await assertTxSuccess(result.effects, result.digest);
@@ -1742,6 +1744,7 @@ async function trySponsored(client, signer, tx) {
   return {
     digest: result.digest,
     effects: result.effects,
+    balanceChanges: result.balanceChanges,
     gasMethod: "sponsored",
     gasCostSui: gasCost,
     preTxSuiMist: suiBalance
@@ -2322,6 +2325,14 @@ var T2000 = class _T2000 extends EventEmitter {
     if (route.priceImpact > 0.05) {
       console.warn(`[swap] High price impact: ${(route.priceImpact * 100).toFixed(2)}%`);
     }
+    const toEntry = Object.entries(SUPPORTED_ASSETS).find(([, v]) => v.type === toType);
+    const toDecimals = toEntry ? toEntry[1].decimals : toType === "0x2::sui::SUI" ? 9 : 6;
+    let preBalance = 0n;
+    try {
+      const bal = await this.client.getBalance({ owner: this._address, coinType: toType });
+      preBalance = BigInt(bal.totalBalance);
+    } catch {
+    }
     const gasResult = await executeWithGas(this.client, this._signer, async () => {
       const tx = new Transaction();
       tx.setSender(this._address);
@@ -2344,32 +2355,26 @@ var T2000 = class _T2000 extends EventEmitter {
       tx.transferObjects([outputCoin], this._address);
       return tx;
     });
-    const toEntry = Object.entries(SUPPORTED_ASSETS).find(([, v]) => v.type === toType);
-    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;
     try {
-      const txBlock = await this.client.getTransactionBlock({
-        digest: gasResult.digest,
-        options: { showBalanceChanges: true }
-      });
-      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;
+      const postBal = await this.client.getBalance({ owner: this._address, coinType: toType });
+      const postBalance = BigInt(postBal.totalBalance);
+      const diff = postBalance - preBalance;
+      if (diff > 0n) {
+        toAmount = Number(diff) / 10 ** toDecimals;
       }
-    } catch (e) {
-      console.warn("[swap] Could not parse on-chain balance changes, using route estimate:", e);
+    } catch {
+      console.warn("[swap] Could not read post-swap balance, using route estimate");
     }
+    const fromName = fromEntry ? fromEntry[0] : this._resolveTokenName(fromType, params.from);
+    const toName = toEntry ? toEntry[0] : this._resolveTokenName(toType, params.to);
     const routeDesc = route.routerData.paths?.map((p) => p.provider).filter(Boolean).slice(0, 3).join(" + ") ?? "Cetus Aggregator";
     return {
       success: true,
       tx: gasResult.digest,
-      fromToken: params.from,
-      toToken: params.to,
+      fromToken: fromName,
+      toToken: toName,
       fromAmount,
       toAmount,
       priceImpact: route.priceImpact,
@@ -2774,6 +2779,12 @@ var T2000 = class _T2000 extends EventEmitter {
     }
     return all;
   }
+  _resolveTokenName(coinType, fallback) {
+    const entry = Object.entries(SUPPORTED_ASSETS).find(([, v]) => v.type === coinType);
+    if (entry) return entry[0];
+    const suffix = coinType.split("::").pop();
+    return suffix && suffix !== coinType ? suffix : fallback;
+  }
   _mergeCoinsInTx(tx, coins) {
     if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No coins to merge");
     const primary = tx.object(coins[0].coinObjectId);