@exodus/ethereum-api 8.34.2 → 8.34.3

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.34.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.34.2...@exodus/ethereum-api@8.34.3) (2025-04-29)
+
+
+### Bug Fixes
+
+
+* fix: prevent insufficient evm custom fees on eip1559Enabled networks (#5519)
+
+
+
 ## [8.34.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.34.1...@exodus/ethereum-api@8.34.2) (2025-04-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.34.2",
+  "version": "8.34.3",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Ethereum and EVM-based blockchains",
   "type": "module",
   "main": "src/index.js",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "e7d49daa108ffa7200e33f6cfe2d1c175cd675ea"
+  "gitHead": "5513269ef920bfdd91701a8108fe73336d105866"
 }

package/src/create-asset.js

@@ -28,7 +28,7 @@ import { createEvmServer, ValidMonitorTypes } from './exodus-eth-server/index.js
 import { createFeeData } from './fee-data-factory.js'
 import { createGetBalanceForAddress } from './get-balance-for-address.js'
 import { getBalancesFactory } from './get-balances.js'
-import { getEffectiveGasPrice, getFeeFactory } from './get-fee.js'
+import { getFeeFactory } from './get-fee.js'
 import getFeeAsyncFactory from './get-fee-async.js'
 import { createEthereumHooks } from './hooks/index.js'
 import { estimateL1DataFeeFactory, getL1GetFeeFactory } from './optimism-gas/index.js'
@@ -323,7 +323,6 @@ export const createAssetFactory = ({
       server,
       ...(erc20FuelBuffer && { erc20FuelBuffer }),
       ...(fuelThreshold && { fuelThreshold: asset.currency.defaultUnit(fuelThreshold) }),
-      getEffectiveGasPrice,
     }
     return overrideCallback({
       asset: fullAsset,

package/src/custom-fees.js

@@ -2,21 +2,51 @@ import NumberUnit from '@exodus/currency'
 
 import { resolveGasPrice } from './fee-utils.js'
 
+const calculateMinCustomFee = ({ feeData }) => {
+  const { eip1559Enabled, baseFeePerGas, gasPriceMinimumRate } = feeData
+
+  // On `eip1559Enabled` networks, the `baseFeePerGas` is
+  // the minimum a transaction should be sent using, else
+  // get rejected by the RPC.
+  if (eip1559Enabled && baseFeePerGas) return baseFeePerGas.mul(Math.max(gasPriceMinimumRate, 1))
+
+  // On legacy networks, senders are permitted to send
+  // transactions below the `baseFeePerGas` (since these
+  // would not be rejected by the RPC - in fact, it was
+  // even possible to mine transactions with a `gasPrice`
+  // of `0`!).
+  return resolveGasPrice({ feeData }).mul(gasPriceMinimumRate)
+}
+
+const calculateRecommendedCustomFee = ({ min, feeData }) => {
+  const recommended = resolveGasPrice({ feeData })
+  // The `recommended` fee must be at least the `min`.
+  return recommended.gt(min) ? recommended : min
+}
+
+const calculateMaxCustomFee = ({ feeData, recommended }) => {
+  const { gasPriceMinimumRate, gasPriceMaximumRate } = feeData
+
+  const maxGasPrice = resolveGasPrice({ feeData }).mul(
+    Math.max(gasPriceMaximumRate, gasPriceMinimumRate)
+  )
+
+  // When calculating the `max` custom fee, the returned fee
+  // must be at least the `recommended` price.
+  return recommended.gt(maxGasPrice) ? recommended : maxGasPrice
+}
+
 export const createCustomFeesApi = ({ baseAsset }) => {
   const Gwei = baseAsset.currency.units.Gwei
   return {
     getRecommendedMinMaxFeeUnitPrices: ({ feeData }) => {
-      const { gasPriceMinimumRate, gasPriceMaximumRate } = feeData
-
-      const gasPrice = resolveGasPrice({ feeData })
-
-      const calculateFeeUnitPrice = (feeUnitPrice, multiplier = 1) =>
-        feeUnitPrice.mul(multiplier).toNumber(Gwei)
-
+      const min = calculateMinCustomFee({ feeData })
+      const recommended = calculateRecommendedCustomFee({ feeData, min })
+      const max = calculateMaxCustomFee({ feeData, recommended })
       return {
-        recommended: calculateFeeUnitPrice(gasPrice),
-        min: calculateFeeUnitPrice(gasPrice, gasPriceMinimumRate),
-        max: calculateFeeUnitPrice(gasPrice, gasPriceMaximumRate),
+        recommended: recommended.toNumber(Gwei),
+        min: min.toNumber(Gwei),
+        max: max.toNumber(Gwei),
       }
     },
     unit: 'gwei/gas',

package/src/fee-utils.js

@@ -41,9 +41,7 @@ export const rewriteFeeConfig = ({ feeAsset, feeConfig, feeData }) => {
 export const resolveGasPrice = ({ feeData }) => {
   assert(feeData, 'feeData is required')
 
-  const eip1559Enabled = feeData.eip1559Enabled
-
-  if (eip1559Enabled && feeData.useBaseGasPrice) {
+  if (feeData.eip1559Enabled) {
     return feeData.tipGasPrice
       ? feeData.baseFeePerGas.add(feeData.tipGasPrice)
       : feeData.baseFeePerGas
@@ -51,3 +49,8 @@ export const resolveGasPrice = ({ feeData }) => {
 
   return feeData.gasPrice
 }
+
+export const ensureSaneEip1559GasPriceForTipGasPrice = ({ gasPrice, tipGasPrice }) => {
+  if (!tipGasPrice || tipGasPrice.lt(gasPrice)) return gasPrice
+  return tipGasPrice
+}

package/src/get-fee.js

@@ -1,6 +1,6 @@
 import { calculateBumpedGasPrice, calculateExtraEth } from '@exodus/ethereum-lib'
 
-import { resolveGasPrice } from './fee-utils.js'
+import { ensureSaneEip1559GasPriceForTipGasPrice, resolveGasPrice } from './fee-utils.js'
 
 // Move to meta?
 const taxes = {
@@ -44,20 +44,20 @@ export const getFeeFactory =
       feeData = { ...feeData, tipGasPrice: customFee }
     }
 
-    const { baseFeePerGas, tipGasPrice, useBaseGasPrice } = feeData
+    const { baseFeePerGas, tipGasPrice } = feeData
 
     let gasPrice = customFee || resolveGasPrice({ feeData })
 
     // The `gasPrice` must be at least the `tipGasPrice`.
-    if (eip1559Enabled && tipGasPrice && gasPrice.lt(tipGasPrice)) {
-      gasPrice = tipGasPrice
+    if (eip1559Enabled) {
+      gasPrice = ensureSaneEip1559GasPriceForTipGasPrice({ gasPrice, tipGasPrice })
     }
 
     const gasLimit = providedGasLimit || asset.gasLimit || defaultGasLimit
 
     // When explicitly opting into EIP-1559 transactions,
     // lock in the `tipGasPrice` we used to compute the fees.
-    const maybeReturnTipGasPrice = eip1559Enabled && useBaseGasPrice ? { tipGasPrice } : null
+    const maybeReturnTipGasPrice = eip1559Enabled ? { tipGasPrice } : null
 
     const extraFeeData = getExtraFeeData({ asset, amount })
     if (calculateEffectiveFee && eip1559Enabled) {
@@ -78,26 +78,15 @@ export const getFeeFactory =
     return { ...maybeReturnTipGasPrice, fee, gasPrice, extraFeeData }
   }
 
-// Used in BE
-export const getEffectiveGasPrice = ({ feeData }) => {
-  const { baseFeePerGas, tipGasPrice, gasPrice: maxFeePerGas, eip1559Enabled } = feeData
-
-  if (!eip1559Enabled) {
-    return maxFeePerGas
-  }
-
-  const gasPrice = baseFeePerGas.add(tipGasPrice)
-  return gasPrice.lt(maxFeePerGas) ? gasPrice : maxFeePerGas
-}
-
 // Used in Mobile
 export const getExtraFeeForBump = ({ tx, feeData, balance, unconfirmedBalance }) => {
   if (!balance || !unconfirmedBalance) return null
-  const { gasPrice: currentGasPrice, eip1559Enabled } = feeData
+  const { gasPrice: currentGasPrice, eip1559Enabled, baseFeePerGas: currentBaseFee } = feeData
   const { bumpedGasPrice } = calculateBumpedGasPrice({
     baseAsset: 'ethereum',
     tx,
     currentGasPrice,
+    currentBaseFee,
     eip1559Enabled,
   })
   return calculateExtraEth({

package/src/staking/ethereum/service.js

@@ -18,15 +18,6 @@ const SLOT_ACTIVATION_PROXIMITY_ETH = '1.0'
 // ratio commonly fall under this limit.
 const MINIMUM_DELEGATION_GAS_LIMIT = 180_000
 
-// Use a custom `maxPriorityFeePerGas` so we can
-// respect the default EIP-1559 relationship:
-// maxFeePerGas = baseFeePerGas + maxPriorityFeePerGas.
-//
-// Currently, the backend will return an excessive
-// `tipGasPrice` which hinders the configuration ofrational
-// inclusion incentives when defined using remote config.
-const MAX_PRIORITY_FEE_PER_GAS = '0.06 Gwei' // semi-urgent
-
 const EXTRA_GAS_LIMIT = 20_000 // extra gas Limit to prevent tx failing if something change on pool state (till tx is in mempool)
 
 const DISABLE_BALANCE_CHECKS = '0x0'
@@ -35,9 +26,9 @@ export function createEthereumStakingService({
   asset,
   assetClientInterface,
   createWatchTx = defaultCreateWatch,
+  stakingProvider = stakingProviderClientFactory(),
 }) {
-  const staking = new EthereumStaking(asset)
-  const stakingProvider = stakingProviderClientFactory()
+  const staking = new EthereumStaking(asset, undefined, asset.server)
   const minAmount = staking.minAmount
 
   async function delegate({ walletAccount, amount } = Object.create(null)) {
@@ -360,7 +351,6 @@ export function createEthereumStakingService({
       amount,
       asset,
       assetClientInterface,
-      maxPriorityFeePerGas: MAX_PRIORITY_FEE_PER_GAS,
       gasLimit,
     })
 

package/src/staking/matic/service.js

@@ -8,7 +8,6 @@ import { amountToCurrency, getEvmStakingServiceFee } from '../utils/index.js'
 import { MaticStakingApi } from './api.js'
 
 const DISABLE_BALANCE_CHECKS = '0x0'
-const MAX_PRIORITY_FEE_PER_GAS = '0.06 Gwei' // semi-urgent
 
 export function createPolygonStakingService({
   assetClientInterface,
@@ -258,7 +257,6 @@ export function createPolygonStakingService({
       amount,
       asset: ethereum,
       assetClientInterface,
-      maxPriorityFeePerGas: MAX_PRIORITY_FEE_PER_GAS,
       gasLimit,
     })
   }

package/src/staking/utils/index.js

@@ -29,45 +29,15 @@ function maybeNormalizeFeeData({ asset, feeData }) {
  * to specify a custom `maxPriorityFeePerGas` whilst the current
  * `tipGasPrice` is incompatible with EIP-1559 pricing.
  */
-export async function getEvmStakingServiceFee({
-  amount,
-  asset,
-  assetClientInterface,
-  maxPriorityFeePerGas: maybeMaxPriorityFeePerGas,
-  gasLimit,
-}) {
-  const defaultFeeData = await assetClientInterface.getFeeData({
-    assetName: asset.name,
-  })
-
-  // HACK: We wish to explicitly enable `useBaseGasPrice`
-  //       since we're using a custom `tipGasPrice`. This
-  //       will be compatible during the transition from
-  //       Magnifier to Clarity, and can be safely removed
-  //       once `useBaseGasPrice` is the default behaviour
-  //       (alongside the custom tip).
-  const { eip1559Enabled } = defaultFeeData
-  const useBaseGasPrice = Boolean(eip1559Enabled) && Boolean(maybeMaxPriorityFeePerGas)
-
-  const normalizedFeeData = maybeNormalizeFeeData({
+export const getEvmStakingServiceFee = async ({ amount, asset, assetClientInterface, gasLimit }) =>
+  asset.api.getFee({
     asset,
-    feeData: {
-      ...defaultFeeData,
-      // HACK: The backend currently exports a very large `tipGasPrice` that is
-      //       compatible with Magnifier's legacy `gasPrice`, but it would
-      //       be incompatible with EIP-1559, since this would evaluate into
-      //       a very large `maxPriorityFeePerGas`.
-      ...(useBaseGasPrice ? { tipGasPrice: maybeMaxPriorityFeePerGas } : null),
-      useBaseGasPrice,
-    },
-  })
-
-  // Returns `fee`, `gasPrice`, `extraFeeData`, and `tipGasPrice`
-  // if the config defines we should `useBaseGasPrice`.
-  return asset.api.getFee({
-    asset,
-    feeData: normalizedFeeData,
+    feeData: maybeNormalizeFeeData({
+      asset,
+      feeData: await assetClientInterface.getFeeData({
+        assetName: asset.name,
+      }),
+    }),
     gasLimit,
     amount,
   })
-}

package/src/tx-send/get-fee-info.js

@@ -1,3 +1,4 @@
+import { ensureSaneEip1559GasPriceForTipGasPrice } from '../fee-utils.js'
 import { fetchGasLimit } from '../gas-estimation.js'
 
 const getFeeInfo = async function getFeeInfo({
@@ -9,7 +10,11 @@ const getFeeInfo = async function getFeeInfo({
   txInput,
   feeOpts = {},
 }) {
-  const { gasPrice: gasPrice_, tipGasPrice: tipGasPrice_ } = await assetClientInterface.getFeeData({
+  const {
+    gasPrice: gasPrice_,
+    tipGasPrice: tipGasPrice_,
+    eip1559Enabled,
+  } = await assetClientInterface.getFeeData({
     assetName: asset.name,
   })
 
@@ -26,6 +31,13 @@ const getFeeInfo = async function getFeeInfo({
     })
   }
 
+  // HACK: If we've received an invalid combination of `tipGasPrice`
+  //       (maxPriorityFeePerGas) and `gasPrice` (maxFeePerGas), then
+  //       we must normalize these before returning.
+  if (eip1559Enabled) {
+    gasPrice = ensureSaneEip1559GasPriceForTipGasPrice({ gasPrice, tipGasPrice })
+  }
+
   return { gasPrice, gasLimit, tipGasPrice }
 }
 

package/src/tx-send/tx-send.js

@@ -117,31 +117,43 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
     let replacedTx, replacedTokenTx
     if (bumpTxId) {
       replacedTx = baseAssetTxLog.get(bumpTxId)
+
       if (!replacedTx || !replacedTx.pending) {
         throw new Error(`Cannot bump transaction ${bumpTxId}: not found or confirmed`)
       }
 
       if (replacedTx.tokens.length > 0) {
+        const [tokenAssetName] = replacedTx.tokens
         const tokenTxSet = await assetClientInterface.getTxLog({
-          assetName: replacedTx.tokens[0],
+          assetName: tokenAssetName,
           walletAccount,
         })
         replacedTokenTx = tokenTxSet.get(bumpTxId)
 
         if (replacedTokenTx) {
-          asset = assets[replacedTx.tokens[0]]
+          // Attempt to overwrite the asset to reflect the fact that
+          // we're performing a token transaction.
+          asset = assets[tokenAssetName]
+          if (!asset) {
+            console.warn(
+              `unable to find ${tokenAssetName} during token bump transaction: asset was not available in assetsForNetwork`
+            )
+          }
         }
+
+        // TODO: Should we `throw` if we can't find the asset?
       }
 
       address = (replacedTokenTx || replacedTx).to
       amount = (replacedTokenTx || replacedTx).coinAmount.negate()
       feeOpts.gasLimit = replacedTx.data.gasLimit
 
-      const { gasPrice: currentGasPrice } = feeData
+      const { gasPrice: currentGasPrice, baseFeePerGas: currentBaseFee } = feeData
       const { bumpedGasPrice, bumpedTipGasPrice } = calculateBumpedGasPrice({
         baseAsset,
         tx: replacedTx,
         currentGasPrice,
+        currentBaseFee,
         eip1559Enabled,
       })
       feeOpts.gasPrice = bumpedGasPrice
@@ -174,6 +186,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       isSendAll,
       createUnsignedTx,
     }
+
     let { txId, rawTx, nonce, gasLimit, tipGasPrice, gasPrice } = await createTx(createTxParams)
 
     const feeAmount = gasPrice.mul(gasLimit)