@shapeshiftoss/swapper 14.0.0 → 14.2.0

package/dist/swappers/thorchain/ThorchainSwapper.d.ts

@@ -1,7 +1,8 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperName, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import type { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { SwapperName, SwapperType } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export * from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -52,9 +52,9 @@ class ThorchainSwapper {
     }
     async initialize() {
         try {
-            const { data } = await thorService_1.thorService.get(`${this.deps.daemonUrl}/lcd/thorchain/pools`);
-            const pools = data.filter((pool) => pool.status === 'Available');
-            this.supportedSellAssetIds = pools.reduce((acc, pool) => {
+            const { data: allPools } = await thorService_1.thorService.get(`${this.deps.daemonUrl}/lcd/thorchain/pools`);
+            const availablePools = allPools.filter((pool) => pool.status === 'Available');
+            this.supportedSellAssetIds = availablePools.reduce((acc, pool) => {
                 const assetId = caip_1.adapters.poolAssetIdToAssetId(pool.asset);
                 if (!assetId || !this.sellSupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
                     return acc;
@@ -62,7 +62,7 @@ class ThorchainSwapper {
                 return acc;
             }, []);
             this.supportedSellAssetIds.push(caip_1.thorchainAssetId);
-            this.supportedBuyAssetIds = pools.reduce((acc, pool) => {
+            this.supportedBuyAssetIds = availablePools.reduce((acc, pool) => {
                 const assetId = caip_1.adapters.poolAssetIdToAssetId(pool.asset);
                 if (!assetId || !this.buySupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
                     return acc;

package/dist/swappers/thorchain/buildThorTrade/buildThorTrade.js

@@ -7,7 +7,7 @@ const api_1 = require("../../../api");
 const constants_1 = require("../../utils/constants");
 const getTradeQuote_1 = require("../getThorTradeQuote/getTradeQuote");
 const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
-const cosmosTxData_1 = require("../utils/cosmos/cosmosTxData");
+const getCosmosTxData_1 = require("../utils/cosmos/getCosmosTxData");
 const makeTradeTx_1 = require("../utils/ethereum/makeTradeTx");
 const buildTrade = async ({ deps, input, }) => {
     var _a, _b, _c, _d;
@@ -79,7 +79,7 @@ const buildTrade = async ({ deps, input, }) => {
             if (!bip44Params) {
                 throw new Error('bip44Params required as input');
             }
-            const txData = await (0, cosmosTxData_1.cosmosTxData)({
+            const txData = await (0, getCosmosTxData_1.getCosmosTxData)({
                 bip44Params,
                 deps,
                 sellAdapter: sellAdapter,

package/dist/swappers/thorchain/constants.d.ts

@@ -1,3 +1 @@
 export declare const RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN: import("bignumber.js").default;
-export declare const MINIMUM_USD_TRADE_AMOUNT: import("bignumber.js").default;
-export declare const MINIMUM_USD_TRADE_AMOUNT_ETHEREUM_NETWORK: import("bignumber.js").default;

package/dist/swappers/thorchain/constants.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MINIMUM_USD_TRADE_AMOUNT_ETHEREUM_NETWORK = exports.MINIMUM_USD_TRADE_AMOUNT = exports.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN = void 0;
+exports.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN = void 0;
 const bignumber_1 = require("../utils/bignumber");
 // TODO: read from https://daemon.thorchain.shapeshift.com/lcd/thorchain/constants
 exports.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN = (0, bignumber_1.bn)('0.02');
-exports.MINIMUM_USD_TRADE_AMOUNT = (0, bignumber_1.bn)(1);
-exports.MINIMUM_USD_TRADE_AMOUNT_ETHEREUM_NETWORK = (0, bignumber_1.bn)(42);

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.js

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
 const constants_2 = require("../constants");
 const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
 const constants_3 = require("../utils/constants");
-const estimateBuyAssetTradeFeeCrypto_1 = require("../utils/estimateBuyAssetTradeFeeCrypto/estimateBuyAssetTradeFeeCrypto");
-const getThorTxData_2 = require("../utils/ethereum/utils/getThorTxData");
+const getInboundAddressDataForChain_1 = require("../utils/getInboundAddressDataForChain");
 const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
 const getUsdRate_1 = require("../utils/getUsdRate/getUsdRate");
 const isRune_1 = require("../utils/isRune/isRune");
@@ -23,40 +21,37 @@ const getThorTradeQuote = async ({ deps, input }) => {
     }
     try {
         const { assetReference: sellAssetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const { chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
         const sellAdapter = deps.adapterManager.get(chainId);
-        if (!sellAdapter)
-            throw new api_1.SwapError(`[getThorTradeQuote] - No chain adapter found for ${chainId}.`, {
+        const buyAdapter = deps.adapterManager.get(buyAssetChainId);
+        if (!sellAdapter || !buyAdapter)
+            throw new api_1.SwapError(`[getThorTradeQuote] - No chain adapter found for ${chainId} or ${buyAssetChainId}.`, {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                details: { chainId },
+                details: { sellAssetChainId: chainId, buyAssetChainId },
             });
         const rate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmountCryptoPrecision, deps);
         const buyAmountCryptoPrecision = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)((0, bignumber_1.fromBaseUnit)(sellAmountCryptoPrecision, sellAsset.precision)).times(rate), buyAsset.precision);
-        const estimatedBuyAssetTradeFeeCryptoHuman = await (0, estimateBuyAssetTradeFeeCrypto_1.estimateBuyAssetTradeFeeCrypto)(deps, buyAsset);
-        const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: buyAsset.assetId } });
+        const buyAssetAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, buyAsset.assetId);
+        const estimatedBuyAssetTradeFeeFeeAssetCryptoHuman = (0, isRune_1.isRune)(buyAsset.assetId)
+            ? constants_2.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN.toString()
+            : (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(buyAssetAddressData === null || buyAssetAddressData === void 0 ? void 0 : buyAssetAddressData.outbound_fee), constants_3.THORCHAIN_FIXED_PRECISION);
+        const buyAssetChainFeeAssetId = buyAdapter.getFeeAssetId();
         const sellAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: sellAsset.assetId } });
-        const estimatedBuyAssetTradeFeeUsd = (0, bignumber_1.bn)(buyAssetUsdRate)
-            .times(estimatedBuyAssetTradeFeeCryptoHuman)
+        const buyFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({
+            deps,
+            input: { assetId: buyAssetChainFeeAssetId },
+        });
+        const buyAssetTradeFeeUsd = (0, bignumber_1.bn)(buyFeeAssetUsdRate)
+            .times(estimatedBuyAssetTradeFeeFeeAssetCryptoHuman)
             .toString();
-        const minimumUsdAmount = buyAsset.chainId === types_1.KnownChainIds.EthereumMainnet
-            ? constants_2.MINIMUM_USD_TRADE_AMOUNT_ETHEREUM_NETWORK
-            : constants_2.MINIMUM_USD_TRADE_AMOUNT;
-        const buyAssetTradeFeeUsdOrMinimum = minimumUsdAmount.gt(estimatedBuyAssetTradeFeeUsd)
-            ? minimumUsdAmount.toString()
-            : estimatedBuyAssetTradeFeeUsd;
-        const minimumSellAssetAmountCryptoHuman = (() => {
-            // The 1$ minimum doesn't apply for swaps to RUNE, use OutboundTransactionFee in human value instead
-            if ((0, isRune_1.isRune)(buyAsset === null || buyAsset === void 0 ? void 0 : buyAsset.assetId))
-                return constants_2.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN;
-            return (0, bignumber_1.bnOrZero)(buyAssetTradeFeeUsdOrMinimum).div(sellAssetUsdRate);
-        })();
+        const minimumSellAssetAmountCryptoHuman = (0, bignumber_1.bn)(sellAssetUsdRate).isGreaterThan(0)
+            ? (0, bignumber_1.bnOrZero)(buyAssetTradeFeeUsd).div(sellAssetUsdRate)
+            : 0; // We don't have a valid rate for the sell asset, there is no sane minimum
         // minimum is tradeFee padded by an amount to be sure they get something back
         // usually it will be slightly more than the amount because sellAssetTradeFee is already a high estimate
         const minimumSellAssetAmountPaddedCryptoHuman = (0, bignumber_1.bnOrZero)(minimumSellAssetAmountCryptoHuman)
             .times(constants_3.THOR_MINIMUM_PADDING)
             .toString();
-        const buyAssetTradeFeeUsdOrDefault = (0, isRune_1.isRune)(buyAsset === null || buyAsset === void 0 ? void 0 : buyAsset.assetId)
-            ? (0, bignumber_1.bn)(buyAssetUsdRate).times(constants_2.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN).toString()
-            : estimatedBuyAssetTradeFeeUsd;
         const commonQuoteFields = {
             rate,
             maximum: constants_3.MAX_THORCHAIN_TRADE,
@@ -72,19 +67,14 @@ const getThorTradeQuote = async ({ deps, input }) => {
         switch (chainNamespace) {
             case caip_1.CHAIN_NAMESPACE.Evm:
                 return (async () => {
-                    const { router } = await (0, getThorTxData_2.getThorTxInfo)({
-                        deps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoPrecision,
-                        slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
-                        destinationAddress: receiveAddress,
-                        buyAssetTradeFeeUsd: estimatedBuyAssetTradeFeeUsd,
-                    });
+                    const ethAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, caip_1.ethAssetId);
+                    const router = ethAddressData === null || ethAddressData === void 0 ? void 0 : ethAddressData.router;
+                    if (!router)
+                        throw new api_1.SwapError('[getThorTradeQuote] No router address found for ETH');
                     const feeData = await (0, getEthTxFees_1.getEthTxFees)({
                         adapterManager: deps.adapterManager,
                         sellAssetReference,
-                        buyAssetTradeFeeUsd: estimatedBuyAssetTradeFeeUsd,
+                        buyAssetTradeFeeUsd,
                     });
                     return {
                         ...commonQuoteFields,
@@ -102,7 +92,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
                         destinationAddress: receiveAddress,
                         xpub: input.xpub,
-                        buyAssetTradeFeeUsd: estimatedBuyAssetTradeFeeUsd,
+                        buyAssetTradeFeeUsd,
                     });
                     const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({
                         sellAmountCryptoPrecision,
@@ -110,7 +100,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         opReturnData,
                         pubkey,
                         sellAdapter: sellAdapter,
-                        buyAssetTradeFeeUsd: estimatedBuyAssetTradeFeeUsd,
+                        buyAssetTradeFeeUsd,
                         sendMax,
                     });
                     return {
@@ -127,7 +117,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         allowanceContract: '0x0',
                         feeData: {
                             networkFee: feeData.fast.txFee,
-                            buyAssetTradeFeeUsd: buyAssetTradeFeeUsdOrDefault,
+                            buyAssetTradeFeeUsd,
                             sellAssetTradeFeeUsd: '0',
                             chainSpecific: { estimatedGas: feeData.fast.chainSpecific.gasLimit },
                         },

package/dist/swappers/thorchain/types.d.ts

@@ -47,13 +47,19 @@ declare type MidgardAction = {
 export declare type MidgardActionsResponse = {
     actions: MidgardAction[];
 };
-export declare type InboundResponse = {
+export declare type InboundAddressResponse = {
     chain: string;
     pub_key: string;
     address: string;
     halted: boolean;
     gas_rate: string;
+    gas_rate_units: string;
     router?: string;
+    global_trading_paused: boolean;
+    chain_trading_paused: boolean;
+    chain_lp_actions_paused: boolean;
+    outbound_tx_size: string;
+    outbound_fee: string;
 };
 export declare type ThorchainSwapperDeps = {
     daemonUrl: string;

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.d.ts

@@ -1,5 +1,5 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import { ThorchainSwapperDeps } from '../../../types';
+import type { ThorchainSwapperDeps } from '../../../types';
 declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
     sellAsset: Asset;

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.js

@@ -2,25 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
 const api_1 = require("../../../../../api");
+const getInboundAddressDataForChain_1 = require("../../getInboundAddressDataForChain");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
-const thorService_1 = require("../../thorService");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecision, slippageTolerance, destinationAddress, xpub, buyAssetTradeFeeUsd, }) => {
     try {
-        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
-        const sellAssetInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === sellAsset.symbol.toUpperCase());
-        const vault = sellAssetInboundAddresses === null || sellAssetInboundAddresses === void 0 ? void 0 : sellAssetInboundAddresses.address;
+        const inboundAddress = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, sellAsset.assetId);
+        const vault = inboundAddress === null || inboundAddress === void 0 ? void 0 : inboundAddress.address;
         if (!vault)
             throw new api_1.SwapError(`[getThorTxInfo]: vault not found for asset`, {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
-                details: { inboundAddresses, sellAsset },
+                details: { inboundAddress, sellAsset },
             });
         const limit = await (0, getLimit_1.getLimit)({
             buyAssetId: buyAsset.assetId,
-            destinationAddress,
             sellAmountCryptoPrecision,
             sellAsset,
-            buyAsset,
             slippageTolerance,
             deps,
             buyAssetTradeFeeUsd,

package/dist/swappers/thorchain/utils/constants.d.ts

@@ -1,5 +1,3 @@
-import { ChainId } from '@shapeshiftoss/caip';
-import BigNumber from 'bignumber.js';
 export declare const MAX_THORCHAIN_TRADE = "100000000000000000000000000";
 export declare const MAX_ALLOWANCE = "100000000000000000000000000";
 export declare const THOR_MINIMUM_PADDING = 1.2;
@@ -7,4 +5,3 @@ export declare const THOR_ETH_GAS_LIMIT = "100000";
 export declare const THORCHAIN_FIXED_PRECISION = 8;
 export declare const THORCHAIN_AFFILIATE_NAME = "ss";
 export declare const THORCHAIN_AFFILIATE_BIPS = "0";
-export declare const THOR_TRADE_FEE_MULTIPLIERS: Record<ChainId, BigNumber>;

package/dist/swappers/thorchain/utils/constants.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THOR_TRADE_FEE_MULTIPLIERS = exports.THORCHAIN_AFFILIATE_BIPS = exports.THORCHAIN_AFFILIATE_NAME = exports.THORCHAIN_FIXED_PRECISION = exports.THOR_ETH_GAS_LIMIT = exports.THOR_MINIMUM_PADDING = exports.MAX_ALLOWANCE = exports.MAX_THORCHAIN_TRADE = void 0;
-const types_1 = require("@shapeshiftoss/types");
-const bignumber_1 = require("../../utils/bignumber");
+exports.THORCHAIN_AFFILIATE_BIPS = exports.THORCHAIN_AFFILIATE_NAME = exports.THORCHAIN_FIXED_PRECISION = exports.THOR_ETH_GAS_LIMIT = exports.THOR_MINIMUM_PADDING = exports.MAX_ALLOWANCE = exports.MAX_THORCHAIN_TRADE = void 0;
 exports.MAX_THORCHAIN_TRADE = '100000000000000000000000000';
 exports.MAX_ALLOWANCE = '100000000000000000000000000';
 exports.THOR_MINIMUM_PADDING = 1.2;
@@ -10,17 +8,3 @@ exports.THOR_ETH_GAS_LIMIT = '100000'; // for sends of eth / erc20 into thorchai
 exports.THORCHAIN_FIXED_PRECISION = 8; // limit values are precision 8 regardless of the chain
 exports.THORCHAIN_AFFILIATE_NAME = 'ss';
 exports.THORCHAIN_AFFILIATE_BIPS = '0'; // affiliate fee in basis points (100 = 1%)
-// Used to estimate the fee thorchain will take out of the buyAsset
-// Official docs on fees are incorrect
-// https://discord.com/channels/838986635756044328/997675038675316776/998552541170253834
-// This is still not "perfect" and tends to overestimate by a small randomish amount
-// TODO figure out if its possible to accurately estimate the outbound fee.
-// Neither the discord nor official docs are correct
-exports.THOR_TRADE_FEE_MULTIPLIERS = {
-    [types_1.KnownChainIds.BitcoinMainnet]: (0, bignumber_1.bn)(0.00002),
-    [types_1.KnownChainIds.DogecoinMainnet]: (0, bignumber_1.bn)(0.00002),
-    [types_1.KnownChainIds.LitecoinMainnet]: (0, bignumber_1.bn)(0.000005),
-    [types_1.KnownChainIds.BitcoinCashMainnet]: (0, bignumber_1.bn)(0.00003),
-    [types_1.KnownChainIds.CosmosMainnet]: (0, bignumber_1.bn)(0.00000002),
-    [types_1.KnownChainIds.EthereumMainnet]: (0, bignumber_1.bn)(0.00024), // A value that "works". Discord recommended value (80,000 gas * 2 or 160k) is often too low
-};

package/dist/swappers/thorchain/utils/cosmos/{cosmosTxData.d.ts → getCosmosTxData.d.ts}

@@ -4,8 +4,8 @@ import { ChainAdapter } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { BIP44Params, KnownChainIds } from '@shapeshiftoss/types';
 import { TradeQuote } from '../../../../api';
-import { ThorchainSwapperDeps } from '../../types';
-export declare const cosmosTxData: (input: {
+import type { ThorchainSwapperDeps } from '../../types';
+declare type GetCosmosTxDataInput = {
     bip44Params: BIP44Params;
     destinationAddress: string;
     deps: ThorchainSwapperDeps;
@@ -17,4 +17,6 @@ export declare const cosmosTxData: (input: {
     quote: TradeQuote<KnownChainIds.CosmosMainnet>;
     chainId: ChainId;
     sellAdapter: ChainAdapter<KnownChainIds.CosmosMainnet>;
-}) => Promise<import("@shapeshiftoss/hdwallet-core").CosmosSignTx>;
+};
+export declare const getCosmosTxData: (input: GetCosmosTxDataInput) => Promise<import("@shapeshiftoss/hdwallet-core").CosmosSignTx>;
+export {};

package/dist/swappers/thorchain/utils/cosmos/getCosmosTxData.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCosmosTxData = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
+const api_1 = require("../../../../api");
+const getInboundAddressDataForChain_1 = require("../getInboundAddressDataForChain");
+const getLimit_1 = require("../getLimit/getLimit");
+const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
+const getCosmosTxData = async (input) => {
+    const { bip44Params, deps, destinationAddress, sellAmountCryptoPrecision, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
+    const fromThorAsset = sellAsset.chainId == types_1.KnownChainIds.ThorchainMainnet;
+    const gaiaAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, caip_1.cosmosAssetId);
+    const vault = gaiaAddressData === null || gaiaAddressData === void 0 ? void 0 : gaiaAddressData.address;
+    if (!vault && !fromThorAsset)
+        throw new api_1.SwapError('[buildTrade]: no vault for chain', {
+            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+            fn: 'buildTrade',
+            details: { chainId: input.chainId },
+        });
+    const limit = await (0, getLimit_1.getLimit)({
+        buyAssetId: buyAsset.assetId,
+        sellAmountCryptoPrecision,
+        sellAsset,
+        slippageTolerance,
+        deps,
+        buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
+    });
+    const memo = (0, makeSwapMemo_1.makeSwapMemo)({
+        buyAssetId: buyAsset.assetId,
+        destinationAddress,
+        limit,
+    });
+    const builtTxResponse = await (async () => {
+        switch (true) {
+            case fromThorAsset:
+                return await sellAdapter.buildDepositTransaction({
+                    bip44Params,
+                    value: sellAmountCryptoPrecision,
+                    wallet,
+                    memo,
+                    chainSpecific: {
+                        gas: quote.feeData.chainSpecific.estimatedGas,
+                        fee: quote.feeData.networkFee,
+                    },
+                });
+            default:
+                if (!vault)
+                    throw new api_1.SwapError('[buildTrade]: no vault for chain', {
+                        code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+                        fn: 'buildTrade',
+                        details: { chainId: input.chainId },
+                    });
+                return await sellAdapter.buildSendTransaction({
+                    bip44Params,
+                    value: sellAmountCryptoPrecision,
+                    wallet,
+                    to: vault,
+                    memo,
+                    chainSpecific: {
+                        gas: quote.feeData.chainSpecific
+                            .estimatedGas,
+                        fee: quote.feeData.networkFee,
+                    },
+                });
+        }
+    })();
+    return builtTxResponse.txToSign;
+};
+exports.getCosmosTxData = getCosmosTxData;

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.d.ts

@@ -2,8 +2,8 @@ import { Asset } from '@shapeshiftoss/asset-service';
 import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { BIP44Params } from '@shapeshiftoss/types';
-import { ThorchainSwapperDeps } from '../../types';
-export declare const makeTradeTx: ({ wallet, bip44Params, sellAmountCryptoPrecision, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }: {
+import type { ThorchainSwapperDeps } from '../../types';
+declare type MakeTradeTxArgs = {
     wallet: HDWallet;
     bip44Params: BIP44Params;
     sellAmountCryptoPrecision: string;
@@ -17,12 +17,14 @@ export declare const makeTradeTx: ({ wallet, bip44Params, sellAmountCryptoPrecis
     buyAssetTradeFeeUsd: string;
 } & ({
     gasPrice: string;
-    maxFeePerGas?: undefined;
-    maxPriorityFeePerGas?: undefined;
+    maxFeePerGas?: never;
+    maxPriorityFeePerGas?: never;
 } | {
-    gasPrice?: undefined;
+    gasPrice?: never;
     maxFeePerGas: string;
     maxPriorityFeePerGas: string;
-})) => Promise<{
+});
+export declare const makeTradeTx: ({ wallet, bip44Params, sellAmountCryptoPrecision, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }: MakeTradeTxArgs) => Promise<{
     txToSign: ETHSignTx;
 }>;
+export {};

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.js

@@ -4,7 +4,7 @@ exports.makeTradeTx = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../../api");
-const getThorTxData_1 = require("../ethereum/utils/getThorTxData");
+const getThorTxData_1 = require("./utils/getThorTxData");
 const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoPrecision, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }) => {
     try {
         const { assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -23,14 +23,7 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoPrecision, buy
             bip44Params,
             to: router,
             gasLimit,
-            ...(gasPrice !== undefined
-                ? {
-                    gasPrice,
-                }
-                : {
-                    maxFeePerGas,
-                    maxPriorityFeePerGas,
-                }),
+            ...(gasPrice !== undefined ? { gasPrice } : { maxFeePerGas, maxPriorityFeePerGas }),
             value: isErc20Trade ? '0x0' : (0, web3_utils_1.numberToHex)(sellAmountCryptoPrecision),
             data,
         });

package/dist/swappers/thorchain/utils/ethereum/utils/getThorTxData.d.ts

@@ -1,5 +1,5 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import { ThorchainSwapperDeps } from '../../../types';
+import type { ThorchainSwapperDeps } from '../../../types';
 declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
     sellAsset: Asset;
@@ -11,7 +11,6 @@ declare type GetBtcThorTxInfoArgs = {
 };
 declare type GetBtcThorTxInfoReturn = Promise<{
     data: string;
-    memo: string;
     router: string;
 }>;
 declare type GetBtcThorTxInfo = (args: GetBtcThorTxInfoArgs) => GetBtcThorTxInfoReturn;

package/dist/swappers/thorchain/utils/ethereum/utils/getThorTxData.js

@@ -3,29 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../../api");
+const getInboundAddressDataForChain_1 = require("../../getInboundAddressDataForChain");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
-const thorService_1 = require("../../thorService");
 const routerCalldata_1 = require("../routerCalldata");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecision, slippageTolerance, destinationAddress, buyAssetTradeFeeUsd, }) => {
     try {
         const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
-        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
-        const ethInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'ETH');
-        const vault = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.address;
-        const router = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.router;
-        if (!vault || !router)
-            throw new api_1.SwapError(`[getPriceRatio]: router or vault found for ETH`, {
+        const inboundAddress = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, caip_1.ethAssetId);
+        const router = inboundAddress === null || inboundAddress === void 0 ? void 0 : inboundAddress.router;
+        const vault = inboundAddress === null || inboundAddress === void 0 ? void 0 : inboundAddress.address;
+        if (!inboundAddress || !router || !vault)
+            throw new api_1.SwapError(`[getPriceRatio]: inboundAddress not found for ETH`, {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
-                details: { inboundAddresses },
+                details: { inboundAddress },
             });
         const limit = await (0, getLimit_1.getLimit)({
             buyAssetId: buyAsset.assetId,
-            destinationAddress,
             sellAmountCryptoPrecision,
             sellAsset,
-            buyAsset,
             slippageTolerance,
             deps,
             buyAssetTradeFeeUsd,
@@ -36,11 +33,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecis
             limit,
         });
         const data = await (0, routerCalldata_1.deposit)(router, vault, isErc20Trade ? assetReference : '0x0000000000000000000000000000000000000000', sellAmountCryptoPrecision, memo);
-        return {
-            data,
-            memo,
-            router,
-        };
+        return { data, router };
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

package/dist/swappers/thorchain/utils/getInboundAddressDataForChain.d.ts

@@ -0,0 +1,3 @@
+import { AssetId } from '@shapeshiftoss/caip';
+import type { InboundAddressResponse } from '../types';
+export declare const getInboundAddressDataForChain: (daemonUrl: string, assetId: AssetId | undefined) => Promise<InboundAddressResponse | undefined>;

package/dist/swappers/thorchain/utils/getInboundAddressDataForChain.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInboundAddressDataForChain = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const thorService_1 = require("./thorService");
+const getInboundAddressDataForChain = async (daemonUrl, assetId) => {
+    if (!assetId)
+        return undefined;
+    const assetPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId });
+    const assetChainSymbol = assetPoolId === null || assetPoolId === void 0 ? void 0 : assetPoolId.slice(0, assetPoolId.indexOf('.'));
+    const { data: inboundAddresses } = await thorService_1.thorService.get(`${daemonUrl}/lcd/thorchain/inbound_addresses`);
+    const activeInboundAddresses = inboundAddresses.filter((a) => !a.halted);
+    return activeInboundAddresses.find((inbound) => inbound.chain === assetChainSymbol);
+};
+exports.getInboundAddressDataForChain = getInboundAddressDataForChain;

package/dist/swappers/thorchain/utils/getLimit/getLimit.d.ts

@@ -1,12 +1,11 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { ThorchainSwapperDeps } from '../../types';
-export declare const getLimit: ({ sellAsset, buyAsset, sellAmountCryptoPrecision, deps, slippageTolerance, buyAssetTradeFeeUsd, }: {
+export declare type GetLimitArgs = {
     buyAssetId: string;
-    destinationAddress: string;
     sellAsset: Asset;
-    buyAsset: Asset;
     sellAmountCryptoPrecision: string;
     deps: ThorchainSwapperDeps;
     slippageTolerance: string;
     buyAssetTradeFeeUsd: string;
-}) => Promise<string>;
+};
+export declare const getLimit: ({ sellAsset, buyAssetId, sellAmountCryptoPrecision, deps, slippageTolerance, buyAssetTradeFeeUsd, }: GetLimitArgs) => Promise<string>;

package/dist/swappers/thorchain/utils/getLimit/getLimit.js

@@ -1,25 +1,67 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLimit = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const max_1 = __importDefault(require("lodash/max"));
 const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
-const constants_1 = require("../constants");
+const constants_1 = require("../../constants");
+const constants_2 = require("../constants");
+const getInboundAddressDataForChain_1 = require("../getInboundAddressDataForChain");
 const getTradeRate_1 = require("../getTradeRate/getTradeRate");
 const getUsdRate_1 = require("../getUsdRate/getUsdRate");
-const getLimit = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision, deps, slippageTolerance, buyAssetTradeFeeUsd, }) => {
-    const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmountCryptoPrecision, deps);
-    const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: buyAsset.assetId } });
-    const expectedBuyAmountCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).times(tradeRate), sellAsset.precision), constants_1.THORCHAIN_FIXED_PRECISION);
+const isRune_1 = require("../isRune/isRune");
+const getLimit = async ({ sellAsset, buyAssetId, sellAmountCryptoPrecision, deps, slippageTolerance, buyAssetTradeFeeUsd, }) => {
+    var _a, _b;
+    const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAssetId, sellAmountCryptoPrecision, deps);
+    const sellAssetChainFeeAssetId = (_a = deps.adapterManager.get(sellAsset.chainId)) === null || _a === void 0 ? void 0 : _a.getFeeAssetId();
+    const buyAssetChainFeeAssetId = (_b = deps.adapterManager
+        .get((0, caip_1.fromAssetId)(buyAssetId).chainId)) === null || _b === void 0 ? void 0 : _b.getFeeAssetId();
+    if (!sellAssetChainFeeAssetId || !buyAssetChainFeeAssetId) {
+        throw new api_1.SwapError('[getLimit]: no sellAssetChainFeeAsset or buyAssetChainFeeAssetId', {
+            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+            details: { sellAssetChainFeeAssetId, buyAssetChainFeeAssetId },
+        });
+    }
+    const sellFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({
+        deps,
+        input: { assetId: sellAssetChainFeeAssetId },
+    });
+    const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: buyAssetId } });
+    const expectedBuyAmountCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).times(tradeRate), sellAsset.precision), constants_2.THORCHAIN_FIXED_PRECISION);
     const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
     if ((0, bignumber_1.bnOrZero)(expectedBuyAmountCryptoPrecision8).lt(0) || !isValidSlippageRange)
-        throw new api_1.SwapError('[getThorTxInfo]: bad expected buy amount or bad slippage tolerance', {
+        throw new api_1.SwapError('[getLimit]: bad expected buy amount or bad slippage tolerance', {
             code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
             details: { expectedBuyAmountCryptoPrecision8, slippageTolerance },
         });
-    const tradeFeeCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(buyAssetTradeFeeUsd).div(buyAssetUsdRate), constants_1.THORCHAIN_FIXED_PRECISION);
+    const buyAssetTradeFeeCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(buyAssetTradeFeeUsd).div(buyAssetUsdRate), constants_2.THORCHAIN_FIXED_PRECISION);
+    const sellAssetAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, sellAsset.assetId);
+    const refundFeeBuyAssetCryptoPrecision8 = (() => {
+        switch (true) {
+            // If the sell asset is on THOR the return fee is fixed at 0.02 RUNE
+            case (0, isRune_1.isRune)(sellAsset.assetId): {
+                const runeFeeUsd = constants_1.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN.times(sellFeeAssetUsdRate);
+                return (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(runeFeeUsd).div(buyAssetUsdRate), constants_2.THORCHAIN_FIXED_PRECISION);
+            }
+            // Else the return fee is the outbound fee of the sell asset's chain
+            default: {
+                const sellAssetTradeFeeCryptoHuman = (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAssetAddressData === null || sellAssetAddressData === void 0 ? void 0 : sellAssetAddressData.outbound_fee), constants_2.THORCHAIN_FIXED_PRECISION);
+                const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(sellAssetTradeFeeCryptoHuman).times(sellFeeAssetUsdRate);
+                return (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(sellAssetTradeFeeUsd).div(buyAssetUsdRate), constants_2.THORCHAIN_FIXED_PRECISION);
+            }
+        }
+    })();
+    const highestPossibleFeeCryptoPrecision8 = (0, max_1.default)([
+        buyAssetTradeFeeCryptoPrecision8,
+        refundFeeBuyAssetCryptoPrecision8,
+    ]);
     return (0, bignumber_1.bnOrZero)(expectedBuyAmountCryptoPrecision8)
         .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
-        .minus((0, bignumber_1.bnOrZero)(tradeFeeCryptoPrecision8))
+        .minus((0, bignumber_1.bnOrZero)(highestPossibleFeeCryptoPrecision8))
         .decimalPlaces(0)
         .toString();
 };

package/dist/swappers/thorchain/utils/test-data/responses.d.ts

@@ -1,8 +1,8 @@
-import { InboundResponse, MidgardPoolResponse, ThornodePoolResponse } from '../../types';
+import { InboundAddressResponse, MidgardPoolResponse, ThornodePoolResponse } from '../../types';
 export declare const btcMidgardPool: MidgardPoolResponse;
 export declare const btcThornodePool: ThornodePoolResponse;
 export declare const ethMidgardPool: MidgardPoolResponse;
 export declare const ethThornodePool: ThornodePoolResponse;
 export declare const foxMidgardPool: MidgardPoolResponse;
 export declare const foxThornodePool: ThornodePoolResponse;
-export declare const mockInboundAdresses: InboundResponse[];
+export declare const mockInboundAddresses: InboundAddressResponse[];

package/dist/swappers/thorchain/utils/test-data/responses.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockInboundAdresses = exports.foxThornodePool = exports.foxMidgardPool = exports.ethThornodePool = exports.ethMidgardPool = exports.btcThornodePool = exports.btcMidgardPool = void 0;
+exports.mockInboundAddresses = exports.foxThornodePool = exports.foxMidgardPool = exports.ethThornodePool = exports.ethMidgardPool = exports.btcThornodePool = exports.btcMidgardPool = void 0;
 exports.btcMidgardPool = {
     asset: 'BTC.BTC',
     assetDepth: '91027798705',
@@ -31,7 +31,7 @@ exports.ethMidgardPool = {
     asset: 'ETH.ETH',
     assetDepth: '915018987646',
     assetPrice: '676.2118757936507',
-    assetPriceUSD: '1963.4172247490626',
+    assetPriceUSD: '1595',
     liquidityUnits: '273709963437801',
     poolAPY: '0.10532151323548256',
     runeDepth: '618746706022909',
@@ -79,13 +79,19 @@ exports.foxThornodePool = {
     synth_supply: '17428372569375',
     synth_units: '552604585625',
 };
-exports.mockInboundAdresses = [
+exports.mockInboundAddresses = [
     {
         chain: 'BCH',
         pub_key: 'thorpub1addwnpepqfyppkehky2hn2gy26y8jqyj9fz0rnvau2r7yueawzvc662w0x9s7n4ypra',
         address: 'qp5a6rn8zmamgmsyspqsl0p6ktk4hrheggdjdvntv0',
         halted: false,
         gas_rate: '3',
+        gas_rate_units: 'satsperbyte',
+        global_trading_paused: false,
+        chain_trading_paused: false,
+        chain_lp_actions_paused: false,
+        outbound_fee: '9000',
+        outbound_tx_size: '1500',
     },
     {
         chain: 'BNB',
@@ -93,6 +99,12 @@ exports.mockInboundAdresses = [
         address: 'bnb1d8wsuecklw6xupyqgy8mcw4ja4dca72z7nvqzw',
         halted: false,
         gas_rate: '11250',
+        gas_rate_units: 'ubnb',
+        global_trading_paused: false,
+        chain_trading_paused: false,
+        chain_lp_actions_paused: false,
+        outbound_fee: '22500',
+        outbound_tx_size: '1',
     },
     {
         chain: 'BTC',
@@ -100,6 +112,12 @@ exports.mockInboundAdresses = [
         address: 'bc1qd8wsuecklw6xupyqgy8mcw4ja4dca72z2dd88d',
         halted: false,
         gas_rate: '18',
+        gas_rate_units: 'satsperbyte',
+        global_trading_paused: false,
+        chain_trading_paused: false,
+        chain_lp_actions_paused: false,
+        outbound_fee: '33000',
+        outbound_tx_size: '1000',
     },
     {
         chain: 'DOGE',
@@ -107,6 +125,12 @@ exports.mockInboundAdresses = [
         address: 'DEnrJfAjC4KMsLsGtoTGSmYaFZLPunWw9q',
         halted: false,
         gas_rate: '550384',
+        gas_rate_units: 'satsperbyte',
+        global_trading_paused: false,
+        chain_trading_paused: false,
+        chain_lp_actions_paused: false,
+        outbound_fee: '1500000000',
+        outbound_tx_size: '1000',
     },
     {
         chain: 'ETH',
@@ -115,6 +139,12 @@ exports.mockInboundAdresses = [
         router: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
         halted: false,
         gas_rate: '280',
+        gas_rate_units: 'gwei',
+        global_trading_paused: false,
+        chain_trading_paused: false,
+        chain_lp_actions_paused: false,
+        outbound_fee: '480000',
+        outbound_tx_size: '80000',
     },
     {
         chain: 'LTC',
@@ -122,12 +152,38 @@ exports.mockInboundAdresses = [
         address: 'ltc1qd8wsuecklw6xupyqgy8mcw4ja4dca72zw3hrla',
         halted: false,
         gas_rate: '60',
+        gas_rate_units: 'satsperbyte',
+        global_trading_paused: false,
+        chain_trading_paused: false,
+        chain_lp_actions_paused: false,
+        outbound_fee: '99750',
+        outbound_tx_size: '250',
     },
     {
-        chain: 'TERRA',
-        pub_key: 'thorpub1addwnpepqfyppkehky2hn2gy26y8jqyj9fz0rnvau2r7yueawzvc662w0x9s7n4ypra',
-        address: 'terra1d8wsuecklw6xupyqgy8mcw4ja4dca72z6nfvpq',
-        halted: true,
-        gas_rate: '182523800',
+        address: 'cosmos1euskj33zyqcysvn252qvwkkurkd72gvnv30h4d',
+        chain: 'GAIA',
+        chain_lp_actions_paused: false,
+        chain_trading_paused: false,
+        gas_rate: '450000',
+        gas_rate_units: 'uatom',
+        global_trading_paused: false,
+        halted: false,
+        outbound_fee: '900000',
+        outbound_tx_size: '1',
+        pub_key: 'sthorpub1addwnpepqdn3p3y3ctnr4sqdr0wswmn665asezx3c5yxags7y5ctxs5j42q278pj7fc',
+    },
+    {
+        address: '0x8d6ed3bcdafc38214af914b08bc47ce36802c87c',
+        chain: 'AVAX',
+        chain_lp_actions_paused: false,
+        chain_trading_paused: false,
+        gas_rate: '150',
+        gas_rate_units: 'nAVAX',
+        global_trading_paused: false,
+        halted: false,
+        outbound_fee: '2400000',
+        outbound_tx_size: '80000',
+        pub_key: 'sthorpub1addwnpepqdn3p3y3ctnr4sqdr0wswmn665asezx3c5yxags7y5ctxs5j42q278pj7fc',
+        router: '0xd6a6c0b3bb4150a98a379811934e440989209db6',
     },
 ];

package/dist/swappers/thorchain/utils/test-data/setupThorswapDeps.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupThorswapDeps = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
+const types_1 = require("@shapeshiftoss/types");
 const web3_1 = __importDefault(require("web3"));
 jest.mock('web3');
 const setupThorswapDeps = () => {
@@ -18,7 +19,7 @@ const setupThorswapDeps = () => {
     };
     const adapterManager = new Map([
         [
-            'eip155:1',
+            types_1.KnownChainIds.EthereumMainnet,
             {
                 buildBIP44Params: jest.fn(() => ({ purpose: 44, coinType: 60, accountNumber: 0 })),
                 getAddress: jest.fn(() => Promise.resolve('0xthisIsMyAddress')),

package/dist/swappers/utils/test-data/assets.d.ts

@@ -7,3 +7,4 @@ export declare const ETH: Asset;
 export declare const UNSUPPORTED: Asset;
 export declare const USDC: Asset;
 export declare const AVAX: Asset;
+export declare const RUNE: Asset;

package/dist/swappers/utils/test-data/assets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AVAX = exports.USDC = exports.UNSUPPORTED = exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
+exports.RUNE = exports.AVAX = exports.USDC = exports.UNSUPPORTED = exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 exports.BTC = {
     assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
@@ -27,7 +27,7 @@ exports.WETH = {
     symbol: 'WETH',
 };
 exports.FOX = {
-    assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
+    assetId: caip_1.foxAssetId,
     chainId: caip_1.ethChainId,
     name: 'FOX',
     precision: 18,
@@ -98,3 +98,15 @@ exports.AVAX = {
     explorerAddressLink: 'https://snowtrace.io/address/',
     explorerTxLink: 'https://snowtrace.io/tx/',
 };
+exports.RUNE = {
+    assetId: caip_1.thorchainAssetId,
+    chainId: caip_1.thorchainChainId,
+    name: 'THORChain',
+    symbol: 'RUNE',
+    precision: 8,
+    color: '#33FF99',
+    icon: 'https://assets.coincap.io/assets/icons/rune@2x.png',
+    explorer: 'https://v2.viewblock.io/thorchain',
+    explorerAddressLink: 'https://v2.viewblock.io/thorchain/address/',
+    explorerTxLink: 'https://v2.viewblock.io/thorchain/tx/',
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "14.0.0",
+  "version": "14.2.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",

package/dist/swappers/thorchain/utils/cosmos/cosmosTxData.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cosmosTxData = void 0;
-const types_1 = require("@shapeshiftoss/types");
-const api_1 = require("../../../../api");
-const getLimit_1 = require("../getLimit/getLimit");
-const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
-const thorService_1 = require("../thorService");
-const cosmosTxData = async (input) => {
-    const { bip44Params, deps, destinationAddress, sellAmountCryptoPrecision, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
-    const fromThorAsset = sellAsset.chainId == types_1.KnownChainIds.ThorchainMainnet;
-    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
-    const atomInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'GAIA');
-    const vault = atomInboundAddresses === null || atomInboundAddresses === void 0 ? void 0 : atomInboundAddresses.address;
-    if (!vault && !fromThorAsset)
-        throw new api_1.SwapError('[buildTrade]: no vault for chain', {
-            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
-            fn: 'buildTrade',
-            details: { chainId: input.chainId },
-        });
-    const limit = await (0, getLimit_1.getLimit)({
-        buyAssetId: buyAsset.assetId,
-        destinationAddress,
-        sellAmountCryptoPrecision,
-        sellAsset,
-        buyAsset,
-        slippageTolerance,
-        deps,
-        buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
-    });
-    const memo = (0, makeSwapMemo_1.makeSwapMemo)({
-        buyAssetId: buyAsset.assetId,
-        destinationAddress,
-        limit,
-    });
-    if (fromThorAsset) {
-        const buildTxResponse = await sellAdapter.buildDepositTransaction({
-            bip44Params,
-            value: sellAmountCryptoPrecision,
-            wallet,
-            memo,
-            gas: quote.feeData.chainSpecific.estimatedGas,
-            fee: quote.feeData.networkFee,
-        });
-        return buildTxResponse.txToSign;
-    }
-    if (!vault)
-        throw new api_1.SwapError('[buildTrade]: no vault for chain', {
-            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
-            fn: 'buildTrade',
-            details: { chainId: input.chainId },
-        });
-    const buildTxResponse = await sellAdapter.buildSendTransaction({
-        bip44Params,
-        value: sellAmountCryptoPrecision,
-        wallet,
-        to: vault,
-        memo,
-        chainSpecific: {
-            gas: quote.feeData.chainSpecific.estimatedGas,
-            fee: quote.feeData.networkFee,
-        },
-    });
-    return buildTxResponse.txToSign;
-};
-exports.cosmosTxData = cosmosTxData;

package/dist/swappers/thorchain/utils/estimateBuyAssetTradeFeeCrypto/estimateBuyAssetTradeFeeCrypto.d.ts

@@ -1,3 +0,0 @@
-import { Asset } from '@shapeshiftoss/asset-service';
-import { ThorchainSwapperDeps } from '../../types';
-export declare const estimateBuyAssetTradeFeeCrypto: (deps: ThorchainSwapperDeps, buyAsset: Asset) => Promise<string>;

package/dist/swappers/thorchain/utils/estimateBuyAssetTradeFeeCrypto/estimateBuyAssetTradeFeeCrypto.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.estimateBuyAssetTradeFeeCrypto = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
-const api_1 = require("../../../../api");
-const constants_1 = require("../../constants");
-const constants_2 = require("../constants");
-const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
-const isRune_1 = require("../isRune/isRune");
-const thorService_1 = require("../thorService");
-const estimateBuyAssetTradeFeeCrypto = async (deps, buyAsset) => {
-    if ((0, isRune_1.isRune)(buyAsset.assetId)) {
-        return constants_1.RUNE_OUTBOUND_TRANSACTION_FEE_CRYPTO_HUMAN.toString();
-    }
-    const thorId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAsset.assetId });
-    if (!thorId)
-        throw new api_1.SwapError('[estimateBuyAssetTradeFeeCrypto] - undefined thorId for given buyAssetId', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { buyAssetId: buyAsset.assetId },
-        });
-    const thorPoolChainId = thorId.slice(0, thorId.indexOf('.'));
-    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
-    const inboundInfo = inboundAddresses.find((inbound) => inbound.chain === thorPoolChainId);
-    if (!inboundInfo)
-        throw new api_1.SwapError('[estimateBuyAssetTradeFeeCrypto] - unable to locate inbound pool info', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { thorPoolChainId },
-        });
-    const gasRate = inboundInfo.gas_rate;
-    const { chainId: buyChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
-    const buyAdapter = deps.adapterManager.get(buyChainId);
-    if (!buyAdapter)
-        throw new api_1.SwapError('[estimateBuyAssetTradeFeeCrypto] - unable to get buy asset adapter', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { buyChainId },
-        });
-    const buyFeeAssetId = buyAdapter.getFeeAssetId();
-    if (!buyFeeAssetId)
-        throw new api_1.SwapError('[estimateBuyAssetTradeFeeCrypto] - no fee assetId', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { buyAssetId: buyAsset.assetId },
-        });
-    const buyFeeAssetRatio = buyAsset.assetId !== buyFeeAssetId
-        ? await (0, getPriceRatio_1.getPriceRatio)(deps, {
-            sellAssetId: buyAsset.assetId,
-            buyAssetId: buyFeeAssetId,
-        })
-        : '1';
-    if (!constants_2.THOR_TRADE_FEE_MULTIPLIERS[buyChainId])
-        throw new api_1.SwapError('[estimateBuyAssetTradeFeeCrypto] - no trade fee multiplier', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { buyChainId },
-        });
-    return constants_2.THOR_TRADE_FEE_MULTIPLIERS[buyChainId].times(buyFeeAssetRatio).times(gasRate).toString();
-};
-exports.estimateBuyAssetTradeFeeCrypto = estimateBuyAssetTradeFeeCrypto;