@shapeshiftoss/swapper 20.2.0 → 20.4.0

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

@@ -1,7 +1,6 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { TradeAmount, TradeStepCommon } from '../types.js';
 import { SwapperName } from '../types.js';
-export declare const FALLBACK_QUOTE_DEADLINE_MS = 60000;
 export declare const getTradeAmount: (input: {
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
 } | {
@@ -10,5 +9,5 @@ export declare const getTradeAmount: (input: {
 export declare const normalizeEpochToMs: (value: number) => number;
 export declare const isNativeEvmAsset: (assetId: AssetId) => boolean;
 export declare const getTreasuryAddressFromChainId: (chainId: ChainId) => string;
-export type DepositAddressStep = Pick<TradeStepCommon, 'chainflipSpecific' | 'swapperMetadata'>;
+export type DepositAddressStep = Pick<TradeStepCommon, 'swapperMetadata'>;
 export declare const getDepositAddress: (step: DepositAddressStep, swapperName: SwapperName) => string | undefined;

package/dist/esm/utils/helpers.js

@@ -1,9 +1,7 @@
-import { arbitrumAssetId, avalancheAssetId, baseAssetId, bscAssetId, ethAssetId, fromAssetId, gnosisAssetId, katanaAssetId, monadAssetId, optimismAssetId, plasmaAssetId, polygonAssetId, } from '@shapeshiftoss/caip';
+import { CHAIN_NAMESPACE, fromAssetId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
-import { DAO_TREASURY_ARBITRUM, DAO_TREASURY_AVALANCHE, DAO_TREASURY_BASE, DAO_TREASURY_BITCOIN, DAO_TREASURY_BOB, DAO_TREASURY_BSC, DAO_TREASURY_ETHEREUM_MAINNET, DAO_TREASURY_GNOSIS, DAO_TREASURY_HYPEREVM, DAO_TREASURY_MEGAETH, DAO_TREASURY_MONAD, DAO_TREASURY_OPTIMISM, DAO_TREASURY_PLASMA, DAO_TREASURY_POLYGON, DAO_TREASURY_ROBINHOOD, DAO_TREASURY_SOLANA, DAO_TREASURY_STARKNET, DAO_TREASURY_TON, isTreasuryChainId, } from '@shapeshiftoss/utils';
+import { chainIdToFeeAssetId, DAO_TREASURY_ARBITRUM, DAO_TREASURY_AVALANCHE, DAO_TREASURY_BASE, DAO_TREASURY_BITCOIN, DAO_TREASURY_BOB, DAO_TREASURY_BSC, DAO_TREASURY_ETHEREUM_MAINNET, DAO_TREASURY_GNOSIS, DAO_TREASURY_HYPEREVM, DAO_TREASURY_MEGAETH, DAO_TREASURY_MONAD, DAO_TREASURY_OPTIMISM, DAO_TREASURY_PLASMA, DAO_TREASURY_POLYGON, DAO_TREASURY_ROBINHOOD, DAO_TREASURY_SOLANA, DAO_TREASURY_STARKNET, DAO_TREASURY_TON, isTreasuryChainId, } from '@shapeshiftoss/utils';
 import { SwapperName } from '../types.js';
-// Deadline for providers without their own expiry - short enough to keep priced amounts honest
-export const FALLBACK_QUOTE_DEADLINE_MS = 60_000;
 export const getTradeAmount = (input) => 'buyAmountCryptoBaseUnit' in input
     ? { direction: 'exactOut', cryptoBaseUnit: input.buyAmountCryptoBaseUnit }
     : { direction: 'exactIn', cryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit };
@@ -18,33 +16,8 @@ export const normalizeEpochToMs = (value) => {
     return Math.floor(value / 1e6);
 };
 export const isNativeEvmAsset = (assetId) => {
-    const { chainId } = fromAssetId(assetId);
-    switch (chainId) {
-        case KnownChainIds.EthereumMainnet:
-            return assetId === ethAssetId;
-        case KnownChainIds.AvalancheMainnet:
-            return assetId === avalancheAssetId;
-        case KnownChainIds.OptimismMainnet:
-            return assetId === optimismAssetId;
-        case KnownChainIds.BnbSmartChainMainnet:
-            return assetId === bscAssetId;
-        case KnownChainIds.PolygonMainnet:
-            return assetId === polygonAssetId;
-        case KnownChainIds.GnosisMainnet:
-            return assetId === gnosisAssetId;
-        case KnownChainIds.ArbitrumMainnet:
-            return assetId === arbitrumAssetId;
-        case KnownChainIds.BaseMainnet:
-            return assetId === baseAssetId;
-        case KnownChainIds.MonadMainnet:
-            return assetId === monadAssetId;
-        case KnownChainIds.PlasmaMainnet:
-            return assetId === plasmaAssetId;
-        case KnownChainIds.KatanaMainnet:
-            return assetId === katanaAssetId;
-        default:
-            return false;
-    }
+    const { chainId, chainNamespace } = fromAssetId(assetId);
+    return chainNamespace === CHAIN_NAMESPACE.Evm && assetId === chainIdToFeeAssetId(chainId);
 };
 const DAO_TREASURY_BY_CHAIN_ID = {
     [KnownChainIds.EthereumMainnet]: DAO_TREASURY_ETHEREUM_MAINNET,
@@ -77,8 +50,11 @@ export const getTreasuryAddressFromChainId = (chainId) => {
 };
 export const getDepositAddress = (step, swapperName) => {
     switch (swapperName) {
-        case SwapperName.Chainflip:
-            return step.chainflipSpecific?.depositAddress || undefined;
+        case SwapperName.Chainflip: {
+            if (step.swapperMetadata?.name !== 'chainflip')
+                return;
+            return step.swapperMetadata.depositAddress || undefined;
+        }
         case SwapperName.NearIntents: {
             if (step.swapperMetadata?.name !== 'nearIntents')
                 return;

package/dist/esm/utils/helpers.test.js

@@ -55,7 +55,9 @@ describe('normalizeEpochToMs', () => {
 const makeStep = (step) => step;
 describe('getDepositAddress', () => {
     it('reads the chainflip deposit address', () => {
-        const step = makeStep({ chainflipSpecific: { depositAddress: 'bc1qdeposit' } });
+        const step = makeStep({
+            swapperMetadata: { name: 'chainflip', swapId: 1, depositAddress: 'bc1qdeposit' },
+        });
         expect(getDepositAddress(step, SwapperName.Chainflip)).toBe('bc1qdeposit');
     });
     it('returns undefined when chainflip has no deposit address', () => {
@@ -78,7 +80,9 @@ describe('getDepositAddress', () => {
         expect(getDepositAddress(step, SwapperName.NearIntents)).toBeUndefined();
     });
     it('returns undefined for swappers that do not use deposit addresses', () => {
-        const step = makeStep({ chainflipSpecific: { depositAddress: 'bc1qdeposit' } });
+        const step = makeStep({
+            swapperMetadata: { name: 'chainflip', swapId: 1, depositAddress: 'bc1qdeposit' },
+        });
         expect(getDepositAddress(step, SwapperName.Relay)).toBeUndefined();
     });
 });

package/dist/esm/utils/thorchain/getThorStepData.js

@@ -2,7 +2,6 @@ import { CHAIN_NAMESPACE, cosmosAssetId, fromAssetId, fromChainId, mayachainAsse
 import { THOR_ROUTER_CONTRACT_MAINNET, TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET, } from '@shapeshiftoss/contracts';
 import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
-import { TronWeb } from 'tronweb';
 import { getAddress, zeroAddress } from 'viem';
 import { TradeQuoteError } from '../../types.js';
 import { makeNetworkFeeEstimationFailedErr, makeSwapErrorRight } from '../../utils/index.js';
@@ -269,58 +268,42 @@ export async function getThorStepData({ type, input, from, deps, swapperName, tr
             }
             case CHAIN_NAMESPACE.Tron: {
                 const { vault } = await getThorTxData({ sellAsset, config, swapperName });
-                const networkFeeCryptoBaseUnit = await (async () => {
-                    // Fees are calculated for rates with a wallet connected - quotes calculate them at
-                    // execution via getTronTransactionFees
-                    if (!(type === 'rate' && input.receiveAddress && vault))
-                        return undefined;
-                    try {
-                        const contractAddress = contractAddressOrUndefined(sellAsset.assetId);
-                        // Estimate fees using the receive address for accurate energy calculation
-                        const tronWeb = new TronWeb({
-                            fullHost: config.VITE_TRON_NODE_URL,
-                            headers: config.VITE_TRON_GRID_API_KEY
-                                ? { 'TRON-PRO-API-KEY': config.VITE_TRON_GRID_API_KEY }
-                                : {},
-                        });
-                        const params = await tronWeb.trx.getChainParameters();
-                        const bandwidthPrice = params.find(p => p.key === 'getTransactionFee')?.value ?? 1000;
-                        const energyPrice = params.find(p => p.key === 'getEnergyFee')?.value ?? 100;
-                        if (contractAddress) {
-                            // TRC20: Estimate energy with actual recipient
-                            try {
-                                const result = await tronWeb.transactionBuilder.triggerConstantContract(contractAddress, 'transfer(address,uint256)', {}, [
-                                    { type: 'address', value: vault },
-                                    { type: 'uint256', value: sellAmountCryptoBaseUnit },
-                                ], input.receiveAddress);
-                                const energyUsed = result.energy_used ?? 65000;
-                                const energyFee = energyUsed * energyPrice * 1.5; // 1.5x safety margin
-                                const bandwidthFee = 276 * bandwidthPrice; // TRC20 bandwidth
-                                return String(Math.ceil(energyFee + bandwidthFee));
-                            }
-                            catch {
-                                // Fallback: Conservative estimate
-                                return String(13_000_000); // 13 TRX worst case
-                            }
-                        }
-                        // TRX transfer bandwidth: Base tx + memo bytes
-                        const baseBytes = 198;
-                        const memoBytes = rawMemo ? Buffer.from(rawMemo, 'utf8').length : 0;
-                        const totalBandwidth = baseBytes + memoBytes;
-                        return String(totalBandwidth * bandwidthPrice);
-                    }
-                    catch {
-                        // Leave as undefined if estimation fails
-                        return undefined;
-                    }
-                })();
+                const adapter = deps.assertGetTronChainAdapter(sellAsset.chainId);
+                const contractAddress = contractAddressOrUndefined(sellAsset.assetId);
+                const estimate = async (txMemo) => {
+                    const { fast } = await adapter.getFeeData({
+                        to: vault,
+                        value: sellAmountCryptoBaseUnit,
+                        chainSpecific: {
+                            from,
+                            contractAddress,
+                            memo: txMemo,
+                            requireEnergyShare: type === 'quote',
+                        },
+                    });
+                    return fast.txFee;
+                };
                 if (type === 'rate') {
+                    // Rates size the memo with the raw thornode memo (processed memo is '' for rates)
+                    const networkFeeCryptoBaseUnit = await (async () => {
+                        try {
+                            return await estimate(rawMemo);
+                        }
+                        catch { }
+                    })();
                     const stepData = { networkFeeCryptoBaseUnit };
                     return Ok(stepData);
                 }
-                // Un-migrated - exec builds its tx from the inbound address, so no transactionData is carried
-                const stepData = { networkFeeCryptoBaseUnit };
-                return Ok(stepData);
+                try {
+                    const stepData = {
+                        transactionData: { type: 'tron', to: vault, value: sellAmountCryptoBaseUnit, memo },
+                        networkFeeCryptoBaseUnit: await estimate(memo),
+                    };
+                    return Ok(stepData);
+                }
+                catch (error) {
+                    return Err(makeNetworkFeeEstimationFailedErr('getThorStepData', error));
+                }
             }
             default:
                 return Err(makeSwapErrorRight({

package/dist/esm/utils/thorchain/getThorStepData.tron.test.d.ts

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

package/dist/esm/utils/thorchain/getThorStepData.tron.test.js

@@ -0,0 +1,91 @@
+import { tronChainId } from '@shapeshiftoss/caip';
+import { describe, expect, it, vi } from 'vitest';
+import { SwapperName } from '../../types.js';
+import { ETH } from '../test-data/assets.js';
+import { getThorStepData } from './getThorStepData.js';
+import { TradeType } from './types.js';
+vi.mock('./getThorTxData', () => ({
+    getThorTxData: vi.fn().mockResolvedValue({ vault: 'TVault' }),
+    getThorRouterAndVault: vi.fn(),
+}));
+const USDT = 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t';
+const USDT_TRON = { ...ETH, assetId: `${tronChainId}/trc20:${USDT}`, chainId: tronChainId };
+const FROM = 'TT2T17KZhoDu47i2E4FWxfG79zdkEWkU9N';
+const tronAdapter = (txFee = '9000000') => ({
+    getFeeData: vi.fn().mockResolvedValue({ fast: { txFee } }),
+});
+const makeDeps = (tron) => ({ config: {}, assertGetTronChainAdapter: () => tron });
+const baseArgs = {
+    swapperName: SwapperName.Thorchain,
+    tradeType: TradeType.L1ToL1,
+    sellAsset: USDT_TRON,
+    sellAmountCryptoBaseUnit: '100000000',
+    expiry: 0,
+    rawMemo: '=:ETH.ETH:0xabc:1',
+};
+describe('getThorStepData tron', () => {
+    it('carries the vault transfer as transactionData and estimates it for a quote', async () => {
+        const adapter = tronAdapter();
+        const actual = await getThorStepData({
+            ...baseArgs,
+            type: 'quote',
+            input: {},
+            deps: makeDeps(adapter),
+            from: FROM,
+            memo: '=:ETH.ETH:0xabc:1/1/0:ss:55',
+        });
+        expect(actual.unwrap()).toEqual({
+            transactionData: {
+                type: 'tron',
+                to: 'TVault',
+                value: '100000000',
+                memo: '=:ETH.ETH:0xabc:1/1/0:ss:55',
+            },
+            networkFeeCryptoBaseUnit: '9000000',
+        });
+        expect(adapter.getFeeData).toHaveBeenCalledWith({
+            to: 'TVault',
+            value: '100000000',
+            chainSpecific: {
+                from: FROM,
+                contractAddress: USDT,
+                memo: '=:ETH.ETH:0xabc:1/1/0:ss:55',
+                requireEnergyShare: true,
+            },
+        });
+    });
+    it('fails the quote when estimation fails', async () => {
+        const adapter = tronAdapter();
+        adapter.getFeeData.mockRejectedValue(new Error('rpc down'));
+        const actual = await getThorStepData({
+            ...baseArgs,
+            type: 'quote',
+            input: {},
+            deps: makeDeps(adapter),
+            from: FROM,
+            memo: '=:ETH.ETH:0xabc:1/1/0:ss:55',
+        });
+        expect(actual.isErr()).toBe(true);
+    });
+    it('sizes a rate with the raw memo and no sender', async () => {
+        const adapter = tronAdapter();
+        const actual = await getThorStepData({
+            ...baseArgs,
+            type: 'rate',
+            input: {},
+            deps: makeDeps(adapter),
+            memo: '',
+        });
+        expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '9000000' });
+        expect(adapter.getFeeData).toHaveBeenCalledWith({
+            to: 'TVault',
+            value: '100000000',
+            chainSpecific: {
+                from: undefined,
+                contractAddress: USDT,
+                memo: '=:ETH.ETH:0xabc:1',
+                requireEnergyShare: false,
+            },
+        });
+    });
+});

package/dist/esm/utils/thorchain/index.d.ts

@@ -15,7 +15,6 @@ export * from './getThorL1TradeContexts.js';
 export * from './getThorL1TradeQuote.js';
 export * from './getThorL1TradeRate.js';
 export * from './getPoolDetails.js';
-export * as tron from './tron/index.js';
 export declare const getChainIdBySwapper: (swapperName: SwapperName) => import("@shapeshiftoss/caip").ChainId;
 export declare const isThorTradeRate: (quote: TradeRate | undefined) => quote is ThorTradeRate;
 export declare const isThorTradeQuote: (quote: TradeQuote | undefined) => quote is ThorTradeQuote;

package/dist/esm/utils/thorchain/index.js

@@ -15,7 +15,6 @@ export * from './getThorL1TradeContexts.js';
 export * from './getThorL1TradeQuote.js';
 export * from './getThorL1TradeRate.js';
 export * from './getPoolDetails.js';
-export * as tron from './tron/index.js';
 export const getChainIdBySwapper = (swapperName) => {
     switch (swapperName) {
         case SwapperName.Thorchain:

package/dist/esm/utils/tron/constants.d.ts

@@ -0,0 +1 @@
+export declare const TRON_PLACEHOLDER_ADDRESS = "TT2T17KZhoDu47i2E4FWxfG79zdkEWkU9N";

package/dist/esm/utils/tron/constants.js

@@ -0,0 +1,2 @@
+// An activated mainnet account, standing in as the sender/recipient for walletless rate estimation
+export const TRON_PLACEHOLDER_ADDRESS = 'TT2T17KZhoDu47i2E4FWxfG79zdkEWkU9N';

package/dist/esm/utils/tron/getTronNetworkFeeCryptoBaseUnit.d.ts

@@ -0,0 +1,27 @@
+import { tron } from '@shapeshiftoss/chain-adapters';
+import type { Asset } from '@shapeshiftoss/types';
+import type { TxBuildData } from '../../types.js';
+export type TronContractCall = Omit<Extract<TxBuildData, {
+    type: 'tron';
+}>, 'type' | 'data' | 'memo'> & {
+    data: string;
+};
+type GetTronContractCallFallbackFeeArgs = {
+    adapter: tron.ChainAdapter;
+    energy: string;
+    bandwidthBytes: number;
+    contractAddress?: string;
+    fullEnergyOnShareLookupFailure?: boolean;
+};
+export declare const getTronContractCallFallbackFeeCryptoBaseUnit: ({ adapter, energy, bandwidthBytes, contractAddress, fullEnergyOnShareLookupFailure, }: GetTronContractCallFallbackFeeArgs) => Promise<string>;
+type GetTronContractCallNetworkFeeArgs = {
+    adapter: tron.ChainAdapter;
+    transactionData: TronContractCall;
+    from: string;
+    sellAsset: Asset;
+    sellAmountCryptoBaseUnit: string;
+    spenderAddress: string;
+    fallbackEnergy: string;
+};
+export declare const getTronContractCallNetworkFeeCryptoBaseUnit: ({ adapter, transactionData, from, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, fallbackEnergy, }: GetTronContractCallNetworkFeeArgs) => Promise<string>;
+export {};

package/dist/esm/utils/tron/getTronNetworkFeeCryptoBaseUnit.js

@@ -0,0 +1,59 @@
+import { fromAssetId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
+import { tron as unchainedTron } from '@shapeshiftoss/unchained-client';
+import { bn, isToken } from '@shapeshiftoss/utils';
+// A measured worst-case energy under the adapter's margin, at live prices
+export const getTronContractCallFallbackFeeCryptoBaseUnit = async ({ adapter, energy, bandwidthBytes, contractAddress, fullEnergyOnShareLookupFailure = false, }) => {
+    const { httpProvider } = adapter;
+    const [{ energyPrice, bandwidthPrice }, share] = await Promise.all([
+        httpProvider.getChainPrices(),
+        contractAddress
+            ? httpProvider.getContractEnergyShare(tron.toTronBase58(contractAddress)).catch(error => {
+                if (!fullEnergyOnShareLookupFailure)
+                    throw error;
+                return undefined;
+            })
+            : undefined,
+    ]);
+    const callerEnergy = share ? unchainedTron.getCallerEnergy(Number(energy), share) : energy;
+    return bn(callerEnergy)
+        .times(tron.TRON_ENERGY_SAFETY_MARGIN)
+        .times(energyPrice)
+        .plus(bn(bandwidthBytes).times(bandwidthPrice))
+        .toFixed(0);
+};
+// Quote arm: a funded token sell that reverts for want of its allowance prices the measured worst case, anything else throws
+export const getTronContractCallNetworkFeeCryptoBaseUnit = async ({ adapter, transactionData, from, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, fallbackEnergy, }) => {
+    const { to, value, data } = transactionData;
+    try {
+        const { fast } = await adapter.getFeeData({
+            to,
+            value,
+            chainSpecific: { from, data, requireEnergyShare: true },
+        });
+        return fast.txFee;
+    }
+    catch (error) {
+        if (!isToken(sellAsset.assetId))
+            throw error;
+        const contractAddress = fromAssetId(sellAsset.assetId).assetReference;
+        const { httpProvider } = adapter;
+        const [allowance, balance] = await Promise.all([
+            httpProvider.getTrc20Allowance({
+                contractAddress,
+                owner: from,
+                spender: tron.toTronBase58(spenderAddress),
+            }),
+            httpProvider.getTrc20Balance({ contractAddress, address: from }),
+        ]);
+        const sellAmount = BigInt(sellAmountCryptoBaseUnit);
+        if (BigInt(allowance) >= sellAmount || BigInt(balance) < sellAmount)
+            throw error;
+        return getTronContractCallFallbackFeeCryptoBaseUnit({
+            adapter,
+            energy: fallbackEnergy,
+            bandwidthBytes: tron.getTronContractCallBandwidthBytes(data),
+            contractAddress: to,
+        });
+    }
+};

package/dist/esm/utils/tron/getTronNetworkFeeCryptoBaseUnit.test.d.ts

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

package/dist/esm/utils/tron/getTronNetworkFeeCryptoBaseUnit.test.js

@@ -0,0 +1,155 @@
+import { tronChainId } from '@shapeshiftoss/caip';
+import { describe, expect, it, vi } from 'vitest';
+import { ETH } from '../test-data/assets.js';
+import { getTronContractCallFallbackFeeCryptoBaseUnit, getTronContractCallNetworkFeeCryptoBaseUnit, } from './getTronNetworkFeeCryptoBaseUnit.js';
+const USDT = 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t';
+const TRX = { ...ETH, assetId: `${tronChainId}/slip44:195`, chainId: tronChainId };
+const USDT_TRON = { ...ETH, assetId: `${tronChainId}/trc20:${USDT}`, chainId: tronChainId };
+const FROM = 'TT2T17KZhoDu47i2E4FWxfG79zdkEWkU9N';
+const SPENDER_HEX = '4107a39ae4c49dee86e892450b20881f32cd5d500d';
+const SPENDER = 'TAfbit1ENsRmtZbPQfYU3srURpfYuWYS7K';
+const transactionData = { to: SPENDER, data: '0x2213bc0b', value: '0' };
+const makeAdapter = ({ allowance = '0', balance = '100000000', simulation = 'ok', } = {}) => {
+    const getFeeData = simulation === 'ok'
+        ? vi.fn().mockResolvedValue({ fast: { txFee: '9000000' } })
+        : vi.fn().mockRejectedValue(new Error('REVERT opcode executed'));
+    const getTrc20Allowance = vi.fn().mockResolvedValue(allowance);
+    const getTrc20Balance = vi.fn().mockResolvedValue(balance);
+    const getContractEnergyShare = vi.fn().mockResolvedValue({
+        callerPercent: 100,
+        originEnergyLimit: 0,
+        originEnergyAvailable: 0,
+    });
+    const adapter = {
+        getFeeData,
+        httpProvider: {
+            getTrc20Allowance,
+            getTrc20Balance,
+            getContractEnergyShare,
+            getChainPrices: () => Promise.resolve({ energyPrice: 100, bandwidthPrice: 1000 }),
+        },
+    };
+    return {
+        adapter: adapter,
+        getFeeData,
+        getTrc20Allowance,
+        getTrc20Balance,
+        getContractEnergyShare,
+    };
+};
+const baseArgs = {
+    transactionData,
+    from: FROM,
+    sellAmountCryptoBaseUnit: '100000000',
+    spenderAddress: SPENDER_HEX,
+    fallbackEnergy: '400000',
+};
+// 400000 energy * 1.2 margin * 100 sun + (4 calldata + 279 envelope) bytes * 1000 sun
+const FALLBACK_FEE = '48283000';
+describe('getTronContractCallFallbackFeeCryptoBaseUnit', () => {
+    it('prices the energy under the adapter margin at live prices plus the bandwidth', async () => {
+        const { adapter, getContractEnergyShare } = makeAdapter();
+        expect(await getTronContractCallFallbackFeeCryptoBaseUnit({
+            adapter,
+            energy: '400000',
+            bandwidthBytes: 283,
+        })).toBe(FALLBACK_FEE);
+        expect(getContractEnergyShare).not.toHaveBeenCalled();
+    });
+    it('bills the caller only their share of a contract whose deployer covers the rest', async () => {
+        const { adapter, getContractEnergyShare } = makeAdapter();
+        getContractEnergyShare.mockResolvedValue({
+            callerPercent: 5,
+            originEnergyLimit: 10_000_000,
+            originEnergyAvailable: 5_000_000,
+        });
+        // 20000 caller energy * 1.2 margin * 100 sun + 283 bytes * 1000 sun
+        expect(await getTronContractCallFallbackFeeCryptoBaseUnit({
+            adapter,
+            energy: '400000',
+            bandwidthBytes: 283,
+            contractAddress: SPENDER,
+        })).toBe('2683000');
+        expect(getContractEnergyShare).toHaveBeenCalledWith(SPENDER);
+    });
+});
+describe('getTronContractCallFallbackFeeCryptoBaseUnit share lookup failure', () => {
+    it('rejects by default', async () => {
+        const { adapter, getContractEnergyShare } = makeAdapter();
+        getContractEnergyShare.mockRejectedValue(new Error('429'));
+        await expect(getTronContractCallFallbackFeeCryptoBaseUnit({
+            adapter,
+            energy: '400000',
+            bandwidthBytes: 283,
+            contractAddress: SPENDER,
+        })).rejects.toThrow('429');
+    });
+    it('prices the caller in full when the caller opts in', async () => {
+        const { adapter, getContractEnergyShare } = makeAdapter();
+        getContractEnergyShare.mockRejectedValue(new Error('429'));
+        expect(await getTronContractCallFallbackFeeCryptoBaseUnit({
+            adapter,
+            energy: '400000',
+            bandwidthBytes: 283,
+            contractAddress: SPENDER,
+            fullEnergyOnShareLookupFailure: true,
+        })).toBe(FALLBACK_FEE);
+    });
+});
+describe('getTronContractCallNetworkFeeCryptoBaseUnit', () => {
+    it('prices a successful simulation without reading the allowance', async () => {
+        const { adapter, getFeeData, getTrc20Allowance } = makeAdapter();
+        const actual = await getTronContractCallNetworkFeeCryptoBaseUnit({
+            ...baseArgs,
+            adapter,
+            sellAsset: USDT_TRON,
+        });
+        expect(actual).toBe('9000000');
+        expect(getFeeData).toHaveBeenCalledWith({
+            to: SPENDER,
+            value: '0',
+            chainSpecific: { from: FROM, data: '0x2213bc0b', requireEnergyShare: true },
+        });
+        expect(getTrc20Allowance).not.toHaveBeenCalled();
+    });
+    it('prices the measured worst case when a funded token sell reverts without its allowance', async () => {
+        const { adapter, getTrc20Allowance, getTrc20Balance, getContractEnergyShare } = makeAdapter({
+            simulation: 'revert',
+            allowance: '0',
+        });
+        const actual = await getTronContractCallNetworkFeeCryptoBaseUnit({
+            ...baseArgs,
+            adapter,
+            sellAsset: USDT_TRON,
+        });
+        expect(actual).toBe(FALLBACK_FEE);
+        expect(getTrc20Allowance).toHaveBeenCalledWith({
+            contractAddress: USDT,
+            owner: FROM,
+            spender: SPENDER,
+        });
+        expect(getTrc20Balance).toHaveBeenCalledWith({ contractAddress: USDT, address: FROM });
+        expect(getContractEnergyShare).toHaveBeenCalledWith(SPENDER);
+    });
+    it('fails the quote rather than guessing when the share lookup fails', async () => {
+        const { adapter, getContractEnergyShare } = makeAdapter({
+            simulation: 'revert',
+            allowance: '0',
+        });
+        getContractEnergyShare.mockRejectedValue(new Error('429'));
+        await expect(getTronContractCallNetworkFeeCryptoBaseUnit({ ...baseArgs, adapter, sellAsset: USDT_TRON })).rejects.toThrow('429');
+    });
+    it('throws when a token sell reverts with a sufficient allowance', async () => {
+        const { adapter } = makeAdapter({ simulation: 'revert', allowance: '100000000' });
+        await expect(getTronContractCallNetworkFeeCryptoBaseUnit({ ...baseArgs, adapter, sellAsset: USDT_TRON })).rejects.toThrow('REVERT opcode executed');
+    });
+    it('throws when the token balance cannot cover the sell', async () => {
+        const { adapter } = makeAdapter({ simulation: 'revert', allowance: '0', balance: '1' });
+        await expect(getTronContractCallNetworkFeeCryptoBaseUnit({ ...baseArgs, adapter, sellAsset: USDT_TRON })).rejects.toThrow('REVERT opcode executed');
+    });
+    it('throws when a native sell reverts', async () => {
+        const { adapter, getTrc20Allowance } = makeAdapter({ simulation: 'revert' });
+        await expect(getTronContractCallNetworkFeeCryptoBaseUnit({ ...baseArgs, adapter, sellAsset: TRX })).rejects.toThrow('REVERT opcode executed');
+        expect(getTrc20Allowance).not.toHaveBeenCalled();
+    });
+});

package/dist/esm/utils/tron/getUnsignedTronTransaction.d.ts

@@ -1,2 +1,3 @@
+import { tron } from '@shapeshiftoss/chain-adapters';
 import type { GetUnsignedTronTransactionArgs } from '../../types.js';
-export declare const getUnsignedTronTransaction: ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter, }: GetUnsignedTronTransactionArgs) => Promise<import("packages/chain-adapters/src/tron").TronSignTx>;
+export declare const getUnsignedTronTransaction: ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter, }: GetUnsignedTronTransactionArgs) => Promise<tron.TronSignTx>;

package/dist/esm/utils/tron/getUnsignedTronTransaction.js

@@ -1,61 +1,27 @@
-import { tronAssetId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
-import { TronWeb } from 'tronweb';
 import { getExecutableTradeStep, isExecutableTradeQuote } from '../../utils/index.js';
 export const getUnsignedTronTransaction = ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter, }) => {
     if (!isExecutableTradeQuote(tradeQuote))
-        throw new Error('Unable to execute a trade rate quote');
+        throw new Error('Unable to execute a trade rate');
     const step = getExecutableTradeStep(tradeQuote, stepIndex);
-    const { accountNumber, sellAsset, relayTransactionMetadata, butterSwapTransactionMetadata } = step;
+    const { accountNumber, sellAsset, transactionData, feeData } = step;
+    if (transactionData?.type !== 'tron')
+        throw new Error('Missing tron transactionData');
     const adapter = assertGetTronChainAdapter(sellAsset.chainId);
-    if (butterSwapTransactionMetadata) {
-        const { to, data, method, args, value: butterValue } = butterSwapTransactionMetadata;
-        if (!to)
-            throw new Error('Missing Butter swap contract address');
-        if (!data)
-            throw new Error('Missing Butter swap transaction data');
-        // Use Butter's value field which includes swap fees for same-chain swaps
-        // For native TRX sells, also include the sell amount
-        const isNativeTron = sellAsset.assetId === tronAssetId;
-        const value = isNativeTron ? step.sellAmountIncludingProtocolFeesCryptoBaseUnit : butterValue;
-        return adapter.buildCustomApiTx({
-            from,
-            to,
-            accountNumber,
-            data,
-            value,
-            method,
-            args,
-        });
-    }
-    if (relayTransactionMetadata?.data) {
-        if (!relayTransactionMetadata.to) {
-            throw new Error('Missing Relay transaction destination address');
-        }
-        const to = TronWeb.address.fromHex(relayTransactionMetadata.to);
-        const isNativeTron = sellAsset.assetId === tronAssetId;
-        const value = isNativeTron ? step.sellAmountIncludingProtocolFeesCryptoBaseUnit : '0';
-        return adapter.buildCustomApiTx({
-            from,
-            to,
-            accountNumber,
-            data: relayTransactionMetadata.data,
-            value,
-        });
-    }
-    const nearIntentsDepositAddress = step.swapperMetadata?.name === 'nearIntents' ? step.swapperMetadata.depositAddress : undefined;
-    const to = relayTransactionMetadata?.to ?? nearIntentsDepositAddress;
-    if (!to)
-        throw new Error('Missing transaction destination address');
-    const value = step.sellAmountIncludingProtocolFeesCryptoBaseUnit;
-    const contractAddress = contractAddressOrUndefined(sellAsset.assetId);
+    const { to, value, data, memo } = transactionData;
+    const feeLimit = tron.getTronFeeLimit(feeData.networkFeeCryptoBaseUnit);
+    if (data)
+        return adapter.buildCustomApiTx({ from, to, accountNumber, data, value, feeLimit });
     return adapter.buildSendApiTransaction({
-        to,
         from,
-        value,
+        to,
         accountNumber,
+        value,
         chainSpecific: {
-            contractAddress,
+            contractAddress: contractAddressOrUndefined(sellAsset.assetId),
+            memo,
+            feeLimit,
         },
     });
 };

package/dist/esm/utils/tron/getUnsignedTronTransaction.test.d.ts

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