@shapeshiftoss/swapper 17.7.3 → 18.1.0

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

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

@@ -1,112 +1,53 @@
 "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.getL1ToLongtailQuote = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const contracts_1 = require("@shapeshiftoss/contracts");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const constants_1 = require("../../../constants");
-const thorchain_utils_1 = require("../../../thorchain-utils");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const thorchain_1 = require("../../../utils/thorchain");
 const addL1ToLongtailPartsToMemo_1 = require("./addL1ToLongtailPartsToMemo/addL1ToLongtailPartsToMemo");
+const assertValidLongtailTrade_1 = require("./assertValidLongtailTrade");
 const getBestAggregator_1 = require("./getBestAggregator");
 const longTailHelpers_1 = require("./longTailHelpers");
 // This just uses UniswapV3 to get the longtail quote for now.
 const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapperName) => {
     const { buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, sellAsset, slippageTolerancePercentageDecimal, } = input;
-    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_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - Unsupported buyAssetId ${buyAsset.assetId}.`,
-            code: types_1.TradeQuoteError.UnsupportedTradePair,
-            details: { buyAsset, sellAsset },
-        }));
-    }
-    /*
-      We only support L1 -> ethereum longtail swaps for now.
-    */
-    if (buyAsset.chainId !== caip_1.ethChainId) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - Unsupported chainId ${buyAsset.chainId}.`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { buyAssetChainId: buyAsset.chainId },
-        }));
-    }
-    const sellAssetChainId = sellAsset.chainId;
-    const buyAssetChainId = buyAsset.chainId;
-    const sellAssetFeeAssetId = deps.assertGetChainAdapter(sellAssetChainId).getFeeAssetId();
-    const sellAssetFeeAsset = sellAssetFeeAssetId ? deps.assetsById[sellAssetFeeAssetId] : undefined;
-    const buyAssetFeeAssetId = deps.assertGetChainAdapter(buyAssetChainId).getFeeAssetId();
-    const buyAssetFeeAsset = buyAssetFeeAssetId ? deps.assetsById[buyAssetFeeAssetId] : undefined;
-    if (!buyAssetFeeAsset) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - No native buy asset found for ${buyAssetChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { buyAssetChainId },
-        }));
-    }
-    if (!sellAssetFeeAsset) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - No native buy asset found for ${sellAssetChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { sellAssetChainId },
-        }));
-    }
+    const addresses = (0, utils_2.assertQuoteAddresses)(input);
+    if (addresses.isErr())
+        return (0, monads_1.Err)(addresses.unwrapErr());
+    const { sendAddress: from } = addresses.unwrap();
+    const assertion = await (0, assertValidLongtailTrade_1.assertValidL1ToLongtailTrade)({ sellAsset, buyAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { buyAssetFeeAsset, longtailTokens } = assertion.unwrap();
     const l1Tol1QuoteInput = {
         ...input,
         buyAsset: buyAssetFeeAsset,
         sellAsset,
         sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
     };
-    const maybeThorchainQuotes = await (0, thorchain_utils_1.getL1RateOrQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_utils_1.TradeType.L1ToLongTail, swapperName);
-    if (maybeThorchainQuotes.isErr())
-        return (0, monads_1.Err)(maybeThorchainQuotes.unwrapErr());
-    const thorchainQuotes = maybeThorchainQuotes.unwrap();
-    let bestAggregator;
-    let quotedAmountOut;
-    const promises = await Promise.allSettled(thorchainQuotes.map(async (quote) => {
-        // A quote always has a first step
-        const onlyStep = (0, utils_2.getHopByIndex)(quote, 0);
-        // Or well... it should.
-        if (!onlyStep) {
+    const maybeL1Quotes = await (0, thorchain_1.getThorL1TradeQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_1.TradeType.L1ToLongTail, swapperName);
+    if (maybeL1Quotes.isErr())
+        return (0, monads_1.Err)(maybeL1Quotes.unwrapErr());
+    const maybeQuotes = await Promise.allSettled(maybeL1Quotes.unwrap().map(async (quote) => {
+        const [step] = quote.steps;
+        const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), (0, longTailHelpers_1.getTokenFromAsset)(buyAsset), step.buyAmountAfterFeesCryptoBaseUnit);
+        if (maybeBestAggregator.isErr())
+            return (0, monads_1.Err)(maybeBestAggregator.unwrapErr());
+        const { bestAggregator, quotedAmountOut } = maybeBestAggregator.unwrap();
+        // Paranoia - a zero expected amount out would likely lead to a loss of funds, and is encoded into
+        // the memo below as well as the calldata
+        if (quotedAmountOut <= 0n) {
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: `[getL1ToLongtailQuote] - First hop not found`,
+                message: '[getL1ToLongtailQuote] - expected a positive amount out',
                 code: types_1.TradeQuoteError.InternalError,
             }));
         }
-        const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), (0, longTailHelpers_1.getTokenFromAsset)(buyAsset), onlyStep.buyAmountAfterFeesCryptoBaseUnit);
-        if (maybeBestAggregator.isErr())
-            return (0, monads_1.Err)(maybeBestAggregator.unwrapErr());
-        const unwrappedResult = maybeBestAggregator.unwrap();
-        bestAggregator = unwrappedResult.bestAggregator;
-        quotedAmountOut = unwrappedResult.quotedAmountOut;
         const updatedMemo = (0, addL1ToLongtailPartsToMemo_1.addL1ToLongtailPartsToMemo)({
-            sellAssetChainId,
+            sellAssetChainId: sellAsset.chainId,
             aggregator: bestAggregator,
             finalAssetAssetId: buyAsset.assetId,
             finalAssetAmountOut: quotedAmountOut.toString(),
@@ -114,12 +55,30 @@ const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapperName)
                 (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(swapperName)).toString(),
             quotedMemo: quote.memo,
             longtailTokens,
-            affiliate: (0, thorchain_utils_1.getAffiliate)(swapperName),
+            affiliate: (0, thorchain_1.getAffiliate)(swapperName),
+        });
+        // getThorL1TradeQuote built the step against the pre-aggregator memo, so rebuild the tx data
+        // and fees through the shared step data now that the final memo is known
+        const stepData = await (0, thorchain_1.getThorStepData)({
+            type: 'quote',
+            input,
+            from,
+            deps,
+            swapperName,
+            tradeType: thorchain_1.TradeType.L1ToLongTail,
+            sellAsset,
+            sellAmountCryptoBaseUnit: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            memo: updatedMemo,
+            expiry: quote.expiry,
+            rawMemo: updatedMemo,
         });
+        if (stepData.isErr())
+            return (0, monads_1.Err)(stepData.unwrapErr());
+        const { data, transactionData, networkFeeCryptoBaseUnit } = stepData.unwrap();
         return (0, monads_1.Ok)({
             ...quote,
             memo: updatedMemo,
-            aggregator: bestAggregator,
+            data,
             steps: quote.steps.map(s => ({
                 ...s,
                 buyAsset,
@@ -127,20 +86,12 @@ const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapperName)
                 // 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 },
             })),
             isLongtail: true,
-            longtailData: {
-                L1ToLongtailExpectedAmountOut: quotedAmountOut.toString(),
-            },
         });
     }));
-    if (promises.every(promise => (0, utils_1.isRejected)(promise) || (0, utils_1.isResolvedErr)(promise))) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: '[getThorTradeQuote] - failed to get best aggregator',
-            code: types_1.TradeQuoteError.InternalError,
-        }));
-    }
-    const updatedQuotes = promises.filter(utils_1.isFulfilled).map(element => element.value.unwrap());
-    return (0, monads_1.Ok)(updatedQuotes);
+    return (0, thorchain_1.getSuccessfulTrades)(maybeQuotes);
 };
 exports.getL1ToLongtailQuote = getL1ToLongtailQuote;

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

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

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

@@ -1,113 +1,37 @@
 "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.getL1ToLongtailRate = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const contracts_1 = require("@shapeshiftoss/contracts");
-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 thorchain_1 = require("../../../utils/thorchain");
+const assertValidLongtailTrade_1 = require("./assertValidLongtailTrade");
 const getBestAggregator_1 = require("./getBestAggregator");
 const longTailHelpers_1 = require("./longTailHelpers");
 const getL1ToLongtailRate = async (input, deps, streamingInterval, swapperName) => {
     const { buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, sellAsset, } = input;
-    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_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - Unsupported buyAssetId ${buyAsset.assetId}.`,
-            code: types_1.TradeQuoteError.UnsupportedTradePair,
-            details: { buyAsset, sellAsset },
-        }));
-    }
-    /*
-      We only support L1 -> ethereum longtail swaps for now.
-    */
-    if (buyAsset.chainId !== caip_1.ethChainId) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - Unsupported chainId ${buyAsset.chainId}.`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { buyAssetChainId: buyAsset.chainId },
-        }));
-    }
-    const sellAssetChainId = sellAsset.chainId;
-    const buyAssetChainId = buyAsset.chainId;
-    const sellAssetFeeAssetId = deps.assertGetChainAdapter(sellAssetChainId).getFeeAssetId();
-    const sellAssetFeeAsset = sellAssetFeeAssetId ? deps.assetsById[sellAssetFeeAssetId] : undefined;
-    const buyAssetFeeAssetId = deps.assertGetChainAdapter(buyAssetChainId).getFeeAssetId();
-    const buyAssetFeeAsset = buyAssetFeeAssetId ? deps.assetsById[buyAssetFeeAssetId] : undefined;
-    if (!buyAssetFeeAsset) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - No native buy asset found for ${buyAssetChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { buyAssetChainId },
-        }));
-    }
-    if (!sellAssetFeeAsset) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - No native buy asset found for ${sellAssetChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { sellAssetChainId },
-        }));
-    }
+    const assertion = await (0, assertValidLongtailTrade_1.assertValidL1ToLongtailTrade)({ sellAsset, buyAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { buyAssetFeeAsset } = assertion.unwrap();
     const l1Tol1RateInput = {
         ...input,
         buyAsset: buyAssetFeeAsset,
         sellAsset,
         sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
     };
-    const maybeThorchainRates = await (0, thorchain_utils_1.getL1RateOrQuote)(l1Tol1RateInput, deps, streamingInterval, thorchain_utils_1.TradeType.L1ToLongTail, swapperName);
-    if (maybeThorchainRates.isErr())
-        return (0, monads_1.Err)(maybeThorchainRates.unwrapErr());
-    const thorchainRates = maybeThorchainRates.unwrap();
-    let bestAggregator;
-    let quotedAmountOut;
-    const promises = await Promise.allSettled(thorchainRates.map(async (quote) => {
-        // A quote always has a first step
-        const onlyStep = (0, utils_2.getHopByIndex)(quote, 0);
-        // Or well... it should.
-        if (!onlyStep) {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: `[getL1ToLongtailRate] - First hop not found`,
-                code: types_1.TradeQuoteError.InternalError,
-            }));
-        }
-        const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), (0, longTailHelpers_1.getTokenFromAsset)(buyAsset), onlyStep.buyAmountAfterFeesCryptoBaseUnit);
+    const maybeL1Rates = await (0, thorchain_1.getThorL1TradeRate)(l1Tol1RateInput, deps, streamingInterval, thorchain_1.TradeType.L1ToLongTail, swapperName);
+    if (maybeL1Rates.isErr())
+        return (0, monads_1.Err)(maybeL1Rates.unwrapErr());
+    const maybeRates = await Promise.allSettled(maybeL1Rates.unwrap().map(async (quote) => {
+        const [step] = quote.steps;
+        const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), (0, longTailHelpers_1.getTokenFromAsset)(buyAsset), step.buyAmountAfterFeesCryptoBaseUnit);
         if (maybeBestAggregator.isErr())
             return (0, monads_1.Err)(maybeBestAggregator.unwrapErr());
-        const unwrappedResult = maybeBestAggregator.unwrap();
-        bestAggregator = unwrappedResult.bestAggregator;
-        quotedAmountOut = unwrappedResult.quotedAmountOut;
-        // No memo is returned upstream for rates
-        const updatedMemo = '';
+        const { quotedAmountOut } = maybeBestAggregator.unwrap();
         return (0, monads_1.Ok)({
             ...quote,
-            memo: updatedMemo,
-            aggregator: bestAggregator,
+            // No memo is returned upstream for rates
+            memo: '',
             steps: quote.steps.map(s => ({
                 ...s,
                 buyAsset,
@@ -117,18 +41,8 @@ const getL1ToLongtailRate = async (input, deps, streamingInterval, swapperName)
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
             })),
             isLongtail: true,
-            longtailData: {
-                L1ToLongtailExpectedAmountOut: quotedAmountOut.toString(),
-            },
         });
     }));
-    if (promises.every(promise => (0, utils_1.isRejected)(promise) || (0, utils_1.isResolvedErr)(promise))) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: '[getThorTradeQuote] - failed to get best aggregator',
-            code: types_1.TradeQuoteError.InternalError,
-        }));
-    }
-    const updatedQuotes = promises.filter(utils_1.isFulfilled).map(element => element.value.unwrap());
-    return (0, monads_1.Ok)(updatedQuotes);
+    return (0, thorchain_1.getSuccessfulTrades)(maybeRates);
 };
 exports.getL1ToLongtailRate = getL1ToLongtailRate;

package/dist/cjs/swappers/ThorchainSwapper/utils/getLongtailQuote.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 getLongtailToL1Quote: (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 getLongtailToL1Quote: (input: ThorTradeQuoteInput, deps: SwapperDeps, streamingInterval: number, swapperName: SwapperName) => Promise<Result<ThorTradeQuote[], SwapErrorRight>>;