Remove unused dontCheckLimits and hardcoded MIN_USD_SWAP

EdgeApp · Nov 23, 2023 · 6199faf · 6199faf
1 parent f1f530c
commit 6199faf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # edge-exchange-plugins
 
+## Unreleased
+
+- fixed: Return proper min amount error with Thorchain
+
 ## 1.1.0 (2023-11-20)
 
 - added: RUNE support for Thorchain swaps

diff --git a/src/swap/defi/thorchain.ts b/src/swap/defi/thorchain.ts
@@ -1,4 +1,4 @@
-import { add, div, gt, lt, mul, round, sub } from 'biggystring'
+import { add, div, gt, mul, round, sub } from 'biggystring'
 import {
   asArray,
   asBoolean,
@@ -283,7 +283,6 @@ interface CalcSwapParams {
   affiliateFeeBasis: string
   streamingInterval: number
   streamingQuantity: number
-  dontCheckLimits?: boolean
 }
 
 interface CalcSwapResponse {
@@ -767,8 +766,7 @@ const calcSwapFrom = async ({
   volatilitySpreadStreamingFinal,
   affiliateFeeBasis,
   streamingInterval,
-  streamingQuantity,
-  dontCheckLimits = false
+  streamingQuantity
 }: CalcSwapParams): Promise<CalcSwapResponse> => {
   const fromNativeAmount = nativeAmount
 
@@ -780,36 +778,6 @@ const calcSwapFrom = async ({
 
   log(`fromExchangeAmount: ${fromExchangeAmount}`)
 
-  // Check minimums if we can
-  if (!dontCheckLimits) {
-    const srcInUsd = mul(sourcePool.assetPriceUSD, fromExchangeAmount)
-    let fromMinNativeAmount
-    if (lt(srcInUsd, MIN_USD_SWAP)) {
-      const minExchangeAmount = div(
-        MIN_USD_SWAP,
-        sourcePool.assetPriceUSD,
-        DIVIDE_PRECISION
-      )
-      fromMinNativeAmount = await fromWallet.denominationToNative(
-        minExchangeAmount,
-        fromCurrencyCode
-      )
-    }
-
-    if (minAmount != null && lt(fromExchangeAmount, minAmount.minInputAmount)) {
-      const tempNativeMin = await fromWallet.denominationToNative(
-        minAmount.minInputAmount,
-        fromCurrencyCode
-      )
-      if (gt(tempNativeMin, fromMinNativeAmount ?? '0')) {
-        fromMinNativeAmount = tempNativeMin
-      }
-    }
-    if (fromMinNativeAmount != null) {
-      throw new SwapBelowLimitError(swapInfo, fromMinNativeAmount, 'from')
-    }
-  }
-
   const fromThorAmount = mul(fromExchangeAmount, THOR_LIMIT_UNITS)
 
   const noStreamParams = {
@@ -914,8 +882,7 @@ const calcSwapTo = async ({
   volatilitySpreadStreamingFinal,
   affiliateFeeBasis,
   streamingInterval,
-  streamingQuantity,
-  dontCheckLimits = false
+  streamingQuantity
 }: CalcSwapParams): Promise<CalcSwapResponse> => {
   const toNativeAmount = nativeAmount