@shapeshiftoss/swapper 17.8.0 → 19.0.0

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

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSunioTradeContext = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const monads_1 = require("@sniptt/monads");
+const types_1 = require("../../../types");
+const utils_2 = require("../../../utils");
+const affiliateFee_1 = require("../../../utils/affiliateFee");
+const constants_1 = require("./constants");
+const fetchFromSunio_1 = require("./fetchFromSunio");
+const helpers_1 = require("./helpers");
+const sunioService_1 = require("./sunioService");
+const getSunioTradeContext = async ({ input, deps, }) => {
+    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps, slippageTolerancePercentageDecimal, } = input;
+    const assertion = (0, helpers_1.assertValidTrade)({ sellAsset, buyAsset });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    try {
+        const maybeQuoteResponse = await (0, fetchFromSunio_1.fetchSunioQuote)({
+            sellAssetId: sellAsset.assetId,
+            buyAssetId: buyAsset.assetId,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        }, (0, sunioService_1.sunioServiceFactory)());
+        if (maybeQuoteResponse.isErr())
+            return (0, monads_1.Err)(maybeQuoteResponse.unwrapErr());
+        const bestRoute = maybeQuoteResponse.unwrap().data[0];
+        if (!bestRoute) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: '[Sun.io] No routes available',
+                code: types_1.TradeQuoteError.NoRouteFound,
+            }));
+        }
+        const buyAmountCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
+            value: bestRoute.amountOut,
+            precision: buyAsset.precision,
+        }).toBaseUnit();
+        const rate = (0, utils_2.getInputOutputRate)({
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            buyAmountCryptoBaseUnit,
+            sellAsset,
+            buyAsset,
+        });
+        const protocolFeeCryptoBaseUnit = (0, utils_1.bn)(bestRoute.fee)
+            .times(sellAmountIncludingProtocolFeesCryptoBaseUnit)
+            .toFixed(0);
+        const protocolFees = (() => {
+            if ((0, utils_1.bn)(protocolFeeCryptoBaseUnit).lte(0))
+                return;
+            return {
+                [sellAsset.assetId]: {
+                    amountCryptoBaseUnit: protocolFeeCryptoBaseUnit,
+                    requiresBalance: false,
+                    asset: sellAsset,
+                },
+            };
+        })();
+        return (0, monads_1.Ok)({
+            tradeCommon: {
+                id: crypto.randomUUID(),
+                rate,
+                affiliateBps,
+                slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ?? constants_1.DEFAULT_SLIPPAGE_PERCENTAGE,
+                swapperName: types_1.SwapperName.Sunio,
+            },
+            stepCommon: {
+                buyAmountBeforeFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
+                buyAmountAfterFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
+                sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                rate,
+                source: types_1.SwapperName.Sunio,
+                buyAsset,
+                sellAsset,
+                allowanceContract: constants_1.SUNIO_SMART_ROUTER_CONTRACT,
+                estimatedExecutionTimeMs: undefined,
+                affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                    strategy: 'buy_asset',
+                    affiliateBps,
+                    sellAsset,
+                    buyAsset,
+                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                    buyAmountCryptoBaseUnit,
+                    isEstimate: true,
+                }),
+            },
+            protocolFees,
+            stepDataArgs: { deps, sellAsset, route: bestRoute },
+        });
+    }
+    catch (error) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: '[Sun.io] Failed to get trade',
+            code: types_1.TradeQuoteError.UnknownError,
+            cause: error,
+        }));
+    }
+};
+exports.getSunioTradeContext = getSunioTradeContext;

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

@@ -9,7 +9,7 @@ const getSunioTransactionFees = async ({ tradeQuote, stepIndex, from, slippageTo
         throw new Error('Unable to execute a trade rate quote');
     const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
     const storedNetworkFeeCryptoBaseUnit = step.feeData.networkFeeCryptoBaseUnit;
-    const route = step.sunioTransactionMetadata?.route;
+    const route = step.sunioTransactionData?.route;
     if (!route) {
         if (!storedNetworkFeeCryptoBaseUnit)
             throw new Error('Missing network fee in quote');

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

@@ -0,0 +1,10 @@
+import type { AssetId } from '@shapeshiftoss/caip';
+import type { Asset } from '@shapeshiftoss/types';
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight } from '../../../types';
+export declare const isSupportedChainId: (chainId: string) => boolean;
+export declare const assetIdToTronToken: (assetId: AssetId) => string;
+export declare const assertValidTrade: ({ sellAsset, buyAsset, }: {
+    sellAsset: Asset;
+    buyAsset: Asset;
+}) => Result<void, SwapErrorRight>;

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

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertValidTrade = exports.assetIdToTronToken = exports.isSupportedChainId = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const utils_1 = require("@shapeshiftoss/utils");
+const monads_1 = require("@sniptt/monads");
+const types_1 = require("../../../types");
+const utils_2 = require("../../../utils");
+const constants_1 = require("./constants");
+const isSupportedChainId = (chainId) => {
+    return constants_1.SUNIO_SUPPORTED_CHAIN_IDS.includes(chainId);
+};
+exports.isSupportedChainId = isSupportedChainId;
+const assetIdToTronToken = (assetId) => {
+    if ((0, utils_1.isToken)(assetId)) {
+        const { assetReference } = (0, caip_1.fromAssetId)(assetId);
+        return assetReference;
+    }
+    return constants_1.SUNIO_TRON_NATIVE_ADDRESS;
+};
+exports.assetIdToTronToken = assetIdToTronToken;
+const assertValidTrade = ({ sellAsset, buyAsset, }) => {
+    if (!(0, exports.isSupportedChainId)(sellAsset.chainId)) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: `[${types_1.SwapperName.Sunio}] Unsupported chainId: ${sellAsset.chainId}`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+            details: { chainId: sellAsset.chainId },
+        }));
+    }
+    if (sellAsset.chainId !== buyAsset.chainId) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: `[${types_1.SwapperName.Sunio}] Cross-chain not supported`,
+            code: types_1.TradeQuoteError.CrossChainNotSupported,
+        }));
+    }
+    if (sellAsset.chainId !== caip_1.tronChainId) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: `[${types_1.SwapperName.Sunio}] Only TRON chain supported`,
+            code: types_1.TradeQuoteError.UnsupportedChain,
+        }));
+    }
+    return (0, monads_1.Ok)(undefined);
+};
+exports.assertValidTrade = assertValidTrade;

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

@@ -1,85 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.thorchainApi = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
-const thorchain_utils_1 = require("../../thorchain-utils");
 const types_1 = require("../../types");
-const utils_1 = require("../../utils");
+const cosmossdk_1 = require("../../utils/cosmossdk");
+const evm_1 = require("../../utils/evm");
+const solana_1 = require("../../utils/solana");
+const thorchain_1 = require("../../utils/thorchain");
+const utxo_1 = require("../../utils/utxo");
 const getTradeQuote_1 = require("./getTradeQuote/getTradeQuote");
 const getTradeRate_1 = require("./getTradeRate/getTradeRate");
 const swapperName = types_1.SwapperName.Thorchain;
 exports.thorchainApi = {
-    getTradeRate: getTradeRate_1.getTradeRate,
-    getTradeQuote: getTradeQuote_1.getTradeQuote,
-    getUnsignedEvmTransaction: input => thorchain_utils_1.evm.getUnsignedEvmTransaction(input, swapperName),
-    getEvmTransactionFees: input => thorchain_utils_1.evm.getEvmTransactionFees(input, swapperName),
-    getUnsignedUtxoTransaction: input => thorchain_utils_1.utxo.getUnsignedUtxoTransaction(input, swapperName),
-    getUtxoTransactionFees: input => thorchain_utils_1.utxo.getUtxoTransactionFees(input, swapperName),
-    getUnsignedSolanaTransaction: input => thorchain_utils_1.solana.getUnsignedSolanaTransaction(input, swapperName),
-    getSolanaTransactionFees: input => thorchain_utils_1.solana.getSolanaTransactionFees(input, swapperName),
-    getUnsignedTronTransaction: input => thorchain_utils_1.tron.getUnsignedTronTransaction(input, swapperName),
-    getTronTransactionFees: input => thorchain_utils_1.tron.getTronTransactionFees(input, swapperName),
-    getUnsignedCosmosSdkTransaction: async ({ tradeQuote, stepIndex, from, config, assertGetCosmosSdkChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const { memo } = tradeQuote;
-        if (!memo)
-            throw new Error('Memo is required');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset, feeData } = step;
-        const gas = feeData.chainSpecific.estimatedGasCryptoBaseUnit;
-        const fee = feeData.networkFeeCryptoBaseUnit ?? '0';
-        switch (sellAsset.assetId) {
-            case caip_1.thorchainAssetId:
-            case caip_1.rujiAssetId:
-            case caip_1.tcyAssetId: {
-                const coin = (() => {
-                    if (sellAsset.assetId === caip_1.tcyAssetId)
-                        return 'THOR.TCY';
-                    if (sellAsset.assetId === caip_1.rujiAssetId)
-                        return 'THOR.RUJI';
-                    return 'THOR.RUNE';
-                })();
-                const adapter = assertGetCosmosSdkChainAdapter(sellAsset.chainId);
-                const { txToSign } = await adapter.buildDepositTransaction({
-                    accountNumber,
-                    from,
-                    value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    memo,
-                    chainSpecific: {
-                        gas,
-                        fee,
-                        coin,
-                    },
-                });
-                return txToSign;
-            }
-            case caip_1.cosmosAssetId: {
-                const adapter = assertGetCosmosSdkChainAdapter(sellAsset.chainId);
-                const url = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;
-                const data = await (0, thorchain_utils_1.getInboundAddressDataForChain)(url, caip_1.cosmosAssetId, true, swapperName);
-                if (data.isErr())
-                    throw data.unwrapErr();
-                const { address: vault } = data.unwrap();
-                const { txToSign } = await adapter.buildSendApiTransaction({
-                    accountNumber,
-                    from,
-                    to: vault,
-                    value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    memo,
-                    chainSpecific: { gas, fee },
-                });
-                return txToSign;
-            }
-            default:
-                throw Error(`Unsupported sellAsset: ${sellAsset.assetId}`);
-        }
-    },
-    getCosmosSdkTransactionFees: input => thorchain_utils_1.cosmossdk.getCosmosSdkTransactionFees(input),
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
+    getUnsignedUtxoTransaction: utxo_1.getUnsignedUtxoTransaction,
+    getUtxoTransactionFees: utxo_1.getUtxoTransactionFees,
+    getUnsignedCosmosSdkTransaction: cosmossdk_1.getUnsignedCosmosSdkTransaction,
+    getCosmosSdkTransactionFees: cosmossdk_1.getCosmosSdkTransactionFees,
+    getUnsignedSolanaTransaction: solana_1.getUnsignedSolanaTransaction,
+    getSolanaTransactionFees: solana_1.getSolanaTransactionFees,
+    getUnsignedTronTransaction: input => thorchain_1.tron.getUnsignedTronTransaction(input, swapperName),
+    getTronTransactionFees: input => thorchain_1.tron.getTronTransactionFees(input, swapperName),
     checkTradeStatus: input => {
         const { config } = input;
         const nodeUrl = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;
         const apiUrl = `${config.VITE_UNCHAINED_THORCHAIN_HTTP_URL}/api/v1`;
-        return (0, thorchain_utils_1.checkTradeStatus)({ ...input, nodeUrl, apiUrl, nativeChain: 'THOR' });
+        return (0, thorchain_1.checkTradeStatus)({ ...input, nodeUrl, apiUrl, nativeChain: 'THOR' });
     },
 };

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,13 +59,12 @@ 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,
+        deadline: 1713710808000,
         swapperName: types_1.SwapperName.Thorchain,
         steps: [
             {
@@ -75,13 +88,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,13 +110,12 @@ 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,
+        deadline: 1713710808000,
         swapperName: types_1.SwapperName.Thorchain,
         steps: [
             {
@@ -123,21 +139,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 +211,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; } });