@shapeshiftoss/swapper 17.7.3 → 18.1.0

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

@@ -1,131 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.butterSwapApi = void 0;
-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 evm_1 = require("../../utils/evm");
+const getSolanaTransactionFees_1 = require("../../utils/solana/getSolanaTransactionFees");
+const getUnsignedSolanaTransaction_1 = require("../../utils/solana/getUnsignedSolanaTransaction");
+const tron_1 = require("../../utils/tron");
+const utxo_1 = require("../../utils/utxo");
 const checkTradeStatus_1 = require("./swapperApi/checkTradeStatus");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
 const getTradeRate_1 = require("./swapperApi/getTradeRate");
 exports.butterSwapApi = {
-    getTradeQuote: getTradeQuote_1.getTradeQuote,
-    getTradeRate: getTradeRate_1.getTradeRate,
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
     checkTradeStatus: checkTradeStatus_1.checkTradeStatus,
-    getEvmTransactionFees: async ({ from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        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 { 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 chain_adapters_1.evm.getFees({
-            adapter,
-            data,
-            to,
-            value: BigInt(value).toString(),
-            from,
-            supportsEIP1559,
-        });
-        const networkFeeCryptoBaseUnit = chain_adapters_1.evm.calcNetworkFeeCryptoBaseUnit({
-            gasLimit,
-            gasPrice: feeData.gasPrice ?? '0',
-            maxFeePerGas: feeData.maxFeePerGas,
-            maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
-            supportsEIP1559,
-        });
-        return bignumber_js_1.default.max(feeData.networkFeeCryptoBaseUnit, networkFeeCryptoBaseUnit).toFixed();
-    },
-    getUnsignedEvmTransaction: async (args) => {
-        const { from, stepIndex, tradeQuote, supportsEIP1559, assertGetEvmChainAdapter } = args;
-        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, data, gasLimit, value } = butterSwapTransactionMetadata;
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.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_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;
-    },
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getUnsignedUtxoTransaction: utxo_1.getUnsignedUtxoTransaction,
+    getUtxoTransactionFees: utxo_1.getUtxoTransactionFees,
     getUnsignedSolanaTransaction: getUnsignedSolanaTransaction_1.getUnsignedSolanaTransaction,
     getSolanaTransactionFees: getSolanaTransactionFees_1.getSolanaTransactionFees,
-    getTronTransactionFees: getTronTransactionFees_1.getTronTransactionFees,
-    getUnsignedTronTransaction: getUnsignedTronTransaction_1.getUnsignedTronTransaction,
+    getTronTransactionFees: tron_1.getTronTransactionFees,
+    getUnsignedTronTransaction: tron_1.getUnsignedTronTransaction,
 };

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

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

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

@@ -14,4 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.butterSwap = void 0;
 __exportStar(require("./endpoints"), exports);
+var ButterSwap_1 = require("./ButterSwap");
+Object.defineProperty(exports, "butterSwap", { enumerable: true, get: function () { return ButterSwap_1.butterSwap; } });

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

@@ -75,7 +75,7 @@ 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
@@ -96,8 +96,8 @@ const checkTradeStatus = async (input) => {
         return {
             status,
             buyTxHash: destinationTxHash,
-            relayerTxHash,
-            relayerExplorerTxLink,
+            swapperTxId: relayerTxHash,
+            swapperTxLink: relayerTxHash && relayerScanUrl ? `${relayerScanUrl}tx/${relayerTxHash}` : undefined,
             message: undefined,
         };
     }

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

@@ -148,7 +148,7 @@ vitest_1.vi.mock('../xhr', () => ({
             state: 1,
             toHash: 'dest-tx',
             relayerHash: 'relayer-tx',
-            relayerChain: { scanUrl: 'https://scan.url' },
+            relayerChain: { scanUrl: 'https://scan.url/' },
         };
         vitest_1.vi.mocked(xhr.getBridgeInfoBySourceHash).mockResolvedValue((0, monads_1.Ok)(mockBridgeInfo));
         const input = {
@@ -174,8 +174,8 @@ vitest_1.vi.mock('../xhr', () => ({
         (0, vitest_1.expect)(result).toEqual({
             status: unchained_client_1.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/cjs/swappers/ButterSwap/swapperApi/getTradeQuote.d.ts

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

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

@@ -2,80 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
-const affiliateFee_1 = require("../../utils/affiliateFee");
-const constants_2 = require("../utils/constants");
+const getButterSwapStepData_1 = require("../utils/getButterSwapStepData");
+const getButterSwapTradeContext_1 = require("../utils/getButterSwapTradeContext");
 const xhr_1 = require("../xhr");
-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.tronChainId) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `Unsupported chain`,
-            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',
-            code: types_1.TradeQuoteError.UnknownError,
-        }));
-    }
+// TODO: Debug why same-chain Tron swaps revert (swapAndCall method works on EVM but 0 successful on Tron)
+const getTradeQuote = async (input, deps) => {
+    const { sellAsset, receiveAddress, accountNumber, slippageTolerancePercentageDecimal } = input;
+    const maybeAddresses = (0, utils_2.assertQuoteAddresses)(input);
+    if (maybeAddresses.isErr())
+        return (0, monads_1.Err)(maybeAddresses.unwrapErr());
+    const { sendAddress } = maybeAddresses.unwrap();
     const slippageDecimal = slippageTolerancePercentageDecimal ??
         (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.ButterSwap);
-    const slippage = (0, utils_1.convertDecimalPercentageToBasisPoints)(slippageDecimal).toString();
-    // Call ButterSwap /route API
-    const routeResult = await (0, xhr_1.getButterRoute)({
-        sellAsset,
-        buyAsset,
-        sellAmountCryptoPrecision: utils_1.BigAmount.fromBaseUnit({
-            value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            precision: sellAsset.precision,
-        }).toPrecision(),
-        slippage,
-        affiliate: (0, constants_2.makeButterSwapAffiliate)(affiliateBps),
+    const maybeContext = await (0, getButterSwapTradeContext_1.getButterSwapTradeContext)({
+        input,
+        deps,
+        slippageTolerancePercentageDecimal: slippageDecimal,
     });
-    if (routeResult.isErr())
-        return (0, monads_1.Err)(routeResult.unwrapErr());
-    const routeResponse = routeResult.unwrap();
-    if (!(0, xhr_1.isRouteSuccess)(routeResponse)) {
-        if (routeResponse.errno === xhr_1.ButterSwapErrorCode.InsufficientAmount) {
-            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,
-            }));
-        }
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getTradeQuote] ${routeResponse.message}`,
-            code: (0, xhr_1.butterSwapErrorToTradeQuoteError)(routeResponse.errno),
-        }));
-    }
-    const route = routeResponse.data[0];
-    if (!route) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: '[getTradeQuote] No route found',
-            code: types_1.TradeQuoteError.NoRouteFound,
-        }));
-    }
-    // Call ButterSwap /swap API to get calldata and contract info
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, route, stepDataArgs } = maybeContext.unwrap();
     const buildTxResult = await (0, xhr_1.fetchTxData)({
         hash: route.hash,
-        slippage,
+        slippage: (0, utils_1.convertDecimalPercentageToBasisPoints)(slippageDecimal).toString(),
         from: sendAddress,
-        receiver: receiveAddress, // receiver (destination chain address)
+        receiver: receiveAddress,
     });
     if (buildTxResult.isErr())
         return (0, monads_1.Err)(buildTxResult.unwrapErr());
@@ -93,127 +49,31 @@ const getTradeQuote = async (input, _deps) => {
             code: types_1.TradeQuoteError.QueryFailed,
         }));
     }
-    // Fee asset for network fees
-    const feeAsset = _deps.assetsById[(0, utils_1.chainIdToFeeAssetId)(sellAsset.chainId)];
-    if (!feeAsset) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getTradeQuote] Fee asset not found for chainId ${sellAsset.chainId}`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset 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 = utils_1.BigAmount.fromPrecision({
-        value: outputAmount,
-        precision: buyAsset.precision,
-    }).toBaseUnit();
-    const rate = (0, utils_2.getInputOutputRate)({
-        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-        sellAsset,
-        buyAsset,
+    const maybeStepData = await (0, getButterSwapStepData_1.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 !== caip_1.solanaChainId)
-            return (0, monads_1.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 = web3_js_1.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 web3_js_1.AddressLookupTableAccount({
-                key: new web3_js_1.PublicKey(info.key),
-                state: web3_js_1.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 = web3_js_1.TransactionMessage.decompile(versionedTransaction.message, {
-                addressLookupTableAccounts,
-            }).instructions;
-            return (0, monads_1.Ok)({
-                instructions,
-                addressLookupTableAddresses: addressLookupTableAccountKeys,
-                isOversized,
-            });
-        }
-        catch (error) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: `[getTradeQuote] Error decompiling VersionedMessage: ${error}`,
-                code: types_1.TradeQuoteError.UnknownError,
-            }));
-        }
-    })();
-    if (sellAsset.chainId === caip_1.solanaChainId && maybeSolanaTransactionMetadata?.isErr()) {
-        return (0, monads_1.Err)(maybeSolanaTransactionMetadata.unwrapErr());
-    }
-    const solanaTransactionMetadata = maybeSolanaTransactionMetadata?.unwrap();
-    const step = {
-        buyAmountBeforeFeesCryptoBaseUnit: utils_1.BigAmount.fromPrecision({
-            value: outputAmount,
-            precision: buyAsset.precision,
-        }).toBaseUnit(),
-        buyAmountAfterFeesCryptoBaseUnit,
-        sellAmountIncludingProtocolFeesCryptoBaseUnit,
-        feeData: {
-            networkFeeCryptoBaseUnit,
-            protocolFees: undefined,
-        },
-        rate,
-        source: types_1.SwapperName.ButterSwap,
-        buyAsset,
-        sellAsset,
-        accountNumber,
-        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,
-        }),
-        affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-            strategy: 'buy_asset',
-            affiliateBps,
-            sellAsset,
-            buyAsset,
-            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
-            isEstimate: true,
-        }),
-    };
+    if (maybeStepData.isErr())
+        return (0, monads_1.Err)(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit, transactionData, butterSwapTransactionMetadata } = maybeStepData.unwrap();
     const tradeQuote = {
-        id: route.hash,
-        rate,
-        receiveAddress,
-        affiliateBps,
-        isStreaming: false,
+        ...tradeCommon,
         quoteOrRate: 'quote',
-        swapperName: types_1.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 === caip_1.tronChainId ? buildTx.to : stepCommon.allowanceContract,
+                transactionData,
+                butterSwapTransactionMetadata,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
+            },
+        ],
     };
     return (0, monads_1.Ok)([tradeQuote]);
 };

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("@shapeshiftoss/types");
 const monads_1 = require("@sniptt/monads");
 const vitest_1 = require("vitest");
-const assets_1 = require("../../utils/test-data/assets");
+const assets_1 = require("../../../utils/test-data/assets");
 const routeQuote_1 = require("../test-data/routeQuote");
 const getTradeQuote_1 = require("./getTradeQuote");
 vitest_1.vi.mock('../xhr', () => ({
@@ -23,12 +24,30 @@ vitest_1.vi.mock('../xhr', () => ({
     isRouteSuccess: () => true,
     isBuildTxSuccess: () => true,
 }));
+// The override path reads live chain state - resolve to no override so estimation exercises the
+// mocked adapter
+vitest_1.vi.mock('../../../utils/evm/stateOverride', async (importOriginal) => ({
+    ...(await importOriginal()),
+    getMinimalStateOverride: vitest_1.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' } },
+    }),
+};
 (0, vitest_1.describe)('getTradeQuote', () => {
     (0, vitest_1.it)('should return a trade quote', async () => {
         const deps = {
             assetsById: { [assets_1.ETH.assetId]: assets_1.ETH },
             assertGetChainAdapter: () => vitest_1.vi.fn(),
-            assertGetEvmChainAdapter: () => vitest_1.vi.fn(),
+            assertGetEvmChainAdapter: () => mockEvmChainAdapter,
             assertGetUtxoChainAdapter: () => vitest_1.vi.fn(),
             assertGetCosmosSdkChainAdapter: () => vitest_1.vi.fn(),
             assertGetSolanaChainAdapter: () => vitest_1.vi.fn(),
@@ -53,13 +72,23 @@ vitest_1.vi.mock('../xhr', () => ({
             affiliateBps: '0',
             allowMultiHop: true,
             quoteOrRate: 'quote',
+            chainId: types_1.KnownChainIds.EthereumMainnet,
+            supportsEIP1559: false,
         };
         const result = await (0, getTradeQuote_1.getTradeQuote)(input, deps);
         (0, vitest_1.expect)(result.isOk()).toBe(true);
         const tradeQuote = result.unwrap();
-        // Use the actual returned value for the expected rate
-        (0, vitest_1.expect)(tradeQuote[0].rate).toBe('2296.409699');
-        // 1 WETH in base units
-        (0, vitest_1.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
+        (0, vitest_1.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
+        (0, vitest_1.expect)(tradeQuote[0].steps[0].allowanceContract).toBe('0xEE030ec6F4307411607E55aCD08e628Ae6655B86');
     });
 });

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

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