@shapeshiftoss/swapper 20.3.0 → 20.5.0

package/dist/cjs/constants.js

@@ -12,12 +12,15 @@ const CetusSwapper_1 = require("./swappers/CetusSwapper");
 const ChainflipSwapper_1 = require("./swappers/ChainflipSwapper");
 const CowSwapper_1 = require("./swappers/CowSwapper");
 const DebridgeSwapper_1 = require("./swappers/DebridgeSwapper");
+const FyndSwapper_1 = require("./swappers/FyndSwapper");
+const KyberSwapper_1 = require("./swappers/KyberSwapper");
 const MayachainSwapper_1 = require("./swappers/MayachainSwapper");
 const NearIntentsSwapper_1 = require("./swappers/NearIntentsSwapper");
 const PortalsSwapper_1 = require("./swappers/PortalsSwapper");
 const RelaySwapper_1 = require("./swappers/RelaySwapper");
 const StonfiSwapper_1 = require("./swappers/StonfiSwapper");
 const SunioSwapper_1 = require("./swappers/SunioSwapper");
+const SymbiosisSwapper_1 = require("./swappers/SymbiosisSwapper");
 const ThorchainSwapper_1 = require("./swappers/ThorchainSwapper");
 const ZrxSwapper_1 = require("./swappers/ZrxSwapper");
 const types_1 = require("./types");
@@ -102,6 +105,18 @@ exports.swappers = {
         ...BobGatewaySwapper_1.bobGatewaySwapper,
         ...BobGatewaySwapper_1.bobGatewayApi,
     },
+    [types_1.SwapperName.Symbiosis]: {
+        ...SymbiosisSwapper_1.symbiosisSwapper,
+        ...SymbiosisSwapper_1.symbiosisApi,
+    },
+    [types_1.SwapperName.Fynd]: {
+        ...FyndSwapper_1.fyndSwapper,
+        ...FyndSwapper_1.fyndApi,
+    },
+    [types_1.SwapperName.KyberSwap]: {
+        ...KyberSwapper_1.kyberSwapper,
+        ...KyberSwapper_1.kyberApi,
+    },
     [types_1.SwapperName.Test]: undefined,
 };
 const DEFAULT_SLIPPAGE_DECIMAL_PERCENTAGE = '0.002';
@@ -121,12 +136,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';
 const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
     if (swapperName === undefined)
         return DEFAULT_SLIPPAGE_DECIMAL_PERCENTAGE;
     switch (swapperName) {
         case types_1.SwapperName.Zrx:
         case types_1.SwapperName.Bebop:
+        case types_1.SwapperName.Fynd:
+        case types_1.SwapperName.KyberSwap:
         case types_1.SwapperName.Test:
             return DEFAULT_SLIPPAGE_DECIMAL_PERCENTAGE;
         case types_1.SwapperName.CowSwap:
@@ -161,6 +180,8 @@ const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
             return DEFAULT_STONFI_SLIPPAGE_DECIMAL_PERCENTAGE;
         case types_1.SwapperName.BobGateway:
             return DEFAULT_BOB_GATEWAY_SLIPPAGE_DECIMAL_PERCENTAGE;
+        case types_1.SwapperName.Symbiosis:
+            return DEFAULT_SYMBIOSIS_SLIPPAGE_DECIMAL_PERCENTAGE;
         default:
             return (0, utils_1.assertUnreachable)(swapperName);
     }

package/dist/cjs/index.d.ts

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

package/dist/cjs/index.js

@@ -44,11 +44,14 @@ __exportStar(require("./swappers/ChainflipSwapper"), exports);
 __exportStar(require("./swappers/SunioSwapper"), exports);
 __exportStar(require("./swappers/CowSwapper"), exports);
 __exportStar(require("./swappers/DebridgeSwapper"), exports);
+__exportStar(require("./swappers/FyndSwapper"), exports);
+__exportStar(require("./swappers/KyberSwapper"), exports);
 __exportStar(require("./swappers/PortalsSwapper"), exports);
 __exportStar(require("./swappers/ThorchainSwapper"), exports);
 __exportStar(require("./swappers/MayachainSwapper"), exports);
 __exportStar(require("./swappers/ButterSwap"), exports);
 __exportStar(require("./swappers/RelaySwapper"), exports);
+__exportStar(require("./swappers/SymbiosisSwapper"), exports);
 __exportStar(require("./utils/helpers"), exports);
 __exportStar(require("./utils/thorchain"), exports);
 __exportStar(require("./types"), exports);

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

@@ -21,7 +21,6 @@ async function getAcrossStepData(args) {
                 to: swapTx.to,
                 data: swapTx.data,
                 value: swapTx.value ?? '0',
-                gasLimit: swapTx.gas,
             };
             const stateOverride = {
                 sellAsset,
@@ -29,20 +28,12 @@ async function getAcrossStepData(args) {
                 spenderAddress,
             };
             if (type === 'rate') {
-                const networkFeeCryptoBaseUnit = await (async () => {
-                    try {
-                        return await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
-                            adapter,
-                            transactionData,
-                            from,
-                            supportsEIP1559,
-                            stateOverride,
-                        });
-                    }
-                    catch {
-                        return fallbackNetworkFeeCryptoBaseUnit;
-                    }
-                })();
+                const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
+                    adapter,
+                    supportsEIP1559,
+                    providerGasLimit: swapTx.gas,
+                    simulation: { transactionData, from, stateOverride },
+                }).catch(() => fallbackNetworkFeeCryptoBaseUnit);
                 const stepData = { networkFeeCryptoBaseUnit };
                 return (0, monads_1.Ok)(stepData);
             }
@@ -53,6 +44,7 @@ async function getAcrossStepData(args) {
                     from,
                     supportsEIP1559,
                     stateOverride,
+                    providerGasLimit: swapTx.gas,
                 });
                 const stepData = { transactionData, networkFeeCryptoBaseUnit };
                 return (0, monads_1.Ok)(stepData);

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

@@ -4,7 +4,6 @@ exports.getTradeQuote = exports.getTradeQuoteWithWallet = void 0;
 const hdwallet_core_1 = require("@shapeshiftoss/hdwallet-core");
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
-const helpers_1 = require("../../../utils/helpers");
 const getArbitrumBridgeStepData_1 = require("../utils/getArbitrumBridgeStepData");
 const getArbitrumBridgeTradeContext_1 = require("../utils/getArbitrumBridgeTradeContext");
 const getTradeQuoteWithWallet = async (inputWithWallet, deps) => {
@@ -37,7 +36,6 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -11,7 +11,7 @@ const helpers_1 = require("./utils/helpers");
 exports.avnuApi = {
     getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
     getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
-    getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, slippageTolerancePercentageDecimal, assertGetStarknetChainAdapter, }) => {
+    getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, callsOnly, slippageTolerancePercentageDecimal, assertGetStarknetChainAdapter, }) => {
         if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
         const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
@@ -37,19 +37,23 @@ exports.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 : starknet_1.CallData.compile(rawCalldata);
-            const selector = starknet_1.hash.getSelectorFromName(call.entrypoint);
-            // Normalize contract address from AVNU to ensure consistent format
-            const normalizedContractAddress = (0, starknet_1.validateAndParseAddress)(call.contractAddress);
-            fullCalldata.push(normalizedContractAddress, selector, calldataArray.length.toString(), ...calldataArray.map(cd => String(cd)));
+            const calldata = Array.isArray(rawCalldata) ? rawCalldata : starknet_1.CallData.compile(rawCalldata);
+            return {
+                contractAddress: (0, starknet_1.validateAndParseAddress)(call.contractAddress),
+                entrypoint: call.entrypoint,
+                calldata: calldata.map(String),
+            };
+        });
+        if (callsOnly) {
+            return {
+                addressNList: (0, chain_adapters_1.toAddressNList)(adapter.getBip44Params({ accountNumber })),
+                txHash: '',
+                calls,
+            };
         }
-        // Format calldata for RPC (convert all values to proper hex format)
-        const formattedCalldata = fullCalldata.map(helpers_1.toHexString);
+        const formattedCalldata = starknet_1.transaction.getExecuteCalldata(calls, '1').map(helpers_1.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);
@@ -147,6 +151,7 @@ exports.avnuApi = {
         return {
             addressNList: (0, chain_adapters_1.toAddressNList)(adapter.getBip44Params({ accountNumber })),
             txHash,
+            calls,
             _txDetails: {
                 fromAddress: normalizedFrom,
                 calldata: formattedCalldata,

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

@@ -5,7 +5,6 @@ const monads_1 = require("@sniptt/monads");
 const starknet_1 = require("starknet");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
-const helpers_1 = require("../../../utils/helpers");
 const getAvnuTradeContext_1 = require("../utils/getAvnuTradeContext");
 const getTradeQuote = async (input, deps) => {
     const { sellAsset, accountNumber } = input;
@@ -36,7 +35,7 @@ const getTradeQuote = async (input, deps) => {
             ...tradeCommon,
             receiveAddress: normalizedReceiveAddress,
             quoteOrRate: 'quote',
-            deadline: deadline ?? Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
+            deadline,
             steps: [
                 {
                     ...stepCommon,

package/dist/cjs/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/cjs/swappers/BebopSwapper/utils/fetchFromBebop.js

@@ -11,6 +11,9 @@ const helpers_1 = require("../../../utils/helpers");
 const types_2 = require("../types");
 const bebopService_1 = require("./bebopService");
 const helpers_2 = require("./helpers");
+// PMM charges the fee set against our api key, which nets exactly this bps
+const BEBOP_PMM_AFFILIATE_BPS = '60';
+const isPmmEligible = (affiliateBps) => (0, utils_1.bnOrZero)(affiliateBps).eq(BEBOP_PMM_AFFILIATE_BPS);
 const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
         const sellToken = (0, helpers_2.assetIdToBebopToken)(sellAsset.assetId);
@@ -30,26 +33,24 @@ const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtoco
             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', (0, viem_1.getAddress)((0, helpers_1.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 && (0, utils_1.bnOrZero)(affiliateBps).gt(0) ? affiliateBps : '1');
+        jamParams.set('fee_recipient', (0, viem_1.getAddress)((0, helpers_1.getTreasuryAddressFromChainId)(buyAsset.chainId)));
         const service = (0, bebopService_1.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 (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
                 message: 'Failed to fetch quote from Bebop',
@@ -80,8 +81,14 @@ const fetchBebopQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtoco
     }
 };
 exports.fetchBebopQuote = fetchBebopQuote;
-const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, apiKey, }) => {
+const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, takerAddress, receiverAddress, slippageTolerancePercentageDecimal, affiliateBps, apiKey, }) => {
     try {
+        if (!isPmmEligible(affiliateBps)) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: 'Bebop Solana is PMM only and cannot take the requested bps',
+                code: types_1.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 === caip_1.solAssetId) {
@@ -104,7 +111,6 @@ const fetchBebopSolanaQuote = async ({ buyAsset, sellAsset, sellAmountIncludingP
             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 (0, bebopService_1.bebopServiceFactory)({ apiKey }).get('https://api.bebop.xyz/pmm/solana/v3/quote', { params });

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

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

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

@@ -11,41 +11,36 @@ 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 (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
-                    adapter,
-                    supportsEIP1559,
-                    gasLimit: (0, utils_1.bnOrZero)(tx.gas).toString(),
-                });
-            }
-            catch {
-                return (0, utils_1.bnOrZero)(tx.gas).times((0, utils_1.bnOrZero)(tx.gasPrice)).toFixed(0);
-            }
-        })();
-        const stepData = { networkFeeCryptoBaseUnit };
-        return (0, monads_1.Ok)(stepData);
-    }
     const transactionData = {
         type: 'evm',
         chainId: Number((0, caip_1.fromChainId)(sellAsset.chainId).chainReference),
         to: tx.to,
         data: tx.data,
         value: (0, viem_1.fromHex)(tx.value, 'bigint').toString(),
-        gasLimit: tx.gas?.toString(),
     };
+    const stateOverride = {
+        sellAsset,
+        sellAmountCryptoBaseUnit,
+        spenderAddress,
+    };
+    if (type === 'rate') {
+        const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
+            adapter,
+            supportsEIP1559,
+            providerGasLimit: tx.gas?.toString(),
+            simulation: { transactionData, from, stateOverride },
+        }).catch(() => (0, utils_1.bnOrZero)(tx.gas).times((0, utils_1.bnOrZero)(tx.gasPrice)).toFixed(0));
+        const stepData = { networkFeeCryptoBaseUnit };
+        return (0, monads_1.Ok)(stepData);
+    }
     try {
         const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
             adapter,
             transactionData,
             from,
             supportsEIP1559,
-            stateOverride: {
-                sellAsset,
-                sellAmountCryptoBaseUnit,
-                spenderAddress,
-            },
+            stateOverride,
+            providerGasLimit: tx.gas?.toString(),
         });
         const stepData = { transactionData, networkFeeCryptoBaseUnit };
         return (0, monads_1.Ok)(stepData);

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

@@ -4,7 +4,6 @@ exports.getBobGatewayTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
-const helpers_1 = require("../../../utils/helpers");
 const getBobGatewayStepData_1 = require("../utils/getBobGatewayStepData");
 const getBobGatewayTradeContext_1 = require("../utils/getBobGatewayTradeContext");
 const getBobGatewayTradeQuote = async (input, deps) => {
@@ -38,7 +37,6 @@ const getBobGatewayTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -7,7 +7,6 @@ const monads_1 = require("@sniptt/monads");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
-const helpers_1 = require("../../../utils/helpers");
 const getButterSwapStepData_1 = require("../utils/getButterSwapStepData");
 const getButterSwapTradeContext_1 = require("../utils/getButterSwapTradeContext");
 const xhr_1 = require("../xhr");
@@ -63,7 +62,6 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -56,6 +56,7 @@ const mockEvmChainAdapter = {
             assertGetNearChainAdapter: () => vitest_1.vi.fn(),
             assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
             assertGetTonChainAdapter: () => vitest_1.vi.fn(),
+            assertGetAptosChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

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

@@ -36,6 +36,7 @@ const mockEvmChainAdapter = {
             assertGetNearChainAdapter: () => vitest_1.vi.fn(),
             assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
             assertGetTonChainAdapter: () => vitest_1.vi.fn(),
+            assertGetAptosChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

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

@@ -28,10 +28,10 @@ async function getButterSwapStepData(args) {
             if (args.type === 'rate') {
                 const networkFeeCryptoBaseUnit = await (async () => {
                     try {
-                        return await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
+                        return await (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
                             adapter,
                             supportsEIP1559,
-                            gasLimit: (0, utils_1.bnOrZero)(route.gasEstimatedTarget).toFixed(),
+                            providerGasLimit: (0, utils_1.bnOrZero)(route.gasEstimatedTarget).toFixed(),
                         });
                     }
                     catch {
@@ -55,13 +55,12 @@ 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: (0, utils_1.bnOrZero)(route.gasEstimatedTarget).toFixed(),
                 });
                 const stepData = { transactionData, networkFeeCryptoBaseUnit };
                 return (0, monads_1.Ok)(stepData);

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

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

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

@@ -11,7 +11,6 @@ const types_1 = require("../../types");
 const utils_2 = require("../../utils");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
 const getTradeRate_1 = require("./swapperApi/getTradeRate");
-const constants_2 = require("./utils/constants");
 const helpers_1 = require("./utils/helpers");
 exports.cetusApi = {
     getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
@@ -23,12 +22,12 @@ exports.cetusApi = {
         const { accountNumber, sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = step;
         const adapter = assertGetSuiChainAdapter(sellAsset.chainId);
         const rpcUrl = config.VITE_SUI_NODE_URL;
-        const client = (0, helpers_1.getAggregatorClient)(rpcUrl);
+        const client = (0, helpers_1.getAggregatorClient)(rpcUrl, from);
         const suiClient = (0, helpers_1.getSuiClient)(rpcUrl);
         const sellCoinType = (0, helpers_1.getCoinType)(sellAsset);
         const buyCoinType = (0, helpers_1.getCoinType)(buyAsset);
         // Exclude Pyth-dependent providers to avoid oracle failures
-        const providersWithoutPyth = (0, aggregator_sdk_1.getProvidersExcluding)(constants_2.PYTH_DEPENDENT_PROVIDERS);
+        const providersWithoutPyth = (0, aggregator_sdk_1.getProvidersExcluding)(aggregator_sdk_1.PYTH_ORACLE_BASED_DEXES);
         const routerData = await (0, helpers_1.findBestRoute)(client, sellCoinType, buyCoinType, sellAmountIncludingProtocolFeesCryptoBaseUnit, providersWithoutPyth);
         if (!routerData) {
             throw new Error(`No route found for ${sellAsset.symbol}/${buyAsset.symbol}`);

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

@@ -8,9 +8,11 @@ const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
 const helpers_1 = require("../utils/helpers");
+// 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'];
 async function getCetusStepData(args) {
     const { routerData, rpcUrl, slippageTolerancePercentageDecimal, from } = args;
-    const client = (0, helpers_1.getAggregatorClient)(rpcUrl);
+    const client = (0, helpers_1.getAggregatorClient)(rpcUrl, from);
     const suiClient = (0, helpers_1.getSuiClient)(rpcUrl);
     const slippage = (0, utils_1.bnOrZero)(slippageTolerancePercentageDecimal ??
         (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Cetus)).toNumber();
@@ -20,12 +22,14 @@ 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();
     };
@@ -36,8 +40,9 @@ async function getCetusStepData(args) {
             return (0, monads_1.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 (0, monads_1.Ok)(stepData);
             }

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

@@ -7,7 +7,6 @@ const uuid_1 = require("uuid");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
 const affiliateFee_1 = require("../../../utils/affiliateFee");
-const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers");
 const getCetusTradeContext = async (input, deps) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps } = input;
@@ -20,7 +19,7 @@ const getCetusTradeContext = async (input, deps) => {
         const sellCoinType = (0, helpers_1.getCoinType)(sellAsset);
         const buyCoinType = (0, helpers_1.getCoinType)(buyAsset);
         // Exclude Pyth-dependent providers to avoid oracle failures
-        const providersWithoutPyth = (0, aggregator_sdk_1.getProvidersExcluding)(constants_1.PYTH_DEPENDENT_PROVIDERS);
+        const providersWithoutPyth = (0, aggregator_sdk_1.getProvidersExcluding)(aggregator_sdk_1.PYTH_ORACLE_BASED_DEXES);
         const routerData = await (0, helpers_1.findBestRoute)(client, sellCoinType, buyCoinType, sellAmountIncludingProtocolFeesCryptoBaseUnit, providersWithoutPyth);
         if (!routerData) {
             return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
-const helpers_1 = require("../../../utils/helpers");
 const getCetusStepData_1 = require("./getCetusStepData");
 const getCetusTradeContext_1 = require("./getCetusTradeContext");
 const getTradeQuote = async (input, deps) => {
@@ -28,7 +27,6 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/cjs/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";

package/dist/cjs/swappers/CetusSwapper/utils/constants.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CETUS_FEE_ESTIMATE_DUMMY_ADDRESS = exports.PYTH_DEPENDENT_PROVIDERS = exports.isSupportedChainId = exports.SUPPORTED_CETUS_CHAIN_IDS = void 0;
+exports.CETUS_FEE_ESTIMATE_DUMMY_ADDRESS = exports.isSupportedChainId = exports.SUPPORTED_CETUS_CHAIN_IDS = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 exports.SUPPORTED_CETUS_CHAIN_IDS = [caip_1.suiChainId];
 const isSupportedChainId = (chainId) => {
     return exports.SUPPORTED_CETUS_CHAIN_IDS.includes(chainId);
 };
 exports.isSupportedChainId = isSupportedChainId;
-exports.PYTH_DEPENDENT_PROVIDERS = ['HAEDALPMM', 'HAEDALHMMV2', 'METASTABLE'];
 // Placeholder sender for walletless rate fee estimation - dry-run needs a sender, real coins aren't required
 exports.CETUS_FEE_ESTIMATE_DUMMY_ADDRESS = '0x0000000000000000000000000000000000000000000000000000000000000000';

package/dist/cjs/swappers/CetusSwapper/utils/helpers.d.ts

@@ -1,11 +1,11 @@
 import type { RouterDataV3 } from '@cetusprotocol/aggregator-sdk';
 import { AggregatorClient } from '@cetusprotocol/aggregator-sdk';
-import { SuiClient } from '@mysten/sui/client';
+import { SuiGrpcClient } from '@mysten/sui/grpc';
 import type { Asset } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
 import type { SwapErrorRight } from '../../../types';
-export declare const getAggregatorClient: (rpcUrl: string) => AggregatorClient;
-export declare const getSuiClient: (rpcUrl: string) => SuiClient;
+export declare const getSuiClient: (rpcUrl: string) => SuiGrpcClient;
+export declare const getAggregatorClient: (rpcUrl: string, signer?: string) => AggregatorClient;
 export declare const assertValidTrade: ({ sellAsset, buyAsset, }: {
     sellAsset: Asset;
     buyAsset: Asset;