@shapeshiftoss/swapper 17.6.8 → 17.6.10

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

@@ -4,11 +4,12 @@ exports.getTradeRate = void 0;
 const avnu_sdk_1 = require("@avnu/avnu-sdk");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const helpers_1 = require("packages/swapper/src/swappers/utils/helpers/helpers");
+const starknet_1 = require("starknet");
 const uuid_1 = require("uuid");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const helpers_1 = require("../../utils/helpers/helpers");
 const constants_2 = require("../utils/constants");
 const helpers_2 = require("../utils/helpers");
 const getTradeRate = async (input, deps) => {
@@ -28,6 +29,9 @@ const getTradeRate = async (input, deps) => {
     try {
         const sellTokenAddress = (0, helpers_2.getTokenAddress)(sellAsset);
         const buyTokenAddress = (0, helpers_2.getTokenAddress)(buyAsset);
+        // Normalize receive address if provided (for fee estimation)
+        // Rate quotes may not have a receive address, so this is optional
+        const normalizedReceiveAddress = receiveAddress ? (0, starknet_1.validateAndParseAddress)(receiveAddress) : '';
         const quotes = await (0, avnu_sdk_1.getQuotes)({
             sellTokenAddress,
             buyTokenAddress,
@@ -53,10 +57,10 @@ const getTradeRate = async (input, deps) => {
         const sellAdapter = deps.assertGetStarknetChainAdapter(sellAsset.chainId);
         // For rate quotes, use receiveAddress as a dummy from/to for fee estimation
         const feeData = await sellAdapter.getFeeData({
-            to: receiveAddress ?? '',
+            to: normalizedReceiveAddress,
             value: sellAmount,
             chainSpecific: {
-                from: receiveAddress ?? '',
+                from: normalizedReceiveAddress,
                 tokenContractAddress: sellTokenAddress,
             },
             sendMax: false,
@@ -81,7 +85,7 @@ const getTradeRate = async (input, deps) => {
             : {};
         const tradeRate = {
             id: (0, uuid_1.v4)(),
-            receiveAddress,
+            receiveAddress: normalizedReceiveAddress || receiveAddress,
             affiliateBps,
             rate,
             slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??

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

@@ -5,7 +5,7 @@ export declare const isSupportedChainId: (chainId: ChainId) => chainId is import
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;
     sellAsset: Asset;
-}) => import("@sniptt/monads/build/result/result").ResOk<boolean, never> | import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../../types").SwapErrorRight>;
+}) => import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../../types").SwapErrorRight> | import("@sniptt/monads/build/result/result").ResOk<boolean, never>;
 export declare const calculateRate: ({ buyAmount, sellAmount, buyAsset, sellAsset, }: {
     buyAmount: string;
     sellAmount: string;

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

@@ -5,6 +5,7 @@ const utils_1 = require("../../utils");
 exports.butterSwap = {
     executeEvmTransaction: utils_1.executeEvmTransaction,
     executeSolanaTransaction: utils_1.executeSolanaTransaction,
+    executeTronTransaction: utils_1.executeTronTransaction,
     executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => {
         return signAndBroadcastTransaction(txToSign);
     },

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

@@ -8,6 +8,8 @@ const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const getSolanaTransactionFees_1 = require("../../solana-utils/getSolanaTransactionFees");
 const getUnsignedSolanaTransaction_1 = require("../../solana-utils/getUnsignedSolanaTransaction");
+const getTronTransactionFees_1 = require("../../tron-utils/getTronTransactionFees");
+const getUnsignedTronTransaction_1 = require("../../tron-utils/getUnsignedTronTransaction");
 const utils_1 = require("../../utils");
 const checkTradeStatus_1 = require("./swapperApi/checkTradeStatus");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
@@ -70,6 +72,60 @@ exports.butterSwapApi = {
             gasLimit: bignumber_js_1.default.max(feeData.gasLimit, gasLimit).toFixed(),
         });
     },
+    getUnsignedUtxoTransaction: async ({ stepIndex, tradeQuote, xpub, accountType, assertGetUtxoChainAdapter, }) => {
+        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
+            throw new Error('Unable to execute a trade rate quote');
+        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+        const { accountNumber, sellAsset, butterSwapTransactionMetadata } = step;
+        if (!butterSwapTransactionMetadata)
+            throw new Error('Transaction metadata is required');
+        const { to, memo } = butterSwapTransactionMetadata;
+        if (!to)
+            throw new Error('Missing deposit address');
+        if (!memo)
+            throw new Error('Missing memo (opReturnData)');
+        const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
+        const { fast } = await adapter.getFeeData({
+            to,
+            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            chainSpecific: { pubkey: xpub, opReturnData: memo },
+            sendMax: false,
+        });
+        return adapter.buildSendApiTransaction({
+            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            xpub,
+            to,
+            accountNumber,
+            chainSpecific: {
+                accountType,
+                opReturnData: memo,
+                satoshiPerByte: fast.chainSpecific.satoshiPerByte,
+            },
+        });
+    },
+    getUtxoTransactionFees: async ({ stepIndex, tradeQuote, xpub, assertGetUtxoChainAdapter }) => {
+        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
+            throw new Error('Unable to execute a trade rate quote');
+        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+        const { sellAsset, butterSwapTransactionMetadata } = step;
+        if (!butterSwapTransactionMetadata)
+            throw new Error('Transaction metadata is required');
+        const { to, memo } = butterSwapTransactionMetadata;
+        if (!to)
+            throw new Error('Missing deposit address');
+        if (!memo)
+            throw new Error('Missing memo (opReturnData)');
+        const adapter = assertGetUtxoChainAdapter(sellAsset.chainId);
+        const { fast } = await adapter.getFeeData({
+            to,
+            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            chainSpecific: { pubkey: xpub, opReturnData: memo },
+            sendMax: false,
+        });
+        return fast.txFee;
+    },
     getUnsignedSolanaTransaction: getUnsignedSolanaTransaction_1.getUnsignedSolanaTransaction,
     getSolanaTransactionFees: getSolanaTransactionFees_1.getSolanaTransactionFees,
+    getTronTransactionFees: getTronTransactionFees_1.getTronTransactionFees,
+    getUnsignedTronTransaction: getUnsignedTronTransaction_1.getUnsignedTronTransaction,
 };

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

@@ -36,6 +36,25 @@ const checkTradeStatus = async (input) => {
                     fetchIsSmartContractAddressQuery,
                 });
             }
+            if (sellChainId === caip_1.tronChainId) {
+                const adapter = input.assertGetTronChainAdapter(caip_1.tronChainId);
+                const tx = await adapter.httpProvider.getTransaction({ txid: txHash });
+                if (!tx) {
+                    return (0, utils_1.createDefaultStatusResponse)(txHash);
+                }
+                const contractRet = tx.ret?.[0]?.contractRet;
+                // Only mark as confirmed if SUCCESS AND has confirmations (in a block)
+                const status = contractRet === 'SUCCESS' && tx.confirmations > 0
+                    ? unchained_client_1.TxStatus.Confirmed
+                    : contractRet === 'REVERT'
+                        ? unchained_client_1.TxStatus.Failed
+                        : unchained_client_1.TxStatus.Pending;
+                return {
+                    status,
+                    buyTxHash: txHash,
+                    message: undefined,
+                };
+            }
             // Fallback: unknown same-chain type (should never happen for Butter, but just in case). Avoid bridge polling.
             return (0, utils_1.createDefaultStatusResponse)(txHash);
         }

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

@@ -15,19 +15,14 @@ const getTradeQuote = async (input, _deps) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, sendAddress, slippageTolerancePercentageDecimal, accountNumber, affiliateBps, } = input;
     if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId) &&
         sellAsset.chainId !== caip_1.btcChainId &&
-        sellAsset.chainId !== caip_1.solanaChainId) {
+        sellAsset.chainId !== caip_1.solanaChainId &&
+        sellAsset.chainId !== caip_1.tronChainId) {
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: `Unsupported chain`,
             code: types_1.TradeQuoteError.UnsupportedChain,
         }));
     }
-    // Yes, this is supposed to be supported as per checks above, but currently, Butter doesn't yield any quotes for BTC sells
-    if (sellAsset.assetId === caip_1.btcAssetId) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `BTC sells are currently unsupported`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
+    // TODO: Debug why same-chain Tron swaps revert (swapAndCall method works on EVM but 0 successful on Tron)
     if (!sendAddress) {
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: '[getTradeQuote] sendAddress is required for ButterSwap',
@@ -41,7 +36,10 @@ const getTradeQuote = async (input, _deps) => {
     const routeResult = await (0, xhr_1.getButterRoute)({
         sellAsset,
         buyAsset,
-        sellAmountCryptoBaseUnit: (0, utils_1.fromBaseUnit)(sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset.precision),
+        sellAmountCryptoPrecision: utils_1.BigAmount.fromBaseUnit({
+            value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            precision: sellAsset.precision,
+        }).toPrecision(),
         slippage,
         affiliate: (0, constants_2.makeButterSwapAffiliate)(affiliateBps),
     });
@@ -50,7 +48,10 @@ const getTradeQuote = async (input, _deps) => {
     const routeResponse = routeResult.unwrap();
     if (!(0, xhr_1.isRouteSuccess)(routeResponse)) {
         if (routeResponse.errno === xhr_1.ButterSwapErrorCode.InsufficientAmount) {
-            const minAmountCryptoBaseUnit = (0, utils_1.toBaseUnit)(routeResponse.minAmount, sellAsset.precision);
+            const minAmountCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+                value: routeResponse.minAmount,
+                precision: sellAsset.precision,
+            }).toBaseUnit();
             return (0, monads_1.Err)((0, utils_2.createTradeAmountTooSmallErr)({
                 minAmountCryptoBaseUnit,
                 assetId: sellAsset.assetId,
@@ -100,13 +101,19 @@ const getTradeQuote = async (input, _deps) => {
         }));
     }
     // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset precision
-    const networkFeeCryptoBaseUnit = (0, utils_1.toBaseUnit)((0, utils_1.bnOrZero)(route.gasFee?.amount), feeAsset.precision);
+    const networkFeeCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+        value: (0, utils_1.bnOrZero)(route.gasFee?.amount),
+        precision: feeAsset.precision,
+    }).toBaseUnit();
     // Use destination receive amount as a priority if present and defined
     // It won't for same-chain swaps, so we fall back to the source chain receive amount (i.e source chain *is* the destination chain)
     const outputAmount = route.dstChain?.totalAmountOut ?? route.srcChain.totalAmountOut;
     // TODO: affiliate fees not yet here, gut feel is that Butter won't do the swap output - fees logic for us here
     // Sanity check me when affiliates are implemented, and do the math ourselves if needed
-    const buyAmountAfterFeesCryptoBaseUnit = (0, utils_1.toBaseUnit)(outputAmount, buyAsset.precision);
+    const buyAmountAfterFeesCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+        value: outputAmount,
+        precision: buyAsset.precision,
+    }).toBaseUnit();
     const rate = (0, utils_2.getInputOutputRate)({
         sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
         buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
@@ -151,7 +158,10 @@ const getTradeQuote = async (input, _deps) => {
     }
     const solanaTransactionMetadata = maybeSolanaTransactionMetadata?.unwrap();
     const step = {
-        buyAmountBeforeFeesCryptoBaseUnit: (0, utils_1.toBaseUnit)(outputAmount, buyAsset.precision),
+        buyAmountBeforeFeesCryptoBaseUnit: utils_1.BigAmount.fromPrecision({
+            value: outputAmount,
+            precision: buyAsset.precision,
+        }).toBaseUnit(),
         buyAmountAfterFeesCryptoBaseUnit,
         sellAmountIncludingProtocolFeesCryptoBaseUnit,
         feeData: {
@@ -163,13 +173,16 @@ const getTradeQuote = async (input, _deps) => {
         buyAsset,
         sellAsset,
         accountNumber,
-        allowanceContract: route.contract ?? '0x0',
+        allowanceContract: sellAsset.chainId === caip_1.tronChainId ? buildTx.to : route.contract ?? '0x0',
         estimatedExecutionTimeMs: route.timeEstimated * 1000,
         butterSwapTransactionMetadata: {
             to: buildTx.to,
             data: buildTx.data,
             value: buildTx.value,
             gasLimit: (0, utils_1.bnOrZero)(route.gasEstimatedTarget).toFixed(),
+            method: buildTx.method,
+            args: buildTx.args,
+            memo: buildTx.memo,
         },
         ...(solanaTransactionMetadata && {
             solanaTransactionMetadata,

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

@@ -36,6 +36,7 @@ vitest_1.vi.mock('../xhr', () => ({
             assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
             assertGetNearChainAdapter: () => vitest_1.vi.fn(),
             assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
+            assertGetTonChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

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

@@ -14,29 +14,24 @@ const getTradeRate = async (input, _deps) => {
     const { sellAsset, buyAsset, affiliateBps, accountNumber, receiveAddress, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
     if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId) &&
         sellAsset.chainId !== caip_1.btcChainId &&
-        sellAsset.chainId !== caip_1.solanaChainId) {
+        sellAsset.chainId !== caip_1.solanaChainId &&
+        sellAsset.chainId !== caip_1.tronChainId) {
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
             message: `Unsupported chain`,
             code: types_1.TradeQuoteError.UnsupportedChain,
         }));
     }
-    // Yes, this is supposed to be supported as per checks above, but currently, Butter doesn't yield any quotes for BTC sells
-    if (sellAsset.assetId === caip_1.btcAssetId) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `BTC sells are currently unsupported`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    const amount = (0, utils_1.bn)(sellAmountIncludingProtocolFeesCryptoBaseUnit)
-        .shiftedBy(-sellAsset.precision)
-        .toString();
+    const amount = utils_1.BigAmount.fromBaseUnit({
+        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        precision: sellAsset.precision,
+    }).toPrecision();
     const feeAssetId = (0, utils_1.chainIdToFeeAssetId)(sellAsset.chainId);
     const slippageTolerancePercentageDecimal = (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.ButterSwap);
     const slippage = (0, utils_1.convertDecimalPercentageToBasisPoints)(slippageTolerancePercentageDecimal).toString();
     const result = await (0, xhr_1.getButterRoute)({
         sellAsset,
         buyAsset,
-        sellAmountCryptoBaseUnit: amount,
+        sellAmountCryptoPrecision: amount,
         slippage,
         affiliate: (0, constants_2.makeButterSwapAffiliate)(affiliateBps),
     });
@@ -46,7 +41,10 @@ const getTradeRate = async (input, _deps) => {
     const routeResponse = result.unwrap();
     if (!(0, xhr_1.isRouteSuccess)(routeResponse)) {
         if (routeResponse.errno === xhr_1.ButterSwapErrorCode.InsufficientAmount) {
-            const minAmountCryptoBaseUnit = (0, utils_1.toBaseUnit)(routeResponse.minAmount, sellAsset.precision);
+            const minAmountCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+                value: routeResponse.minAmount,
+                precision: sellAsset.precision,
+            }).toBaseUnit();
             return (0, monads_1.Err)((0, utils_2.createTradeAmountTooSmallErr)({
                 minAmountCryptoBaseUnit,
                 assetId: sellAsset.assetId,
@@ -69,7 +67,10 @@ const getTradeRate = async (input, _deps) => {
     const outputAmount = route.dstChain?.totalAmountOut ?? route.srcChain.totalAmountOut;
     // TODO: affiliate fees not yet here, gut feel is that Butter won't do the swap output - fees logic for us here
     // Sanity check me when affiliates are implemented, and do the math ourselves if needed
-    const buyAmountAfterFeesCryptoBaseUnit = (0, utils_1.toBaseUnit)(outputAmount, buyAsset.precision);
+    const buyAmountAfterFeesCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+        value: outputAmount,
+        precision: buyAsset.precision,
+    }).toBaseUnit();
     const rate = (0, utils_2.getInputOutputRate)({
         sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
         buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
@@ -85,12 +86,18 @@ const getTradeRate = async (input, _deps) => {
     }
     // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset precision
     const networkFeeCryptoBaseUnit = (0, utils_1.bnOrZero)(route.gasFee?.amount).gt(0)
-        ? (0, utils_1.toBaseUnit)(route.gasFee.amount, feeAsset.precision)
+        ? utils_1.BigAmount.fromPrecision({
+            value: route.gasFee.amount,
+            precision: feeAsset.precision,
+        }).toBaseUnit()
         : '0';
     // Always a single step
     const step = {
         rate,
-        buyAmountBeforeFeesCryptoBaseUnit: (0, utils_1.toBaseUnit)(outputAmount, buyAsset.precision),
+        buyAmountBeforeFeesCryptoBaseUnit: utils_1.BigAmount.fromPrecision({
+            value: outputAmount,
+            precision: buyAsset.precision,
+        }).toBaseUnit(),
         buyAmountAfterFeesCryptoBaseUnit,
         sellAmountIncludingProtocolFeesCryptoBaseUnit,
         feeData: {

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

@@ -30,6 +30,7 @@ vitest_1.vi.mock('../utils/butterSwapService', () => ({
             assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
             assertGetNearChainAdapter: () => vitest_1.vi.fn(),
             assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
+            assertGetTonChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },
@@ -66,6 +67,7 @@ vitest_1.vi.mock('../utils/butterSwapService', () => ({
             assertGetSuiChainAdapter: () => vitest_1.vi.fn(),
             assertGetNearChainAdapter: () => vitest_1.vi.fn(),
             assertGetStarknetChainAdapter: () => vitest_1.vi.fn(),
+            assertGetTonChainAdapter: () => vitest_1.vi.fn(),
             config: {
                 VITE_BUTTERSWAP_CLIENT_ID: 'test',
             },

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

@@ -93,6 +93,7 @@ export type BuildTxSuccessItem = {
         type: string;
         value: unknown;
     }[];
+    memo?: string;
 };
 export type BuildTxResponse = {
     errno: 0;

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

@@ -13,6 +13,7 @@ const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
     43114: types_1.KnownChainIds.AvalancheMainnet,
     1360108768460801: types_1.KnownChainIds.SolanaMainnet,
     1360095883558913: types_1.KnownChainIds.BitcoinMainnet,
+    728126428: types_1.KnownChainIds.TronMainnet,
 };
 const CHAIN_ID_TO_BUTTERSWAP_CHAIN_ID = Object.entries(BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID).reduce((acc, [butterSwapChainId, chainId]) => {
     acc[chainId] = Number(butterSwapChainId);

package/dist/cjs/swappers/ButterSwap/xhr.d.ts

@@ -20,11 +20,11 @@ type ButterSwapPromise<T> = Promise<Result<T, SwapErrorRight>>;
 export type GetButterRouteArgs = {
     sellAsset: Asset;
     buyAsset: Asset;
-    sellAmountCryptoBaseUnit: string;
+    sellAmountCryptoPrecision: string;
     slippage: string;
     affiliate?: string;
 };
-export declare const getButterRoute: ({ sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippage, affiliate, }: GetButterRouteArgs) => ButterSwapPromise<RouteResponse>;
+export declare const getButterRoute: ({ sellAsset, buyAsset, sellAmountCryptoPrecision, slippage, affiliate, }: GetButterRouteArgs) => ButterSwapPromise<RouteResponse>;
 export type ButterBuildTxArgs = {
     hash: string;
     slippage: string;

package/dist/cjs/swappers/ButterSwap/xhr.js

@@ -23,7 +23,8 @@ var ButterSwapErrorCode;
     ButterSwapErrorCode[ButterSwapErrorCode["InvalidAddress"] = 2007] = "InvalidAddress";
 })(ButterSwapErrorCode || (exports.ButterSwapErrorCode = ButterSwapErrorCode = {}));
 const SOLANA_NATIVE_ADDRESS = 'So11111111111111111111111111111111111111112';
-const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippage, affiliate, }) => {
+const TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
+const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision, slippage, affiliate, }) => {
     const butterFromChainId = (0, helpers_2.chainIdToButterSwapChainId)(sellAsset.chainId);
     const butterToChainId = (0, helpers_2.chainIdToButterSwapChainId)(buyAsset.chainId);
     if (!butterFromChainId || !butterToChainId) {
@@ -40,6 +41,8 @@ const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBaseUnit, s
     const sellAssetAddress = (() => {
         if (sellAsset.chainId === caip_1.solanaChainId && sellAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
+        if (sellAsset.chainId === caip_1.tronChainId && sellAssetIsNative)
+            return TRON_NATIVE_ADDRESS;
         if (sellAssetIsNative)
             return viem_1.zeroAddress;
         return sellAssetAddressRaw;
@@ -47,6 +50,8 @@ const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBaseUnit, s
     const buyAssetAddress = (() => {
         if (buyAsset.chainId === caip_1.solanaChainId && buyAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
+        if (buyAsset.chainId === caip_1.tronChainId && buyAssetIsNative)
+            return TRON_NATIVE_ADDRESS;
         if (buyAssetIsNative)
             return viem_1.zeroAddress;
         return buyAssetAddressRaw;
@@ -57,7 +62,7 @@ const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBaseUnit, s
         tokenInAddress: sellAssetAddress,
         toChainId: butterToChainId,
         tokenOutAddress: buyAssetAddress,
-        amount: sellAmountCryptoBaseUnit,
+        amount: sellAmountCryptoPrecision,
         type: 'exactIn',
         slippage,
         entrance: 'shapeshift',

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

@@ -2,7 +2,8 @@
 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 transactions_1 = require("@mysten/sui/transactions");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
 const utils_1 = require("@shapeshiftoss/utils");
 const constants_1 = require("../../constants");
@@ -54,13 +55,7 @@ exports.cetusApi = {
         intentMessage[2] = 0;
         intentMessage.set(transactionBytes, 3);
         const bip44Params = adapter.getBip44Params({ accountNumber });
-        const addressNList = [
-            bip44Params.purpose,
-            bip44Params.coinType,
-            bip44Params.accountNumber,
-            ...(bip44Params.isChange !== undefined ? [bip44Params.isChange ? 1 : 0] : []),
-            ...(bip44Params.addressIndex !== undefined ? [bip44Params.addressIndex] : []),
-        ];
+        const addressNList = (0, chain_adapters_1.toAddressNList)(bip44Params);
         return {
             addressNList,
             intentMessageBytes: intentMessage,

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
-const transactions_1 = require("@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions");
+const transactions_1 = require("@mysten/sui/transactions");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRate = void 0;
-const transactions_1 = require("@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions");
+const transactions_1 = require("@mysten/sui/transactions");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");

package/dist/cjs/swappers/ChainflipSwapper/utils/getQuoteOrRate.js

@@ -69,11 +69,11 @@ const getQuoteOrRate = async (input, deps) => {
     if (maybeQuoteResponse.isErr()) {
         const error = maybeQuoteResponse.unwrapErr();
         const cause = error.cause;
-        if (cause.message.includes('code 400') &&
-            cause.response?.data.detail.includes('Amount outside asset bounds')) {
+        if (cause?.message?.includes('code 400') &&
+            cause?.response?.data?.detail?.includes('Amount outside asset bounds')) {
             return (0, monads_1.Err)((0, utils_2.createTradeAmountTooSmallErr)({
                 assetId: sellAsset.assetId,
-                minAmountCryptoBaseUnit: cause.response?.data.errors.minimalAmountNative[0],
+                minAmountCryptoBaseUnit: cause.response?.data?.errors?.minimalAmountNative?.[0],
             }));
         }
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
@@ -202,7 +202,10 @@ const getQuoteOrRate = async (input, deps) => {
             const boostRate = getChainflipQuoteRate(singleQuoteResponse.boostQuote.ingressAmountNative, singleQuoteResponse.boostQuote.egressAmountNative);
             // This is not really a buyAmount before fees but rather an input/output calculation to get the sell amount
             // prorated to the buy asset price to determine price impact
-            const buyAmountBeforeFeesCryptoBaseUnit = (0, utils_1.toBaseUnit)((0, utils_1.bnOrZero)(singleQuoteResponse.boostQuote.ingressAmount).times((0, utils_1.bnOrZero)(singleQuoteResponse.estimatedPrice)), buyAsset.precision);
+            const buyAmountBeforeFeesCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+                value: (0, utils_1.bnOrZero)(singleQuoteResponse.boostQuote.ingressAmount).times((0, utils_1.bnOrZero)(singleQuoteResponse.estimatedPrice)),
+                precision: buyAsset.precision,
+            }).toBaseUnit();
             const boostTradeRateOrQuote = {
                 id: (0, uuid_1.v4)(),
                 rate: boostRate,
@@ -249,7 +252,10 @@ const getQuoteOrRate = async (input, deps) => {
             : '0';
         // This is not really a buyAmount before fees but rather an input/output calculation to get the sell amount
         // prorated to the buy asset price to determine price impact
-        const buyAmountBeforeFeesCryptoBaseUnit = (0, utils_1.toBaseUnit)((0, utils_1.bnOrZero)(singleQuoteResponse.ingressAmount).times((0, utils_1.bnOrZero)(singleQuoteResponse.estimatedPrice)), buyAsset.precision);
+        const buyAmountBeforeFeesCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+            value: (0, utils_1.bnOrZero)(singleQuoteResponse.ingressAmount).times((0, utils_1.bnOrZero)(singleQuoteResponse.estimatedPrice)),
+            precision: buyAsset.precision,
+        }).toBaseUnit();
         const tradeRateOrQuote = {
             id: (0, uuid_1.v4)(),
             rate,

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

@@ -20,8 +20,14 @@ const isSupportedAssetId = (chainId, assetId) => {
 };
 exports.isSupportedAssetId = isSupportedAssetId;
 const calculateChainflipMinPrice = ({ sellAmountIncludingProtocolFeesCryptoBaseUnit, buyAmountAfterFeesCryptoBaseUnit, slippageTolerancePercentageDecimal, sellAsset, buyAsset, }) => {
-    const sellAmountCryptoPrecision = (0, utils_1.fromBaseUnit)(sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset.precision);
-    const buyAmountCryptoPrecision = (0, utils_1.fromBaseUnit)(buyAmountAfterFeesCryptoBaseUnit, buyAsset.precision);
+    const sellAmountCryptoPrecision = utils_1.BigAmount.fromBaseUnit({
+        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        precision: sellAsset.precision,
+    }).toPrecision();
+    const buyAmountCryptoPrecision = utils_1.BigAmount.fromBaseUnit({
+        value: buyAmountAfterFeesCryptoBaseUnit,
+        precision: buyAsset.precision,
+    }).toPrecision();
     const estimatedPrice = (0, utils_1.bn)(buyAmountCryptoPrecision).div(sellAmountCryptoPrecision);
     // This is called minimumPrice upstream but this really is a rate, let's not honour confusing terminology
     const minimumRate = estimatedPrice

package/dist/cjs/swappers/CowSwapper/CowSwapper.js

@@ -12,7 +12,7 @@ exports.cowSwapper = {
             throw Error('Missing appDataHash');
         const signature = await (0, cowswap_utils_1.signCowOrder)(orderToSign, chainId, signMessage);
         const network = (0, cowswap_utils_1.assertGetCowNetwork)(chainId);
-        const maybeOrdersResponse = await cowService_1.cowService.post(`${config.VITE_COWSWAP_BASE_URL}/${network}/api/v1/orders/`, {
+        const maybeOrdersResponse = await cowService_1.cowService.post(`${config.VITE_COWSWAP_BASE_URL}/${network}/api/v1/orders`, {
             ...orderToSign,
             signingScheme: types_1.SigningScheme.EIP712,
             signature,

package/dist/cjs/swappers/CowSwapper/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -42,7 +42,7 @@ async function getCowSwapTradeQuote(input, config) {
     });
     const { appData, appDataHash } = await (0, cowswap_utils_1.getFullAppData)(slippageTolerancePercentageDecimal, affiliateAppDataFragment, 'market');
     // https://api.cow.fi/docs/#/default/post_api_v1_quote
-    const maybeQuoteResponse = await cowService_1.cowService.post(`${config.VITE_COWSWAP_BASE_URL}/${network}/api/v1/quote/`, {
+    const maybeQuoteResponse = await cowService_1.cowService.post(`${config.VITE_COWSWAP_BASE_URL}/${network}/api/v1/quote`, {
         sellToken: (0, caip_1.fromAssetId)(sellAsset.assetId).assetReference,
         buyToken,
         receiver: receiveAddress,

package/dist/cjs/swappers/CowSwapper/getCowSwapTradeQuote/getCowSwapTradeQuote.test.js

@@ -385,7 +385,7 @@ const expectedTradeQuoteSmallAmountWethToFox = {
         const maybeTradeQuote = await (0, getCowSwapTradeQuote_1.getCowSwapTradeQuote)(input, MOCK_COWSWAP_CONFIG);
         (0, vitest_1.expect)(maybeTradeQuote.isOk()).toBe(true);
         (0, vitest_1.expect)(maybeTradeQuote.unwrap()).toEqual(expectedTradeQuoteWethToFox);
-        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/mainnet/api/v1/quote/', expectedApiInputWethToFox);
+        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/mainnet/api/v1/quote', expectedApiInputWethToFox);
     });
     (0, vitest_1.it)('should call cowService with correct parameters, handle the fees and return the correct trade quote when buying ETH', async () => {
         const input = {
@@ -418,7 +418,7 @@ const expectedTradeQuoteSmallAmountWethToFox = {
         const maybeTradeQuote = await (0, getCowSwapTradeQuote_1.getCowSwapTradeQuote)(input, MOCK_COWSWAP_CONFIG);
         (0, vitest_1.expect)(maybeTradeQuote.isOk()).toBe(true);
         (0, vitest_1.expect)(maybeTradeQuote.unwrap()).toEqual(expectedTradeQuoteFoxToEth);
-        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/mainnet/api/v1/quote/', expectedApiInputFoxToEth);
+        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/mainnet/api/v1/quote', expectedApiInputFoxToEth);
     });
     (0, vitest_1.it)('should call cowService with correct parameters, handle the fees and return the correct trade quote when buying XDAI', async () => {
         const input = {
@@ -451,7 +451,7 @@ const expectedTradeQuoteSmallAmountWethToFox = {
         const maybeTradeQuote = await (0, getCowSwapTradeQuote_1.getCowSwapTradeQuote)(input, MOCK_COWSWAP_CONFIG);
         (0, vitest_1.expect)(maybeTradeQuote.isOk()).toBe(true);
         (0, vitest_1.expect)(maybeTradeQuote.unwrap()).toEqual(expectedTradeQuoteUsdcToXdai);
-        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/xdai/api/v1/quote/', expectedApiInputUsdcGnosisToXdai);
+        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/xdai/api/v1/quote', expectedApiInputUsdcGnosisToXdai);
     });
     (0, vitest_1.it)('should call cowService with correct parameters, handle the fees and return the correct trade quote when buying ETH on Arbitrum', async () => {
         const input = {
@@ -484,7 +484,7 @@ const expectedTradeQuoteSmallAmountWethToFox = {
         const maybeTradeQuote = await (0, getCowSwapTradeQuote_1.getCowSwapTradeQuote)(input, MOCK_COWSWAP_CONFIG);
         (0, vitest_1.expect)(maybeTradeQuote.isOk()).toBe(true);
         (0, vitest_1.expect)(maybeTradeQuote.unwrap()).toEqual(expectedTradeQuoteUsdcToEthArbitrum);
-        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/arbitrum_one/api/v1/quote/', expectedApiInputUsdcToEthArbitrum);
+        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/arbitrum_one/api/v1/quote', expectedApiInputUsdcToEthArbitrum);
     });
     (0, vitest_1.it)('should call cowService with correct parameters and return quote with original sellAmount when selling a very small amount of WETH', async () => {
         const input = {
@@ -517,6 +517,6 @@ const expectedTradeQuoteSmallAmountWethToFox = {
         const maybeTradeQuote = await (0, getCowSwapTradeQuote_1.getCowSwapTradeQuote)(input, MOCK_COWSWAP_CONFIG);
         (0, vitest_1.expect)(maybeTradeQuote.isErr()).toBe(false);
         (0, vitest_1.expect)(maybeTradeQuote.unwrap()).toEqual(expectedTradeQuoteSmallAmountWethToFox);
-        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/mainnet/api/v1/quote/', expectedApiInputSmallAmountWethToFox);
+        (0, vitest_1.expect)(cowService_1.cowService.post).toHaveBeenCalledWith('https://api.cow.fi/mainnet/api/v1/quote', expectedApiInputSmallAmountWethToFox);
     });
 });

package/dist/cjs/swappers/CowSwapper/getCowSwapTradeRate/getCowSwapTradeRate.js

@@ -42,7 +42,7 @@ async function getCowSwapTradeRate(input, config) {
     });
     const { appData, appDataHash } = await (0, cowswap_utils_1.getFullAppData)(slippageTolerancePercentageDecimal, affiliateAppDataFragment, 'market');
     // https://api.cow.fi/docs/#/default/post_api_v1_quote
-    const maybeQuoteResponse = await cowService_1.cowService.post(`${config.VITE_COWSWAP_BASE_URL}/${network}/api/v1/quote/`, {
+    const maybeQuoteResponse = await cowService_1.cowService.post(`${config.VITE_COWSWAP_BASE_URL}/${network}/api/v1/quote`, {
         sellToken: (0, caip_1.fromAssetId)(sellAsset.assetId).assetReference,
         buyToken,
         receiver: receiveAddress,