@shapeshiftoss/swapper 9.0.1 → 9.2.0

package/dist/api.d.ts

@@ -85,7 +85,6 @@ declare type GetBtcTradeQuoteInput = CommonTradeInput & {
 };
 export declare type GetTradeQuoteInput = GetBtcTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
 export declare type BuildTradeInput = GetTradeQuoteInput & {
-    buyAssetAccountNumber: number;
     slippage?: string;
     wallet: HDWallet;
 };

package/dist/swappercli.js

@@ -137,7 +137,6 @@ const main = async () => {
             sellAmount: sellAmountBase,
             sellAsset,
             sellAssetAccountNumber: 0,
-            buyAssetAccountNumber: 0,
             receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d'
         });
         const txid = await swapper.executeTrade({ trade, wallet });

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

@@ -1,9 +1,5 @@
 import { ChainId } from '@shapeshiftoss/caip';
 import { Trade } from '../../api';
-export declare type CowSwapPriceResponse = {
-    amount: string;
-    token: string;
-};
 export declare type CowSwapQuoteResponse = {
     quote: {
         sellToken: string;

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

@@ -1,6 +1,6 @@
 export declare const MAX_ALLOWANCE = "100000000000000000000000000";
 export declare const MAX_COWSWAP_TRADE = "100000000000000000000000000";
-export declare const MIN_COWSWAP_VALUE_USD = 10;
+export declare const MIN_COWSWAP_VALUE_USD = 20;
 export declare const DEFAULT_SOURCE: {
     name: string;
     proportion: string;
@@ -11,6 +11,7 @@ export declare const COW_SWAP_VAULT_RELAYER_ADDRESS = "0xc92e8bdf79f0507f65a392b
 export declare const COW_SWAP_SETTLEMENT_ADDRESS = "0x9008D19f58AAbD9eD0D60971565AA8510560ab41";
 export declare const WETH_ASSET_ID = "eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
 export declare const ORDER_KIND_SELL = "sell";
+export declare const ORDER_KIND_BUY = "buy";
 export declare const SIGNING_SCHEME = "ethsign";
 export declare const ERC20_TOKEN_BALANCE = "erc20";
 export declare const ORDER_STATUS_FULFILLED = "fulfilled";

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ORDER_STATUS_FULFILLED = exports.ERC20_TOKEN_BALANCE = exports.SIGNING_SCHEME = exports.ORDER_KIND_SELL = exports.WETH_ASSET_ID = exports.COW_SWAP_SETTLEMENT_ADDRESS = exports.COW_SWAP_VAULT_RELAYER_ADDRESS = exports.DEFAULT_APP_DATA = exports.DEFAULT_ADDRESS = exports.DEFAULT_SOURCE = exports.MIN_COWSWAP_VALUE_USD = exports.MAX_COWSWAP_TRADE = exports.MAX_ALLOWANCE = void 0;
+exports.ORDER_STATUS_FULFILLED = exports.ERC20_TOKEN_BALANCE = exports.SIGNING_SCHEME = exports.ORDER_KIND_BUY = exports.ORDER_KIND_SELL = exports.WETH_ASSET_ID = exports.COW_SWAP_SETTLEMENT_ADDRESS = exports.COW_SWAP_VAULT_RELAYER_ADDRESS = exports.DEFAULT_APP_DATA = exports.DEFAULT_ADDRESS = exports.DEFAULT_SOURCE = exports.MIN_COWSWAP_VALUE_USD = exports.MAX_COWSWAP_TRADE = exports.MAX_ALLOWANCE = void 0;
 const constants_1 = require("@ethersproject/constants");
 exports.MAX_ALLOWANCE = '100000000000000000000000000';
 exports.MAX_COWSWAP_TRADE = '100000000000000000000000000';
-exports.MIN_COWSWAP_VALUE_USD = 10;
+exports.MIN_COWSWAP_VALUE_USD = 20;
 exports.DEFAULT_SOURCE = [{ name: 'CowSwap', proportion: '1' }];
 exports.DEFAULT_ADDRESS = constants_1.AddressZero;
 exports.DEFAULT_APP_DATA = constants_1.HashZero;
@@ -12,6 +12,7 @@ exports.COW_SWAP_VAULT_RELAYER_ADDRESS = '0xc92e8bdf79f0507f65a392b0ab4667716bfe
 exports.COW_SWAP_SETTLEMENT_ADDRESS = '0x9008D19f58AAbD9eD0D60971565AA8510560ab41';
 exports.WETH_ASSET_ID = 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
 exports.ORDER_KIND_SELL = 'sell';
+exports.ORDER_KIND_BUY = 'buy';
 exports.SIGNING_SCHEME = 'ethsign';
 exports.ERC20_TOKEN_BALANCE = 'erc20';
 exports.ORDER_STATUS_FULFILLED = 'fulfilled';

package/dist/swappers/cow/utils/helpers/helpers.d.ts

@@ -23,19 +23,24 @@ export declare type CowSwapOrder = {
     sellTokenBalance: string;
     buyTokenBalance: string;
 };
-export declare type CowSwapQuoteApiInput = {
+export declare type CowSwapQuoteApiInputBase = {
     appData: string;
     buyToken: string;
     from: string;
     kind: string;
     partiallyFillable: boolean;
     receiver: string;
-    sellAmountBeforeFee: string;
     sellToken: string;
     validTo: number;
 };
-export declare const getUsdRate: ({ apiUrl }: CowSwapperDeps, input: Asset) => Promise<string>;
+export declare type CowSwapSellQuoteApiInput = CowSwapQuoteApiInputBase & {
+    sellAmountBeforeFee: string;
+};
+export declare type CowSwapBuyQuoteApiInput = CowSwapQuoteApiInputBase & {
+    buyAmountAfterFee: string;
+};
 export declare const getNowPlusThirtyMinutesTimestamp: () => number;
+export declare const getUsdRate: ({ apiUrl }: CowSwapperDeps, input: Asset) => Promise<string>;
 export declare const hashTypedData: (domain: TypedDataDomain, types: TypedDataTypes, data: Record<string, unknown>) => string;
 /**
  * Compute the 32-byte signing hash for the specified order.

package/dist/swappers/cow/utils/helpers/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.domain = exports.hashOrder = exports.hashTypedData = exports.getNowPlusThirtyMinutesTimestamp = exports.getUsdRate = exports.ORDER_TYPE_FIELDS = void 0;
+exports.domain = exports.hashOrder = exports.hashTypedData = exports.getUsdRate = exports.getNowPlusThirtyMinutesTimestamp = exports.ORDER_TYPE_FIELDS = void 0;
 const asset_service_1 = require("@shapeshiftoss/asset-service");
 const caip_1 = require("@shapeshiftoss/caip");
 const ethers_1 = require("ethers");
@@ -24,6 +24,12 @@ exports.ORDER_TYPE_FIELDS = [
     { name: 'sellTokenBalance', type: 'string' },
     { name: 'buyTokenBalance', type: 'string' }
 ];
+const getNowPlusThirtyMinutesTimestamp = () => {
+    const ts = new Date();
+    ts.setMinutes(ts.getMinutes() + 30);
+    return Math.round(ts.getTime() / 1000);
+};
+exports.getNowPlusThirtyMinutesTimestamp = getNowPlusThirtyMinutesTimestamp;
 const getUsdRate = async ({ apiUrl }, input) => {
     // Replacing ETH by WETH specifically for CowSwap in order to get an usd rate when called with ETH as feeAsset
     const asset = input.assetId !== caip_1.ethAssetId ? input : new asset_service_1.AssetService().getAll()[constants_1.WETH_ASSET_ID];
@@ -37,20 +43,46 @@ const getUsdRate = async ({ apiUrl }, input) => {
     if (erc20Address === USDC_CONTRACT_ADDRESS) {
         return '1';
     }
+    // rate is imprecise for low $ values, hence asking for $1000
     const buyAmountInDollars = 1000;
-    const buyAmount = (0, bignumber_1.bn)(buyAmountInDollars).times((0, bignumber_1.bn)(10).exponentiatedBy(USDC_ASSET_PRECISION));
+    const buyAmount = (0, bignumber_1.bn)(buyAmountInDollars)
+        .times((0, bignumber_1.bn)(10).exponentiatedBy(USDC_ASSET_PRECISION))
+        .toString();
     try {
-        // rate is imprecise for low $ values, hence asking for $1000
-        // cowSwap api used : markets/{baseToken}-{quoteToken}/{kind}/{amount}
-        // It returns the estimated amount in quoteToken for either buying or selling amount of baseToken.
-        const rateResponse = await cowService_1.cowService.get(`${apiUrl}/v1/markets/${USDC_CONTRACT_ADDRESS}-${erc20Address}/buy/${buyAmount}`);
-        const tokenAmount = (0, bignumber_1.bnOrZero)(rateResponse.data.amount).div((0, bignumber_1.bn)(10).exponentiatedBy(asset.precision));
-        if (!tokenAmount.gt(0))
-            throw new api_1.SwapError('[getUsdRate] - Failed to get token amount', {
+        const apiInput = {
+            sellToken: erc20Address,
+            buyToken: USDC_CONTRACT_ADDRESS,
+            receiver: constants_1.DEFAULT_ADDRESS,
+            validTo: (0, exports.getNowPlusThirtyMinutesTimestamp)(),
+            appData: constants_1.DEFAULT_APP_DATA,
+            partiallyFillable: false,
+            from: constants_1.DEFAULT_ADDRESS,
+            kind: constants_1.ORDER_KIND_BUY,
+            buyAmountAfterFee: buyAmount
+        };
+        /**
+         * /v1/quote
+         * params: {
+         * sellToken: contract address of token to sell
+         * buyToken: contractAddress of token to buy
+         * receiver: receiver address can be defaulted to "0x0000000000000000000000000000000000000000"
+         * validTo: time duration during which quote is valid (eg : 1654851610 as timestamp)
+         * appData: appData for the CowSwap quote that can be used later, can be defaulted to "0x0000000000000000000000000000000000000000000000000000000000000000"
+         * partiallyFillable: false
+         * from: sender address can be defaulted to "0x0000000000000000000000000000000000000000"
+         * kind: "sell" or "buy"
+         * sellAmountBeforeFee / buyAmountAfterFee: amount in base unit
+         * }
+         */
+        const quoteResponse = await cowService_1.cowService.post(`${apiUrl}/v1/quote/`, apiInput);
+        const { data: { quote } } = quoteResponse;
+        const sellCryptoAmount = (0, bignumber_1.bn)(quote.sellAmount).div((0, bignumber_1.bn)(10).exponentiatedBy(asset.precision));
+        if (!sellCryptoAmount.gt(0))
+            throw new api_1.SwapError('[getUsdRate] - Failed to get sell token amount', {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR
             });
-        // dividing $1000 by amount of token received
-        return (0, bignumber_1.bn)(buyAmountInDollars).dividedBy(tokenAmount).toString();
+        // dividing $1000 by amount of sell token received
+        return (0, bignumber_1.bn)(buyAmountInDollars).div(sellCryptoAmount).toString();
     }
     catch (e) {
         if (e instanceof api_1.SwapError)
@@ -62,12 +94,6 @@ const getUsdRate = async ({ apiUrl }, input) => {
     }
 };
 exports.getUsdRate = getUsdRate;
-const getNowPlusThirtyMinutesTimestamp = () => {
-    const ts = new Date();
-    ts.setMinutes(ts.getMinutes() + 30);
-    return Math.round(ts.getTime() / 1000);
-};
-exports.getNowPlusThirtyMinutesTimestamp = getNowPlusThirtyMinutesTimestamp;
 const hashTypedData = (domain, types, data) => {
     return ethers_1.ethers.utils._TypedDataEncoder.hash(domain, types, data);
 };

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

@@ -1,7 +1,7 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {
     readonly name = "Thorchain";
@@ -16,8 +16,8 @@ export declare class ThorchainSwapper implements Swapper<ChainId> {
     approveInfinite(input: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];
-    buildTrade(): Promise<Trade<ChainId>>;
+    buildTrade(input: BuildTradeInput): Promise<Trade<ChainId>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainId>>;
     executeTrade(args: ExecuteTradeInput<ChainId>): Promise<TradeResult>;
-    getTradeTxs(): Promise<TradeTxs>;
+    getTradeTxs(tradeResult: TradeResult): Promise<TradeTxs>;
 }

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -4,6 +4,7 @@ exports.ThorchainSwapper = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../api");
+const buildThorTrade_1 = require("./buildThorTrade/buildThorTrade");
 const getTradeQuote_1 = require("./getThorTradeQuote/getTradeQuote");
 const thorTradeApprovalNeeded_1 = require("./thorTradeApprovalNeeded/thorTradeApprovalNeeded");
 const thorTradeApproveInfinite_1 = require("./thorTradeApproveInfinite/thorTradeApproveInfinite");
@@ -13,8 +14,8 @@ class ThorchainSwapper {
     constructor(deps) {
         this.name = 'Thorchain';
         this.swapSupportedChainIds = {
-            'eip155:1': true,
-            'bip122:000000000019d6689c085ae165831e93': true
+            [types_1.KnownChainIds.EthereumMainnet]: true,
+            [types_1.KnownChainIds.BitcoinMainnet]: true
         };
         this.supportedAssetIds = [];
         this.deps = deps;
@@ -59,33 +60,60 @@ class ThorchainSwapper {
     filterAssetIdsBySellable() {
         return this.supportedAssetIds;
     }
-    async buildTrade() {
-        throw new Error('ThorchainSwapper: buildTrade unimplemented');
+    async buildTrade(input) {
+        return (0, buildThorTrade_1.buildTrade)({ deps: this.deps, input });
     }
     async getTradeQuote(input) {
         return (0, getTradeQuote_1.getThorTradeQuote)({ deps: this.deps, input });
     }
     async executeTrade(args) {
-        const { trade, wallet } = args;
-        const adapter = this.deps.adapterManager.get(trade.sellAsset.chainId);
-        if (adapter && trade.sellAsset.chainId === types_1.KnownChainIds.EthereumMainnet) {
-            const thorTradeEth = trade;
-            const signedTx = await adapter.signTransaction({
-                txToSign: thorTradeEth.txData,
-                wallet
-            });
-            const txid = await adapter.broadcastTransaction(signedTx);
-            return { tradeId: txid };
+        try {
+            const { trade, wallet } = args;
+            const adapter = this.deps.adapterManager.get(trade.sellAsset.chainId);
+            if (!adapter)
+                throw new api_1.SwapError('[executeTrade]: no adapter for sell asset chain id', {
+                    code: api_1.SwapErrorTypes.SIGN_AND_BROADCAST_FAILED,
+                    details: { chainId: trade.sellAsset.chainId },
+                    fn: 'executeTrade'
+                });
+            if (trade.sellAsset.chainId === types_1.KnownChainIds.EthereumMainnet) {
+                const signedTx = await adapter.signTransaction({
+                    txToSign: trade.txData,
+                    wallet
+                });
+                const txid = await adapter.broadcastTransaction(signedTx);
+                return { tradeId: txid };
+            }
+            else if (trade.sellAsset.chainId === types_1.KnownChainIds.BitcoinMainnet) {
+                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,
+                    fn: 'executeTrade'
+                });
+            }
         }
-        else {
-            throw new api_1.SwapError('[executeTrade]: unsupported trade', {
+        catch (e) {
+            if (e instanceof api_1.SwapError)
+                throw e;
+            throw new api_1.SwapError('[executeTrade]: failed to sign or broadcast', {
                 code: api_1.SwapErrorTypes.SIGN_AND_BROADCAST_FAILED,
-                fn: 'executeTrade'
+                cause: e
             });
         }
     }
-    async getTradeTxs() {
-        throw new Error('ThorchainSwapper: executeTrade unimplemented');
+    async getTradeTxs(tradeResult) {
+        // TODO poll midgard for the correct buyTxid
+        return {
+            sellTxid: tradeResult.tradeId,
+            buyTxid: tradeResult.tradeId
+        };
     }
 }
 exports.ThorchainSwapper = ThorchainSwapper;

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

@@ -0,0 +1,7 @@
+import { ChainId } from '@shapeshiftoss/caip';
+import { BuildTradeInput } from '../../../api';
+import { ThorchainSwapperDeps, ThorTrade } from '../types';
+export declare const buildTrade: ({ deps, input }: {
+    deps: ThorchainSwapperDeps;
+    input: BuildTradeInput;
+}) => Promise<ThorTrade<ChainId>>;

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

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildTrade = void 0;
+const types_1 = require("@shapeshiftoss/types");
+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 makeTradeTx_1 = require("../utils/ethereum/makeTradeTx");
+const buildTrade = async ({ deps, input }) => {
+    var _a, _b, _c, _d;
+    try {
+        const { buyAsset, sellAsset, sellAssetAccountNumber, sellAmount, wallet, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, receiveAddress: destinationAddress } = input;
+        const quote = await (0, getTradeQuote_1.getThorTradeQuote)({ deps, input });
+        const sellAdapter = deps.adapterManager.get(sellAsset.chainId);
+        if (!sellAdapter)
+            throw new api_1.SwapError('[buildTrade]: unsupported sell asset', {
+                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+                fn: 'buildTrade',
+                details: { sellAsset }
+            });
+        const sellAssetBip44Params = sellAdapter.buildBIP44Params({
+            accountNumber: sellAssetAccountNumber
+        });
+        if (input.chainId === types_1.KnownChainIds.EthereumMainnet) {
+            const ethTradeTx = await (0, makeTradeTx_1.makeTradeTx)({
+                wallet,
+                slippageTolerance,
+                bip44Params: sellAssetBip44Params,
+                sellAsset,
+                buyAsset,
+                adapter: sellAdapter,
+                sellAmount,
+                destinationAddress,
+                deps,
+                gasPrice: (_b = (_a = quote.feeData.chainSpecific) === null || _a === void 0 ? void 0 : _a.gasPrice) !== null && _b !== void 0 ? _b : '0',
+                gasLimit: (_d = (_c = quote.feeData.chainSpecific) === null || _c === void 0 ? void 0 : _c.estimatedGas) !== null && _d !== void 0 ? _d : '0',
+                tradeFee: quote.feeData.tradeFee
+            });
+            return {
+                chainId: types_1.KnownChainIds.EthereumMainnet,
+                ...quote,
+                receiveAddress: destinationAddress,
+                txData: ethTradeTx.txToSign
+            };
+        }
+        else if (input.chainId === types_1.KnownChainIds.BitcoinMainnet) {
+            const { vault, opReturnData } = await (0, getThorTxData_1.getThorTxInfo)({
+                deps,
+                sellAsset,
+                buyAsset,
+                sellAmount,
+                slippageTolerance,
+                destinationAddress,
+                wallet,
+                bip44Params: sellAssetBip44Params,
+                accountType: input.accountType,
+                tradeFee: quote.feeData.tradeFee
+            });
+            const buildTxResponse = await sellAdapter.buildSendTransaction({
+                value: sellAmount,
+                wallet,
+                to: vault,
+                chainSpecific: {
+                    accountType: input.accountType,
+                    satoshiPerByte: quote.feeData.chainSpecific
+                        .satsPerByte,
+                    opReturnData
+                }
+            });
+            return {
+                chainId: types_1.KnownChainIds.BitcoinMainnet,
+                ...quote,
+                receiveAddress: destinationAddress,
+                txData: buildTxResponse.txToSign
+            };
+        }
+        else {
+            throw new api_1.SwapError('[buildTrade]: unsupported chain id', {
+                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+                fn: 'buildTrade',
+                details: { sellAsset }
+            });
+        }
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[buildTrade]: error building trade', {
+            code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+            fn: 'buildTrade'
+        });
+    }
+};
+exports.buildTrade = buildTrade;

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

@@ -6,18 +6,17 @@ const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
-const helpers_1 = require("../../utils/helpers/helpers");
 const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
 const constants_2 = require("../utils/constants");
 const estimateTradeFee_1 = require("../utils/estimateTradeFee/estimateTradeFee");
 const getThorTxData_2 = require("../utils/ethereum/utils/getThorTxData");
-const getPriceRatio_1 = require("../utils/getPriceRatio/getPriceRatio");
+const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
 const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
 const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
 const getThorTradeQuote = async ({ deps, input }) => {
     const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet, chainId, receiveAddress } = input;
     if (!wallet)
-        throw new api_1.SwapError('[getTradeQuote] - wallet is required', {
+        throw new api_1.SwapError('[getThorTradeQuote] - wallet is required', {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED
         });
     try {
@@ -28,7 +27,6 @@ const getThorTradeQuote = async ({ deps, input }) => {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
                 details: { chainId }
             });
-        const sellAssetId = sellAsset.assetId;
         const buyAssetId = buyAsset.assetId;
         const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAssetId);
         if (!feeAssetId)
@@ -36,13 +34,14 @@ const getThorTradeQuote = async ({ deps, input }) => {
                 code: api_1.SwapErrorTypes.VALIDATION_FAILED,
                 details: { buyAssetId }
             });
-        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, { sellAssetId, buyAssetId });
-        const rate = (0, bignumber_1.bnOrZero)(1).div(priceRatio).toString();
-        const buyAmount = (0, helpers_1.normalizeAmount)((0, bignumber_1.bnOrZero)(sellAmount).times(rate));
-        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
-        const sellAssetTradeFee = (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(tradeFee).times((0, bignumber_1.bnOrZero)(priceRatio)), buyAsset.precision);
-        // padding minimum by 1.5 the trade fee to avoid thorchain "not enough to cover fee" errors.
-        const minimum = (0, bignumber_1.bnOrZero)(sellAssetTradeFee).times(1.5).toString();
+        const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
+        const rate = (0, bignumber_1.bnOrZero)(1).div(tradeRate).toString();
+        const buyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)((0, bignumber_1.fromBaseUnit)(sellAmount, sellAsset.precision)).times(tradeRate), buyAsset.precision);
+        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset);
+        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(tradeFee).times((0, bignumber_1.bnOrZero)(rate));
+        // 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 minimum = (0, bignumber_1.bnOrZero)(sellAssetTradeFee).times(constants_2.THOR_MINIMUM_PADDING).toString();
         const commonQuoteFields = {
             rate,
             maximum: constants_2.MAX_THORCHAIN_TRADE,
@@ -57,23 +56,19 @@ const getThorTradeQuote = async ({ deps, input }) => {
         switch (chainId) {
             case types_1.KnownChainIds.EthereumMainnet:
                 return (async () => {
-                    const { data, router } = await (0, getThorTxData_2.getThorTxInfo)({
+                    const { router } = await (0, getThorTxData_2.getThorTxInfo)({
                         deps,
                         sellAsset,
                         buyAsset,
                         sellAmount,
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
-                        destinationAddress: receiveAddress
+                        destinationAddress: receiveAddress,
+                        tradeFee
                     });
                     const feeData = await (0, getEthTxFees_1.getEthTxFees)({
-                        deps,
-                        data,
-                        router,
-                        buyAsset,
-                        sellAmount,
                         adapterManager: deps.adapterManager,
-                        receiveAddress,
-                        sellAssetReference: sellAssetErc20Address
+                        sellAssetReference: sellAssetErc20Address,
+                        tradeFee
                     });
                     return {
                         ...commonQuoteFields,
@@ -92,16 +87,16 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         destinationAddress: receiveAddress,
                         wallet,
                         bip44Params: input.bip44Params,
-                        accountType: input.accountType
+                        accountType: input.accountType,
+                        tradeFee
                     });
                     const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({
-                        deps,
-                        buyAsset,
                         sellAmount,
                         vault,
                         opReturnData,
                         pubkey,
-                        adapterManager: deps.adapterManager
+                        adapterManager: deps.adapterManager,
+                        tradeFee
                     });
                     return {
                         ...commonQuoteFields,

package/dist/swappers/thorchain/thorTradeApprovalNeeded/thorTradeApprovalNeeded.js

@@ -14,12 +14,8 @@ const thorTradeApprovalNeeded = async ({ deps, input }) => {
         const { adapterManager, web3 } = deps;
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { chainNamespace } = (0, caip_1.fromChainId)(sellAsset.chainId);
-        if (chainNamespace !== 'eip155') {
-            throw new api_1.SwapError('[thorTradeApprovalNeeded] - sellAsset chain namespace is not supported', {
-                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                details: { chainNamespace }
-            });
-        }
+        if (chainNamespace !== caip_1.CHAIN_NAMESPACE.Ethereum)
+            return { approvalNeeded: false };
         // No approval needed for selling a fee asset
         if (sellAsset.assetId === (0, caip_1.getFeeAssetIdFromAssetId)(sellAsset.assetId)) {
             return { approvalNeeded: false };

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

@@ -12,6 +12,7 @@ declare type GetBtcThorTxInfoArgs = {
     wallet: HDWallet;
     bip44Params: BIP44Params;
     accountType: UtxoAccountType;
+    tradeFee: string;
 };
 declare type GetBtcThorTxInfoReturn = Promise<{
     opReturnData: string;

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

@@ -4,10 +4,11 @@ exports.getThorTxInfo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getPriceRatio_1 = require("../../getPriceRatio/getPriceRatio");
+const constants_1 = require("../../constants");
+const getTradeRate_1 = require("../../getTradeRate/getTradeRate");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType, tradeFee }) => {
     try {
         const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
         const btcInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'BTC');
@@ -17,19 +18,18 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { inboundAddresses }
             });
-        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, {
-            buyAssetId: buyAsset.assetId,
-            sellAssetId: sellAsset.assetId
-        });
-        const expectedBuyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
+        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)(expectedBuyAmount).lt(0) || !isValidSlippageRange)
+        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: { expectedBuyAmount, slippageTolerance }
+                details: { expectedBuyAmountPrecision8, slippageTolerance }
             });
-        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
+        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 memo = (0, makeSwapMemo_1.makeSwapMemo)({

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

@@ -1,2 +1,7 @@
 export declare const MAX_THORCHAIN_TRADE = "100000000000000000000000000";
 export declare const MAX_ALLOWANCE = "100000000000000000000000000";
+export declare const THOR_MINIMUM_PADDING = 1.2;
+export declare const THOR_ETH_GAS_LIMIT = "100000";
+export declare const THORCHAIN_FIXED_PRECISION = 8;
+export declare const THOR_TRADE_FEE_BTC_SIZE = 1000;
+export declare const THOR_TRADE_FEE_ETH_GAS = 120000;

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

@@ -1,5 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_ALLOWANCE = exports.MAX_THORCHAIN_TRADE = void 0;
+exports.THOR_TRADE_FEE_ETH_GAS = exports.THOR_TRADE_FEE_BTC_SIZE = 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;
+exports.THOR_ETH_GAS_LIMIT = '100000'; // for sends of eth / erc20 into thorchain router
+exports.THORCHAIN_FIXED_PRECISION = 8; // limit values are precision 8 regardless of the chain
+// 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

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

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

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

@@ -4,23 +4,32 @@ exports.estimateTradeFee = 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 getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
 const thorService_1 = require("../thorService");
 const gweiGasPrecision = 9;
-// https://docs.thorchain.org/how-it-works/fees#outbound-fee
-// estimatedTradeFee = `3 * estimatedFeeOutboundFee`
-// eth txs from thorchain use approx 38383 gas
-const ethEstimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate).times(38383).times(3).times((0, bignumber_1.bn)(10).exponentiatedBy(gweiGasPrecision)).toString();
-// erc20 txs from thorchain use approx 70996 gas
-const erc20Estimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate).times(70996).times(3).times((0, bignumber_1.bn)(10).exponentiatedBy(gweiGasPrecision)).toString();
-// BTC utxo transactions from thorchain are approx 303 bytes long
-const btcEstimate = (gasRate) => (0, bignumber_1.bnOrZero)(gasRate).times(303).times(3).toString();
-const estimateTradeFee = async (deps, buyAssetId) => {
-    const thorId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAssetId });
+// 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)
         throw new api_1.SwapError('[estimateTradeFee] - undefined thorId for given buyAssetId', {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { buyAssetId }
+            details: { buyAssetId: buyAsset.assetId }
         });
     const thorPoolChainId = thorId.slice(0, thorId.indexOf('.'));
     const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
@@ -31,28 +40,28 @@ const estimateTradeFee = async (deps, buyAssetId) => {
             details: { thorPoolChainId }
         });
     const gasRate = inboundInfo.gas_rate;
-    const { chainId, assetNamespace } = (0, caip_1.fromAssetId)(buyAssetId);
-    const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAssetId);
+    const { chainId, assetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
+    const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAsset.assetId);
     if (!feeAssetId)
         throw new api_1.SwapError('[estimateTradeFee] - no fee assetId', {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-            details: { buyAssetId }
+            details: { buyAssetId: buyAsset.assetId }
         });
-    const feeAssetRatio = buyAssetId !== feeAssetId
+    const feeAssetRatio = buyAsset.assetId !== feeAssetId
         ? await (0, getPriceRatio_1.getPriceRatio)(deps, {
-            sellAssetId: buyAssetId,
+            sellAssetId: buyAsset.assetId,
             buyAssetId: feeAssetId
         })
         : '1';
     switch (chainId) {
         case 'bip122:000000000019d6689c085ae165831e93':
-            return (0, bignumber_1.bnOrZero)(btcEstimate(gasRate)).times(feeAssetRatio).dp(0).toString();
+            return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(btcEstimate(gasRate)).times(feeAssetRatio).dp(0), buyAsset.precision);
         case 'eip155:1':
             switch (assetNamespace) {
                 case 'slip44':
-                    return (0, bignumber_1.bnOrZero)(ethEstimate(gasRate)).times(feeAssetRatio).dp(0).toString();
+                    return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(ethEstimate(gasRate)).times(feeAssetRatio).dp(0), buyAsset.precision);
                 case 'erc20':
-                    return (0, bignumber_1.bnOrZero)(erc20Estimate(gasRate)).times(feeAssetRatio).dp(0).toString();
+                    return (0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(erc20Estimate(gasRate)).times(feeAssetRatio).dp(0), buyAsset.precision);
                 default:
                     throw new api_1.SwapError('[estimateTradeFee] - unsupported asset namespace', {
                         code: api_1.SwapErrorTypes.VALIDATION_FAILED,

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

@@ -3,7 +3,7 @@ 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, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit }: {
+export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, tradeFee }: {
     wallet: HDWallet;
     bip44Params: BIP44Params;
     sellAmount: string;
@@ -14,6 +14,7 @@ export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset,
     slippageTolerance: string;
     deps: ThorchainSwapperDeps;
     gasLimit: string;
+    tradeFee: string;
 } & ({
     gasPrice: string;
     maxFeePerGas?: undefined;

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

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit }) => {
+const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, tradeFee }) => {
     try {
         const { assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
@@ -14,7 +15,8 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsse
             buyAsset,
             sellAmount,
             slippageTolerance,
-            destinationAddress
+            destinationAddress,
+            tradeFee
         });
         return adapter.buildCustomTx({
             wallet,
@@ -29,7 +31,7 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsse
                     maxFeePerGas,
                     maxPriorityFeePerGas
                 }),
-            value: isErc20Trade ? '0' : sellAmount,
+            value: isErc20Trade ? '0x0' : (0, web3_utils_1.numberToHex)(sellAmount),
             data
         });
     }

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

@@ -7,6 +7,7 @@ declare type GetBtcThorTxInfoArgs = {
     sellAmount: string;
     slippageTolerance: string;
     destinationAddress: string;
+    tradeFee: string;
 };
 declare type GetBtcThorTxInfoReturn = Promise<{
     data: string;

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

@@ -4,11 +4,12 @@ exports.getThorTxInfo = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getPriceRatio_1 = require("../../getPriceRatio/getPriceRatio");
+const getTradeRate_1 = require("../../../utils/getTradeRate/getTradeRate");
+const constants_1 = require("../../constants");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
 const routerCalldata_1 = require("../routerCalldata");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, tradeFee }) => {
     try {
         const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
@@ -21,19 +22,18 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { inboundAddresses }
             });
-        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, {
-            buyAssetId: buyAsset.assetId,
-            sellAssetId: sellAsset.assetId
-        });
-        const expectedBuyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
+        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)(expectedBuyAmount).lt(0) || !isValidSlippageRange)
+        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: { expectedBuyAmount, slippageTolerance }
+                details: { expectedBuyAmountPrecision8, slippageTolerance }
             });
-        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
+        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 memo = (0, makeSwapMemo_1.makeSwapMemo)({

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

@@ -5,6 +5,7 @@ const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
 const bignumber_2 = require("../../../utils/bignumber");
+const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
 const thorService_1 = require("../thorService");
 const THOR_PRECISION = 8;
 const getSwapOutput = (inputAmount, poolData, toRune) => {
@@ -23,6 +24,13 @@ const getDoubleSwapOutput = (input, inputPool, outputPool) => {
 // TODO this does not support swaps between native "RUNE"
 // Rune swaps use a different calculation because its 1 hop between pools instead of 2
 const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
+    // we can't get a quote for a zero amount so use getPriceRatio between pools instead
+    if ((0, bignumber_1.bnOrZero)(sellAmount).eq(0)) {
+        return (0, getPriceRatio_1.getPriceRatio)(deps, {
+            sellAssetId: sellAsset.assetId,
+            buyAssetId
+        });
+    }
     const buyPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAssetId });
     const sellPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: sellAsset.assetId });
     if (!buyPoolId || !sellPoolId)

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupThorswapDeps = void 0;
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const web3_1 = __importDefault(require("web3"));
 jest.mock('web3');
 const setupThorswapDeps = () => {
@@ -20,7 +21,24 @@ const setupThorswapDeps = () => {
             {
                 buildBIP44Params: jest.fn(() => ({ purpose: 44, coinType: 60, accountNumber: 0 })),
                 getAddress: jest.fn(() => Promise.resolve('0xthisIsMyAddress')),
-                getFeeData: jest.fn(() => feeData)
+                getFeeData: jest.fn(() => feeData),
+                getGasFeeData: jest.fn(() => ({
+                    [chain_adapters_1.FeeDataKey.Slow]: {
+                        gasPrice: '1',
+                        maxFeePerGas: '2',
+                        maxPriorityFeePerGas: '3'
+                    },
+                    [chain_adapters_1.FeeDataKey.Average]: {
+                        gasPrice: '4',
+                        maxFeePerGas: '5',
+                        maxPriorityFeePerGas: '6'
+                    },
+                    [chain_adapters_1.FeeDataKey.Fast]: {
+                        gasPrice: '7',
+                        maxFeePerGas: '8',
+                        maxPriorityFeePerGas: '9'
+                    }
+                }))
             }
         ]
     ]);

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.d.ts

@@ -1,14 +1,11 @@
-import { Asset } from '@shapeshiftoss/asset-service';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { QuoteFeeData } from '../../../../../api';
-import { ThorchainSwapperDeps } from '../../../types';
-export declare const getBtcTxFees: ({ deps, opReturnData, vault, buyAsset, sellAmount, adapterManager, pubkey }: {
-    deps: ThorchainSwapperDeps;
+export declare const getBtcTxFees: ({ opReturnData, vault, sellAmount, adapterManager, pubkey, tradeFee }: {
     opReturnData: string;
     vault: string;
-    buyAsset: Asset;
     sellAmount: string;
     adapterManager: ChainAdapterManager;
     pubkey: string;
+    tradeFee: string;
 }) => Promise<QuoteFeeData<KnownChainIds.BitcoinMainnet>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBtcTxFees = void 0;
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const estimateTradeFee_1 = require("../../estimateTradeFee/estimateTradeFee");
-const getBtcTxFees = async ({ deps, opReturnData, vault, buyAsset, sellAmount, adapterManager, pubkey }) => {
+const getBtcTxFees = async ({ opReturnData, vault, sellAmount, adapterManager, pubkey, tradeFee }) => {
     try {
         const adapter = adapterManager.get('bip122:000000000019d6689c085ae165831e93');
         if (!adapter)
@@ -18,7 +17,6 @@ const getBtcTxFees = async ({ deps, opReturnData, vault, buyAsset, sellAmount, a
             chainSpecific: { pubkey, opReturnData }
         });
         const feeData = feeDataOptions['fast'];
-        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
         return {
             fee: feeData.txFee,
             tradeFee,

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.d.ts

@@ -1,16 +1,9 @@
-import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetReference } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { QuoteFeeData } from '../../../../../api';
-import { ThorchainSwapperDeps } from '../../../types';
-export declare const getEthTxFees: ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }: {
-    deps: ThorchainSwapperDeps;
-    data: string;
-    router: string;
-    buyAsset: Asset;
-    sellAmount: string;
-    sellAssetReference: AssetReference | string;
+export declare const getEthTxFees: ({ adapterManager, sellAssetReference, tradeFee }: {
     adapterManager: ChainAdapterManager;
-    receiveAddress: string;
+    sellAssetReference: AssetReference | string;
+    tradeFee: string;
 }) => Promise<QuoteFeeData<KnownChainIds.EthereumMainnet>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.js

@@ -6,8 +6,8 @@ const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
 const constants_1 = require("../../../../utils/constants");
-const estimateTradeFee_1 = require("../../estimateTradeFee/estimateTradeFee");
-const getEthTxFees = async ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }) => {
+const constants_2 = require("../../constants");
+const getEthTxFees = async ({ adapterManager, sellAssetReference, tradeFee }) => {
     try {
         const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
         if (!adapter) {
@@ -16,32 +16,20 @@ const getEthTxFees = async ({ deps, data, router, buyAsset, sellAmount, adapterM
                 details: { chainId: types_1.KnownChainIds.EthereumMainnet }
             });
         }
-        let feeDataOptions;
-        try {
-            feeDataOptions = await adapter.getFeeData({
-                to: router,
-                value: sellAmount,
-                chainSpecific: { from: receiveAddress, contractData: data }
-            });
-        }
-        catch (e) {
-            // Fallback to fixed fee amount in case of failure so that quote will not fail
-            // eslint-disable-next-line no-console
-            console.debug('[ThorSwapper:getEthTxFees] precise gas estimate failed, falling back on hard coded limit');
-            const gasFeeData = await adapter.getGasFeeData();
-            const gasLimit = '100000'; // good value to cover all thortrades out of eth/erc20
-            feeDataOptions = {
-                fast: {
-                    txFee: (0, bignumber_1.bn)(gasLimit).times(gasFeeData[chain_adapters_1.FeeDataKey.Fast].gasPrice).toString(),
-                    chainSpecific: {
-                        gasPrice: gasFeeData[chain_adapters_1.FeeDataKey.Fast].gasPrice,
-                        gasLimit
-                    }
+        const gasFeeData = await adapter.getGasFeeData();
+        // this is a good value to cover all thortrades out of eth/erc20
+        // in the future we may want to look at doing this more precisely and in a future-proof way
+        const gasLimit = constants_2.THOR_ETH_GAS_LIMIT;
+        const feeDataOptions = {
+            fast: {
+                txFee: (0, bignumber_1.bn)(gasLimit).times(gasFeeData[chain_adapters_1.FeeDataKey.Fast].gasPrice).toString(),
+                chainSpecific: {
+                    gasPrice: gasFeeData[chain_adapters_1.FeeDataKey.Fast].gasPrice,
+                    gasLimit
                 }
-            };
-        }
+            }
+        };
         const feeData = feeDataOptions['fast'];
-        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
         return {
             fee: feeData.txFee,
             chainSpecific: {

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

@@ -20,7 +20,6 @@ export declare const setupBuildTrade: () => {
     } & {
         chainId: import("../../../api").EvmSupportedChainIds;
     } & {
-        buyAssetAccountNumber: number;
         slippage?: string | undefined;
         wallet: HDWallet;
     };

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

@@ -41,7 +41,6 @@ const setupBuildTrade = () => {
         buyAsset,
         sendMax: false,
         sellAssetAccountNumber: 0,
-        buyAssetAccountNumber: 0,
         sellAsset,
         wallet: {},
         receiveAddress: ''

package/dist/swappers/zrx/utils/test-data/setupZrxSwapQuote.d.ts

@@ -18,7 +18,6 @@ export declare const setupExecuteTrade: () => {
         sellAsset: Asset;
         sendMax: boolean;
         sellAssetAccountNumber: number;
-        buyAssetAccountNumber: number;
         txData: string;
         depositAddress: string;
         receiveAddress: string;

package/dist/swappers/zrx/utils/test-data/setupZrxSwapQuote.js

@@ -34,7 +34,6 @@ const setupExecuteTrade = () => {
         sellAsset,
         sendMax: false,
         sellAssetAccountNumber: 0,
-        buyAssetAccountNumber: 0,
         txData: '0x0',
         depositAddress: '0x0',
         receiveAddress: '0x0',

package/dist/swappers/zrx/zrxBuildTrade/zrxBuildTrade.js

@@ -37,7 +37,7 @@ const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function zrxBuildTrade({ adapter, web3 }, input) {
     var _a, _b, _c;
-    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountNumber, buyAssetAccountNumber, wallet } = input;
+    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountNumber, receiveAddress } = input;
     try {
         const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -50,8 +50,6 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
                 details: { chainId: sellAsset.chainId }
             });
         }
-        const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountNumber) });
-        const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         const slippagePercentage = slippage ? (0, bignumber_1.bnOrZero)(slippage).div(100).toString() : constants_1.DEFAULT_SLIPPAGE;
         const baseUrl = (0, helpers_2.baseUrlFromChainId)(buyAsset.chainId);
         const zrxService = (0, zrxService_1.zrxServiceFactory)(baseUrl);

package/package.json

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