@shapeshiftoss/swapper 17.6.9 → 17.6.10

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

@@ -1,11 +1,12 @@
 import { getQuotes } from '@avnu/avnu-sdk';
 import { bn } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
-import { getTreasuryAddressFromChainId } from '../../utils/helpers/helpers.js';
+import { validateAndParseAddress } from 'starknet';
 import { v4 as uuid } from 'uuid';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { getInputOutputRate, makeSwapErrorRight } from '../../../utils.js';
+import { getTreasuryAddressFromChainId } from '../../utils/helpers/helpers.js';
 import { AVNU_SUPPORTED_CHAIN_IDS } from '../utils/constants.js';
 import { getTokenAddress } from '../utils/helpers.js';
 export const getTradeRate = async (input, deps) => {
@@ -25,6 +26,9 @@ export const getTradeRate = async (input, deps) => {
     try {
         const sellTokenAddress = getTokenAddress(sellAsset);
         const buyTokenAddress = 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 ? validateAndParseAddress(receiveAddress) : '';
         const quotes = await getQuotes({
             sellTokenAddress,
             buyTokenAddress,
@@ -50,10 +54,10 @@ export 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,
@@ -78,7 +82,7 @@ export const getTradeRate = async (input, deps) => {
             : {};
         const tradeRate = {
             id: uuid(),
-            receiveAddress,
+            receiveAddress: normalizedReceiveAddress || receiveAddress,
             affiliateBps,
             rate,
             slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??

package/dist/esm/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.js").SwapErrorRight>;
+}) => import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../../types.js").SwapErrorRight> | import("@sniptt/monads/build/result/result").ResOk<boolean, never>;
 export declare const calculateRate: ({ buyAmount, sellAmount, buyAsset, sellAsset, }: {
     buyAmount: string;
     sellAmount: string;

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

@@ -1,7 +1,8 @@
-import { executeEvmTransaction, executeSolanaTransaction } from '../../utils.js';
+import { executeEvmTransaction, executeSolanaTransaction, executeTronTransaction, } from '../../utils.js';
 export const butterSwap = {
     executeEvmTransaction,
     executeSolanaTransaction,
+    executeTronTransaction,
     executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => {
         return signAndBroadcastTransaction(txToSign);
     },

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

@@ -2,6 +2,8 @@ import { evm } from '@shapeshiftoss/chain-adapters';
 import BigNumber from 'bignumber.js';
 import { getSolanaTransactionFees } from '../../solana-utils/getSolanaTransactionFees.js';
 import { getUnsignedSolanaTransaction } from '../../solana-utils/getUnsignedSolanaTransaction.js';
+import { getTronTransactionFees } from '../../tron-utils/getTronTransactionFees.js';
+import { getUnsignedTronTransaction } from '../../tron-utils/getUnsignedTronTransaction.js';
 import { getExecutableTradeStep, isExecutableTradeQuote } from '../../utils.js';
 import { checkTradeStatus } from './swapperApi/checkTradeStatus.js';
 import { getTradeQuote } from './swapperApi/getTradeQuote.js';
@@ -64,6 +66,60 @@ export const butterSwapApi = {
             gasLimit: BigNumber.max(feeData.gasLimit, gasLimit).toFixed(),
         });
     },
+    getUnsignedUtxoTransaction: async ({ stepIndex, tradeQuote, xpub, accountType, assertGetUtxoChainAdapter, }) => {
+        if (!isExecutableTradeQuote(tradeQuote))
+            throw new Error('Unable to execute a trade rate quote');
+        const step = 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 (!isExecutableTradeQuote(tradeQuote))
+            throw new Error('Unable to execute a trade rate quote');
+        const step = 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,
     getSolanaTransactionFees,
+    getTronTransactionFees,
+    getUnsignedTronTransaction,
 };

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

@@ -1,4 +1,4 @@
-import { solanaChainId } from '@shapeshiftoss/caip';
+import { solanaChainId, tronChainId } from '@shapeshiftoss/caip';
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { checkEvmSwapStatus, checkSolanaSwapStatus, createDefaultStatusResponse, } from '../../../utils.js';
@@ -33,6 +33,25 @@ export const checkTradeStatus = async (input) => {
                     fetchIsSmartContractAddressQuery,
                 });
             }
+            if (sellChainId === tronChainId) {
+                const adapter = input.assertGetTronChainAdapter(tronChainId);
+                const tx = await adapter.httpProvider.getTransaction({ txid: txHash });
+                if (!tx) {
+                    return 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
+                    ? TxStatus.Confirmed
+                    : contractRet === 'REVERT'
+                        ? TxStatus.Failed
+                        : 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 createDefaultStatusResponse(txHash);
         }

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

@@ -1,6 +1,6 @@
-import { btcAssetId, btcChainId, solanaChainId } from '@shapeshiftoss/caip';
+import { btcChainId, solanaChainId, tronChainId } from '@shapeshiftoss/caip';
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
-import { bnOrZero, chainIdToFeeAssetId, convertDecimalPercentageToBasisPoints, fromBaseUnit, toBaseUnit, } from '@shapeshiftoss/utils';
+import { BigAmount, bnOrZero, chainIdToFeeAssetId, convertDecimalPercentageToBasisPoints, } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { AddressLookupTableAccount, PublicKey, TransactionMessage, VersionedTransaction, } from '@solana/web3.js';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
@@ -12,19 +12,14 @@ export const getTradeQuote = async (input, _deps) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, sendAddress, slippageTolerancePercentageDecimal, accountNumber, affiliateBps, } = input;
     if (!isEvmChainId(sellAsset.chainId) &&
         sellAsset.chainId !== btcChainId &&
-        sellAsset.chainId !== solanaChainId) {
+        sellAsset.chainId !== solanaChainId &&
+        sellAsset.chainId !== tronChainId) {
         return Err(makeSwapErrorRight({
             message: `Unsupported chain`,
             code: 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 === btcAssetId) {
-        return Err(makeSwapErrorRight({
-            message: `BTC sells are currently unsupported`,
-            code: TradeQuoteError.UnsupportedChain,
-        }));
-    }
+    // TODO: Debug why same-chain Tron swaps revert (swapAndCall method works on EVM but 0 successful on Tron)
     if (!sendAddress) {
         return Err(makeSwapErrorRight({
             message: '[getTradeQuote] sendAddress is required for ButterSwap',
@@ -38,7 +33,10 @@ export const getTradeQuote = async (input, _deps) => {
     const routeResult = await getButterRoute({
         sellAsset,
         buyAsset,
-        sellAmountCryptoBaseUnit: fromBaseUnit(sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset.precision),
+        sellAmountCryptoPrecision: BigAmount.fromBaseUnit({
+            value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            precision: sellAsset.precision,
+        }).toPrecision(),
         slippage,
         affiliate: makeButterSwapAffiliate(affiliateBps),
     });
@@ -47,7 +45,10 @@ export const getTradeQuote = async (input, _deps) => {
     const routeResponse = routeResult.unwrap();
     if (!isRouteSuccess(routeResponse)) {
         if (routeResponse.errno === ButterSwapErrorCode.InsufficientAmount) {
-            const minAmountCryptoBaseUnit = toBaseUnit(routeResponse.minAmount, sellAsset.precision);
+            const minAmountCryptoBaseUnit = BigAmount.fromPrecision({
+                value: routeResponse.minAmount,
+                precision: sellAsset.precision,
+            }).toBaseUnit();
             return Err(createTradeAmountTooSmallErr({
                 minAmountCryptoBaseUnit,
                 assetId: sellAsset.assetId,
@@ -97,13 +98,19 @@ export const getTradeQuote = async (input, _deps) => {
         }));
     }
     // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset precision
-    const networkFeeCryptoBaseUnit = toBaseUnit(bnOrZero(route.gasFee?.amount), feeAsset.precision);
+    const networkFeeCryptoBaseUnit = BigAmount.fromPrecision({
+        value: 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 = toBaseUnit(outputAmount, buyAsset.precision);
+    const buyAmountAfterFeesCryptoBaseUnit = BigAmount.fromPrecision({
+        value: outputAmount,
+        precision: buyAsset.precision,
+    }).toBaseUnit();
     const rate = getInputOutputRate({
         sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
         buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
@@ -148,7 +155,10 @@ export const getTradeQuote = async (input, _deps) => {
     }
     const solanaTransactionMetadata = maybeSolanaTransactionMetadata?.unwrap();
     const step = {
-        buyAmountBeforeFeesCryptoBaseUnit: toBaseUnit(outputAmount, buyAsset.precision),
+        buyAmountBeforeFeesCryptoBaseUnit: BigAmount.fromPrecision({
+            value: outputAmount,
+            precision: buyAsset.precision,
+        }).toBaseUnit(),
         buyAmountAfterFeesCryptoBaseUnit,
         sellAmountIncludingProtocolFeesCryptoBaseUnit,
         feeData: {
@@ -160,13 +170,16 @@ export const getTradeQuote = async (input, _deps) => {
         buyAsset,
         sellAsset,
         accountNumber,
-        allowanceContract: route.contract ?? '0x0',
+        allowanceContract: sellAsset.chainId === tronChainId ? buildTx.to : route.contract ?? '0x0',
         estimatedExecutionTimeMs: route.timeEstimated * 1000,
         butterSwapTransactionMetadata: {
             to: buildTx.to,
             data: buildTx.data,
             value: buildTx.value,
             gasLimit: bnOrZero(route.gasEstimatedTarget).toFixed(),
+            method: buildTx.method,
+            args: buildTx.args,
+            memo: buildTx.memo,
         },
         ...(solanaTransactionMetadata && {
             solanaTransactionMetadata,

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

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

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

@@ -1,6 +1,6 @@
-import { btcAssetId, btcChainId, solanaChainId } from '@shapeshiftoss/caip';
+import { btcChainId, solanaChainId, tronChainId } from '@shapeshiftoss/caip';
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
-import { bn, bnOrZero, chainIdToFeeAssetId, convertDecimalPercentageToBasisPoints, toBaseUnit, } from '@shapeshiftoss/utils';
+import { BigAmount, bnOrZero, chainIdToFeeAssetId, convertDecimalPercentageToBasisPoints, } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
@@ -11,29 +11,24 @@ export const getTradeRate = async (input, _deps) => {
     const { sellAsset, buyAsset, affiliateBps, accountNumber, receiveAddress, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
     if (!isEvmChainId(sellAsset.chainId) &&
         sellAsset.chainId !== btcChainId &&
-        sellAsset.chainId !== solanaChainId) {
+        sellAsset.chainId !== solanaChainId &&
+        sellAsset.chainId !== tronChainId) {
         return Err(makeSwapErrorRight({
             message: `Unsupported chain`,
             code: 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 === btcAssetId) {
-        return Err(makeSwapErrorRight({
-            message: `BTC sells are currently unsupported`,
-            code: TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    const amount = bn(sellAmountIncludingProtocolFeesCryptoBaseUnit)
-        .shiftedBy(-sellAsset.precision)
-        .toString();
+    const amount = BigAmount.fromBaseUnit({
+        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        precision: sellAsset.precision,
+    }).toPrecision();
     const feeAssetId = chainIdToFeeAssetId(sellAsset.chainId);
     const slippageTolerancePercentageDecimal = getDefaultSlippageDecimalPercentageForSwapper(SwapperName.ButterSwap);
     const slippage = convertDecimalPercentageToBasisPoints(slippageTolerancePercentageDecimal).toString();
     const result = await getButterRoute({
         sellAsset,
         buyAsset,
-        sellAmountCryptoBaseUnit: amount,
+        sellAmountCryptoPrecision: amount,
         slippage,
         affiliate: makeButterSwapAffiliate(affiliateBps),
     });
@@ -43,7 +38,10 @@ export const getTradeRate = async (input, _deps) => {
     const routeResponse = result.unwrap();
     if (!isRouteSuccess(routeResponse)) {
         if (routeResponse.errno === ButterSwapErrorCode.InsufficientAmount) {
-            const minAmountCryptoBaseUnit = toBaseUnit(routeResponse.minAmount, sellAsset.precision);
+            const minAmountCryptoBaseUnit = BigAmount.fromPrecision({
+                value: routeResponse.minAmount,
+                precision: sellAsset.precision,
+            }).toBaseUnit();
             return Err(createTradeAmountTooSmallErr({
                 minAmountCryptoBaseUnit,
                 assetId: sellAsset.assetId,
@@ -66,7 +64,10 @@ export 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 = toBaseUnit(outputAmount, buyAsset.precision);
+    const buyAmountAfterFeesCryptoBaseUnit = BigAmount.fromPrecision({
+        value: outputAmount,
+        precision: buyAsset.precision,
+    }).toBaseUnit();
     const rate = getInputOutputRate({
         sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
         buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
@@ -82,12 +83,18 @@ export const getTradeRate = async (input, _deps) => {
     }
     // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset precision
     const networkFeeCryptoBaseUnit = bnOrZero(route.gasFee?.amount).gt(0)
-        ? toBaseUnit(route.gasFee.amount, feeAsset.precision)
+        ? BigAmount.fromPrecision({
+            value: route.gasFee.amount,
+            precision: feeAsset.precision,
+        }).toBaseUnit()
         : '0';
     // Always a single step
     const step = {
         rate,
-        buyAmountBeforeFeesCryptoBaseUnit: toBaseUnit(outputAmount, buyAsset.precision),
+        buyAmountBeforeFeesCryptoBaseUnit: BigAmount.fromPrecision({
+            value: outputAmount,
+            precision: buyAsset.precision,
+        }).toBaseUnit(),
         buyAmountAfterFeesCryptoBaseUnit,
         sellAmountIncludingProtocolFeesCryptoBaseUnit,
         feeData: {

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

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

package/dist/esm/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/esm/swappers/ButterSwap/utils/helpers.js

@@ -10,6 +10,7 @@ const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
     43114: KnownChainIds.AvalancheMainnet,
     1360108768460801: KnownChainIds.SolanaMainnet,
     1360095883558913: KnownChainIds.BitcoinMainnet,
+    728126428: 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/esm/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/esm/swappers/ButterSwap/xhr.js

@@ -1,4 +1,4 @@
-import { fromAssetId, solanaChainId } from '@shapeshiftoss/caip';
+import { fromAssetId, solanaChainId, tronChainId } from '@shapeshiftoss/caip';
 import { chainIdToFeeAssetId } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { zeroAddress } from 'viem';
@@ -20,7 +20,8 @@ export var ButterSwapErrorCode;
     ButterSwapErrorCode[ButterSwapErrorCode["InvalidAddress"] = 2007] = "InvalidAddress";
 })(ButterSwapErrorCode || (ButterSwapErrorCode = {}));
 const SOLANA_NATIVE_ADDRESS = 'So11111111111111111111111111111111111111112';
-export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippage, affiliate, }) => {
+const TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
+export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision, slippage, affiliate, }) => {
     const butterFromChainId = chainIdToButterSwapChainId(sellAsset.chainId);
     const butterToChainId = chainIdToButterSwapChainId(buyAsset.chainId);
     if (!butterFromChainId || !butterToChainId) {
@@ -37,6 +38,8 @@ export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBase
     const sellAssetAddress = (() => {
         if (sellAsset.chainId === solanaChainId && sellAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
+        if (sellAsset.chainId === tronChainId && sellAssetIsNative)
+            return TRON_NATIVE_ADDRESS;
         if (sellAssetIsNative)
             return zeroAddress;
         return sellAssetAddressRaw;
@@ -44,6 +47,8 @@ export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBase
     const buyAssetAddress = (() => {
         if (buyAsset.chainId === solanaChainId && buyAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
+        if (buyAsset.chainId === tronChainId && buyAssetIsNative)
+            return TRON_NATIVE_ADDRESS;
         if (buyAssetIsNative)
             return zeroAddress;
         return buyAssetAddressRaw;
@@ -54,7 +59,7 @@ export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoBase
         tokenInAddress: sellAssetAddress,
         toChainId: butterToChainId,
         tokenOutAddress: buyAssetAddress,
-        amount: sellAmountCryptoBaseUnit,
+        amount: sellAmountCryptoPrecision,
         type: 'exactIn',
         slippage,
         entrance: 'shapeshift',

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

@@ -1,5 +1,6 @@
 import { getProvidersExcluding } from '@cetusprotocol/aggregator-sdk';
-import { Transaction } from '@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions';
+import { Transaction } from '@mysten/sui/transactions';
+import { toAddressNList } from '@shapeshiftoss/chain-adapters';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { bnOrZero } from '@shapeshiftoss/utils';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../constants.js';
@@ -51,13 +52,7 @@ export const 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 = toAddressNList(bip44Params);
         return {
             addressNList,
             intentMessageBytes: intentMessage,

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

@@ -1,4 +1,4 @@
-import { Transaction } from '@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { bnOrZero } from '@shapeshiftoss/utils';
 import { Err } from '@sniptt/monads';
 import { v4 as uuid } from 'uuid';

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

@@ -1,4 +1,4 @@
-import { Transaction } from '@cetusprotocol/aggregator-sdk/node_modules/@mysten/sui/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { bnOrZero } from '@shapeshiftoss/utils';
 import { Err } from '@sniptt/monads';
 import { v4 as uuid } from 'uuid';

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

@@ -1,5 +1,5 @@
 import { CHAIN_NAMESPACE, fromAssetId, solAssetId } from '@shapeshiftoss/caip';
-import { assertUnreachable, bnOrZero, toBaseUnit } from '@shapeshiftoss/utils';
+import { assertUnreachable, BigAmount, bnOrZero } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { v4 as uuid } from 'uuid';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
@@ -66,11 +66,11 @@ export 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 Err(createTradeAmountTooSmallErr({
                 assetId: sellAsset.assetId,
-                minAmountCryptoBaseUnit: cause.response?.data.errors.minimalAmountNative[0],
+                minAmountCryptoBaseUnit: cause.response?.data?.errors?.minimalAmountNative?.[0],
             }));
         }
         return Err(makeSwapErrorRight({
@@ -199,7 +199,10 @@ export 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 = toBaseUnit(bnOrZero(singleQuoteResponse.boostQuote.ingressAmount).times(bnOrZero(singleQuoteResponse.estimatedPrice)), buyAsset.precision);
+            const buyAmountBeforeFeesCryptoBaseUnit = BigAmount.fromPrecision({
+                value: bnOrZero(singleQuoteResponse.boostQuote.ingressAmount).times(bnOrZero(singleQuoteResponse.estimatedPrice)),
+                precision: buyAsset.precision,
+            }).toBaseUnit();
             const boostTradeRateOrQuote = {
                 id: uuid(),
                 rate: boostRate,
@@ -246,7 +249,10 @@ export 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 = toBaseUnit(bnOrZero(singleQuoteResponse.ingressAmount).times(bnOrZero(singleQuoteResponse.estimatedPrice)), buyAsset.precision);
+        const buyAmountBeforeFeesCryptoBaseUnit = BigAmount.fromPrecision({
+            value: bnOrZero(singleQuoteResponse.ingressAmount).times(bnOrZero(singleQuoteResponse.estimatedPrice)),
+            precision: buyAsset.precision,
+        }).toBaseUnit();
         const tradeRateOrQuote = {
             id: uuid(),
             rate,

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

@@ -1,5 +1,5 @@
 import { fromAssetId } from '@shapeshiftoss/caip';
-import { bn, bnOrZero, fromBaseUnit, isToken } from '@shapeshiftoss/utils';
+import { BigAmount, bn, bnOrZero, isToken } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
 import { makeSwapErrorRight } from '../../../utils.js';
@@ -15,8 +15,14 @@ export const isSupportedAssetId = (chainId, assetId) => {
     return supportedAssetIds.includes(assetId);
 };
 export const calculateChainflipMinPrice = ({ sellAmountIncludingProtocolFeesCryptoBaseUnit, buyAmountAfterFeesCryptoBaseUnit, slippageTolerancePercentageDecimal, sellAsset, buyAsset, }) => {
-    const sellAmountCryptoPrecision = fromBaseUnit(sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset.precision);
-    const buyAmountCryptoPrecision = fromBaseUnit(buyAmountAfterFeesCryptoBaseUnit, buyAsset.precision);
+    const sellAmountCryptoPrecision = BigAmount.fromBaseUnit({
+        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        precision: sellAsset.precision,
+    }).toPrecision();
+    const buyAmountCryptoPrecision = BigAmount.fromBaseUnit({
+        value: buyAmountAfterFeesCryptoBaseUnit,
+        precision: buyAsset.precision,
+    }).toPrecision();
     const estimatedPrice = 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/esm/swappers/CowSwapper/CowSwapper.js

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

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

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