@exodus/ethereum-api 8.33.4 → 8.33.6

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.33.6](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.33.5...@exodus/ethereum-api@8.33.6) (2025-04-01)
+
+
+### Bug Fixes
+
+
+* fix: [ETH] Estimate using the correct `tipGasPrice` for transactions that use a `customFee`. (#5351)
+
+* fix: remove unused isSendAll param (#5310)
+
+* fix: return the delegatedBalance in getStaked and subtract the activeStakedBalance from getStaking (#5363)
+
+
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.33.4",
+  "version": "8.33.6",
   "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": "c13d977ea0c99066b13258271555a74f3b8d3c07"
+  "gitHead": "323d88c01416cafbc90022d336d9062315f9322b"
 }

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/gas-estimation.js

@@ -4,7 +4,7 @@ import BN from 'bn.js'
 
 import { estimateGas, isContractAddressCached } from './eth-like-util.js'
 
-export const EXTRA_PERCENTAGE = 20
+export const EXTRA_PERCENTAGE = 29
 
 // 16 gas per non-zero byte (4 gas per zero byte) of "transaction input data"
 const GAS_PER_NON_ZERO_BYTE = 16

package/src/get-balances.js

@@ -8,13 +8,13 @@ import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
 import assert from 'minimalistic-assert'
 
 const getStaked = ({ accountState, asset }) => {
-  return accountState?.staking?.[asset.name]?.activeStakedBalance || asset.currency.ZERO
+  return accountState?.staking?.[asset.name]?.delegatedBalance || asset.currency.ZERO
 }
 
 const getStaking = ({ accountState, asset }) => {
-  return (accountState?.staking?.[asset.name]?.pendingBalance || asset.currency.ZERO).add(
-    accountState?.staking?.[asset.name]?.pendingDepositedBalance || asset.currency.ZERO
-  )
+  const activeStakedBalance =
+    accountState?.staking?.[asset.name]?.activeStakedBalance || asset.currency.ZERO
+  return getStaked({ accountState, asset }).sub(activeStakedBalance)
 }
 
 const getUnclaimedUndelegatedBalance = ({ accountState, asset }) => {

package/src/get-fee-async.js

@@ -66,9 +66,7 @@ const getFeeAsyncFactory = ({
     isExchange,
     customFee,
     calculateEffectiveFee,
-    isSendAll,
     gasLimit: providedGasLimit,
-    isRbfAllowed = true, // Destkop, isRbfAllowed=true when advanced panel is on
   }) => {
     const fromAddress = providedFromAddress || ARBITRARY_ADDRESS // sending from a random address
     const toAddress = providedToAddress || ARBITRARY_ADDRESS // sending to a random address,
@@ -109,9 +107,7 @@ const getFeeAsyncFactory = ({
       feeData,
       gasLimit,
       isExchange,
-      isSendAll,
       amount,
-      isRbfAllowed,
       calculateEffectiveFee,
       customFee,
     })

package/src/get-fee.js

@@ -29,12 +29,22 @@ export const getFeeFactory =
     customFee,
     gasLimit: providedGasLimit,
     isExchange,
-    isSendAll,
     amount,
-    isRbfAllowed = true, // Destkop, isRbfAllowed=true when advanced panel is on
     calculateEffectiveFee,
   }) => {
-    const { eip1559Enabled, baseFeePerGas, tipGasPrice, useBaseGasPrice } = 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 })
 

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