@shapeshiftoss/swapper 17.8.0 → 18.1.0

package/dist/cjs/swappers/ThorchainSwapper/generated/generatedThorLongtailTokens.json

@@ -1015,6 +1015,7 @@
     "eip155:1/erc20:0x815c23eca83261b6ec689b60cc4a58b54bc24d8d",
     "eip155:1/erc20:0x826180541412d574cf1336d22c0c0a287822678a",
     "eip155:1/erc20:0x2c06ba9e7f0daccbc1f6a33ea67e85bb68fbee3a",
+    "eip155:1/erc20:0xcbb8f1bda10b9696c57e13bc128fe674769dcec0",
     "eip155:43114/erc20:0xc891eb4cbdeff6e073e859e987815ed1505c2acd",
     "eip155:43114/erc20:0xd24c2ad096400b6fbcd2ad8b24e7acbc21a1da64",
     "eip155:43114/erc20:0x47c3118ad183712acd42648e9e522e13690f29a0",

package/dist/cjs/swappers/ThorchainSwapper/getTradeQuote/getTradeQuote.d.ts

@@ -1,4 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { ThorTradeQuote } from '../../../thorchain-utils';
-import type { CommonTradeQuoteInput, SwapErrorRight, SwapperDeps } from '../../../types';
-export declare const getTradeQuote: (input: CommonTradeQuoteInput, deps: SwapperDeps) => Promise<Result<ThorTradeQuote[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps } from '../../../types';
+import type { ThorTradeQuote, ThorTradeQuoteInput } from '../../../utils/thorchain';
+export declare const getTradeQuote: (input: ThorTradeQuoteInput, deps: SwapperDeps) => Promise<Result<ThorTradeQuote[], SwapErrorRight>>;

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

@@ -3,60 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const thorchain_utils_1 = require("../../../thorchain-utils");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
-const constants_1 = require("../constants");
+const thorchain_1 = require("../../../utils/thorchain");
+const assertValidTrade_1 = require("../utils/assertValidTrade");
 const getL1ToLongtailQuote_1 = require("../utils/getL1ToLongtailQuote");
 const getLongtailQuote_1 = require("../utils/getLongtailQuote");
-const longTailHelpers_1 = require("../utils/longTailHelpers");
 const getTradeQuote = async (input, deps) => {
-    const thorchainSwapLongtailEnabled = deps.config.VITE_FEATURE_THORCHAINSWAP_LONGTAIL;
-    const thorchainSwapL1ToLongtailEnabled = deps.config.VITE_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL;
     const { sellAsset, buyAsset } = input;
-    if (!constants_1.THORCHAIN_SUPPORTED_CHAIN_IDS.includes(sellAsset.chainId) ||
-        !constants_1.THORCHAIN_SUPPORTED_CHAIN_IDS.includes(buyAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Unsupported chain',
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    const poolDetails = await (0, thorchain_utils_1.getPoolDetails)({
-        buyAsset,
-        sellAsset,
-        url: `${deps.config.VITE_THORCHAIN_NODE_URL}/thorchain/pools`,
-        swapperName: types_1.SwapperName.Thorchain,
-    });
-    if (poolDetails.isErr())
-        return (0, monads_1.Err)(poolDetails.unwrapErr());
-    const { buyPool, buyPoolId, sellPool, sellPoolId, streamingInterval } = poolDetails.unwrap();
-    const tradeType = thorchainSwapLongtailEnabled
-        ? (0, longTailHelpers_1.getTradeType)(sellPool, buyPool, sellPoolId, buyPoolId)
-        : thorchain_utils_1.TradeType.L1ToL1;
-    if (tradeType === undefined) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Unknown trade type',
-            code: types_1.TradeQuoteError.UnsupportedTradePair,
-        }));
-    }
-    if ((!buyPoolId && tradeType !== thorchain_utils_1.TradeType.L1ToLongTail) ||
-        (!sellPoolId && tradeType !== thorchain_utils_1.TradeType.LongTailToL1)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Unsupported trade pair',
-            code: types_1.TradeQuoteError.UnsupportedTradePair,
-        }));
-    }
+    const assertion = await (0, assertValidTrade_1.assertValidTrade)({ sellAsset, buyAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { tradeType, streamingInterval } = assertion.unwrap();
     switch (tradeType) {
-        case thorchain_utils_1.TradeType.L1ToL1:
-            return (0, thorchain_utils_1.getL1RateOrQuote)(input, deps, streamingInterval, tradeType, types_1.SwapperName.Thorchain);
-        case thorchain_utils_1.TradeType.LongTailToL1:
+        case thorchain_1.TradeType.L1ToL1:
+            return (0, thorchain_1.getThorL1TradeQuote)(input, deps, streamingInterval, tradeType, types_1.SwapperName.Thorchain);
+        case thorchain_1.TradeType.LongTailToL1:
             return (0, getLongtailQuote_1.getLongtailToL1Quote)(input, deps, streamingInterval, types_1.SwapperName.Thorchain);
-        case thorchain_utils_1.TradeType.L1ToLongTail:
-            if (!thorchainSwapL1ToLongtailEnabled) {
+        case thorchain_1.TradeType.L1ToLongTail:
+            if (!deps.config.VITE_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL) {
                 return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({ message: 'Not implemented yet' }));
             }
             return (0, getL1ToLongtailQuote_1.getL1ToLongtailQuote)(input, deps, streamingInterval, types_1.SwapperName.Thorchain);
-        case thorchain_utils_1.TradeType.LongTailToLongTail:
+        case thorchain_1.TradeType.LongTailToLongTail:
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({ message: 'Not implemented yet' }));
         default:
             return (0, utils_1.assertUnreachable)(tradeType);

package/dist/cjs/swappers/ThorchainSwapper/getTradeQuote/getTradeQuote.test.js

@@ -1,23 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
 const lodash_1 = require("lodash");
+const viem_1 = require("viem");
 const vitest_1 = require("vitest");
-const thorchain_utils_1 = require("../../../thorchain-utils");
 const types_1 = require("../../../types");
-const assets_1 = require("../../utils/test-data/assets");
-const setupSwapQuote_1 = require("../../utils/test-data/setupSwapQuote");
+const assets_1 = require("../../../utils/test-data/assets");
+const setupSwapQuote_1 = require("../../../utils/test-data/setupSwapQuote");
+const thorchain_1 = require("../../../utils/thorchain");
 const responses_1 = require("../utils/test-data/responses");
 const setupThorswapDeps_1 = require("../utils/test-data/setupThorswapDeps");
 const getTradeQuote_1 = require("./getTradeQuote");
-const mockedGetThorTxInfo = vitest_1.vi.mocked(thorchain_utils_1.evm.getThorTxData);
-const mockedThorService = vitest_1.vi.mocked(thorchain_utils_1.thorService);
+const mockedGetThorRouterAndVault = vitest_1.vi.mocked(thorchain_1.getThorRouterAndVault);
+const mockedThorService = vitest_1.vi.mocked(thorchain_1.thorService);
 const mocks = vitest_1.vi.hoisted(() => ({
     get: vitest_1.vi.fn(),
     post: vitest_1.vi.fn(),
 }));
-vitest_1.vi.mock('../../../thorchain-utils/evm/getThorTxData');
-vitest_1.vi.mock('../../../thorchain-utils/service', () => {
+vitest_1.vi.mock('../../../utils/thorchain/getThorTxData');
+// The override path reads live chain state - resolve to no override so estimation exercises the
+// mocked adapter
+vitest_1.vi.mock('../../../utils/evm/stateOverride', async (importOriginal) => ({
+    ...(await importOriginal()),
+    getMinimalStateOverride: vitest_1.vi.fn().mockResolvedValue(undefined),
+}));
+vitest_1.vi.mock('../../../utils/thorchain/service', () => {
     const mockAxios = {
         default: {
             create: vitest_1.vi.fn(() => ({
@@ -30,12 +38,18 @@ vitest_1.vi.mock('../../../thorchain-utils/service', () => {
         thorService: mockAxios.default.create(),
     };
 });
-vitest_1.vi.mock('@/config', () => {
-    return {
-        getConfig: () => ({
-            VITE_THORCHAIN_NODE_URL: '',
-        }),
-    };
+const THOR_VAULT = '0x06828ac8dbf4cc9e5f363ead14629c9b330c0f5c';
+const SELL_AMOUNT = '713014679420';
+const EXPIRY = 1713710808;
+const REGULAR_MEMO = '=:ETH.ETH:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:9786345:ss:0';
+const STREAMING_MEMO = '=:ETH.ETH:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:0/10/0:ss:0';
+// The deposit calldata is asserted as the encoding of the memo it sits alongside
+const expectedDepositData = (memo) => (0, thorchain_1.depositWithExpiry)({
+    vault: THOR_VAULT,
+    asset: (0, viem_1.getAddress)((0, caip_1.fromAssetId)(assets_1.FOX_MAINNET.assetId).assetReference),
+    amount: BigInt(SELL_AMOUNT),
+    memo,
+    expiry: BigInt(EXPIRY),
 });
 const expectedQuoteResponse = [
     {
@@ -45,11 +59,9 @@ const expectedQuoteResponse = [
         isStreaming: false,
         recommendedMinimumCryptoBaseUnit: '10000000000',
         rate: '143505.61489594191334131621',
-        data: '0x',
-        router: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
-        vault: '0x06828ac8dbf4cc9e5f363ead14629c9b330c0f5c',
-        memo: '=:ETH.ETH:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:9786345:ss:0',
-        tradeType: thorchain_utils_1.TradeType.L1ToL1,
+        data: expectedDepositData(REGULAR_MEMO),
+        memo: REGULAR_MEMO,
+        tradeType: thorchain_1.TradeType.L1ToL1,
         slippageTolerancePercentageDecimal: '0.04357',
         expiry: 1713710808,
         swapperName: types_1.SwapperName.Thorchain,
@@ -75,13 +87,17 @@ const expectedQuoteResponse = [
                 buyAsset: assets_1.ETH,
                 sellAsset: assets_1.FOX_MAINNET,
                 accountNumber: 0,
-                thorchainSpecific: {
+                swapperMetadata: {
+                    name: 'thorchain',
                     maxStreamingQuantity: undefined,
                 },
-                thorchainTransactionMetadata: {
+                transactionData: {
+                    type: 'evm',
+                    chainId: 1,
                     to: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
-                    data: '0x',
+                    data: expectedDepositData(REGULAR_MEMO),
                     value: '0',
+                    gasLimit: '120000',
                 },
             },
         ],
@@ -93,11 +109,9 @@ const expectedQuoteResponse = [
         isStreaming: true,
         recommendedMinimumCryptoBaseUnit: '10000000000',
         rate: '157530.57158846677816130059',
-        data: '0x',
-        router: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
-        vault: '0x06828ac8dbf4cc9e5f363ead14629c9b330c0f5c',
-        memo: '=:ETH.ETH:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:0/10/0:ss:0',
-        tradeType: thorchain_utils_1.TradeType.L1ToL1,
+        data: expectedDepositData(STREAMING_MEMO),
+        memo: STREAMING_MEMO,
+        tradeType: thorchain_1.TradeType.L1ToL1,
         slippageTolerancePercentageDecimal: undefined,
         expiry: 1713710808,
         swapperName: types_1.SwapperName.Thorchain,
@@ -123,21 +137,24 @@ const expectedQuoteResponse = [
                 buyAsset: assets_1.ETH,
                 sellAsset: assets_1.FOX_MAINNET,
                 accountNumber: 0,
-                thorchainSpecific: {
+                swapperMetadata: {
+                    name: 'thorchain',
                     maxStreamingQuantity: undefined,
                 },
-                thorchainTransactionMetadata: {
+                transactionData: {
+                    type: 'evm',
+                    chainId: 1,
                     to: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
-                    data: '0x',
+                    data: expectedDepositData(STREAMING_MEMO),
                     value: '0',
+                    gasLimit: '120000',
                 },
             },
         ],
     },
 ];
 (0, vitest_1.describe)('getTradeQuote', () => {
-    mockedGetThorTxInfo.mockReturnValue(Promise.resolve({
-        data: '0x',
+    mockedGetThorRouterAndVault.mockReturnValue(Promise.resolve({
         router: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
         vault: '0x06828ac8dbf4cc9e5f363ead14629c9b330c0f5c',
     }));
@@ -192,6 +209,7 @@ const expectedQuoteResponse = [
             sellAmountIncludingProtocolFeesCryptoBaseUnit: '713014679420',
             buyAsset: assets_1.ETH,
             sellAsset: assets_1.FOX_MAINNET,
+            sendAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
             slippageTolerancePercentageDecimal: '0.04357',
         };
         const assertGetEvmChainAdapter = (_chainId) => setupThorswapDeps_1.mockEvmChainAdapter;

package/dist/cjs/swappers/ThorchainSwapper/getTradeRate/getTradeRate.d.ts

@@ -1,4 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { ThorTradeRate } from '../../../thorchain-utils';
-import type { GetTradeRateInput, SwapErrorRight, SwapperDeps } from '../../../types';
-export declare const getTradeRate: (input: GetTradeRateInput, deps: SwapperDeps) => Promise<Result<ThorTradeRate[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps } from '../../../types';
+import type { ThorTradeRate, ThorTradeRateInput } from '../../../utils/thorchain';
+export declare const getTradeRate: (input: ThorTradeRateInput, deps: SwapperDeps) => Promise<Result<ThorTradeRate[], SwapErrorRight>>;

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

@@ -3,60 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRate = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const thorchain_utils_1 = require("../../../thorchain-utils");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
-const constants_1 = require("../constants");
+const thorchain_1 = require("../../../utils/thorchain");
+const assertValidTrade_1 = require("../utils/assertValidTrade");
 const getL1ToLongtailRate_1 = require("../utils/getL1ToLongtailRate");
 const getLongtailRate_1 = require("../utils/getLongtailRate");
-const longTailHelpers_1 = require("../utils/longTailHelpers");
 const getTradeRate = async (input, deps) => {
-    const thorchainSwapLongtailEnabled = deps.config.VITE_FEATURE_THORCHAINSWAP_LONGTAIL;
-    const thorchainSwapL1ToLongtailEnabled = deps.config.VITE_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL;
     const { sellAsset, buyAsset } = input;
-    if (!constants_1.THORCHAIN_SUPPORTED_CHAIN_IDS.includes(sellAsset.chainId) ||
-        !constants_1.THORCHAIN_SUPPORTED_CHAIN_IDS.includes(buyAsset.chainId)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Unsupported chain',
-            code: types_1.TradeQuoteError.UnsupportedChain,
-        }));
-    }
-    const poolDetails = await (0, thorchain_utils_1.getPoolDetails)({
-        buyAsset,
-        sellAsset,
-        url: `${deps.config.VITE_THORCHAIN_NODE_URL}/thorchain/pools`,
-        swapperName: types_1.SwapperName.Thorchain,
-    });
-    if (poolDetails.isErr())
-        return (0, monads_1.Err)(poolDetails.unwrapErr());
-    const { buyPool, buyPoolId, sellPool, sellPoolId, streamingInterval } = poolDetails.unwrap();
-    const tradeType = thorchainSwapLongtailEnabled
-        ? (0, longTailHelpers_1.getTradeType)(sellPool, buyPool, sellPoolId, buyPoolId)
-        : thorchain_utils_1.TradeType.L1ToL1;
-    if (tradeType === undefined) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Unknown trade type',
-            code: types_1.TradeQuoteError.UnsupportedTradePair,
-        }));
-    }
-    if ((!buyPoolId && tradeType !== thorchain_utils_1.TradeType.L1ToLongTail) ||
-        (!sellPoolId && tradeType !== thorchain_utils_1.TradeType.LongTailToL1)) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'Unsupported trade pair',
-            code: types_1.TradeQuoteError.UnsupportedTradePair,
-        }));
-    }
+    const assertion = await (0, assertValidTrade_1.assertValidTrade)({ sellAsset, buyAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { tradeType, streamingInterval } = assertion.unwrap();
     switch (tradeType) {
-        case thorchain_utils_1.TradeType.L1ToL1:
-            return (0, thorchain_utils_1.getL1RateOrQuote)(input, deps, streamingInterval, tradeType, types_1.SwapperName.Thorchain);
-        case thorchain_utils_1.TradeType.LongTailToL1:
+        case thorchain_1.TradeType.L1ToL1:
+            return (0, thorchain_1.getThorL1TradeRate)(input, deps, streamingInterval, tradeType, types_1.SwapperName.Thorchain);
+        case thorchain_1.TradeType.LongTailToL1:
             return (0, getLongtailRate_1.getLongtailToL1Rate)(input, deps, streamingInterval, types_1.SwapperName.Thorchain);
-        case thorchain_utils_1.TradeType.L1ToLongTail:
-            if (!thorchainSwapL1ToLongtailEnabled) {
+        case thorchain_1.TradeType.L1ToLongTail:
+            if (!deps.config.VITE_FEATURE_THORCHAINSWAP_L1_TO_LONGTAIL) {
                 return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({ message: 'Not implemented yet' }));
             }
             return (0, getL1ToLongtailRate_1.getL1ToLongtailRate)(input, deps, streamingInterval, types_1.SwapperName.Thorchain);
-        case thorchain_utils_1.TradeType.LongTailToLongTail:
+        case thorchain_1.TradeType.LongTailToLongTail:
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({ message: 'Not implemented yet' }));
         default:
             return (0, utils_1.assertUnreachable)(tradeType);

package/dist/cjs/swappers/ThorchainSwapper/index.d.ts

@@ -5,3 +5,5 @@ export * from './utils/longTailHelpers';
 export declare const isRune: (assetId: AssetId) => boolean;
 export declare const isTcy: (assetId: AssetId) => boolean;
 export declare const isRuji: (assetId: AssetId) => boolean;
+export { thorchainApi } from './endpoints';
+export { thorchainSwapper } from './ThorchainSwapper';

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

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRuji = exports.isTcy = exports.isRune = void 0;
+exports.thorchainSwapper = exports.thorchainApi = exports.isRuji = exports.isTcy = exports.isRune = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils/poolAssetHelpers/poolAssetHelpers"), exports);
@@ -25,3 +25,7 @@ const isTcy = (assetId) => assetId === caip_1.tcyAssetId;
 exports.isTcy = isTcy;
 const isRuji = (assetId) => assetId === caip_1.rujiAssetId;
 exports.isRuji = isRuji;
+var endpoints_1 = require("./endpoints");
+Object.defineProperty(exports, "thorchainApi", { enumerable: true, get: function () { return endpoints_1.thorchainApi; } });
+var ThorchainSwapper_1 = require("./ThorchainSwapper");
+Object.defineProperty(exports, "thorchainSwapper", { enumerable: true, get: function () { return ThorchainSwapper_1.thorchainSwapper; } });

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

@@ -9,7 +9,7 @@ const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const utils_1 = require("@shapeshiftoss/utils");
 const assert_1 = __importDefault(require("assert"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const thorchain_utils_1 = require("../../../../thorchain-utils");
+const thorchain_1 = require("../../../../utils/thorchain");
 const getShortenedFinalAssetLimit_1 = require("../getShortenedFinalAssetLimit/getShortenedFinalAssetLimit");
 const getUniqueAddressSubstring_1 = require("../getUniqueAddressSubstring/getUniqueAddressSubstring");
 const longTailHelpers_1 = require("../longTailHelpers");
@@ -31,16 +31,16 @@ const addL1ToLongtailPartsToMemo = ({ sellAssetChainId, quotedMemo, aggregator,
     (0, assert_1.default)(quotedMemo.length <= maxMemoSize, 'memo is too long');
     // THORChain themselves use 2 characters but it might collide at some point in the future (https://gitlab.com/thorchain/thornode/-/blob/develop/x/thorchain/aggregators/dex_mainnet_current.go)
     const shortenedAggregatorAddress = aggregator.slice(aggregator.length - 2, aggregator.length);
-    const quotedMemoWithAggregator = (0, thorchain_utils_1.addAggregatorAddressToMemo)({
+    const quotedMemoWithAggregator = (0, thorchain_1.addAggregatorAddressToMemo)({
         memo: quotedMemo,
         aggregatorAddress: shortenedAggregatorAddress,
     });
     const finalAssetContractAddressShortened = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(finalAssetAssetId, longtailTokens);
-    const quotedMemoWithAggregatorAndFinalAssetContract = (0, thorchain_utils_1.addFinalAssetAddressToMemo)({
+    const quotedMemoWithAggregatorAndFinalAssetContract = (0, thorchain_1.addFinalAssetAddressToMemo)({
         memo: quotedMemoWithAggregator,
         finalAssetAddress: finalAssetContractAddressShortened,
     });
-    const [prefix, nativeAssetName, address, nativeAssetLimitWithManualSlippage, affiliate, affiliateBps, aggregatorLastTwoChars, finalAssetContract,] = quotedMemoWithAggregatorAndFinalAssetContract.split(thorchain_utils_1.MEMO_PART_DELIMITER);
+    const [prefix, nativeAssetName, address, nativeAssetLimitWithManualSlippage, affiliate, affiliateBps, aggregatorLastTwoChars, finalAssetContract,] = quotedMemoWithAggregatorAndFinalAssetContract.split(thorchain_1.MEMO_PART_DELIMITER);
     const shortenedNativeAssetName = longTailHelpers_1.shortenedNativeAssetNameByNativeAssetName[nativeAssetName];
     (0, assert_1.default)(shortenedNativeAssetName, 'cannot find shortened native asset name');
     const memoWithoutFinalAssetLimit = [
@@ -52,7 +52,7 @@ const addL1ToLongtailPartsToMemo = ({ sellAssetChainId, quotedMemo, aggregator,
         affiliateBps,
         aggregatorLastTwoChars,
         finalAssetContract,
-    ].join(thorchain_utils_1.MEMO_PART_DELIMITER);
+    ].join(thorchain_1.MEMO_PART_DELIMITER);
     // Paranonia - If memo without final asset amount out is already too long, we can't do anything
     (0, assert_1.default)(memoWithoutFinalAssetLimit.length <= maxMemoSize, 'memo is too long');
     const finalAssetLimitWithManualSlippage = (0, utils_1.subtractBasisPointAmount)((0, chain_adapters_1.bn)(finalAssetAmountOut).toFixed(0, bignumber_js_1.default.ROUND_DOWN), slippageBps, bignumber_js_1.default.ROUND_DOWN);
@@ -61,12 +61,12 @@ const addL1ToLongtailPartsToMemo = ({ sellAssetChainId, quotedMemo, aggregator,
         memoWithoutFinalAssetLimit,
         finalAssetLimitWithManualSlippage,
     });
-    const memoWithShortenedFinalAssetAmountOut = (0, thorchain_utils_1.addFinalAssetLimitToMemo)({
+    const memoWithShortenedFinalAssetAmountOut = (0, thorchain_1.addFinalAssetLimitToMemo)({
         memo: memoWithoutFinalAssetLimit,
         finalAssetLimit: shortenedFinalAssetAmount,
         affiliate: _affiliate,
     });
     (0, assert_1.default)(memoWithShortenedFinalAssetAmountOut.length <= maxMemoSize, 'memo is too long');
-    return (0, thorchain_utils_1.assertAndProcessMemo)(memoWithShortenedFinalAssetAmountOut, _affiliate);
+    return (0, thorchain_1.assertAndProcessMemo)(memoWithShortenedFinalAssetAmountOut, _affiliate);
 };
 exports.addL1ToLongtailPartsToMemo = addL1ToLongtailPartsToMemo;

package/dist/cjs/swappers/ThorchainSwapper/utils/assertValidLongtailTrade.d.ts

@@ -0,0 +1,18 @@
+import type { AssetId } from '@shapeshiftoss/caip';
+import type { Asset } from '@shapeshiftoss/types';
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight, SwapperDeps } from '../../../types';
+export declare const assertValidLongtailToL1Trade: ({ sellAsset, deps, }: {
+    sellAsset: Asset;
+    deps: SwapperDeps;
+}) => Result<{
+    buyAssetFeeAsset: Asset;
+}, SwapErrorRight>;
+export declare const assertValidL1ToLongtailTrade: ({ sellAsset, buyAsset, deps, }: {
+    sellAsset: Asset;
+    buyAsset: Asset;
+    deps: SwapperDeps;
+}) => Promise<Result<{
+    buyAssetFeeAsset: Asset;
+    longtailTokens: AssetId[];
+}, SwapErrorRight>>;

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

@@ -0,0 +1,99 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertValidL1ToLongtailTrade = exports.assertValidLongtailToL1Trade = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const contracts_1 = require("@shapeshiftoss/contracts");
+const monads_1 = require("@sniptt/monads");
+const types_1 = require("../../../types");
+const utils_1 = require("../../../utils");
+// We only support ethereum longtail -> L1 swaps for now.
+// We can later add BSC via UniV3, or Avalanche (e.g. via PancakeSwap)
+const assertValidLongtailToL1Trade = ({ sellAsset, deps, }) => {
+    if (sellAsset.chainId !== caip_1.ethChainId) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - Unsupported chainId ${sellAsset.chainId}.`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+            details: { sellAssetChainId: sellAsset.chainId },
+        }));
+    }
+    const buyAssetFeeAssetId = deps.assertGetChainAdapter(sellAsset.chainId)?.getFeeAssetId();
+    const buyAssetFeeAsset = buyAssetFeeAssetId ? deps.assetsById[buyAssetFeeAssetId] : undefined;
+    if (!buyAssetFeeAsset) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - No native buy asset found for ${sellAsset.chainId}.`,
+            code: types_1.TradeQuoteError.InternalError,
+            details: { sellAssetChainId: sellAsset.chainId },
+        }));
+    }
+    // TODO: use more than just UniswapV3, and also consider trianglar routes.
+    if (contracts_1.viemClientByChainId[sellAsset.chainId] === undefined) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `no public client found for chainId '${sellAsset.chainId}'`,
+            code: types_1.TradeQuoteError.InternalError,
+        }));
+    }
+    return (0, monads_1.Ok)({ buyAssetFeeAsset });
+};
+exports.assertValidLongtailToL1Trade = assertValidLongtailToL1Trade;
+// We only support L1 -> ethereum longtail swaps for now.
+const assertValidL1ToLongtailTrade = async ({ sellAsset, buyAsset, deps, }) => {
+    const longtailTokensJson = await Promise.resolve().then(() => __importStar(require('../generated/generatedThorLongtailTokens.json')));
+    const longtailTokens = longtailTokensJson.default;
+    if (!longtailTokens.includes(buyAsset.assetId)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - Unsupported buyAssetId ${buyAsset.assetId}.`,
+            code: types_1.TradeQuoteError.UnsupportedTradePair,
+            details: { buyAsset, sellAsset },
+        }));
+    }
+    if (buyAsset.chainId !== caip_1.ethChainId) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - Unsupported chainId ${buyAsset.chainId}.`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+            details: { buyAssetChainId: buyAsset.chainId },
+        }));
+    }
+    const sellAssetFeeAssetId = deps.assertGetChainAdapter(sellAsset.chainId).getFeeAssetId();
+    const sellAssetFeeAsset = sellAssetFeeAssetId ? deps.assetsById[sellAssetFeeAssetId] : undefined;
+    const buyAssetFeeAssetId = deps.assertGetChainAdapter(buyAsset.chainId).getFeeAssetId();
+    const buyAssetFeeAsset = buyAssetFeeAssetId ? deps.assetsById[buyAssetFeeAssetId] : undefined;
+    if (!buyAssetFeeAsset) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - No native buy asset found for ${buyAsset.chainId}.`,
+            code: types_1.TradeQuoteError.InternalError,
+            details: { buyAssetChainId: buyAsset.chainId },
+        }));
+    }
+    if (!sellAssetFeeAsset) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - No native buy asset found for ${sellAsset.chainId}.`,
+            code: types_1.TradeQuoteError.InternalError,
+            details: { sellAssetChainId: sellAsset.chainId },
+        }));
+    }
+    return (0, monads_1.Ok)({ buyAssetFeeAsset, longtailTokens });
+};
+exports.assertValidL1ToLongtailTrade = assertValidL1ToLongtailTrade;

package/dist/cjs/swappers/ThorchainSwapper/utils/assertValidTrade.d.ts

@@ -0,0 +1,12 @@
+import type { Asset } from '@shapeshiftoss/types';
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight, SwapperDeps } from '../../../types';
+import { TradeType } from '../../../utils/thorchain';
+export declare const assertValidTrade: ({ sellAsset, buyAsset, deps, }: {
+    sellAsset: Asset;
+    buyAsset: Asset;
+    deps: SwapperDeps;
+}) => Promise<Result<{
+    tradeType: TradeType;
+    streamingInterval: number;
+}, SwapErrorRight>>;

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

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertValidTrade = void 0;
+const monads_1 = require("@sniptt/monads");
+const types_1 = require("../../../types");
+const utils_1 = require("../../../utils");
+const thorchain_1 = require("../../../utils/thorchain");
+const constants_1 = require("../constants");
+const longTailHelpers_1 = require("./longTailHelpers");
+const assertValidTrade = async ({ sellAsset, buyAsset, deps, }) => {
+    if (!constants_1.THORCHAIN_SUPPORTED_CHAIN_IDS.includes(sellAsset.chainId) ||
+        !constants_1.THORCHAIN_SUPPORTED_CHAIN_IDS.includes(buyAsset.chainId)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: 'Unsupported chain',
+            code: types_1.TradeQuoteError.UnsupportedChain,
+        }));
+    }
+    const poolDetails = await (0, thorchain_1.getPoolDetails)({
+        buyAsset,
+        sellAsset,
+        url: `${deps.config.VITE_THORCHAIN_NODE_URL}/thorchain/pools`,
+        swapperName: types_1.SwapperName.Thorchain,
+    });
+    if (poolDetails.isErr())
+        return (0, monads_1.Err)(poolDetails.unwrapErr());
+    const { buyPool, buyPoolId, sellPool, sellPoolId, streamingInterval } = poolDetails.unwrap();
+    const tradeType = deps.config.VITE_FEATURE_THORCHAINSWAP_LONGTAIL
+        ? (0, longTailHelpers_1.getTradeType)(sellPool, buyPool, sellPoolId, buyPoolId)
+        : thorchain_1.TradeType.L1ToL1;
+    if (tradeType === undefined) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: 'Unknown trade type',
+            code: types_1.TradeQuoteError.UnsupportedTradePair,
+        }));
+    }
+    if ((!buyPoolId && tradeType !== thorchain_1.TradeType.L1ToLongTail) ||
+        (!sellPoolId && tradeType !== thorchain_1.TradeType.LongTailToL1)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: 'Unsupported trade pair',
+            code: types_1.TradeQuoteError.UnsupportedTradePair,
+        }));
+    }
+    return (0, monads_1.Ok)({ tradeType, streamingInterval });
+};
+exports.assertValidTrade = assertValidTrade;

package/dist/cjs/swappers/ThorchainSwapper/utils/getL1ToLongtailQuote.d.ts

@@ -1,4 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { ThorTradeQuote } from '../../../thorchain-utils';
-import type { CommonTradeQuoteInput, SwapErrorRight, SwapperDeps, SwapperName } from '../../../types';
-export declare const getL1ToLongtailQuote: (input: CommonTradeQuoteInput, deps: SwapperDeps, streamingInterval: number, swapperName: SwapperName) => Promise<Result<ThorTradeQuote[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, SwapperName } from '../../../types';
+import type { ThorTradeQuote, ThorTradeQuoteInput } from '../../../utils/thorchain';
+export declare const getL1ToLongtailQuote: (input: ThorTradeQuoteInput, deps: SwapperDeps, streamingInterval: number, swapperName: SwapperName) => Promise<Result<ThorTradeQuote[], SwapErrorRight>>;