@exodus/ethereum-api 8.34.3 → 8.34.4

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.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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.34.3",
+  "version": "8.34.4",
   "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.1",
+    "@exodus/ethereum-lib": "^5.10.2",
     "@exodus/ethereum-meta": "^2.5.0",
     "@exodus/ethereumholesky-meta": "^2.0.2",
     "@exodus/ethereumjs": "^1.0.0",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "5513269ef920bfdd91701a8108fe73336d105866"
+  "gitHead": "ef3710f80aaff8c5d84bc53026800f9a1c0e029f"
 }

package/src/fee-utils.js

@@ -54,3 +54,14 @@ 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,6 +1,5 @@
 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'
 
@@ -11,6 +10,11 @@ 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))
+
 // Starting with geth v1.9.14, if gasPrice is set for eth_estimateGas call, the call allowance will
 // be calculated with account's balance divided by gasPrice. If user's balance is too low,
 // the gasEstimation will fail. If gasPrice is set to '0x0', the account's balance is not
@@ -22,7 +26,7 @@ export async function estimateGasLimit(
   amount,
   data,
   gasPrice = '0x',
-  extraPercentage = EXTRA_PERCENTAGE
+  extraPercentage
 ) {
   const opts = {
     from: fromAddress,
@@ -33,10 +37,11 @@ export async function estimateGasLimit(
   }
 
   const estimatedGas = await estimateGas({ asset, ...opts })
-  return new BN(estimatedGas.slice(2), 16)
-    .imuln(100 + extraPercentage)
-    .idivn(100)
-    .toNumber()
+
+  return scaleGasLimitEstimate({
+    estimatedGasLimit: BigInt(estimatedGas),
+    extraPercentage,
+  })
 }
 
 export function resolveDefaultTxInput({ asset, toAddress, amount }) {

package/src/get-fee-async.js

@@ -5,14 +5,6 @@ import { EXTRA_PERCENTAGE, fetchGasLimit, resolveDefaultTxInput } from './gas-es
 import { getFeeFactory } from './get-fee.js'
 import { getNftArguments } from './nft-utils.js'
 
-const FIXED_TRANSFER_GAS_LIMIT_ASSETS = new Set([
-  'amp',
-  'tetherusd',
-  'usdcoin',
-  'snx',
-  'geminidollar',
-])
-
 const UNKNOWN_ADDRESS_EXTRA_PERCENTAGE = {
   usdt_bsc_ddedf0f8: 80,
 }
@@ -24,12 +16,6 @@ export async function resolveExtraPercentage({ asset, fromAddress, toAddress })
 
   const isToken = asset.name !== asset.baseAsset.name
 
-  const isFixedGasLimitToken = isToken && FIXED_TRANSFER_GAS_LIMIT_ASSETS.has(asset.name)
-
-  if (isFixedGasLimitToken) {
-    return 0
-  }
-
   // calling forwarder contracts with a bumped gas limit causes 'Out Of Gas' error on chain
   const hasForwarderContract =
     !isToken && toAddress ? await isForwarderContractCached({ asset, address: toAddress }) : false

package/src/get-fee.js

@@ -1,6 +1,10 @@
 import { calculateBumpedGasPrice, calculateExtraEth } from '@exodus/ethereum-lib'
 
-import { ensureSaneEip1559GasPriceForTipGasPrice, resolveGasPrice } from './fee-utils.js'
+import {
+  ensureSaneEip1559GasPriceForTipGasPrice,
+  getNormalizedFeeDataForCustomFee,
+  resolveGasPrice,
+} from './fee-utils.js'
 
 // Move to meta?
 const taxes = {
@@ -21,6 +25,20 @@ 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 }) =>
   ({
@@ -32,26 +50,13 @@ export const getFeeFactory =
     amount,
     calculateEffectiveFee,
   }) => {
-    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 } = feeData
-
-    let gasPrice = customFee || resolveGasPrice({ feeData })
-
-    // The `gasPrice` must be at least the `tipGasPrice`.
-    if (eip1559Enabled) {
-      gasPrice = ensureSaneEip1559GasPriceForTipGasPrice({ gasPrice, tipGasPrice })
-    }
+    const {
+      feeData: { baseFeePerGas, tipGasPrice, eip1559Enabled },
+      gasPrice,
+    } = getFeeFactoryGasPrices({
+      customFee,
+      feeData,
+    })
 
     const gasLimit = providedGasLimit || asset.gasLimit || defaultGasLimit
 

package/src/index.js

@@ -81,6 +81,8 @@ 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,6 +4,7 @@ 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']
 

package/src/staking/ethereum/service.js

@@ -1,7 +1,7 @@
 import { estimateGasLimit } from '../../gas-estimation.js'
 import { createWatchTx as defaultCreateWatch } from '../../watch-tx.js'
 import { stakingProviderClientFactory } from '../staking-provider-client.js'
-import { amountToCurrency, getEvmStakingServiceFee } from '../utils/index.js'
+import { amountToCurrency, DISABLE_BALANCE_CHECKS, resolveFeeData } from '../utils/index.js'
 import { EthereumStaking } from './api.js'
 
 const WETH9_ADDRESS = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
@@ -20,8 +20,6 @@ const MINIMUM_DELEGATION_GAS_LIMIT = 180_000
 
 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'
-
 export function createEthereumStakingService({
   asset,
   assetClientInterface,
@@ -31,17 +29,27 @@ export function createEthereumStakingService({
   const staking = new EthereumStaking(asset, undefined, asset.server)
   const minAmount = staking.minAmount
 
-  async function delegate({ walletAccount, amount } = Object.create(null)) {
-    const address = await assetClientInterface.getReceiveAddress({
-      assetName: asset.name,
-      walletAccount,
-    })
+  const getTransactionProps = async ({ feeData, walletAccount }) => {
+    let address
+    ;[address, feeData] = await Promise.all([
+      assetClientInterface.getReceiveAddress({
+        assetName: asset.name,
+        walletAccount,
+      }),
+      resolveFeeData({ asset, assetClientInterface, feeData }),
+    ])
+
     const delegatorAddress = address.toLowerCase()
+    return { delegatorAddress, feeData }
+  }
+
+  async function delegate({ walletAccount, amount, feeData } = Object.create(null)) {
     amount = amountToCurrency({ asset, amount })
 
-    const { to, data } = await staking.stake({
-      amount,
-    })
+    let delegatorAddress
+    ;({ feeData, delegatorAddress } = await getTransactionProps({ feeData, walletAccount }))
+
+    const { to, data } = await staking.stake({ amount })
 
     console.log(
       `delegator address ${delegatorAddress} staking ${amount.toDefaultString({
@@ -49,12 +57,14 @@ export function createEthereumStakingService({
       })}`
     )
 
-    const { gasPrice, gasLimit, tipGasPrice } = await estimateTxFee(
-      delegatorAddress,
+    const { gasPrice, gasLimit, tipGasPrice } = await estimateTxFee({
+      from: delegatorAddress,
       to,
       amount,
-      data
-    )
+      txInput: data,
+      feeData,
+    })
+
     const txId = await prepareAndSendTx({
       asset,
       walletAccount,
@@ -64,6 +74,7 @@ export function createEthereumStakingService({
       gasPrice,
       gasLimit,
       tipGasPrice,
+      feeData,
     })
 
     // Goerli is not supported
@@ -83,32 +94,36 @@ export function createEthereumStakingService({
     resquestedAmount,
     pendingAmount,
     minAmount,
+    feeData,
   }) {
     const leftOver = pendingAmount.sub(resquestedAmount)
 
-    if (leftOver.isPositive && leftOver.lt(minAmount)) {
+    if (leftOver.isPositive && leftOver.lt(minAmount))
       throw new Error(`Pending balance less than min stake amount ${minAmount}`)
-    }
 
     const inactiveAmountToUnstake = pendingAmount.lte(resquestedAmount)
       ? pendingAmount
       : resquestedAmount
+
+    feeData = await resolveFeeData({ asset, assetClientInterface, feeData })
+
     const { to, data } = await staking.unstakePending({
       address: delegatorAddress,
       amount: inactiveAmountToUnstake,
     })
 
-    const { fee, gasLimit, gasPrice, tipGasPrice } = await estimateTxFee(
-      delegatorAddress,
+    const { fee, gasLimit, gasPrice, tipGasPrice } = await estimateTxFee({
+      from: delegatorAddress,
       to,
-      null,
-      data
-    )
+      amount: null,
+      txInput: data,
+      feeData,
+    })
 
     return { to, txData: data, gasLimit, gasPrice, tipGasPrice, fee }
   }
 
-  async function getUndelegateData({ delegatorAddress, resquestedAmount, pendingAmount }) {
+  async function getUndelegateData({ delegatorAddress, resquestedAmount, pendingAmount, feeData }) {
     const canUnstake = resquestedAmount.gt(pendingAmount)
 
     if (!canUnstake) {
@@ -117,17 +132,21 @@ export function createEthereumStakingService({
     }
 
     const activeAmountToUnstake = resquestedAmount.sub(pendingAmount)
+
+    feeData = await resolveFeeData({ asset, assetClientInterface, feeData })
+
     const { to, data } = await staking.unstake({
       address: delegatorAddress,
       amount: activeAmountToUnstake,
     })
 
-    const { fee, gasLimit, gasPrice, tipGasPrice } = await estimateTxFee(
-      delegatorAddress,
+    const { fee, gasLimit, gasPrice, tipGasPrice } = await estimateTxFee({
+      from: delegatorAddress,
       to,
-      null,
-      data
-    )
+      amount: null,
+      txInput: data,
+      feeData,
+    })
 
     return { to, txData: data, gasLimit, gasPrice, tipGasPrice, fee }
   }
@@ -137,12 +156,10 @@ export function createEthereumStakingService({
    * Fee estimation depends on the executed txs. Can be both.
    * @returns total undelegete fee
    */
-  async function estimateUndelegate({ walletAccount, amount: resquestedAmount }) {
-    const address = await assetClientInterface.getReceiveAddress({
-      assetName: asset.name,
-      walletAccount,
-    })
-    const delegatorAddress = address.toLowerCase()
+  async function estimateUndelegate({ walletAccount, amount: resquestedAmount, feeData }) {
+    let delegatorAddress
+    ;({ feeData, delegatorAddress } = await getTransactionProps({ feeData, walletAccount }))
+
     const pendingAmount = await staking.pendingBalanceOf(delegatorAddress)
 
     let undelegatePendingFee = asset.currency.ZERO
@@ -155,6 +172,7 @@ export function createEthereumStakingService({
           resquestedAmount,
           pendingAmount,
           minAmount,
+          feeData,
         })
         undelegatePendingFee = fee
       } catch (err) {
@@ -168,12 +186,15 @@ export function createEthereumStakingService({
       resquestedAmount,
       pendingAmount,
       minAmount,
+      feeData,
     })
 
     return undelegatePendingFee.add(undelegateFee)
   }
 
-  async function undelegate({ walletAccount, amount } = Object.create(null)) {
+  async function undelegate(
+    { walletAccount, amount, feeData, waitForConfirmation = true } = Object.create(null)
+  ) {
     /*
     unstakePending balance (not yet in validator) + unstake balance (in validator)
     1. give priority to unstakePending (based on the amount)
@@ -181,11 +202,9 @@ export function createEthereumStakingService({
     */
     const resquestedAmount = amountToCurrency({ asset, amount })
 
-    const address = await assetClientInterface.getReceiveAddress({
-      assetName: asset.name,
-      walletAccount,
-    })
-    const delegatorAddress = address.toLowerCase()
+    let delegatorAddress
+    ;({ feeData, delegatorAddress } = await getTransactionProps({ feeData, walletAccount }))
+
     const pendingAmount = await staking.pendingBalanceOf(delegatorAddress)
 
     console.log(
@@ -201,14 +220,24 @@ export function createEthereumStakingService({
         resquestedAmount,
         pendingAmount,
         minAmount,
+        feeData,
       })
 
       txId = await prepareAndSendTx({
         asset,
         walletAccount,
-        waitForConfirmation: true, // wait for tx confirmation in the client
+        waitForConfirmation,
         ...undelegatePendingData,
+        feeData,
       })
+
+      // If we are waiting for confirmation, then sufficient time
+      // will have elapsed for us to re-estimate `feeData`.
+      //
+      // NOTE: This will invalidate previous transaction fee estimates!
+      if (waitForConfirmation) {
+        feeData = await assetClientInterface.getFeeData({ assetName: asset.name })
+      }
     }
 
     // may need also to unstake
@@ -216,6 +245,7 @@ export function createEthereumStakingService({
       delegatorAddress,
       resquestedAmount,
       pendingAmount,
+      feeData,
     })
 
     if (undelegateData.fee) {
@@ -223,6 +253,7 @@ export function createEthereumStakingService({
         asset,
         walletAccount,
         ...undelegateData,
+        feeData,
       })
     }
 
@@ -238,26 +269,24 @@ export function createEthereumStakingService({
     return txId
   }
 
-  async function claimUndelegatedBalance({ walletAccount } = Object.create(null)) {
-    // claim withdrawable balance (of a previous unstake)
-    const address = await assetClientInterface.getReceiveAddress({
-      assetName: asset.name,
-      walletAccount,
-    })
-    const delegatorAddress = address.toLowerCase()
+  async function claimUndelegatedBalance({ walletAccount, feeData } = Object.create(null)) {
+    let delegatorAddress
+    ;({ feeData, delegatorAddress } = await getTransactionProps({ feeData, walletAccount }))
 
     const withdrawRequest = await staking.claimWithdrawRequest({
       address: delegatorAddress,
     })
+
     if (withdrawRequest) {
       const { to, data } = withdrawRequest
 
-      const { gasLimit, gasPrice, tipGasPrice } = await estimateTxFee(
-        delegatorAddress,
+      const { gasLimit, gasPrice, tipGasPrice } = await estimateTxFee({
+        from: delegatorAddress,
         to,
-        null,
-        data
-      )
+        amount: null,
+        txInput: data,
+        feeData,
+      })
       return prepareAndSendTx({
         asset,
         walletAccount,
@@ -266,24 +295,21 @@ export function createEthereumStakingService({
         gasLimit,
         gasPrice,
         tipGasPrice,
+        feeData,
       })
     }
   }
 
-  async function estimateDelegateOperation({ walletAccount, operation, args }) {
+  async function estimateDelegateOperation({ walletAccount, operation, args, feeData }) {
     const requestedAmount = args.amount
       ? amountToCurrency({ asset, amount: args.amount })
       : asset.currency.ZERO
 
-    if (operation === 'undelegate') {
-      return estimateUndelegate({ walletAccount, amount: requestedAmount })
-    }
+    let delegatorAddress
+    ;({ delegatorAddress, feeData } = await getTransactionProps({ feeData, walletAccount }))
 
-    const address = await assetClientInterface.getReceiveAddress({
-      assetName: asset.name,
-      walletAccount,
-    })
-    const delegatorAddress = address.toLowerCase()
+    if (operation === 'undelegate')
+      return estimateUndelegate({ walletAccount, amount: requestedAmount, feeData })
 
     const NAMING_MAP = {
       delegate: 'stake',
@@ -293,14 +319,18 @@ export function createEthereumStakingService({
 
     const delegateOperation = staking[NAMING_MAP[operation]].bind(staking)
 
-    if (!delegateOperation) {
-      throw new Error('Invalid staking operation')
-    }
+    if (!delegateOperation) throw new Error('Invalid staking operation')
 
     const { amount, data } = await delegateOperation({ ...args, amount: requestedAmount })
 
     const { fee } = await (operation === 'claimUndelegatedBalance'
-      ? estimateTxFee(delegatorAddress, staking.accountingAddress, amount, data)
+      ? estimateTxFee({
+          from: delegatorAddress,
+          to: staking.accountingAddress,
+          amount,
+          txInput: data,
+          feeData,
+        })
       : // The `gasUsed` of a delegation transaction can vary
         // significantly depending upon whether it will result
         // in the activation of new slots (i.e. validator creation).
@@ -314,17 +344,18 @@ export function createEthereumStakingService({
         // 2. Originate the transaction from the WETH contract,
         //    which guarantees deep native ether liquidity which
         //    exceeds any rational user deposit.
-        estimateTxFee(
-          WETH9_ADDRESS,
-          staking.poolAddress,
-          amount.add(asset.currency.defaultUnit(SLOT_ACTIVATION_PROXIMITY_ETH)),
-          data
-        ))
+        estimateTxFee({
+          from: WETH9_ADDRESS,
+          to: staking.poolAddress,
+          amount: amount.add(asset.currency.defaultUnit(SLOT_ACTIVATION_PROXIMITY_ETH)),
+          txInput: data,
+          feeData,
+        }))
 
     return fee
   }
 
-  async function estimateTxFee(from, to, amount, txInput) {
+  async function estimateTxFee({ from, to, amount, txInput, feeData }) {
     amount = amount || asset.currency.ZERO
     from = from.toLowerCase()
 
@@ -347,17 +378,14 @@ export function createEthereumStakingService({
       EthereumStaking.isDelegationTransactonCalldata(txInput) ? MINIMUM_DELEGATION_GAS_LIMIT : 0
     )
 
-    const feeData = await getEvmStakingServiceFee({
-      amount,
+    const getFeeResult = await asset.api.getFee({
       asset,
-      assetClientInterface,
+      feeData,
       gasLimit,
+      amount,
     })
 
-    return {
-      ...feeData,
-      gasLimit,
-    }
+    return { ...getFeeResult, gasLimit }
   }
 
   /** Returns the minimum possible amount that can be staked. */
@@ -369,9 +397,12 @@ export function createEthereumStakingService({
   async function getDelegateSelectAllAmount({
     walletAccount,
     spendableForStaking = asset.currency.ZERO,
+    feeData,
   }) {
     const minAmount = getMinAmount()
 
+    ;({ feeData } = await getTransactionProps({ feeData, walletAccount }))
+
     // If the caller hasn't specified a value of `spendableForStaking`
     // which satisfies the minimum amount, then we'll coerce this value
     // up to the minimum amount so we can at least provide a rational
@@ -389,6 +420,7 @@ export function createEthereumStakingService({
       args: {
         amount: spendableForStaking,
       },
+      feeData,
     })
 
     // If the `spendableForStaking` is insufficient to cover both the
@@ -420,6 +452,7 @@ export function createEthereumStakingService({
       gasLimit,
       tipGasPrice,
       waitForConfirmation = false,
+      feeData,
     } = Object.create(null)
   ) {
     const sendTxArgs = {
@@ -436,6 +469,7 @@ export function createEthereumStakingService({
         // HACK: Override the `tipGasPrice` to use a custom `maxPriorityFeePerGas`.
         tipGasPrice,
       },
+      feeData,
     }
 
     const { txId } = await asset.baseAsset.api.sendTx(sendTxArgs)