@shapeshiftoss/swapper 20.2.0 → 20.3.0

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/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/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, {

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

@@ -1,5 +1,5 @@
 import { CHAIN_NAMESPACE, fromAssetId, fromChainId } from '@shapeshiftoss/caip';
-import { evm } from '@shapeshiftoss/chain-adapters';
+import { evm, tron } from '@shapeshiftoss/chain-adapters';
 import { bn, contractAddressOrUndefined } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
@@ -150,23 +150,42 @@ export async function getChainflipStepData(args) {
                 return Err(makeNetworkFeeEstimationFailedErr('getChainflipStepData', error));
             }
         }
-        // Un-migrated - exec builds its tx from chainflipSpecific.depositAddress, so no transactionData is carried
         case CHAIN_NAMESPACE.Tron: {
-            const to = depositAddress ?? from;
-            if (!to || !from) {
-                const stepData = { networkFeeCryptoBaseUnit: undefined };
+            const adapter = deps.assertGetTronChainAdapter(sellAsset.chainId);
+            const contractAddress = contractAddressOrUndefined(sellAsset.assetId);
+            if (args.type === 'rate') {
+                // No deposit channel yet, but every channel is a fresh address, so a fresh recipient prices the transfer
+                const networkFeeCryptoBaseUnit = await (async () => {
+                    if (!from)
+                        return;
+                    try {
+                        const { fast } = await adapter.getFeeData({
+                            to: tron.generateFreshTronAddress(),
+                            value: sellAmountCryptoBaseUnit,
+                            chainSpecific: { from, contractAddress },
+                        });
+                        return fast.txFee;
+                    }
+                    catch { }
+                })();
+                const stepData = { networkFeeCryptoBaseUnit };
                 return Ok(stepData);
             }
+            const transactionData = {
+                type: 'tron',
+                to: args.depositAddress,
+                value: sellAmountCryptoBaseUnit,
+            };
             try {
-                const { fast } = await deps.assertGetTronChainAdapter(sellAsset.chainId).getFeeData({
-                    to,
-                    value: sellAmountCryptoBaseUnit,
-                    chainSpecific: {
-                        from,
-                        contractAddress: contractAddressOrUndefined(sellAsset.assetId),
-                    },
+                const { fast } = await adapter.getFeeData({
+                    to: transactionData.to,
+                    value: transactionData.value,
+                    chainSpecific: { from, contractAddress, requireEnergyShare: true },
                 });
-                const stepData = { networkFeeCryptoBaseUnit: fast.txFee };
+                const stepData = {
+                    transactionData,
+                    networkFeeCryptoBaseUnit: fast.txFee,
+                };
                 return Ok(stepData);
             }
             catch (error) {

package/dist/esm/swappers/NearIntentsSwapper/constants.d.ts

@@ -2,3 +2,4 @@ export declare const ONE_CLICK_BASE_URL = "https://1click.chaindefuser.com";
 export declare const DEFAULT_SLIPPAGE_BPS = 50;
 export declare const DEFAULT_QUOTE_DEADLINE_MS: number;
 export declare const UTXO_QUOTE_DEADLINE_MS: number;
+export declare const APP_FEE_SPLIT_MULTIPLIER = 2;

package/dist/esm/swappers/NearIntentsSwapper/constants.js

@@ -3,3 +3,5 @@ export const DEFAULT_SLIPPAGE_BPS = 50;
 // 1Click refunds a deposit it cannot settle by the requested deadline, and prices a quote the same at any length
 export const DEFAULT_QUOTE_DEADLINE_MS = 60 * 60 * 1000;
 export const UTXO_QUOTE_DEADLINE_MS = 4 * 60 * 60 * 1000;
+// 1Click pays half of the requested appFee to its own account, so request double to receive affiliateBps
+export const APP_FEE_SPLIT_MULTIPLIER = 2;

package/dist/esm/swappers/NearIntentsSwapper/utils/getNearIntentsStepData.js

@@ -142,12 +142,17 @@ export async function getNearIntentsStepData(args) {
                 const { fast } = await deps.assertGetTronChainAdapter(sellAsset.chainId).getFeeData({
                     to: depositAddress,
                     value: sellAmountCryptoBaseUnit,
-                    chainSpecific: {
-                        from,
-                        contractAddress: contractAddressOrUndefined(sellAsset.assetId),
-                    },
+                    chainSpecific: { from, contractAddress, requireEnergyShare: type === 'quote' },
                 });
-                const stepData = { networkFeeCryptoBaseUnit: fast.txFee };
+                const networkFeeCryptoBaseUnit = fast.txFee;
+                if (type === 'rate') {
+                    const stepData = { networkFeeCryptoBaseUnit };
+                    return Ok(stepData);
+                }
+                const stepData = {
+                    transactionData: { type: 'tron', to: depositAddress, value: sellAmountCryptoBaseUnit },
+                    networkFeeCryptoBaseUnit,
+                };
                 return Ok(stepData);
             }
             case CHAIN_NAMESPACE.Sui: {

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

@@ -5,7 +5,7 @@ import { Err, Ok } from '@sniptt/monads';
 import { zeroAddress } from 'viem';
 import { TradeQuoteError } from '../../../types.js';
 import { createTradeAmountTooSmallErr, makeSwapErrorRight } from '../../../utils/index.js';
-import { DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS, UTXO_QUOTE_DEADLINE_MS, } from '../constants.js';
+import { APP_FEE_SPLIT_MULTIPLIER, DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS, UTXO_QUOTE_DEADLINE_MS, } from '../constants.js';
 import { chainIdToNearIntentsChain, QuoteRequest } from '../types.js';
 import { ApiError, OneClickService } from './oneClickService.js';
 const getTokensWithRetry = async () => {
@@ -149,7 +149,7 @@ export const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, am
         appFees: [
             {
                 recipient: DAO_TREASURY_NEAR,
-                fee: Number(affiliateBps),
+                fee: Number(affiliateBps) * APP_FEE_SPLIT_MULTIPLIER,
             },
         ],
     };

package/dist/esm/swappers/RelaySwapper/constant.d.ts

@@ -14,8 +14,8 @@ export declare const relayChainIdToChainId: import("lodash").Dictionary<string>;
 export declare const DEFAULT_RELAY_EVM_TOKEN_ADDRESS: "0x0000000000000000000000000000000000000000";
 export declare const RELAY_BTC_TOKEN_ADDRESS = "bc1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqmql8k8";
 export declare const RELAY_SOLANA_TOKEN_ADDRESS = "11111111111111111111111111111111";
-export declare const RELAY_TRON_TOKEN_ADDRESS = "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb";
 export declare const DEFAULT_RELAY_EVM_USER_ADDRESS = "0x000000000000000000000000000000000000dead";
+export declare const RELAY_TRON_FALLBACK_DEPOSIT_ENERGY = "100000";
 export declare const DEFAULT_RELAY_BTC_USER_ADDRESS = "bc1q4vxn43l44h30nkluqfxd9eckf45vr2awz38lwa";
 export declare const DEFAULT_RELAY_SOLANA_USER_ADDRESS = "CbKGgVKLJFb8bBrf58DnAkdryX6ubewVytn7X957YwNr";
 export declare const DEFAULT_RELAY_TRON_USER_ADDRESS = "TLsV52sRDL79HXGGm9yzwKibb6BeruhUzy";

package/dist/esm/swappers/RelaySwapper/constant.js

@@ -58,8 +58,9 @@ export const relayChainIdToChainId = invert(chainIdToRelayChainId);
 export const DEFAULT_RELAY_EVM_TOKEN_ADDRESS = zeroAddress;
 export const RELAY_BTC_TOKEN_ADDRESS = 'bc1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqmql8k8';
 export const RELAY_SOLANA_TOKEN_ADDRESS = '11111111111111111111111111111111';
-export const RELAY_TRON_TOKEN_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
 export const DEFAULT_RELAY_EVM_USER_ADDRESS = '0x000000000000000000000000000000000000dead';
+// depositor energy for a TRC20 deposit measured on mainnet, for token quotes without their allowance
+export const RELAY_TRON_FALLBACK_DEPOSIT_ENERGY = '100000';
 export const DEFAULT_RELAY_BTC_USER_ADDRESS = 'bc1q4vxn43l44h30nkluqfxd9eckf45vr2awz38lwa';
 export const DEFAULT_RELAY_SOLANA_USER_ADDRESS = 'CbKGgVKLJFb8bBrf58DnAkdryX6ubewVytn7X957YwNr';
 export const DEFAULT_RELAY_TRON_USER_ADDRESS = 'TLsV52sRDL79HXGGm9yzwKibb6BeruhUzy';

package/dist/esm/swappers/RelaySwapper/getTradeQuote/getTradeQuote.js

@@ -21,12 +21,11 @@ const getQuote = async (input, deps, relayChainMap) => {
             type: 'quote',
             input,
         });
-        return maybeStepData.map(({ transactionData, relayTransactionMetadata, networkFeeCryptoBaseUnit, }) => ({
+        return maybeStepData.map(({ transactionData, networkFeeCryptoBaseUnit }) => ({
             ...stepCommon,
             accountNumber,
             allowanceContract,
             transactionData,
-            relayTransactionMetadata,
             swapperMetadata: {
                 name: 'relay',
                 relayId,

package/dist/esm/swappers/RelaySwapper/utils/getRelayAssetAddress.js

@@ -1,13 +1,14 @@
 import { btcAssetId, fromAssetId, isAssetReference, solAssetId, tronAssetId, } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { isNativeEvmAsset } from '../../../utils/helpers.js';
-import { DEFAULT_RELAY_EVM_TOKEN_ADDRESS, RELAY_BTC_TOKEN_ADDRESS, RELAY_SOLANA_TOKEN_ADDRESS, RELAY_TRON_TOKEN_ADDRESS, } from '../constant.js';
+import { DEFAULT_RELAY_EVM_TOKEN_ADDRESS, RELAY_BTC_TOKEN_ADDRESS, RELAY_SOLANA_TOKEN_ADDRESS, } from '../constant.js';
 export const getRelayAssetAddress = (asset) => {
     if (asset.assetId === btcAssetId)
         return RELAY_BTC_TOKEN_ADDRESS;
     if (asset.assetId === solAssetId)
         return RELAY_SOLANA_TOKEN_ADDRESS;
     if (asset.assetId === tronAssetId)
-        return RELAY_TRON_TOKEN_ADDRESS;
+        return tron.TRON_ZERO_ADDRESS;
     if (isNativeEvmAsset(asset.assetId))
         return DEFAULT_RELAY_EVM_TOKEN_ADDRESS;
     const { assetReference } = fromAssetId(asset.assetId);

package/dist/esm/swappers/RelaySwapper/utils/getRelayStepData.d.ts

@@ -1,7 +1,7 @@
 import type { Result } from '@sniptt/monads';
 import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types.js';
 import type { SolanaComputeBudgetOptions } from '../../../utils/solana/index.js';
-import type { RelayQuoteItem, RelayTransactionMetadata } from './types.js';
+import type { RelayQuoteItem } from './types.js';
 export declare const RELAY_SOLANA_COMPUTE_BUDGET: SolanaComputeBudgetOptions;
 type BaseArgs = {
     data: RelayQuoteItem['data'];
@@ -15,8 +15,7 @@ type RelayRateStepData = {
     networkFeeCryptoBaseUnit: string;
 };
 type RelayQuoteStepData = {
-    transactionData?: TxBuildData;
-    relayTransactionMetadata?: RelayTransactionMetadata;
+    transactionData: TxBuildData;
     networkFeeCryptoBaseUnit: string;
 };
 export type GetRelayStepDataArgs = StepDataArgs<BaseArgs, {

package/dist/esm/swappers/RelaySwapper/utils/getRelayStepData.js

@@ -1,10 +1,13 @@
 import { fromChainId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { bnOrZero, contractAddressOrUndefined, isToken } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { makeNetworkFeeEstimationFailedErr, 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 { getUtxoNetworkFeeCryptoBaseUnit } from '../../../utils/utxo/index.js';
+import { RELAY_TRON_FALLBACK_DEPOSIT_ENERGY } from '../constant.js';
 import { getRelayPsbtRelayer } from './getRelayPsbtRelayer.js';
 import { convertRelaySolanaInstruction } from './helpers.js';
 import { isRelayQuoteEvmItemData, isRelayQuoteSolanaItemData, isRelayQuoteTronItemData, isRelayQuoteUtxoItemData, } from './types.js';
@@ -169,25 +172,55 @@ export async function getRelayStepData({ data, sellAsset, sellAmountCryptoBaseUn
             return Err(makeNetworkFeeEstimationFailedErr('getRelayStepData', error));
         }
     }
+    // Native and token sells alike are a call into relay's depositor contract
     if (isRelayQuoteTronItemData(data)) {
-        const contractAddress = data.parameter?.contract_address;
-        const tronCallData = data.parameter?.data;
-        const isTronToken = isToken(sellAsset.assetId);
-        if (isTronToken && !contractAddress)
-            return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
-        if (isTronToken && !tronCallData)
-            return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
+        const { contract_address: contractAddress, data: callData, call_value: callValue, } = data.parameter ?? {};
         if (type === 'rate') {
+            // Relay's gas figure runs ~35% under the deposit's measured energy, so rates price the measured call
+            const networkFeeCryptoBaseUnit = await (async () => {
+                if (!contractAddress || !callData)
+                    return fallbackNetworkFeeCryptoBaseUnit;
+                try {
+                    return await getTronContractCallFallbackFeeCryptoBaseUnit({
+                        adapter: deps.assertGetTronChainAdapter(sellAsset.chainId),
+                        energy: RELAY_TRON_FALLBACK_DEPOSIT_ENERGY,
+                        bandwidthBytes: tron.getTronContractCallBandwidthBytes(callData),
+                        contractAddress,
+                    });
+                }
+                catch {
+                    return fallbackNetworkFeeCryptoBaseUnit;
+                }
+            })();
+            const stepData = { networkFeeCryptoBaseUnit };
+            return Ok(stepData);
+        }
+        if (!contractAddress || !callData)
+            return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
+        const isNativeSell = !isToken(sellAsset.assetId);
+        const call = {
+            to: contractAddress,
+            data: callData,
+            value: String(callValue ?? (isNativeSell ? sellAmountCryptoBaseUnit : 0)),
+        };
+        try {
             const stepData = {
-                networkFeeCryptoBaseUnit: fallbackNetworkFeeCryptoBaseUnit,
+                transactionData: { type: 'tron', ...call },
+                networkFeeCryptoBaseUnit: await getTronContractCallNetworkFeeCryptoBaseUnit({
+                    adapter: deps.assertGetTronChainAdapter(sellAsset.chainId),
+                    transactionData: call,
+                    from,
+                    sellAsset,
+                    sellAmountCryptoBaseUnit,
+                    spenderAddress: contractAddress,
+                    fallbackEnergy: RELAY_TRON_FALLBACK_DEPOSIT_ENERGY,
+                }),
             };
             return Ok(stepData);
         }
-        const stepData = {
-            relayTransactionMetadata: { to: contractAddress, data: tronCallData },
-            networkFeeCryptoBaseUnit: fallbackNetworkFeeCryptoBaseUnit,
-        };
-        return Ok(stepData);
+        catch (error) {
+            return Err(makeNetworkFeeEstimationFailedErr('getRelayStepData', error));
+        }
     }
     return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
 }

package/dist/esm/swappers/RelaySwapper/utils/getRelayStepData.test.d.ts

@@ -0,0 +1 @@
+export {};