@shapeshiftoss/swapper 20.2.0 → 20.3.0

package/dist/esm/swappers/SunioSwapper/utils/getSunioStepData.test.js

@@ -0,0 +1,175 @@
+import { tronChainId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
+import { describe, expect, it, vi } from 'vitest';
+import { ETH } from '../../../utils/test-data/assets.js';
+import { buildSunioSwapCalldata } from './buildSwapContractCall.js';
+import { SUNIO_FALLBACK_SWAP_ENERGY_NATIVE, SUNIO_FALLBACK_SWAP_ENERGY_TRC20, SUNIO_SMART_ROUTER_CONTRACT, } from './constants.js';
+import { getSunioStepData } from './getSunioStepData.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 route = {
+    tokens: ['T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb', USDT],
+    poolVersions: ['v2'],
+    poolFees: ['0'],
+};
+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,
+        }),
+    },
+});
+const makeDeps = (tron) => ({ assertGetTronChainAdapter: () => tron });
+const baseArgs = {
+    route,
+    sellAmountCryptoBaseUnit: '100000000',
+    buyAmountCryptoBaseUnit: '30000000',
+};
+// The calldata is fixed-width ABI, so its size doesn't depend on the recipient or deadline
+const calldataBandwidthBytes = tron.getTronContractCallBandwidthBytes(buildSunioSwapCalldata({
+    route,
+    sellAmountCryptoBaseUnit: '100000000',
+    minBuyAmountCryptoBaseUnit: '30000000',
+    recipient: FROM,
+    slippageTolerancePercentageDecimal: '0.005',
+    deadline: 0,
+}));
+const fallbackFee = (energy) => String(Number(energy) * 1.2 * 100 + calldataBandwidthBytes * 1000);
+describe('getSunioStepData', () => {
+    describe('quote', () => {
+        it('carries the router call as transactionData and simulates it', async () => {
+            const adapter = tronAdapter();
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: {
+                    receiveAddress: FROM,
+                    slippageTolerancePercentageDecimal: '0.01',
+                },
+                deps: makeDeps(adapter),
+                sellAsset: TRX,
+                from: FROM,
+            });
+            const { transactionData, networkFeeCryptoBaseUnit, deadline } = actual.unwrap();
+            expect(transactionData).toMatchObject({
+                type: 'tron',
+                to: SUNIO_SMART_ROUTER_CONTRACT,
+                value: '100000000',
+            });
+            // swapExactInput selector
+            expect(transactionData.data).toMatch(/^0x[0-9a-f]{8}/);
+            expect(networkFeeCryptoBaseUnit).toBe('9000000');
+            expect(deadline).toBeGreaterThan(Date.now());
+            expect(adapter.getFeeData).toHaveBeenCalledWith({
+                to: SUNIO_SMART_ROUTER_CONTRACT,
+                value: '100000000',
+                chainSpecific: { from: FROM, data: transactionData.data, requireEnergyShare: true },
+            });
+        });
+        it('sends no value for a token sell', async () => {
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(tronAdapter()),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            expect(actual.unwrap().transactionData.value).toBe('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 getSunioStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: TRX,
+                from: FROM,
+            });
+            expect(actual.isErr()).toBe(true);
+        });
+        it('prices the token worst case when the allowance is not granted yet', async () => {
+            const adapter = tronAdapter({ allowance: '0' });
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            const { transactionData, networkFeeCryptoBaseUnit } = actual.unwrap();
+            expect(transactionData.to).toBe(SUNIO_SMART_ROUTER_CONTRACT);
+            expect(networkFeeCryptoBaseUnit).toBe(fallbackFee(SUNIO_FALLBACK_SWAP_ENERGY_TRC20));
+            expect(adapter.httpProvider.getTrc20Allowance).toHaveBeenCalledWith({
+                contractAddress: USDT,
+                owner: FROM,
+                spender: SUNIO_SMART_ROUTER_CONTRACT,
+            });
+        });
+        it('fails a token quote that reverts with its allowance in place', async () => {
+            const adapter = tronAdapter({ allowance: '100000000' });
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            expect(actual.isErr()).toBe(true);
+        });
+    });
+    describe('rate', () => {
+        it('simulates from the receive address when present', async () => {
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'rate',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(tronAdapter()),
+                sellAsset: TRX,
+                from: FROM,
+            });
+            expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '9000000' });
+        });
+        it('prices the measured worst case without an address to simulate from', async () => {
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'rate',
+                input: {},
+                deps: makeDeps(tronAdapter()),
+                sellAsset: TRX,
+            });
+            expect(actual.unwrap()).toEqual({
+                networkFeeCryptoBaseUnit: fallbackFee(SUNIO_FALLBACK_SWAP_ENERGY_NATIVE),
+            });
+        });
+        it('prices the token worst case when a pre-approval simulation reverts', async () => {
+            const adapter = tronAdapter();
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await getSunioStepData({
+                ...baseArgs,
+                type: 'rate',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            expect(actual.unwrap()).toEqual({
+                networkFeeCryptoBaseUnit: fallbackFee(SUNIO_FALLBACK_SWAP_ENERGY_TRC20),
+            });
+        });
+    });
+});

package/dist/esm/swappers/SunioSwapper/utils/getSunioTradeContext.js

@@ -4,7 +4,7 @@ import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { getInputOutputRate, makeSwapErrorRight } from '../../../utils/index.js';
 import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
 import { DEFAULT_SLIPPAGE_PERCENTAGE, SUNIO_SMART_ROUTER_CONTRACT } from './constants.js';
-import { fetchSunioQuote } from './fetchFromSunio.js';
+import { fetchSunioQuote } from './fetchSunioQuote.js';
 import { assertValidTrade } from './helpers.js';
 import { sunioServiceFactory } from './sunioService.js';
 export const getSunioTradeContext = async ({ input, deps, }) => {
@@ -84,6 +84,7 @@ export const getSunioTradeContext = async ({ input, deps, }) => {
                 deps,
                 sellAsset,
                 sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                buyAmountCryptoBaseUnit,
                 route: bestRoute,
             },
         });

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

@@ -1,9 +1,10 @@
 import { fromAssetId, tronChainId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { isToken } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { makeSwapErrorRight } from '../../../utils/index.js';
-import { SUNIO_SUPPORTED_CHAIN_IDS, SUNIO_TRON_NATIVE_ADDRESS } from './constants.js';
+import { SUNIO_SUPPORTED_CHAIN_IDS } from './constants.js';
 export const isSupportedChainId = (chainId) => {
     return SUNIO_SUPPORTED_CHAIN_IDS.includes(chainId);
 };
@@ -12,7 +13,7 @@ export const assetIdToTronToken = (assetId) => {
         const { assetReference } = fromAssetId(assetId);
         return assetReference;
     }
-    return SUNIO_TRON_NATIVE_ADDRESS;
+    return tron.TRON_ZERO_ADDRESS;
 };
 export const assertValidTrade = ({ sellAsset, buyAsset, }) => {
     if (!isSupportedChainId(sellAsset.chainId)) {

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

@@ -1,12 +1,11 @@
-import { SwapperName } from '../../types.js';
 import { getCosmosSdkTransactionFees, getUnsignedCosmosSdkTransaction } from '../../utils/cosmossdk/index.js';
 import { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/evm/index.js';
 import { getSolanaTransactionFees, getUnsignedSolanaTransaction } from '../../utils/solana/index.js';
-import { checkTradeStatus, tron } from '../../utils/thorchain/index.js';
+import { checkTradeStatus } from '../../utils/thorchain/index.js';
+import { getTronTransactionFees, getUnsignedTronTransaction } from '../../utils/tron/index.js';
 import { getUnsignedUtxoTransaction, getUtxoTransactionFees } from '../../utils/utxo/index.js';
 import { getTradeQuote } from './getTradeQuote/getTradeQuote.js';
 import { getTradeRate } from './getTradeRate/getTradeRate.js';
-const swapperName = SwapperName.Thorchain;
 export const thorchainApi = {
     getTradeRate: (input, deps) => getTradeRate(input, deps),
     getTradeQuote: (input, deps) => getTradeQuote(input, deps),
@@ -18,8 +17,8 @@ export const thorchainApi = {
     getCosmosSdkTransactionFees,
     getUnsignedSolanaTransaction,
     getSolanaTransactionFees,
-    getUnsignedTronTransaction: input => tron.getUnsignedTronTransaction(input, swapperName),
-    getTronTransactionFees: input => tron.getTronTransactionFees(input, swapperName),
+    getUnsignedTronTransaction,
+    getTronTransactionFees,
     checkTradeStatus: input => {
         const { config } = input;
         const nodeUrl = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;

package/dist/esm/swappers/ThorchainSwapper/utils/addL1ToLongtailPartsToMemo/addL1ToLongtailPartsToMemo.js

@@ -34,7 +34,12 @@ export const addL1ToLongtailPartsToMemo = ({ sellAssetChainId, quotedMemo, aggre
         finalAssetAddress: finalAssetContractAddressShortened,
     });
     const [prefix, nativeAssetName, address, nativeAssetLimitWithManualSlippage, affiliate, affiliateBps, aggregatorLastTwoChars, finalAssetContract,] = quotedMemoWithAggregatorAndFinalAssetContract.split(MEMO_PART_DELIMITER);
-    const shortenedNativeAssetName = shortenedNativeAssetNameByNativeAssetName[nativeAssetName];
+    // THORNode quote memos may already use the shortened native asset name
+    const shortenedNativeAssetNames = Object.values(shortenedNativeAssetNameByNativeAssetName);
+    const isAlreadyShortened = shortenedNativeAssetNames.includes(nativeAssetName);
+    const shortenedNativeAssetName = isAlreadyShortened
+        ? nativeAssetName
+        : shortenedNativeAssetNameByNativeAssetName[nativeAssetName];
     assert(shortenedNativeAssetName, 'cannot find shortened native asset name');
     const memoWithoutFinalAssetLimit = [
         prefix,

package/dist/esm/swappers/ThorchainSwapper/utils/addL1ToLongtailPartsToMemo/addL1ToLongtailPartsToMemo.test.js

@@ -35,6 +35,21 @@ describe('addL1ToLongtailPartsToMemo', () => {
         // The aggregator will turn the finalAssetAmountOut from 94136714201 to 9413671420 using the last 2 bytes as exponents
         `=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100:d2:a6df4741:94136714201`);
     });
+    it('should accept a quoted memo with an already shortened native asset name', () => {
+        const finalAssetAmountOut = '9508759019';
+        const quotedMemo = `=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100`;
+        const modifiedMemo = addL1ToLongtailPartsToMemo({
+            sellAssetChainId: ethChainId,
+            quotedMemo,
+            aggregator: AGGREGATOR_ADDRESS,
+            finalAssetAssetId: FINAL_ASSET_ASSETID,
+            finalAssetAmountOut,
+            slippageBps,
+            longtailTokens: THORCHAIN_ASSETIDS_ONE_COLLISION,
+            affiliate: THORCHAIN_AFFILIATE_NAME,
+        });
+        expect(modifiedMemo).toBe(`=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100:d2:a6df4741:94136714201`);
+    });
     it('should throw if chainId is BCH and initial memo length is > 220', () => {
         const finalAssetAmountOut = '2083854765519275828179229';
         const memoOver220Bytes = `=:ETH.ETH:${REALLY_BIG_ADDRESS}:42:ss:100`;

package/dist/esm/swappers/ThorchainSwapper/utils/assertValidLongtailTrade.js

@@ -67,5 +67,12 @@ export const assertValidL1ToLongtailTrade = async ({ sellAsset, buyAsset, deps,
             details: { sellAssetChainId: sellAsset.chainId },
         }));
     }
+    if (sellAsset.assetId === buyAssetFeeAsset.assetId) {
+        return Err(makeSwapErrorRight({
+            message: `[getThorTradeQuote] - Cannot swap ${sellAsset.assetId} to itself before the aggregator.`,
+            code: TradeQuoteError.UnsupportedTradePair,
+            details: { buyAsset, sellAsset },
+        }));
+    }
     return Ok({ buyAssetFeeAsset, longtailTokens });
 };

package/dist/esm/swappers/ThorchainSwapper/utils/getL1ToLongtailQuote.js

@@ -1,4 +1,3 @@
-import { TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET } from '@shapeshiftoss/contracts';
 import { convertDecimalPercentageToBasisPoints } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
@@ -82,7 +81,6 @@ export const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapp
                 buyAmountAfterFeesCryptoBaseUnit: quotedAmountOut.toString(),
                 // This is wrong, we should get the get the value before fees or display ETH value received after the thorchain bridge
                 buyAmountBeforeFeesCryptoBaseUnit: quotedAmountOut.toString(),
-                allowanceContract: TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
                 transactionData,
                 feeData: { ...s.feeData, networkFeeCryptoBaseUnit },
             })),

package/dist/esm/swappers/ThorchainSwapper/utils/getL1ToLongtailRate.js

@@ -1,4 +1,3 @@
-import { TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET } from '@shapeshiftoss/contracts';
 import { Err, Ok } from '@sniptt/monads';
 import { getSuccessfulTrades, getThorL1TradeRate, TradeType } from '../../../utils/thorchain/index.js';
 import { assertValidL1ToLongtailTrade } from './assertValidLongtailTrade.js';
@@ -35,7 +34,6 @@ export const getL1ToLongtailRate = async (input, deps, streamingInterval, swappe
                 buyAmountAfterFeesCryptoBaseUnit: quotedAmountOut.toString(),
                 // This is wrong, we should get the get the value before fees or display ETH value received after the thorchain bridge
                 buyAmountBeforeFeesCryptoBaseUnit: quotedAmountOut.toString(),
-                allowanceContract: TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
             })),
             isLongtail: true,
         });

package/dist/esm/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.d.ts

@@ -1,2 +1,2 @@
 import type { AssetId } from '@shapeshiftoss/caip';
-export declare const getUniqueAddressSubstring: (destinationAssetId: AssetId, longTailAssetIds: AssetId[]) => AssetId;
+export declare const getUniqueAddressSubstring: (destinationAssetId: AssetId, longTailAssetIds: AssetId[]) => string;

package/dist/esm/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.js

@@ -1,23 +1,20 @@
+import { fromAssetId } from '@shapeshiftoss/caip';
+const MINIMUM_UNIQUE_SUBSTRING = 2;
+// Mirrors THORNode's externalAssetMatch: a case-insensitive suffix match against the target chain's token list only
 export const getUniqueAddressSubstring = (destinationAssetId, longTailAssetIds) => {
-    const MINIMUM_UNIQUE_SUBSTRING = 2;
-    let maybeShortenedDestinationAddress = destinationAssetId;
-    const substringsCount = {};
-    for (let length = MINIMUM_UNIQUE_SUBSTRING; length <= destinationAssetId.length - 2; length++) {
-        const currentSubstring = destinationAssetId.slice(-length);
-        substringsCount[currentSubstring] = 0;
+    const { chainId, assetReference } = fromAssetId(destinationAssetId);
+    const address = assetReference.toLowerCase();
+    const sameChainAddresses = longTailAssetIds
+        .map(assetId => fromAssetId(assetId))
+        .filter(asset => asset.chainId === chainId)
+        .map(asset => asset.assetReference.toLowerCase());
+    if (!sameChainAddresses.includes(address))
+        return address;
+    for (let length = MINIMUM_UNIQUE_SUBSTRING; length < address.length; length++) {
+        const suffix = address.slice(-length);
+        const matchCount = sameChainAddresses.filter(sameChainAddress => sameChainAddress.endsWith(suffix)).length;
+        if (matchCount === 1)
+            return suffix;
     }
-    longTailAssetIds.forEach(assetId => {
-        Object.keys(substringsCount).forEach(substring => {
-            if (assetId.includes(substring)) {
-                substringsCount[substring] += 1;
-            }
-        });
-    });
-    for (const [substring, count] of Object.entries(substringsCount)) {
-        if (count === 1) {
-            maybeShortenedDestinationAddress = substring;
-            break;
-        }
-    }
-    return maybeShortenedDestinationAddress;
+    return address;
 };

package/dist/esm/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.test.js

@@ -1,5 +1,6 @@
-import { ethChainId, toAssetId } from '@shapeshiftoss/caip';
+import { bscChainId, ethChainId, toAssetId } from '@shapeshiftoss/caip';
 import { describe, expect, it } from 'vitest';
+import longtailTokens from '../../generated/generatedThorLongtailTokens.json';
 import { getUniqueAddressSubstring } from './getUniqueAddressSubstring.js';
 const FINAL_ASSET_ASSETID = toAssetId({
     chainId: ethChainId,
@@ -16,6 +17,16 @@ const BIGGER_COLLIDING_FINAL_ASSETID = toAssetId({
     assetReference: '0xa0b86991c6218b36c1d19d4a2e9eb032a6dF4741',
     assetNamespace: 'erc20',
 });
+const SAME_ADDRESS_OTHER_CHAIN_ASSETID = toAssetId({
+    chainId: bscChainId,
+    assetReference: '0x8a65ac0E23F31979db06Ec62Af62b432a6dF4741',
+    assetNamespace: 'erc20',
+});
+const ONE_INCH_ASSETID = toAssetId({
+    chainId: ethChainId,
+    assetReference: '0x111111111117dc0aa78b770fa6a738034120c302',
+    assetNamespace: 'erc20',
+});
 const SHORTENED_FINAL_ASSET_ADDRESS = 'a6df4741';
 const BIGGER_SHORTENED_FINAL_ASSET_ADDRESS = '432a6df4741';
 const THORCHAIN_ASSETIDS_ONE_COLLISION = [FINAL_ASSET_ASSETID, COLLIDING_FINAL_ASSETID];
@@ -33,4 +44,21 @@ describe('getUniqueAddressSubstring', () => {
         const substring = getUniqueAddressSubstring(FINAL_ASSET_ASSETID, THORCHAIN_ASSETIDS_TWO_COLLISION);
         expect(substring).toBe(BIGGER_SHORTENED_FINAL_ASSET_ADDRESS);
     });
+    it('should ignore the same address on other chains', () => {
+        const substring = getUniqueAddressSubstring(FINAL_ASSET_ASSETID, [
+            ...THORCHAIN_ASSETIDS_ONE_COLLISION,
+            SAME_ADDRESS_OTHER_CHAIN_ASSETID,
+        ]);
+        expect(substring).toBe(SHORTENED_FINAL_ASSET_ADDRESS);
+    });
+    it('should return the full address when the asset is not in the list', () => {
+        const substring = getUniqueAddressSubstring(FINAL_ASSET_ASSETID, [COLLIDING_FINAL_ASSETID]);
+        expect(substring).toBe('0x8a65ac0e23f31979db06ec62af62b432a6df4741');
+    });
+    it('should return a hex suffix for an address listed on multiple chains', () => {
+        expect(longtailTokens).toContain(ONE_INCH_ASSETID);
+        const substring = getUniqueAddressSubstring(ONE_INCH_ASSETID, longtailTokens);
+        expect(substring).toMatch(/^[0-9a-f]+$/);
+        expect('0x111111111117dc0aa78b770fa6a738034120c302'.endsWith(substring)).toBe(true);
+    });
 });

package/dist/esm/types.d.ts

@@ -12,14 +12,12 @@ import type { InterpolationOptions } from 'node-polyglot';
 import type { AvnuMetadata } from './swappers/AvnuSwapper/types.js';
 import type { BebopMetadata } from './swappers/BebopSwapper/types.js';
 import type { BobGatewayMetadata } from './swappers/BobGatewaySwapper/types.js';
-import type { ButterSwapTransactionMetadata } from './swappers/ButterSwap/types.js';
 import type { ChainflipMetadata } from './swappers/ChainflipSwapper/types.js';
 import type { CowMessageToSign } from './swappers/CowSwapper/types.js';
 import type { DebridgeMetadata } from './swappers/DebridgeSwapper/utils/types.js';
 import type { NearIntentsMetadata } from './swappers/NearIntentsSwapper/types.js';
-import type { RelayMetadata, RelayTransactionMetadata } from './swappers/RelaySwapper/utils/types.js';
+import type { RelayMetadata } from './swappers/RelaySwapper/utils/types.js';
 import type { StonfiMetadata, StonfiTransactionData } from './swappers/StonfiSwapper/types.js';
-import type { SunioTransactionData } from './swappers/SunioSwapper/types.js';
 import type { makeSwapperAxiosServiceMonadic } from './utils/index.js';
 import type { MayachainMetadata, ThorchainMetadata } from './utils/thorchain/types.js';
 export type SwapperConfig = {
@@ -323,8 +321,9 @@ export type TxBuildData = {
 } | {
     type: 'tron';
     to: string;
-    data: string;
     value: string;
+    data?: string;
+    memo?: string;
 } | {
     type: 'cowswap';
     chainId: ChainId;
@@ -344,9 +343,6 @@ export type TradeStepCommon = {
     estimatedExecutionTimeMs: number | undefined;
     swapperMetadata?: SwapperMetadata;
     stonfiTransactionData?: StonfiTransactionData;
-    sunioTransactionData?: SunioTransactionData;
-    relayTransactionMetadata?: RelayTransactionMetadata;
-    butterSwapTransactionMetadata?: ButterSwapTransactionMetadata;
     chainflipSpecific?: {
         depositAddress?: string;
     };
@@ -477,6 +473,11 @@ export type EvmMessageExecutionProps = {
 };
 export type UtxoTransactionExecutionProps = {
     signAndBroadcastTransaction: (txToSign: SignTx<UtxoChainId>) => Promise<string>;
+    signTransaction?: (txToSign: SignTx<UtxoChainId>) => Promise<string>;
+};
+export type UtxoTransactionExecutionContext = {
+    config: SwapperConfig;
+    swapperMetadata: SwapperMetadata | undefined;
 };
 export type CosmosSdkTransactionExecutionProps = {
     signAndBroadcastTransaction: (txToSign: SignTx<CosmosSdkChainId>) => Promise<string>;
@@ -587,7 +588,7 @@ export type Swapper = {
     supportsExternalPayment?: boolean;
     executeEvmTransaction?: (txToSign: SignTx<EvmChainId>, callbacks: EvmTransactionExecutionProps) => Promise<string>;
     executeEvmMessage?: (txMetaToSign: EvmMessageToSign, callbacks: EvmMessageExecutionProps, config: SwapperConfig) => Promise<string>;
-    executeUtxoTransaction?: (txToSign: SignTx<UtxoChainId>, callbacks: UtxoTransactionExecutionProps) => Promise<string>;
+    executeUtxoTransaction?: (txToSign: SignTx<UtxoChainId>, callbacks: UtxoTransactionExecutionProps, context?: UtxoTransactionExecutionContext) => Promise<string>;
     executeCosmosSdkTransaction?: (txToSign: SignTx<CosmosSdkChainId>, callbacks: CosmosSdkTransactionExecutionProps) => Promise<string>;
     executeSolanaTransaction?: (txToSign: SolanaSignTx, callbacks: SolanaTransactionExecutionProps) => Promise<string>;
     executeSolanaMessage?: (messageData: SolanaMessageToSign, callbacks: SolanaMessageExecutionProps, config: SwapperConfig) => Promise<string>;

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 {};