@shapeshiftoss/swapper 20.3.0 → 20.5.0

package/dist/esm/constants.js

@@ -9,12 +9,15 @@ import { cetusApi, cetusSwapper } from './swappers/CetusSwapper/index.js';
 import { chainflipApi, chainflipSwapper } from './swappers/ChainflipSwapper/index.js';
 import { cowApi, cowSwapper } from './swappers/CowSwapper/index.js';
 import { debridgeApi, debridgeSwapper } from './swappers/DebridgeSwapper/index.js';
+import { fyndApi, fyndSwapper } from './swappers/FyndSwapper/index.js';
+import { kyberApi, kyberSwapper } from './swappers/KyberSwapper/index.js';
 import { mayachainApi, mayachainSwapper } from './swappers/MayachainSwapper/index.js';
 import { nearIntentsApi, nearIntentsSwapper } from './swappers/NearIntentsSwapper/index.js';
 import { portalsApi, portalsSwapper } from './swappers/PortalsSwapper/index.js';
 import { relayApi, relaySwapper } from './swappers/RelaySwapper/index.js';
 import { stonfiApi, stonfiSwapper } from './swappers/StonfiSwapper/index.js';
 import { sunioApi, sunioSwapper } from './swappers/SunioSwapper/index.js';
+import { symbiosisApi, symbiosisSwapper } from './swappers/SymbiosisSwapper/index.js';
 import { thorchainApi, thorchainSwapper } from './swappers/ThorchainSwapper/index.js';
 import { zrxApi, zrxSwapper } from './swappers/ZrxSwapper/index.js';
 import { SwapperName, TradeQuoteError } from './types.js';
@@ -99,6 +102,18 @@ export const swappers = {
         ...bobGatewaySwapper,
         ...bobGatewayApi,
     },
+    [SwapperName.Symbiosis]: {
+        ...symbiosisSwapper,
+        ...symbiosisApi,
+    },
+    [SwapperName.Fynd]: {
+        ...fyndSwapper,
+        ...fyndApi,
+    },
+    [SwapperName.KyberSwap]: {
+        ...kyberSwapper,
+        ...kyberApi,
+    },
     [SwapperName.Test]: undefined,
 };
 const DEFAULT_SLIPPAGE_DECIMAL_PERCENTAGE = '0.002';
@@ -118,12 +133,16 @@ const DEFAULT_STONFI_SLIPPAGE_DECIMAL_PERCENTAGE = '0.01';
 // deBridge API off-chain simulation overestimates output on some chains (e.g. SEI ~2.4%), so auto slippage (1%) is insufficient
 const DEFAULT_DEBRIDGE_SLIPPAGE_DECIMAL_PERCENTAGE = '0.03';
 const DEFAULT_BOB_GATEWAY_SLIPPAGE_DECIMAL_PERCENTAGE = '0.03';
+// Symbiosis splits the tolerance across up to three legs, and a destination leg over its share pays out the transit token instead of reverting
+const DEFAULT_SYMBIOSIS_SLIPPAGE_DECIMAL_PERCENTAGE = '0.01';
 export const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
     if (swapperName === undefined)
         return DEFAULT_SLIPPAGE_DECIMAL_PERCENTAGE;
     switch (swapperName) {
         case SwapperName.Zrx:
         case SwapperName.Bebop:
+        case SwapperName.Fynd:
+        case SwapperName.KyberSwap:
         case SwapperName.Test:
             return DEFAULT_SLIPPAGE_DECIMAL_PERCENTAGE;
         case SwapperName.CowSwap:
@@ -158,6 +177,8 @@ export const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
             return DEFAULT_STONFI_SLIPPAGE_DECIMAL_PERCENTAGE;
         case SwapperName.BobGateway:
             return DEFAULT_BOB_GATEWAY_SLIPPAGE_DECIMAL_PERCENTAGE;
+        case SwapperName.Symbiosis:
+            return DEFAULT_SYMBIOSIS_SLIPPAGE_DECIMAL_PERCENTAGE;
         default:
             return assertUnreachable(swapperName);
     }

package/dist/esm/index.d.ts

@@ -15,11 +15,14 @@ export * from './swappers/ChainflipSwapper/index.js';
 export * from './swappers/SunioSwapper/index.js';
 export * from './swappers/CowSwapper/index.js';
 export * from './swappers/DebridgeSwapper/index.js';
+export * from './swappers/FyndSwapper/index.js';
+export * from './swappers/KyberSwapper/index.js';
 export * from './swappers/PortalsSwapper/index.js';
 export * from './swappers/ThorchainSwapper/index.js';
 export * from './swappers/MayachainSwapper/index.js';
 export * from './swappers/ButterSwap/index.js';
 export * from './swappers/RelaySwapper/index.js';
+export * from './swappers/SymbiosisSwapper/index.js';
 export * from './utils/helpers.js';
 export * from './utils/thorchain/index.js';
 export * from './types.js';

package/dist/esm/index.js

@@ -15,11 +15,14 @@ export * from './swappers/ChainflipSwapper/index.js';
 export * from './swappers/SunioSwapper/index.js';
 export * from './swappers/CowSwapper/index.js';
 export * from './swappers/DebridgeSwapper/index.js';
+export * from './swappers/FyndSwapper/index.js';
+export * from './swappers/KyberSwapper/index.js';
 export * from './swappers/PortalsSwapper/index.js';
 export * from './swappers/ThorchainSwapper/index.js';
 export * from './swappers/MayachainSwapper/index.js';
 export * from './swappers/ButterSwap/index.js';
 export * from './swappers/RelaySwapper/index.js';
+export * from './swappers/SymbiosisSwapper/index.js';
 export * from './utils/helpers.js';
 export * from './utils/thorchain/index.js';
 export * from './types.js';

package/dist/esm/swappers/AcrossSwapper/utils/getAcrossStepData.js

@@ -4,7 +4,7 @@ import { Err, Ok } from '@sniptt/monads';
 import { AddressLookupTableAccount, PublicKey, TransactionMessage, VersionedTransaction, } from '@solana/web3.js';
 import { TradeQuoteError } from '../../../types.js';
 import { makeNetworkFeeEstimationFailedErr, makeSwapErrorRight, makeTradeStepBuildFailedErr, } from '../../../utils/index.js';
-import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
+import { getEvmNetworkFeeCryptoBaseUnit, getEvmRateNetworkFeeCryptoBaseUnit, } from '../../../utils/evm/index.js';
 import { getSolanaNetworkFeeCryptoBaseUnit } from '../../../utils/solana/index.js';
 export async function getAcrossStepData(args) {
     const { swapTx, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, from, type, input, fallbackNetworkFeeCryptoBaseUnit, deps, } = args;
@@ -18,7 +18,6 @@ export async function getAcrossStepData(args) {
                 to: swapTx.to,
                 data: swapTx.data,
                 value: swapTx.value ?? '0',
-                gasLimit: swapTx.gas,
             };
             const stateOverride = {
                 sellAsset,
@@ -26,20 +25,12 @@ export async function getAcrossStepData(args) {
                 spenderAddress,
             };
             if (type === 'rate') {
-                const networkFeeCryptoBaseUnit = await (async () => {
-                    try {
-                        return await getEvmNetworkFeeCryptoBaseUnit({
-                            adapter,
-                            transactionData,
-                            from,
-                            supportsEIP1559,
-                            stateOverride,
-                        });
-                    }
-                    catch {
-                        return fallbackNetworkFeeCryptoBaseUnit;
-                    }
-                })();
+                const networkFeeCryptoBaseUnit = await getEvmRateNetworkFeeCryptoBaseUnit({
+                    adapter,
+                    supportsEIP1559,
+                    providerGasLimit: swapTx.gas,
+                    simulation: { transactionData, from, stateOverride },
+                }).catch(() => fallbackNetworkFeeCryptoBaseUnit);
                 const stepData = { networkFeeCryptoBaseUnit };
                 return Ok(stepData);
             }
@@ -50,6 +41,7 @@ export async function getAcrossStepData(args) {
                     from,
                     supportsEIP1559,
                     stateOverride,
+                    providerGasLimit: swapTx.gas,
                 });
                 const stepData = { transactionData, networkFeeCryptoBaseUnit };
                 return Ok(stepData);

package/dist/esm/swappers/ArbitrumBridgeSwapper/getTradeQuote/getTradeQuote.js

@@ -1,7 +1,6 @@
 import { supportsETH } from '@shapeshiftoss/hdwallet-core';
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getArbitrumBridgeStepData } from '../utils/getArbitrumBridgeStepData.js';
 import { getArbitrumBridgeTradeContext } from '../utils/getArbitrumBridgeTradeContext.js';
 export const getTradeQuoteWithWallet = async (inputWithWallet, deps) => {
@@ -33,7 +32,6 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/AvnuSwapper/endpoints.js

@@ -1,6 +1,6 @@
 import { quoteToCalls } from '@avnu/avnu-sdk';
 import { toAddressNList } from '@shapeshiftoss/chain-adapters';
-import { CallData, hash, validateAndParseAddress } from 'starknet';
+import { CallData, hash, transaction, validateAndParseAddress } from 'starknet';
 import { checkStarknetSwapStatus, createDefaultStatusResponse, getExecutableTradeStep, getSwapMetadata, isExecutableTradeQuote, } from '../../utils/index.js';
 import { getTradeQuote } from './swapperApi/getTradeQuote.js';
 import { getTradeRate } from './swapperApi/getTradeRate.js';
@@ -8,7 +8,7 @@ import { toHexString } from './utils/helpers.js';
 export const avnuApi = {
     getTradeQuote: (input, deps) => getTradeQuote(input, deps),
     getTradeRate: (input, deps) => getTradeRate(input, deps),
-    getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, slippageTolerancePercentageDecimal, assertGetStarknetChainAdapter, }) => {
+    getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, callsOnly, slippageTolerancePercentageDecimal, assertGetStarknetChainAdapter, }) => {
         if (!isExecutableTradeQuote(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
         const step = getExecutableTradeStep(tradeQuote, stepIndex);
@@ -34,19 +34,23 @@ export const avnuApi = {
         if (!avnuCalls || avnuCalls.length === 0) {
             throw new Error('No swap calls returned from AVNU - quote may have expired');
         }
-        // Build the full invoke transaction calldata from AVNU calls
-        // Format: [call_array_length, contract1, selector1, calldata_len1, ...calldata1, ...]
-        const fullCalldata = [avnuCalls.length.toString()];
-        for (const call of avnuCalls) {
+        const calls = avnuCalls.map(call => {
             const rawCalldata = call.calldata ?? [];
-            const calldataArray = Array.isArray(rawCalldata) ? rawCalldata : CallData.compile(rawCalldata);
-            const selector = hash.getSelectorFromName(call.entrypoint);
-            // Normalize contract address from AVNU to ensure consistent format
-            const normalizedContractAddress = validateAndParseAddress(call.contractAddress);
-            fullCalldata.push(normalizedContractAddress, selector, calldataArray.length.toString(), ...calldataArray.map(cd => String(cd)));
+            const calldata = Array.isArray(rawCalldata) ? rawCalldata : CallData.compile(rawCalldata);
+            return {
+                contractAddress: validateAndParseAddress(call.contractAddress),
+                entrypoint: call.entrypoint,
+                calldata: calldata.map(String),
+            };
+        });
+        if (callsOnly) {
+            return {
+                addressNList: toAddressNList(adapter.getBip44Params({ accountNumber })),
+                txHash: '',
+                calls,
+            };
         }
-        // Format calldata for RPC (convert all values to proper hex format)
-        const formattedCalldata = fullCalldata.map(toHexString);
+        const formattedCalldata = transaction.getExecuteCalldata(calls, '1').map(toHexString);
         // Get nonce using adapter method (checks deployment status and returns appropriate nonce)
         const chainIdHex = await adapter.getStarknetProvider().getChainId();
         const nonce = await adapter.getNonce(normalizedFrom);
@@ -144,6 +148,7 @@ export const avnuApi = {
         return {
             addressNList: toAddressNList(adapter.getBip44Params({ accountNumber })),
             txHash,
+            calls,
             _txDetails: {
                 fromAddress: normalizedFrom,
                 calldata: formattedCalldata,

package/dist/esm/swappers/AvnuSwapper/swapperApi/getTradeQuote.js

@@ -2,7 +2,6 @@ import { Err, Ok } from '@sniptt/monads';
 import { validateAndParseAddress } from 'starknet';
 import { TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getAvnuTradeContext } from '../utils/getAvnuTradeContext.js';
 export const getTradeQuote = async (input, deps) => {
     const { sellAsset, accountNumber } = input;
@@ -33,7 +32,7 @@ export const getTradeQuote = async (input, deps) => {
             ...tradeCommon,
             receiveAddress: normalizedReceiveAddress,
             quoteOrRate: 'quote',
-            deadline: deadline ?? Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
+            deadline,
             steps: [
                 {
                     ...stepCommon,

package/dist/esm/swappers/BebopSwapper/utils/fetchFromBebop.d.ts

@@ -13,12 +13,13 @@ export declare const fetchBebopQuote: ({ buyAsset, sellAsset, sellAmountIncludin
     affiliateBps?: string | undefined;
     apiKey: string;
 }) => Promise<Result<BebopQuoteResponse, SwapErrorRight>>;
-export declare const fetchBebopSolanaQuote: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, apiKey, }: {
+export declare const fetchBebopSolanaQuote: ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }: {
     buyAsset: Asset;
     sellAsset: Asset;
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
     takerAddress: string;
     receiverAddress: string;
     slippageTolerancePercentageDecimal: string;
+    affiliateBps?: string | undefined;
     apiKey: string;
 }) => Promise<Result<BebopSolanaQuoteResponse, SwapErrorRight>>;

package/dist/esm/swappers/BebopSwapper/utils/fetchFromBebop.js

@@ -8,6 +8,9 @@ import { getTreasuryAddressFromChainId } from '../../../utils/helpers.js';
 import { chainIdToBebopChain } from '../types.js';
 import { bebopServiceFactory } from './bebopService.js';
 import { assetIdToBebopSolanaToken, assetIdToBebopToken } from './helpers.js';
+// PMM charges the fee set against our api key, which nets exactly this bps
+const BEBOP_PMM_AFFILIATE_BPS = '60';
+const isPmmEligible = (affiliateBps) => bnOrZero(affiliateBps).eq(BEBOP_PMM_AFFILIATE_BPS);
 export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
         const sellToken = assetIdToBebopToken(sellAsset.assetId);
@@ -27,26 +30,24 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
             approval_type: 'Standard',
             skip_validation: 'true',
             gasless: 'false',
-            // PMM fees are configured against our api key on Bebop's side, not sent per quote
             source: 'shapeshift',
         };
         const jamParams = new URLSearchParams(baseParams);
-        const pmmParams = new URLSearchParams(baseParams);
-        // JAM settles the fee on-chain, so it still takes our bps and a recipient per quote
-        if (affiliateBps && affiliateBps !== '0') {
-            jamParams.set('fee', affiliateBps);
-            jamParams.set('fee_recipient', getAddress(getTreasuryAddressFromChainId(buyAsset.chainId)));
-        }
+        // Without an explicit fee JAM charges our api key's flat fee, so 1 bps is the lowest it can go
+        jamParams.set('fee', affiliateBps && bnOrZero(affiliateBps).gt(0) ? affiliateBps : '1');
+        jamParams.set('fee_recipient', getAddress(getTreasuryAddressFromChainId(buyAsset.chainId)));
         const service = bebopServiceFactory({ apiKey });
-        const [maybeJam, maybePmm] = await Promise.all([
+        const requests = [
             service.get(`https://api.bebop.xyz/jam/${chainName}/v2/quote`, {
                 params: jamParams,
             }),
-            service.get(`https://api.bebop.xyz/pmm/${chainName}/v3/quote`, {
-                params: pmmParams,
-            }),
-        ]);
-        const maybeResponses = [maybeJam, maybePmm];
+        ];
+        if (isPmmEligible(affiliateBps)) {
+            requests.push(service.get(`https://api.bebop.xyz/pmm/${chainName}/v3/quote`, {
+                params: new URLSearchParams(baseParams),
+            }));
+        }
+        const maybeResponses = await Promise.all(requests);
         if (maybeResponses.every(maybeResponse => maybeResponse.isErr())) {
             return Err(makeSwapErrorRight({
                 message: 'Failed to fetch quote from Bebop',
@@ -76,8 +77,14 @@ export const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncluding
         }));
     }
 };
-export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, apiKey, }) => {
+export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
+        if (!isPmmEligible(affiliateBps)) {
+            return Err(makeSwapErrorRight({
+                message: 'Bebop Solana is PMM only and cannot take the requested bps',
+                code: TradeQuoteError.NoRouteFound,
+            }));
+        }
         // Bebop's Solana routes don't wrap native SOL on the input side, so selling native SOL
         // always fails on-chain. Reject up front instead of returning an unexecutable quote.
         if (sellAsset.assetId === solAssetId) {
@@ -100,7 +107,6 @@ export const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountInc
             approval_type: 'Standard',
             skip_validation: 'false',
             gasless: 'true',
-            // Solana is PMM only, so its fees are configured against our api key on Bebop's side
             source: 'shapeshift',
         });
         const maybeResponse = await bebopServiceFactory({ apiKey }).get('https://api.bebop.xyz/pmm/solana/v3/quote', { params });

package/dist/esm/swappers/BebopSwapper/utils/getBebopSolanaTradeContext.js

@@ -19,6 +19,7 @@ export const getBebopSolanaTradeContext = async ({ input, deps, takerAddress, re
         takerAddress,
         receiverAddress,
         slippageTolerancePercentageDecimal,
+        affiliateBps,
         apiKey: deps.config.VITE_BEBOP_API_KEY,
     });
     if (maybeBebopQuoteResponse.isErr())

package/dist/esm/swappers/BebopSwapper/utils/getBebopStepData.js

@@ -3,46 +3,41 @@ import { bnOrZero } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { fromHex } from 'viem';
 import { makeNetworkFeeEstimationFailedErr } from '../../../utils/index.js';
-import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
+import { getEvmNetworkFeeCryptoBaseUnit, getEvmRateNetworkFeeCryptoBaseUnit, } from '../../../utils/evm/index.js';
 export async function getBebopStepData(args) {
     const { tx, spenderAddress, sellAsset, sellAmountCryptoBaseUnit, type, input, from, deps } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
-    if (type === 'rate') {
-        const networkFeeCryptoBaseUnit = await (async () => {
-            try {
-                return await getEvmNetworkFeeCryptoBaseUnit({
-                    adapter,
-                    supportsEIP1559,
-                    gasLimit: bnOrZero(tx.gas).toString(),
-                });
-            }
-            catch {
-                return bnOrZero(tx.gas).times(bnOrZero(tx.gasPrice)).toFixed(0);
-            }
-        })();
-        const stepData = { networkFeeCryptoBaseUnit };
-        return Ok(stepData);
-    }
     const transactionData = {
         type: 'evm',
         chainId: Number(fromChainId(sellAsset.chainId).chainReference),
         to: tx.to,
         data: tx.data,
         value: fromHex(tx.value, 'bigint').toString(),
-        gasLimit: tx.gas?.toString(),
     };
+    const stateOverride = {
+        sellAsset,
+        sellAmountCryptoBaseUnit,
+        spenderAddress,
+    };
+    if (type === 'rate') {
+        const networkFeeCryptoBaseUnit = await getEvmRateNetworkFeeCryptoBaseUnit({
+            adapter,
+            supportsEIP1559,
+            providerGasLimit: tx.gas?.toString(),
+            simulation: { transactionData, from, stateOverride },
+        }).catch(() => bnOrZero(tx.gas).times(bnOrZero(tx.gasPrice)).toFixed(0));
+        const stepData = { networkFeeCryptoBaseUnit };
+        return Ok(stepData);
+    }
     try {
         const networkFeeCryptoBaseUnit = await getEvmNetworkFeeCryptoBaseUnit({
             adapter,
             transactionData,
             from,
             supportsEIP1559,
-            stateOverride: {
-                sellAsset,
-                sellAmountCryptoBaseUnit,
-                spenderAddress,
-            },
+            stateOverride,
+            providerGasLimit: tx.gas?.toString(),
         });
         const stepData = { transactionData, networkFeeCryptoBaseUnit };
         return Ok(stepData);

package/dist/esm/swappers/BobGatewaySwapper/swapperApi/getTradeQuote.js

@@ -1,7 +1,6 @@
 import { btcChainId } from '@shapeshiftoss/caip';
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getBobGatewayStepData } from '../utils/getBobGatewayStepData.js';
 import { getBobGatewayTradeContext } from '../utils/getBobGatewayTradeContext.js';
 export const getBobGatewayTradeQuote = async (input, deps) => {
@@ -35,7 +34,6 @@ export const getBobGatewayTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/ButterSwap/swapperApi/getTradeQuote.js

@@ -4,7 +4,6 @@ import { Err, Ok } from '@sniptt/monads';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getButterSwapStepData } from '../utils/getButterSwapStepData.js';
 import { getButterSwapTradeContext } from '../utils/getButterSwapTradeContext.js';
 import { fetchTxData, isBuildTxSuccess } from '../xhr.js';
@@ -60,7 +59,6 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/ButterSwap/swapperApi/getTradeQuote.test.js

@@ -54,6 +54,7 @@ describe('getTradeQuote', () => {
             assertGetNearChainAdapter: () => vi.fn(),
             assertGetStarknetChainAdapter: () => vi.fn(),
             assertGetTonChainAdapter: () => vi.fn(),
+            assertGetAptosChainAdapter: () => vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

package/dist/esm/swappers/ButterSwap/swapperApi/getTradeRate.test.js

@@ -34,6 +34,7 @@ describe('getTradeRate', () => {
             assertGetNearChainAdapter: () => vi.fn(),
             assertGetStarknetChainAdapter: () => vi.fn(),
             assertGetTonChainAdapter: () => vi.fn(),
+            assertGetAptosChainAdapter: () => vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

package/dist/esm/swappers/ButterSwap/utils/getButterSwapStepData.js

@@ -5,7 +5,7 @@ import { AddressLookupTableAccount, PublicKey, TransactionMessage, VersionedTran
 import { fromHex } from 'viem';
 import { TradeQuoteError } from '../../../types.js';
 import { makeNetworkFeeEstimationFailedErr, makeSwapErrorRight, makeTradeStepBuildFailedErr, } from '../../../utils/index.js';
-import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
+import { getEvmNetworkFeeCryptoBaseUnit, getEvmRateNetworkFeeCryptoBaseUnit, } from '../../../utils/evm/index.js';
 import { getSolanaNetworkFeeCryptoBaseUnit, omitComputeBudgetInstructions, withComputeUnitLimit, } from '../../../utils/solana/index.js';
 import { getTronContractCallFallbackFeeCryptoBaseUnit, getTronContractCallNetworkFeeCryptoBaseUnit, } from '../../../utils/tron/index.js';
 import { BUTTERSWAP_TRON_DEFAULT_BANDWIDTH_BYTES, BUTTERSWAP_TRON_FALLBACK_SWAP_ENERGY, } from './constants.js';
@@ -25,10 +25,10 @@ export async function getButterSwapStepData(args) {
             if (args.type === 'rate') {
                 const networkFeeCryptoBaseUnit = await (async () => {
                     try {
-                        return await getEvmNetworkFeeCryptoBaseUnit({
+                        return await getEvmRateNetworkFeeCryptoBaseUnit({
                             adapter,
                             supportsEIP1559,
-                            gasLimit: bnOrZero(route.gasEstimatedTarget).toFixed(),
+                            providerGasLimit: bnOrZero(route.gasEstimatedTarget).toFixed(),
                         });
                     }
                     catch {
@@ -52,13 +52,12 @@ export async function getButterSwapStepData(args) {
                     supportsEIP1559,
                     transactionData,
                     from,
-                    // Butter's gasEstimatedTarget lands short on chain (observed 24% under actual, causing
-                    // in-flight OOG/SWAP_FAIL reverts) - estimate ourselves instead
                     stateOverride: {
                         sellAsset,
                         sellAmountCryptoBaseUnit,
                         spenderAddress,
                     },
+                    providerGasLimit: bnOrZero(route.gasEstimatedTarget).toFixed(),
                 });
                 const stepData = { transactionData, networkFeeCryptoBaseUnit };
                 return Ok(stepData);

package/dist/esm/swappers/ButterSwap/utils/getButterSwapStepData.test.js

@@ -94,7 +94,7 @@ describe('getButterSwapStepData', () => {
             });
             // gasEstimatedTarget 1159118 is ignored - the tx carries the buffered on chain estimate
             expect(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: '500000000000000',
+                networkFeeCryptoBaseUnit: '600000000000000',
                 transactionData: {
                     type: 'evm',
                     chainId: 1,
@@ -121,7 +121,7 @@ describe('getButterSwapStepData', () => {
             const { transactionData, networkFeeCryptoBaseUnit } = actual.unwrap();
             // The buffered limit is set on the tx data in place, so the executable tx always carries one
             expect(transactionData).toMatchObject({ gasLimit: '600000' });
-            expect(networkFeeCryptoBaseUnit).toBe('500000000000000');
+            expect(networkFeeCryptoBaseUnit).toBe('600000000000000');
         });
         it('errors rather than falling back to the provider fee when quote estimation fails', async () => {
             const actual = await getButterSwapStepData({

package/dist/esm/swappers/CetusSwapper/endpoints.js

@@ -1,4 +1,4 @@
-import { getProvidersExcluding } from '@cetusprotocol/aggregator-sdk';
+import { getProvidersExcluding, PYTH_ORACLE_BASED_DEXES } from '@cetusprotocol/aggregator-sdk';
 import { Transaction } from '@mysten/sui/transactions';
 import { toAddressNList } from '@shapeshiftoss/chain-adapters';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
@@ -8,7 +8,6 @@ import { SwapperName } from '../../types.js';
 import { checkSuiSwapStatus, getExecutableTradeStep, isExecutableTradeQuote } from '../../utils/index.js';
 import { getTradeQuote } from './swapperApi/getTradeQuote.js';
 import { getTradeRate } from './swapperApi/getTradeRate.js';
-import { PYTH_DEPENDENT_PROVIDERS } from './utils/constants.js';
 import { findBestRoute, getAggregatorClient, getCoinType, getSuiClient } from './utils/helpers.js';
 export const cetusApi = {
     getTradeQuote: (input, deps) => getTradeQuote(input, deps),
@@ -20,12 +19,12 @@ export const cetusApi = {
         const { accountNumber, sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = step;
         const adapter = assertGetSuiChainAdapter(sellAsset.chainId);
         const rpcUrl = config.VITE_SUI_NODE_URL;
-        const client = getAggregatorClient(rpcUrl);
+        const client = getAggregatorClient(rpcUrl, from);
         const suiClient = getSuiClient(rpcUrl);
         const sellCoinType = getCoinType(sellAsset);
         const buyCoinType = getCoinType(buyAsset);
         // Exclude Pyth-dependent providers to avoid oracle failures
-        const providersWithoutPyth = getProvidersExcluding(PYTH_DEPENDENT_PROVIDERS);
+        const providersWithoutPyth = getProvidersExcluding(PYTH_ORACLE_BASED_DEXES);
         const routerData = await findBestRoute(client, sellCoinType, buyCoinType, sellAmountIncludingProtocolFeesCryptoBaseUnit, providersWithoutPyth);
         if (!routerData) {
             throw new Error(`No route found for ${sellAsset.symbol}/${buyAsset.symbol}`);

package/dist/esm/swappers/CetusSwapper/swapperApi/getCetusStepData.js

@@ -5,9 +5,11 @@ import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constant
 import { SwapperName } from '../../../types.js';
 import { makeNetworkFeeEstimationFailedErr } from '../../../utils/index.js';
 import { getAggregatorClient, getSuiClient } from '../utils/helpers.js';
+// The 0x0 dummy sender only holds dust SUI, so server-side gas selection exceeds the payment object limit
+const UNFUNDED_SENDER_ERRORS = ['Insufficient balance of', 'maximum number of gas payment objects'];
 export async function getCetusStepData(args) {
     const { routerData, rpcUrl, slippageTolerancePercentageDecimal, from } = args;
-    const client = getAggregatorClient(rpcUrl);
+    const client = getAggregatorClient(rpcUrl, from);
     const suiClient = getSuiClient(rpcUrl);
     const slippage = bnOrZero(slippageTolerancePercentageDecimal ??
         getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Cetus)).toNumber();
@@ -17,12 +19,14 @@ export async function getCetusStepData(args) {
         txb.setSender(from);
         await client.fastRouterSwap({ router: routerData, slippage, txb, refreshAllCoins: true });
         const transactionBytes = await txb.build({ client: suiClient });
-        const dryRunResult = await suiClient.dryRunTransactionBlock({
-            transactionBlock: transactionBytes,
+        const dryRunResult = await suiClient.simulateTransaction({
+            transaction: transactionBytes,
+            include: { effects: true },
         });
-        const computationCost = BigInt(dryRunResult.effects.gasUsed.computationCost);
-        const storageCost = BigInt(dryRunResult.effects.gasUsed.storageCost);
-        const storageRebate = BigInt(dryRunResult.effects.gasUsed.storageRebate);
+        const { gasUsed } = (dryRunResult.Transaction ?? dryRunResult.FailedTransaction).effects;
+        const computationCost = BigInt(gasUsed.computationCost);
+        const storageCost = BigInt(gasUsed.storageCost);
+        const storageRebate = BigInt(gasUsed.storageRebate);
         const netStorageCost = storageCost > storageRebate ? storageCost - storageRebate : 0n;
         return (computationCost + netStorageCost).toString();
     };
@@ -33,8 +37,9 @@ export async function getCetusStepData(args) {
             return Ok(stepData);
         }
         catch (error) {
-            // Walletless rates have no coins to dry-run against - degrade to an unknown fee, but a real route/build error still fails
-            if (error instanceof Error && error.message.includes('Not enough coins of type')) {
+            // Walletless rates have no usable coins to dry-run against - degrade to an unknown fee, but a real route/build error still fails
+            const errorMessage = error instanceof Error ? error.message : '';
+            if (UNFUNDED_SENDER_ERRORS.some(message => errorMessage.includes(message))) {
                 const stepData = { networkFeeCryptoBaseUnit: undefined };
                 return Ok(stepData);
             }

package/dist/esm/swappers/CetusSwapper/swapperApi/getCetusTradeContext.js

@@ -1,10 +1,9 @@
-import { getProvidersExcluding } from '@cetusprotocol/aggregator-sdk';
+import { getProvidersExcluding, PYTH_ORACLE_BASED_DEXES } from '@cetusprotocol/aggregator-sdk';
 import { Err, Ok } from '@sniptt/monads';
 import { v4 as uuid } from 'uuid';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { getInputOutputRate, makeSwapErrorRight } from '../../../utils/index.js';
 import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
-import { PYTH_DEPENDENT_PROVIDERS } from '../utils/constants.js';
 import { assertValidTrade, findBestRoute, getAggregatorClient, getCoinType } from '../utils/helpers.js';
 export const getCetusTradeContext = async (input, deps) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps } = input;
@@ -17,7 +16,7 @@ export const getCetusTradeContext = async (input, deps) => {
         const sellCoinType = getCoinType(sellAsset);
         const buyCoinType = getCoinType(buyAsset);
         // Exclude Pyth-dependent providers to avoid oracle failures
-        const providersWithoutPyth = getProvidersExcluding(PYTH_DEPENDENT_PROVIDERS);
+        const providersWithoutPyth = getProvidersExcluding(PYTH_ORACLE_BASED_DEXES);
         const routerData = await findBestRoute(client, sellCoinType, buyCoinType, sellAmountIncludingProtocolFeesCryptoBaseUnit, providersWithoutPyth);
         if (!routerData) {
             return Err(makeSwapErrorRight({

package/dist/esm/swappers/CetusSwapper/swapperApi/getTradeQuote.js

@@ -1,6 +1,5 @@
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getCetusStepData } from './getCetusStepData.js';
 import { getCetusTradeContext } from './getCetusTradeContext.js';
 export const getTradeQuote = async (input, deps) => {
@@ -25,7 +24,6 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/CetusSwapper/utils/constants.d.ts

@@ -1,5 +1,4 @@
 import type { ChainId } from '@shapeshiftoss/caip';
 export declare const SUPPORTED_CETUS_CHAIN_IDS: readonly ChainId[];
 export declare const isSupportedChainId: (chainId: ChainId) => chainId is ChainId;
-export declare const PYTH_DEPENDENT_PROVIDERS: string[];
 export declare const CETUS_FEE_ESTIMATE_DUMMY_ADDRESS = "0x0000000000000000000000000000000000000000000000000000000000000000";