@msafe/sui3-sdk 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msafe/sui3-sdk",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "SDK for MSafe SUI V3",
   "type": "module",
   "module": "./dist/index.js",

package/src/core/MSafeAccount.ts

@@ -340,15 +340,9 @@ export class MSafeAccount {
       throw new Error('Already rejected');
     }
 
+    // API independently rebuilds via buildRejectTxb() + build() and compares digest.
+    // Do not set gas / prepareGasFunding here — that changes payment and breaks the check.
     const rejectTxb = toSuiTransaction(buildRejectTxb(this.address));
-    rejectTxb.setGasPrice(input.gasPrice);
-    await prepareGasFunding({
-      tx: rejectTxb,
-      suiClient: this.suiClient,
-      owner: this.address,
-      gasPrice: input.gasPrice,
-      gasBudget: input.gasBudget,
-    });
     const digest = await rejectTxb.getDigest({ client: this.suiClient });
     const payload = await rejectTxb.build({ client: this.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });

package/src/utils/gasFunding.ts

@@ -1,7 +1,7 @@
 import type { SuiClientTypes } from '@mysten/sui/client';
 import type { SuiGrpcClient } from '@mysten/sui/grpc';
 import { Transaction } from '@mysten/sui/transactions';
-import { normalizeSuiObjectId } from '@mysten/sui/utils';
+import { normalizeStructTag, normalizeSuiObjectId } from '@mysten/sui/utils';
 
 import { createCoinReservationRef } from '@/utils/coinReservation';
 import { getAllCoins, SUI_COIN } from '@/utils/sui';
@@ -73,6 +73,29 @@ function collectUsedObjectIds(tx: Transaction): Set<string> {
   }, new Set<string>());
 }
 
+/**
+ * Mysten CoinWithBalance with useGasCoin=false (type is 0x2::sui::SUI, not "gas")
+ * loads every unused SUI coin as a mutable input at resolve time. Those coins
+ * cannot also be gas payment or the node rejects:
+ * "Mutable object ... cannot appear more than one in one transaction".
+ */
+function txConsumesOwnedSuiCoins(tx: Transaction): boolean {
+  return tx.getData().commands.some((cmd) => {
+    if (cmd.$kind !== '$Intent' || cmd.$Intent.name !== 'CoinWithBalance') {
+      return false;
+    }
+    const type = (cmd.$Intent.data as { type?: string } | undefined)?.type;
+    if (!type || type === 'gas') {
+      return false;
+    }
+    try {
+      return normalizeStructTag(type) === normalizeStructTag(SUI_COIN);
+    } catch {
+      return false;
+    }
+  });
+}
+
 async function loadSuiGasFunding(suiClient: SuiGrpcClient, owner: string, tx: Transaction): Promise<SuiGasFunding> {
   const usedObjectIds = collectUsedObjectIds(tx);
   const [coins, balanceRes] = await Promise.all([
@@ -80,6 +103,18 @@ async function loadSuiGasFunding(suiClient: SuiGrpcClient, owner: string, tx: Tr
     suiClient.getBalance({ owner, coinType: SUI_COIN }),
   ]);
 
+  const addressBalance = BigInt(balanceRes.balance.addressBalance);
+
+  // Intent will take every owned SUI coin at resolve time — leave them off gas payment.
+  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) => ({
@@ -90,7 +125,6 @@ async function loadSuiGasFunding(suiClient: SuiGrpcClient, owner: string, tx: Tr
     }));
 
   const coinBalance = paymentCoins.reduce((sum, coin) => sum + coin.balance, 0n);
-  const addressBalance = BigInt(balanceRes.balance.addressBalance);
   return {
     paymentCoins,
     coinBalance,