@exodus/ethereum-api 8.34.7 → 8.34.8

package/CHANGELOG.md

@@ -3,26 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [8.34.4](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.34.3...@exodus/ethereum-api@8.34.4) (2025-05-07)
-
-
-### Bug Fixes
-
-
-* fix: remove fixed gas limit tokens on evm (#5543)
-
-
-
-## [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.7",
+  "version": "8.34.8",
   "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",
@@ -28,7 +28,7 @@
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/crypto": "^1.0.0-rc.13",
     "@exodus/currency": "^6.0.1",
-    "@exodus/ethereum-lib": "^5.10.2",
+    "@exodus/ethereum-lib": "^5.10.1",
     "@exodus/ethereum-meta": "^2.5.0",
     "@exodus/ethereumholesky-meta": "^2.0.2",
     "@exodus/ethereumjs": "^1.0.0",

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 { getFeeFactory } from './get-fee.js'
+import { getEffectiveGasPrice, 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,6 +323,7 @@ export const createAssetFactory = ({
       server,
       ...(erc20FuelBuffer && { erc20FuelBuffer }),
       ...(fuelThreshold && { fuelThreshold: asset.currency.defaultUnit(fuelThreshold) }),
+      getEffectiveGasPrice,
     }
     return overrideCallback({
       asset: fullAsset,

package/src/custom-fees.js

@@ -2,51 +2,21 @@ 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 min = calculateMinCustomFee({ feeData })
-      const recommended = calculateRecommendedCustomFee({ feeData, min })
-      const max = calculateMaxCustomFee({ feeData, recommended })
+      const { gasPriceMinimumRate, gasPriceMaximumRate } = feeData
+
+      const gasPrice = resolveGasPrice({ feeData })
+
+      const calculateFeeUnitPrice = (feeUnitPrice, multiplier = 1) =>
+        feeUnitPrice.mul(multiplier).toNumber(Gwei)
+
       return {
-        recommended: recommended.toNumber(Gwei),
-        min: min.toNumber(Gwei),
-        max: max.toNumber(Gwei),
+        recommended: calculateFeeUnitPrice(gasPrice),
+        min: calculateFeeUnitPrice(gasPrice, gasPriceMinimumRate),
+        max: calculateFeeUnitPrice(gasPrice, gasPriceMaximumRate),
       }
     },
     unit: 'gwei/gas',

package/src/etherscan/ws.js

@@ -1,7 +1,8 @@
-import WebSocket from '@exodus/fetch/websocket'
 import EventEmitter from 'events/events.js' // forces it to use the module from node_modules
 import ms from 'ms'
 
+import WebSocket from '../websocket/index.js'
+
 const RECONNECT_INTERVAL = ms('10s')
 const PING_INTERVAL = ms('20s')
 

package/src/exodus-eth-server/ws.js

@@ -1,7 +1,8 @@
-import WebSocket from '@exodus/fetch/websocket'
 import EventEmitter from 'events/events.js' // forces it to use the module from node_modules
 import ms from 'ms'
 
+import WebSocket from '../websocket/index.js'
+
 const RECONNECT_INTERVAL = ms('10s')
 const PING_INTERVAL = ms('10s')
 const MAX_RECONNECT_DELAY = ms('15s')

package/src/fee-utils.js

@@ -41,7 +41,9 @@ export const rewriteFeeConfig = ({ feeAsset, feeConfig, feeData }) => {
 export const resolveGasPrice = ({ feeData }) => {
   assert(feeData, 'feeData is required')
 
-  if (feeData.eip1559Enabled) {
+  const eip1559Enabled = feeData.eip1559Enabled
+
+  if (eip1559Enabled && feeData.useBaseGasPrice) {
     return feeData.tipGasPrice
       ? feeData.baseFeePerGas.add(feeData.tipGasPrice)
       : feeData.baseFeePerGas
@@ -49,19 +51,3 @@ export const resolveGasPrice = ({ feeData }) => {
 
   return feeData.gasPrice
 }
-
-export const ensureSaneEip1559GasPriceForTipGasPrice = ({ gasPrice, tipGasPrice }) => {
-  if (!tipGasPrice || tipGasPrice.lt(gasPrice)) return gasPrice
-  return tipGasPrice
-}
-
-export const getNormalizedFeeDataForCustomFee = ({ customFee, feeData }) => {
-  const { eip1559Enabled } = feeData
-  // We must ensure maxPriorityFeePerGas <= maxFeePerGas or our transaction library throws an error
-  // It's a bit counterintuitive  since maxPriorityFeePerGas should only contain the tip,
-  // so we should be subtracting the base gas price from the custom gas price to keep just the tip
-  // but the fee is also limited by our maxFeePerGas above, so that implicitly captures the max tip.
-  // Setting this tipGasPrice to undefined will result in a legacy transaction (not an EIP1559 anymore)
-  if (eip1559Enabled && customFee) return { ...feeData, tipGasPrice: customFee }
-  return feeData
-}

package/src/gas-estimation.js

@@ -1,5 +1,6 @@
 import { currency2buffer, isEthereumLikeToken } from '@exodus/ethereum-lib'
 import { bufferToHex, toBuffer } from '@exodus/ethereumjs/util'
+import BN from 'bn.js'
 
 import { estimateGas, isContractAddressCached } from './eth-like-util.js'
 
@@ -10,11 +11,6 @@ const GAS_PER_NON_ZERO_BYTE = 16
 
 export const DEFAULT_CONTRACT_GAS_LIMIT = 1e6
 
-// HACK: RPCs generally provide imprecise estimates
-//       for `gasUsed` (often these are insufficient).
-export const scaleGasLimitEstimate = ({ estimatedGasLimit, extraPercentage = EXTRA_PERCENTAGE }) =>
-  Number((BigInt(estimatedGasLimit) * BigInt(100 + extraPercentage)) / BigInt(100))
-
 const hardcodedGasLimits = new Map([
   ['amp', 151_000],
   ['tetherusd', 70_000],
@@ -35,7 +31,7 @@ export async function estimateGasLimit(
   amount,
   data,
   gasPrice = '0x',
-  extraPercentage
+  extraPercentage = EXTRA_PERCENTAGE
 ) {
   // move this to remote config
   if (hardcodedGasLimits.has(asset.name)) {
@@ -51,11 +47,10 @@ export async function estimateGasLimit(
   }
 
   const estimatedGas = await estimateGas({ asset, ...opts })
-
-  return scaleGasLimitEstimate({
-    estimatedGasLimit: BigInt(estimatedGas),
-    extraPercentage,
-  })
+  return new BN(estimatedGas.slice(2), 16)
+    .imuln(100 + extraPercentage)
+    .idivn(100)
+    .toNumber()
 }
 
 export function resolveDefaultTxInput({ asset, toAddress, amount }) {

package/src/get-fee.js

@@ -1,10 +1,6 @@
 import { calculateBumpedGasPrice, calculateExtraEth } from '@exodus/ethereum-lib'
 
-import {
-  ensureSaneEip1559GasPriceForTipGasPrice,
-  getNormalizedFeeDataForCustomFee,
-  resolveGasPrice,
-} from './fee-utils.js'
+import { resolveGasPrice } from './fee-utils.js'
 
 // Move to meta?
 const taxes = {
@@ -25,20 +21,6 @@ const getExtraFeeData = ({ asset, amount }) => {
   }
 }
 
-export const getFeeFactoryGasPrices = ({ customFee, feeData }) => {
-  feeData = getNormalizedFeeDataForCustomFee({ customFee, feeData })
-  const gasPrice = customFee || resolveGasPrice({ feeData })
-  const { tipGasPrice, eip1559Enabled } = feeData
-
-  // The `gasPrice` must be at least the `tipGasPrice`.
-  return {
-    gasPrice: eip1559Enabled
-      ? ensureSaneEip1559GasPriceForTipGasPrice({ gasPrice, tipGasPrice })
-      : gasPrice,
-    feeData,
-  }
-}
-
 export const getFeeFactory =
   ({ gasLimit: defaultGasLimit }) =>
   ({
@@ -50,19 +32,32 @@ export const getFeeFactory =
     amount,
     calculateEffectiveFee,
   }) => {
-    const {
-      feeData: { baseFeePerGas, tipGasPrice, eip1559Enabled },
-      gasPrice,
-    } = getFeeFactoryGasPrices({
-      customFee,
-      feeData,
-    })
+    const { eip1559Enabled } = feeData
+
+    // HACK: For EIP-1559 transactions, we forcibly coerce the
+    //       tipGasPrice to be the `customFee`, where defined:
+    //       https://github.com/ExodusMovement/assets/blob/b805d1de0e67013ece2a1460389fb4328445eac1/ethereum/ethereum-api/src/tx-send/tx-send.js#L302C5-L311C6
+    //
+    //       Therefore to compute the true fee at send time, we
+    //       must also enforce the relationship here!
+    if (eip1559Enabled && customFee) {
+      feeData = { ...feeData, tipGasPrice: customFee }
+    }
+
+    const { baseFeePerGas, tipGasPrice, useBaseGasPrice } = feeData
+
+    let gasPrice = customFee || resolveGasPrice({ feeData })
+
+    // The `gasPrice` must be at least the `tipGasPrice`.
+    if (eip1559Enabled && tipGasPrice && gasPrice.lt(tipGasPrice)) {
+      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 ? { tipGasPrice } : null
+    const maybeReturnTipGasPrice = eip1559Enabled && useBaseGasPrice ? { tipGasPrice } : null
 
     const extraFeeData = getExtraFeeData({ asset, amount })
     if (calculateEffectiveFee && eip1559Enabled) {
@@ -83,15 +78,26 @@ 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, baseFeePerGas: currentBaseFee } = feeData
+  const { gasPrice: currentGasPrice, eip1559Enabled } = feeData
   const { bumpedGasPrice } = calculateBumpedGasPrice({
     baseAsset: 'ethereum',
     tx,
     currentGasPrice,
-    currentBaseFee,
     eip1559Enabled,
   })
   return calculateExtraEth({

package/src/index.js

@@ -81,8 +81,6 @@ export {
 
 export { reasons as errorReasons, withErrorReason, EthLikeError } from './error-wrapper.js'
 
-// TODO: `getFeeInfo` is not consumed by third parties and should
-//        be considered an internal API.
 export { txSendFactory, getFeeInfo } from './tx-send/index.js'
 
 export { createAssetFactory } from './create-asset.js'

package/src/staking/ethereum/api.js

@@ -4,7 +4,6 @@ import { retry } from '@exodus/simple-retry'
 
 import { getServerByName } from '../../exodus-eth-server/index.js'
 
-// TODO: Shouldn't this be a function of `ethereumStakingState.minDelegateAmount`?
 const MIN_AMOUNT = '0.1'
 const RETRY_DELAYS = ['10s']