@exodus/ethereum-api 8.31.2 → 8.32.0

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.32.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.31.2...@exodus/ethereum-api@8.32.0) (2025-02-27)
+
+
+### Features
+
+
+* feat: useBaseGasPrice option (#5050)
+
+
+
 ## [8.31.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.31.1...@exodus/ethereum-api@8.31.2) (2025-02-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.31.2",
+  "version": "8.32.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",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "d6e4676a7a54f1f2a7a19b6d26d4a42bf433d320"
+  "gitHead": "4804c70533af0f7ee246de84926d4133eb0aa689"
 }

package/src/custom-fees.js

@@ -1,16 +1,17 @@
 import NumberUnit from '@exodus/currency'
 
+import { resolveGasPrice } from './fee-utils.js'
+
 export const createCustomFeesApi = ({ baseAsset }) => {
   const Gwei = baseAsset.currency.units.Gwei
   return {
     getRecommendedMinMaxFeeUnitPrices: ({ feeData }) => {
-      const { gasPrice, gasPriceMinimumRate, gasPriceMaximumRate } = feeData
+      const { gasPriceMinimumRate, gasPriceMaximumRate } = feeData
+
+      const gasPrice = resolveGasPrice({ feeData })
 
-      const calculateFeeUnitPrice = (
-        feeUnitPrice,
-        multiplier = 1,
-        toAdd = baseAsset.currency.ZERO
-      ) => feeUnitPrice.mul(multiplier).add(toAdd).toNumber(Gwei)
+      const calculateFeeUnitPrice = (feeUnitPrice, multiplier = 1) =>
+        feeUnitPrice.mul(multiplier).toNumber(Gwei)
 
       return {
         recommended: calculateFeeUnitPrice(gasPrice),

package/src/fee-utils.js

@@ -0,0 +1,19 @@
+import assert from 'minimalistic-assert'
+
+export const resolveGasPrice = ({ feeData }) => {
+  assert(feeData, 'feeData is required')
+
+  const eip1559Enabled = feeData.eip1559Enabled
+
+  const multipler = feeData.gasPriceMultiplier || 1
+
+  if (eip1559Enabled && feeData.useBaseGasPrice) {
+    const multipledBaseFeePerGas = feeData.baseFeePerGas.mul(multipler)
+
+    return feeData.tipGasPrice
+      ? multipledBaseFeePerGas.add(feeData.tipGasPrice)
+      : multipledBaseFeePerGas
+  }
+
+  return feeData.gasPrice.mul(multipler)
+}

package/src/get-fee.js

@@ -1,5 +1,7 @@
 import { calculateBumpedGasPrice, calculateExtraEth } from '@exodus/ethereum-lib'
 
+import { resolveGasPrice } from './fee-utils.js'
+
 // Move to meta?
 const taxes = {
   paxgold: 0.0002,
@@ -32,9 +34,9 @@ export const getFeeFactory =
     isRbfAllowed = true, // Destkop, isRbfAllowed=true when advanced panel is on
     calculateEffectiveFee,
   }) => {
-    const { gasPrice: feeDataGasPrice, eip1559Enabled, baseFeePerGas, tipGasPrice } = feeData
+    const { eip1559Enabled, baseFeePerGas, tipGasPrice } = feeData
 
-    const gasPrice = customFee || feeDataGasPrice
+    const gasPrice = customFee || resolveGasPrice({ feeData })
 
     const gasLimit = providedGasLimit || asset.gasLimit || defaultGasLimit
 

package/src/server-based-fee-monitor.js

@@ -1,7 +1,6 @@
 import { FeeMonitor } from '@exodus/asset-lib'
 import assert from 'minimalistic-assert'
 
-import { resolveGasPrices } from './fee-monitor-utils.js'
 import { fromHexToString } from './number-utils.js'
 
 /**
@@ -40,7 +39,7 @@ export const serverBasedFeeMonitorFactoryFactory = ({ asset, interval, server, a
         server.getGasPrice().then((wei) => `${fromHexToString(wei)} wei`),
         eip1559Enabled ? server.getBaseFeePerGas().then((wei) => `${wei} wei`) : undefined,
       ])
-      return resolveGasPrices({ asset, feeData, gasPrice, baseFeePerGas })
+      return { gasPrice, baseFeePerGas }
     }
   }
   return (...args) => new FeeMonitorClass(...args)

package/src/tx-log/clarity-monitor.js

@@ -2,7 +2,6 @@ import { BaseMonitor } from '@exodus/asset-lib'
 import { getAssetAddresses, isRpcBalanceAsset } from '@exodus/ethereum-lib'
 import lodash from 'lodash'
 
-import { resolveGasPrices } from '../fee-monitor-utils.js'
 import { fromHexToString } from '../number-utils.js'
 import { filterEffects, getLogItemsFromServerTx } from './clarity-utils/index.js'
 import {
@@ -265,13 +264,10 @@ export class ClarityMonitor extends BaseMonitor {
 
   async updateGasPrice({ gasPrice, baseGasPrice: baseFeePerGas }) {
     try {
-      const feeData = await this.aci.getFeeConfig({ assetName: this.asset.name })
-      const feeConfig = resolveGasPrices({
-        asset: this.asset,
-        feeData,
+      const feeConfig = {
         gasPrice: `${fromHexToString(gasPrice)} wei`,
         baseFeePerGas: baseFeePerGas ? `${fromHexToString(baseFeePerGas)} wei` : undefined,
-      })
+      }
       await this.aci.updateFeeConfig({ assetName: this.asset.name, feeConfig })
     } catch (e) {
       this.logger.warn('error updating gasPrice', e)

package/src/tx-log/ethereum-monitor.js

@@ -2,7 +2,6 @@ import { BaseMonitor } from '@exodus/asset-lib'
 import { getAssetAddresses, isRpcBalanceAsset } from '@exodus/ethereum-lib'
 import lodash from 'lodash'
 
-import { resolveGasPrices } from '../fee-monitor-utils.js'
 import { fromHexToString } from '../number-utils.js'
 import {
   checkPendingTransactions,
@@ -216,12 +215,10 @@ export class EthereumMonitor extends BaseMonitor {
         return `${fromHexToString(baseFeePerGas)} wei`
       }
 
-      const feeConfig = resolveGasPrices({
-        asset: this.asset,
-        feeData,
+      const feeConfig = {
         gasPrice: `${fromHexToString(gasPrice)} wei`,
         baseFeePerGas: await resolveBaseFeePerGas(),
-      })
+      }
       await this.aci.updateFeeConfig({ assetName: this.asset.name, feeConfig })
     } catch (e) {
       this.logger.warn('error updating gasPrice', e)

package/src/fee-monitor-utils.js

@@ -1,38 +0,0 @@
-import assert from 'minimalistic-assert'
-
-export const resolveGasPrices = ({
-  asset,
-  feeData,
-  gasPrice: gasPriceString,
-  baseFeePerGas: baseFeePerGasString,
-}) => {
-  assert(asset, 'asset is required')
-  assert(feeData, 'feeData is required')
-  assert(gasPriceString, 'gasPrice is required')
-
-  const zero = asset.currency.ZERO
-  const eip1559Enabled = feeData.eip1559Enabled
-  const gasPrice = asset.currency.parse(gasPriceString)
-
-  if (eip1559Enabled) {
-    assert(baseFeePerGasString, 'baseFeePerGasString is required')
-    const baseFeePerGas = asset.currency.parse(baseFeePerGasString)
-
-    const tipGasPrice = feeData.tipGasPrice ?? zero
-
-    const resolvedGasPrice = baseFeePerGas.mul(feeData.gasPriceMultiplier || 1).add(tipGasPrice)
-
-    return {
-      serverGasPrice: gasPriceString, // for reference
-      gasPrice: resolvedGasPrice.toBaseString({ unit: true }),
-      baseFeePerGas: baseFeePerGasString,
-      tipGasPrice: tipGasPrice.toBaseString({ unit: true }),
-    }
-  }
-
-  const resolvedGasPrice = gasPrice.mul(feeData.gasPriceMultiplier || 1)
-  return {
-    serverGasPrice: gasPriceString, // for reference
-    gasPrice: resolvedGasPrice.toBaseString({ unit: true }),
-  }
-}