@shapeshiftoss/swapper 17.6.1 → 17.6.3

package/dist/swappers/cow/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -36,10 +36,9 @@ async function getCowSwapTradeQuote(deps, input) {
         const buyToken = buyAsset.assetId !== caip_1.ethAssetId ? buyAssetErc20Address : constants_1.COW_SWAP_ETH_MARKER_ADDRESS;
         const { minimum, maximum } = await (0, getCowSwapMinMax_1.getCowSwapMinMax)(deps, sellAsset, buyAsset);
         const minQuoteSellAmount = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
+        const isSellAmountBelowMinimum = (0, bignumber_1.bnOrZero)(sellAmountBeforeFeesCryptoBaseUnit).lt(minQuoteSellAmount);
         // making sure we do not have decimals for cowswap api (can happen at least from minQuoteSellAmount)
-        const normalizedSellAmount = (0, helpers_1.normalizeIntegerAmount)((0, bignumber_1.bnOrZero)(sellAmountBeforeFeesCryptoBaseUnit).lt(minQuoteSellAmount)
-            ? minQuoteSellAmount
-            : sellAmountBeforeFeesCryptoBaseUnit);
+        const normalizedSellAmountCryptoBaseUnit = (0, helpers_1.normalizeIntegerAmount)(isSellAmountBelowMinimum ? minQuoteSellAmount : sellAmountBeforeFeesCryptoBaseUnit);
         const apiInput = {
             sellToken: sellAssetErc20Address,
             buyToken,
@@ -49,7 +48,7 @@ async function getCowSwapTradeQuote(deps, input) {
             partiallyFillable: false,
             from: constants_1.DEFAULT_ADDRESS,
             kind: constants_1.ORDER_KIND_SELL,
-            sellAmountBeforeFee: normalizedSellAmount,
+            sellAmountBeforeFee: normalizedSellAmountCryptoBaseUnit,
         };
         /**
          * /v1/quote
@@ -67,6 +66,7 @@ async function getCowSwapTradeQuote(deps, input) {
          */
         const quoteResponse = await cowService_1.cowService.post(`${deps.apiUrl}/v1/quote/`, apiInput);
         const { data: { quote: { buyAmount: buyAmountCryptoBaseUnit, sellAmount: sellAmountCryptoBaseUnit, feeAmount: feeAmountInSellTokenCryptoBaseUnit, }, }, } = quoteResponse;
+        const quoteSellAmountPlusFeesCryptoBaseUnit = (0, bignumber_1.bnOrZero)(sellAmountCryptoBaseUnit).plus(feeAmountInSellTokenCryptoBaseUnit);
         const buyCryptoAmount = (0, bignumber_1.bn)(buyAmountCryptoBaseUnit).div((0, bignumber_1.bn)(10).exponentiatedBy(buyAsset.precision));
         const sellCryptoAmount = (0, bignumber_1.bn)(sellAmountCryptoBaseUnit).div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
         const rate = buyCryptoAmount.div(sellCryptoAmount).toString();
@@ -88,11 +88,17 @@ async function getCowSwapTradeQuote(deps, input) {
             .multipliedBy((0, bignumber_1.bnOrZero)(sellAssetUsdRate))
             .toString();
         const feeData = feeDataOptions['fast'];
-        // If original sellAmount is < minQuoteSellAmount, we don't want to replace it with normalizedSellAmount
+        const isQuoteSellAmountBelowMinimum = (0, bignumber_1.bnOrZero)(quoteSellAmountPlusFeesCryptoBaseUnit).lt(minQuoteSellAmount);
+        // If isQuoteSellAmountBelowMinimum we don't want to replace it with normalizedSellAmount
         // The purpose of this was to get a quote from CowSwap even with small amounts
-        const quoteSellAmount = (0, bignumber_1.bnOrZero)(sellAmountCryptoBaseUnit).lt(minQuoteSellAmount)
+        const quoteSellAmountCryptoBaseUnit = isQuoteSellAmountBelowMinimum
             ? sellAmountBeforeFeesCryptoBaseUnit
-            : normalizedSellAmount;
+            : normalizedSellAmountCryptoBaseUnit;
+        // Similarly, if isQuoteSellAmountBelowMinimum we can't use the buy amount from the quote
+        // because we aren't actually selling the minimum amount (we are attempting to sell an amount less than it)
+        const quoteBuyAmountCryptoBaseUnit = isQuoteSellAmountBelowMinimum
+            ? '0'
+            : buyAmountCryptoBaseUnit;
         return {
             rate,
             minimumCryptoHuman: minimum,
@@ -109,8 +115,8 @@ async function getCowSwapTradeQuote(deps, input) {
                 buyAssetTradeFeeUsd: '0',
                 sellAssetTradeFeeUsd,
             },
-            sellAmountBeforeFeesCryptoBaseUnit: quoteSellAmount,
-            buyAmountCryptoBaseUnit,
+            sellAmountBeforeFeesCryptoBaseUnit: quoteSellAmountCryptoBaseUnit,
+            buyAmountCryptoBaseUnit: quoteBuyAmountCryptoBaseUnit,
             sources: constants_1.DEFAULT_SOURCE,
             allowanceContract: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
             buyAsset,

package/package.json

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