@exodus/ethereum-api 8.22.2 → 8.22.4

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.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)
+
+
+### Bug Fixes
+
+
+* fix: send evm compatibility (#4661)
+
+
+
 ## [8.22.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.22.1...@exodus/ethereum-api@8.22.2) (2024-12-04)
 
 **Note:** Version bump only for package @exodus/ethereum-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.22.2",
+  "version": "8.22.4",
   "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": "94b6b798534f6b0587f6940248ab612513bfc34f"
+  "gitHead": "9271a07964a668a9903bd4268b893c83ca1118f9"
 }

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

@@ -49,7 +49,8 @@ export const getFeeFactory =
     isRbfAllowed = true, // Destkop, isRbfAllowed=true when advanced panel is on
     calculateEffectiveFee,
   }) => {
-    const { gasPrice, eip1559Enabled, baseFeePerGas, tipGasPrice } = feeData
+    const { gasPrice: feeDataGasPrice, eip1559Enabled, baseFeePerGas, tipGasPrice } = feeData
+
     const gasPriceMultiplier = getGasPriceMultiplier({
       asset,
       isRbfAllowed,
@@ -58,20 +59,22 @@ export const getFeeFactory =
       isSendAll,
     })
 
+    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

@@ -12,26 +12,19 @@ import { resolveNonce } from './nonce-utils.js'
 const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
   assert(assetClientInterface, 'assetClientInterface is required')
   assert(createUnsignedTx, 'createUnsignedTx is required')
-  return async ({
-    nft,
-    asset,
-    walletAccount,
-    amount,
-    address,
-    feeAmount,
-    shouldLog = true,
-    keepTxInput,
-    txInput,
-    nonce: providedNonce,
-    bumpTxId,
-    customFee,
-    isSendAll,
-    isExchange,
-    feeOpts: feeOpts_ = {},
-  }) => {
+  return async ({ asset, walletAccount, address, amount, options = {} }) => {
+    const { nft, bumpTxId, nonce: providedNonce, customFee, keepTxInput, isSendAll } = options
+    let { txInput, feeAmount } = options // avoid let!
+
+    const feeOpts = {
+      gasPrice: options.gasPrice,
+      tipGasPrice: options.tipGasPrice,
+      gasLimit: options.gasLimit,
+    }
+
     const assetName = asset.name
     const baseAsset = asset.baseAsset
-    const feeOpts = { ...feeOpts_ }
+
     const assets = await assetClientInterface.getAssetsForNetwork({ baseAssetName: baseAsset.name })
 
     // Using a default zero value to not break code relying on the `tx.feeAmount` property.
@@ -126,7 +119,6 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       txInput,
       keepTxInput,
       isSendAll,
-      isExchange,
       createUnsignedTx,
     }
     let { txId, rawTx, nonce, gasLimit, tipGasPrice } = await createTx(createTxParams)
@@ -274,7 +266,6 @@ const createTx = async ({
   keepTxInput = false,
   customFee: customGasPrice,
   isSendAll,
-  isExchange,
   fromAddress,
   feeOpts,
   createUnsignedTx,
@@ -299,7 +290,6 @@ const createTx = async ({
     fromAddress,
     toAddress,
     amount,
-    isExchange,
     txInput,
     feeOpts,
   })