feat: eip1559 fees

src/features/defi/helpers/utils.ts

@@ -1,7 +1,13 @@
 import type { Asset } from '@shapeshiftoss/asset-service'
 import type { AccountId, ChainId } from '@shapeshiftoss/caip'
 import { cosmosChainId, osmosisChainId } from '@shapeshiftoss/caip'
-import type { evm, EvmChainAdapter } from '@shapeshiftoss/chain-adapters'
+import type {
+  evm,
+  EvmChainAdapter,
+  EvmChainId,
+  FeeData,
+  FeeDataEstimate,
+} from '@shapeshiftoss/chain-adapters'
 import type { HDWallet } from '@shapeshiftoss/hdwallet-core'
 import { supportsETH } from '@shapeshiftoss/hdwallet-core'
 import { bnOrZero } from 'lib/bignumber/bignumber'
@@ -38,6 +44,19 @@ export const canCoverTxFees = ({
   return bnOrZero(feeAssetBalanceCryptoHuman).minus(bnOrZero(estimatedGasCryptoPrecision)).gte(0)
 }
 
+export const getFeeDataFromEstimate = ({
+  average,
+  fast,
+}: FeeDataEstimate<EvmChainId>): FeeData<EvmChainId> => ({
+  txFee: fast.txFee, // use worst case tx fee for display purposes
+  chainSpecific: {
+    gasLimit: average.chainSpecific.gasLimit, // average and fast gasLimit values are the same
+    gasPrice: fast.chainSpecific.gasPrice, // fast gas price since it is underestimated currently
+    maxFeePerGas: average.chainSpecific.maxFeePerGas,
+    maxPriorityFeePerGas: average.chainSpecific.maxPriorityFeePerGas,
+  },
+})
+
 type GetFeesFromFeeDataArgs = {
   wallet: HDWallet
   feeData: evm.FeeData

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Claim/ClaimConfirm.tsx

@@ -156,9 +156,9 @@ export const ClaimConfirm = ({ accountId, assetId, amount, onBack }: ClaimConfir
           !(walletState.wallet && feeAsset && feeMarketData && foxFarmingContract && accountAddress)
         )
           return
-        const gasEstimate = await getClaimFeeData(accountAddress)
-        if (!gasEstimate) throw new Error('Gas estimation failed')
-        const estimatedGasCrypto = bnOrZero(gasEstimate.average.txFee)
+        const feeData = await getClaimFeeData(accountAddress)
+        if (!feeData) throw new Error('Gas estimation failed')
+        const estimatedGasCrypto = bnOrZero(feeData.txFee)
           .div(`1e${feeAsset.precision}`)
           .toPrecision()
         setCanClaim(true)

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Deposit/components/Approve.tsx

@@ -109,9 +109,9 @@ export const Approve: React.FC<FoxFarmingApproveProps> = ({ accountId, onNext })
         maxAttempts: 30,
       })
       // Get deposit gas estimate
-      const gasData = await getStakeFeeData(state.deposit.cryptoAmount)
-      if (!gasData) return
-      const estimatedGasCryptoPrecision = bnOrZero(gasData.average.txFee)
+      const feeData = await getStakeFeeData(state.deposit.cryptoAmount)
+      if (!feeData) return
+      const estimatedGasCryptoPrecision = bnOrZero(feeData.txFee)
         .div(bn(10).pow(feeAsset.precision))
         .toPrecision()
       dispatch({

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Deposit/components/Deposit.tsx

@@ -132,9 +132,9 @@ export const Deposit: React.FC<DepositProps> = ({
       ): Promise<string | undefined> => {
         if (!assetReference) return
         try {
-          const gasData = await getStakeFeeData(deposit.cryptoAmount)
-          if (!gasData) return
-          return bnOrZero(gasData.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
+          const feeData = await getStakeFeeData(deposit.cryptoAmount)
+          if (!feeData) return
+          return bnOrZero(feeData.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
         } catch (error) {
           moduleLogger.error(
             { fn: 'getDepositGasEstimateCryptoPrecision', error },
@@ -180,12 +180,12 @@ export const Deposit: React.FC<DepositProps> = ({
             assets,
           )
         } else {
-          const estimatedGasCryptoBaseUnit = await getApproveFeeData()
-          if (!estimatedGasCryptoBaseUnit) return
+          const feeData = await getApproveFeeData()
+          if (!feeData) return
           dispatch({
             type: FoxFarmingDepositActionType.SET_APPROVE,
             payload: {
-              estimatedGasCryptoPrecision: bnOrZero(estimatedGasCryptoBaseUnit.average.txFee)
+              estimatedGasCryptoPrecision: bnOrZero(feeData.txFee)
                 .div(bn(10).pow(feeAsset.precision))
                 .toPrecision(),
             },

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Withdraw/components/Approve.tsx

@@ -107,9 +107,9 @@ export const Approve: React.FC<ApproveProps> = ({ accountId, onNext }) => {
         maxAttempts: 30,
       })
       // Get withdraw gas estimate
-      const gasData = await getUnstakeFeeData(state.withdraw.lpAmount, state.withdraw.isExiting)
-      if (!gasData) return
-      const estimatedGasCrypto = bnOrZero(gasData.average.txFee)
+      const feeData = await getUnstakeFeeData(state.withdraw.lpAmount, state.withdraw.isExiting)
+      if (!feeData) return
+      const estimatedGasCrypto = bnOrZero(feeData.txFee)
         .div(bn(10).pow(underlyingAsset?.precision ?? 0))
         .toPrecision()
       dispatch({

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Withdraw/components/ExpiredWithdraw.tsx

@@ -108,9 +108,9 @@ export const ExpiredWithdraw: React.FC<ExpiredWithdrawProps> = ({
 
   const getWithdrawGasEstimate = async () => {
     try {
-      const fee = await getUnstakeFeeData(amountAvailableCryptoPrecision.toFixed(), true)
-      if (!fee) return
-      return bnOrZero(fee.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
+      const feeData = await getUnstakeFeeData(amountAvailableCryptoPrecision.toFixed(), true)
+      if (!feeData) return
+      return bnOrZero(feeData.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
     } catch (error) {
       // TODO: handle client side errors maybe add a toast?
       moduleLogger.error(
@@ -162,12 +162,12 @@ export const ExpiredWithdraw: React.FC<ExpiredWithdrawProps> = ({
         assets,
       )
     } else {
-      const estimatedGasCrypto = await getApproveFeeData()
-      if (!estimatedGasCrypto) return
+      const feeData = await getApproveFeeData()
+      if (!feeData) return
       dispatch({
         type: FoxFarmingWithdrawActionType.SET_APPROVE,
         payload: {
-          estimatedGasCryptoPrecision: bnOrZero(estimatedGasCrypto.average.txFee)
+          estimatedGasCryptoPrecision: bnOrZero(feeData.txFee)
             .div(bn(10).pow(feeAsset.precision))
             .toPrecision(),
         },

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Withdraw/components/Withdraw.tsx

@@ -95,9 +95,9 @@ export const Withdraw: React.FC<WithdrawProps> = ({
   const getWithdrawGasEstimateCryptoPrecision = useCallback(
     async (withdraw: WithdrawValues) => {
       try {
-        const fee = await getUnstakeFeeData(withdraw.cryptoAmount, isExiting)
-        if (!fee) return
-        return bnOrZero(fee.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
+        const feeData = await getUnstakeFeeData(withdraw.cryptoAmount, isExiting)
+        if (!feeData) return
+        return bnOrZero(feeData.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
       } catch (error) {
         // TODO: handle client side errors maybe add a toast?
         moduleLogger.error(error, 'FoxFarmingWithdraw:getWithdrawGasEstimate error:')
@@ -147,12 +147,12 @@ export const Withdraw: React.FC<WithdrawProps> = ({
           assets,
         )
       } else {
-        const estimatedGasCrypto = await getApproveFeeData()
-        if (!estimatedGasCrypto) return
+        const feeData = await getApproveFeeData()
+        if (!feeData) return
         dispatch({
           type: FoxFarmingWithdrawActionType.SET_APPROVE,
           payload: {
-            estimatedGasCryptoPrecision: bnOrZero(estimatedGasCrypto.average.txFee)
+            estimatedGasCryptoPrecision: bnOrZero(feeData.txFee)
               .div(bn(10).pow(feeAsset.precision))
               .toPrecision(),
           },

src/features/defi/providers/fox-farming/hooks/useFoxFarming.ts

@@ -6,7 +6,7 @@ import {
   UNISWAP_V2_ROUTER_02_CONTRACT_ADDRESS,
 } from 'contracts/constants'
 import { getOrCreateContractByAddress } from 'contracts/contractManager'
-import { buildAndBroadcast } from 'features/defi/helpers/utils'
+import { buildAndBroadcast, getFeeDataFromEstimate } from 'features/defi/helpers/utils'
 import { useCallback, useMemo } from 'react'
 import { useFoxEth } from 'context/FoxEthProvider/FoxEthProvider'
 import { getChainAdapterManager } from 'context/PluginProvider/chainAdapterSingleton'
@@ -81,7 +81,7 @@ export const useFoxFarming = (
           bnOrZero(lpAmount).times(bnOrZero(10).exponentiatedBy(lpAsset.precision)).toFixed(0),
         ])
 
-        const { average } = await adapter.getFeeData({
+        const feeData = await adapter.getFeeData({
           to: contractAddress,
           value: '0',
           chainSpecific: {
@@ -93,7 +93,7 @@ export const useFoxFarming = (
         const txid = await buildAndBroadcast({
           accountNumber,
           adapter,
-          feeData: average.chainSpecific,
+          feeData: getFeeDataFromEstimate(feeData).chainSpecific,
           to: contractAddress,
           value: '0',
           wallet,
@@ -135,7 +135,7 @@ export const useFoxFarming = (
               bnOrZero(lpAmount).times(bnOrZero(10).exponentiatedBy(lpAsset.precision)).toFixed(0),
             ])
 
-        const { average } = await adapter.getFeeData({
+        const feeData = await adapter.getFeeData({
           to: contractAddress,
           value: '0',
           chainSpecific: {
@@ -147,7 +147,7 @@ export const useFoxFarming = (
         const txid = await buildAndBroadcast({
           accountNumber,
           adapter,
-          feeData: average.chainSpecific,
+          feeData: getFeeDataFromEstimate(feeData).chainSpecific,
           to: contractAddress,
           value: '0',
           wallet,
@@ -201,7 +201,7 @@ export const useFoxFarming = (
       },
     })
 
-    return feeData
+    return getFeeDataFromEstimate(feeData)
   }, [adapter, farmingAccountId, contractAddress, uniV2LPContract])
 
   const getStakeFeeData = useCallback(
@@ -223,7 +223,7 @@ export const useFoxFarming = (
         },
       })
 
-      return feeData
+      return getFeeDataFromEstimate(feeData)
     },
     [
       adapter,
@@ -257,7 +257,7 @@ export const useFoxFarming = (
         },
       })
 
-      return feeData
+      return getFeeDataFromEstimate(feeData)
     },
     [
       adapter,
@@ -285,7 +285,7 @@ export const useFoxFarming = (
         },
       })
 
-      return feeData
+      return getFeeDataFromEstimate(feeData)
     },
     [adapter, contractAddress, foxFarmingContract],
   )
@@ -306,7 +306,7 @@ export const useFoxFarming = (
     const txid = await buildAndBroadcast({
       accountNumber,
       adapter,
-      feeData: feeData.average.chainSpecific,
+      feeData: feeData.chainSpecific,
       to: uniV2LPContract.address,
       value: '0',
       wallet,
@@ -336,7 +336,7 @@ export const useFoxFarming = (
     const data = foxFarmingContract.interface.encodeFunctionData('getReward')
     const farmingAccountAddress = fromAccountId(farmingAccountId).account
 
-    const { average } = await adapter.getFeeData({
+    const feeData = await adapter.getFeeData({
       to: contractAddress,
       value: '0',
       chainSpecific: {
@@ -348,7 +348,7 @@ export const useFoxFarming = (
     const txid = await buildAndBroadcast({
       accountNumber,
       adapter,
-      feeData: average.chainSpecific,
+      feeData: getFeeDataFromEstimate(feeData).chainSpecific,
       to: contractAddress,
       value: '0',
       wallet,

src/features/defi/providers/univ2/components/UniV2Manager/Deposit/components/Approve.tsx

@@ -241,13 +241,12 @@ export const Approve: React.FC<UniV2ApproveProps> = ({ accountId, onNext }) => {
       if (!(state && dispatch && lpOpportunity)) return
       if (!(isApprove0Needed || isApprove1Needed)) return
       if (isAsset0AllowanceGranted && isAsset1AllowanceGranted) {
-        // Get deposit gas estimate
-        const gasData = await getDepositFeeData({
+        const feeData = await getDepositFeeData({
           token0Amount: state.deposit.asset0CryptoAmount,
           token1Amount: state.deposit.asset1CryptoAmount,
         })
-        if (!gasData) return
-        const estimatedGasCryptoPrecision = bnOrZero(gasData.average.txFee)
+        if (!feeData) return
+        const estimatedGasCryptoPrecision = bnOrZero(feeData.txFee)
           .div(bn(10).pow(feeAsset.precision))
           .toPrecision()
         dispatch({

src/features/defi/providers/univ2/components/UniV2Manager/Deposit/components/Deposit.tsx

@@ -118,12 +118,12 @@ export const Deposit: React.FC<DepositProps> = ({
     if (!feeAsset) return
     const { cryptoAmount0: token0Amount, cryptoAmount1: token1Amount } = deposit
     try {
-      const gasData = await getDepositFeeData({
+      const feeData = await getDepositFeeData({
         token0Amount,
         token1Amount,
       })
-      if (!gasData) return
-      return bnOrZero(gasData.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
+      if (!feeData) return
+      return bnOrZero(feeData.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
     } catch (error) {
       moduleLogger.error(
         { fn: 'getDepositGasEstimateCryptoPrecision', error },
@@ -201,28 +201,28 @@ export const Deposit: React.FC<DepositProps> = ({
         // While the naive approach would be to think both assets approve() calls are going to result in the same gas estimation,
         // this is not necesssarly true. Some ERC-20s approve() might have a bit more logic, and thus require more gas.
         // e.g https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L119
-        const asset0EstimatedGasCrypto =
+        const asset0FeeData =
           assetId0 !== ethAssetId && (await getApproveFeeData(asset0ContractAddress!))
-        const asset1EstimatedGasCrypto =
+        const asset1FeeData =
           assetId1 !== ethAssetId && (await getApproveFeeData(asset1ContractAddress!))
-        if (!(asset0EstimatedGasCrypto || asset1EstimatedGasCrypto)) return
+        if (!(asset0FeeData || asset1FeeData)) return
 
-        if (!isAsset0AllowanceGranted && asset0EstimatedGasCrypto) {
+        if (!isAsset0AllowanceGranted && asset0FeeData) {
           dispatch({
             type: UniV2DepositActionType.SET_APPROVE_0,
             payload: {
-              estimatedGasCryptoPrecision: bnOrZero(asset0EstimatedGasCrypto.average.txFee)
+              estimatedGasCryptoPrecision: bnOrZero(asset0FeeData.txFee)
                 .div(bn(10).pow(feeAsset.precision))
                 .toPrecision(),
             },
           })
         }
 
-        if (!isAsset1AllowanceGranted && asset1EstimatedGasCrypto) {
+        if (!isAsset1AllowanceGranted && asset1FeeData) {
           dispatch({
             type: UniV2DepositActionType.SET_APPROVE_1,
             payload: {
-              estimatedGasCryptoPrecision: bnOrZero(asset1EstimatedGasCrypto.average.txFee)
+              estimatedGasCryptoPrecision: bnOrZero(asset1FeeData.txFee)
                 .div(bn(10).pow(feeAsset.precision))
                 .toPrecision(),
             },

src/features/defi/providers/univ2/components/UniV2Manager/Withdraw/components/Approve.tsx

@@ -127,14 +127,13 @@ export const Approve: React.FC<UniV2ApproveProps> = ({ accountId, onNext }) => {
         interval: 15000,
         maxAttempts: 30,
       })
-      // Get withdraw gas estimate
-      const gasData = await getWithdrawFeeData(
+      const feeData = await getWithdrawFeeData(
         state.withdraw.lpAmount,
         state.withdraw.asset0Amount,
         state.withdraw.asset1Amount,
       )
-      if (!gasData) return
-      const estimatedGasCryptoPrecision = bnOrZero(gasData.average.txFee)
+      if (!feeData) return
+      const estimatedGasCryptoPrecision = bnOrZero(feeData.txFee)
         .div(bn(10).pow(feeAsset.precision))
         .toPrecision()
       dispatch({

src/features/defi/providers/univ2/components/UniV2Manager/Withdraw/components/Withdraw.tsx

@@ -136,13 +136,13 @@ export const Withdraw: React.FC<WithdrawProps> = ({
 
   const getWithdrawGasEstimateCryptoPrecision = async (withdraw: WithdrawValues) => {
     try {
-      const fee = await getWithdrawFeeData(
+      const feeData = await getWithdrawFeeData(
         withdraw.cryptoAmount,
         asset0AmountCryptoPrecision,
         asset1AmountCryptoPrecision,
       )
-      if (!fee) return
-      return bnOrZero(fee.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
+      if (!feeData) return
+      return bnOrZero(feeData.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
     } catch (error) {
       // TODO: handle client side errors maybe add a toast?
       moduleLogger.error(error, 'UniV2Withdraw:getWithdrawGasEstimate error:')
@@ -196,12 +196,12 @@ export const Withdraw: React.FC<WithdrawProps> = ({
       dispatch({ type: UniV2WithdrawActionType.SET_LOADING, payload: false })
     } else {
       const lpAssetContractAddress = ethers.utils.getAddress(fromAssetId(lpAssetId).assetReference)
-      const estimatedGasCryptoPrecision = await getApproveFeeData(lpAssetContractAddress)
-      if (!estimatedGasCryptoPrecision) return
+      const feeData = await getApproveFeeData(lpAssetContractAddress)
+      if (!feeData) return
       dispatch({
         type: UniV2WithdrawActionType.SET_APPROVE,
         payload: {
-          estimatedGasCryptoPrecision: bnOrZero(estimatedGasCryptoPrecision.average.txFee)
+          estimatedGasCryptoPrecision: bnOrZero(feeData.txFee)
             .div(bn(10).pow(feeAsset.precision))
             .toPrecision(),
         },