@msafe/sui3-sdk 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msafe/sui3-sdk",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "SDK for MSafe SUI V3",
   "type": "module",
   "module": "./dist/index.js",
@@ -32,8 +32,8 @@
     "@changesets/changelog-github": "^0.7.0",
     "@changesets/cli": "^2.31.0",
     "@msafe/mpay-sdk-sui": "^1.0.25",
-    "@msafe/sui-app-store": "0.0.338",
-    "@msafe/sui3-utils": "^5.0.8",
+    "@msafe/sui-app-store": "^0.0.357",
+    "@msafe/sui3-utils": "^5.1.0",
     "@mysten/sui": "^2.16.2",
     "@mysten/wallet-standard": "^0.20.3",
     "@types/jest": "^30.0.0",

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,
@@ -212,6 +246,44 @@ export async function selectGasFunding(input: {
  * cheaper payment path. Budget is left unset so Mysten can dry-run with MAX_GAS
  * overrides (avoids locking the full balance away from GasCoin splits).
  */
+/**
+ * Clone a tx with gas budget/payment/expiration cleared.
+ * Needed because Mysten treats budget "0" as set (truthy) and skips re-estimation,
+ * and app-store helper.build() often pre-builds with payment:[] + budget:"0".
+ */
+function cloneWithClearedGasConfig(tx: Transaction): Transaction {
+  const data = structuredClone(tx.getData()) as {
+    version: number;
+    sender: string | null;
+    expiration: unknown;
+    gasData: {
+      budget: string | null;
+      price: string | null;
+      owner: string | null;
+      payment: unknown;
+    };
+    inputs: unknown;
+    commands: unknown;
+  };
+  data.gasData.budget = null;
+  data.gasData.price = null;
+  data.gasData.payment = null;
+  // Address-balance gas bakes ValidDuring; clear so classic gas probe is valid.
+  data.expiration = null;
+  return Transaction.from(JSON.stringify(data));
+}
+
+function isPositiveBudget(budget: string | number | bigint | null | undefined): boolean {
+  if (budget == null) {
+    return false;
+  }
+  try {
+    return BigInt(budget) > 0n;
+  } catch {
+    return false;
+  }
+}
+
 export async function estimateGasBudget(input: {
   tx: Transaction;
   suiClient: SuiGrpcClient;
@@ -224,7 +296,11 @@ export async function estimateGasBudget(input: {
     throw new InsufficientGasFundsError(0n, funding.coinBalance, funding.addressBalance);
   }
 
-  const probe = Transaction.from(tx);
+  const { budget, payment } = tx.getData().gasData;
+  // app-store / Mysten pre-build can leave payment:[] with budget "0".
+  // Mysten's setGasBudget skips when budget is the string "0" (truthy), so clear first.
+  const mustResetGas = (payment != null && payment.length === 0) || (budget != null && !isPositiveBudget(budget));
+  const probe = mustResetGas ? cloneWithClearedGasConfig(tx) : Transaction.from(tx);
   probe.setSender(owner);
   probe.setGasPrice(gasPrice);
 
@@ -273,16 +349,27 @@ export async function prepareGasFunding(input: {
   // Never trust a budget baked into plain-tx / Mysten auto AB-gas txs.
   // Those budgets are often under-estimated for payment: [] and would skip
   // estimateGasBudget if we kept existingBudget.
+  // Also never trust budget "0" / 0n — Mysten treats "0" as set and skips resolve.
   let { gasBudget } = input;
+  if (gasBudget != null && gasBudget <= 0n) {
+    gasBudget = undefined;
+  }
+  const existingPositive = isPositiveBudget(existingBudget) ? BigInt(existingBudget as string) : null;
+
   if (gasBudget == null) {
-    if (bakedAddressBalanceGas || existingBudget == null) {
+    if (bakedAddressBalanceGas || existingPositive == null) {
       gasBudget = await estimateGasBudget({ tx, suiClient, owner, gasPrice });
     } else {
-      gasBudget = BigInt(existingBudget);
+      gasBudget = existingPositive;
     }
   }
 
   tx.setGasBudget(gasBudget);
+  // Drop ValidDuring from a prior address-balance pre-build; classic gas must not keep it,
+  // and AB gas will re-attach expiration during the final build when payment is [].
+  if (bakedAddressBalanceGas) {
+    tx.setExpiration(null);
+  }
   return selectGasFunding({ tx, suiClient, owner, gasBudget });
 }