@shapeshiftoss/swapper 17.8.0 → 18.1.0

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

@@ -1,123 +1,19 @@
-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 { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/evm/index.js';
+import { getSolanaTransactionFees } from '../../utils/solana/getSolanaTransactionFees.js';
+import { getUnsignedSolanaTransaction } from '../../utils/solana/getUnsignedSolanaTransaction.js';
+import { getTronTransactionFees, getUnsignedTronTransaction } from '../../utils/tron/index.js';
+import { getUnsignedUtxoTransaction, getUtxoTransactionFees } from '../../utils/utxo/index.js';
 import { checkTradeStatus } from './swapperApi/checkTradeStatus.js';
 import { getTradeQuote } from './swapperApi/getTradeQuote.js';
 import { getTradeRate } from './swapperApi/getTradeRate.js';
 export const butterSwapApi = {
-    getTradeQuote,
-    getTradeRate,
+    getTradeQuote: (input, deps) => getTradeQuote(input, deps),
+    getTradeRate: (input, deps) => getTradeRate(input, deps),
     checkTradeStatus,
-    getEvmTransactionFees: async ({ from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!isExecutableTradeQuote(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = getExecutableTradeStep(tradeQuote, stepIndex);
-        const { butterSwapTransactionMetadata, sellAsset } = step;
-        if (!butterSwapTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { to, data, gasLimit, value } = butterSwapTransactionMetadata;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await evm.getFees({
-            adapter,
-            data,
-            to,
-            value: BigInt(value).toString(),
-            from,
-            supportsEIP1559,
-        });
-        const networkFeeCryptoBaseUnit = evm.calcNetworkFeeCryptoBaseUnit({
-            gasLimit,
-            gasPrice: feeData.gasPrice ?? '0',
-            maxFeePerGas: feeData.maxFeePerGas,
-            maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
-            supportsEIP1559,
-        });
-        return BigNumber.max(feeData.networkFeeCryptoBaseUnit, networkFeeCryptoBaseUnit).toFixed();
-    },
-    getUnsignedEvmTransaction: async (args) => {
-        const { from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter } = args;
-        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, data, gasLimit, value } = butterSwapTransactionMetadata;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await evm.getFees({
-            adapter,
-            data,
-            to,
-            value: BigInt(value).toString(),
-            from,
-            supportsEIP1559,
-        });
-        return adapter.buildCustomApiTx({
-            accountNumber,
-            data,
-            from,
-            to,
-            value: BigInt(value).toString(),
-            ...feeData,
-            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;
-    },
+    getEvmTransactionFees,
+    getUnsignedEvmTransaction,
+    getUnsignedUtxoTransaction,
+    getUtxoTransactionFees,
     getUnsignedSolanaTransaction,
     getSolanaTransactionFees,
     getTronTransactionFees,

package/dist/esm/swappers/ButterSwap/index.d.ts

@@ -1 +1,2 @@
 export * from './endpoints.js';
+export { butterSwap } from './ButterSwap.js';

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

@@ -1 +1,2 @@
 export * from './endpoints.js';
+export { butterSwap } from './ButterSwap.js';

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

@@ -1,7 +1,7 @@
 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';
+import { checkEvmSwapStatus, checkSolanaSwapStatus, createDefaultStatusResponse, } from '../../../utils/index.js';
 import { getBridgeInfoBySourceHash } from '../xhr.js';
 // See: https://docs.butternetwork.io/butter-swap-integration/butter-api-for-swap-data/get-swap-history-by-source-hash
 // Example endpoint: https://bs-app-api.chainservice.io/api/queryBridgeInfoBySourceHash?hash=0x...
@@ -72,7 +72,7 @@ export const checkTradeStatus = async (input) => {
         // Use toHash as the destination chain tx hash if present
         const destinationTxHash = bridgeInfo.toHash ?? undefined;
         const relayerTxHash = bridgeInfo.relayerHash ?? undefined;
-        const relayerExplorerTxLink = bridgeInfo.relayerChain?.scanUrl ?? undefined;
+        const relayerScanUrl = bridgeInfo.relayerChain?.scanUrl ?? undefined;
         // State mapping: 0 = pending, 1 = complete, 6 = refunded/failed
         let status = (() => {
             // Optimistically return Confirmed if we have a destination tx hash, useful to chains with long block
@@ -93,8 +93,8 @@ export const checkTradeStatus = async (input) => {
         return {
             status,
             buyTxHash: destinationTxHash,
-            relayerTxHash,
-            relayerExplorerTxLink,
+            swapperTxId: relayerTxHash,
+            swapperTxLink: relayerTxHash && relayerScanUrl ? `${relayerScanUrl}tx/${relayerTxHash}` : undefined,
             message: undefined,
         };
     }

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

@@ -2,7 +2,7 @@ import { solanaChainId } from '@shapeshiftoss/caip';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { Ok } from '@sniptt/monads';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import * as utils from '../../../utils.js';
+import * as utils from '../../../utils/index.js';
 import * as xhr from '../xhr.js';
 import { checkTradeStatus } from './checkTradeStatus.js';
 // Mock the utility functions
@@ -123,7 +123,7 @@ describe('checkTradeStatus same-chain short-circuit', () => {
             state: 1,
             toHash: 'dest-tx',
             relayerHash: 'relayer-tx',
-            relayerChain: { scanUrl: 'https://scan.url' },
+            relayerChain: { scanUrl: 'https://scan.url/' },
         };
         vi.mocked(xhr.getBridgeInfoBySourceHash).mockResolvedValue(Ok(mockBridgeInfo));
         const input = {
@@ -149,8 +149,8 @@ describe('checkTradeStatus same-chain short-circuit', () => {
         expect(result).toEqual({
             status: TxStatus.Confirmed,
             buyTxHash: 'dest-tx',
-            relayerTxHash: 'relayer-tx',
-            relayerExplorerTxLink: 'https://scan.url',
+            swapperTxId: 'relayer-tx',
+            swapperTxLink: 'https://scan.url/tx/relayer-tx',
             message: undefined,
         });
     });

package/dist/esm/swappers/ButterSwap/swapperApi/getTradeQuote.d.ts

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

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

@@ -1,78 +1,34 @@
-import { btcChainId, solanaChainId, tronChainId } from '@shapeshiftoss/caip';
-import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
-import { BigAmount, bnOrZero, chainIdToFeeAssetId, convertDecimalPercentageToBasisPoints, } from '@shapeshiftoss/utils';
+import { tronChainId } from '@shapeshiftoss/caip';
+import { convertDecimalPercentageToBasisPoints } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
-import { AddressLookupTableAccount, PublicKey, TransactionMessage, VersionedTransaction, } from '@solana/web3.js';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
-import { createTradeAmountTooSmallErr, getInputOutputRate, makeSwapErrorRight, } from '../../../utils.js';
-import { buildAffiliateFee } from '../../utils/affiliateFee.js';
-import { makeButterSwapAffiliate } from '../utils/constants.js';
-import { ButterSwapErrorCode, butterSwapErrorToTradeQuoteError, fetchTxData, getButterRoute, isBuildTxSuccess, isRouteSuccess, } from '../xhr.js';
-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 !== tronChainId) {
-        return Err(makeSwapErrorRight({
-            message: `Unsupported chain`,
-            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',
-            code: TradeQuoteError.UnknownError,
-        }));
-    }
+import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
+import { getButterSwapStepData } from '../utils/getButterSwapStepData.js';
+import { getButterSwapTradeContext } from '../utils/getButterSwapTradeContext.js';
+import { fetchTxData, isBuildTxSuccess } from '../xhr.js';
+// TODO: Debug why same-chain Tron swaps revert (swapAndCall method works on EVM but 0 successful on Tron)
+export const getTradeQuote = async (input, deps) => {
+    const { sellAsset, receiveAddress, accountNumber, slippageTolerancePercentageDecimal } = input;
+    const maybeAddresses = assertQuoteAddresses(input);
+    if (maybeAddresses.isErr())
+        return Err(maybeAddresses.unwrapErr());
+    const { sendAddress } = maybeAddresses.unwrap();
     const slippageDecimal = slippageTolerancePercentageDecimal ??
         getDefaultSlippageDecimalPercentageForSwapper(SwapperName.ButterSwap);
-    const slippage = convertDecimalPercentageToBasisPoints(slippageDecimal).toString();
-    // Call ButterSwap /route API
-    const routeResult = await getButterRoute({
-        sellAsset,
-        buyAsset,
-        sellAmountCryptoPrecision: BigAmount.fromBaseUnit({
-            value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            precision: sellAsset.precision,
-        }).toPrecision(),
-        slippage,
-        affiliate: makeButterSwapAffiliate(affiliateBps),
+    const maybeContext = await getButterSwapTradeContext({
+        input,
+        deps,
+        slippageTolerancePercentageDecimal: slippageDecimal,
     });
-    if (routeResult.isErr())
-        return Err(routeResult.unwrapErr());
-    const routeResponse = routeResult.unwrap();
-    if (!isRouteSuccess(routeResponse)) {
-        if (routeResponse.errno === ButterSwapErrorCode.InsufficientAmount) {
-            const minAmountCryptoBaseUnit = BigAmount.fromPrecision({
-                value: routeResponse.minAmount,
-                precision: sellAsset.precision,
-            }).toBaseUnit();
-            return Err(createTradeAmountTooSmallErr({
-                minAmountCryptoBaseUnit,
-                assetId: sellAsset.assetId,
-            }));
-        }
-        return Err(makeSwapErrorRight({
-            message: `[getTradeQuote] ${routeResponse.message}`,
-            code: butterSwapErrorToTradeQuoteError(routeResponse.errno),
-        }));
-    }
-    const route = routeResponse.data[0];
-    if (!route) {
-        return Err(makeSwapErrorRight({
-            message: '[getTradeQuote] No route found',
-            code: TradeQuoteError.NoRouteFound,
-        }));
-    }
-    // Call ButterSwap /swap API to get calldata and contract info
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, route, stepDataArgs } = maybeContext.unwrap();
     const buildTxResult = await fetchTxData({
         hash: route.hash,
-        slippage,
+        slippage: convertDecimalPercentageToBasisPoints(slippageDecimal).toString(),
         from: sendAddress,
-        receiver: receiveAddress, // receiver (destination chain address)
+        receiver: receiveAddress,
     });
     if (buildTxResult.isErr())
         return Err(buildTxResult.unwrapErr());
@@ -90,127 +46,31 @@ export const getTradeQuote = async (input, _deps) => {
             code: TradeQuoteError.QueryFailed,
         }));
     }
-    // Fee asset for network fees
-    const feeAsset = _deps.assetsById[chainIdToFeeAssetId(sellAsset.chainId)];
-    if (!feeAsset) {
-        return Err(makeSwapErrorRight({
-            message: `[getTradeQuote] Fee asset not found for chainId ${sellAsset.chainId}`,
-            code: TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset 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 = BigAmount.fromPrecision({
-        value: outputAmount,
-        precision: buyAsset.precision,
-    }).toBaseUnit();
-    const rate = getInputOutputRate({
-        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-        sellAsset,
-        buyAsset,
+    const maybeStepData = await getButterSwapStepData({
+        ...stepDataArgs,
+        type: 'quote',
+        input,
+        buildTx,
+        from: sendAddress,
     });
-    // Extract Solana transaction metadata from versioned transaction, to allow building an unsigned Tx later on at getUnsignedSolanaTransaction time
-    const maybeSolanaTransactionMetadata = await (async () => {
-        if (sellAsset.chainId !== solanaChainId)
-            return Ok(undefined);
-        const txData = buildTx.data.startsWith('0x') ? buildTx.data.slice(2) : buildTx.data;
-        const txBytes = Buffer.from(txData, 'hex');
-        // Solana transactions are limited to 1232 bytes. If Butter returns a larger tx,
-        // we need to split it into a Jito bundle (2 txs with tip in the last one).
-        const SOLANA_TX_SIZE_LIMIT = 1232;
-        const isOversized = txBytes.length > SOLANA_TX_SIZE_LIMIT;
-        const versionedTransaction = VersionedTransaction.deserialize(new Uint8Array(txBytes));
-        const adapter = _deps.assertGetSolanaChainAdapter(sellAsset.chainId);
-        try {
-            const addressLookupTableAccountKeys = versionedTransaction.message.addressTableLookups.map(lookup => lookup.accountKey.toString());
-            const addressLookupTableAccountsInfos = await adapter.getAddressLookupTableAccounts(addressLookupTableAccountKeys);
-            const addressLookupTableAccounts = addressLookupTableAccountsInfos.map(info => new AddressLookupTableAccount({
-                key: new PublicKey(info.key),
-                state: AddressLookupTableAccount.deserialize(new Uint8Array(info.data)),
-            }));
-            // Decompile VersionedMessage with address lookup tables to get instructions
-            // This is required to properly resolve all account addresses in the transaction
-            // Without lookup tables, the transaction would fail during execution
-            // Reference: https://dev.jup.ag/docs/old/additional-topics/composing-with-versioned-transaction
-            const instructions = TransactionMessage.decompile(versionedTransaction.message, {
-                addressLookupTableAccounts,
-            }).instructions;
-            return Ok({
-                instructions,
-                addressLookupTableAddresses: addressLookupTableAccountKeys,
-                isOversized,
-            });
-        }
-        catch (error) {
-            return Err(makeSwapErrorRight({
-                message: `[getTradeQuote] Error decompiling VersionedMessage: ${error}`,
-                code: TradeQuoteError.UnknownError,
-            }));
-        }
-    })();
-    if (sellAsset.chainId === solanaChainId && maybeSolanaTransactionMetadata?.isErr()) {
-        return Err(maybeSolanaTransactionMetadata.unwrapErr());
-    }
-    const solanaTransactionMetadata = maybeSolanaTransactionMetadata?.unwrap();
-    const step = {
-        buyAmountBeforeFeesCryptoBaseUnit: BigAmount.fromPrecision({
-            value: outputAmount,
-            precision: buyAsset.precision,
-        }).toBaseUnit(),
-        buyAmountAfterFeesCryptoBaseUnit,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        feeData: {
-            networkFeeCryptoBaseUnit,
-            protocolFees: undefined,
-        },
-        rate,
-        source: SwapperName.ButterSwap,
-        buyAsset,
-        sellAsset,
-        accountNumber,
-        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,
-        }),
-        affiliateFee: buildAffiliateFee({
-            strategy: 'buy_asset',
-            affiliateBps,
-            sellAsset,
-            buyAsset,
-            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-            isEstimate: true,
-        }),
-    };
+    if (maybeStepData.isErr())
+        return Err(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit, transactionData, butterSwapTransactionMetadata } = maybeStepData.unwrap();
     const tradeQuote = {
-        id: route.hash,
-        rate,
-        receiveAddress,
-        affiliateBps,
-        isStreaming: false,
+        ...tradeCommon,
         quoteOrRate: 'quote',
-        swapperName: SwapperName.ButterSwap,
-        slippageTolerancePercentageDecimal: slippageDecimal,
-        steps: [step],
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                // Tron exec still builds from legacy metadata whose spender is the buildTx target
+                allowanceContract: sellAsset.chainId === tronChainId ? buildTx.to : stepCommon.allowanceContract,
+                transactionData,
+                butterSwapTransactionMetadata,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
+            },
+        ],
     };
     return Ok([tradeQuote]);
 };

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

@@ -1,6 +1,7 @@
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { Ok } from '@sniptt/monads';
 import { describe, expect, it, vi } from 'vitest';
-import { ETH, USDC_MAINNET, WETH } from '../../utils/test-data/assets.js';
+import { ETH, USDC_MAINNET, WETH } from '../../../utils/test-data/assets.js';
 import { ROUTE_QUOTE } from '../test-data/routeQuote.js';
 import { getTradeQuote } from './getTradeQuote.js';
 vi.mock('../xhr', () => ({
@@ -21,12 +22,30 @@ vi.mock('../xhr', () => ({
     isRouteSuccess: () => true,
     isBuildTxSuccess: () => true,
 }));
+// The override path reads live chain state - resolve to no override so estimation exercises the
+// mocked adapter
+vi.mock('../../../utils/evm/stateOverride', async (importOriginal) => ({
+    ...(await importOriginal()),
+    getMinimalStateOverride: vi.fn().mockResolvedValue(undefined),
+}));
+const mockEvmChainAdapter = {
+    getGasFeeData: () => Promise.resolve({
+        average: {
+            gasPrice: '1000000000',
+            maxFeePerGas: '2000000000',
+            maxPriorityFeePerGas: '1000000000',
+        },
+    }),
+    getFeeData: () => Promise.resolve({
+        average: { chainSpecific: { gasLimit: '500000', gasPrice: '1000000000' } },
+    }),
+};
 describe('getTradeQuote', () => {
     it('should return a trade quote', async () => {
         const deps = {
             assetsById: { [ETH.assetId]: ETH },
             assertGetChainAdapter: () => vi.fn(),
-            assertGetEvmChainAdapter: () => vi.fn(),
+            assertGetEvmChainAdapter: () => mockEvmChainAdapter,
             assertGetUtxoChainAdapter: () => vi.fn(),
             assertGetCosmosSdkChainAdapter: () => vi.fn(),
             assertGetSolanaChainAdapter: () => vi.fn(),
@@ -51,13 +70,23 @@ describe('getTradeQuote', () => {
             affiliateBps: '0',
             allowMultiHop: true,
             quoteOrRate: 'quote',
+            chainId: KnownChainIds.EthereumMainnet,
+            supportsEIP1559: false,
         };
         const result = await getTradeQuote(input, deps);
         expect(result.isOk()).toBe(true);
         const tradeQuote = result.unwrap();
-        // Use the actual returned value for the expected rate
-        expect(tradeQuote[0].rate).toBe('2296.409699');
-        // 1 WETH in base units
-        expect(tradeQuote[0].steps[0].sellAmountIncludingProtocolFeesCryptoBaseUnit).toBe('1000000000000000000');
+        // The built swap tx is what distinguishes a quote from a rate - see
+        // getButterSwapStepData.test.ts for the per-namespace build and fee behaviour
+        expect(tradeQuote[0].steps[0].transactionData).toEqual({
+            type: 'evm',
+            chainId: 1,
+            to: '0xContractAddress',
+            data: '0xCalldata',
+            value: '0',
+            gasLimit: '600000',
+        });
+        // The route contract, since this is not the tron path that spends via the buildTx target
+        expect(tradeQuote[0].steps[0].allowanceContract).toBe('0xEE030ec6F4307411607E55aCD08e628Ae6655B86');
     });
 });

package/dist/esm/swappers/ButterSwap/swapperApi/getTradeRate.d.ts

@@ -1,3 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { GetTradeRateInput, SwapErrorRight, SwapperDeps, TradeRate } from '../../../types.js';
-export declare const getTradeRate: (input: GetTradeRateInput, _deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeRate } from '../../../types.js';
+import type { ButterSwapTradeRateInput } from '../types.js';
+export declare const getTradeRate: (input: ButterSwapTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;