feat: eip1559 fees

package.json

@@ -273,6 +273,35 @@
     "react-dom@^18.2.0": "patch:react-dom@npm%3A18.2.0#./.yarn/patches/react-dom-npm-18.2.0-dd675bca1c.patch"
   },
   "jest": {
-    "resetMocks": false
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      ".d.ts",
+      ".js",
+      "__mocks__",
+      "mockData"
+    ],
+    "clearMocks": true,
+    "resetMocks": false,
+    "roots": [
+      "<rootDir>"
+    ],
+    "collectCoverage": false,
+    "setupFiles": [
+      "<rootDir>/.jest/setup.js"
+    ],
+    "moduleNameMapper": {
+      "^@shapeshiftoss\\/([^/ ]+)": [
+        "@shapeshiftoss/$1",
+        "@shapeshiftoss/$1/src"
+      ]
+    },
+    "globals": {
+      "ts-jest": {
+        "sourceMap": true,
+        "isolatedModules": true
+      }
+    }
   }
-}
+}

packages/chain-adapters/src/evm/EvmBaseAdapter.ts

@@ -37,7 +37,6 @@ import type {
 import { ValidAddressResultType } from '../types'
 import {
   chainIdToChainLabel,
-  convertNumberToHex,
   getAssetNamespace,
   toAddressNList,
   toRootDerivationPath,
@@ -548,7 +547,7 @@ export abstract class EvmBaseAdapter<T extends EvmChainId> implements IChainAdap
       const bip44Params = this.getBIP44Params({ accountNumber })
       const txToSign = {
         addressNList: toAddressNList(bip44Params),
-        value: convertNumberToHex(value),
+        value: numberToHex(value),
         to,
         chainId: Number(fromChainId(this.chainId).chainReference),
         data,

src/features/defi/helpers/utils.ts

@@ -1,6 +1,9 @@
 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 { HDWallet } from '@shapeshiftoss/hdwallet-core'
+import { supportsETH } from '@shapeshiftoss/hdwallet-core'
 import { bnOrZero } from 'lib/bignumber/bignumber'
 import { selectPortfolioCryptoPrecisionBalanceByFilter } from 'state/slices/selectors'
 import { store } from 'state/store'
@@ -34,3 +37,68 @@ export const canCoverTxFees = ({
 
   return bnOrZero(feeAssetBalanceCryptoHuman).minus(bnOrZero(estimatedGasCryptoPrecision)).gte(0)
 }
+
+type GetFeesFromFeeDataArgs = {
+  wallet: HDWallet
+  feeData: evm.FeeData
+}
+
+export const getFeesFromFeeData = async ({
+  wallet,
+  feeData: { gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas },
+}: GetFeesFromFeeDataArgs): Promise<evm.Fees & { gasLimit: string }> => {
+  if (!supportsETH(wallet)) throw new Error('wallet has no evm support')
+  if (!gasLimit) throw new Error('gasLimit is required')
+
+  const eip1559Support = await wallet.ethSupportsEIP1559()
+
+  // use eip1559 fees if able
+  if (eip1559Support && maxFeePerGas && maxPriorityFeePerGas) {
+    return { gasLimit, maxFeePerGas, maxPriorityFeePerGas }
+  }
+
+  // fallback to legacy fees if unable to use eip1559
+  if (gasPrice) return { gasLimit, gasPrice }
+
+  throw new Error('legacy gas or eip1559 gas required')
+}
+
+type BuildAndBroadcastArgs = GetFeesFromFeeDataArgs & {
+  accountNumber: number
+  adapter: EvmChainAdapter
+  data?: string
+  to: string
+  value: string
+}
+
+export const buildAndBroadcast = async ({
+  accountNumber,
+  adapter,
+  data,
+  feeData,
+  to,
+  value,
+  wallet,
+}: BuildAndBroadcastArgs) => {
+  const { txToSign } = await adapter.buildCustomTx({
+    wallet,
+    to,
+    accountNumber,
+    value,
+    data: data ?? '0x',
+    ...(await getFeesFromFeeData({ wallet, feeData })),
+  })
+
+  if (wallet.supportsOfflineSigning()) {
+    const signedTx = await adapter.signTransaction({ txToSign, wallet })
+    const txid = await adapter.broadcastTransaction(signedTx)
+    return txid
+  }
+
+  if (wallet.supportsBroadcast() && adapter.signAndBroadcastTransaction) {
+    const txid = await adapter.signAndBroadcastTransaction({ txToSign, wallet })
+    return txid
+  }
+
+  throw new Error('buildAndBroadcast: no broadcast support')
+}

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

@@ -70,7 +70,7 @@ export const ClaimConfirm = ({ accountId, assetId, amount, onBack }: ClaimConfir
 
   assertIsFoxEthStakingContractAddress(contractAddress)
 
-  const { claimRewards, getClaimGasData, foxFarmingContract } = useFoxFarming(contractAddress)
+  const { claimRewards, getClaimFeeData, foxFarmingContract } = useFoxFarming(contractAddress)
   const translate = useTranslate()
   const mixpanel = getMixPanel()
   const { onOngoingFarmingTxIdChange } = useFoxEth()
@@ -156,7 +156,7 @@ export const ClaimConfirm = ({ accountId, assetId, amount, onBack }: ClaimConfir
           !(walletState.wallet && feeAsset && feeMarketData && foxFarmingContract && accountAddress)
         )
           return
-        const gasEstimate = await getClaimGasData(accountAddress)
+        const gasEstimate = await getClaimFeeData(accountAddress)
         if (!gasEstimate) throw new Error('Gas estimation failed')
         const estimatedGasCrypto = bnOrZero(gasEstimate.average.txFee)
           .div(`1e${feeAsset.precision}`)
@@ -174,7 +174,7 @@ export const ClaimConfirm = ({ accountId, assetId, amount, onBack }: ClaimConfir
     feeAsset.precision,
     feeMarketData,
     feeMarketData.price,
-    getClaimGasData,
+    getClaimFeeData,
     walletState.wallet,
     foxFarmingContract,
   ])

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

@@ -68,7 +68,7 @@ export const Approve: React.FC<FoxFarmingApproveProps> = ({ accountId, onNext })
   )
   assertIsFoxEthStakingContractAddress(contractAddress)
 
-  const { allowance, approve, getStakeGasData } = useFoxFarming(contractAddress)
+  const { allowance, approve, getStakeFeeData } = useFoxFarming(contractAddress)
 
   const assets = useAppSelector(selectAssets)
 
@@ -109,7 +109,7 @@ export const Approve: React.FC<FoxFarmingApproveProps> = ({ accountId, onNext })
         maxAttempts: 30,
       })
       // Get deposit gas estimate
-      const gasData = await getStakeGasData(state.deposit.cryptoAmount)
+      const gasData = await getStakeFeeData(state.deposit.cryptoAmount)
       if (!gasData) return
       const estimatedGasCryptoPrecision = bnOrZero(gasData.average.txFee)
         .div(bn(10).pow(feeAsset.precision))
@@ -147,7 +147,7 @@ export const Approve: React.FC<FoxFarmingApproveProps> = ({ accountId, onNext })
     wallet,
     asset,
     approve,
-    getStakeGasData,
+    getStakeFeeData,
     feeAsset.precision,
     onNext,
     assets,

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

@@ -95,8 +95,8 @@ export const Deposit: React.FC<DepositProps> = ({
 
   const {
     allowance: foxFarmingAllowance,
-    getStakeGasData,
-    getApproveGasData,
+    getStakeFeeData,
+    getApproveFeeData,
   } = useFoxFarming(contractAddress)
 
   const feeAssetId = getChainAdapterManager().get(chainId)?.getFeeAssetId()
@@ -132,7 +132,7 @@ export const Deposit: React.FC<DepositProps> = ({
       ): Promise<string | undefined> => {
         if (!assetReference) return
         try {
-          const gasData = await getStakeGasData(deposit.cryptoAmount)
+          const gasData = await getStakeFeeData(deposit.cryptoAmount)
           if (!gasData) return
           return bnOrZero(gasData.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
         } catch (error) {
@@ -180,7 +180,7 @@ export const Deposit: React.FC<DepositProps> = ({
             assets,
           )
         } else {
-          const estimatedGasCryptoBaseUnit = await getApproveGasData()
+          const estimatedGasCryptoBaseUnit = await getApproveFeeData()
           if (!estimatedGasCryptoBaseUnit) return
           dispatch({
             type: FoxFarmingDepositActionType.SET_APPROVE,
@@ -210,14 +210,14 @@ export const Deposit: React.FC<DepositProps> = ({
       feeAsset,
       foxFarmingOpportunity,
       assetReference,
-      getStakeGasData,
+      getStakeFeeData,
       toast,
       translate,
       asset,
       foxFarmingAllowance,
       onNext,
       assets,
-      getApproveGasData,
+      getApproveFeeData,
     ],
   )
 

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

@@ -67,7 +67,7 @@ export const Approve: React.FC<ApproveProps> = ({ accountId, onNext }) => {
 
   assertIsFoxEthStakingContractAddress(contractAddress)
 
-  const { allowance, approve, getUnstakeGasData } = useFoxFarming(contractAddress)
+  const { allowance, approve, getUnstakeFeeData } = useFoxFarming(contractAddress)
   const toast = useToast()
   const assets = useAppSelector(selectAssets)
 
@@ -107,7 +107,7 @@ export const Approve: React.FC<ApproveProps> = ({ accountId, onNext }) => {
         maxAttempts: 30,
       })
       // Get withdraw gas estimate
-      const gasData = await getUnstakeGasData(state.withdraw.lpAmount, state.withdraw.isExiting)
+      const gasData = await getUnstakeFeeData(state.withdraw.lpAmount, state.withdraw.isExiting)
       if (!gasData) return
       const estimatedGasCrypto = bnOrZero(gasData.average.txFee)
         .div(bn(10).pow(underlyingAsset?.precision ?? 0))
@@ -145,7 +145,7 @@ export const Approve: React.FC<ApproveProps> = ({ accountId, onNext }) => {
     opportunity,
     wallet,
     approve,
-    getUnstakeGasData,
+    getUnstakeFeeData,
     underlyingAsset?.precision,
     onNext,
     assets,

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

@@ -70,7 +70,7 @@ export const ExpiredWithdraw: React.FC<ExpiredWithdrawProps> = ({
 
   assertIsFoxEthStakingContractAddress(contractAddress)
 
-  const { getUnstakeGasData, allowance, getApproveGasData } = useFoxFarming(contractAddress)
+  const { getUnstakeFeeData, allowance, getApproveFeeData } = useFoxFarming(contractAddress)
 
   const methods = useForm<WithdrawValues>({ mode: 'onChange' })
 
@@ -108,7 +108,7 @@ export const ExpiredWithdraw: React.FC<ExpiredWithdrawProps> = ({
 
   const getWithdrawGasEstimate = async () => {
     try {
-      const fee = await getUnstakeGasData(amountAvailableCryptoPrecision.toFixed(), true)
+      const fee = await getUnstakeFeeData(amountAvailableCryptoPrecision.toFixed(), true)
       if (!fee) return
       return bnOrZero(fee.average.txFee).div(bn(10).pow(feeAsset.precision)).toPrecision()
     } catch (error) {
@@ -162,7 +162,7 @@ export const ExpiredWithdraw: React.FC<ExpiredWithdrawProps> = ({
         assets,
       )
     } else {
-      const estimatedGasCrypto = await getApproveGasData()
+      const estimatedGasCrypto = await getApproveFeeData()
       if (!estimatedGasCrypto) return
       dispatch({
         type: FoxFarmingWithdrawActionType.SET_APPROVE,

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

@@ -64,7 +64,7 @@ export const Withdraw: React.FC<WithdrawProps> = ({
 
   assertIsFoxEthStakingContractAddress(contractAddress)
 
-  const { getUnstakeGasData, allowance, getApproveGasData } = useFoxFarming(contractAddress)
+  const { getUnstakeFeeData, allowance, getApproveFeeData } = useFoxFarming(contractAddress)
 
   const methods = useForm<WithdrawValues>({ mode: 'onChange' })
   const { setValue } = methods
@@ -95,15 +95,15 @@ export const Withdraw: React.FC<WithdrawProps> = ({
   const getWithdrawGasEstimateCryptoPrecision = useCallback(
     async (withdraw: WithdrawValues) => {
       try {
-        const fee = await getUnstakeGasData(withdraw.cryptoAmount, isExiting)
+        const fee = await getUnstakeFeeData(withdraw.cryptoAmount, isExiting)
         if (!fee) return
         return bnOrZero(fee.average.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:')
       }
     },
-    [feeAsset.precision, getUnstakeGasData, isExiting],
+    [feeAsset.precision, getUnstakeFeeData, isExiting],
   )
 
   const handleContinue = useCallback(
@@ -147,7 +147,7 @@ export const Withdraw: React.FC<WithdrawProps> = ({
           assets,
         )
       } else {
-        const estimatedGasCrypto = await getApproveGasData()
+        const estimatedGasCrypto = await getApproveFeeData()
         if (!estimatedGasCrypto) return
         dispatch({
           type: FoxFarmingWithdrawActionType.SET_APPROVE,
@@ -166,7 +166,7 @@ export const Withdraw: React.FC<WithdrawProps> = ({
       assets,
       dispatch,
       feeAsset.precision,
-      getApproveGasData,
+      getApproveFeeData,
       getWithdrawGasEstimateCryptoPrecision,
       isExiting,
       onNext,