@shapeshiftoss/swapper 11.4.0 → 11.4.1

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

@@ -4,16 +4,25 @@ exports.getPriceRatio = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
+const isRune_1 = require("../../utils/isRune/isRune");
 const thorService_1 = require("../thorService");
 const getPriceRatio = async (deps, input) => {
     const { buyAssetId, sellAssetId } = input;
     try {
         const buyPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAssetId });
         const sellPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: sellAssetId });
-        if (!buyPoolId || !sellPoolId) {
-            throw new api_1.SwapError(`[getPriceRatio]: No thorchain pool found`, {
-                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
-                details: { buyPoolId, sellPoolId },
+        if (!buyPoolId && !(0, isRune_1.isRune)(buyAssetId)) {
+            throw new api_1.SwapError(`[getPriceRatio]: No buyPoolId found for asset ${buyAssetId}`, {
+                code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+                fn: 'getPriceRatio',
+                details: { buyAssetId },
+            });
+        }
+        if (!sellPoolId && !(0, isRune_1.isRune)(sellAssetId)) {
+            throw new api_1.SwapError(`[getPriceRatio]: No sellPoolId found for asset ${sellAssetId}`, {
+                code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+                fn: 'getPriceRatio',
+                details: { sellAssetId },
             });
         }
         const { data: responseData } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/pools`);

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

@@ -17,8 +17,17 @@ const getSwapOutput = (inputAmount, pool, toRune) => {
     return numerator.div(denominator);
 };
 const getDoubleSwapOutput = (input, inputPool, outputPool) => {
-    const runeToOutput = getSwapOutput(input, inputPool, true);
-    return getSwapOutput(runeToOutput, outputPool, false);
+    if (inputPool && outputPool) {
+        const runeToOutput = getSwapOutput(input, inputPool, true);
+        return getSwapOutput(runeToOutput, outputPool, false);
+    }
+    if (inputPool && !outputPool) {
+        return getSwapOutput(input, inputPool, true);
+    }
+    if (!inputPool && outputPool) {
+        return getSwapOutput(input, outputPool, false);
+    }
+    return (0, bignumber_1.bn)(0); // We should never reach this, but this makes tsc happy
 };
 // https://docs.thorchain.org/how-it-works/prices
 // TODO this does not support swaps between native "RUNE"
@@ -48,14 +57,22 @@ const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
         });
     }
     const { data } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/pools`);
-    const buyPool = buyPoolId && data.find((response) => response.asset === buyPoolId);
-    const sellPool = sellPoolId && data.find((response) => response.asset === sellPoolId);
-    if (!buyPool || !sellPool)
-        throw new api_1.SwapError(`[getPriceRatio]: no pools found`, {
+    const buyPool = buyPoolId ? data.find((response) => response.asset === buyPoolId) : null;
+    const sellPool = sellPoolId ? data.find((response) => response.asset === sellPoolId) : null;
+    if (!buyPool && !(0, isRune_1.isRune)(buyAssetId)) {
+        throw new api_1.SwapError(`[getTradeRate]: no pools found`, {
+            code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+            fn: 'getTradeRate',
+            details: { buyPoolId, sellPoolId },
+        });
+    }
+    if (!sellPool && !(0, isRune_1.isRune)(sellAsset.assetId)) {
+        throw new api_1.SwapError(`[getTradeRate]: no pools found`, {
             code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
-            fn: 'getPriceRatio',
+            fn: 'getTradeRate',
             details: { buyPoolId, sellPoolId },
         });
+    }
     // All thorchain pool amounts are base 8 regardless of token precision
     const sellBaseAmount = (0, bignumber_1.bn)((0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)(sellAmount, sellAsset.precision), THOR_PRECISION));
     const outputAmountBase8 = getDoubleSwapOutput(sellBaseAmount, sellPool, buyPool);

package/package.json

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