@shapeshiftoss/swapper 9.3.2 → 9.6.0

package/dist/api.d.ts

@@ -42,6 +42,9 @@ declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
         byteCount: string;
         satsPerByte: string;
     };
+    [KnownChainIds.CosmosMainnet]: {
+        estimatedGas: string;
+    };
 }>;
 export declare type QuoteFeeData<T extends ChainId> = {
     fee: string;
@@ -165,7 +168,8 @@ export declare enum SwapErrorTypes {
     MAKE_MEMO_FAILED = "MAKE_MEMO_FAILED",
     PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED",
     POOL_NOT_FOUND = "POOL_NOT_FOUND",
-    GET_TRADE_TXS_FAILED = "GET_TRADE_TXS_FAILED"
+    GET_TRADE_TXS_FAILED = "GET_TRADE_TXS_FAILED",
+    TRADE_FAILED = "TRADE_FAILED"
 }
 export interface Swapper<T extends ChainId> {
     /** Human readable swapper name */

package/dist/api.js

@@ -37,4 +37,5 @@ var SwapErrorTypes;
     SwapErrorTypes["PRICE_RATIO_FAILED"] = "PRICE_RATIO_FAILED";
     SwapErrorTypes["POOL_NOT_FOUND"] = "POOL_NOT_FOUND";
     SwapErrorTypes["GET_TRADE_TXS_FAILED"] = "GET_TRADE_TXS_FAILED";
+    SwapErrorTypes["TRADE_FAILED"] = "TRADE_FAILED";
 })(SwapErrorTypes = exports.SwapErrorTypes || (exports.SwapErrorTypes = {}));

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

@@ -5,8 +5,10 @@ import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildT
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {
     readonly name = "Thorchain";
-    private swapSupportedChainIds;
-    private supportedAssetIds;
+    private sellSupportedChainIds;
+    private buySupportedChainIds;
+    private supportedSellAssetIds;
+    private supportedBuyAssetIds;
     deps: ThorchainSwapperDeps;
     constructor(deps: ThorchainSwapperDeps);
     initialize(): Promise<void>;

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -13,24 +13,40 @@ const thorService_1 = require("./utils/thorService");
 class ThorchainSwapper {
     constructor(deps) {
         this.name = 'Thorchain';
-        this.swapSupportedChainIds = {
+        this.sellSupportedChainIds = {
             [types_1.KnownChainIds.EthereumMainnet]: true,
-            [types_1.KnownChainIds.BitcoinMainnet]: true
+            [types_1.KnownChainIds.BitcoinMainnet]: true,
+            [types_1.KnownChainIds.CosmosMainnet]: true
         };
-        this.supportedAssetIds = [];
+        this.buySupportedChainIds = {
+            [types_1.KnownChainIds.EthereumMainnet]: true,
+            [types_1.KnownChainIds.BitcoinMainnet]: true,
+            [types_1.KnownChainIds.DogecoinMainnet]: true,
+            [types_1.KnownChainIds.LitecoinMainnet]: true,
+            [types_1.KnownChainIds.BitcoinCashMainnet]: true,
+            [types_1.KnownChainIds.CosmosMainnet]: true
+        };
+        this.supportedSellAssetIds = [];
+        this.supportedBuyAssetIds = [];
         this.deps = deps;
     }
     async initialize() {
         try {
             const { data: responseData } = await thorService_1.thorService.get(`${this.deps.midgardUrl}/pools`);
-            const supportedAssetIds = responseData.reduce((acc, midgardPool) => {
+            this.supportedSellAssetIds = responseData.reduce((acc, midgardPool) => {
+                const assetId = caip_1.adapters.poolAssetIdToAssetId(midgardPool.asset);
+                if (!assetId || !this.sellSupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
+                    return acc;
+                acc.push(assetId);
+                return acc;
+            }, []);
+            this.supportedBuyAssetIds = responseData.reduce((acc, midgardPool) => {
                 const assetId = caip_1.adapters.poolAssetIdToAssetId(midgardPool.asset);
-                if (!assetId || !this.swapSupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
+                if (!assetId || !this.buySupportedChainIds[(0, caip_1.fromAssetId)(assetId).chainId])
                     return acc;
                 acc.push(assetId);
                 return acc;
             }, []);
-            this.supportedAssetIds = supportedAssetIds;
         }
         catch (e) {
             throw new api_1.SwapError('[thorchainInitialize]: initialize failed to set supportedAssetIds', {
@@ -53,12 +69,12 @@ class ThorchainSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;
-        if (!this.supportedAssetIds.includes(sellAssetId))
+        if (!this.supportedSellAssetIds.includes(sellAssetId))
             return [];
-        return assetIds.filter((assetId) => this.supportedAssetIds.includes(assetId) && assetId !== sellAssetId);
+        return assetIds.filter((assetId) => this.supportedBuyAssetIds.includes(assetId) && assetId !== sellAssetId);
     }
     filterAssetIdsBySellable() {
-        return this.supportedAssetIds;
+        return this.supportedSellAssetIds;
     }
     async buildTrade(input) {
         return (0, buildThorTrade_1.buildTrade)({ deps: this.deps, input });
@@ -92,6 +108,14 @@ class ThorchainSwapper {
                 const txid = await adapter.broadcastTransaction(signedTx);
                 return { tradeId: txid };
             }
+            else if (trade.sellAsset.chainId === types_1.KnownChainIds.CosmosMainnet) {
+                const signedTx = await adapter.signTransaction({
+                    txToSign: trade.txData,
+                    wallet
+                });
+                const txid = await adapter.broadcastTransaction(signedTx);
+                return { tradeId: txid };
+            }
             else {
                 throw new api_1.SwapError('[executeTrade]: unsupported trade', {
                     code: api_1.SwapErrorTypes.SIGN_AND_BROADCAST_FAILED,
@@ -109,11 +133,35 @@ class ThorchainSwapper {
         }
     }
     async getTradeTxs(tradeResult) {
-        // TODO poll midgard for the correct buyTxid
-        return {
-            sellTxid: tradeResult.tradeId,
-            buyTxid: tradeResult.tradeId
-        };
+        var _a, _b, _c, _d;
+        try {
+            const midgardTxid = tradeResult.tradeId.startsWith('0x')
+                ? tradeResult.tradeId.slice(2)
+                : tradeResult.tradeId;
+            const { data: responseData } = await thorService_1.thorService.get(`${this.deps.midgardUrl}/actions?txid=${midgardTxid}`);
+            const buyTxid = ((_a = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _a === void 0 ? void 0 : _a.status) === 'success' && ((_b = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _b === void 0 ? void 0 : _b.type) === 'swap'
+                ? responseData === null || responseData === void 0 ? void 0 : responseData.actions[0].out[0].txID
+                : '';
+            // This will detect all the errors I have seen.
+            if (((_c = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _c === void 0 ? void 0 : _c.status) === 'success' &&
+                ((_d = responseData === null || responseData === void 0 ? void 0 : responseData.actions[0]) === null || _d === void 0 ? void 0 : _d.type) !== 'swap')
+                throw new api_1.SwapError('[getTradeTxs]: trade failed', {
+                    code: api_1.SwapErrorTypes.TRADE_FAILED,
+                    cause: responseData
+                });
+            return {
+                sellTxid: tradeResult.tradeId,
+                buyTxid: buyTxid.toLowerCase()
+            };
+        }
+        catch (e) {
+            if (e instanceof api_1.SwapError)
+                throw e;
+            throw new api_1.SwapError('[getTradeTxs]: error', {
+                code: api_1.SwapErrorTypes.GET_TRADE_TXS_FAILED,
+                cause: e
+            });
+        }
     }
 }
 exports.ThorchainSwapper = ThorchainSwapper;

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

@@ -6,6 +6,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 makeTradeTx_1 = require("../utils/ethereum/makeTradeTx");
 const buildTrade = async ({ deps, input }) => {
     var _a, _b, _c, _d;
@@ -75,6 +76,26 @@ const buildTrade = async ({ deps, input }) => {
                 txData: buildTxResponse.txToSign
             };
         }
+        else if (input.chainId === types_1.KnownChainIds.CosmosMainnet) {
+            const txData = await (0, cosmosTxData_1.cosmosTxData)({
+                deps,
+                sellAdapter: sellAdapter,
+                sellAmount,
+                sellAsset,
+                slippageTolerance,
+                chainId: input.chainId,
+                buyAsset,
+                wallet,
+                destinationAddress,
+                quote: quote
+            });
+            return {
+                chainId: types_1.KnownChainIds.CosmosMainnet,
+                ...quote,
+                receiveAddress: destinationAddress,
+                txData
+            };
+        }
         else {
             throw new api_1.SwapError('[buildTrade]: unsupported chain id', {
                 code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,

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

@@ -21,8 +21,8 @@ const getThorTradeQuote = async ({ deps, input }) => {
         });
     try {
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        const adapter = deps.adapterManager.get(chainId);
-        if (!adapter)
+        const sellAdapter = deps.adapterManager.get(chainId);
+        if (!sellAdapter)
             throw new api_1.SwapError(`[getThorTradeQuote] - No chain adapter found for ${chainId}.`, {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
                 details: { chainId }
@@ -97,6 +97,19 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         feeData
                     };
                 })();
+            case types_1.KnownChainIds.CosmosMainnet:
+                return (async () => {
+                    const feeData = await sellAdapter.getFeeData({});
+                    return {
+                        ...commonQuoteFields,
+                        allowanceContract: '0x0',
+                        feeData: {
+                            fee: feeData.fast.txFee,
+                            tradeFee,
+                            chainSpecific: { estimatedGas: feeData.fast.chainSpecific.gasLimit }
+                        }
+                    };
+                })();
             default:
                 throw new api_1.SwapError('[getThorTradeQuote] - Asset chainId is not supported.', {
                     code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,

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

@@ -1,6 +1,6 @@
 import { ChainId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { BTCSignTx, ETHSignTx } from '@shapeshiftoss/hdwallet-core';
+import { BTCSignTx, CosmosSignTx, ETHSignTx } from '@shapeshiftoss/hdwallet-core';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import type Web3 from 'web3';
 import { Trade } from '../../api';
@@ -18,6 +18,19 @@ export declare type PoolResponse = {
     units: string;
     volume24h: string;
 };
+declare type MidgardActionOut = {
+    txID: string;
+};
+declare type MidgardAction = {
+    date: string;
+    height: string;
+    out: MidgardActionOut[];
+    status: string;
+    type: string;
+};
+export declare type MidgardActionsResponse = {
+    actions: MidgardAction[];
+};
 export declare type InboundResponse = {
     chain: string;
     pub_key: string;
@@ -39,4 +52,9 @@ export interface EthThorTrade<C extends ChainId> extends Trade<C> {
     chainId: KnownChainIds.EthereumMainnet;
     txData: ETHSignTx;
 }
-export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C>;
+export interface CosmosThorTrade<C extends ChainId> extends Trade<C> {
+    chainId: KnownChainIds.CosmosMainnet;
+    txData: CosmosSignTx;
+}
+export declare type ThorTrade<C extends ChainId> = BtcThorTrade<C> | EthThorTrade<C> | CosmosThorTrade<C>;
+export {};

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../../api");
-const bignumber_1 = require("../../../../utils/bignumber");
-const constants_1 = require("../../constants");
-const getTradeRate_1 = require("../../getTradeRate/getTradeRate");
+const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
 const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType, tradeFee }) => {
@@ -18,20 +16,16 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { inboundAddresses }
             });
-        const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
-        const expectedBuyAmountPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).times(tradeRate), sellAsset.precision), constants_1.THORCHAIN_FIXED_PRECISION);
-        const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
-        if ((0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8).lt(0) || !isValidSlippageRange)
-            throw new api_1.SwapError('[getThorTxInfo]: bad expected buy amount or bad slippage tolerance', {
-                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
-                details: { expectedBuyAmountPrecision8, slippageTolerance }
-            });
-        const tradeFeePrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(tradeFee), constants_1.THORCHAIN_FIXED_PRECISION);
-        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8)
-            .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
-            .minus((0, bignumber_1.bnOrZero)(tradeFeePrecision8))
-            .decimalPlaces(0)
-            .toString();
+        const limit = await (0, getLimit_1.getLimit)({
+            buyAssetId: buyAsset.assetId,
+            destinationAddress,
+            sellAmount,
+            sellAsset,
+            buyAsset,
+            slippageTolerance,
+            deps,
+            tradeFee
+        });
         const memo = (0, makeSwapMemo_1.makeSwapMemo)({
             buyAssetId: buyAsset.assetId,
             destinationAddress,

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

@@ -1,3 +1,5 @@
+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;
@@ -5,5 +7,4 @@ 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_BTC_SIZE = 1000;
-export declare const THOR_TRADE_FEE_ETH_GAS = 120000;
+export declare const THOR_TRADE_FEE_MULTIPLIERS: Record<ChainId, BigNumber>;

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THOR_TRADE_FEE_ETH_GAS = exports.THOR_TRADE_FEE_BTC_SIZE = 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.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.MAX_THORCHAIN_TRADE = '100000000000000000000000000';
 exports.MAX_ALLOWANCE = '100000000000000000000000000';
 exports.THOR_MINIMUM_PADDING = 1.2;
@@ -8,7 +10,17 @@ 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%)
-// These are different from THOR_ETH_GAS_LIMIT
 // Used to estimate the fee thorchain will take out of the buyAsset
-exports.THOR_TRADE_FEE_BTC_SIZE = 1000; // used for estimating thorchain side fees
-exports.THOR_TRADE_FEE_ETH_GAS = 120000; // used for estimating thorchain side fees
+// 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

@@ -0,0 +1,19 @@
+import { Asset } from '@shapeshiftoss/asset-service';
+import { ChainId } from '@shapeshiftoss/caip';
+import { ChainAdapter } from '@shapeshiftoss/chain-adapters';
+import { HDWallet } from '@shapeshiftoss/hdwallet-core';
+import { KnownChainIds } from '@shapeshiftoss/types';
+import { TradeQuote } from '../../../../api';
+import { ThorchainSwapperDeps } from '../../types';
+export declare const cosmosTxData: (input: {
+    destinationAddress: string;
+    deps: ThorchainSwapperDeps;
+    sellAmount: string;
+    sellAsset: Asset;
+    buyAsset: Asset;
+    slippageTolerance: string;
+    wallet: HDWallet;
+    quote: TradeQuote<KnownChainIds.CosmosMainnet>;
+    chainId: ChainId;
+    sellAdapter: ChainAdapter<KnownChainIds.CosmosMainnet>;
+}) => Promise<import("@shapeshiftoss/hdwallet-core").CosmosSignTx>;

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cosmosTxData = void 0;
+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 { deps, destinationAddress, sellAmount, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter } = input;
+    const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+    const atomInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'GAIA');
+    const vault = atomInboundAddresses === null || atomInboundAddresses === void 0 ? void 0 : atomInboundAddresses.address;
+    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 limit = await (0, getLimit_1.getLimit)({
+        buyAssetId: buyAsset.assetId,
+        destinationAddress,
+        sellAmount,
+        sellAsset,
+        buyAsset,
+        slippageTolerance,
+        deps,
+        tradeFee: quote.feeData.tradeFee
+    });
+    const memo = (0, makeSwapMemo_1.makeSwapMemo)({
+        buyAssetId: buyAsset.assetId,
+        destinationAddress,
+        limit
+    });
+    const buildTxResponse = await sellAdapter.buildSendTransaction({
+        value: sellAmount,
+        wallet,
+        to: vault,
+        memo,
+        chainSpecific: {
+            gas: quote.feeData.chainSpecific.estimatedGas,
+            fee: quote.feeData.fee
+        }
+    });
+    return buildTxResponse.txToSign;
+};
+exports.cosmosTxData = cosmosTxData;

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

@@ -1,30 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimateTradeFee = void 0;
-const asset_service_1 = require("@shapeshiftoss/asset-service");
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../../../utils/bignumber");
 const constants_1 = require("../constants");
 const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
 const thorService_1 = require("../thorService");
-const gweiGasPrecision = 9;
-// Official docs on fees are incorrect
-// https://discord.com/channels/838986635756044328/997675038675316776/998552541170253834
-// This is still not "perfect" and tends to overestimate by a randomish amount
-// TODO figure out if its possible to accurately estimate the outbound fee.
-// Neither the discord nor official docs are correct
-const ethEstimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate)
-    .times(constants_1.THOR_TRADE_FEE_ETH_GAS)
-    .times(2)
-    .times((0, bignumber_1.bn)(10).exponentiatedBy(gweiGasPrecision))
-    .toString();
-const erc20Estimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate)
-    .times(constants_1.THOR_TRADE_FEE_ETH_GAS)
-    .times(2)
-    .times((0, bignumber_1.bn)(10).exponentiatedBy(gweiGasPrecision))
-    .toString();
-const btcEstimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate).times(constants_1.THOR_TRADE_FEE_BTC_SIZE).times(2).toString();
 const estimateTradeFee = async (deps, buyAsset) => {
     const thorId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAsset.assetId });
     if (!thorId)
@@ -41,7 +22,7 @@ const estimateTradeFee = async (deps, buyAsset) => {
             details: { thorPoolChainId }
         });
     const gasRate = inboundInfo.gas_rate;
-    const { chainId: buyChainId, assetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+    const { chainId: buyChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
     const buyAdapter = deps.adapterManager.get(buyChainId);
     if (!buyAdapter)
         throw new api_1.SwapError('[estimateTradeFee] - unable to get buy asset adapter', {
@@ -54,33 +35,17 @@ const estimateTradeFee = async (deps, buyAsset) => {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED,
             details: { buyAssetId: buyAsset.assetId }
         });
-    const feeAssetRatio = buyAsset.assetId !== buyFeeAssetId
+    const buyFeeAssetRatio = buyAsset.assetId !== buyFeeAssetId
         ? await (0, getPriceRatio_1.getPriceRatio)(deps, {
             sellAssetId: buyAsset.assetId,
             buyAssetId: buyFeeAssetId
         })
         : '1';
-    const buyFeeAsset = new asset_service_1.AssetService().getAll()[buyFeeAssetId];
-    switch (buyChainId) {
-        case 'bip122:000000000019d6689c085ae165831e93':
-            return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(btcEstimate(gasRate)).times(feeAssetRatio).dp(0), buyFeeAsset.precision);
-        case 'eip155:1':
-            switch (assetNamespace) {
-                case 'slip44':
-                    return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(ethEstimate(gasRate)).times(feeAssetRatio).dp(0), buyFeeAsset.precision);
-                case 'erc20':
-                    return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(erc20Estimate(gasRate)).times(feeAssetRatio).dp(0), buyFeeAsset.precision);
-                default:
-                    throw new api_1.SwapError('[estimateTradeFee] - unsupported asset namespace', {
-                        code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-                        details: { assetNamespace }
-                    });
-            }
-        default:
-            throw new api_1.SwapError('[estimateTradeFee] - unsupported chain id', {
-                code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-                details: { chainId: buyChainId }
-            });
-    }
+    if (!constants_1.THOR_TRADE_FEE_MULTIPLIERS[buyChainId])
+        throw new api_1.SwapError('[estimateTradeFee] - no trade fee multiplier', {
+            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
+            details: { buyChainId }
+        });
+    return constants_1.THOR_TRADE_FEE_MULTIPLIERS[buyChainId].times(buyFeeAssetRatio).times(gasRate).toString();
 };
 exports.estimateTradeFee = estimateTradeFee;

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTxInfo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../../api");
-const bignumber_1 = require("../../../../utils/bignumber");
-const getTradeRate_1 = require("../../../utils/getTradeRate/getTradeRate");
-const constants_1 = require("../../constants");
+const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
 const routerCalldata_1 = require("../routerCalldata");
@@ -22,20 +20,16 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { inboundAddresses }
             });
-        const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
-        const expectedBuyAmountPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).times(tradeRate), sellAsset.precision), constants_1.THORCHAIN_FIXED_PRECISION);
-        const tradeFeePrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(tradeFee), constants_1.THORCHAIN_FIXED_PRECISION);
-        const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
-        if ((0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8).lt(0) || !isValidSlippageRange)
-            throw new api_1.SwapError('[makeTradeTx]: bad expected buy amount or bad slippage tolerance', {
-                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
-                details: { expectedBuyAmountPrecision8, slippageTolerance }
-            });
-        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8)
-            .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
-            .minus((0, bignumber_1.bnOrZero)(tradeFeePrecision8))
-            .decimalPlaces(0)
-            .toString();
+        const limit = await (0, getLimit_1.getLimit)({
+            buyAssetId: buyAsset.assetId,
+            destinationAddress,
+            sellAmount,
+            sellAsset,
+            buyAsset,
+            slippageTolerance,
+            deps,
+            tradeFee
+        });
         const memo = (0, makeSwapMemo_1.makeSwapMemo)({
             buyAssetId: buyAsset.assetId,
             destinationAddress,

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

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

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLimit = void 0;
+const api_1 = require("../../../../api");
+const bignumber_1 = require("../../../utils/bignumber");
+const constants_1 = require("../constants");
+const getTradeRate_1 = require("../getTradeRate/getTradeRate");
+const getLimit = async ({ sellAsset, buyAsset, sellAmount, deps, slippageTolerance, tradeFee }) => {
+    const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
+    const expectedBuyAmountPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).times(tradeRate), sellAsset.precision), constants_1.THORCHAIN_FIXED_PRECISION);
+    const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
+    if ((0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8).lt(0) || !isValidSlippageRange)
+        throw new api_1.SwapError('[getThorTxInfo]: bad expected buy amount or bad slippage tolerance', {
+            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+            details: { expectedBuyAmountPrecision8, slippageTolerance }
+        });
+    const tradeFeePrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(tradeFee), constants_1.THORCHAIN_FIXED_PRECISION);
+    return (0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8)
+        .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
+        .minus((0, bignumber_1.bnOrZero)(tradeFeePrecision8))
+        .decimalPlaces(0)
+        .toString();
+};
+exports.getLimit = getLimit;

package/package.json

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