Revert "feat(widgets): support convenience fee in trades (#3219)" (#3224)

This reverts commit 8064dd8e.

src/hooks/useSwapCallArguments.tsx

@@ -2,7 +2,7 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { SwapRouter, Trade } from '@uniswap/router-sdk'
 import { Currency, Percent, TradeType } from '@uniswap/sdk-core'
 import { Router as V2SwapRouter, Trade as V2Trade } from '@uniswap/v2-sdk'
-import { FeeOptions, SwapRouter as V3SwapRouter, Trade as V3Trade } from '@uniswap/v3-sdk'
+import { SwapRouter as V3SwapRouter, Trade as V3Trade } from '@uniswap/v3-sdk'
 import { SWAP_ROUTER_ADDRESSES, V3_ROUTER_ADDRESS } from 'constants/addresses'
 import useActiveWeb3React from 'hooks/useActiveWeb3React'
 import { useMemo } from 'react'
@@ -36,8 +36,7 @@ export function useSwapCallArguments(
   allowedSlippage: Percent,
   recipientAddressOrName: string | null | undefined,
   signatureData: SignatureData | null | undefined,
-  deadline: BigNumber | undefined,
-  fee: FeeOptions | undefined
+  deadline: BigNumber | undefined
 ): SwapCall[] {
   const { account, chainId, library } = useActiveWeb3React()
 
@@ -99,7 +98,6 @@ export function useSwapCallArguments(
     } else {
       // swap options shared by v3 and v2+v3 swap routers
       const sharedSwapOptions = {
-        fee,
         recipient,
         slippageTolerance: allowedSlippage,
         ...(signatureData
@@ -169,16 +167,15 @@ export function useSwapCallArguments(
       ]
     }
   }, [
+    trade,
+    recipient,
+    library,
     account,
-    allowedSlippage,
-    argentWalletContract,
     chainId,
     deadline,
-    fee,
-    library,
-    recipient,
     routerContract,
+    allowedSlippage,
+    argentWalletContract,
     signatureData,
-    trade,
   ])
 }

src/hooks/useSwapCallback.tsx

@@ -33,7 +33,7 @@ export function useSwapCallback(
     state,
     callback: libCallback,
     error,
-  } = useLibSwapCallBack({ trade, allowedSlippage, recipientAddressOrName: recipient, signatureData, deadline })
+  } = useLibSwapCallBack(trade, allowedSlippage, recipient, signatureData, deadline)
 
   const callback = useMemo(() => {
     if (!libCallback || !trade) {

src/lib/components/Swap/SwapButton.tsx

@@ -51,7 +51,6 @@ export default function SwapButton({ disabled }: SwapButtonProps) {
     currencies: { [Field.INPUT]: inputCurrency },
     currencyBalances: { [Field.INPUT]: inputCurrencyBalance },
     currencyAmounts: { [Field.INPUT]: inputCurrencyAmount, [Field.OUTPUT]: outputCurrencyAmount },
-    fee,
   } = useSwapInfo()
 
   const independentField = useAtomValue(independentFieldAtom)
@@ -119,14 +118,13 @@ export default function SwapButton({ disabled }: SwapButtonProps) {
   const { signatureData } = useERC20PermitFromTrade(optimizedTrade, allowedSlippage, deadline)
 
   // the callback to execute the swap
-  const { callback: swapCallback } = useSwapCallback({
-    trade: optimizedTrade,
+  const { callback: swapCallback } = useSwapCallback(
+    optimizedTrade,
     allowedSlippage,
-    recipientAddressOrName: account ?? null,
+    account ?? null,
     signatureData,
-    deadline,
-    fee,
-  })
+    deadline
+  )
 
   //@TODO(ianlapham): add a loading state, process errors
   const setDisplayTxHash = useUpdateAtom(displayTxHashAtom)

src/lib/components/Swap/index.tsx

 import { Trans } from '@lingui/macro'
 import { TokenInfo } from '@uniswap/token-lists'
 import { useAtom } from 'jotai'
+import useSwapDefaults from 'lib/hooks/swap/useSwapDefaults'
 import { SwapInfoUpdater } from 'lib/hooks/swap/useSwapInfo'
-import useSyncConvenienceFee from 'lib/hooks/swap/useSyncConvenienceFee'
-import useSyncSwapDefaults from 'lib/hooks/swap/useSyncSwapDefaults'
 import { usePendingTransactions } from 'lib/hooks/transactions'
 import useActiveWeb3React from 'lib/hooks/useActiveWeb3React'
 import useTokenList from 'lib/hooks/useTokenList'
@@ -48,8 +47,7 @@ export interface SwapProps {
 
 export default function Swap(props: SwapProps) {
   useTokenList(props.tokenList)
-  useSyncSwapDefaults(props)
-  useSyncConvenienceFee(props)
+  useSwapDefaults(props)
 
   const { active, account } = useActiveWeb3React()
   const [boundary, setBoundary] = useState<HTMLDivElement | null>(null)

src/lib/hooks/swap/useSwapCallback.tsx

@@ -3,7 +3,6 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { TransactionResponse } from '@ethersproject/providers'
 import { Trans } from '@lingui/macro'
 import { Percent } from '@uniswap/sdk-core'
-import { FeeOptions } from '@uniswap/v3-sdk'
 import useActiveWeb3React from 'hooks/useActiveWeb3React'
 import useENS from 'hooks/useENS'
 import { SignatureData } from 'hooks/useERC20Permit'
@@ -18,33 +17,18 @@ export enum SwapCallbackState {
   VALID,
 }
 
-interface UseSwapCallbackReturns {
-  state: SwapCallbackState
-  callback: null | (() => Promise<TransactionResponse>)
-  error: ReactNode | null
-}
-interface UseSwapCallbackArgs {
-  trade: AnyTrade | undefined // trade to execute, required
-  allowedSlippage: Percent // in bips
-  recipientAddressOrName: string | null | undefined // the ENS name or address of the recipient of the trade, or null if swap should be returned to sender
-  signatureData: SignatureData | null | undefined
-  deadline: BigNumber | undefined
-  fee?: FeeOptions
-}
-
 // returns a function that will execute a swap, if the parameters are all valid
 // and the user has approved the slippage adjusted input amount for the trade
-export function useSwapCallback({
-  trade,
-  allowedSlippage,
-  recipientAddressOrName,
-  signatureData,
-  deadline,
-  fee,
-}: UseSwapCallbackArgs): UseSwapCallbackReturns {
+export function useSwapCallback(
+  trade: AnyTrade | undefined, // trade to execute, required
+  allowedSlippage: Percent, // in bips
+  recipientAddressOrName: string | null | undefined, // the ENS name or address of the recipient of the trade, or null if swap should be returned to sender
+  signatureData: SignatureData | null | undefined,
+  deadline: BigNumber | undefined
+): { state: SwapCallbackState; callback: null | (() => Promise<TransactionResponse>); error: ReactNode | null } {
   const { account, chainId, library } = useActiveWeb3React()
 
-  const swapCalls = useSwapCallArguments(trade, allowedSlippage, recipientAddressOrName, signatureData, deadline, fee)
+  const swapCalls = useSwapCallArguments(trade, allowedSlippage, recipientAddressOrName, signatureData, deadline)
   const { callback } = useSendSwapTransaction(account, chainId, library, trade, swapCalls)
 
   const { address: recipientAddress } = useENS(recipientAddressOrName)

src/lib/hooks/swap/useSyncSwapDefaults.ts → src/lib/hooks/swap/useSwapDefaults.ts

@@ -31,7 +31,7 @@ interface UseSwapDefaultsArgs {
   defaultOutputAmount?: string
 }
 
-export default function useSyncSwapDefaults({
+export default function useSwapDefaults({
   defaultInputAddress,
   defaultInputAmount,
   defaultOutputAddress,

src/lib/hooks/swap/useSwapInfo.tsx

 import { Trans } from '@lingui/macro'
 import { Currency, CurrencyAmount, Percent, TradeType } from '@uniswap/sdk-core'
-import { FeeOptions } from '@uniswap/v3-sdk'
 import useAutoSlippageTolerance from 'hooks/useAutoSlippageTolerance'
 import { atom } from 'jotai'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
 import { useCurrencyBalances } from 'lib/hooks/useCurrencyBalance'
 import { maxSlippageAtom } from 'lib/state/settings'
-import { DEFAULT_FEE_OPTIONS, feeOptionsAtom, Field, swapAtom } from 'lib/state/swap'
+import { Field, swapAtom } from 'lib/state/swap'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { ReactNode, useEffect, useMemo } from 'react'
 import { InterfaceTrade, TradeState } from 'state/routing/types'
@@ -24,7 +23,6 @@ interface SwapInfo {
     state: TradeState
   }
   allowedSlippage: Percent
-  fee: FeeOptions
 }
 
 const BAD_RECIPIENT_ADDRESSES: { [address: string]: true } = {
@@ -44,8 +42,6 @@ function useComputeSwapInfo(): SwapInfo {
     [Field.OUTPUT]: outputCurrency,
   } = useAtomValue(swapAtom)
 
-  const fee = useAtomValue(feeOptionsAtom)
-
   const to = account
 
   const relevantTokenBalances = useCurrencyBalances(
@@ -143,9 +139,8 @@ function useComputeSwapInfo(): SwapInfo {
       inputError,
       trade,
       allowedSlippage,
-      fee,
     }),
-    [currencies, currencyBalances, currencyAmounts, inputError, trade, allowedSlippage, fee]
+    [currencies, currencyBalances, currencyAmounts, inputError, trade, allowedSlippage]
   )
 }
 
@@ -155,7 +150,6 @@ const swapInfoAtom = atom<SwapInfo>({
   currencyAmounts: {},
   trade: { state: TradeState.INVALID },
   allowedSlippage: new Percent(0),
-  fee: DEFAULT_FEE_OPTIONS,
 })
 
 export function SwapInfoUpdater() {

src/lib/hooks/swap/useSyncConvenienceFee.ts

-import { Percent } from '@uniswap/sdk-core'
-import useActiveWeb3React from 'hooks/useActiveWeb3React'
-import { useUpdateAtom } from 'jotai/utils'
-import { DEFAULT_FEE_OPTIONS, feeOptionsAtom } from 'lib/state/swap'
-import { useEffect } from 'react'
-
-interface FeeOptionsArgs {
-  convenienceFee?: number
-  convenienceFeeRecipient?: string | string | { [chainId: number]: string }
-}
-
-export default function useSyncConvenienceFee({ convenienceFee, convenienceFeeRecipient }: FeeOptionsArgs) {
-  const { chainId } = useActiveWeb3React()
-  const updateFeeOptions = useUpdateAtom(feeOptionsAtom)
-
-  useEffect(() => {
-    if (convenienceFee && convenienceFeeRecipient) {
-      if (typeof convenienceFeeRecipient === 'string') {
-        updateFeeOptions({
-          fee: new Percent(convenienceFee, 10_000),
-          recipient: convenienceFeeRecipient,
-        })
-        return
-      }
-      if (chainId && convenienceFeeRecipient[chainId]) {
-        updateFeeOptions({
-          fee: new Percent(convenienceFee, 10_000),
-          recipient: convenienceFeeRecipient[chainId],
-        })
-        return
-      }
-    }
-    updateFeeOptions(DEFAULT_FEE_OPTIONS)
-  }, [chainId, convenienceFee, convenienceFeeRecipient, updateFeeOptions])
-}

src/lib/state/swap.ts

-import { Currency, Percent } from '@uniswap/sdk-core'
-import { FeeOptions } from '@uniswap/v3-sdk'
+import { Currency } from '@uniswap/sdk-core'
 import { SupportedChainId } from 'constants/chains'
 import { nativeOnChain } from 'constants/tokens'
 import { atom } from 'jotai'
@@ -28,9 +27,3 @@ export const independentFieldAtom = pickAtom(swapAtom, 'independentField')
 
 // If set to a transaction hash, that transaction will display in a status dialog.
 export const displayTxHashAtom = atom<string | undefined>(undefined)
-
-export const DEFAULT_FEE_OPTIONS = {
-  fee: new Percent(0),
-  recipient: '',
-}
-export const feeOptionsAtom = atom<FeeOptions>(DEFAULT_FEE_OPTIONS)