@mysten/sui 2.14.1 → 2.16.0

package/src/transactions/intents/CoinWithBalance.ts

@@ -140,6 +140,12 @@ export async function resolveCoinBalance(
 		intentsByType.get(type)!.push({ balance, outputKind: outputKind ?? 'coin' });
 	}
 
+	if (totalByType.has('gas') && totalByType.has(SUI_TYPE)) {
+		throw new Error(
+			'Cannot mix SUI CoinWithBalance intents that use the gas coin with ones that do not (useGasCoin: false). Use one or the other.',
+		);
+	}
+
 	const usedIds = new Set<string>();
 
 	for (const input of transactionData.inputs) {
@@ -188,6 +194,7 @@ export async function resolveCoinBalance(
 
 	const mergedCoins = new Map<string, Argument>();
 	const exactBalanceByType = new Map<string, boolean>();
+	const usedAddressBalance = new Set<string>();
 
 	// Per-type state for Path 2 combined splits
 	type TypeState = { results: Argument[]; nextIntent: number };
@@ -251,7 +258,31 @@ export async function resolveCoinBalance(
 				// Step 1: Build sources and merge
 				const sources: Argument[] = [];
 
-				if (type === 'gas') {
+				if (addressBalance >= totalRequired) {
+					// AB sufficient — source entirely from address balance, no coins needed.
+					usedAddressBalance.add(type);
+
+					commands.push(
+						TransactionCommands.MoveCall({
+							target: '0x2::coin::redeem_funds',
+							typeArguments: [coinType],
+							arguments: [
+								transactionData.addInput(
+									'withdrawal',
+									Inputs.FundsWithdrawal({
+										reservation: {
+											$kind: 'MaxAmountU64',
+											MaxAmountU64: String(totalRequired),
+										},
+										typeArg: { $kind: 'Balance', Balance: coinType },
+										withdrawFrom: { $kind: 'Sender', Sender: true },
+									}),
+								),
+							],
+						}),
+					);
+					sources.push({ $kind: 'Result', Result: index + commands.length - 1 });
+				} else if (type === 'gas') {
 					sources.push({ $kind: 'GasCoin', GasCoin: true });
 				} else {
 					const coins = coinsByType.get(type)!;
@@ -275,6 +306,7 @@ export async function resolveCoinBalance(
 					}
 
 					if (abNeeded > 0n) {
+						usedAddressBalance.add(type);
 						commands.push(
 							TransactionCommands.MoveCall({
 								target: '0x2::coin::redeem_funds',
@@ -363,17 +395,20 @@ export async function resolveCoinBalance(
 
 	// Step 3: Remainder handling
 	for (const [type, mergedCoin] of mergedCoins) {
-		if (type === 'gas') continue;
+		// When gas type used GasCoin (not AB), leftover stays in the gas coin — no remainder needed.
+		if (type === 'gas' && !usedAddressBalance.has(type)) continue;
 
+		const coinType = type === 'gas' ? SUI_TYPE : type;
 		const hasBalanceIntent = intentsByType.get(type)?.some((i) => i.outputKind === 'balance');
+		const sourcedFromAB = usedAddressBalance.has(type);
 
-		if (hasBalanceIntent) {
-			// Balance intents exist: send remainder coin back to sender's address balance.
+		if (hasBalanceIntent || sourcedFromAB) {
+			// Sourced from AB or balance intents exist: send remainder back to sender's address balance.
 			// coin::send_funds is gasless-eligible and handles zero amounts.
 			transactionData.commands.push(
 				TransactionCommands.MoveCall({
 					target: '0x2::coin::send_funds',
-					typeArguments: [type],
+					typeArguments: [coinType],
 					arguments: [
 						mergedCoin,
 						transactionData.addInput(
@@ -388,7 +423,7 @@ export async function resolveCoinBalance(
 			transactionData.commands.push(
 				TransactionCommands.MoveCall({
 					target: '0x2::coin::destroy_zero',
-					typeArguments: [type],
+					typeArguments: [coinType],
 					arguments: [mergedCoin],
 				}),
 			);

package/src/utils/format.ts

@@ -1,6 +1,8 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+import { SUI_DECIMALS } from './constants.js';
+
 const ELLIPSIS = '\u{2026}';
 
 export function formatAddress(address: string) {
@@ -17,3 +19,37 @@ export function formatDigest(digest: string) {
 	// Use 10 first characters
 	return `${digest.slice(0, 10)}${ELLIPSIS}`;
 }
+
+const AMOUNT_REGEX = /^-?(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+)$/;
+
+/** Parse a decimal string into its smallest-unit bigint representation. No floating point. */
+export function parseToUnits(amount: string, decimals: number): bigint {
+	if (decimals < 0 || !Number.isInteger(decimals)) {
+		throw new Error(`Invalid decimals: ${decimals}`);
+	}
+
+	if (!AMOUNT_REGEX.test(amount)) {
+		throw new Error(`Invalid amount: "${amount}"`);
+	}
+
+	const negative = amount.startsWith('-');
+	const stripped = negative ? amount.slice(1) : amount;
+
+	const [whole, fraction = ''] = stripped.split('.');
+
+	if (fraction.length > decimals) {
+		throw new Error(
+			`Too many decimal places: "${amount}" has ${fraction.length} but max is ${decimals}`,
+		);
+	}
+
+	const paddedFraction = fraction.padEnd(decimals, '0') || '0';
+	const result = BigInt(whole || '0') * 10n ** BigInt(decimals) + BigInt(paddedFraction);
+
+	return negative ? -result : result;
+}
+
+/** Parse a SUI decimal string into MIST. */
+export function parseToMist(amount: string): bigint {
+	return parseToUnits(amount, SUI_DECIMALS);
+}

package/src/utils/index.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-export { formatAddress, formatDigest } from './format.js';
+export { formatAddress, formatDigest, parseToUnits, parseToMist } from './format.js';
 export {
 	isValidStructTag,
 	isValidSuiAddress,

package/src/version.ts

@@ -3,5 +3,5 @@
 
 // This file is generated by genversion.mjs. Do not edit it directly.
 
-export const PACKAGE_VERSION = '2.14.1';
-export const TARGETED_RPC_VERSION = '1.70.0';
+export const PACKAGE_VERSION = '2.16.0';
+export const TARGETED_RPC_VERSION = '1.71.0';