@exodus/ethereum-api 8.35.2-alpha.0 → 8.37.0-patch.0

package/CHANGELOG.md

@@ -3,36 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [8.35.2-alpha.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.35.1...@exodus/ethereum-api@8.35.2-alpha.0) (2025-06-11)
+## [8.37.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.36.0...@exodus/ethereum-api@8.37.0) (2025-06-12)
 
 
 ### Features
 
-* add clarity monitor v2 ([1e08a69](https://github.com/ExodusMovement/assets/commit/1e08a694026acd3f68fc9a154b2d3da99044ae95))
-* add ws client for ws-gateway [WIP] ([05bf8b6](https://github.com/ExodusMovement/assets/commit/05bf8b616809b955fa3face60a7db2dd7b8a6259))
-* add ws-gateway client ([12b6178](https://github.com/ExodusMovement/assets/commit/12b6178a113ad68063532fe12ffded4aa47ff188))
-* improve default uri and passing ws gateway via DI ([a6cda37](https://github.com/ExodusMovement/assets/commit/a6cda37cabb0986d17bca48d4ece1792a83989ad))
-* improve default uri and passing ws gateway via DI ([79a37cf](https://github.com/ExodusMovement/assets/commit/79a37cf0dc75a2d4ae527e63f4ca45e533020a7c))
-* make unsubscribeNetwork public ([4d6b675](https://github.com/ExodusMovement/assets/commit/4d6b675c8c34fa331d256854be6f38da03aaca27))
-* pass logger inside ws gateway ([08f2383](https://github.com/ExodusMovement/assets/commit/08f2383f74b33cc8f940e39f1e597fac447f16c5))
-* remove error log, logging only reconnection ([bbaffe4](https://github.com/ExodusMovement/assets/commit/bbaffe492b5155a254a05409fd58535cb60c4cd6))
-* update addSingleTx after merge conflicts ([ca3128a](https://github.com/ExodusMovement/assets/commit/ca3128aba451e5a7c77bcfdb2f91c2ff009ec412))
-* update code after rebase ([d8b2e25](https://github.com/ExodusMovement/assets/commit/d8b2e252266f3d818147b7623ed762ef8cac2fdc))
-* update logic ([427f84d](https://github.com/ExodusMovement/assets/commit/427f84d224925e3f94c246bd26f2b14ee64442ca))
-* update message schema ([155814d](https://github.com/ExodusMovement/assets/commit/155814d744798d9796c315cabd262b46a4466e0c))
-* update subscription logic to handle edge soft-lock case ([359faa3](https://github.com/ExodusMovement/assets/commit/359faa34aa5abf7cce767c60e2ad2fdeafd9d591))
-* update unsubscribe logic ([fc7e288](https://github.com/ExodusMovement/assets/commit/fc7e288deb9b4815bbafd9d8c156f7cc2919bc9b))
-* ws-gateway dispose from network. ([7140e83](https://github.com/ExodusMovement/assets/commit/7140e83e863981fe7d79b8234d254d728cd22f4b))
-
-
-### Bug Fixes
-
-* add assetName to use in tick() ([66657ca](https://github.com/ExodusMovement/assets/commit/66657cac5e184f8b6218cc282c6f51bbad25f5b5))
-* ethereum api cleaning up ([#5832](https://github.com/ExodusMovement/assets/issues/5832)) ([29d167e](https://github.com/ExodusMovement/assets/commit/29d167e573993be4f49ea87523f5a2156ce7cef1))
-* improve evm gas estimation when using arbitrary addresses ([#5842](https://github.com/ExodusMovement/assets/issues/5842)) ([9518cc1](https://github.com/ExodusMovement/assets/commit/9518cc1f6f5d861edc7a9e9fd563ee556901d5e5))
-* reconnection issues ([5cbdbfc](https://github.com/ExodusMovement/assets/commit/5cbdbfc8a1109c8c4e95e9b93c4b6269037e72b0))
-* remove extra async. Use address ([10a1380](https://github.com/ExodusMovement/assets/commit/10a13803d4fd913cf98dccc130eb22021a72245d))
-* update code and tests to support send method instead of emit ([379406a](https://github.com/ExodusMovement/assets/commit/379406a020f8c56048b2373e8ccb2a284ea61a5d))
+
+* feat: remote config feeData.gasLimits (#5830)
+
+
+
+## [8.36.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.35.1...@exodus/ethereum-api@8.36.0) (2025-06-11)
+
+
+### Features
+
+
+* feat: ethereum api use balances and nonces data (#5727)
+
+
+### Bug Fixes
+
+
+* fix: ethereum api cleaning up (#5832)
+
+* fix: improve evm gas estimation when using arbitrary addresses (#5842)
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.35.2-alpha.0",
+  "version": "8.37.0-patch.0",
   "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,18 +28,17 @@
     "@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.12.0",
     "@exodus/ethereum-meta": "^2.5.0",
     "@exodus/ethereumholesky-meta": "^2.0.2",
     "@exodus/ethereumjs": "^1.0.0",
     "@exodus/fetch": "^1.3.0",
-    "@exodus/models": "^12.0.1",
+    "@exodus/models": "^12.13.0",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solidity-contract": "^1.1.3",
     "@exodus/web3-ethereum-utils": "^4.2.1",
     "bn.js": "^5.2.1",
     "delay": "^4.0.1",
-    "eventemitter3": "^4.0.7",
     "events": "^1.1.1",
     "idna-uts46-hx": "^2.3.1",
     "lodash": "^4.17.15",
@@ -50,7 +49,7 @@
     "ws": "^6.1.0"
   },
   "devDependencies": {
-    "@exodus/assets-testing": "^1.0.0",
+    "@exodus/assets-testing": "workspace:^",
     "@exodus/bsc-meta": "^2.1.2",
     "@exodus/ethereumarbone-meta": "^2.0.3",
     "@exodus/ethereumgoerli-meta": "^2.0.1",
@@ -64,6 +63,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
-  },
-  "gitHead": "d88b71e86cdc0c3289f8ddaac4e0e1b642da04f2"
+  }
 }

package/src/create-asset-utils.js

@@ -0,0 +1,55 @@
+import assert from 'assert'
+
+import { ValidMonitorTypes } from './exodus-eth-server/index.js'
+
+// Determines the appropriate `monitorType`, `serverUrl` and `monitorInterval`
+// to use for a given config.
+export const resolveMonitorSettings = (
+  {
+    asset,
+    configWithOverrides,
+    defaultMonitorInterval,
+    defaultMonitorType,
+    defaultServerUrl,
+  } = Object.create(null)
+) => {
+  assert(asset, 'expected asset')
+  assert(
+    ValidMonitorTypes.includes(defaultMonitorType),
+    `defaultMonitorType ${defaultMonitorType} for ${asset.name} is invalid.`
+  )
+  assert(defaultServerUrl, `expected default serverUrl for ${asset.name}`)
+
+  const overrideMonitorType = configWithOverrides?.monitorType
+  const overrideServerUrl = configWithOverrides?.serverUrl
+  const overrideMonitorInterval = configWithOverrides?.monitorInterval
+
+  const defaultResolution = {
+    // NOTE: Regardless of the `monitorType`, the `monitorInterval`
+    //       will be respected.
+    monitorInterval: overrideMonitorInterval ?? defaultMonitorInterval,
+    monitorType: defaultMonitorType,
+    serverUrl: defaultServerUrl,
+  }
+
+  if (!overrideMonitorType && overrideServerUrl) {
+    console.warn(
+      `Received an \`overrideServerUrl\`, but not the \`monitorType\` for ${asset.name}. Falling back to ${defaultMonitorType}<${defaultServerUrl}>.`
+    )
+    return defaultResolution
+  }
+
+  // If we don't attempt to override the `monitorType`, we resort
+  // to the default configuration.
+  if (!overrideMonitorType) return defaultResolution
+
+  if (!ValidMonitorTypes.includes(overrideMonitorType)) {
+    console.warn(
+      `"${overrideMonitorType}" is not a valid \`MonitorType\`. Falling back to ${defaultMonitorType}<${defaultServerUrl}>.`
+    )
+    return defaultResolution
+  }
+
+  // Permit the `monitorType` and `serverUrl` to be overrided.
+  return { ...defaultResolution, monitorType: overrideMonitorType, serverUrl: overrideServerUrl }
+}

package/src/create-asset.js

@@ -22,10 +22,10 @@ import assert from 'minimalistic-assert'
 import ms from 'ms'
 
 import { addressHasHistoryFactory } from './address-has-history.js'
+import { resolveMonitorSettings } from './create-asset-utils.js'
 import { createTokenFactory } from './create-token-factory.js'
 import { createCustomFeesApi } from './custom-fees.js'
-import { createEvmServer, ValidMonitorTypes } from './exodus-eth-server/index.js'
-import { createWsGateway } from './exodus-eth-server/ws-gateway.js'
+import { createEvmServer } 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'
@@ -36,7 +36,6 @@ import { estimateL1DataFeeFactory, getL1GetFeeFactory } from './optimism-gas/ind
 import { serverBasedFeeMonitorFactoryFactory } from './server-based-fee-monitor.js'
 import { createStakingApi } from './staking-api.js'
 import { ClarityMonitor } from './tx-log/clarity-monitor.js'
-import { ClarityMonitorV2 } from './tx-log/clarity-monitor-v2.js'
 import { EthereumMonitor } from './tx-log/ethereum-monitor.js'
 import { EthereumNoHistoryMonitor } from './tx-log/ethereum-no-history-monitor.js'
 import { txSendFactory } from './tx-send/index.js'
@@ -59,18 +58,19 @@ export const createAssetFactory = ({
   isMaxFeeAsset = false,
   isTestnet = false,
   l1GasOracleAddress, // l1 extra fee for base and optostakingConfiguration = {},
-  monitorInterval,
-  monitorType = 'magnifier',
+  monitorInterval: defaultMonitorInterval,
+  monitorType: defaultMonitorType = 'magnifier',
   nfts: defaultNfts = false,
-  serverUrl,
+  serverUrl: defaultServerUrl,
   stakingConfiguration = {},
   useEip1191ChainIdChecksum = false,
   forceGasLimitEstimation = false,
   supportsCustomFees: defaultSupportsCustomFees = false,
+  useAbsoluteBalanceAndNonce = false,
 }) => {
   assert(assetsList, 'assetsList is required')
   assert(providedFeeData || feeDataConfig, 'feeData or feeDataConfig is required')
-  assert(serverUrl, 'serverUrl is required')
+  assert(defaultServerUrl, 'serverUrl is required')
   assert(confirmationsNumber, 'confirmationsNumber is required')
 
   const base = assetsList.find((asset) => asset.name === asset.baseAssetName)
@@ -99,38 +99,32 @@ export const createAssetFactory = ({
   ) => {
     const assets = connectAssetsList(assetsList)
 
+    const configWithOverrides = { ...defaultConfig, ...config }
+
     const {
       allowMetaMaskCompat,
       supportsStaking,
       nfts,
       customTokens,
       supportsCustomFees,
-      monitorType: overrideMonitorType,
-      serverUrl: overrideServerUrl,
-      monitorInterval: overrideMonitorInterval,
-    } = {
-      ...defaultConfig,
-      ...config,
-    }
+      useAbsoluteBalanceAndNonce: overrideUseAbsoluteBalanceAndNonce,
+    } = configWithOverrides
 
     const asset = assets[base.name]
 
-    if (overrideMonitorType) {
-      if (!ValidMonitorTypes.includes(overrideMonitorType) || !overrideServerUrl) {
-        console.warn('Invalid config for overrideMonitorType or overrideServerUrl', {
-          monitorType: overrideMonitorType,
-          serverUrl: overrideServerUrl,
-        })
-      } else {
-        monitorType = overrideMonitorType
-        serverUrl = overrideServerUrl
-        monitorInterval = overrideMonitorInterval || monitorInterval
-      }
+    const { monitorType, serverUrl, monitorInterval } = resolveMonitorSettings({
+      asset,
+      configWithOverrides,
+      defaultMonitorInterval,
+      defaultMonitorType,
+      defaultServerUrl,
+    })
+
+    if (overrideUseAbsoluteBalanceAndNonce !== undefined) {
+      useAbsoluteBalanceAndNonce = overrideUseAbsoluteBalanceAndNonce
     }
 
-    monitorType = overrideMonitorType || monitorType
     const server = createEvmServer({ assetName: asset.name, serverUrl, monitorType })
-    const wsGatewayClient = createWsGateway()
 
     const gasLimit = 21e3 // 21 KGas, enough only for sending ether to normal address
 
@@ -152,6 +146,7 @@ export const createAssetFactory = ({
     const getBalances = getBalancesFactory({
       monitorType,
       config,
+      useAbsoluteBalance: useAbsoluteBalanceAndNonce,
     })
 
     const { createToken, getTokens } = createTokenFactory(
@@ -217,15 +212,6 @@ export const createAssetFactory = ({
             ...args,
           })
           break
-        case 'clarity-v3':
-          monitor = new ClarityMonitorV2({
-            assetClientInterface,
-            interval: ms(monitorInterval || '5m'),
-            server,
-            wsGatewayClient,
-            ...args,
-          })
-          break
         case 'no-history':
           monitor = new EthereumNoHistoryMonitor({
             assetClientInterface,
@@ -266,6 +252,7 @@ export const createAssetFactory = ({
     const sendTx = txSendFactory({
       assetClientInterface,
       createUnsignedTx,
+      useAbsoluteBalanceAndNonce,
     })
 
     const estimateL1DataFee = l1GasOracleAddress

package/src/exodus-eth-server/clarity-v2.js

@@ -2,6 +2,33 @@ import { retry } from '@exodus/simple-retry'
 
 import ClarityServer from './clarity.js'
 
+export const encodeCursor = (blockNumberBigInt, isLegacy = false) => {
+  if (typeof blockNumberBigInt !== 'bigint') throw new Error('expected bigint')
+
+  if (isLegacy) {
+    const cursor = Buffer.alloc(26)
+    cursor.writeBigInt64LE(blockNumberBigInt, 10)
+    return cursor
+  }
+
+  const cursor = Buffer.alloc(8)
+  cursor.writeBigUInt64LE(blockNumberBigInt, 0)
+  return cursor
+}
+
+export const decodeCursor = (cursor) => {
+  if (Buffer.isBuffer(cursor)) {
+    // New format: buffer containing only the block number
+    if (cursor.length === 8) return { blockNumber: cursor.readBigUInt64LE(0) }
+
+    // Old format: buffer with length 26
+    if (cursor.length === 26) return { blockNumber: cursor.readBigInt64LE(10) }
+  }
+
+  // Doesn't match any known format, return default
+  return { blockNumber: BigInt(0) }
+}
+
 const getTextFromResponse = async (response) => {
   try {
     const responseBody = await response.text()
@@ -44,18 +71,25 @@ export default class ClarityServerV2 extends ClarityServer {
     this.updateBaseApiPath()
   }
 
+  getTransactionsAtBlockNumber = async ({ address, blockNumber, withInput = true }) => {
+    const url = new URL(`${this.baseApiPath}/addresses/${encodeURIComponent(address)}/transactions`)
+    url.searchParams.set('cursor', blockNumber)
+    url.searchParams.set('withInput', Boolean(withInput).toString())
+    return fetchJsonRetry(url)
+  }
+
   async getAllTransactions({ address, cursor }) {
-    let { blockNumber } = this.#decodeCursor(cursor)
+    let { blockNumber } = decodeCursor(cursor)
     blockNumber = blockNumber.toString()
 
     let transactions = []
 
     while (true) {
-      const url = new URL(`${this.baseApiPath}/addresses/${address}/transactions`)
-      url.searchParams.set('cursor', blockNumber)
-      url.searchParams.set('withInput', 'true')
-
-      const { transactions: txs, cursor: nextBlockNumber } = await fetchJsonRetry(url)
+      const { transactions: txs, cursor: nextBlockNumber } =
+        await this.getTransactionsAtBlockNumber({
+          address,
+          blockNumber,
+        })
 
       if (txs.length === 0) {
         // fetch until no more new transactions
@@ -91,19 +125,6 @@ export default class ClarityServerV2 extends ClarityServer {
     }
   }
 
-  #decodeCursor(cursor) {
-    if (Buffer.isBuffer(cursor)) {
-      // New format: buffer containing only the block number
-      if (cursor.length === 8) return { blockNumber: cursor.readBigUInt64LE(0) }
-
-      // Old format: buffer with length 26
-      if (cursor.length === 26) return { blockNumber: cursor.readBigInt64LE(10) }
-    }
-
-    // Doesn't match any known format, return default
-    return { blockNumber: BigInt(0) }
-  }
-
   async sendHttpRequest({ path, method, body }) {
     const url = new URL(`${this.baseApiPath}${path}`)
     const fetchOptions = {
@@ -130,4 +151,14 @@ export default class ClarityServerV2 extends ClarityServer {
       body: request,
     })
   }
+
+  async getTransactionCount(...params) {
+    // nonce is called during tx send, use it in rest api
+    const request = this.getTransactionCountRequest(...params)
+    return this.sendHttpRequest({
+      path: '/rpc',
+      method: 'POST',
+      body: request,
+    })
+  }
 }

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

@@ -13,7 +13,7 @@ import ApiCoinNodesServer from './api-coin-nodes.js'
 import ClarityServer from './clarity.js'
 import ClarityServerV2 from './clarity-v2.js'
 
-export const ValidMonitorTypes = ['no-history', 'clarity', 'clarity-v2', 'clarity-v3', 'magnifier']
+export const ValidMonitorTypes = ['no-history', 'clarity', 'clarity-v2', 'magnifier']
 
 export function createEvmServer({ assetName, serverUrl, monitorType }) {
   assert(assetName, 'assetName is required')
@@ -25,7 +25,6 @@ export function createEvmServer({ assetName, serverUrl, monitorType }) {
     case 'clarity':
       return new ClarityServer({ baseAssetName: assetName, uri: serverUrl })
     case 'clarity-v2':
-    case 'clarity-v3':
       return new ClarityServerV2({ baseAssetName: assetName, uri: serverUrl })
     case 'magnifier':
       return create(serverUrl, assetName)

package/src/gas-estimation.js

@@ -1,28 +1,50 @@
 import { currency2buffer, isEthereumLikeToken } from '@exodus/ethereum-lib'
 import { bufferToHex, toBuffer } from '@exodus/ethereumjs/util'
 
-import { estimateGas, isContractAddressCached } from './eth-like-util.js'
+import { estimateGas, isContractAddressCached, isForwarderContractCached } from './eth-like-util.js'
 
-export const EXTRA_PERCENTAGE = 29
+export const DEFAULT_GAS_LIMIT_MULTIPLIER = 1.29
 
 // 16 gas per non-zero byte (4 gas per zero byte) of "transaction input data"
 const GAS_PER_NON_ZERO_BYTE = 16
 
 export const DEFAULT_CONTRACT_GAS_LIMIT = 1e6
 
+// HACK: If a recipient address is not defined, we usually fall back to
+//       default address so gas estimation can still complete successfully
+//       without knowledge of which accounts are involved.
+//
+//       However, we must be careful to select addresses which are unlikely
+//       to have existing obligations, such as popular dead addresses or the
+//       reserved addresses of precompiles, since these can influence gas
+//       estimation.
+//
+//       Here, we use an address which is mostly all `1`s to make sure we can
+//       exaggerate the worst-case calldata cost (which is priced per high bit)
+//       whilst being unlikely to have any token balances.
+//
+//       Unfortunately, we can't use `0xffffffffffffffffffffffffffffffffffffffff`,
+//       since this address is a whale.
+export const ARBITRARY_ADDRESS = '0xfffFfFfFfFfFFFFFfeFfFFFffFffFFFFfFFFFFFF'.toLowerCase()
+
 // 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],
-  ['usdcoin', 70_000],
-  ['snx', 220_000],
-  ['geminidollar', 75_000],
-  ['aave', 250_000],
-])
+export const scaleGasLimitEstimate = ({
+  estimatedGasLimit,
+  gasLimitMultiplier = DEFAULT_GAS_LIMIT_MULTIPLIER,
+}) => {
+  const gasLimit = parseInt(estimatedGasLimit)
+  if (!Number.isInteger(gasLimit)) {
+    throw new TypeError('Invalid scaleGasLimitEstimate ' + estimatedGasLimit)
+  }
+
+  const multiplier = parseFloat(gasLimitMultiplier)
+  if (Number.isNaN(multiplier)) {
+    throw new TypeError('Invalid gasLimitMultiplier ' + gasLimitMultiplier)
+  }
+
+  return Math.floor(gasLimit * multiplier)
+}
 
 // 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,
@@ -34,14 +56,8 @@ export async function estimateGasLimit(
   toAddress,
   amount,
   data,
-  gasPrice = '0x',
-  extraPercentage
+  gasPrice = '0x'
 ) {
-  // move this to remote config
-  if (hardcodedGasLimits.has(asset.name)) {
-    return hardcodedGasLimits.get(asset.name)
-  }
-
   const opts = {
     from: fromAddress,
     to: toAddress,
@@ -51,62 +67,98 @@ export async function estimateGasLimit(
   }
 
   const estimatedGas = await estimateGas({ asset, ...opts })
+  return Number(BigInt(estimatedGas))
+}
 
-  return scaleGasLimitEstimate({
-    estimatedGasLimit: BigInt(estimatedGas),
-    extraPercentage,
-  })
+export async function resolveGasLimitMultiplier({ asset, feeData, toAddress, fromAddress }) {
+  const gasLimitMultiplierWhenUnknownAddress =
+    feeData?.gasLimits?.[asset.name]?.gasLimitMultiplierWhenUnknownAddress
+
+  if (gasLimitMultiplierWhenUnknownAddress && (!fromAddress || !toAddress)) {
+    return gasLimitMultiplierWhenUnknownAddress
+  }
+
+  const gasLimitMultiplier = feeData?.gasLimits?.[asset.name]?.gasLimitMultiplier
+
+  if (gasLimitMultiplier) {
+    return gasLimitMultiplier
+  }
+
+  if (asset.baseAsset.estimateL1DataFee) {
+    return 2
+  }
+
+  const isToken = asset.name !== asset.baseAsset.name
+
+  // 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
+
+  if (hasForwarderContract) {
+    return 1
+  }
+
+  return DEFAULT_GAS_LIMIT_MULTIPLIER
 }
 
 export function resolveDefaultTxInput({ asset, toAddress, amount }) {
   return isEthereumLikeToken(asset)
-    ? bufferToHex(asset.contract.transfer.build(toAddress.toLowerCase(), amount.toBaseString()))
+    ? bufferToHex(asset.contract.transfer.build(toAddress.toLowerCase(), amount?.toBaseString()))
     : '0x'
 }
 
 export async function fetchGasLimit({
   asset,
-  fromAddress,
-  toAddress,
+  feeData,
+  fromAddress: providedFromAddress,
+  toAddress: providedToAddress,
   txInput: providedTxInput,
-  amount,
+  amount: providedAmount,
   bip70,
   throwOnError = true,
-  extraPercentage,
 }) {
   if (bip70?.bitpay?.data && bip70?.bitpay?.gasPrice)
     return asset.name === 'ethereum' ? 65_000 : 130_000 // from on chain stats https://dune.xyz/queries/189123
 
-  if (!amount) amount = asset.currency.ZERO
+  const fixedGasLimit = feeData?.gasLimits?.[asset.name]?.fixedGasLimit
+  if (fixedGasLimit) {
+    return fixedGasLimit
+  }
 
+  const amount = providedAmount ?? asset.currency.ZERO
+  const fromAddress = providedFromAddress ?? ARBITRARY_ADDRESS
+  const toAddress = providedToAddress ?? ARBITRARY_ADDRESS
   const txInput = providedTxInput || resolveDefaultTxInput({ asset, toAddress, amount })
 
   const defaultGasLimit = () => asset.gasLimit + GAS_PER_NON_ZERO_BYTE * toBuffer(txInput).length
 
   const isContract = await isContractAddressCached({ asset, address: toAddress })
 
-  if (isEthereumLikeToken(asset)) {
-    amount = asset.baseAsset.currency.ZERO
-    toAddress = asset.contract.address
-  } else if (!isContract && !asset.forceGasLimitEstimation) {
+  const isToken = isEthereumLikeToken(asset)
+  if (!isToken && !isContract && !asset.forceGasLimitEstimation) {
     return defaultGasLimit()
   }
 
-  // calling forwarder contracts with a bumped gas limit causes 'Out Of Gas' error on chain
-  // Since geth v1.9.14 estimateGas will throw if user does not have enough ETH.
-  // If gasPrice is set to zero, estimateGas will make the expected estimation.
-  const gasPrice = bufferToHex(currency2buffer(asset.baseAsset.currency.ZERO))
+  const gasLimitMultiplier = await resolveGasLimitMultiplier({
+    asset,
+    feeData,
+    fromAddress: providedFromAddress,
+    toAddress: providedToAddress,
+  })
+
+  const txToAddress = isToken ? asset.contract.address : toAddress
+  const txAmount = isToken ? asset.baseAsset.currency.ZERO : amount
 
   try {
-    return await estimateGasLimit(
+    const estimatedGasLimit = await estimateGasLimit(
       asset,
       fromAddress,
-      toAddress,
-      amount,
-      txInput,
-      gasPrice,
-      extraPercentage
+      txToAddress,
+      txAmount,
+      txInput
     )
+
+    return scaleGasLimitEstimate({ estimatedGasLimit, gasLimitMultiplier })
   } catch (err) {
     if (throwOnError) throw err