Merge branch 'develop' of https://github.com/cowprotocol/cowswap into…

… feat/vampire-attack-setup

# Conflicts:
#	apps/cowswap-frontend/src/legacy/components/SwapWarnings/index.tsx
#	apps/cowswap-frontend/src/modules/tradeSlippage/updaters/SmartSlippageUpdater/index.ts
#	apps/cowswap-frontend/src/modules/tradeWidgetAddons/containers/TransactionSettings/index.tsx
#	apps/cowswap-frontend/src/modules/tradeWidgetAddons/pure/Row/RowSlippageContent/index.tsx

apps/cowswap-frontend/src/modules/tradeSlippage/updaters/SmartSlippageUpdater/index.ts

@@ -1,5 +1,5 @@
 import { useSetAtom } from 'jotai'
-import { useEffect, useMemo } from 'react'
+import { useEffect } from 'react'
 
 import { useTradeConfirmState } from 'modules/trade'
 import { useHighFeeWarning } from 'modules/tradeWidgetAddons'
@@ -16,8 +16,6 @@ export function SmartSlippageUpdater() {
   const setSmartSwapSlippage = useSetAtom(smartTradeSlippageAtom)
 
   const bffSlippageBps = useSmartSlippageFromBff()
-  // TODO: remove v1
-  const tradeSizeSlippageBpsV1 = useSmartSlippageFromFeePercentage()
   const feeMultiplierSlippageBps = useSmartSlippageFromFeeMultiplier()
 
   const { isOpen: isTradeReviewOpen } = useTradeConfirmState()
@@ -38,48 +36,5 @@ export function SmartSlippageUpdater() {
     setSmartSwapSlippage(Math.max(MIN_BPS, Math.min(slippage, MAX_BPS)))
   }, [bffSlippageBps, setSmartSwapSlippage, feeMultiplierSlippageBps, isTradeReviewOpen])
 
-  // TODO: remove before merging
-  useEffect(() => {
-    console.log(`SmartSlippageUpdater`, {
-      granularSlippage: tradeSizeSlippageBpsV1,
-      fiftyPercentFeeSlippage: feeMultiplierSlippageBps,
-      bffSlippageBps,
-    })
-  }, [tradeSizeSlippageBpsV1, feeMultiplierSlippageBps])
-
   return null
 }
-
-// TODO: remove
-/**
- * Calculates smart slippage in bps, based on trade size in relation to fee
- */
-function useSmartSlippageFromFeePercentage(): number | undefined {
-  const { feePercentage } = useHighFeeWarning()
-
-  const percentage = feePercentage && +feePercentage.toFixed(3)
-
-  return useMemo(() => {
-    if (percentage === undefined) {
-      // Unset, return undefined
-      return
-    }
-    if (percentage < 1) {
-      // bigger volume compared to the fee, trust on smart slippage from BFF
-      return
-    } else if (percentage < 5) {
-      // Between 1 and 5, 2%
-      return 200
-    } else if (percentage < 10) {
-      // Between 5 and 10, 5%
-      return 500
-    } else if (percentage < 20) {
-      // Between 10 and 20, 10%
-      return 1000
-    }
-    // TODO: more granularity?
-
-    // > 20%, cap it at 20% slippage
-    return 2000
-  }, [percentage])
-}

apps/cowswap-frontend/src/modules/tradeWidgetAddons/containers/TransactionSettings/index.tsx

@@ -90,78 +90,84 @@ export function TransactionSettings({ deadlineState }: TransactionSettingsProps)
 
   const placeholderSlippage = isSlippageModified ? defaultSwapSlippage : swapSlippage
 
-  function parseSlippageInput(value: string) {
-    // populate what the user typed and clear the error
-    setSlippageInput(value)
-    setSlippageError(false)
+  const parseSlippageInput = useCallback(
+    (value: string) => {
+      // populate what the user typed and clear the error
+      setSlippageInput(value)
+      setSlippageError(false)
 
-    if (value.length === 0) {
-      slippageToleranceAnalytics('Default', placeholderSlippage.toFixed(2))
-      setSwapSlippage(isEoaEthFlow ? percentToBps(minEthFlowSlippage) : null)
-    } else {
-      let v = value
-
-      // Prevent inserting more than 2 decimal precision
-      if (value.split('.')[1]?.length > 2) {
-        // indexOf + 3 because we are cutting it off at `.XX`
-        v = value.slice(0, value.indexOf('.') + 3)
-        // Update the input to remove the extra numbers from UI input
-        setSlippageInput(v)
-      }
+      if (value.length === 0) {
+        slippageToleranceAnalytics('Default', placeholderSlippage.toFixed(2))
+        setSwapSlippage(isEoaEthFlow ? percentToBps(minEthFlowSlippage) : null)
+      } else {
+        let v = value
+
+        // Prevent inserting more than 2 decimal precision
+        if (value.split('.')[1]?.length > 2) {
+          // indexOf + 3 because we are cutting it off at `.XX`
+          v = value.slice(0, value.indexOf('.') + 3)
+          // Update the input to remove the extra numbers from UI input
+          setSlippageInput(v)
+        }
 
-      const parsed = Math.round(Number.parseFloat(v) * 100)
+        const parsed = Math.round(Number.parseFloat(v) * 100)
 
-      if (
-        !Number.isInteger(parsed) ||
-        parsed < (isEoaEthFlow ? minEthFlowSlippageBps : MIN_SLIPPAGE_BPS) ||
-        parsed > MAX_SLIPPAGE_BPS
-      ) {
-        if (v !== '.') {
-          setSlippageError(SlippageError.InvalidInput)
+        if (
+          !Number.isInteger(parsed) ||
+          parsed < (isEoaEthFlow ? minEthFlowSlippageBps : MIN_SLIPPAGE_BPS) ||
+          parsed > MAX_SLIPPAGE_BPS
+        ) {
+          if (v !== '.') {
+            setSlippageError(SlippageError.InvalidInput)
+          }
         }
-      }
 
-      slippageToleranceAnalytics('Custom', parsed)
-      setSwapSlippage(percentToBps(new Percent(parsed, 10_000)))
-    }
-  }
+        slippageToleranceAnalytics('Custom', parsed)
+        setSwapSlippage(percentToBps(new Percent(parsed, 10_000)))
+      }
+    },
+    [placeholderSlippage, isEoaEthFlow, minEthFlowSlippage],
+  )
 
   const tooLow = swapSlippage.lessThan(new Percent(isEoaEthFlow ? minEthFlowSlippageBps : LOW_SLIPPAGE_BPS, 10_000))
   const tooHigh = swapSlippage.greaterThan(
-    new Percent(isEoaEthFlow ? HIGH_ETH_FLOW_SLIPPAGE_BPS : HIGH_SLIPPAGE_BPS, 10_000),
+    new Percent(isEoaEthFlow ? HIGH_ETH_FLOW_SLIPPAGE_BPS : smartSlippage || HIGH_SLIPPAGE_BPS, 10_000),
   )
 
-  function parseCustomDeadline(value: string) {
-    // populate what the user typed and clear the error
-    setDeadlineInput(value)
-    setDeadlineError(false)
-
-    if (value.length === 0) {
-      orderExpirationTimeAnalytics('Default', DEFAULT_DEADLINE_FROM_NOW)
-      setDeadline(DEFAULT_DEADLINE_FROM_NOW)
-    } else {
-      try {
-        const parsed: number = Math.floor(Number.parseFloat(value) * 60)
-        if (
-          !Number.isInteger(parsed) || // Check deadline is a number
-          parsed <
-            (isEoaEthFlow
-              ? // 10 minute low threshold for eth flow
-                MINIMUM_ETH_FLOW_DEADLINE_SECONDS
-              : MINIMUM_ORDER_VALID_TO_TIME_SECONDS) || // Check deadline is not too small
-          parsed > MAX_DEADLINE_MINUTES * 60 // Check deadline is not too big
-        ) {
+  const parseCustomDeadline = useCallback(
+    (value: string) => {
+      // populate what the user typed and clear the error
+      setDeadlineInput(value)
+      setDeadlineError(false)
+
+      if (value.length === 0) {
+        orderExpirationTimeAnalytics('Default', DEFAULT_DEADLINE_FROM_NOW)
+        setDeadline(DEFAULT_DEADLINE_FROM_NOW)
+      } else {
+        try {
+          const parsed: number = Math.floor(Number.parseFloat(value) * 60)
+          if (
+            !Number.isInteger(parsed) || // Check deadline is a number
+            parsed <
+              (isEoaEthFlow
+                ? // 10 minute low threshold for eth flow
+                  MINIMUM_ETH_FLOW_DEADLINE_SECONDS
+                : MINIMUM_ORDER_VALID_TO_TIME_SECONDS) || // Check deadline is not too small
+            parsed > MAX_DEADLINE_MINUTES * 60 // Check deadline is not too big
+          ) {
+            setDeadlineError(DeadlineError.InvalidInput)
+          } else {
+            orderExpirationTimeAnalytics('Custom', parsed)
+            setDeadline(parsed)
+          }
+        } catch (error: any) {
+          console.error(error)
           setDeadlineError(DeadlineError.InvalidInput)
-        } else {
-          orderExpirationTimeAnalytics('Custom', parsed)
-          setDeadline(parsed)
         }
-      } catch (error: any) {
-        console.error(error)
-        setDeadlineError(DeadlineError.InvalidInput)
       }
-    }
-  }
+    },
+    [isEoaEthFlow],
+  )
 
   const showCustomDeadlineRow = Boolean(chainId)
 
@@ -185,14 +191,14 @@ export function TransactionSettings({ deadlineState }: TransactionSettingsProps)
         <AutoColumn gap="sm">
           <RowFixed>
             <ThemedText.Black fontWeight={400} fontSize={14}>
-              <Trans>MEV protected slippage</Trans>
+              <Trans>MEV-protected slippage</Trans>
             </ThemedText.Black>
             <HelpTooltip
               text={
                 // <Trans>Your transaction will revert if the price changes unfavorably by more than this percentage.</Trans>
                 isEoaEthFlow
                   ? getNativeSlippageTooltip(chainId, [nativeCurrency.symbol, getWrappedToken(nativeCurrency).symbol])
-                  : getNonNativeSlippageTooltip()
+                  : getNonNativeSlippageTooltip(true)
               }
             />
           </RowFixed>
@@ -251,8 +257,8 @@ export function TransactionSettings({ deadlineState }: TransactionSettingsProps)
                 <HelpTooltip
                   text={
                     <Trans>
-                      Based on recent volatility observed for this token pair, it's recommended to leave the default to
-                      account for price changes.
+                      CoW Swap has dynamically selected this slippage amount to account for current gas prices and
+                      volatility. Changes may result in slower execution.
                     </Trans>
                   }
                 />

apps/cowswap-frontend/src/modules/tradeWidgetAddons/pure/Row/RowSlippageContent/index.tsx

@@ -30,7 +30,7 @@ const DefaultSlippage = styled.span`
 `
 
 const SUGGESTED_SLIPPAGE_TOOLTIP =
-  'Based on recent volatility for the selected token pair, this is the suggested slippage for ensuring quick execution of your order.'
+  'This is the recommended slippage tolerance based on current gas prices & volatility. A lower amount may result in slower execution.'
 
 export interface RowSlippageContentProps {
   chainId: SupportedChainId
@@ -82,7 +82,7 @@ export function RowSlippageContent(props: RowSlippageContentProps) {
           <CenteredDots />
         ) : (
           <>
-            <LinkStyledButton onClick={setAutoSlippage}>(Suggested: {smartSlippage})</LinkStyledButton>
+            <LinkStyledButton onClick={setAutoSlippage}>(Recommended: {smartSlippage})</LinkStyledButton>
             <HoverTooltip wrapInContainer content={SUGGESTED_SLIPPAGE_TOOLTIP}>
               <StyledInfoIcon size={16} />
             </HoverTooltip>

libs/common-const/src/misc.ts

@@ -1,29 +1,15 @@
-import { Percent, Fraction } from '@uniswap/sdk-core'
+import { Fraction, Percent } from '@uniswap/sdk-core'
 
 import JSBI from 'jsbi'
 
 export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 
-export const NetworkContextName = 'NETWORK'
-
-export const IS_IN_IFRAME = typeof window !== 'undefined' && window.parent !== window
-
 // 30 minutes, denominated in seconds
 export const DEFAULT_DEADLINE_FROM_NOW = 60 * 30
 export const L2_DEADLINE_FROM_NOW = 60 * 5
 
-// transaction popup dismisal amounts
-export const DEFAULT_TXN_DISMISS_MS = 25000
-export const L2_TXN_DISMISS_MS = 5000
-
-// used for rewards deadlines
-export const BIG_INT_SECONDS_IN_WEEK = JSBI.BigInt(60 * 60 * 24 * 7)
-
-export const BIG_INT_ZERO = JSBI.BigInt(0)
-
 // one basis JSBI.BigInt
 const BPS_BASE = JSBI.BigInt(10000)
-export const ONE_BPS = new Percent(JSBI.BigInt(1), BPS_BASE)
 
 // used for warning states
 export const ALLOWED_PRICE_IMPACT_LOW: Percent = new Percent(JSBI.BigInt(100), BPS_BASE) // 1%
@@ -34,12 +20,6 @@ export const PRICE_IMPACT_WITHOUT_FEE_CONFIRM_MIN: Percent = new Percent(JSBI.Bi
 // for non expert mode disable swaps above this
 export const BLOCKED_PRICE_IMPACT_NON_EXPERT: Percent = new Percent(JSBI.BigInt(1500), BPS_BASE) // 15%
 
-export const BETTER_TRADE_LESS_HOPS_THRESHOLD = new Percent(JSBI.BigInt(50), BPS_BASE)
-
-export const ZERO_PERCENT = new Percent('0')
-export const TWO_PERCENT = new Percent(JSBI.BigInt(200), BPS_BASE)
 export const ONE_HUNDRED_PERCENT = new Percent('1')
 
-export const IS_SIDE_BANNER_VISIBLE_KEY = 'IS_SIDEBAR_BANNER_VISIBLE'
-
 export const ONE_FRACTION = new Fraction(1, 1)