@shapeshiftoss/swapper 17.8.0 → 18.1.0

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

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

@@ -1,73 +1,94 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLongtailToL1Quote = 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 assert_1 = __importDefault(require("assert"));
-const thorchain_utils_1 = require("../../../thorchain-utils");
 const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
+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 LONGTAIL_TO_L1_DEADLINE_SECONDS = 600n;
 // This just uses UniswapV3 to get the longtail quote for now.
 const getLongtailToL1Quote = async (input, deps, streamingInterval, swapperName) => {
     const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
-    /*
-      We only support ethereum longtail -> L1 swaps for now.
-      We can later add BSC via UniV3, or Avalanche (e.g. via PancakeSwap)
-    */
-    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 sellChainId = sellAsset.chainId;
-    const buyAssetFeeAssetId = deps.assertGetChainAdapter(sellChainId)?.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 ${sellChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { sellAssetChainId: sellChainId },
-        }));
-    }
-    // TODO: use more than just UniswapV3, and also consider trianglar routes.
-    const publicClient = contracts_1.viemClientByChainId[sellChainId];
-    (0, assert_1.default)(publicClient !== undefined, `no public client found for chainId '${sellChainId}'`);
+    const addresses = (0, utils_2.assertQuoteAddresses)(input);
+    if (addresses.isErr())
+        return (0, monads_1.Err)(addresses.unwrapErr());
+    const { sendAddress: from } = addresses.unwrap();
+    const assertion = (0, assertValidLongtailTrade_1.assertValidLongtailToL1Trade)({ sellAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { buyAssetFeeAsset } = assertion.unwrap();
     const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getTokenFromAsset)(sellAsset), (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), sellAmountIncludingProtocolFeesCryptoBaseUnit);
-    if (maybeBestAggregator.isErr()) {
+    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
+    if (quotedAmountOut <= 0n) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: '[getLongtailToL1Quote] - expected a positive amount out',
+            code: types_1.TradeQuoteError.InternalError,
+        }));
+    }
     const l1Tol1QuoteInput = {
         ...input,
         sellAsset: buyAssetFeeAsset,
         sellAmountIncludingProtocolFeesCryptoBaseUnit: quotedAmountOut.toString(),
     };
-    const thorchainQuotes = await (0, thorchain_utils_1.getL1RateOrQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_utils_1.TradeType.LongTailToL1, swapperName);
-    return thorchainQuotes.andThen(quotes => {
-        const updatedQuotes = quotes.map(q => ({
-            ...q,
-            aggregator: bestAggregator,
+    // The sell side is asserted to be ethereum above, so these are always evm quotes
+    const maybeL1Quotes = await (0, thorchain_1.getThorL1TradeQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_1.TradeType.LongTailToL1, swapperName);
+    if (maybeL1Quotes.isErr())
+        return (0, monads_1.Err)(maybeL1Quotes.unwrapErr());
+    const maybeQuotes = await Promise.allSettled(maybeL1Quotes.unwrap().map(async (quote) => {
+        const amountOutMin = BigInt((0, utils_1.bnOrZero)(quotedAmountOut.toString())
+            .times((0, utils_1.bn)(1).minus(quote.slippageTolerancePercentageDecimal ?? 0))
+            .toFixed(0, utils_1.BigNumber.ROUND_UP));
+        // Paranoia: ensure we have this to prevent sandwich attacks on the first step of a LongtailToL1 trade
+        if (amountOutMin <= 0n) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: '[getLongtailToL1Quote] - expected amountOutMin to be a positive amount',
+                code: types_1.TradeQuoteError.InternalError,
+            }));
+        }
+        // The deadline doubles as the THORChain deposit expiry, so it stays pinned to quote time rather
+        // than being refreshed at execution - a stale quote reverts instead of executing on newer terms
+        const deadline = BigInt(Math.floor(Date.now() / 1000)) + LONGTAIL_TO_L1_DEADLINE_SECONDS;
+        // Swap the direct deposit built by getThorL1TradeQuote for the aggregator swapIn we execute
+        const maybeStepData = await (0, thorchain_1.getThorStepData)({
+            type: 'quote',
+            input,
+            from,
+            deps,
+            swapperName,
+            tradeType: thorchain_1.TradeType.LongTailToL1,
+            sellAsset,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            memo: quote.memo,
+            expiry: quote.expiry,
+            rawMemo: quote.memo,
+            longtail: { aggregator: bestAggregator, amountOutMin, deadline },
+        });
+        if (maybeStepData.isErr())
+            return (0, monads_1.Err)(maybeStepData.unwrapErr());
+        const { data, transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+        return (0, monads_1.Ok)({
+            ...quote,
+            data: data ?? quote.data,
             // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
-            steps: q.steps.map(s => ({
+            steps: quote.steps.map(s => ({
                 ...s,
                 sellAmountIncludingProtocolFeesCryptoBaseUnit,
                 sellAsset,
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
+                transactionData,
+                feeData: { ...s.feeData, networkFeeCryptoBaseUnit },
             })),
             isLongtail: true,
-            longtailData: {
-                longtailToL1ExpectedAmountOut: quotedAmountOut.toString(),
-            },
-        }));
-        return (0, monads_1.Ok)(updatedQuotes);
-    });
+        });
+    }));
+    return (0, thorchain_1.getSuccessfulTrades)(maybeQuotes);
 };
 exports.getLongtailToL1Quote = getLongtailToL1Quote;

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

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

@@ -1,73 +1,40 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLongtailToL1Rate = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const contracts_1 = require("@shapeshiftoss/contracts");
 const monads_1 = require("@sniptt/monads");
-const assert_1 = __importDefault(require("assert"));
-const thorchain_utils_1 = require("../../../thorchain-utils");
-const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
+const thorchain_1 = require("../../../utils/thorchain");
+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 getLongtailToL1Rate = async (input, deps, streamingInterval, swapperName) => {
     const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
-    /*
-      We only support ethereum longtail -> L1 swaps for now.
-      We can later add BSC via UniV3, or Avalanche (e.g. via PancakeSwap)
-    */
-    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 sellChainId = sellAsset.chainId;
-    const buyAssetFeeAssetId = deps.assertGetChainAdapter(sellChainId)?.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 ${sellChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { sellAssetChainId: sellChainId },
-        }));
-    }
-    // TODO: use more than just UniswapV3, and also consider trianglar routes.
-    const publicClient = contracts_1.viemClientByChainId[sellChainId];
-    (0, assert_1.default)(publicClient !== undefined, `no public client found for chainId '${sellChainId}'`);
+    const assertion = (0, assertValidLongtailTrade_1.assertValidLongtailToL1Trade)({ sellAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { buyAssetFeeAsset } = assertion.unwrap();
     const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getTokenFromAsset)(sellAsset), (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), sellAmountIncludingProtocolFeesCryptoBaseUnit);
     if (maybeBestAggregator.isErr()) {
         return (0, monads_1.Err)(maybeBestAggregator.unwrapErr());
     }
-    const { bestAggregator, quotedAmountOut } = maybeBestAggregator.unwrap();
+    const { quotedAmountOut } = maybeBestAggregator.unwrap();
     const l1Tol1QuoteInput = {
         ...input,
         sellAsset: buyAssetFeeAsset,
         sellAmountIncludingProtocolFeesCryptoBaseUnit: quotedAmountOut.toString(),
     };
-    const thorchainRates = await (0, thorchain_utils_1.getL1RateOrQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_utils_1.TradeType.LongTailToL1, swapperName);
-    return thorchainRates.andThen(rates => {
-        const updatedRates = rates.map(q => ({
-            ...q,
-            aggregator: bestAggregator,
-            // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
-            steps: q.steps.map(s => ({
-                ...s,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                sellAsset,
-                allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
-            })),
-            isLongtail: true,
-            longtailData: {
-                longtailToL1ExpectedAmountOut: quotedAmountOut.toString(),
-            },
-        }));
-        return (0, monads_1.Ok)(updatedRates);
-    });
+    const maybeL1Rates = await (0, thorchain_1.getThorL1TradeRate)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_1.TradeType.LongTailToL1, swapperName);
+    return maybeL1Rates.map(rates => rates.map(rate => ({
+        ...rate,
+        // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
+        steps: rate.steps.map(s => ({
+            ...s,
+            sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            sellAsset,
+            allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
+        })),
+        isLongtail: true,
+    })));
 };
 exports.getLongtailToL1Rate = getLongtailToL1Rate;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
-const thorchain_utils_1 = require("../../../../thorchain-utils");
+const thorchain_1 = require("../../../../utils/thorchain");
 const constants_1 = require("../../constants");
 const getShortenedFinalAssetLimit_1 = require("./getShortenedFinalAssetLimit");
 const RECEIVE_ADDRESS = '0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6';
@@ -21,7 +21,7 @@ const expectedL1AmountOut = '42';
             memoWithoutFinalAssetLimit: quotedMemo,
             finalAssetLimitWithManualSlippage: '950875902132134123',
         });
-        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_utils_1.addFinalAssetLimitToMemo)({
+        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_1.addFinalAssetLimitToMemo)({
             memo: quotedMemo,
             finalAssetLimit,
             affiliate: constants_1.THORCHAIN_AFFILIATE_NAME,
@@ -78,7 +78,7 @@ const expectedL1AmountOut = '42';
             memoWithoutFinalAssetLimit: quotedMemo,
             finalAssetLimitWithManualSlippage: '950875902132134123',
         });
-        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_utils_1.addFinalAssetLimitToMemo)({
+        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_1.addFinalAssetLimitToMemo)({
             memo: quotedMemo,
             finalAssetLimit,
             affiliate: constants_1.THORCHAIN_AFFILIATE_NAME,