@shapeshiftoss/swapper 20.2.0 → 20.3.0

package/dist/cjs/swappers/SunioSwapper/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUNIO_TRON_NATIVE_ADDRESS = exports.SUNIO_DEX_TYPES = exports.SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = exports.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = exports.DEFAULT_SLIPPAGE_PERCENTAGE = exports.SUNIO_SMART_ROUTER_CONTRACT = exports.SUNIO_API_BASE_URL = exports.SUNIO_SUPPORTED_CHAIN_IDS = void 0;
+exports.SUNIO_DEX_TYPES = exports.SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = exports.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = exports.SUNIO_SWAP_DEADLINE_MS = exports.DEFAULT_SLIPPAGE_PERCENTAGE = exports.SUNIO_SMART_ROUTER_CONTRACT = exports.SUNIO_API_BASE_URL = exports.SUNIO_SUPPORTED_CHAIN_IDS = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 exports.SUNIO_SUPPORTED_CHAIN_IDS = [caip_1.tronChainId];
 // NOTE: This domain looks suspicious, but it's the official Sun.io backend API
@@ -11,12 +11,8 @@ exports.SUNIO_API_BASE_URL = 'https://rot.endjgfsv.link';
 // This is the current mainnet router that sun.io's frontend uses
 exports.SUNIO_SMART_ROUTER_CONTRACT = 'TCFNp179Lg46D16zKoumd4Poa2WFFdtqYj';
 exports.DEFAULT_SLIPPAGE_PERCENTAGE = '0.005';
-// Energy fallbacks for when we can't simulate a swap (no address, or the simulation reverts
-// pre-approval for TRC20 sells). Set to observed average energy so the 1.2x margin applied at
-// estimate time lifts them to cover the worst case (native ~245k, TRC20 ~415k due to the extra
-// transferFrom token pull) without double-counting safety.
-exports.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = 215_000;
-exports.SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = 375_000;
+exports.SUNIO_SWAP_DEADLINE_MS = 20 * 60 * 1000;
+// p90 router energy on mainnet, for rates that can't simulate and token quotes without their allowance
+exports.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = '250000';
+exports.SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = '480000';
 exports.SUNIO_DEX_TYPES = 'PSM,CURVE,CURVE_COMBINATION,WTRX,SUNSWAP_V1,SUNSWAP_V2,SUNSWAP_V3';
-// Native TRX token address (used when assetId is not a TRC-20 token)
-exports.SUNIO_TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';

package/dist/cjs/swappers/SunioSwapper/utils/getSunioStepData.d.ts

@@ -1,17 +1,22 @@
 import type { Result } from '@sniptt/monads';
-import type { StepDataArgs, SwapErrorRight } from '../../../types';
-import type { SunioRoute, SunioTransactionData } from '../types';
+import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
+import type { SunioRoute } from '../types';
 type BaseArgs = {
     route: SunioRoute;
     sellAmountCryptoBaseUnit: string;
+    buyAmountCryptoBaseUnit: string;
 };
 export type GetSunioStepDataArgs = StepDataArgs<BaseArgs>;
+type TronTxBuildData = Extract<TxBuildData, {
+    type: 'tron';
+}>;
 type SunioRateStepData = {
     networkFeeCryptoBaseUnit: string | undefined;
 };
 type SunioQuoteStepData = {
+    transactionData: TronTxBuildData;
     networkFeeCryptoBaseUnit: string;
-    sunioTransactionData: SunioTransactionData;
+    deadline: number;
 };
 export declare function getSunioStepData(args: Extract<GetSunioStepDataArgs, {
     type: 'rate';

package/dist/cjs/swappers/SunioSwapper/utils/getSunioStepData.js

@@ -1,43 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSunioStepData = void 0;
-const utils_1 = require("@shapeshiftoss/utils");
+const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const monads_1 = require("@sniptt/monads");
-const utils_2 = require("../../../utils");
-const estimateSunioNetworkFee_1 = require("./estimateSunioNetworkFee");
+const utils_1 = require("../../../utils");
+const tron_1 = require("../../../utils/tron");
+const buildSwapContractCall_1 = require("./buildSwapContractCall");
+const constants_1 = require("./constants");
 async function getSunioStepData(args) {
-    const { type, route, sellAsset, sellAmountCryptoBaseUnit, from, input, deps } = args;
-    const estimateArgs = {
-        rpcUrl: deps.config.VITE_TRON_NODE_URL,
-        apiKey: deps.config.VITE_TRON_GRID_API_KEY,
-        route,
-        sellAmountCryptoBaseUnit,
-        isSellingNativeTrx: !(0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
-        address: from,
-        slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,
-    };
+    const { type, route, sellAsset, sellAmountCryptoBaseUnit, buyAmountCryptoBaseUnit, from, input } = args;
+    const adapter = args.deps.assertGetTronChainAdapter(sellAsset.chainId);
+    const isNativeSell = sellAsset.assetId === caip_1.tronAssetId;
+    const fallbackEnergy = isNativeSell
+        ? constants_1.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE
+        : constants_1.SUNIO_FALLBACK_SWAP_ENERGY_TRC20;
+    // The router reverts past this, so the quote expires with it
+    const deadline = Date.now() + constants_1.SUNIO_SWAP_DEADLINE_MS;
+    const buildCall = (recipient) => ({
+        to: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+        value: isNativeSell ? sellAmountCryptoBaseUnit : '0',
+        data: (0, buildSwapContractCall_1.buildSunioSwapCalldata)({
+            route,
+            sellAmountCryptoBaseUnit,
+            minBuyAmountCryptoBaseUnit: buyAmountCryptoBaseUnit,
+            recipient,
+            slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal ?? constants_1.DEFAULT_SLIPPAGE_PERCENTAGE,
+            deadline,
+        }),
+    });
     if (type === 'rate') {
         const networkFeeCryptoBaseUnit = await (async () => {
             try {
-                return await (0, estimateSunioNetworkFee_1.estimateSunioNetworkFeeCryptoBaseUnit)(estimateArgs);
+                if (from) {
+                    const { to, value, data } = buildCall(from);
+                    const { fast } = await adapter.getFeeData({ to, value, chainSpecific: { from, data } });
+                    return fast.txFee;
+                }
             }
-            catch {
-                return undefined;
+            catch { }
+            try {
+                return await (0, tron_1.getTronContractCallFallbackFeeCryptoBaseUnit)({
+                    adapter,
+                    energy: fallbackEnergy,
+                    bandwidthBytes: chain_adapters_1.tron.getTronContractCallBandwidthBytes(buildCall(from ?? tron_1.TRON_PLACEHOLDER_ADDRESS).data),
+                    contractAddress: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+                    fullEnergyOnShareLookupFailure: true,
+                });
             }
+            catch { }
         })();
         const stepData = { networkFeeCryptoBaseUnit };
         return (0, monads_1.Ok)(stepData);
     }
+    const call = buildCall(input.receiveAddress);
     try {
-        const networkFeeCryptoBaseUnit = await (0, estimateSunioNetworkFee_1.estimateSunioNetworkFeeCryptoBaseUnit)(estimateArgs);
         const stepData = {
-            networkFeeCryptoBaseUnit,
-            sunioTransactionData: { route },
+            transactionData: { type: 'tron', ...call },
+            networkFeeCryptoBaseUnit: await (0, tron_1.getTronContractCallNetworkFeeCryptoBaseUnit)({
+                adapter,
+                transactionData: call,
+                from,
+                sellAsset,
+                sellAmountCryptoBaseUnit,
+                spenderAddress: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+                fallbackEnergy,
+            }),
+            deadline,
         };
         return (0, monads_1.Ok)(stepData);
     }
     catch (error) {
-        return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getSunioStepData', error));
+        return (0, monads_1.Err)((0, utils_1.makeNetworkFeeEstimationFailedErr)('getSunioStepData', error));
     }
 }
 exports.getSunioStepData = getSunioStepData;

package/dist/cjs/swappers/SunioSwapper/utils/getSunioStepData.test.d.ts

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

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

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
+const vitest_1 = require("vitest");
+const assets_1 = require("../../../utils/test-data/assets");
+const buildSwapContractCall_1 = require("./buildSwapContractCall");
+const constants_1 = require("./constants");
+const getSunioStepData_1 = require("./getSunioStepData");
+const USDT = 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t';
+const TRX = { ...assets_1.ETH, assetId: `${caip_1.tronChainId}/slip44:195`, chainId: caip_1.tronChainId };
+const USDT_TRON = { ...assets_1.ETH, assetId: `${caip_1.tronChainId}/trc20:${USDT}`, chainId: caip_1.tronChainId };
+const FROM = 'TT2T17KZhoDu47i2E4FWxfG79zdkEWkU9N';
+const route = {
+    tokens: ['T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb', USDT],
+    poolVersions: ['v2'],
+    poolFees: ['0'],
+};
+const tronAdapter = ({ txFee = '9000000', allowance = '0' } = {}) => ({
+    getFeeData: vitest_1.vi.fn().mockResolvedValue({ fast: { txFee } }),
+    httpProvider: {
+        getChainPrices: () => Promise.resolve({ energyPrice: 100, bandwidthPrice: 1000 }),
+        getTrc20Allowance: vitest_1.vi.fn().mockResolvedValue(allowance),
+        getTrc20Balance: vitest_1.vi.fn().mockResolvedValue('100000000'),
+        getContractEnergyShare: vitest_1.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 = chain_adapters_1.tron.getTronContractCallBandwidthBytes((0, buildSwapContractCall_1.buildSunioSwapCalldata)({
+    route,
+    sellAmountCryptoBaseUnit: '100000000',
+    minBuyAmountCryptoBaseUnit: '30000000',
+    recipient: FROM,
+    slippageTolerancePercentageDecimal: '0.005',
+    deadline: 0,
+}));
+const fallbackFee = (energy) => String(Number(energy) * 1.2 * 100 + calldataBandwidthBytes * 1000);
+(0, vitest_1.describe)('getSunioStepData', () => {
+    (0, vitest_1.describe)('quote', () => {
+        (0, vitest_1.it)('carries the router call as transactionData and simulates it', async () => {
+            const adapter = tronAdapter();
+            const actual = await (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'quote',
+                input: {
+                    receiveAddress: FROM,
+                    slippageTolerancePercentageDecimal: '0.01',
+                },
+                deps: makeDeps(adapter),
+                sellAsset: TRX,
+                from: FROM,
+            });
+            const { transactionData, networkFeeCryptoBaseUnit, deadline } = actual.unwrap();
+            (0, vitest_1.expect)(transactionData).toMatchObject({
+                type: 'tron',
+                to: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+                value: '100000000',
+            });
+            // swapExactInput selector
+            (0, vitest_1.expect)(transactionData.data).toMatch(/^0x[0-9a-f]{8}/);
+            (0, vitest_1.expect)(networkFeeCryptoBaseUnit).toBe('9000000');
+            (0, vitest_1.expect)(deadline).toBeGreaterThan(Date.now());
+            (0, vitest_1.expect)(adapter.getFeeData).toHaveBeenCalledWith({
+                to: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+                value: '100000000',
+                chainSpecific: { from: FROM, data: transactionData.data, requireEnergyShare: true },
+            });
+        });
+        (0, vitest_1.it)('sends no value for a token sell', async () => {
+            const actual = await (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(tronAdapter()),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            (0, vitest_1.expect)(actual.unwrap().transactionData.value).toBe('0');
+        });
+        (0, vitest_1.it)('fails a native quote when the simulation fails', async () => {
+            const adapter = tronAdapter();
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: TRX,
+                from: FROM,
+            });
+            (0, vitest_1.expect)(actual.isErr()).toBe(true);
+        });
+        (0, vitest_1.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 (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            const { transactionData, networkFeeCryptoBaseUnit } = actual.unwrap();
+            (0, vitest_1.expect)(transactionData.to).toBe(constants_1.SUNIO_SMART_ROUTER_CONTRACT);
+            (0, vitest_1.expect)(networkFeeCryptoBaseUnit).toBe(fallbackFee(constants_1.SUNIO_FALLBACK_SWAP_ENERGY_TRC20));
+            (0, vitest_1.expect)(adapter.httpProvider.getTrc20Allowance).toHaveBeenCalledWith({
+                contractAddress: USDT,
+                owner: FROM,
+                spender: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+            });
+        });
+        (0, vitest_1.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 (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'quote',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            (0, vitest_1.expect)(actual.isErr()).toBe(true);
+        });
+    });
+    (0, vitest_1.describe)('rate', () => {
+        (0, vitest_1.it)('simulates from the receive address when present', async () => {
+            const actual = await (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'rate',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(tronAdapter()),
+                sellAsset: TRX,
+                from: FROM,
+            });
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '9000000' });
+        });
+        (0, vitest_1.it)('prices the measured worst case without an address to simulate from', async () => {
+            const actual = await (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'rate',
+                input: {},
+                deps: makeDeps(tronAdapter()),
+                sellAsset: TRX,
+            });
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({
+                networkFeeCryptoBaseUnit: fallbackFee(constants_1.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE),
+            });
+        });
+        (0, vitest_1.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 (0, getSunioStepData_1.getSunioStepData)({
+                ...baseArgs,
+                type: 'rate',
+                input: { receiveAddress: FROM },
+                deps: makeDeps(adapter),
+                sellAsset: USDT_TRON,
+                from: FROM,
+            });
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({
+                networkFeeCryptoBaseUnit: fallbackFee(constants_1.SUNIO_FALLBACK_SWAP_ENERGY_TRC20),
+            });
+        });
+    });
+});

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

@@ -7,7 +7,7 @@ const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
 const affiliateFee_1 = require("../../../utils/affiliateFee");
 const constants_1 = require("./constants");
-const fetchFromSunio_1 = require("./fetchFromSunio");
+const fetchSunioQuote_1 = require("./fetchSunioQuote");
 const helpers_1 = require("./helpers");
 const sunioService_1 = require("./sunioService");
 const getSunioTradeContext = async ({ input, deps, }) => {
@@ -16,7 +16,7 @@ const getSunioTradeContext = async ({ input, deps, }) => {
     if (assertion.isErr())
         return (0, monads_1.Err)(assertion.unwrapErr());
     try {
-        const maybeQuoteResponse = await (0, fetchFromSunio_1.fetchSunioQuote)({
+        const maybeQuoteResponse = await (0, fetchSunioQuote_1.fetchSunioQuote)({
             sellAssetId: sellAsset.assetId,
             buyAssetId: buyAsset.assetId,
             sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
@@ -87,6 +87,7 @@ const getSunioTradeContext = async ({ input, deps, }) => {
                 deps,
                 sellAsset,
                 sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                buyAmountCryptoBaseUnit,
                 route: bestRoute,
             },
         });

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertValidTrade = exports.assetIdToTronToken = exports.isSupportedChainId = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const types_1 = require("../../../types");
@@ -16,7 +17,7 @@ const assetIdToTronToken = (assetId) => {
         const { assetReference } = (0, caip_1.fromAssetId)(assetId);
         return assetReference;
     }
-    return constants_1.SUNIO_TRON_NATIVE_ADDRESS;
+    return chain_adapters_1.tron.TRON_ZERO_ADDRESS;
 };
 exports.assetIdToTronToken = assetIdToTronToken;
 const assertValidTrade = ({ sellAsset, buyAsset, }) => {

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

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.thorchainApi = void 0;
-const types_1 = require("../../types");
 const cosmossdk_1 = require("../../utils/cosmossdk");
 const evm_1 = require("../../utils/evm");
 const solana_1 = require("../../utils/solana");
 const thorchain_1 = require("../../utils/thorchain");
+const tron_1 = require("../../utils/tron");
 const utxo_1 = require("../../utils/utxo");
 const getTradeQuote_1 = require("./getTradeQuote/getTradeQuote");
 const getTradeRate_1 = require("./getTradeRate/getTradeRate");
-const swapperName = types_1.SwapperName.Thorchain;
 exports.thorchainApi = {
     getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
     getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
@@ -21,8 +20,8 @@ exports.thorchainApi = {
     getCosmosSdkTransactionFees: cosmossdk_1.getCosmosSdkTransactionFees,
     getUnsignedSolanaTransaction: solana_1.getUnsignedSolanaTransaction,
     getSolanaTransactionFees: solana_1.getSolanaTransactionFees,
-    getUnsignedTronTransaction: input => thorchain_1.tron.getUnsignedTronTransaction(input, swapperName),
-    getTronTransactionFees: input => thorchain_1.tron.getTronTransactionFees(input, swapperName),
+    getUnsignedTronTransaction: tron_1.getUnsignedTronTransaction,
+    getTronTransactionFees: tron_1.getTronTransactionFees,
     checkTradeStatus: input => {
         const { config } = input;
         const nodeUrl = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;

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

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

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

@@ -37,6 +37,21 @@ const slippageBps = 100; // 1%
         // 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`);
     });
+    (0, vitest_1.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 = (0, addL1ToLongtailPartsToMemo_1.addL1ToLongtailPartsToMemo)({
+            sellAssetChainId: caip_1.ethChainId,
+            quotedMemo,
+            aggregator: AGGREGATOR_ADDRESS,
+            finalAssetAssetId: FINAL_ASSET_ASSETID,
+            finalAssetAmountOut,
+            slippageBps,
+            longtailTokens: THORCHAIN_ASSETIDS_ONE_COLLISION,
+            affiliate: constants_1.THORCHAIN_AFFILIATE_NAME,
+        });
+        (0, vitest_1.expect)(modifiedMemo).toBe(`=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100:d2:a6df4741:94136714201`);
+    });
     (0, vitest_1.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/cjs/swappers/ThorchainSwapper/utils/assertValidLongtailTrade.js

@@ -94,6 +94,13 @@ const assertValidL1ToLongtailTrade = async ({ sellAsset, buyAsset, deps, }) => {
             details: { sellAssetChainId: sellAsset.chainId },
         }));
     }
+    if (sellAsset.assetId === buyAssetFeeAsset.assetId) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - Cannot swap ${sellAsset.assetId} to itself before the aggregator.`,
+            code: types_1.TradeQuoteError.UnsupportedTradePair,
+            details: { buyAsset, sellAsset },
+        }));
+    }
     return (0, monads_1.Ok)({ buyAssetFeeAsset, longtailTokens });
 };
 exports.assertValidL1ToLongtailTrade = assertValidL1ToLongtailTrade;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getL1ToLongtailQuote = void 0;
-const contracts_1 = require("@shapeshiftoss/contracts");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const constants_1 = require("../../../constants");
@@ -85,7 +84,6 @@ const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapperName)
                 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: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
                 transactionData,
                 feeData: { ...s.feeData, networkFeeCryptoBaseUnit },
             })),

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getL1ToLongtailRate = void 0;
-const contracts_1 = require("@shapeshiftoss/contracts");
 const monads_1 = require("@sniptt/monads");
 const thorchain_1 = require("../../../utils/thorchain");
 const assertValidLongtailTrade_1 = require("./assertValidLongtailTrade");
@@ -38,7 +37,6 @@ const getL1ToLongtailRate = async (input, deps, streamingInterval, swapperName)
                 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: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
             })),
             isLongtail: true,
         });

package/dist/cjs/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/cjs/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.js

@@ -1,27 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniqueAddressSubstring = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const MINIMUM_UNIQUE_SUBSTRING = 2;
+// Mirrors THORNode's externalAssetMatch: a case-insensitive suffix match against the target chain's token list only
 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 } = (0, caip_1.fromAssetId)(destinationAssetId);
+    const address = assetReference.toLowerCase();
+    const sameChainAddresses = longTailAssetIds
+        .map(assetId => (0, caip_1.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;
 };
 exports.getUniqueAddressSubstring = getUniqueAddressSubstring;

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

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const caip_1 = require("@shapeshiftoss/caip");
 const vitest_1 = require("vitest");
+const generatedThorLongtailTokens_json_1 = __importDefault(require("../../generated/generatedThorLongtailTokens.json"));
 const getUniqueAddressSubstring_1 = require("./getUniqueAddressSubstring");
 const FINAL_ASSET_ASSETID = (0, caip_1.toAssetId)({
     chainId: caip_1.ethChainId,
@@ -18,6 +22,16 @@ const BIGGER_COLLIDING_FINAL_ASSETID = (0, caip_1.toAssetId)({
     assetReference: '0xa0b86991c6218b36c1d19d4a2e9eb032a6dF4741',
     assetNamespace: 'erc20',
 });
+const SAME_ADDRESS_OTHER_CHAIN_ASSETID = (0, caip_1.toAssetId)({
+    chainId: caip_1.bscChainId,
+    assetReference: '0x8a65ac0E23F31979db06Ec62Af62b432a6dF4741',
+    assetNamespace: 'erc20',
+});
+const ONE_INCH_ASSETID = (0, caip_1.toAssetId)({
+    chainId: caip_1.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];
@@ -35,4 +49,21 @@ const THORCHAIN_ASSETIDS_TWO_COLLISION = [
         const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(FINAL_ASSET_ASSETID, THORCHAIN_ASSETIDS_TWO_COLLISION);
         (0, vitest_1.expect)(substring).toBe(BIGGER_SHORTENED_FINAL_ASSET_ADDRESS);
     });
+    (0, vitest_1.it)('should ignore the same address on other chains', () => {
+        const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(FINAL_ASSET_ASSETID, [
+            ...THORCHAIN_ASSETIDS_ONE_COLLISION,
+            SAME_ADDRESS_OTHER_CHAIN_ASSETID,
+        ]);
+        (0, vitest_1.expect)(substring).toBe(SHORTENED_FINAL_ASSET_ADDRESS);
+    });
+    (0, vitest_1.it)('should return the full address when the asset is not in the list', () => {
+        const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(FINAL_ASSET_ASSETID, [COLLIDING_FINAL_ASSETID]);
+        (0, vitest_1.expect)(substring).toBe('0x8a65ac0e23f31979db06ec62af62b432a6df4741');
+    });
+    (0, vitest_1.it)('should return a hex suffix for an address listed on multiple chains', () => {
+        (0, vitest_1.expect)(generatedThorLongtailTokens_json_1.default).toContain(ONE_INCH_ASSETID);
+        const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(ONE_INCH_ASSETID, generatedThorLongtailTokens_json_1.default);
+        (0, vitest_1.expect)(substring).toMatch(/^[0-9a-f]+$/);
+        (0, vitest_1.expect)('0x111111111117dc0aa78b770fa6a738034120c302'.endsWith(substring)).toBe(true);
+    });
 });