@vultisig/core-mpc 1.12.0 → 1.12.1

package/dist/keysign/signingInputs/resolvers/solana/index.js

@@ -1,7 +1,10 @@
 import { Buffer } from 'buffer';
+import { assertSafeSolanaSwapTransactionBase64 } from '@vultisig/core-chain/chains/solana/assertSafeSolanaSwapInstructions';
 import { getCoinType } from '@vultisig/core-chain/coin/coinType';
+import { assertField } from '@vultisig/lib-utils/record/assertField';
 import { shouldBePresent } from '@vultisig/lib-utils/assert/shouldBePresent';
 import { matchRecordUnion } from '@vultisig/lib-utils/matchRecordUnion';
+import { PublicKey } from '@solana/web3.js';
 import { TW } from '@trustwallet/wallet-core';
 import { getBlockchainSpecificValue } from '../../../chainSpecific/KeysignChainSpecific.js';
 import { getKeysignSwapPayload } from '../../../swap/getKeysignSwapPayload.js';
@@ -11,27 +14,53 @@ export const getSolanaSigningInputs = ({ keysignPayload, walletCore }) => {
     const chain = getKeysignChain(keysignPayload);
     const { recentBlockHash } = getBlockchainSpecificValue(keysignPayload.blockchainSpecific, 'solanaSpecific');
     if (keysignPayload.signData.case === 'signSolana') {
-        const coinType = getCoinType({ walletCore, chain });
-        const inputs = keysignPayload.signData.value.rawTransactions.map(transaction => {
-            const decodedData = walletCore.TransactionDecoder.decode(coinType, Buffer.from(transaction, 'base64'));
-            const decodedTransaction = TW.Solana.Proto.DecodingTransactionOutput.decode(decodedData);
-            if (!decodedTransaction.transaction) {
-                throw new Error("Can't decode transaction");
-            }
-            const rawMessage = decodedTransaction.transaction;
-            return TW.Solana.Proto.SigningInput.create({
-                rawMessage,
-            });
-        });
-        return inputs;
+        // Handled upstream in getEncodedSigningInputs (sdk#1204): dApp raw
+        // transactions are signed over their ORIGINAL message bytes and never
+        // routed through TransactionDecoder + SigningInput.rawMessage — the
+        // WalletCore re-encode is not byte-identical for v0+ALT transactions
+        // and breaks mixed-vault co-signing (ios#4419, android#5223). Reaching
+        // this branch means a caller bypassed getEncodedSigningInputs; fail
+        // loud instead of silently re-introducing the divergent pre-image.
+        throw new Error('signSolana raw transactions are handled in getEncodedSigningInputs — do not resolve them into TW SigningInputs (sdk#1204)');
     }
     const swapPayload = getKeysignSwapPayload(keysignPayload);
     if (swapPayload) {
         return matchRecordUnion(swapPayload, {
             native: () => [getSolanaSendSigningInput({ keysignPayload, walletCore })],
-            general: swapPayload => {
+            general: async (swapPayload) => {
                 const tx = shouldBePresent(swapPayload.quote?.tx);
                 const { data } = tx;
+                // sdk#1358 fund-safety: re-run the Jupiter program allow-list + fund-movement guard HERE, on
+                // the co-signer signing-input path, not only at quote construction. Every co-signer (e.g.
+                // VultiServer in a 2-of-2) independently rebuilds this input from the shared KeysignPayload and
+                // signs it verbatim (only recentBlockhash is overwritten below), so a compromised initiator
+                // could otherwise slip a drain instruction into swapPayload.quote.tx.data that no co-signer ever
+                // validated. This is a PURE gate - it throws (fail-closed, like the Ripple resolver) or no-ops,
+                // and never touches the bytes that get signed, so it cannot desync the cross-device pre-signing
+                // hash. userWallet is the signing vault's own Solana address (coin.address).
+                //
+                // JUPITER-SCOPED on purpose: the allow-list (JUPITER_SWAP_ALLOWED_PROGRAM_IDS) is Jupiter's
+                // program set, and the only quote-time caller is getJupiterSwapQuote. LiFi and SwapKit also
+                // route Solana swaps (lifiSwapEnabledChains / swapKitEnabledChains include Chain.Solana) through
+                // Raydium/Orca/executor + fee-transfer instructions that are NOT in that set - guarding those
+                // here would fail-closed on a legitimate swap and brick the keysign. Mirrors the EVM arm, which
+                // only enforces the providers whose router is actually allow-listed.
+                //
+                // TRUST OF `provider` (same boundary the EVM arm documents in knownAggregatorRouters.ts): this
+                // is the free `provider` STRING on the OneInchSwapPayload proto, part of the attacker-influenceable
+                // payload, NOT a trusted oneof discriminant. So an attacker can embed a Jupiter tx in
+                // quote.tx.data but relabel `provider` to a non-jupiter value (or omit it -> '') to skip this
+                // guard. That is NOT a new bypass: this gate is MONOTONIC (throws or no-ops, never mutates the
+                // signed bytes), so skipping it merely degrades to the pre-#1358 state where no Solana
+                // signing-path guard ran at all - a payload that was unsignable before is not made signable. What
+                // the guard buys is defense against the realistic partial compromise the issue targets: a quote
+                // server/MITM that swaps quote.tx.data but leaves an honestly-declared `provider: 'jupiter'`
+                // intact. Complete co-signer protection would need a proto change (a distinct oneof case per
+                // provider) to key enforcement on the case rather than the string - out of scope, not a regression.
+                if (swapPayload.provider === 'jupiter') {
+                    const userWallet = new PublicKey(assertField(keysignPayload, 'coin').address);
+                    await assertSafeSolanaSwapTransactionBase64(data, userWallet);
+                }
                 const decodedData = walletCore.TransactionDecoder.decode(getCoinType({
                     walletCore,
                     chain,

package/dist/keysign/signingInputs/resolvers/solana/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/index.ts"],"names":[],"mappings":"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"}

package/dist/keysign/signingInputs/resolvers/solana/rawTx.d.ts

@@ -0,0 +1,52 @@
+/**
+ * dApp-supplied raw Solana transaction handling (sdk#1204).
+ *
+ * For `signData.signSolana` transactions we sign the message bytes directly
+ * instead of routing through `SolanaSigningInput.rawMessage` +
+ * `TransactionCompiler`. The round-trip through WalletCore's proto re-encoder
+ * is sensitive to WalletCore version differences between platforms — even a
+ * one-byte drift in the re-encoded message (v0 + address-lookup-table
+ * transactions are the known-risky shape) produces a different pre-image,
+ * which breaks Secure Vault co-signing: the other party computes a different
+ * hash, the setup-message equality check throws, and no TSS messages are ever
+ * emitted. For Solana, ed25519 signs the wire-format message verbatim, so
+ * extracting it directly is canonical and cross-platform safe.
+ *
+ * Byte-for-byte port of vultisig-ios#4419 (`Solana.swift`
+ * `extractSolanaMessageBytes` / `signRawTransaction`); Android sibling is
+ * vultisig-android#5223. Wire format of a serialized Solana transaction:
+ *
+ *   [shortvec(numSignatures)][numSignatures x 64-byte signature][message]
+ */
+export type ParsedSolanaRawTx = {
+    /** Byte offset of the first (fee payer, signer index 0) signature slot. */
+    firstSignatureOffset: number;
+    /** Declared signature-slot count from the shortvec envelope. */
+    numSignatures: number;
+    /** The Solana wire-format message bytes — the exact ed25519 pre-image. */
+    message: Uint8Array;
+};
+/**
+ * Strip the `[shortvec(numSigs)][numSigs x 64-byte sig]` envelope and return
+ * the underlying Solana message bytes plus the offset of the first signature
+ * slot (for later splice-in).
+ */
+export declare function extractSolanaMessageBytes(txData: Uint8Array): ParsedSolanaRawTx;
+/**
+ * Splice the 64-byte signature into the original transaction at signer
+ * index 0 (the dApp builds the tx with the user as fee payer == first
+ * signer; any other signature slots stay as the dApp-provided placeholders).
+ * Returns a new array — the input is not mutated.
+ *
+ * Assumes the vault is signer index 0. Byte-for-byte parity with
+ * vultisig-ios#4419, which makes the same assumption. A sponsored
+ * transaction (a relayer pays and is signer 0, the vault signs at index
+ * >= 1) would land the vault's signature in the wrong slot — not
+ * fund-unsafe (the signature still binds the exact message it was
+ * computed over, so a misplaced signature just fails Solana's runtime
+ * signature check), but the tx would be rejected on broadcast rather
+ * than land. No sponsored-tx path exists today; if one is added, this
+ * splice needs the vault's actual signer index, not a hardcoded 0.
+ */
+export declare function spliceSolanaSignature(txData: Uint8Array, signature: Uint8Array): Uint8Array;
+//# sourceMappingURL=rawTx.d.ts.map

package/dist/keysign/signingInputs/resolvers/solana/rawTx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rawTx.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/rawTx.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2EAA2E;IAC3E,oBAAoB,EAAE,MAAM,CAAA;IAC5B,gEAAgE;IAChE,aAAa,EAAE,MAAM,CAAA;IACrB,0EAA0E;IAC1E,OAAO,EAAE,UAAU,CAAA;CACpB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,iBAAiB,CA4B/E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,UAAU,CAW3F"}

package/dist/keysign/signingInputs/resolvers/solana/rawTx.js

@@ -0,0 +1,84 @@
+/**
+ * dApp-supplied raw Solana transaction handling (sdk#1204).
+ *
+ * For `signData.signSolana` transactions we sign the message bytes directly
+ * instead of routing through `SolanaSigningInput.rawMessage` +
+ * `TransactionCompiler`. The round-trip through WalletCore's proto re-encoder
+ * is sensitive to WalletCore version differences between platforms — even a
+ * one-byte drift in the re-encoded message (v0 + address-lookup-table
+ * transactions are the known-risky shape) produces a different pre-image,
+ * which breaks Secure Vault co-signing: the other party computes a different
+ * hash, the setup-message equality check throws, and no TSS messages are ever
+ * emitted. For Solana, ed25519 signs the wire-format message verbatim, so
+ * extracting it directly is canonical and cross-platform safe.
+ *
+ * Byte-for-byte port of vultisig-ios#4419 (`Solana.swift`
+ * `extractSolanaMessageBytes` / `signRawTransaction`); Android sibling is
+ * vultisig-android#5223. Wire format of a serialized Solana transaction:
+ *
+ *   [shortvec(numSignatures)][numSignatures x 64-byte signature][message]
+ */
+/**
+ * Strip the `[shortvec(numSigs)][numSigs x 64-byte sig]` envelope and return
+ * the underlying Solana message bytes plus the offset of the first signature
+ * slot (for later splice-in).
+ */
+export function extractSolanaMessageBytes(txData) {
+    let offset = 0;
+    let numSigs = 0;
+    let shift = 0;
+    // Solana compact-u16 (shortvec) decode: 7 bits per byte, high bit = continuation.
+    while (offset < txData.length) {
+        const byte = txData[offset];
+        numSigs |= (byte & 0x7f) << shift;
+        offset += 1;
+        if ((byte & 0x80) === 0)
+            break;
+        shift += 7;
+        if (shift > 14) {
+            throw new Error('Invalid shortvec for signature count');
+        }
+    }
+    if (numSigs < 1) {
+        throw new Error('Transaction declares no signatures');
+    }
+    const firstSignatureOffset = offset;
+    const messageOffset = offset + numSigs * 64;
+    if (messageOffset >= txData.length) {
+        throw new Error(`Transaction too short for declared signature count (${numSigs})`);
+    }
+    return {
+        firstSignatureOffset,
+        numSignatures: numSigs,
+        message: txData.slice(messageOffset),
+    };
+}
+/**
+ * Splice the 64-byte signature into the original transaction at signer
+ * index 0 (the dApp builds the tx with the user as fee payer == first
+ * signer; any other signature slots stay as the dApp-provided placeholders).
+ * Returns a new array — the input is not mutated.
+ *
+ * Assumes the vault is signer index 0. Byte-for-byte parity with
+ * vultisig-ios#4419, which makes the same assumption. A sponsored
+ * transaction (a relayer pays and is signer 0, the vault signs at index
+ * >= 1) would land the vault's signature in the wrong slot — not
+ * fund-unsafe (the signature still binds the exact message it was
+ * computed over, so a misplaced signature just fails Solana's runtime
+ * signature check), but the tx would be rejected on broadcast rather
+ * than land. No sponsored-tx path exists today; if one is added, this
+ * splice needs the vault's actual signer index, not a hardcoded 0.
+ */
+export function spliceSolanaSignature(txData, signature) {
+    if (signature.length !== 64) {
+        throw new Error(`Solana signature must be 64 bytes, got ${signature.length}`);
+    }
+    const { firstSignatureOffset } = extractSolanaMessageBytes(txData);
+    if (firstSignatureOffset + 64 > txData.length) {
+        throw new Error('Transaction too short to place signature');
+    }
+    const signedTx = new Uint8Array(txData);
+    signedTx.set(signature, firstSignatureOffset);
+    return signedTx;
+}
+//# sourceMappingURL=rawTx.js.map

package/dist/keysign/signingInputs/resolvers/solana/rawTx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rawTx.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/rawTx.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAWH;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAkB;IAC1D,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,kFAAkF;IAClF,OAAO,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;QAC3B,OAAO,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,CAAA;QACjC,MAAM,IAAI,CAAC,CAAA;QACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;YAAE,MAAK;QAC9B,KAAK,IAAI,CAAC,CAAA;QACV,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACzD,CAAC;IACH,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IACvD,CAAC;IACD,MAAM,oBAAoB,GAAG,MAAM,CAAA;IACnC,MAAM,aAAa,GAAG,MAAM,GAAG,OAAO,GAAG,EAAE,CAAA;IAC3C,IAAI,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,uDAAuD,OAAO,GAAG,CAAC,CAAA;IACpF,CAAC;IACD,OAAO;QACL,oBAAoB;QACpB,aAAa,EAAE,OAAO;QACtB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;KACrC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAkB,EAAE,SAAqB;IAC7E,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,0CAA0C,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;IAC/E,CAAC;IACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAClE,IAAI,oBAAoB,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;IAC7D,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;IACvC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;IAC7C,OAAO,QAAQ,CAAA;AACjB,CAAC"}

package/dist/keysign/signingInputs/resolvers/sui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/sui.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAInD,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CA0E5D,CAAA"}
+{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/sui.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAEnD,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CAmF5D,CAAA"}

package/dist/keysign/signingInputs/resolvers/sui.js

@@ -2,8 +2,8 @@ import { suiGasBudget } from '@vultisig/core-chain/chains/sui/config';
 import { TW } from '@trustwallet/wallet-core';
 import Long from 'long';
 import { getBlockchainSpecificValue } from '../../chainSpecific/KeysignChainSpecific.js';
+import { isNativeSuiCoin, isSameSuiCoinType, selectSuiGasObject, selectSuiInputCoins, suiNativeCoinType, } from '../../suiCoinSelection.js';
 import { getKeysignCoin } from '../../utils/getKeysignCoin.js';
-const suiContractAddress = '0x2::sui::SUI';
 export const getSuiSigningInputs = ({ keysignPayload }) => {
     const coin = getKeysignCoin(keysignPayload);
     // dApp-supplied PTBs (Sui Wallet Standard) arrive already BCS-serialized in
@@ -28,25 +28,31 @@ export const getSuiSigningInputs = ({ keysignPayload }) => {
         throw new Error('Sui transactions do not support a memo');
     }
     const { coins, referenceGasPrice, gasBudget } = getBlockchainSpecificValue(keysignPayload.blockchainSpecific, 'suicheSpecific');
-    const coinType = coin.id || suiContractAddress;
+    const coinType = coin.id || suiNativeCoinType;
     const createObjectRef = (coin) => TW.Sui.Proto.ObjectRef.create({
         objectDigest: coin.digest,
         objectId: coin.coinObjectId,
         version: Long.fromString(coin.version),
     });
-    const gasCoins = coins.filter(c => c.coinType === suiContractAddress).map(createObjectRef);
+    const gasBudgetAmount = gasBudget ? BigInt(gasBudget) : suiGasBudget;
     const baseInput = {
         referenceGasPrice: Long.fromString(referenceGasPrice),
         signer: coin.address,
-        gasBudget: gasBudget ? Long.fromString(gasBudget) : Long.fromBigInt(suiGasBudget),
+        gasBudget: Long.fromString(gasBudgetAmount.toString()),
     };
-    const inputCoins = coins.filter(c => c.coinType === coinType).map(createObjectRef);
+    const amount = BigInt(keysignPayload.toAmount || '0');
     if (coin.id) {
+        const tokenCoins = coins.filter(c => isSameSuiCoinType(c.coinType, coinType));
+        const inputCoins = selectSuiInputCoins(tokenCoins, amount).map(createObjectRef);
+        const gasObject = selectSuiGasObject(coins, gasBudgetAmount);
+        if (!gasObject) {
+            throw new Error('Non-native Sui token transaction requires at least one SUI coin for gas fees');
+        }
         return [
             TW.Sui.Proto.SigningInput.create({
                 ...baseInput,
                 pay: TW.Sui.Proto.Pay.create({
-                    gas: gasCoins[0],
+                    gas: createObjectRef(gasObject),
                     inputCoins: inputCoins,
                     recipients: [keysignPayload.toAddress],
                     amounts: [Long.fromString(keysignPayload.toAmount)],
@@ -54,6 +60,7 @@ export const getSuiSigningInputs = ({ keysignPayload }) => {
             }),
         ];
     }
+    const inputCoins = selectSuiInputCoins(coins.filter(isNativeSuiCoin), amount + gasBudgetAmount).map(createObjectRef);
     return [
         TW.Sui.Proto.SigningInput.create({
             ...baseInput,

package/dist/keysign/signingInputs/resolvers/sui.js.map

@@ -1 +1 @@
-{"version":3,"file":"sui.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/sui.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sui.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/sui.ts"],"names":[],"mappings":"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"}

package/dist/keysign/signingInputs/resolvers/ton/jetton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jetton.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/jetton.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAGhG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAMrD,KAAK,wBAAwB,GAAG;IAC9B,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,qEAKjC,wBAAwB,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAyBrD,CAAA"}
+{"version":3,"file":"jetton.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/jetton.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAEhG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAMrD,KAAK,wBAAwB,GAAG;IAC9B,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,qEAKjC,wBAAwB,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAyBrD,CAAA"}

package/dist/keysign/signingInputs/resolvers/ton/jetton.js

@@ -1,25 +1,23 @@
-import { Buffer } from 'buffer';
 import { tonConfig } from '@vultisig/core-chain/chains/ton/config';
 import { shouldBePresent } from '@vultisig/lib-utils/assert/shouldBePresent';
-import { numberToEvenHex } from '@vultisig/lib-utils/hex/numberToHex';
 import { TW } from '@trustwallet/wallet-core';
 import { getKeysignAmount } from '../../../utils/getKeysignAmount.js';
 import { getKeysignCoin } from '../../../utils/getKeysignCoin.js';
-import { toSafeComment } from './native.js';
+import { toSafeComment, tonAmountToBytes } from './native.js';
 export const buildJettonTransfer = ({ keysignPayload, walletCore, jettonAddress, isActiveDestination, }) => {
     const coin = getKeysignCoin(keysignPayload);
     const destinationAddress = walletCore.TONAddressConverter.toUserFriendly(keysignPayload.toAddress, true, false);
     const forwardAmount = isActiveDestination ? 1n : 0n;
     const jettonTransfer = TW.TheOpenNetwork.Proto.JettonTransfer.create({
-        jettonAmount: Buffer.from(numberToEvenHex(shouldBePresent(getKeysignAmount(keysignPayload))), 'hex'),
+        jettonAmount: tonAmountToBytes(shouldBePresent(getKeysignAmount(keysignPayload))),
         toOwner: destinationAddress,
         responseAddress: coin.address,
-        forwardAmount: Buffer.from(numberToEvenHex(forwardAmount), 'hex'),
+        forwardAmount: tonAmountToBytes(forwardAmount),
     });
     const mode = TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY | TW.TheOpenNetwork.Proto.SendMode.IGNORE_ACTION_PHASE_ERRORS;
     return TW.TheOpenNetwork.Proto.Transfer.create({
         dest: jettonAddress,
-        amount: Buffer.from(numberToEvenHex(tonConfig.jettonAmount), 'hex'),
+        amount: tonAmountToBytes(tonConfig.jettonAmount),
         bounceable: true,
         comment: toSafeComment(keysignPayload.memo ?? ''),
         mode,

package/dist/keysign/signingInputs/resolvers/ton/jetton.js.map

@@ -1 +1 @@
-{"version":3,"file":"jetton.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/jetton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAElE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAG7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AASxC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,cAAc,EACd,UAAU,EACV,aAAa,EACb,mBAAmB,GACM,EAAoC,EAAE;IAC/D,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAE3C,MAAM,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,CAAC,cAAc,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAE/G,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnD,MAAM,cAAc,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;QACnE,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;QACpG,OAAO,EAAE,kBAAkB;QAC3B,eAAe,EAAE,IAAI,CAAC,OAAO;QAC7B,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC;KAClE,CAAC,CAAA;IAEF,MAAM,IAAI,GACR,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,0BAA0B,CAAA;IAEpH,OAAO,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7C,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC;QACnE,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,IAAI;QACJ,cAAc;KACf,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"jetton.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/jetton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAElE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAG7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAS1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,cAAc,EACd,UAAU,EACV,aAAa,EACb,mBAAmB,GACM,EAAoC,EAAE;IAC/D,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAE3C,MAAM,kBAAkB,GAAG,UAAU,CAAC,mBAAmB,CAAC,cAAc,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAE/G,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnD,MAAM,cAAc,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;QACnE,YAAY,EAAE,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;QACjF,OAAO,EAAE,kBAAkB;QAC3B,eAAe,EAAE,IAAI,CAAC,OAAO;QAC7B,aAAa,EAAE,gBAAgB,CAAC,aAAa,CAAC;KAC/C,CAAC,CAAA;IAEF,MAAM,IAAI,GACR,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,0BAA0B,CAAA;IAEpH,OAAO,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7C,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC;QAChD,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,IAAI;QACJ,cAAc;KACf,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/keysign/signingInputs/resolvers/ton/native.d.ts

@@ -1,3 +1,4 @@
+import { Buffer } from 'buffer';
 import { KeysignPayload } from '@vultisig/core-mpc/types/vultisig/keysign/v1/keysign_message_pb';
 import { TW } from '@trustwallet/wallet-core';
 type BuildNativeTonTransferFromMessageInput = {
@@ -14,6 +15,7 @@ type BuildNativeTonTransferInput = {
 };
 export declare const toSafeComment: (payload: string) => string;
 export declare const validateTonComment: (memo: string) => void;
+export declare const tonAmountToBytes: (amount: string | bigint) => Buffer;
 export declare const buildNativeTonTransfer: ({ keysignPayload, bounceable, sendMaxAmount, }: BuildNativeTonTransferInput) => TW.TheOpenNetwork.Proto.Transfer;
 export declare const buildNativeTonTransferFromMessage: ({ to, amount, payload, stateInit, bounceable, }: BuildNativeTonTransferFromMessageInput) => TW.TheOpenNetwork.Proto.Transfer;
 export {};

package/dist/keysign/signingInputs/resolvers/ton/native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/native.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAEhG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAG7C,KAAK,sCAAsC,GAAG;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,KAAK,2BAA2B,GAAG;IACjC,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAOD,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,MAM/C,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,IAKjD,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,gDAIpC,2BAA2B,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAgBxD,CAAA;AAED,eAAO,MAAM,iCAAiC,GAAI,iDAM/C,sCAAsC,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAanE,CAAA"}
+{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAEhG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAE7C,KAAK,sCAAsC,GAAG;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,KAAK,2BAA2B,GAAG;IACjC,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAOD,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,MAM/C,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,IAKjD,CAAA;AAMD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,GAAG,MAAM,KAAG,MAuB1D,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,gDAIpC,2BAA2B,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAgBxD,CAAA;AAED,eAAO,MAAM,iCAAiC,GAAI,iDAM/C,sCAAsC,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAanE,CAAA"}

package/dist/keysign/signingInputs/resolvers/ton/native.js

@@ -1,7 +1,6 @@
 import { Buffer } from 'buffer';
 import { numberToEvenHex } from '@vultisig/lib-utils/hex/numberToHex';
 import { TW } from '@trustwallet/wallet-core';
-import Long from 'long';
 /** TON cell limit is 1023 bits; comment uses ~32 bits opcode + text. Max ~123 bytes. */
 const tonCommentMaxBytes = 123;
 const tonCommentTooLongError = `TON memo exceeds ${tonCommentMaxBytes} bytes and would be truncated; reject oversized memos upstream`;
@@ -18,15 +17,37 @@ export const validateTonComment = (memo) => {
         throw new Error(`TON memo must be at most ${tonCommentMaxBytes} bytes (got ${bytes.length})`);
     }
 };
+const tonUnsignedDecimalRegex = /^\d+$/;
+const tonMaxAmount = (1n << 120n) - 1n;
+const tonMaxAmountDecimal = tonMaxAmount.toString();
+export const tonAmountToBytes = (amount) => {
+    if (typeof amount === 'string' && !tonUnsignedDecimalRegex.test(amount)) {
+        throw new Error('TON amount must be a non-negative integer');
+    }
+    const normalizedAmount = typeof amount === 'string' ? amount.replace(/^0+(?=\d)/, '') : amount;
+    if (typeof normalizedAmount === 'string' &&
+        (normalizedAmount.length > tonMaxAmountDecimal.length ||
+            (normalizedAmount.length === tonMaxAmountDecimal.length && normalizedAmount > tonMaxAmountDecimal))) {
+        throw new Error('TON amount exceeds the VarUInteger 16 maximum');
+    }
+    const value = typeof normalizedAmount === 'bigint' ? normalizedAmount : BigInt(normalizedAmount);
+    if (value < 0n) {
+        throw new Error('TON amount must be a non-negative integer');
+    }
+    if (value > tonMaxAmount) {
+        throw new Error('TON amount exceeds the VarUInteger 16 maximum');
+    }
+    return Buffer.from(numberToEvenHex(value), 'hex');
+};
 export const buildNativeTonTransfer = ({ keysignPayload, bounceable, sendMaxAmount, }) => {
     const mode = (sendMaxAmount
         ? TW.TheOpenNetwork.Proto.SendMode.ATTACH_ALL_CONTRACT_BALANCE
         : TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY) |
         TW.TheOpenNetwork.Proto.SendMode.IGNORE_ACTION_PHASE_ERRORS;
-    const amount = sendMaxAmount ? Long.ZERO : Long.fromString(keysignPayload.toAmount);
+    const amount = sendMaxAmount ? 0n : keysignPayload.toAmount;
     return TW.TheOpenNetwork.Proto.Transfer.create({
         dest: keysignPayload.toAddress,
-        amount: Buffer.from(numberToEvenHex(amount), 'hex'),
+        amount: tonAmountToBytes(amount),
         bounceable,
         comment: toSafeComment(keysignPayload.memo || ''),
         mode,
@@ -36,7 +57,7 @@ export const buildNativeTonTransferFromMessage = ({ to, amount, payload = '', st
     const mode = TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY | TW.TheOpenNetwork.Proto.SendMode.IGNORE_ACTION_PHASE_ERRORS;
     return TW.TheOpenNetwork.Proto.Transfer.create({
         dest: to,
-        amount: Buffer.from(numberToEvenHex(Long.fromString(amount)), 'hex'),
+        amount: tonAmountToBytes(amount),
         bounceable,
         comment: '',
         customPayload: payload || undefined,

package/dist/keysign/signingInputs/resolvers/ton/native.js.map

@@ -1 +1 @@
-{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/native.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/native.ts"],"names":[],"mappings":"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"}

package/dist/keysign/suiCoinSelection.d.ts

@@ -0,0 +1,20 @@
+import { SuiCoin } from '../types/vultisig/keysign/v1/blockchain_specific_pb.js';
+export declare const suiNativeCoinType = "0x2::sui::SUI";
+export declare const maxSuiInputCoinObjects = 255;
+export declare const suiGasCandidateObjectCount = 5;
+export declare const normalizeSuiCoinType: (coinType: string) => string;
+export declare const isSameSuiCoinType: (lhs: string, rhs: string) => boolean;
+export declare const isNativeSuiCoin: ({ coinType }: Pick<SuiCoin, "coinType">) => boolean;
+export declare const getSuiCoinBalance: ({ balance }: Pick<SuiCoin, "balance">) => bigint;
+export declare const selectSuiInputCoins: (coins: readonly SuiCoin[], target: bigint, maxObjects?: number) => SuiCoin[];
+export declare const selectSuiGasObject: (coins: readonly SuiCoin[], gasBudget: bigint) => SuiCoin | undefined;
+type SelectSuiPayloadCoinsInput = {
+    coins: readonly SuiCoin[];
+    isNativeToken: boolean;
+    coinType?: string;
+    amount: bigint;
+    gasBudget: bigint;
+};
+export declare const selectSuiPayloadCoins: ({ coins, isNativeToken, coinType, amount, gasBudget, }: SelectSuiPayloadCoinsInput) => SuiCoin[];
+export {};
+//# sourceMappingURL=suiCoinSelection.d.ts.map

package/dist/keysign/suiCoinSelection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"suiCoinSelection.d.ts","sourceRoot":"","sources":["../../../../../packages/core/mpc/keysign/suiCoinSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qDAAqD,CAAA;AAE7E,eAAO,MAAM,iBAAiB,kBAAkB,CAAA;AAEhD,eAAO,MAAM,sBAAsB,MAAM,CAAA;AACzC,eAAO,MAAM,0BAA0B,IAAI,CAAA;AAS3C,eAAO,MAAM,oBAAoB,GAAI,UAAU,MAAM,KAAG,MAOvD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,KAAG,OACJ,CAAA;AAEzD,eAAO,MAAM,eAAe,GAAI,cAAc,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAG,OAC1B,CAAA;AAEhD,eAAO,MAAM,iBAAiB,GAAI,aAAa,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,KAAG,MAMzE,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,OAAO,SAAS,OAAO,EAAE,EACzB,QAAQ,MAAM,EACd,mBAAmC,KAClC,OAAO,EA0BT,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,SAAS,OAAO,EAAE,EAAE,WAAW,MAAM,KAAG,OAAO,GAAG,SAkB3F,CAAA;AAED,KAAK,0BAA0B,GAAG;IAChC,KAAK,EAAE,SAAS,OAAO,EAAE,CAAA;IACzB,aAAa,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,wDAMnC,0BAA0B,KAAG,OAAO,EAuBtC,CAAA"}

package/dist/keysign/suiCoinSelection.js

@@ -0,0 +1,88 @@
+export const suiNativeCoinType = '0x2::sui::SUI';
+export const maxSuiInputCoinObjects = 255;
+export const suiGasCandidateObjectCount = 5;
+const normalizeSuiAddress = (address) => {
+    const lowered = address.toLowerCase();
+    const hex = lowered.startsWith('0x') ? lowered.slice(2) : lowered;
+    const trimmed = hex.replace(/^0+/, '');
+    return `0x${trimmed || '0'}`;
+};
+export const normalizeSuiCoinType = (coinType) => {
+    const addressEnd = coinType.indexOf('::');
+    if (addressEnd < 0) {
+        return normalizeSuiAddress(coinType);
+    }
+    return `${normalizeSuiAddress(coinType.slice(0, addressEnd))}${coinType.slice(addressEnd)}`;
+};
+export const isSameSuiCoinType = (lhs, rhs) => normalizeSuiCoinType(lhs) === normalizeSuiCoinType(rhs);
+export const isNativeSuiCoin = ({ coinType }) => isSameSuiCoinType(coinType, suiNativeCoinType);
+export const getSuiCoinBalance = ({ balance }) => {
+    try {
+        return BigInt(balance || '0');
+    }
+    catch {
+        return 0n;
+    }
+};
+export const selectSuiInputCoins = (coins, target, maxObjects = maxSuiInputCoinObjects) => {
+    const sorted = [...coins].sort((lhs, rhs) => {
+        const lhsBalance = getSuiCoinBalance(lhs);
+        const rhsBalance = getSuiCoinBalance(rhs);
+        if (lhsBalance !== rhsBalance) {
+            return lhsBalance > rhsBalance ? -1 : 1;
+        }
+        return lhs.coinObjectId.localeCompare(rhs.coinObjectId);
+    });
+    const selected = [];
+    let accumulated = 0n;
+    for (const coin of sorted) {
+        if (selected.length > 0 && accumulated >= target)
+            break;
+        if (selected.length >= maxObjects)
+            break;
+        selected.push(coin);
+        accumulated += getSuiCoinBalance(coin);
+    }
+    if (accumulated < target) {
+        throw new Error(`Insufficient Sui coin balance to cover ${target.toString()}`);
+    }
+    return selected;
+};
+export const selectSuiGasObject = (coins, gasBudget) => {
+    const nativeCoins = coins.filter(isNativeSuiCoin);
+    if (nativeCoins.length === 0)
+        return undefined;
+    const covering = nativeCoins.filter(coin => getSuiCoinBalance(coin) >= gasBudget);
+    if (covering.length > 0) {
+        return covering.sort((lhs, rhs) => {
+            const lhsBalance = getSuiCoinBalance(lhs);
+            const rhsBalance = getSuiCoinBalance(rhs);
+            if (lhsBalance !== rhsBalance) {
+                return lhsBalance < rhsBalance ? -1 : 1;
+            }
+            return lhs.coinObjectId.localeCompare(rhs.coinObjectId);
+        })[0];
+    }
+    throw new Error(`Insufficient SUI balance to cover gas budget ${gasBudget.toString()}`);
+};
+export const selectSuiPayloadCoins = ({ coins, isNativeToken, coinType, amount, gasBudget, }) => {
+    const nativeCoins = coins.filter(isNativeSuiCoin);
+    if (isNativeToken) {
+        return selectSuiInputCoins(nativeCoins, amount + gasBudget);
+    }
+    const tokenType = coinType || suiNativeCoinType;
+    const tokenCoins = coins.filter(coin => isSameSuiCoinType(coin.coinType, tokenType));
+    const selectedTokens = selectSuiInputCoins(tokenCoins, amount);
+    const gasCandidates = [...nativeCoins]
+        .sort((lhs, rhs) => {
+        const lhsBalance = getSuiCoinBalance(lhs);
+        const rhsBalance = getSuiCoinBalance(rhs);
+        if (lhsBalance !== rhsBalance) {
+            return lhsBalance > rhsBalance ? -1 : 1;
+        }
+        return lhs.coinObjectId.localeCompare(rhs.coinObjectId);
+    })
+        .slice(0, suiGasCandidateObjectCount);
+    return [...selectedTokens, ...gasCandidates];
+};
+//# sourceMappingURL=suiCoinSelection.js.map

package/dist/keysign/suiCoinSelection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"suiCoinSelection.js","sourceRoot":"","sources":["../../../../../packages/core/mpc/keysign/suiCoinSelection.ts"],"names":[],"mappings":"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"}