@msafe/sui3-sdk 1.0.18 → 1.0.19

package/dist/index.js

@@ -134,7 +134,7 @@ import {
   isSameAddress as isSameAddress2
 } from "@msafe/sui3-utils";
 import { Transaction as Transaction4 } from "@mysten/sui/transactions";
-import { fromHex as fromHex2, normalizeStructTag as normalizeStructTag3, toHex as toHex2 } from "@mysten/sui/utils";
+import { fromHex as fromHex2, normalizeStructTag as normalizeStructTag4, toHex as toHex2 } from "@mysten/sui/utils";
 import { SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN } from "@mysten/wallet-standard";
 
 // src/simulate/simulator.ts
@@ -142,7 +142,7 @@ import { Transaction as Transaction2 } from "@mysten/sui/transactions";
 
 // src/utils/gasFunding.ts
 import { Transaction } from "@mysten/sui/transactions";
-import { normalizeSuiObjectId } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag3, normalizeSuiObjectId } from "@mysten/sui/utils";
 
 // src/utils/coinReservation.ts
 import { bcs, TypeTagSerializer } from "@mysten/sui/bcs";
@@ -450,12 +450,37 @@ function collectUsedObjectIds(tx) {
     return used;
   }, /* @__PURE__ */ new Set());
 }
+function txConsumesOwnedSuiCoins(tx) {
+  return tx.getData().commands.some((cmd) => {
+    if (cmd.$kind !== "$Intent" || cmd.$Intent.name !== "CoinWithBalance") {
+      return false;
+    }
+    const type = cmd.$Intent.data?.type;
+    if (!type || type === "gas") {
+      return false;
+    }
+    try {
+      return normalizeStructTag3(type) === normalizeStructTag3(SUI_COIN);
+    } catch {
+      return false;
+    }
+  });
+}
 async function loadSuiGasFunding(suiClient, owner, tx) {
   const usedObjectIds = collectUsedObjectIds(tx);
   const [coins, balanceRes] = await Promise.all([
     getAllCoins({ suiClient, owner, coinType: SUI_COIN }),
     suiClient.getBalance({ owner, coinType: SUI_COIN })
   ]);
+  const addressBalance = BigInt(balanceRes.balance.addressBalance);
+  if (txConsumesOwnedSuiCoins(tx)) {
+    return {
+      paymentCoins: [],
+      coinBalance: 0n,
+      addressBalance,
+      total: addressBalance
+    };
+  }
   const paymentCoins = coins.filter((coin) => !usedObjectIds.has(normalizeSuiObjectId(coin.objectId)) && BigInt(coin.balance) > 0n).map((coin) => ({
     objectId: coin.objectId,
     version: coin.version,
@@ -463,7 +488,6 @@ async function loadSuiGasFunding(suiClient, owner, tx) {
     balance: BigInt(coin.balance)
   }));
   const coinBalance = paymentCoins.reduce((sum, coin) => sum + coin.balance, 0n);
-  const addressBalance = BigInt(balanceRes.balance.addressBalance);
   return {
     paymentCoins,
     coinBalance,
@@ -957,7 +981,7 @@ var MSafeAccount = class _MSafeAccount {
       balances.map(async (balance) => {
         const meta = await this.coinHelper.getCoinMeta(balance.coinType);
         return {
-          type: normalizeStructTag3(balance.coinType),
+          type: normalizeStructTag4(balance.coinType),
           balance: BigInt(balance.addressBalance),
           metadata: meta
         };