@exodus/ethereum-api 8.22.3 → 8.22.5

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.22.5](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.22.4...@exodus/ethereum-api@8.22.5) (2024-12-09)
+
+
+### Bug Fixes
+
+
+* fix: remove gasPriceEconomicalRate (#4659)
+
+
+
+## [8.22.4](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.22.3...@exodus/ethereum-api@8.22.4) (2024-12-09)
+
+
+### Bug Fixes
+
+
+* fix: use multipled gasPrice when sending (#4628)
+
+
+
 ## [8.22.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.22.2...@exodus/ethereum-api@8.22.3) (2024-12-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.22.3",
+  "version": "8.22.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",
@@ -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.4.0",
+    "@exodus/ethereum-lib": "^5.8.1",
     "@exodus/ethereum-meta": "^2.1.5",
     "@exodus/ethereumholesky-meta": "^2.0.0",
     "@exodus/ethereumjs": "^1.0.0",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "baff21e8431ee823250984b91dd5c3f4bb51ba32"
+  "gitHead": "2a5e9f37cb3694f7fc17f8760c69cbccda13e462"
 }

package/src/fee-data-factory.js

@@ -5,7 +5,6 @@ const createFeeDataConfigDefaults = ({ currency, feeDataConfig }) => {
   const shared = {
     tipGasPrice: '0 Gwei',
     fuelThreshold: '0 Gwei',
-    gasPriceEconomicalRate: 0.8,
     gasPriceMinimumRate: 0.6,
     gasPriceMaximumRate: 1.3,
   }

package/src/get-fee-async.js

@@ -104,6 +104,18 @@ const getFeeAsyncFactory = ({
 
     const feeData = await assetClientInterface.getFeeConfig({ assetName: asset.baseAsset.name })
 
+    const { fee, gasPrice, ...rest } = getFee({
+      asset,
+      feeData,
+      gasLimit,
+      isExchange,
+      isSendAll,
+      amount,
+      isRbfAllowed,
+      calculateEffectiveFee,
+      customFee,
+    })
+
     const optimismL1DataFee = asset.baseAsset.estimateL1DataFee
       ? await asset.baseAsset.estimateL1DataFee({
           unsignedTx: createUnsignedTx({
@@ -113,24 +125,12 @@ const getFeeAsyncFactory = ({
             amount,
             nonce: 0,
             txInput,
-            gasPrice: feeData.gasPrice,
+            gasPrice,
             gasLimit,
           }),
         })
       : undefined
 
-    const { fee, ...rest } = getFee({
-      asset,
-      feeData,
-      gasLimit,
-      isExchange,
-      isSendAll,
-      amount,
-      isRbfAllowed,
-      calculateEffectiveFee, // BE
-      customFee, // BE
-    })
-
     const l1DataFee = optimismL1DataFee
       ? asset.baseAsset.currency.baseUnit(optimismL1DataFee)
       : asset.baseAsset.currency.ZERO
@@ -138,6 +138,7 @@ const getFeeAsyncFactory = ({
       fee: fee.add(l1DataFee),
       optimismL1DataFee,
       gasLimit,
+      gasPrice,
       ...rest,
     }
   }

package/src/get-fee.js

@@ -1,27 +1,10 @@
-import { calculateBumpedGasPrice, calculateExtraEth, isEthereumLike } from '@exodus/ethereum-lib'
+import { calculateBumpedGasPrice, calculateExtraEth } from '@exodus/ethereum-lib'
 
 // Move to meta?
 const taxes = {
   paxgold: 0.0002,
 }
 
-const getGasPriceMultiplier = ({ asset, feeData, isExchange, isSendAll, isRbfAllowed }) => {
-  // exchanges quotes expire, do not risk having a stuck tx
-
-  const gasPriceMultiplier = feeData.gasPriceMultiplier || 1
-
-  if (isExchange) return gasPriceMultiplier
-
-  // if eip1559 enabled, do not risk not leaving enough ETH to cover base fee (applies only for native asset)
-  // (gasPrice difference will be reimbursed anyway: users do not overpay)
-  if (isSendAll && isEthereumLike(asset) && feeData.eip1559Enabled) return gasPriceMultiplier
-
-  // do not risk having a stuck tx if we're not able to accelerate it
-  if (!isRbfAllowed || !feeData.rbfEnabled) return gasPriceMultiplier
-
-  return feeData.gasPriceEconomicalRate || gasPriceMultiplier
-}
-
 const getExtraFeeData = ({ asset, amount }) => {
   const tax = taxes[asset.name]
   if (!amount || !tax || amount.isZero) {
@@ -49,29 +32,26 @@ export const getFeeFactory =
     isRbfAllowed = true, // Destkop, isRbfAllowed=true when advanced panel is on
     calculateEffectiveFee,
   }) => {
-    const { gasPrice, eip1559Enabled, baseFeePerGas, tipGasPrice } = feeData
-    const gasPriceMultiplier = getGasPriceMultiplier({
-      asset,
-      isRbfAllowed,
-      feeData,
-      isExchange,
-      isSendAll,
-    })
+    const { gasPrice: feeDataGasPrice, eip1559Enabled, baseFeePerGas, tipGasPrice } = feeData
+
+    const gasPriceMultiplier = feeData.gasPriceMultiplier || 1
+
+    const gasPrice = customFee || feeDataGasPrice.mul(gasPriceMultiplier)
 
     const gasLimit = providedGasLimit || asset.gasLimit || defaultGasLimit
 
     const extraFeeData = getExtraFeeData({ asset, amount })
     if (calculateEffectiveFee && eip1559Enabled) {
-      const maxFeePerGas = customFee || gasPrice
+      const maxFeePerGas = gasPrice
       // effective_gas_price = min(base_fee_per_gas + tip_gas_price, max_fee_per_gas)
       const feePerGas = baseFeePerGas.add(tipGasPrice)
       const effectiveGasPrice = feePerGas.lt(maxFeePerGas) ? feePerGas : maxFeePerGas
 
-      return { fee: effectiveGasPrice.mul(gasLimit), extraFeeData }
+      return { fee: effectiveGasPrice.mul(gasLimit), gasPrice, extraFeeData }
     }
 
-    const fee = (customFee || gasPrice.mul(gasPriceMultiplier)).mul(gasLimit)
-    return { fee, extraFeeData }
+    const fee = gasPrice.mul(gasLimit)
+    return { fee, gasPrice, extraFeeData }
   }
 
 // Used in BE

package/src/tx-send/get-fee-info.js

@@ -6,15 +6,10 @@ const getFeeInfo = async function getFeeInfo({
   fromAddress,
   toAddress,
   amount,
-  isExchange,
   txInput,
   feeOpts = {},
 }) {
-  const {
-    gasPrice: gasPrice_,
-    tipGasPrice: tipGasPrice_,
-    gasPriceEconomicalRate,
-  } = await assetClientInterface.getFeeData({
+  const { gasPrice: gasPrice_, tipGasPrice: tipGasPrice_ } = await assetClientInterface.getFeeData({
     assetName: asset.name,
   })
 
@@ -31,10 +26,7 @@ const getFeeInfo = async function getFeeInfo({
     })
   }
 
-  const economicalFeeMultiplier = isExchange ? 1 : gasPriceEconomicalRate || 1
-
-  const fee = gasPrice.mul(economicalFeeMultiplier).mul(gasLimit)
-  return { gasPrice, gasLimit, fee, tipGasPrice }
+  return { gasPrice, gasLimit, tipGasPrice }
 }
 
 export default getFeeInfo

package/src/tx-send/tx-send.js

@@ -13,16 +13,8 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
   assert(assetClientInterface, 'assetClientInterface is required')
   assert(createUnsignedTx, 'createUnsignedTx is required')
   return async ({ asset, walletAccount, address, amount, options = {} }) => {
-    const {
-      nft,
-      isExchange,
-      bumpTxId,
-      nonce: providedNonce,
-      customFee,
-      keepTxInput,
-      isSendAll,
-    } = options
-    let { txInput, feeAmount } = options // avoid let!
+    const { nft, bumpTxId, nonce: providedNonce, customFee, keepTxInput, isSendAll } = options
+    let { txInput } = options // avoid let!
 
     const feeOpts = {
       gasPrice: options.gasPrice,
@@ -35,12 +27,6 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
 
     const assets = await assetClientInterface.getAssetsForNetwork({ baseAssetName: baseAsset.name })
 
-    // Using a default zero value to not break code relying on the `tx.feeAmount` property.
-    // For example, some exchange providers don't supply this.
-    if (!feeAmount) {
-      feeAmount = asset.baseAsset.currency.ZERO
-    }
-
     const fromAddress = await assetClientInterface.getReceiveAddress({
       assetName: baseAsset.name,
       walletAccount,
@@ -103,7 +89,6 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       eip1559Enabled = feeData.eip1559Enabled && feeOpts.tipGasPrice
       bumpNonce = replacedTx.data.nonce
       txInput = replacedTokenTx ? null : replacedTx.data.data || '0x'
-      feeAmount = feeOpts.gasPrice.mul(feeOpts.gasLimit)
       if (bumpNonce === undefined) {
         throw new Error(`Cannot bump transaction ${bumpTxId}: data object seems to be corrupted`)
       }
@@ -127,10 +112,11 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       txInput,
       keepTxInput,
       isSendAll,
-      isExchange,
       createUnsignedTx,
     }
-    let { txId, rawTx, nonce, gasLimit, tipGasPrice } = await createTx(createTxParams)
+    let { txId, rawTx, nonce, gasLimit, tipGasPrice, gasPrice } = await createTx(createTxParams)
+
+    const feeAmount = gasPrice.mul(gasLimit)
 
     try {
       await baseAsset.api.broadcastTx(rawTx.toString('hex'))
@@ -275,7 +261,6 @@ const createTx = async ({
   keepTxInput = false,
   customFee: customGasPrice,
   isSendAll,
-  isExchange,
   fromAddress,
   feeOpts,
   createUnsignedTx,
@@ -300,7 +285,6 @@ const createTx = async ({
     fromAddress,
     toAddress,
     amount,
-    isExchange,
     txInput,
     feeOpts,
   })