@shapeshiftoss/swapper 17.6.7 → 17.6.8

package/dist/cjs/swappers/AvnuSwapper/types.d.ts

@@ -0,0 +1,2 @@
+import type { KnownChainIds } from '@shapeshiftoss/types';
+export type AvnuSupportedChainId = typeof KnownChainIds.StarknetMainnet;

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/swappers/AvnuSwapper/utils/constants.d.ts

@@ -0,0 +1,5 @@
+import type { ChainId } from '@shapeshiftoss/caip';
+export declare const AVNU_SUPPORTED_CHAIN_IDS: readonly ChainId[];
+export declare const isSupportedChainId: (chainId: ChainId) => chainId is ChainId;
+export declare const DEFAULT_SLIPPAGE_PERCENTAGE = "0.005";
+export declare const AVNU_API_BASE_URL = "https://starknet.api.avnu.fi";

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AVNU_API_BASE_URL = exports.DEFAULT_SLIPPAGE_PERCENTAGE = exports.isSupportedChainId = exports.AVNU_SUPPORTED_CHAIN_IDS = void 0;
+const types_1 = require("@shapeshiftoss/types");
+exports.AVNU_SUPPORTED_CHAIN_IDS = [types_1.KnownChainIds.StarknetMainnet];
+const isSupportedChainId = (chainId) => {
+    return exports.AVNU_SUPPORTED_CHAIN_IDS.includes(chainId);
+};
+exports.isSupportedChainId = isSupportedChainId;
+exports.DEFAULT_SLIPPAGE_PERCENTAGE = '0.005';
+exports.AVNU_API_BASE_URL = 'https://starknet.api.avnu.fi';

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

@@ -0,0 +1,7 @@
+import type { Asset } from '@shapeshiftoss/types';
+/**
+ * Get the token address for AVNU swaps
+ * For native STRK token (slip44 namespace), returns the STRK contract address
+ * For other tokens, returns the token contract address from assetReference
+ */
+export declare const getTokenAddress: (asset: Asset) => string;

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenAddress = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+// STRK native token contract address on Starknet
+const AVNU_STRK_NATIVE_ADDRESS = '0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d';
+/**
+ * Get the token address for AVNU swaps
+ * For native STRK token (slip44 namespace), returns the STRK contract address
+ * For other tokens, returns the token contract address from assetReference
+ */
+const getTokenAddress = (asset) => {
+    const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(asset.assetId);
+    // For native STRK token, the assetReference is 'slip44:9004' but AVNU expects the STRK contract address
+    if (assetNamespace === 'slip44') {
+        return AVNU_STRK_NATIVE_ADDRESS;
+    }
+    // For other tokens, the assetReference should be the token contract address
+    return assetReference;
+};
+exports.getTokenAddress = getTokenAddress;

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

@@ -34,6 +34,8 @@ vitest_1.vi.mock('../xhr', () => ({
             assertGetSolanaChainAdapter: () => vitest_1.vi.fn(),
             assertGetTronChainAdapter: () => vitest_1.vi.fn(),
             assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
+            assertGetNearChainAdapter: () => vitest_1.vi.fn(),
+            assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

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

@@ -28,6 +28,8 @@ vitest_1.vi.mock('../utils/butterSwapService', () => ({
             assertGetSolanaChainAdapter: () => vitest_1.vi.fn(),
             assertGetTronChainAdapter: () => vitest_1.vi.fn(),
             assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
+            assertGetNearChainAdapter: () => vitest_1.vi.fn(),
+            assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },
@@ -62,6 +64,8 @@ vitest_1.vi.mock('../utils/butterSwapService', () => ({
             assertGetSolanaChainAdapter: () => vitest_1.vi.fn(),
             assertGetTronChainAdapter: () => vitest_1.vi.fn(),
             assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
+            assertGetNearChainAdapter: () => vitest_1.vi.fn(),
+            assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

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

@@ -10,6 +10,7 @@ const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
     42161: types_1.KnownChainIds.ArbitrumMainnet,
     10: types_1.KnownChainIds.OptimismMainnet,
     8453: types_1.KnownChainIds.BaseMainnet,
+    43114: types_1.KnownChainIds.AvalancheMainnet,
     1360108768460801: types_1.KnownChainIds.SolanaMainnet,
     1360095883558913: types_1.KnownChainIds.BitcoinMainnet,
 };

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

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cetusApi = void 0;
+const aggregator_sdk_1 = require("@cetusprotocol/aggregator-sdk");
+const transactions_1 = require("@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
-const utils_1 = require("../../utils");
+const utils_1 = require("@shapeshiftoss/utils");
+const constants_1 = require("../../constants");
+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) => {
@@ -13,36 +19,35 @@ exports.cetusApi = {
     getTradeRate: (input, deps) => {
         return (0, getTradeRate_1.getTradeRate)(input, deps);
     },
-    getUnsignedSuiTransaction: async ({ stepIndex, tradeQuote, from, assertGetSuiChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
+    getUnsignedSuiTransaction: async ({ stepIndex, tradeQuote, from, assertGetSuiChainAdapter, config, }) => {
+        if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+        const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
         const { accountNumber, sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = step;
         const adapter = assertGetSuiChainAdapter(sellAsset.chainId);
-        const sdk = await (0, helpers_1.getCetusSDK)();
-        sdk.senderAddress = from;
+        const rpcUrl = config.VITE_SUI_NODE_URL;
+        const client = (0, helpers_1.getAggregatorClient)(rpcUrl);
+        const suiClient = (0, helpers_1.getSuiClient)(rpcUrl);
         const sellCoinType = (0, helpers_1.getCoinType)(sellAsset);
         const buyCoinType = (0, helpers_1.getCoinType)(buyAsset);
-        const pool = await (0, helpers_1.findBestPool)(sdk, sellCoinType, buyCoinType);
-        if (!pool) {
-            throw new Error(`No liquidity pool found for ${sellAsset.symbol}/${buyAsset.symbol}`);
+        // Exclude Pyth-dependent providers to avoid oracle failures
+        const providersWithoutPyth = (0, aggregator_sdk_1.getProvidersExcluding)(constants_2.PYTH_DEPENDENT_PROVIDERS);
+        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}`);
         }
-        const swapResult = await (0, helpers_1.calculateSwapAmounts)(sdk, pool, sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit);
-        if (!swapResult) {
-            throw new Error(`Failed to calculate swap for ${sellAsset.symbol}/${buyAsset.symbol}`);
-        }
-        const a2b = (0, helpers_1.determineSwapDirection)(pool, sellCoinType, buyCoinType);
-        const amountLimit = (0, helpers_1.calculateAmountLimit)(swapResult.estimatedAmountOut, tradeQuote.slippageTolerancePercentageDecimal, true);
-        const tx = await sdk.Swap.createSwapTransactionPayload({
-            pool_id: pool.poolAddress,
-            coinTypeA: pool.coinTypeA,
-            coinTypeB: pool.coinTypeB,
-            a2b,
-            by_amount_in: true,
-            amount: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            amount_limit: amountLimit,
+        const slippage = (0, utils_1.bnOrZero)(tradeQuote.slippageTolerancePercentageDecimal ??
+            (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Cetus)).toNumber();
+        const txb = new transactions_1.Transaction();
+        txb.setSender(from);
+        await client.fastRouterSwap({
+            router: routerData,
+            slippage,
+            txb,
+            refreshAllCoins: true,
         });
-        const transactionBytes = await tx.build({ client: adapter.getSuiClient() });
+        const transactionJson = await txb.toJSON({ client: suiClient });
+        const transactionBytes = await txb.build({ client: suiClient });
         const intentMessage = new Uint8Array(3 + transactionBytes.length);
         intentMessage[0] = 0;
         intentMessage[1] = 0;
@@ -59,12 +64,13 @@ exports.cetusApi = {
         return {
             addressNList,
             intentMessageBytes: intentMessage,
+            transactionJson,
         };
     },
     getSuiTransactionFees: ({ tradeQuote, stepIndex }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
+        if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+        const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
         if (!step.feeData.networkFeeCryptoBaseUnit) {
             throw new Error('Missing network fee in quote');
         }
@@ -78,7 +84,7 @@ exports.cetusApi = {
                 message: undefined,
             });
         }
-        return (0, utils_1.checkSuiSwapStatus)({
+        return (0, utils_2.checkSuiSwapStatus)({
             txHash: swap.sellTxHash,
             address: swap.receiveAddress,
             assertGetSuiChainAdapter,

package/dist/cjs/swappers/CetusSwapper/swapperApi/getCetusTradeData.d.ts

@@ -0,0 +1,24 @@
+import type { RouterDataV3 } from '@cetusprotocol/aggregator-sdk';
+import type { AssetId } from '@shapeshiftoss/caip';
+import type { Asset } from '@shapeshiftoss/types';
+import type { Result } from '@sniptt/monads';
+import type { ProtocolFee, SwapErrorRight, SwapperDeps } from '../../../types';
+type CetusTradeDataInput = {
+    sellAsset: Asset;
+    buyAsset: Asset;
+    receiveAddress: string | undefined;
+    sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
+};
+type CetusTradeData = {
+    buyAmountAfterFeesCryptoBaseUnit: string;
+    rate: string;
+    addressForFeeEstimate: string;
+    sellCoinType: string;
+    buyCoinType: string;
+    routerData: RouterDataV3;
+    protocolFees: Record<AssetId, ProtocolFee>;
+    adapter: ReturnType<SwapperDeps['assertGetSuiChainAdapter']>;
+    rpcUrl: string;
+};
+export declare const getCetusTradeData: (input: CetusTradeDataInput, deps: SwapperDeps) => Promise<Result<CetusTradeData, SwapErrorRight>>;
+export {};

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

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCetusTradeData = void 0;
+const aggregator_sdk_1 = require("@cetusprotocol/aggregator-sdk");
+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("../utils/constants");
+const helpers_1 = require("../utils/helpers");
+const getCetusTradeData = async (input, deps) => {
+    const { sellAsset, buyAsset, receiveAddress, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
+    const { assetsById } = deps;
+    if (!(0, constants_1.isSupportedChainId)(sellAsset.chainId)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `unsupported chainId`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+            details: { chainId: sellAsset.chainId },
+        }));
+    }
+    if (!(0, constants_1.isSupportedChainId)(buyAsset.chainId)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `unsupported chainId`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+            details: { chainId: buyAsset.chainId },
+        }));
+    }
+    const suiAsset = assetsById[caip_1.suiAssetId];
+    if (!suiAsset) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `suiAsset is required`,
+            code: types_1.TradeQuoteError.InternalError,
+        }));
+    }
+    try {
+        const adapter = deps.assertGetSuiChainAdapter(sellAsset.chainId);
+        const rpcUrl = deps.config.VITE_SUI_NODE_URL;
+        const client = (0, helpers_1.getAggregatorClient)(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_1.PYTH_DEPENDENT_PROVIDERS);
+        const routerData = await (0, helpers_1.findBestRoute)(client, sellCoinType, buyCoinType, sellAmountIncludingProtocolFeesCryptoBaseUnit, providersWithoutPyth);
+        if (!routerData) {
+            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+                message: `No route found for ${sellAsset.symbol}/${buyAsset.symbol}`,
+                code: types_1.TradeQuoteError.NoRouteFound,
+            }));
+        }
+        const buyAmountAfterFeesCryptoBaseUnit = routerData.amountOut.toString();
+        const rate = (0, utils_1.getInputOutputRate)({
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+            sellAsset,
+            buyAsset,
+        });
+        const dummyAddress = '0x0000000000000000000000000000000000000000000000000000000000000000';
+        const addressForFeeEstimate = receiveAddress ?? dummyAddress;
+        const protocolFees = {};
+        return (0, monads_1.Ok)({
+            buyAmountAfterFeesCryptoBaseUnit,
+            rate,
+            addressForFeeEstimate,
+            sellCoinType,
+            buyCoinType,
+            routerData,
+            protocolFees,
+            adapter,
+            rpcUrl,
+        });
+    }
+    catch (error) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: error instanceof Error ? error.message : 'Unknown error getting Cetus data',
+            code: types_1.TradeQuoteError.QueryFailed,
+        }));
+    }
+};
+exports.getCetusTradeData = getCetusTradeData;

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

@@ -1,82 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
+const transactions_1 = require("@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions");
+const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");
+const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
-const constants_1 = require("../utils/constants");
+const utils_2 = require("../../../utils");
 const helpers_1 = require("../utils/helpers");
+const getCetusTradeData_1 = require("./getCetusTradeData");
 const getTradeQuote = async (input, deps) => {
     const { sellAsset, buyAsset, receiveAddress, accountNumber, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, affiliateBps, slippageTolerancePercentageDecimal, } = input;
-    const { assetsById } = deps;
     if (accountNumber === undefined) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: `accountNumber is required`,
             code: types_1.TradeQuoteError.InternalError,
         }));
     }
-    if (!(0, constants_1.isSupportedChainId)(sellAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `unsupported chainId`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { chainId: sellAsset.chainId },
-        }));
-    }
-    if (!(0, constants_1.isSupportedChainId)(buyAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `unsupported chainId`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { chainId: buyAsset.chainId },
-        }));
-    }
-    const suiAsset = assetsById[caip_1.suiAssetId];
-    if (!suiAsset) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `suiAsset is required`,
-            code: types_1.TradeQuoteError.InternalError,
-        }));
-    }
+    const tradeDataResult = await (0, getCetusTradeData_1.getCetusTradeData)({
+        sellAsset,
+        buyAsset,
+        receiveAddress,
+        sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
+    }, deps);
+    if (tradeDataResult.isErr())
+        return (0, monads_1.Err)(tradeDataResult.unwrapErr());
+    const { buyAmountAfterFeesCryptoBaseUnit, rate, addressForFeeEstimate, routerData, protocolFees, rpcUrl, } = tradeDataResult.unwrap();
     try {
-        const sdk = await (0, helpers_1.getCetusSDK)();
-        const sellCoinType = (0, helpers_1.getCoinType)(sellAsset);
-        const buyCoinType = (0, helpers_1.getCoinType)(buyAsset);
-        const pool = await (0, helpers_1.findBestPool)(sdk, sellCoinType, buyCoinType);
-        if (!pool) {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `No liquidity pool found for ${sellAsset.symbol}/${buyAsset.symbol}`,
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
-        }
-        const swapResult = await (0, helpers_1.calculateSwapAmounts)(sdk, pool, sellAsset, buyAsset, sellAmount);
-        if (!swapResult) {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `Failed to calculate swap for ${sellAsset.symbol}/${buyAsset.symbol}`,
-                code: types_1.TradeQuoteError.QueryFailed,
-            }));
-        }
-        const buyAmountAfterFeesCryptoBaseUnit = swapResult.estimatedAmountOut;
-        const rate = (0, utils_1.getInputOutputRate)({
-            sellAmountCryptoBaseUnit: sellAmount,
-            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-            sellAsset,
-            buyAsset,
+        // Build the actual Cetus swap transaction to get accurate gas estimation
+        const client = (0, helpers_1.getAggregatorClient)(rpcUrl);
+        const suiClient = (0, helpers_1.getSuiClient)(rpcUrl);
+        const slippage = (0, utils_1.bnOrZero)(slippageTolerancePercentageDecimal ??
+            (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Cetus)).toNumber();
+        const txb = new transactions_1.Transaction();
+        txb.setSender(addressForFeeEstimate);
+        await client.fastRouterSwap({
+            router: routerData,
+            slippage,
+            txb,
+            refreshAllCoins: true,
         });
-        const adapter = deps.assertGetSuiChainAdapter(sellAsset.chainId);
-        const dummyAddress = '0x0000000000000000000000000000000000000000000000000000000000000000';
-        const addressForFeeEstimate = receiveAddress ?? dummyAddress;
-        const getFeeDataInput = {
-            to: addressForFeeEstimate,
-            value: sellAmount,
-            chainSpecific: {
-                from: addressForFeeEstimate,
-                tokenId: (0, helpers_1.getCoinType)(sellAsset),
-            },
-        };
-        const feeData = await adapter.getFeeData(getFeeDataInput);
-        const protocolFees = {};
-        const quotes = [];
+        const transactionBytes = await txb.build({ client: suiClient });
+        const dryRunResult = await suiClient.dryRunTransactionBlock({
+            transactionBlock: transactionBytes,
+        });
+        const computationCost = BigInt(dryRunResult.effects.gasUsed.computationCost);
+        const storageCost = BigInt(dryRunResult.effects.gasUsed.storageCost);
+        const storageRebate = BigInt(dryRunResult.effects.gasUsed.storageRebate);
+        const netStorageCost = storageCost > storageRebate ? storageCost - storageRebate : 0n;
+        const estimatedGas = computationCost + netStorageCost;
+        const txFee = estimatedGas.toString();
+        const gasBudget = ((estimatedGas * 120n) / 100n).toString();
+        const gasPrice = await suiClient.getReferenceGasPrice();
         const tradeQuote = {
             id: (0, uuid_1.v4)(),
             quoteOrRate: 'quote',
@@ -93,10 +69,10 @@ const getTradeQuote = async (input, deps) => {
                     sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
                     feeData: {
                         protocolFees,
-                        networkFeeCryptoBaseUnit: feeData.fast.txFee,
+                        networkFeeCryptoBaseUnit: txFee,
                         chainSpecific: {
-                            gasBudget: feeData.fast.chainSpecific.gasBudget,
-                            gasPrice: feeData.fast.chainSpecific.gasPrice,
+                            gasBudget,
+                            gasPrice: gasPrice.toString(),
                         },
                     },
                     rate,
@@ -108,12 +84,11 @@ const getTradeQuote = async (input, deps) => {
                 },
             ],
         };
-        quotes.push(tradeQuote);
-        return (0, monads_1.Ok)(quotes);
+        return tradeDataResult.map(() => [tradeQuote]);
     }
     catch (error) {
         console.error(error);
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: error instanceof Error ? error.message : 'Unknown error getting Cetus quote',
             code: types_1.TradeQuoteError.QueryFailed,
         }));

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

@@ -1,75 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRate = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
+const transactions_1 = require("@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions");
+const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");
+const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
-const constants_1 = require("../utils/constants");
+const utils_2 = require("../../../utils");
 const helpers_1 = require("../utils/helpers");
+const getCetusTradeData_1 = require("./getCetusTradeData");
 const getTradeRate = async (input, deps) => {
     const { sellAsset, buyAsset, receiveAddress, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, affiliateBps, slippageTolerancePercentageDecimal, } = input;
-    const { assetsById } = deps;
-    if (!(0, constants_1.isSupportedChainId)(sellAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `unsupported chainId`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { chainId: sellAsset.chainId },
-        }));
-    }
-    if (!(0, constants_1.isSupportedChainId)(buyAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `unsupported chainId`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { chainId: buyAsset.chainId },
-        }));
-    }
-    const suiAsset = assetsById[caip_1.suiAssetId];
-    if (!suiAsset) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `suiAsset is required`,
-            code: types_1.TradeQuoteError.UnknownError,
-        }));
-    }
+    const tradeDataResult = await (0, getCetusTradeData_1.getCetusTradeData)({
+        sellAsset,
+        buyAsset,
+        receiveAddress,
+        sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
+    }, deps);
+    if (tradeDataResult.isErr())
+        return (0, monads_1.Err)(tradeDataResult.unwrapErr());
+    const { buyAmountAfterFeesCryptoBaseUnit, rate, addressForFeeEstimate, routerData, protocolFees, rpcUrl, } = tradeDataResult.unwrap();
     try {
-        const sdk = await (0, helpers_1.getCetusSDK)();
-        const sellCoinType = (0, helpers_1.getCoinType)(sellAsset);
-        const buyCoinType = (0, helpers_1.getCoinType)(buyAsset);
-        const pool = await (0, helpers_1.findBestPool)(sdk, sellCoinType, buyCoinType);
-        if (!pool) {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `No liquidity pool found for ${sellAsset.symbol}/${buyAsset.symbol}`,
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
-        }
-        const swapResult = await (0, helpers_1.calculateSwapAmounts)(sdk, pool, sellAsset, buyAsset, sellAmount);
-        if (!swapResult) {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `Failed to calculate swap for ${sellAsset.symbol}/${buyAsset.symbol}`,
-                code: types_1.TradeQuoteError.QueryFailed,
-            }));
-        }
-        const buyAmountAfterFeesCryptoBaseUnit = swapResult.estimatedAmountOut;
-        const rate = (0, utils_1.getInputOutputRate)({
-            sellAmountCryptoBaseUnit: sellAmount,
-            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-            sellAsset,
-            buyAsset,
-        });
-        const adapter = deps.assertGetSuiChainAdapter(sellAsset.chainId);
-        const dummyAddress = '0x0000000000000000000000000000000000000000000000000000000000000000';
-        const addressForFeeEstimate = receiveAddress ?? dummyAddress;
-        const { fast: feeDataFast } = await adapter.getFeeData({
-            to: addressForFeeEstimate,
-            value: sellAmount,
-            chainSpecific: {
-                from: addressForFeeEstimate,
-                tokenId: (0, helpers_1.getCoinType)(sellAsset),
-            },
+        // Build the actual Cetus swap transaction to get accurate gas estimation
+        const client = (0, helpers_1.getAggregatorClient)(rpcUrl);
+        const suiClient = (0, helpers_1.getSuiClient)(rpcUrl);
+        const slippage = (0, utils_1.bnOrZero)(slippageTolerancePercentageDecimal ??
+            (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.Cetus)).toNumber();
+        const txb = new transactions_1.Transaction();
+        txb.setSender(addressForFeeEstimate);
+        await client.fastRouterSwap({
+            router: routerData,
+            slippage,
+            txb,
+            refreshAllCoins: true,
         });
-        const protocolFees = {};
-        const rates = [];
+        const txFee = await (async () => {
+            try {
+                const transactionBytes = await txb.build({ client: suiClient });
+                const dryRunResult = await suiClient.dryRunTransactionBlock({
+                    transactionBlock: transactionBytes,
+                });
+                const computationCost = BigInt(dryRunResult.effects.gasUsed.computationCost);
+                const storageCost = BigInt(dryRunResult.effects.gasUsed.storageCost);
+                const storageRebate = BigInt(dryRunResult.effects.gasUsed.storageRebate);
+                const netStorageCost = storageCost > storageRebate ? storageCost - storageRebate : 0n;
+                const estimatedGas = computationCost + netStorageCost;
+                return estimatedGas.toString();
+            }
+            catch (error) {
+                if (error instanceof Error && error.message.includes('Not enough coins of type')) {
+                    return undefined;
+                }
+                throw error;
+            }
+        })();
         const tradeRate = {
             id: (0, uuid_1.v4)(),
             quoteOrRate: 'rate',
@@ -86,7 +71,7 @@ const getTradeRate = async (input, deps) => {
                     sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount,
                     feeData: {
                         protocolFees,
-                        networkFeeCryptoBaseUnit: feeDataFast.txFee,
+                        networkFeeCryptoBaseUnit: txFee,
                     },
                     rate,
                     source: types_1.SwapperName.Cetus,
@@ -97,11 +82,10 @@ const getTradeRate = async (input, deps) => {
                 },
             ],
         };
-        rates.push(tradeRate);
-        return (0, monads_1.Ok)(rates);
+        return tradeDataResult.map(() => [tradeRate]);
     }
     catch (error) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: error instanceof Error ? error.message : 'Unknown error getting Cetus rate',
             code: types_1.TradeQuoteError.QueryFailed,
         }));

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

@@ -1,3 +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[];

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSupportedChainId = exports.SUPPORTED_CETUS_CHAIN_IDS = void 0;
+exports.PYTH_DEPENDENT_PROVIDERS = 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'];

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

@@ -1,13 +1,8 @@
-import type { CetusClmmSDK, Pool } from '@cetusprotocol/cetus-sui-clmm-sdk';
+import type { RouterDataV3 } from '@cetusprotocol/aggregator-sdk';
+import { AggregatorClient } from '@cetusprotocol/aggregator-sdk';
+import { SuiClient } from '@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/client';
 import type { Asset } from '@shapeshiftoss/types';
-export declare const getCetusSDK: () => Promise<CetusClmmSDK>;
+export declare const getAggregatorClient: (rpcUrl: string) => AggregatorClient;
+export declare const getSuiClient: (rpcUrl: string) => SuiClient;
 export declare const getCoinType: (asset: Asset) => string;
-export declare const determineSwapDirection: (pool: Pool, sellCoinType: string, buyCoinType: string) => boolean;
-export declare const calculateAmountLimit: (estimatedAmount: string, slippageTolerancePercentageDecimal: string | undefined, isBuyAmount: boolean) => string;
-export declare const findBestPool: (sdk: CetusClmmSDK, sellCoinType: string, buyCoinType: string) => Promise<Pool | undefined>;
-export type CalculateSwapResult = {
-    estimatedAmountOut: string;
-    estimatedAmountIn: string;
-    estimatedFeeAmount: string;
-};
-export declare const calculateSwapAmounts: (sdk: CetusClmmSDK, pool: Pool, sellAsset: Asset, buyAsset: Asset, sellAmount: string) => Promise<CalculateSwapResult | undefined>;
+export declare const findBestRoute: (client: AggregatorClient, sellCoinType: string, buyCoinType: string, sellAmountCryptoBaseUnit: string, providers?: string[]) => Promise<RouterDataV3 | undefined>;