@exodus/ethereum-api 8.33.3 → 8.33.5

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.33.5](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.33.4...@exodus/ethereum-api@8.33.5) (2025-03-19)
+
+
+### Bug Fixes
+
+
+* fix: apply gas price multiplication at value entry point (#5267)
+
+* fix: avoid returning staking rewards as a number unit (#5292)
+
+
+
+## [8.33.4](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.33.3...@exodus/ethereum-api@8.33.4) (2025-03-12)
+
+
+### Bug Fixes
+
+
+* fix: ensure the tipGasPrice cannot exceed the maxFeePerGas (#5235)
+
+
+
 ## [8.33.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.33.2...@exodus/ethereum-api@8.33.3) (2025-03-11)
 
 **Note:** Version bump only for package @exodus/ethereum-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.33.3",
+  "version": "8.33.5",
   "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": "daf913a8a92b372fa46daa3dd45668386540dbe0"
+  "gitHead": "95c7858f0e448608650ec560f0e0b179fa27c35f"
 }

package/src/fee-utils.js

@@ -1,19 +1,53 @@
 import assert from 'minimalistic-assert'
 
+const applyMultiplierToPriceInWei = ({ feeAsset, feeData, priceInWei }) => {
+  assert(typeof priceInWei === 'string', 'gasPriceInWei should be a string')
+
+  const multipler = feeData.gasPriceMultiplier || 1
+  return feeAsset.currency.parse(priceInWei).mul(multipler).toBaseString({ unit: true })
+}
+
+/**
+ * Returns augmented `feeConfig` values manipulated using the `feeData`,
+ * for example, like multiplying the `gasPrice`. This helps us to apply
+ * modifications to values before presenting them to the consumer.
+ *
+ * TODO: We shouldn't actually do this, lol. The closer we are to
+ *       the node, the better!
+ */
+export const rewriteFeeConfig = ({ feeAsset, feeConfig, feeData }) => {
+  try {
+    const { gasPrice, baseFeePerGas, ...extras } = feeConfig
+    return {
+      ...extras,
+      gasPrice: applyMultiplierToPriceInWei({
+        feeAsset,
+        feeData,
+        priceInWei: gasPrice,
+      }) /* required */,
+      baseFeePerGas: baseFeePerGas
+        ? applyMultiplierToPriceInWei({ feeAsset, feeData, priceInWei: baseFeePerGas })
+        : undefined,
+    }
+  } catch (e) {
+    console.error(
+      'Unable to rewrite feeConfig - gas prices will not be amplified using the `gasPriceMultiplier`.',
+      e
+    )
+    return feeConfig
+  }
+}
+
 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
+      ? feeData.baseFeePerGas.add(feeData.tipGasPrice)
+      : feeData.baseFeePerGas
   }
 
-  return feeData.gasPrice.mul(multipler)
+  return feeData.gasPrice
 }

package/src/get-fee.js

@@ -36,7 +36,12 @@ export const getFeeFactory =
   }) => {
     const { eip1559Enabled, baseFeePerGas, tipGasPrice, useBaseGasPrice } = feeData
 
-    const gasPrice = customFee || resolveGasPrice({ 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
 

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

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

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

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

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

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

package/src/tx-log-staking-processor/utils.js

@@ -30,7 +30,7 @@ export const calculateRewardsFromStakeTx = ({ tx, currency }) => {
 
   if (rewards) {
     // cache rewards
-    return currency.baseUnit(rewards)
+    return rewards
   }
 
   if (stakeTxContainsReward) {