@shapeshiftoss/swapper 20.4.0 → 20.6.0

package/dist/cjs/constants.js

@@ -13,6 +13,7 @@ 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");
@@ -112,6 +113,10 @@ exports.swappers = {
         ...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';
@@ -140,6 +145,7 @@ const getDefaultSlippageDecimalPercentageForSwapper = (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:

package/dist/cjs/index.d.ts

@@ -16,6 +16,7 @@ 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';

package/dist/cjs/index.js

@@ -45,6 +45,7 @@ __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);

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/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/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/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/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;

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

@@ -1,37 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findBestRoute = exports.getCoinType = exports.assertValidTrade = exports.getSuiClient = exports.getAggregatorClient = void 0;
+exports.findBestRoute = exports.getCoinType = exports.assertValidTrade = exports.getAggregatorClient = exports.getSuiClient = void 0;
 const aggregator_sdk_1 = require("@cetusprotocol/aggregator-sdk");
-const client_1 = require("@mysten/sui/client");
+const grpc_1 = require("@mysten/sui/grpc");
 const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
 const constants_1 = require("./constants");
 let suiClientInstance;
-let aggregatorClientInstance;
 let currentRpcUrl;
-const getAggregatorClient = (rpcUrl) => {
-    if (!aggregatorClientInstance || !suiClientInstance || currentRpcUrl !== rpcUrl) {
-        suiClientInstance = new client_1.SuiClient({ url: rpcUrl });
-        aggregatorClientInstance = new aggregator_sdk_1.AggregatorClient({
-            client: suiClientInstance,
-            env: aggregator_sdk_1.Env.Mainnet,
-            signer: '0x0',
-        });
-        currentRpcUrl = rpcUrl;
-    }
-    return aggregatorClientInstance;
-};
-exports.getAggregatorClient = getAggregatorClient;
 const getSuiClient = (rpcUrl) => {
     if (!suiClientInstance || currentRpcUrl !== rpcUrl) {
-        suiClientInstance = new client_1.SuiClient({ url: rpcUrl });
+        suiClientInstance = new grpc_1.SuiGrpcClient({ network: 'mainnet', baseUrl: rpcUrl });
         currentRpcUrl = rpcUrl;
     }
     return suiClientInstance;
 };
 exports.getSuiClient = getSuiClient;
+// Cetus merges the swap output into an existing coin owned by signer, so it must be the tx sender
+const getAggregatorClient = (rpcUrl, signer) => new aggregator_sdk_1.AggregatorClient({ client: (0, exports.getSuiClient)(rpcUrl), env: aggregator_sdk_1.Env.Mainnet, signer });
+exports.getAggregatorClient = getAggregatorClient;
 const assertValidTrade = ({ sellAsset, buyAsset, }) => {
     if (!(0, constants_1.isSupportedChainId)(sellAsset.chainId)) {
         return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({

package/dist/cjs/swappers/DebridgeSwapper/utils/getDebridgeStepData.d.ts

@@ -4,7 +4,6 @@ import type { DebridgeTx } from './types';
 type BaseArgs = {
     tx: DebridgeTx;
     sellAmountCryptoBaseUnit: string;
-    gasLimit: string | undefined;
     spenderAddress: string;
     fallbackNetworkFeeCryptoBaseUnit: string | undefined;
 };

package/dist/cjs/swappers/DebridgeSwapper/utils/getDebridgeStepData.js

@@ -6,7 +6,7 @@ const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 async function getDebridgeStepData(args) {
-    const { tx, sellAmountCryptoBaseUnit, gasLimit, spenderAddress, fallbackNetworkFeeCryptoBaseUnit, sellAsset, from, type, input, deps, } = args;
+    const { tx, sellAmountCryptoBaseUnit, spenderAddress, fallbackNetworkFeeCryptoBaseUnit, sellAsset, from, type, input, deps, } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     const transactionData = {
@@ -15,7 +15,6 @@ async function getDebridgeStepData(args) {
         to: tx.to,
         data: tx.data,
         value: tx.value,
-        gasLimit,
     };
     const stateOverride = {
         sellAsset,
@@ -23,20 +22,14 @@ async function getDebridgeStepData(args) {
         spenderAddress,
     };
     if (type === 'rate') {
-        const networkFeeCryptoBaseUnit = await (async () => {
-            try {
-                return await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
-                    adapter,
-                    transactionData,
-                    from,
-                    supportsEIP1559,
-                    stateOverride,
-                });
-            }
-            catch {
-                return fallbackNetworkFeeCryptoBaseUnit;
-            }
-        })();
+        // deBridge returns a flat gas limit far above actual usage, so rates simulate instead
+        const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
+            adapter,
+            transactionData,
+            from,
+            supportsEIP1559,
+            stateOverride,
+        }).catch(() => fallbackNetworkFeeCryptoBaseUnit);
         const stepData = { networkFeeCryptoBaseUnit };
         return (0, monads_1.Ok)(stepData);
     }

package/dist/cjs/swappers/DebridgeSwapper/utils/getDebridgeTradeContext.js

@@ -85,7 +85,6 @@ const getDebridgeTradeContext = async ({ input, deps, senderAddress, recipientAd
         stepDataArgs: {
             tx: quote.tx,
             sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            gasLimit: quote.gasLimit,
             fallbackNetworkFeeCryptoBaseUnit: quote.fallbackNetworkFeeCryptoBaseUnit,
             sellAsset,
             spenderAddress: allowanceContract,
@@ -139,7 +138,6 @@ const fetchCrossChainQuote = async ({ input, deps, sellDebridgeChainId, buyDebri
         isSameChainSwap: false,
         slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,
         tx: quote.tx,
-        gasLimit: quote.estimatedTransactionFee?.details.gasLimit,
         fallbackNetworkFeeCryptoBaseUnit: quote.estimatedTransactionFee?.total,
     });
 };
@@ -195,7 +193,6 @@ const fetchSameChainQuote = async ({ input, deps, sellDebridgeChainId, senderAdd
         slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal ??
             (quote.slippage ? (0, utils_1.bnOrZero)(quote.slippage).div(100).toString() : undefined),
         tx: quote.tx,
-        gasLimit: quote.estimatedTransactionFee?.details.gasLimit,
         fallbackNetworkFeeCryptoBaseUnit: quote.estimatedTransactionFee?.total,
     });
 };

package/dist/cjs/swappers/FyndSwapper/utils/getFyndStepData.js

@@ -18,15 +18,12 @@ async function getFyndStepData(args) {
     };
     const stateOverride = { sellAsset, sellAmountCryptoBaseUnit, spenderAddress };
     if (type === 'rate') {
-        const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
+        const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
             adapter,
-            transactionData,
-            from,
             supportsEIP1559,
-            stateOverride,
-        })
-            .catch(() => (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({ adapter, supportsEIP1559, gasLimit: quote.gas_estimate }))
-            .catch(() => undefined);
+            providerGasLimit: quote.gas_estimate,
+            simulation: { transactionData, from, stateOverride },
+        }).catch(() => undefined);
         const stepData = { networkFeeCryptoBaseUnit };
         return (0, monads_1.Ok)(stepData);
     }
@@ -37,6 +34,7 @@ async function getFyndStepData(args) {
             from,
             supportsEIP1559,
             stateOverride,
+            providerGasLimit: quote.gas_estimate,
         });
         const stepData = { transactionData, networkFeeCryptoBaseUnit };
         return (0, monads_1.Ok)(stepData);

package/dist/cjs/swappers/KyberSwapper/KyberSwapper.d.ts

@@ -0,0 +1,2 @@
+import type { Swapper } from '../../types';
+export declare const kyberSwapper: Swapper;

package/dist/cjs/swappers/KyberSwapper/KyberSwapper.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.kyberSwapper = void 0;
+const utils_1 = require("../../utils");
+exports.kyberSwapper = { executeEvmTransaction: utils_1.executeEvmTransaction };

package/dist/cjs/swappers/KyberSwapper/endpoints.d.ts

@@ -0,0 +1,2 @@
+import type { SwapperApi } from '../../types';
+export declare const kyberApi: SwapperApi;

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.kyberApi = void 0;
+const utils_1 = require("../../utils");
+const evm_1 = require("../../utils/evm");
+const getKyberTradeQuote_1 = require("./swapperApi/getKyberTradeQuote");
+const getKyberTradeRate_1 = require("./swapperApi/getKyberTradeRate");
+exports.kyberApi = {
+    getTradeQuote: (input, deps) => (0, getKyberTradeQuote_1.getKyberTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getKyberTradeRate_1.getKyberTradeRate)(input, deps),
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
+    checkTradeStatus: utils_1.checkEvmSwapStatus,
+};

package/dist/cjs/swappers/KyberSwapper/index.d.ts

@@ -0,0 +1,2 @@
+export { kyberApi } from './endpoints';
+export { kyberSwapper } from './KyberSwapper';

package/dist/cjs/swappers/KyberSwapper/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.kyberSwapper = exports.kyberApi = void 0;
+var endpoints_1 = require("./endpoints");
+Object.defineProperty(exports, "kyberApi", { enumerable: true, get: function () { return endpoints_1.kyberApi; } });
+var KyberSwapper_1 = require("./KyberSwapper");
+Object.defineProperty(exports, "kyberSwapper", { enumerable: true, get: function () { return KyberSwapper_1.kyberSwapper; } });

package/dist/cjs/swappers/KyberSwapper/swapperApi/getKyberTradeQuote.d.ts

@@ -0,0 +1,4 @@
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+import type { KyberTradeQuoteInput } from '../types';
+export declare const getKyberTradeQuote: (input: KyberTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;