@shapeshiftoss/swapper 20.2.0 → 20.4.0

package/dist/esm/swappers/BobGatewaySwapper/utils/helpers.d.ts

@@ -1,4 +1,4 @@
-import type { GatewayOrderStatusV3, GatewayQuoteV3, GetQuoteParams } from '@gobob/bob-sdk';
+import type { GatewayOrderStatusV3, GatewayQuoteV4, GetQuoteParams } from '@gobob/bob-sdk';
 import { GatewaySDK } from '@gobob/bob-sdk';
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset, AssetsByIdPartial } from '@shapeshiftoss/types';
@@ -8,7 +8,6 @@ import type { SwapErrorRight, SwapperConfig } from '../../../types.js';
 import type { BobGatewayChainName } from './constants.js';
 export declare const dummyAddressForChainId: (chainId: ChainId) => string;
 export declare const getBobGatewayClient: (config: SwapperConfig) => GatewaySDK;
-export declare const toTronBase58: (address: string) => string;
 export declare const assetIdToBobGatewayToken: (assetId: string) => string;
 export declare const getBobGatewayAffiliates: (affiliateBps: string) => GetQuoteParams['affiliates'];
 export declare const getBobGatewayQuote: ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, refundAddress, amount, affiliateBps, slippageTolerancePercentageDecimal, }: {
@@ -23,23 +22,21 @@ export declare const getBobGatewayQuote: ({ config, sellAsset, buyAsset, sellCha
     amount: string;
     affiliateBps: string;
     slippageTolerancePercentageDecimal: string | undefined;
-}) => Promise<Result<GatewayQuoteV3, SwapErrorRight>>;
-export declare const createBobGatewayOrder: (config: SwapperConfig, quote: GatewayQuoteV3) => Promise<import("@sniptt/monads/build/result/result").ResOk<import("@gobob/bob-sdk").GatewayCreateOrderV3, never> | import("@sniptt/monads/build/result/result").ResErr<unknown, SwapErrorRight>>;
-export declare const registerBobGatewayTx: ({ config, orderId, txHash, sellAsset, buyAsset, }: {
+}) => Promise<Result<GatewayQuoteV4, SwapErrorRight>>;
+export declare const createBobGatewayOrder: (config: SwapperConfig, quote: GatewayQuoteV4) => Promise<import("@sniptt/monads/build/result/result").ResOk<import("@gobob/bob-sdk").GatewayCreateOrderV3, never> | import("@sniptt/monads/build/result/result").ResErr<unknown, SwapErrorRight>>;
+export declare const submitBobGatewayBtcDeposit: ({ config, orderId, bitcoinTxHex, }: {
     config: SwapperConfig;
     orderId: string;
-    txHash: string;
-    sellAsset: Asset;
-    buyAsset: Asset;
-}) => Promise<void>;
+    bitcoinTxHex: string;
+}) => Promise<string>;
 export declare const mapBobGatewayOrderStatusToTxStatus: (status: GatewayOrderStatusV3) => TxStatus;
-export declare const parseBobGatewayQuote: (quote: GatewayQuoteV3, buyAsset: Asset, assetsById: AssetsByIdPartial) => {
+export declare const parseBobGatewayQuote: (quote: GatewayQuoteV4, buyAsset: Asset, assetsById: AssetsByIdPartial) => {
     buyAmountBeforeFeesCryptoBaseUnit: string;
     buyAmountAfterFeesCryptoBaseUnit: string;
     protocolFees: Partial<Record<AssetId, import("../../../types.js").ProtocolFee>>;
     estimatedExecutionTimeMs: number | undefined;
 };
-export declare const getBobGatewayAllowanceContract: (quote: GatewayQuoteV3, sellAsset: Asset) => string;
+export declare const getBobGatewayAllowanceContract: (quote: GatewayQuoteV4, sellAsset: Asset) => string;
 export declare const assertValidTrade: ({ sellAsset, buyAsset, }: {
     sellAsset: Asset;
     buyAsset: Asset;

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

@@ -1,33 +1,27 @@
 import { GatewayErrorCode, GatewaySDK, isGatewayError } from '@gobob/bob-sdk';
+import * as bitcoin from '@shapeshiftoss/bitcoinjs-lib';
 import { ASSET_NAMESPACE, btcChainId, ethChainId, fromAssetId, toAssetId, tronChainId, } from '@shapeshiftoss/caip';
-import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
+import { isEvmChainId, tron } from '@shapeshiftoss/chain-adapters';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { bnOrZero, chainIdToFeeAssetId, contractAddressOrUndefined, isToken, } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
-import { TronWeb } from 'tronweb';
 import { getAddress, zeroAddress } from 'viem';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { createTradeAmountTooSmallErr, makeSwapErrorRight } from '../../../utils/index.js';
 import { getTreasuryAddressFromChainId } from '../../../utils/helpers.js';
-import { BOB_GATEWAY_BASE_URL, bobGatewayChainNameToChainId, chainIdToBobGatewayChainName, decimalSlippageToBobBps, DUMMY_BTC_ADDRESS, DUMMY_EVM_ADDRESS, DUMMY_TRON_ADDRESS, } from './constants.js';
+import { TRON_PLACEHOLDER_ADDRESS } from '../../../utils/tron/index.js';
+import { BOB_GATEWAY_BASE_URL, bobGatewayChainNameToChainId, chainIdToBobGatewayChainName, decimalSlippageToBobBps, DUMMY_BTC_ADDRESS, DUMMY_EVM_ADDRESS, } from './constants.js';
 export const dummyAddressForChainId = (chainId) => {
     if (chainId === btcChainId)
         return DUMMY_BTC_ADDRESS;
     if (chainId === tronChainId)
-        return DUMMY_TRON_ADDRESS;
+        return TRON_PLACEHOLDER_ADDRESS;
     return DUMMY_EVM_ADDRESS;
 };
 export const getBobGatewayClient = (config) => {
     return new GatewaySDK({ basePath: BOB_GATEWAY_BASE_URL, apiKey: config.VITE_BOB_GATEWAY_API_KEY });
 };
-export const toTronBase58 = (address) => {
-    if (address.startsWith('T'))
-        return address;
-    if (address.startsWith('0x'))
-        return TronWeb.address.fromHex(address.slice(2));
-    return TronWeb.address.fromHex(address);
-};
 export const assetIdToBobGatewayToken = (assetId) => {
     // BOB Gateway uses the zero address as the token address for native assets
     if (!isToken(assetId))
@@ -54,7 +48,6 @@ export const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChai
             toUserAddress: recipient,
             amount,
             maxSlippage: Number(slippage),
-            ownerAddress: sellChainName === 'bitcoin' ? recipient : sender,
             refundAddress,
             affiliates: getBobGatewayAffiliates(affiliateBps),
         });
@@ -99,7 +92,7 @@ export const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChai
 };
 export const createBobGatewayOrder = async (config, quote) => {
     try {
-        const order = await getBobGatewayClient(config).api.createOrderV3({ gatewayQuoteV3: quote });
+        const order = await getBobGatewayClient(config).api.createOrderV4({ gatewayQuoteV4: quote });
         return Ok(order);
     }
     catch (err) {
@@ -117,21 +110,11 @@ export const createBobGatewayOrder = async (config, quote) => {
         }));
     }
 };
-export const registerBobGatewayTx = async ({ config, orderId, txHash, sellAsset, buyAsset, }) => {
-    const registerTxV3 = (() => {
-        const sellChainName = chainIdToBobGatewayChainName[sellAsset.chainId];
-        // BTC→EVM
-        if (sellChainName === 'bitcoin') {
-            return { onramp: { orderId, bitcoinTxid: txHash } };
-        }
-        // EVM→BTC
-        if (chainIdToBobGatewayChainName[buyAsset.chainId] === 'bitcoin') {
-            return { offramp: { orderId, srcChain: sellChainName, srcTxHash: txHash } };
-        }
-        // EVM→EVM
-        return { tokenSwap: { orderId, srcChain: sellChainName, srcTxHash: txHash } };
-    })();
-    await getBobGatewayClient(config).api.registerTxV3({ registerTxV3 });
+export const submitBobGatewayBtcDeposit = async ({ config, orderId, bitcoinTxHex, }) => {
+    await getBobGatewayClient(config).api.registerTxV4({
+        registerTxV4: { onramp: { orderId, bitcoinTxHex } },
+    });
+    return bitcoin.Transaction.fromHex(bitcoinTxHex).getId();
 };
 export const mapBobGatewayOrderStatusToTxStatus = (status) => {
     if ('inProgress' in status)
@@ -154,7 +137,7 @@ const bobGatewayFeeToAssetId = (fee) => {
         return toAssetId({
             chainId,
             assetNamespace: ASSET_NAMESPACE.trc20,
-            assetReference: toTronBase58(fee.address),
+            assetReference: tron.toTronBase58(fee.address),
         });
     }
     return toAssetId({
@@ -227,7 +210,7 @@ export const getBobGatewayAllowanceContract = (quote, sellAsset) => {
     if (!txTo)
         return '';
     if (isTron)
-        return toTronBase58(txTo);
+        return tron.toTronBase58(txTo);
     return txTo;
 };
 export const assertValidTrade = ({ sellAsset, buyAsset, }) => {

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

@@ -4,7 +4,6 @@ import { Err, Ok } from '@sniptt/monads';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getButterSwapStepData } from '../utils/getButterSwapStepData.js';
 import { getButterSwapTradeContext } from '../utils/getButterSwapTradeContext.js';
 import { fetchTxData, isBuildTxSuccess } from '../xhr.js';
@@ -56,20 +55,18 @@ export const getTradeQuote = async (input, deps) => {
     });
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
-    const { networkFeeCryptoBaseUnit, transactionData, butterSwapTransactionMetadata } = maybeStepData.unwrap();
+    const { networkFeeCryptoBaseUnit, transactionData } = maybeStepData.unwrap();
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {
                 ...stepCommon,
                 accountNumber,
-                // Tron exec still builds from legacy metadata whose spender is the buildTx target
+                // Tron routes pull the sell token from the buildTx target
                 allowanceContract: sellAsset.chainId === tronChainId ? buildTx.to : stepCommon.allowanceContract,
                 transactionData,
-                butterSwapTransactionMetadata,
                 feeData: { networkFeeCryptoBaseUnit, protocolFees },
             },
         ],

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

@@ -2,17 +2,6 @@ import type { Hex } from 'viem';
 import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput } from '../../types.js';
 export type ButterSwapTradeQuoteInput = GetEvmTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
 export type ButterSwapTradeRateInput = GetEvmTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
-export type ButterSwapTransactionMetadata = {
-    to: string;
-    data: string;
-    value: Hex;
-    method?: string;
-    args?: {
-        type: string;
-        value: unknown;
-    }[];
-    memo?: string;
-};
 export type ErrorType = {
     errno: number;
     message: string;

package/dist/esm/swappers/ButterSwap/utils/constants.d.ts

@@ -1 +1,3 @@
+export declare const BUTTERSWAP_TRON_FALLBACK_SWAP_ENERGY = "1000000";
+export declare const BUTTERSWAP_TRON_DEFAULT_BANDWIDTH_BYTES = 2400;
 export declare const makeButterSwapAffiliate: (affiliateBps: string) => string | undefined;

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

@@ -1,5 +1,8 @@
 import { bnOrZero } from '@shapeshiftoss/utils';
 const BUTTERSWAP_AFFILIATE = 'shapeshift';
+// The router's total energy per swap, before its deployer's share comes off
+export const BUTTERSWAP_TRON_FALLBACK_SWAP_ENERGY = '1000000';
+export const BUTTERSWAP_TRON_DEFAULT_BANDWIDTH_BYTES = 2400;
 // Format is `<nickname>[:rate]`, where rate is in basis points (e.g. `shapeshift:60` = 0.6%).
 export const makeButterSwapAffiliate = (affiliateBps) => {
     if (bnOrZero(affiliateBps).lte(0))

package/dist/esm/swappers/ButterSwap/utils/getButterSwapStepData.d.ts

@@ -2,7 +2,7 @@ import type { Asset } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
 import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types.js';
 import type { SolanaComputeBudgetOptions } from '../../../utils/solana/index.js';
-import type { BuildTxSuccessItem, ButterSwapTransactionMetadata, RouteSuccessItem } from '../types.js';
+import type { BuildTxSuccessItem, RouteSuccessItem } from '../types.js';
 export declare const BUTTERSWAP_SOLANA_COMPUTE_BUDGET: SolanaComputeBudgetOptions;
 type BaseArgs = {
     route: RouteSuccessItem;
@@ -19,8 +19,7 @@ type ButterSwapRateStepData = {
     networkFeeCryptoBaseUnit: string;
 };
 type ButterSwapQuoteStepData = {
-    transactionData?: TxBuildData;
-    butterSwapTransactionMetadata?: ButterSwapTransactionMetadata;
+    transactionData: TxBuildData;
     networkFeeCryptoBaseUnit: string;
 };
 export declare function getButterSwapStepData(args: Extract<GetButterSwapStepDataArgs, {

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

@@ -7,6 +7,8 @@ import { TradeQuoteError } from '../../../types.js';
 import { makeNetworkFeeEstimationFailedErr, makeSwapErrorRight, makeTradeStepBuildFailedErr, } from '../../../utils/index.js';
 import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
 import { getSolanaNetworkFeeCryptoBaseUnit, omitComputeBudgetInstructions, withComputeUnitLimit, } from '../../../utils/solana/index.js';
+import { getTronContractCallFallbackFeeCryptoBaseUnit, getTronContractCallNetworkFeeCryptoBaseUnit, } from '../../../utils/tron/index.js';
+import { BUTTERSWAP_TRON_DEFAULT_BANDWIDTH_BYTES, BUTTERSWAP_TRON_FALLBACK_SWAP_ENERGY, } from './constants.js';
 import { getProviderNetworkFeeCryptoBaseUnit } from './helpers.js';
 // Jupiter swap legs can consume more units than simulated when pool state moves between
 // simulation and landing (CLMM tick crossings), 1.4 matches Jupiter's dynamicComputeUnitLimit margin
@@ -114,26 +116,52 @@ export async function getButterSwapStepData(args) {
                 return Err(makeTradeStepBuildFailedErr('getButterSwapStepData', error));
             }
         }
-        // Not yet migrated to a TxBuildData variant - exec still builds from legacy metadata
         case CHAIN_NAMESPACE.Tron: {
-            const networkFeeCryptoBaseUnit = getProviderNetworkFeeCryptoBaseUnit({ route, feeAsset });
+            const adapter = deps.assertGetTronChainAdapter(sellAsset.chainId);
             if (args.type === 'rate') {
+                // Butter's gasFee is a fraction of what the router burns, so rates price the measured swap at the router's share
+                const networkFeeCryptoBaseUnit = await (async () => {
+                    if (!route.contract)
+                        return getProviderNetworkFeeCryptoBaseUnit({ route, feeAsset });
+                    try {
+                        return await getTronContractCallFallbackFeeCryptoBaseUnit({
+                            adapter,
+                            energy: BUTTERSWAP_TRON_FALLBACK_SWAP_ENERGY,
+                            bandwidthBytes: BUTTERSWAP_TRON_DEFAULT_BANDWIDTH_BYTES,
+                            contractAddress: route.contract,
+                        });
+                    }
+                    catch {
+                        return getProviderNetworkFeeCryptoBaseUnit({ route, feeAsset });
+                    }
+                })();
                 const stepData = { networkFeeCryptoBaseUnit };
                 return Ok(stepData);
             }
-            const { buildTx } = args;
-            const stepData = {
-                butterSwapTransactionMetadata: {
-                    to: buildTx.to,
-                    data: buildTx.data,
-                    value: buildTx.value,
-                    method: buildTx.method,
-                    args: buildTx.args,
-                    memo: buildTx.memo,
-                },
-                networkFeeCryptoBaseUnit,
+            const { buildTx, from } = args;
+            const call = {
+                to: buildTx.to,
+                data: buildTx.data,
+                value: fromHex(buildTx.value, 'bigint').toString(),
             };
-            return Ok(stepData);
+            try {
+                const stepData = {
+                    transactionData: { type: 'tron', ...call },
+                    networkFeeCryptoBaseUnit: await getTronContractCallNetworkFeeCryptoBaseUnit({
+                        adapter,
+                        transactionData: call,
+                        from,
+                        sellAsset,
+                        sellAmountCryptoBaseUnit,
+                        spenderAddress: buildTx.to,
+                        fallbackEnergy: BUTTERSWAP_TRON_FALLBACK_SWAP_ENERGY,
+                    }),
+                };
+                return Ok(stepData);
+            }
+            catch (error) {
+                return Err(makeNetworkFeeEstimationFailedErr('getButterSwapStepData', error));
+            }
         }
         default:
             return Err(makeSwapErrorRight({

package/dist/esm/swappers/ButterSwap/utils/getButterSwapStepData.test.js

@@ -15,6 +15,11 @@ const route = ROUTE_QUOTE.data[0];
 const PROVIDER_GAS_FEE_BASE_UNIT = '1333043669759539'; // 0.001333043669759539 ETH
 const SOL = { ...ETH, assetId: `${solanaChainId}/slip44:501`, chainId: solanaChainId };
 const TRX = { ...ETH, assetId: `${tronChainId}/slip44:195`, chainId: tronChainId };
+const USDT_TRON = {
+    ...ETH,
+    assetId: `${tronChainId}/trc20:TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t`,
+    chainId: tronChainId,
+};
 const evmBuildTx = {
     to: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
     data: '0xdeadbeef',
@@ -25,6 +30,7 @@ const makeDeps = (adapters) => ({
     assertGetEvmChainAdapter: () => adapters.evm,
     assertGetUtxoChainAdapter: () => adapters.utxo,
     assertGetSolanaChainAdapter: () => adapters.solana,
+    assertGetTronChainAdapter: () => adapters.tron,
 });
 const evmAdapter = ({ gasPrice = '1000000000', estimatedGasLimit = '500000', throwOnGasFeeData = false, throwOnFeeData = false, } = {}) => ({
     getGasFeeData: () => {
@@ -153,36 +159,133 @@ describe('getButterSwapStepData', () => {
         });
     });
     describe('tron', () => {
-        it('returns legacy metadata rather than transaction data, since exec still builds from it', async () => {
-            const buildTx = {
-                ...evmBuildTx,
+        const tronBuildTx = { ...evmBuildTx, to: 'TRouterAddress' };
+        const tronAdapter = ({ txFee = '9000000', allowance = '0' } = {}) => ({
+            getFeeData: vi.fn().mockResolvedValue({ fast: { txFee } }),
+            httpProvider: {
+                getChainPrices: () => Promise.resolve({ energyPrice: 100, bandwidthPrice: 1000 }),
+                getTrc20Allowance: vi.fn().mockResolvedValue(allowance),
+                getTrc20Balance: vi.fn().mockResolvedValue('100000000'),
+                getContractEnergyShare: vi.fn().mockResolvedValue({
+                    callerPercent: 100,
+                    originEnergyLimit: 0,
+                    originEnergyAvailable: 0,
+                }),
+            },
+        });
+        it('carries the router call as transactionData and simulates it', async () => {
+            const adapter = tronAdapter();
+            const actual = await getButterSwapStepData({
+                type: 'quote',
+                input: {},
+                from: 'TSenderAddress',
+                buildTx: tronBuildTx,
+                deps: makeDeps({ tron: adapter }),
+                route,
+                sellAsset: TRX,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
+            });
+            // Butter's value is the native amount to send: the sell amount for a native sell, 0 for a token
+            const transactionData = {
+                type: 'tron',
                 to: 'TRouterAddress',
-                method: 'swapAndCall',
-                args: [{ type: 'address', value: 'TSpender' }],
+                data: evmBuildTx.data,
+                value: '100000000000000000',
             };
+            expect(actual.unwrap()).toEqual({ transactionData, networkFeeCryptoBaseUnit: '9000000' });
+            expect(adapter.getFeeData).toHaveBeenCalledWith({
+                to: 'TRouterAddress',
+                value: '100000000000000000',
+                chainSpecific: { from: 'TSenderAddress', data: evmBuildTx.data, requireEnergyShare: true },
+            });
+        });
+        it('uses the provider value for a token sell', async () => {
             const actual = await getButterSwapStepData({
                 type: 'quote',
                 input: {},
                 from: 'TSenderAddress',
-                buildTx,
-                deps: {},
+                buildTx: { ...tronBuildTx, value: '0x00' },
+                deps: makeDeps({ tron: tronAdapter() }),
+                route,
+                sellAsset: USDT_TRON,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
+            });
+            expect(actual.unwrap().transactionData).toMatchObject({ value: '0' });
+        });
+        it('fails a native quote when the simulation fails', async () => {
+            const adapter = tronAdapter();
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await getButterSwapStepData({
+                type: 'quote',
+                input: {},
+                from: 'TSenderAddress',
+                buildTx: tronBuildTx,
+                deps: makeDeps({ tron: adapter }),
                 route,
                 sellAsset: TRX,
                 feeAsset: TRX,
                 sellAmountCryptoBaseUnit: '1000000',
                 spenderAddress: '',
             });
-            expect(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: PROVIDER_GAS_FEE_BASE_UNIT,
-                butterSwapTransactionMetadata: {
-                    to: 'TRouterAddress',
-                    data: evmBuildTx.data,
-                    value: evmBuildTx.value,
-                    method: 'swapAndCall',
-                    args: [{ type: 'address', value: 'TSpender' }],
-                    memo: undefined,
-                },
+            expect(actual.isErr()).toBe(true);
+        });
+        it('prices the measured worst case when a token allowance is not granted yet', async () => {
+            const adapter = tronAdapter({ allowance: '0' });
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await getButterSwapStepData({
+                type: 'quote',
+                input: {},
+                from: 'TSenderAddress',
+                buildTx: { ...tronBuildTx, value: '0x00' },
+                deps: makeDeps({ tron: adapter }),
+                route,
+                sellAsset: USDT_TRON,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
+            });
+            // 1000000 energy * 1.2 margin * 100 sun + (4 calldata + 279 envelope) bytes * 1000 sun
+            expect(actual.unwrap().networkFeeCryptoBaseUnit).toBe('120283000');
+        });
+        it('rates price the measured swap at the router share', async () => {
+            const adapter = tronAdapter();
+            adapter.httpProvider.getContractEnergyShare.mockResolvedValue({
+                callerPercent: 5,
+                originEnergyLimit: 10_000_000,
+                originEnergyAvailable: 5_000_000,
+            });
+            const actual = await getButterSwapStepData({
+                type: 'rate',
+                input: {},
+                deps: makeDeps({ tron: adapter }),
+                route: { ...route, contract: 'TRouterAddress' },
+                sellAsset: TRX,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
+            });
+            // 1000000 * 5% caller energy * 1.2 margin * 100 sun + 2400 bytes * 1000 sun
+            expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '8400000' });
+            expect(adapter.httpProvider.getContractEnergyShare).toHaveBeenCalledWith('TRouterAddress');
+        });
+        it('rates fall back to the provider fee when the worst case cannot be priced', async () => {
+            const adapter = tronAdapter();
+            adapter.httpProvider.getContractEnergyShare.mockRejectedValue(new Error('429'));
+            const actual = await getButterSwapStepData({
+                type: 'rate',
+                input: {},
+                deps: makeDeps({ tron: adapter }),
+                route: { ...route, contract: 'TRouterAddress' },
+                sellAsset: TRX,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
             });
+            expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: PROVIDER_GAS_FEE_BASE_UNIT });
         });
     });
     it('errors on an unsupported chain namespace', async () => {

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

@@ -40,8 +40,7 @@ export const assertValidTrade = ({ sellAsset, }) => {
     }
     return Ok(undefined);
 };
-// Provider reported network fee - the rate fallback when estimation fails, and the fee for the
-// un-migrated tron quote path (exec computes the real fee at execution)
+// Provider reported network fee - the fallback when estimation fails
 export const getProviderNetworkFeeCryptoBaseUnit = ({ route, feeAsset, }) => {
     if (bnOrZero(route.gasFee?.amount).lte(0))
         return '0';

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

@@ -1,4 +1,5 @@
 import { fromAssetId, solanaChainId, tronChainId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { chainIdToFeeAssetId } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { zeroAddress } from 'viem';
@@ -20,7 +21,6 @@ export var ButterSwapErrorCode;
     ButterSwapErrorCode[ButterSwapErrorCode["InvalidAddress"] = 2007] = "InvalidAddress";
 })(ButterSwapErrorCode || (ButterSwapErrorCode = {}));
 const SOLANA_NATIVE_ADDRESS = 'So11111111111111111111111111111111111111112';
-const TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
 export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision, slippage, affiliate, }) => {
     const butterFromChainId = chainIdToButterSwapChainId(sellAsset.chainId);
     const butterToChainId = chainIdToButterSwapChainId(buyAsset.chainId);
@@ -39,7 +39,7 @@ export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrec
         if (sellAsset.chainId === solanaChainId && sellAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
         if (sellAsset.chainId === tronChainId && sellAssetIsNative)
-            return TRON_NATIVE_ADDRESS;
+            return tron.TRON_ZERO_ADDRESS;
         if (sellAssetIsNative)
             return zeroAddress;
         return sellAssetAddressRaw;
@@ -48,7 +48,7 @@ export const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrec
         if (buyAsset.chainId === solanaChainId && buyAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
         if (buyAsset.chainId === tronChainId && buyAssetIsNative)
-            return TRON_NATIVE_ADDRESS;
+            return tron.TRON_ZERO_ADDRESS;
         if (buyAssetIsNative)
             return zeroAddress;
         return buyAssetAddressRaw;

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

@@ -1,6 +1,5 @@
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getCetusStepData } from './getCetusStepData.js';
 import { getCetusTradeContext } from './getCetusTradeContext.js';
 export const getTradeQuote = async (input, deps) => {
@@ -25,7 +24,6 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -1,9 +1,8 @@
 import { TxStatus } from '@shapeshiftoss/unchained-client';
-import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
-import { getExecutableTradeStep, getSwapMetadata, isExecutableTradeQuote } from '../../utils/index.js';
+import { getSwapMetadata } from '../../utils/index.js';
 import { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/evm/index.js';
 import { getSolanaTransactionFees, getUnsignedSolanaTransaction } from '../../utils/solana/index.js';
-import { getTronTransactionFees } from '../../utils/tron/index.js';
+import { getTronTransactionFees, getUnsignedTronTransaction } from '../../utils/tron/index.js';
 import { getUnsignedUtxoTransaction, getUtxoTransactionFees } from '../../utils/utxo/index.js';
 import { ChainflipStatusMessage } from './constants.js';
 import { getTradeQuote } from './swapperApi/getTradeQuote.js';
@@ -19,22 +18,7 @@ export const chainflipApi = {
     getUtxoTransactionFees,
     getUnsignedSolanaTransaction,
     getSolanaTransactionFees,
-    getUnsignedTronTransaction: ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter }) => {
-        if (!isExecutableTradeQuote(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = getExecutableTradeStep(tradeQuote, stepIndex);
-        const { accountNumber, chainflipSpecific, sellAsset } = step;
-        if (!chainflipSpecific?.depositAddress)
-            throw Error('Missing deposit address');
-        const adapter = assertGetTronChainAdapter(sellAsset.chainId);
-        return adapter.buildSendApiTransaction({
-            to: chainflipSpecific.depositAddress,
-            from,
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            accountNumber,
-            chainSpecific: { contractAddress: contractAddressOrUndefined(sellAsset.assetId) },
-        });
-    },
+    getUnsignedTronTransaction,
     getTronTransactionFees,
     checkTradeStatus: async ({ config, swap }) => {
         if (!swap)

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

@@ -73,8 +73,7 @@ export const getTradeQuote = async (input, deps) => {
                 {
                     ...stepCommon,
                     accountNumber,
-                    chainflipSpecific: { depositAddress },
-                    swapperMetadata: { name: 'chainflip', swapId },
+                    swapperMetadata: { name: 'chainflip', swapId, depositAddress },
                     transactionData,
                     feeData: { networkFeeCryptoBaseUnit, protocolFees },
                 },

package/dist/esm/swappers/ChainflipSwapper/types.d.ts

@@ -6,6 +6,7 @@ export type ChainflipTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInp
 export type ChainflipMetadata = {
     name: 'chainflip';
     swapId: number | string;
+    depositAddress: string;
 };
 export type ChainFlipStatus = {
     status: {

package/dist/esm/swappers/ChainflipSwapper/utils/getChainflipStepData.d.ts

@@ -14,7 +14,7 @@ type ChainflipRateStepData = {
     networkFeeCryptoBaseUnit: string | undefined;
 };
 type ChainflipQuoteStepData = {
-    transactionData?: TxBuildData;
+    transactionData: TxBuildData;
     networkFeeCryptoBaseUnit: string | undefined;
 };
 export declare function getChainflipStepData(args: Extract<GetChainflipStepDataArgs, {