@vultisig/core-mpc 3.0.1 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # @vultisig/core-mpc
 
+## 3.2.0
+
+### Minor Changes
+
+- [#2328](https://github.com/vultisig/vultisig-sdk/pull/2328) [`741272f`](https://github.com/vultisig/vultisig-sdk/commit/741272f8d3872afdf12d9487d2121dee04c2f363) Thanks [@Ehsan-saradar](https://github.com/Ehsan-saradar)! - Carry a native swap's price impact in the keysign payload, so a co-signer can show it.
+
+  A device joining a keysign renders its swap verify screen entirely from the `KeysignPayload` — it holds no quote. Price impact was never on the wire, so the initiator showed a `Price Impact` row and the joining device showed nothing, on the screen whose purpose is for both parties to confirm they are approving the same swap.
+
+  `THORChainSwapPayload` gains `optional uint32 slippage_bps = 14` (vultisig/commondata#104), and `nativeSwapQuoteToSwapPayload` populates it from `quote.fees.slippage_bps`. MayaChain shares the message, so one field covers both native swap chains.
+
+  The value is carried rather than re-derived on the joiner. A joining device has enough in the payload to rebuild the quote request, but pools move between initiating and joining, so a fresh quote returns a different figure — price impact would become the only term on that screen where the two devices legitimately disagree.
+
+  The field is optional and left unset when the provider reports no slippage. Payloads from senders that predate it round-trip unchanged, and receivers are expected to hide the row rather than read an absent figure as zero.
+
+- [#2325](https://github.com/vultisig/vultisig-sdk/pull/2325) [`7c95286`](https://github.com/vultisig/vultisig-sdk/commit/7c9528622702a1e6f10cd5ff72017779d25e509a) Thanks [@Ehsan-saradar](https://github.com/Ehsan-saradar)! - EVM fee quotes now size the gas reserve from the transaction itself instead of a flat 600k floor. An aggregator swap is signed with the larger of the route's own gas and 1.5x its simulation (1.5x the 600k default when it cannot be simulated, e.g. a token route quoted before its allowance exists); a THORChain or Maya swap deposit (any transaction carrying the native swap payload) takes a fixed 120k; a plain transfer, including a memo-carrying vault deposit that carries no swap payload, takes its simulation raised to a per-chain floor with no inflation (when it cannot be simulated, that floor plus the intrinsic cost of its memo calldata); a dApp or other contract call keeps 1.5x headroom over its simulation. Base-fee headroom drops from 50% to 20% (32% for swaps), legacy-priced chains (BSC) are priced from `eth_gasPrice` with no tip, and the tip is the highest recent 5th-percentile reward from `eth_feeHistory`, capped at the gas price, with per-chain floors (1 gwei on tip-auction chains, 30 gwei on Polygon, 20 wei on OP-stack rollups) and a zero tip on Arbitrum, Mantle and Robinhood.
+
+  `getEvmFeeQuote`'s `minimumGasLimit` now only raises the value that stands in for a failed simulation and never a successful estimate. `getEvmTransferGasLimit`, `getEvmContractCallGasLimit` and `evmRouterDepositGasLimit` are exported from `@vultisig/core-chain/tx/fee/evm/evmGasLimit`, and `getEvmGasPrice` from `@vultisig/core-chain/tx/fee/evm/gasPrice`.
+
+- [#2331](https://github.com/vultisig/vultisig-sdk/pull/2331) [`982d464`](https://github.com/vultisig/vultisig-sdk/commit/982d4645467272f32e33a2df20883c1a7171a7ee) Thanks [@Ehsan-saradar](https://github.com/Ehsan-saradar)! - Publish the SwapKit swap-fee work to the core packages that hold it. [#2315](https://github.com/vultisig/vultisig-sdk/issues/2315) landed
+  `swap_fee` on `SwapKitSwapPayload`, the `getKeysignSwapFeeFields` reader, and the
+  `sub_provider` route tag in `@vultisig/core-mpc`, plus the transfer-route fee
+  resolution in `@vultisig/core-chain` — but its changeset named only
+  `@vultisig/sdk`, so neither core package was versioned and the release skipped
+  both. Clients that consume `@vultisig/core-mpc` directly, rather than through
+  `@vultisig/sdk`, cannot reach the new fee group or its reader until these are
+  republished.
+
+### Patch Changes
+
+- Updated dependencies [[`7c95286`](https://github.com/vultisig/vultisig-sdk/commit/7c9528622702a1e6f10cd5ff72017779d25e509a), [`2e1ed70`](https://github.com/vultisig/vultisig-sdk/commit/2e1ed704ccd0a360eaf760f1258c7cd8a4401e22), [`741272f`](https://github.com/vultisig/vultisig-sdk/commit/741272f8d3872afdf12d9487d2121dee04c2f363), [`982d464`](https://github.com/vultisig/vultisig-sdk/commit/982d4645467272f32e33a2df20883c1a7171a7ee), [`95cf397`](https://github.com/vultisig/vultisig-sdk/commit/95cf39722b8a4d3e197b26bcef9983ecef6c3703)]:
+  - @vultisig/core-chain@5.3.0
+
+## 3.1.0
+
+### Minor Changes
+
+- [#2299](https://github.com/vultisig/vultisig-sdk/pull/2299) [`bcca32c`](https://github.com/vultisig/vultisig-sdk/commit/bcca32c885066e2bf224aa37d6666c68a3684956) Thanks [@Ehsan-saradar](https://github.com/Ehsan-saradar)! - feat(ton): W5 (wallet v5r1) support as an explicit per-account opt-in
+
+  Every Vultisig TON account has been hard-pinned to the V4R2 wallet contract. W5 is the default for new wallets in Tonkeeper and Telegram Wallet and is the gateway to what users now expect from TON — up to 255 messages per request instead of 4, lower fees, and relayer-paid ("gasless") transactions. WalletCore has supported it for a while; nothing here used it.
+
+  A W5 wallet is a _different address_ for the same key, with its own balance, so this is not a switch: V4R2 stays the default everywhere and W5 is selected per account.
+
+  - `@vultisig/core-chain/chains/ton/wallet` (new): `TonWalletVersion` (`'v4r2' | 'v5r1'`), `deriveTonAddress` for either contract, `resolveTonWalletVersion` to tell which contract an address is for a key, the W5 mainnet wallet id, and the per-contract message limits.
+  - `vault.setTonWalletVersion('v5r1')` selects which of the key's two TON accounts the vault acts on: `send`, balances, swaps, fee estimation and every other address lookup follow it, so one selected account is used consistently. `vault.address(chain, { tonWalletVersion })` — like `deriveAddress` / `getChainAddress` / `deriveAddressFromKeys` — names a contract for a single lookup without changing the selection, so a client can show both accounts side by side for a migration flow.
+  - Balance cache keys name a chain and an asset, not an account, so switching between the two accounts drops the balance scope and any fetch already in flight for the old account is neither cached nor announced: it still answers its own caller, but `balanceUpdated` carries no account identity, so emitting it after a switch would credit the old account's balance to the new one.
+  - The keysign signing-input resolver derives the contract from the sender address — the payload has no wallet-version field, and every co-signer reaches the same answer from the shared vault key — and refuses an address that is neither of the key's wallets rather than assuming V4R2. W5 requests carry `IGNORE_ACTION_PHASE_ERRORS`, which the W5 code requires of every external action (its replay protection) and WalletCore enforces; the TON status resolver's action-phase check covers the blindness that flag would otherwise cause. Message counts are capped per contract.
+  - The RN-safe builders (`buildTonSendTx`, `buildTonJettonTransferTx`, `buildTonTxFromSigningPayload`, `deriveTonAddress`, `prepareJettonTransferTxFromKeys`) take `walletVersion`; W5 uses the `signed_external` request layout with the signature appended, byte-identical to WalletCore. New `buildV5R1Wallet` / `TON_V5R1_WALLET_ID` alongside the V4R2 helpers.
+
+  Golden vectors (`testdata/cross-encoder-golden/ton-w5-*.json`) pin the W5 pre-images and are verified against real WalletCore, including the full signed external message. Client-side migration UI (show both accounts, move funds, reconnect dApps) is separate work per platform.
+
+### Patch Changes
+
+- Updated dependencies [[`a5def09`](https://github.com/vultisig/vultisig-sdk/commit/a5def098e06cf7269174eb6840dc516d78ec55f9), [`bcca32c`](https://github.com/vultisig/vultisig-sdk/commit/bcca32c885066e2bf224aa37d6666c68a3684956)]:
+  - @vultisig/core-chain@5.2.0
+
 ## 3.0.1
 
 ### Patch Changes

package/dist/keysign/chainSpecific/resolvers/evm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/evm.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAEtD,eAAO,MAAM,mBAAmB,EAAE,wBAAwB,CAAC,kBAAkB,CAsD5E,CAAA"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/evm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAEtD,eAAO,MAAM,mBAAmB,EAAE,wBAAwB,CAAC,kBAAkB,CAsC5E,CAAA"}

package/dist/keysign/chainSpecific/resolvers/evm.js

@@ -1,9 +1,7 @@
 import { create } from '@bufbuild/protobuf';
 import { getEvmClient } from '@vultisig/core-chain/chains/evm/client';
-import { deriveEvmGasLimit } from '@vultisig/core-chain/tx/fee/evm/evmGasLimit';
 import { getEvmFeeQuote } from '@vultisig/core-mpc/keysign/fee/resolvers/evm/getEvmFeeQuote';
 import { EthereumSpecificSchema } from '@vultisig/core-mpc/types/vultisig/keysign/v1/blockchain_specific_pb';
-import { getKeysignSwapPayload } from '../../swap/getKeysignSwapPayload.js';
 import { getKeysignCoin } from '../../utils/getKeysignCoin.js';
 export const getEvmChainSpecific = async ({ keysignPayload, feeSettings, thirdPartyGasLimitEstimation, }) => {
     const coin = getKeysignCoin(keysignPayload);
@@ -24,24 +22,10 @@ export const getEvmChainSpecific = async ({ keysignPayload, feeSettings, thirdPa
         }
     };
     const nonce = BigInt(await getNonce());
-    const getData = () => {
-        const swapPayload = getKeysignSwapPayload(keysignPayload);
-        if (swapPayload && 'general' in swapPayload) {
-            const value = swapPayload.general.quote?.tx?.data;
-            if (value) {
-                return value;
-            }
-        }
-        return keysignPayload.memo;
-    };
     const { gasLimit, baseFeePerGas, maxPriorityFeePerGas } = await getEvmFeeQuote({
         keysignPayload,
         feeSettings,
         thirdPartyGasLimitEstimation,
-        minimumGasLimit: deriveEvmGasLimit({
-            coin,
-            data: getData(),
-        }),
     });
     const maxFeePerGas = baseFeePerGas + maxPriorityFeePerGas;
     return create(EthereumSpecificSchema, {

package/dist/keysign/chainSpecific/resolvers/evm.js.map

@@ -1 +1 @@
-{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,6DAA6D,CAAA;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qEAAqE,CAAA;AAE5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAG3D,MAAM,CAAC,MAAM,mBAAmB,GAAiD,KAAK,EAAE,EACtF,cAAc,EACd,WAAW,EACX,4BAA4B,GAC7B,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,cAAc,CAAW,cAAc,CAAC,CAAA;IACrD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAC/B,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAElC,wEAAwE;IACxE,kEAAkE;IAClE,wEAAwE;IACxE,wEAAwE;IACxE,4EAA4E;IAC5E,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,OAAwB,EAAE,CAAA;QACpD,IAAI,CAAC;YACH,OAAO,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;QAC7E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC,mBAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAA;IAEtC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,WAAW,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAA;QACzD,IAAI,WAAW,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAA;YACjD,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC,IAAI,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,EAAE,GAAG,MAAM,cAAc,CAAC;QAC7E,cAAc;QACd,WAAW;QACX,4BAA4B;QAC5B,eAAe,EAAE,iBAAiB,CAAC;YACjC,IAAI;YACJ,IAAI,EAAE,OAAO,EAAE;SAChB,CAAC;KACH,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,aAAa,GAAG,oBAAoB,CAAA;IAEzD,OAAO,MAAM,CAAC,sBAAsB,EAAE;QACpC,KAAK;QACL,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE;QACxC,WAAW,EAAE,oBAAoB,CAAC,QAAQ,EAAE;QAC5C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;KAC9B,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,6DAA6D,CAAA;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qEAAqE,CAAA;AAE5G,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAG3D,MAAM,CAAC,MAAM,mBAAmB,GAAiD,KAAK,EAAE,EACtF,cAAc,EACd,WAAW,EACX,4BAA4B,GAC7B,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,cAAc,CAAW,cAAc,CAAC,CAAA;IACrD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAC/B,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAElC,wEAAwE;IACxE,kEAAkE;IAClE,wEAAwE;IACxE,wEAAwE;IACxE,4EAA4E;IAC5E,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,OAAwB,EAAE,CAAA;QACpD,IAAI,CAAC;YACH,OAAO,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;QAC7E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC,mBAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAA;IAEtC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,EAAE,GAAG,MAAM,cAAc,CAAC;QAC7E,cAAc;QACd,WAAW;QACX,4BAA4B;KAC7B,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,aAAa,GAAG,oBAAoB,CAAA;IAEzD,OAAO,MAAM,CAAC,sBAAsB,EAAE;QACpC,KAAK;QACL,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE;QACxC,WAAW,EAAE,oBAAoB,CAAC,QAAQ,EAAE;QAC5C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;KAC9B,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/keysign/fee/resolvers/evm/getEvmFeeQuote.d.ts

@@ -8,7 +8,12 @@ type EvmFeeQuote = {
 type GetEvmFeeQuoteInput = {
     keysignPayload: KeysignPayload;
     feeSettings?: FeeSettings<'evm'>;
+    /** Gas limit the transaction's author (a dApp, an aggregator route) asks for. */
     thirdPartyGasLimitEstimation?: bigint;
+    /**
+     * Extra floor on the value that stands in for a failed simulation. Never
+     * raises a successful estimate.
+     */
     minimumGasLimit?: bigint;
 };
 export declare const getEvmFeeQuote: ({ keysignPayload, feeSettings, thirdPartyGasLimitEstimation, minimumGasLimit, }: GetEvmFeeQuoteInput) => Promise<EvmFeeQuote>;

package/dist/keysign/fee/resolvers/evm/getEvmFeeQuote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getEvmFeeQuote.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/fee/resolvers/evm/getEvmFeeQuote.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAA;AAMlF,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAgBhG,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,oBAAoB,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAA;IAChC,4BAA4B,CAAC,EAAE,MAAM,CAAA;IACrC,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,iFAKlC,mBAAmB,KAAG,OAAO,CAAC,WAAW,CAqK3C,CAAA"}
+{"version":3,"file":"getEvmFeeQuote.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/fee/resolvers/evm/getEvmFeeQuote.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAA;AAMlF,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAehG,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,oBAAoB,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAA;IAChC,iFAAiF;IACjF,4BAA4B,CAAC,EAAE,MAAM,CAAA;IACrC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAsBD,eAAO,MAAM,cAAc,GAAU,iFAKlC,mBAAmB,KAAG,OAAO,CAAC,WAAW,CAmM3C,CAAA"}

package/dist/keysign/fee/resolvers/evm/getEvmFeeQuote.js

@@ -1,24 +1,37 @@
-import { Chain, EvmChain } from '@vultisig/core-chain/Chain';
+import { Chain } from '@vultisig/core-chain/Chain';
 import { evmChainInfo } from '@vultisig/core-chain/chains/evm/chainInfo';
 import { getEvmClient } from '@vultisig/core-chain/chains/evm/client';
+import { evmChainTxFeeFormat } from '@vultisig/core-chain/chains/evm/tx/fee';
 import { getEvmBaseFee } from '@vultisig/core-chain/tx/fee/evm/baseFee';
-import { clampEvmPriorityFee } from '@vultisig/core-chain/tx/fee/evm/clampEvmPriorityFee';
+import { clampEvmPriorityFee, isZeroPriorityFeeChain } from '@vultisig/core-chain/tx/fee/evm/clampEvmPriorityFee';
+import { evmRouterDepositGasLimit, getEvmCalldataGas, getEvmContractCallGasLimit, getEvmTransferGasLimit, } from '@vultisig/core-chain/tx/fee/evm/evmGasLimit';
+import { getEvmGasPrice } from '@vultisig/core-chain/tx/fee/evm/gasPrice';
 import { getEvmMaxPriorityFeePerGas } from '@vultisig/core-chain/tx/fee/evm/maxPriorityFeePerGas';
 import { getKeysignSwapPayload } from '@vultisig/core-mpc/keysign/swap/getKeysignSwapPayload';
 import { getIsGenericContractCall } from '@vultisig/core-mpc/keysign/utils/getIsGenericContractCall';
 import { getKeysignAmount } from '@vultisig/core-mpc/keysign/utils/getKeysignAmount';
 import { getKeysignCoin } from '@vultisig/core-mpc/keysign/utils/getKeysignCoin';
-import { without } from '@vultisig/lib-utils/array/without';
 import { attempt, withFallback } from '@vultisig/lib-utils/attempt';
 import { bigIntMax } from '@vultisig/lib-utils/bigint/bigIntMax';
 import { formatDataToHex } from '@vultisig/lib-utils/formatDataToHex';
+import { match } from '@vultisig/lib-utils/match';
 import { matchRecordUnion } from '@vultisig/lib-utils/matchRecordUnion';
-import { encodeFunctionData, erc20Abi } from 'viem';
+import { encodeFunctionData, erc20Abi, isHex } from 'viem';
 import { publicActionsL2 } from 'viem/zksync';
-const baseFeeMultiplier = (value) => (value * 15n) / 10n;
-const dataTxGasLimitBufferNumerator = 3n;
-const dataTxGasLimitBufferDenominator = 2n;
-const addDataTxGasLimitBuffer = (value) => (value * dataTxGasLimitBufferNumerator + dataTxGasLimitBufferDenominator - 1n) / dataTxGasLimitBufferDenominator;
+const percentOf = (value, percent) => (value * percent) / 100n;
+// Half again on top of a simulated contract call: a route that turns out to need
+// slightly more gas than its simulation would otherwise revert and forfeit the gas.
+const inflateGasLimit = (value) => value + value / 2n;
+const getEvmTxKind = (keysignPayload, swapPayload) => {
+    if (swapPayload) {
+        return 'general' in swapPayload ? 'swap' : 'routerDeposit';
+    }
+    const { memo } = keysignPayload;
+    if (getIsGenericContractCall(keysignPayload) || (memo && isHex(memo))) {
+        return 'contractCall';
+    }
+    return 'transfer';
+};
 export const getEvmFeeQuote = async ({ keysignPayload, feeSettings, thirdPartyGasLimitEstimation, minimumGasLimit, }) => {
     const coin = getKeysignCoin(keysignPayload);
     const { chain, address } = coin;
@@ -27,30 +40,55 @@ export const getEvmFeeQuote = async ({ keysignPayload, feeSettings, thirdPartyGa
     const receiver = keysignPayload.toAddress;
     const data = keysignPayload.memo ? formatDataToHex(keysignPayload.memo) : undefined;
     const swapPayload = getKeysignSwapPayload(keysignPayload);
-    // Native swaps use chain-specific router builders instead of EVM calldata estimation here.
-    const shouldBufferDataTxGasLimit = Boolean((data || (swapPayload && 'general' in swapPayload)) && chain !== EvmChain.Mantle);
-    const resolveGasLimit = (estimatedGasLimit) => {
-        // SDK2-03: bigIntMax() with zero args throws an opaque error. Unreachable today
-        // (minimumGasLimit is always supplied), but guard so a future caller that omits every
-        // source fails with a clear, actionable message instead of a bare bigIntMax throw —
-        // and can never silently fall through to an undefined/zero gas limit.
-        const gasLimitSources = without([estimatedGasLimit, thirdPartyGasLimitEstimation, minimumGasLimit], undefined);
-        if (gasLimitSources.length === 0) {
-            throw new Error('resolveGasLimit: no gas-limit source available (estimated, third-party, and minimum are all undefined)');
-        }
-        // This selects the highest available floor; it deliberately does not claim
-        // to cap the transaction. A safe upper bound is chain- and call-specific,
-        // so introducing an arbitrary global ceiling here would reject valid calls.
-        const gasLimit = bigIntMax(...gasLimitSources);
-        return shouldBufferDataTxGasLimit ? addDataTxGasLimitBuffer(gasLimit) : gasLimit;
-    };
-    const getBaseFee = async () => baseFeeMultiplier(await getEvmBaseFee(chain));
+    const kind = getEvmTxKind(keysignPayload, swapPayload);
+    const kindGasLimit = match(kind, {
+        transfer: () => getEvmTransferGasLimit(coin),
+        contractCall: () => getEvmContractCallGasLimit(chain),
+        swap: () => getEvmContractCallGasLimit(chain),
+        routerDeposit: () => evmRouterDepositGasLimit,
+    });
+    // A fee-coin transfer that could not be simulated still has to cover the
+    // calldata its memo becomes, which the per-chain floor leaves out; a node
+    // refuses a limit below that intrinsic cost outright.
+    const unsimulatedGasLimit = kind === 'transfer' && !coin.id && data ? kindGasLimit + getEvmCalldataGas(data) : kindGasLimit;
+    // Stands in for a simulation that failed. A caller minimum only ever raises
+    // this stand-in, never a real estimate.
+    const fallbackGasLimit = bigIntMax(unsimulatedGasLimit, minimumGasLimit ?? 0n);
+    const requestedGasLimit = thirdPartyGasLimitEstimation ?? 0n;
+    const resolveGasLimit = (estimatedGasLimit) => match(kind, {
+        // A transfer costs what its simulation says, raised to the per-chain floor.
+        transfer: () => bigIntMax(estimatedGasLimit ?? fallbackGasLimit, kindGasLimit, requestedGasLimit),
+        // A contract call gets headroom over its simulation (or the fallback), and
+        // never less than what its author asked for.
+        contractCall: () => inflateGasLimit(bigIntMax(estimatedGasLimit ?? fallbackGasLimit, requestedGasLimit)),
+        // A swap is signed with the larger of the route's own gas and the inflated
+        // simulation; a route that carries no gas figure counts as the swap default.
+        swap: () => bigIntMax(requestedGasLimit > 0n ? requestedGasLimit : kindGasLimit, inflateGasLimit(estimatedGasLimit ?? fallbackGasLimit)),
+        // A router deposit is never simulated, so its fixed limit is the stand-in
+        // a caller minimum may raise.
+        routerDeposit: () => bigIntMax(fallbackGasLimit, requestedGasLimit),
+    });
+    const isLegacyPriced = evmChainTxFeeFormat[chain] === 'legacy';
+    // Headroom against the base fee rising while the keysign runs: 20% on
+    // everything, plus 10% on aggregator swaps, whose quotes go stale fastest
+    // and whose reverts cost the most.
+    const withBaseFeeHeadroom = (baseFee) => kind === 'swap' ? percentOf(percentOf(baseFee, 110n), 120n) : percentOf(baseFee, 120n);
+    // A legacy-priced chain has a single gas price; a swap gets 10% on top of it.
+    const withGasPriceHeadroom = (gasPrice) => (kind === 'swap' ? percentOf(gasPrice, 110n) : gasPrice);
+    const getBaseFeePerGas = async () => isLegacyPriced ? withGasPriceHeadroom(await getEvmGasPrice(chain)) : withBaseFeeHeadroom(await getEvmBaseFee(chain));
+    // A legacy-priced chain carries no tip, and a chain that pins it to zero
+    // needs no network suggestion to discard.
+    const getMaxPriorityFeePerGas = async () => isLegacyPriced || isZeroPriorityFeeChain(chain)
+        ? 0n
+        : clampEvmPriorityFee(chain, await getEvmMaxPriorityFeePerGas(chain));
     const getEstimateGasParams = async () => {
         if (swapPayload) {
             return matchRecordUnion(swapPayload, {
                 native: () => null,
                 general: ({ quote }) => {
-                    if (!quote?.tx) {
+                    // A token route cannot be simulated until its allowance exists, so it
+                    // is sized from the route's own gas and the swap fallback instead.
+                    if (coin.id || !quote?.tx) {
                         return null;
                     }
                     const { to, data, value } = quote.tx;
@@ -95,7 +133,7 @@ export const getEvmFeeQuote = async ({ keysignPayload, feeSettings, thirdPartyGa
         if (feeSettings) {
             return {
                 gasLimit: feeSettings.gasLimit,
-                baseFeePerGas: await getBaseFee(),
+                baseFeePerGas: await getBaseFeePerGas(),
                 maxPriorityFeePerGas: feeSettings.maxPriorityFeePerGas,
             };
         }
@@ -136,11 +174,9 @@ export const getEvmFeeQuote = async ({ keysignPayload, feeSettings, thirdPartyGa
                 data: estimateGasParams.data,
             })), undefined)
             : undefined;
-        const gasLimit = resolveGasLimit(estimatedGasLimit);
-        const baseFeePerGas = baseFeeMultiplier(await getEvmBaseFee(chain));
-        const maxPriorityFeePerGas = clampEvmPriorityFee(chain, await getEvmMaxPriorityFeePerGas(chain));
+        const [baseFeePerGas, maxPriorityFeePerGas] = await Promise.all([getBaseFeePerGas(), getMaxPriorityFeePerGas()]);
         return {
-            gasLimit,
+            gasLimit: resolveGasLimit(estimatedGasLimit),
             baseFeePerGas,
             maxPriorityFeePerGas,
         };

package/dist/keysign/fee/resolvers/evm/getEvmFeeQuote.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEvmFeeQuote.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/fee/resolvers/evm/getEvmFeeQuote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getEvmFeeQuote.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/fee/resolvers/evm/getEvmFeeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AACvE,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAA;AACjH,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAA;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sDAAsD,CAAA;AAEjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAA;AAE7F,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAA;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAA;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAA;AAEhF,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AA0B7C,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,IAAI,CAAA;AAE9E,iFAAiF;AACjF,oFAAoF;AACpF,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,GAAG,EAAE,CAAA;AAE7D,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,WAA2C,EAAa,EAAE;IAC9G,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAA;IAC5D,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAA;IAE/B,IAAI,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtE,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,cAAc,EACd,WAAW,EACX,4BAA4B,EAC5B,eAAe,GACK,EAAwB,EAAE;IAC9C,MAAM,IAAI,GAAG,cAAc,CAAW,cAAc,CAAC,CAAA;IACrD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAC/B,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAA;IAC/C,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAA;IACzC,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnF,MAAM,WAAW,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAA;IACzD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;IAEtD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE;QAC/B,QAAQ,EAAE,GAAG,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC;QAC5C,YAAY,EAAE,GAAG,EAAE,CAAC,0BAA0B,CAAC,KAAK,CAAC;QACrD,IAAI,EAAE,GAAG,EAAE,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAC7C,aAAa,EAAE,GAAG,EAAE,CAAC,wBAAwB;KAC9C,CAAC,CAAA;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,sDAAsD;IACtD,MAAM,mBAAmB,GACvB,IAAI,KAAK,UAAU,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;IACjG,4EAA4E;IAC5E,wCAAwC;IACxC,MAAM,gBAAgB,GAAG,SAAS,CAAC,mBAAmB,EAAE,eAAe,IAAI,EAAE,CAAC,CAAA;IAC9E,MAAM,iBAAiB,GAAG,4BAA4B,IAAI,EAAE,CAAA;IAE5D,MAAM,eAAe,GAAG,CAAC,iBAAqC,EAAU,EAAE,CACxE,KAAK,CAAC,IAAI,EAAE;QACV,4EAA4E;QAC5E,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,iBAAiB,IAAI,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,CAAC;QACjG,2EAA2E;QAC3E,6CAA6C;QAC7C,YAAY,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,iBAAiB,IAAI,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QACxG,2EAA2E;QAC3E,6EAA6E;QAC7E,IAAI,EAAE,GAAG,EAAE,CACT,SAAS,CACP,iBAAiB,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,EACzD,eAAe,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,CACvD;QACH,0EAA0E;QAC1E,8BAA8B;QAC9B,aAAa,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;KACpE,CAAC,CAAA;IAEJ,MAAM,cAAc,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAA;IAE9D,sEAAsE;IACtE,0EAA0E;IAC1E,mCAAmC;IACnC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,EAAE,CAC9C,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAExF,8EAA8E;IAC9E,MAAM,oBAAoB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;IAE3G,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE,CAClC,cAAc,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IAEtH,yEAAyE;IACzE,0CAA0C;IAC1C,MAAM,uBAAuB,GAAG,KAAK,IAAI,EAAE,CACzC,cAAc,IAAI,sBAAsB,CAAC,KAAK,CAAC;QAC7C,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAA;IAEzE,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;QACtC,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,gBAAgB,CAOrB,WAAW,EAAE;gBACb,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI;gBAClB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;oBACrB,sEAAsE;oBACtE,mEAAmE;oBACnE,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC;wBAC1B,OAAO,IAAI,CAAA;oBACb,CAAC;oBAED,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,EAAE,CAAA;oBAEpC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;wBACjB,OAAO,IAAI,CAAA;oBACb,CAAC;oBAED,MAAM,OAAO,GAAG,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;oBAEpF,OAAO;wBACL,EAAE,EAAE,EAAmB;wBACvB,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,IAAqB;qBAC5B,CAAA;gBACH,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAA;QACb,CAAC;QAED,8EAA8E;QAC9E,8EAA8E;QAC9E,+EAA+E;QAC/E,qDAAqD;QACrD,IAAI,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACzD,OAAO;gBACL,EAAE,EAAE,QAAyB;gBAC7B,KAAK,EAAE,MAAM;gBACb,IAAI;aACL,CAAA;QACH,CAAC;QAED,MAAM,YAAY,GAAG,kBAAkB,CAAC;YACtC,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,UAAU;YACxB,IAAI,EAAE,CAAC,QAAyB,EAAE,MAAM,CAAC;SAC1C,CAAC,CAAA;QAEF,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAmB;YAC5B,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,YAAY;SACnB,CAAA;IACH,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,KAAK,IAA0B,EAAE;QAClD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO;gBACL,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,aAAa,EAAE,MAAM,gBAAgB,EAAE;gBACvC,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;aACvD,CAAA;QACH,CAAC;QAED,IAAI,KAAK,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;YACtD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,WAAW,CAAC;oBAC3C,KAAK,EAAE,YAAY,CAAC,KAAiB,CAAC;oBACtC,OAAO,EAAE,IAAI,CAAC,OAAwB;oBACtC,EAAE,EAAE,iBAAiB,CAAC,EAAE;oBACxB,KAAK,EAAE,iBAAiB,CAAC,KAAK;oBAC9B,IAAI,EAAE,iBAAiB,CAAC,IAAI;iBAC7B,CAAC,CACH,CAAA;gBACD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;oBAChB,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,IAAI,CAAA;oBACpE,OAAO;wBACL,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC;wBACnC,mEAAmE;wBACnE,uDAAuD;wBACvD,iEAAiE;wBACjE,mEAAmE;wBACnE,gEAAgE;wBAChE,gEAAgE;wBAChE,gEAAgE;wBAChE,+DAA+D;wBAC/D,aAAa,EAAE,SAAS,CAAC,EAAE,EAAE,YAAY,GAAG,oBAAoB,CAAC;wBACjE,oBAAoB,EAAE,mBAAmB,CAAC,KAAK,EAAE,oBAAoB,CAAC;qBACvE,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;QAEtD,MAAM,iBAAiB,GAAG,iBAAiB;YACzC,CAAC,CAAC,MAAM,YAAY,CAChB,OAAO,CACL,MAAM,CAAC,WAAW,CAAC;gBACjB,OAAO,EAAE,OAAwB;gBACjC,EAAE,EAAE,iBAAiB,CAAC,EAAE;gBACxB,KAAK,EAAE,iBAAiB,CAAC,KAAK;gBAC9B,IAAI,EAAE,iBAAiB,CAAC,IAAI;aAC7B,CAAC,CACH,EACD,SAAS,CACV;YACH,CAAC,CAAC,SAAS,CAAA;QAEb,MAAM,CAAC,aAAa,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAA;QAEhH,OAAO;YACL,QAAQ,EAAE,eAAe,CAAC,iBAAiB,CAAC;YAC5C,aAAa;YACb,oBAAoB;SACrB,CAAA;IACH,CAAC,CAAA;IAED,OAAO,MAAM,UAAU,EAAE,CAAA;AAC3B,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAItD,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CAqD5D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAItD,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CA2E5D,CAAA"}

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

@@ -1,6 +1,8 @@
 import { getTonMessageBounceable } from '@vultisig/core-chain/chains/ton/messageBounce';
 import { isTonStakingComment } from '@vultisig/core-chain/chains/ton/staking';
+import { resolveTonWalletVersion, tonMaxMessagesPerRequest } from '@vultisig/core-chain/chains/ton/wallet';
 import { isFeeCoin } from '@vultisig/core-chain/coin/utils/isFeeCoin';
+import { match } from '@vultisig/lib-utils/match';
 import { TW } from '@trustwallet/wallet-core';
 import { getBlockchainSpecificValue } from '../../../chainSpecific/KeysignChainSpecific.js';
 import { getKeysignTwPublicKey } from '../../../tw/getKeysignTwPublicKey.js';
@@ -9,6 +11,14 @@ import { buildJettonTransfer } from './jetton.js';
 import { buildNativeTonTransfer, buildNativeTonTransferFromMessage } from './native.js';
 export const getTonSigningInputs = ({ keysignPayload, walletCore }) => {
     const coin = getKeysignCoin(keysignPayload);
+    const publicKeyBytes = getKeysignTwPublicKey(keysignPayload);
+    // The payload does not say which wallet contract the sender is; its address
+    // does. Every co-signer derives the same answer from the shared vault key.
+    const walletVersion = resolveTonWalletVersion({
+        address: coin.address,
+        publicKey: walletCore.PublicKey.createWithData(publicKeyBytes, walletCore.PublicKeyType.ed25519),
+        walletCore,
+    });
     // `sendMaxAmount` is deliberately not read here. A MAX send is the displayed
     // `balance - fee` carried in `toAmount` like any other amount, so the signed bytes
     // are identical either way and the flag stays descriptive metadata.
@@ -25,26 +35,36 @@ export const getTonSigningInputs = ({ keysignPayload, walletCore }) => {
             // tag. The wallet-level flag describes only `toAddress` — the first message —
             // and applying it to the whole batch signs the wrong bit on the others.
             bounceable: getTonMessageBounceable(msg.to, !!msg.stateInit),
+            walletVersion,
         }))
         : [
             isFeeCoin(coin)
                 ? buildNativeTonTransfer({
                     keysignPayload,
                     bounceable: isStakeOp ? true : !!bounceable,
+                    walletVersion,
                 })
                 : buildJettonTransfer({
                     keysignPayload,
                     walletCore,
                     jettonAddress,
                     isActiveDestination,
+                    walletVersion,
                 }),
         ];
+    const maxMessages = tonMaxMessagesPerRequest[walletVersion];
+    if (messages.length > maxMessages) {
+        throw new Error(`A ${walletVersion} TON wallet can send at most ${maxMessages} messages per request, got ${messages.length}`);
+    }
     const input = TW.TheOpenNetwork.Proto.SigningInput.create({
-        walletVersion: TW.TheOpenNetwork.Proto.WalletVersion.WALLET_V4_R2,
+        walletVersion: match(walletVersion, {
+            v4r2: () => TW.TheOpenNetwork.Proto.WalletVersion.WALLET_V4_R2,
+            v5r1: () => TW.TheOpenNetwork.Proto.WalletVersion.WALLET_V5_R1,
+        }),
         expireAt: Number(expireAt.toString()),
         sequenceNumber: Number(sequenceNumber.toString()),
         messages,
-        publicKey: getKeysignTwPublicKey(keysignPayload),
+        publicKey: publicKeyBytes,
     });
     return [input];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AACrE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAA;AAE7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAEpF,MAAM,CAAC,MAAM,mBAAmB,GAAiC,CAAC,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,EAAE;IAClG,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAE3C,6EAA6E;IAC7E,mFAAmF;IACnF,oEAAoE;IACpE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,GAAG,0BAA0B,CAC7G,cAAc,CAAC,kBAAkB,EACjC,aAAa,CACd,CAAA;IAED,MAAM,SAAS,GAAG,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;IAE1D,MAAM,eAAe,GACnB,cAAc,CAAC,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;IAErG,MAAM,QAAQ,GACZ,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC;QAC9D,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CACxB,iCAAiC,CAAC;YAChC,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,+EAA+E;YAC/E,8EAA8E;YAC9E,wEAAwE;YACxE,UAAU,EAAE,uBAAuB,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;SAC7D,CAAC,CACH;QACH,CAAC,CAAC;YACE,SAAS,CAAC,IAAI,CAAC;gBACb,CAAC,CAAC,sBAAsB,CAAC;oBACrB,cAAc;oBACd,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;iBAC5C,CAAC;gBACJ,CAAC,CAAC,mBAAmB,CAAC;oBAClB,cAAc;oBACd,UAAU;oBACV,aAAa;oBACb,mBAAmB;iBACpB,CAAC;SACP,CAAA;IAEP,MAAM,KAAK,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;QACxD,aAAa,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY;QACjE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACrC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;QACjD,QAAQ;QACR,SAAS,EAAE,qBAAqB,CAAC,cAAc,CAAC;KACjD,CAAC,CAAA;IAEF,OAAO,CAAC,KAAK,CAAC,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/index.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,4 @@
+import { TonWalletVersion } from '@vultisig/core-chain/chains/ton/wallet';
 import { KeysignPayload } from '@vultisig/core-mpc/types/vultisig/keysign/v1/keysign_message_pb';
 import { TW } from '@trustwallet/wallet-core';
 import { WalletCore } from '@trustwallet/wallet-core';
@@ -6,6 +7,7 @@ type BuildJettonTransferInput = {
     walletCore: WalletCore;
     jettonAddress: string;
     isActiveDestination: boolean;
+    walletVersion: TonWalletVersion;
 };
 /**
  * Builds the transfer that carries a Jetton send: a fixed TON amount to the
@@ -13,6 +15,6 @@ type BuildJettonTransferInput = {
  * nanoton only when the destination is already active, so an inactive recipient
  * isn't charged for a notification it cannot receive.
  */
-export declare const buildJettonTransfer: ({ keysignPayload, walletCore, jettonAddress, isActiveDestination, }: BuildJettonTransferInput) => TW.TheOpenNetwork.Proto.Transfer;
+export declare const buildJettonTransfer: ({ keysignPayload, walletCore, jettonAddress, isActiveDestination, walletVersion, }: BuildJettonTransferInput) => TW.TheOpenNetwork.Proto.Transfer;
 export {};
 //# sourceMappingURL=jetton.d.ts.map

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;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;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,qEAKjC,wBAAwB,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAsCrD,CAAA"}
+{"version":3,"file":"jetton.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/ton/jetton.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AACzE,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;IAC5B,aAAa,EAAE,gBAAgB,CAAA;CAChC,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,oFAMjC,wBAAwB,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAsCrD,CAAA"}

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

@@ -4,14 +4,14 @@ import { shouldBePresent } from '@vultisig/lib-utils/assert/shouldBePresent';
 import { TW } from '@trustwallet/wallet-core';
 import { getKeysignAmount } from '../../../utils/getKeysignAmount.js';
 import { getKeysignCoin } from '../../../utils/getKeysignCoin.js';
-import { tonAmountToBytes, tonSendMode } from './native.js';
+import { getTonSendMode, tonAmountToBytes } from './native.js';
 /**
  * Builds the transfer that carries a Jetton send: a fixed TON amount to the
  * sender's own Jetton wallet, wrapping the Jetton payload. `forwardAmount` is 1
  * nanoton only when the destination is already active, so an inactive recipient
  * isn't charged for a notification it cannot receive.
  */
-export const buildJettonTransfer = ({ keysignPayload, walletCore, jettonAddress, isActiveDestination, }) => {
+export const buildJettonTransfer = ({ keysignPayload, walletCore, jettonAddress, isActiveDestination, walletVersion, }) => {
     // `TonSpecific.jettonAddress` is a plain proto string that defaults to '' when the
     // sender's jetton wallet could not be resolved, and '' survives every null/undefined
     // check on the way here. Signing that would broadcast a transfer to no destination,
@@ -40,7 +40,7 @@ export const buildJettonTransfer = ({ keysignPayload, walletCore, jettonAddress,
         amount: tonAmountToBytes(tonConfig.jettonAmount),
         bounceable: true,
         comment: keysignPayload.memo ?? '',
-        mode: tonSendMode,
+        mode: getTonSendMode(walletVersion),
         jettonTransfer,
     });
 };

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,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,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,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AASxD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,cAAc,EACd,UAAU,EACV,aAAa,EACb,mBAAmB,GACM,EAAoC,EAAE;IAC/D,mFAAmF;IACnF,qFAAqF;IACrF,oFAAoF;IACpF,qEAAqE;IACrE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAA;IACpG,CAAC;IAED,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,MAAM,GAAG,eAAe,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAA;IAChE,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnD,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,8EAA8E;IAC9E,4CAA4C;IAC5C,kBAAkB,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAA;IAEhG,MAAM,cAAc,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;QACnE,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACtC,OAAO,EAAE,kBAAkB;QAC3B,eAAe,EAAE,IAAI,CAAC,OAAO;QAC7B,aAAa,EAAE,gBAAgB,CAAC,aAAa,CAAC;KAC/C,CAAC,CAAA;IAEF,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,cAAc,CAAC,IAAI,IAAI,EAAE;QAClC,IAAI,EAAE,WAAW;QACjB,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,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAGlE,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,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAU3D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,cAAc,EACd,UAAU,EACV,aAAa,EACb,mBAAmB,EACnB,aAAa,GACY,EAAoC,EAAE;IAC/D,mFAAmF;IACnF,qFAAqF;IACrF,oFAAoF;IACpF,qEAAqE;IACrE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAA;IACpG,CAAC;IAED,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,MAAM,GAAG,eAAe,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAA;IAChE,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnD,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,8EAA8E;IAC9E,4CAA4C;IAC5C,kBAAkB,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAA;IAEhG,MAAM,cAAc,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;QACnE,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACtC,OAAO,EAAE,kBAAkB;QAC3B,eAAe,EAAE,IAAI,CAAC,OAAO;QAC7B,aAAa,EAAE,gBAAgB,CAAC,aAAa,CAAC;KAC/C,CAAC,CAAA;IAEF,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,cAAc,CAAC,IAAI,IAAI,EAAE;QAClC,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC;QACnC,cAAc;KACf,CAAC,CAAA;AACJ,CAAC,CAAA"}

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

@@ -1,4 +1,5 @@
 import { Buffer } from 'buffer';
+import { TonWalletVersion } from '@vultisig/core-chain/chains/ton/wallet';
 import { KeysignPayload } from '@vultisig/core-mpc/types/vultisig/keysign/v1/keysign_message_pb';
 import { TW } from '@trustwallet/wallet-core';
 type BuildNativeTonTransferFromMessageInput = {
@@ -7,10 +8,12 @@ type BuildNativeTonTransferFromMessageInput = {
     payload?: string;
     stateInit?: string;
     bounceable: boolean;
+    walletVersion: TonWalletVersion;
 };
 type BuildNativeTonTransferInput = {
     keysignPayload: KeysignPayload;
     bounceable: boolean;
+    walletVersion: TonWalletVersion;
 };
 export declare const tonAmountToBytes: (amount: string | bigint) => Buffer;
 /**
@@ -29,6 +32,18 @@ export declare const tonAmountToBytes: (amount: string | bigint) => Buffer;
  * this payload, so changing it here breaks keysign with any client that has not changed too.
  */
 export declare const tonSendMode = TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY;
+/**
+ * The send mode for a given wallet contract.
+ *
+ * W5 is the exception to the rule above: its code refuses an external request
+ * unless every action carries `IGNORE_ACTION_PHASE_ERRORS`, because that is
+ * how it guarantees the seqno advances even when an action fails — the
+ * contract's own replay protection. WalletCore enforces the same check before
+ * it will build the message. The blindness the flag causes is covered on the
+ * other side: the status resolver reads the action phase, so a W5 send whose
+ * transfer was skipped reports as failed instead of confirmed.
+ */
+export declare const getTonSendMode: (walletVersion: TonWalletVersion) => number;
 /**
  * Builds the single WalletCore transfer for an app-initiated native TON send.
  *
@@ -39,11 +54,11 @@ export declare const tonSendMode = TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEP
  * send is just `balance - fee` as an ordinary amount, and that fee is the reserve the
  * send mode then draws on.
  */
-export declare const buildNativeTonTransfer: ({ keysignPayload, bounceable, }: BuildNativeTonTransferInput) => TW.TheOpenNetwork.Proto.Transfer;
+export declare const buildNativeTonTransfer: ({ keysignPayload, bounceable, walletVersion, }: BuildNativeTonTransferInput) => TW.TheOpenNetwork.Proto.Transfer;
 /**
  * Builds a transfer for one message of a dApp-supplied `signTon` request. The
  * message carries its own payload/stateInit, so no comment is attached here.
  */
-export declare const buildNativeTonTransferFromMessage: ({ to, amount, payload, stateInit, bounceable, }: BuildNativeTonTransferFromMessageInput) => TW.TheOpenNetwork.Proto.Transfer;
+export declare const buildNativeTonTransferFromMessage: ({ to, amount, payload, stateInit, bounceable, walletVersion, }: BuildNativeTonTransferFromMessageInput) => TW.TheOpenNetwork.Proto.Transfer;
 export {};
 //# sourceMappingURL=native.d.ts.map

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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/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;CACpB,CAAA;AAMD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,GAAG,MAAM,KAAG,MAuB1D,CAAA;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,uDAAuD,CAAA;AAE/E;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GAAI,iCAGpC,2BAA2B,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAWxD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iCAAiC,GAAI,iDAM/C,sCAAsC,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAUnE,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;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAGhG,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;IACnB,aAAa,EAAE,gBAAgB,CAAA;CAChC,CAAA;AAED,KAAK,2BAA2B,GAAG;IACjC,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB,aAAa,EAAE,gBAAgB,CAAA;CAChC,CAAA;AAMD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,GAAG,MAAM,KAAG,MAuB1D,CAAA;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,uDAAuD,CAAA;AAE/E;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,eAAe,gBAAgB,KAAG,MAI7D,CAAA;AAEJ;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GAAI,gDAIpC,2BAA2B,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAWxD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iCAAiC,GAAI,gEAO/C,sCAAsC,KAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,QAUnE,CAAA"}

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

@@ -1,6 +1,7 @@
 import { Buffer } from 'buffer';
 import { validateTonComment } from '@vultisig/core-chain/chains/ton/comment';
 import { numberToEvenHex } from '@vultisig/lib-utils/hex/numberToHex';
+import { match } from '@vultisig/lib-utils/match';
 import { TW } from '@trustwallet/wallet-core';
 const tonUnsignedDecimalRegex = /^\d+$/;
 const tonMaxAmount = (1n << 120n) - 1n;
@@ -40,6 +41,21 @@ export const tonAmountToBytes = (amount) => {
  * this payload, so changing it here breaks keysign with any client that has not changed too.
  */
 export const tonSendMode = TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY;
+/**
+ * The send mode for a given wallet contract.
+ *
+ * W5 is the exception to the rule above: its code refuses an external request
+ * unless every action carries `IGNORE_ACTION_PHASE_ERRORS`, because that is
+ * how it guarantees the seqno advances even when an action fails — the
+ * contract's own replay protection. WalletCore enforces the same check before
+ * it will build the message. The blindness the flag causes is covered on the
+ * other side: the status resolver reads the action phase, so a W5 send whose
+ * transfer was skipped reports as failed instead of confirmed.
+ */
+export const getTonSendMode = (walletVersion) => match(walletVersion, {
+    v4r2: () => tonSendMode,
+    v5r1: () => tonSendMode | TW.TheOpenNetwork.Proto.SendMode.IGNORE_ACTION_PHASE_ERRORS,
+});
 /**
  * Builds the single WalletCore transfer for an app-initiated native TON send.
  *
@@ -50,7 +66,7 @@ export const tonSendMode = TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY;
  * send is just `balance - fee` as an ordinary amount, and that fee is the reserve the
  * send mode then draws on.
  */
-export const buildNativeTonTransfer = ({ keysignPayload, bounceable, }) => {
+export const buildNativeTonTransfer = ({ keysignPayload, bounceable, walletVersion, }) => {
     const comment = keysignPayload.memo || '';
     validateTonComment({ memo: comment });
     return TW.TheOpenNetwork.Proto.Transfer.create({
@@ -58,14 +74,14 @@ export const buildNativeTonTransfer = ({ keysignPayload, bounceable, }) => {
         amount: tonAmountToBytes(keysignPayload.toAmount),
         bounceable,
         comment,
-        mode: tonSendMode,
+        mode: getTonSendMode(walletVersion),
     });
 };
 /**
  * Builds a transfer for one message of a dApp-supplied `signTon` request. The
  * message carries its own payload/stateInit, so no comment is attached here.
  */
-export const buildNativeTonTransferFromMessage = ({ to, amount, payload = '', stateInit, bounceable, }) => {
+export const buildNativeTonTransferFromMessage = ({ to, amount, payload = '', stateInit, bounceable, walletVersion, }) => {
     return TW.TheOpenNetwork.Proto.Transfer.create({
         dest: to,
         amount: tonAmountToBytes(amount),
@@ -73,7 +89,7 @@ export const buildNativeTonTransferFromMessage = ({ to, amount, payload = '', st
         comment: '',
         customPayload: payload || undefined,
         stateInit: stateInit || undefined,
-        mode: tonSendMode,
+        mode: getTonSendMode(walletVersion),
     });
 };
 //# sourceMappingURL=native.js.map