@shapeshiftoss/swapper 8.3.0 → 8.3.1

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -52,6 +52,8 @@ class ThorchainSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;
+        if (!this.supportedAssetIds.includes(sellAssetId))
+            return [];
         return assetIds.filter((assetId) => this.supportedAssetIds.includes(assetId) && assetId !== sellAssetId);
     }
     filterAssetIdsBySellable() {

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

@@ -36,14 +36,13 @@ const getThorTradeQuote = async ({ deps, input }) => {
                 code: api_1.SwapErrorTypes.VALIDATION_FAILED,
                 details: { buyAssetId }
             });
-        const feeAssetRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, { sellAssetId, buyAssetId: feeAssetId });
         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.bnOrZero)(tradeFee).times((0, bignumber_1.bnOrZero)(feeAssetRatio));
+        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.fromBaseUnit)(sellAssetTradeFee.times(1.5).toString(), sellAsset.precision);
+        const minimum = (0, bignumber_1.bnOrZero)(sellAssetTradeFee).times(1.5).toString();
         const commonQuoteFields = {
             rate,
             maximum: constants_2.MAX_THORCHAIN_TRADE,

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

@@ -4,6 +4,7 @@ exports.estimateTradeFee = 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 thorService_1 = require("../thorService");
 const gweiGasPrecision = 9;
 // https://docs.thorchain.org/how-it-works/fees#outbound-fee
@@ -31,15 +32,27 @@ const estimateTradeFee = async (deps, buyAssetId) => {
         });
     const gasRate = inboundInfo.gas_rate;
     const { chainId, assetNamespace } = (0, caip_1.fromAssetId)(buyAssetId);
+    const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAssetId);
+    if (!feeAssetId)
+        throw new api_1.SwapError('[estimateTradeFee] - no fee assetId', {
+            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
+            details: { buyAssetId }
+        });
+    const feeAssetRatio = buyAssetId !== feeAssetId
+        ? await (0, getPriceRatio_1.getPriceRatio)(deps, {
+            sellAssetId: buyAssetId,
+            buyAssetId: feeAssetId
+        })
+        : '1';
     switch (chainId) {
         case 'bip122:000000000019d6689c085ae165831e93':
-            return btcEstimate(gasRate);
+            return (0, bignumber_1.bnOrZero)(btcEstimate(gasRate)).times(feeAssetRatio).dp(0).toString();
         case 'eip155:1':
             switch (assetNamespace) {
                 case 'slip44':
-                    return ethEstimate(gasRate);
+                    return (0, bignumber_1.bnOrZero)(ethEstimate(gasRate)).times(feeAssetRatio).dp(0).toString();
                 case 'erc20':
-                    return erc20Estimate(gasRate);
+                    return (0, bignumber_1.bnOrZero)(erc20Estimate(gasRate)).times(feeAssetRatio).dp(0).toString();
                 default:
                     throw new api_1.SwapError('[estimateTradeFee] - unsupported asset namespace', {
                         code: api_1.SwapErrorTypes.VALIDATION_FAILED,

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

@@ -29,7 +29,7 @@ const getPriceRatio = async (deps, input) => {
     catch (e) {
         if (e instanceof api_1.SwapError)
             throw e;
-        throw new api_1.SwapError('[getUsdRate]: Thorchain getUsdRate failed', {
+        throw new api_1.SwapError('[getPriceRatio]: Thorchain getPriceRatio failed', {
             code: api_1.SwapErrorTypes.PRICE_RATIO_FAILED,
             cause: e
         });

package/package.json

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