@exodus/ethereum-api 7.4.0 → 7.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "7.4.0",
+  "version": "7.5.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -25,7 +25,7 @@
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/crypto": "^1.0.0-rc.0",
     "@exodus/currency": "^2.1.3",
-    "@exodus/ethereum-lib": "^4.2.7",
+    "@exodus/ethereum-lib": "^4.8.1",
     "@exodus/ethereum-meta": "^1.2.0",
     "@exodus/ethereumholesky-meta": "^1.0.1",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.7",
@@ -57,5 +57,5 @@
     "cross-fetch": "^3.1.5",
     "delay": "4.0.1"
   },
-  "gitHead": "ac617aef893ac9d6b1689ca12e7b6de68a258621"
+  "gitHead": "220c00b21c6bf4d250aea7a40d37ceebb1716979"
 }

package/src/create-asset.js

@@ -21,6 +21,7 @@ import {
   signUnsignedTxWithSigner,
   validate,
   signMessage,
+  signMessageWithSigner,
   signHardwareFactory,
   DEFAULT_FEE_MONITOR_INTERVAL,
 } from '@exodus/ethereum-lib'
@@ -34,7 +35,6 @@ import { getEffectiveGasPrice, getFeeFactory } from './get-fee'
 import { createEthereumHooks } from './hooks'
 import { createStakingApi } from './staking-api'
 import { txSendFactory } from './tx-send'
-import { signMessageWithSigner } from '@exodus/ethereum-lib/src/sign-message'
 import { serverBasedFeeMonitorFactoryFactory } from './fee-monitor'
 import { createGetBalanceForAddress } from './get-balance-for-address'
 import { estimateL1DataFeeFactory, getL1GetFeeFactory } from './optimism-gas'
@@ -116,6 +116,7 @@ export const createAssetFactory = ({
     const createFeeMonitor = serverBasedFeeMonitorFactoryFactory({
       assetName: base.name,
       interval: config.feeMonitorInterval || feeMonitorInterval || DEFAULT_FEE_MONITOR_INTERVAL,
+      eip1559Enabled: feeData.eip1559Enabled, // this is not updated via remote config. Should it be?
     })
 
     const features = {

package/src/exodus-eth-server/api-coin-nodes.js

@@ -160,6 +160,21 @@ export default class ApiCoinNodesServer extends EventEmitter {
   // for fee monitor
   getGasPrice = this.gasPrice
 
+  async getLatestBlock() {
+    const request = this.buildRequest({
+      method: 'eth_getBlockByNumber',
+      params: ['latest', false],
+    })
+    return this.sendRequest(request)
+  }
+
+  async getBaseFeePerGas() {
+    const response = await this.getLatestBlock()
+    if (response.baseFeePerGas) {
+      return fromHexToString(response.baseFeePerGas)
+    }
+  }
+
   async estimateGas(...params) {
     const request = this.estimateGasRequest(...params)
     return this.sendRequest(request)

package/src/exodus-eth-server/api.js

@@ -126,6 +126,17 @@ export function create(defaultURL, ensAssetName) {
       return requestWithRetry('proxy', { method: 'eth_gasPrice' })
     },
 
+    async getLatestBlock() {
+      return this.getBlockByNumber('latest')
+    },
+
+    async getBaseFeePerGas() {
+      const response = await this.getLatestBlock()
+      if (response.baseFeePerGas) {
+        return fromHexToString(response.baseFeePerGas)
+      }
+    },
+
     async getTransactionCount(address, tag = 'latest') {
       return requestWithRetry('proxy', { method: 'eth_getTransactionCount', address, tag })
     },

package/src/exodus-eth-server/clarity.js

@@ -366,6 +366,17 @@ export default class ClarityServer extends EventEmitter {
     return this.sendRequest(request)
   }
 
+  async getLatestBlock() {
+    return this.getBlockByNumber('latest')
+  }
+
+  async getBaseFeePerGas() {
+    const response = await this.getLatestBlock()
+    if (response.baseFeePerGas) {
+      return fromHexToString(response.baseFeePerGas)
+    }
+  }
+
   async getBlockByHash(...params) {
     const request = this.getBlockByHashRequest(...params)
     return this.sendRequest(request)

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

@@ -1,6 +1,8 @@
-import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
+import { FeeMonitor } from '@exodus/asset-lib'
 import assert from 'minimalistic-assert'
 import { getServerByName } from '../exodus-eth-server'
+import { DEFAULT_FEE_MONITOR_INTERVAL } from '@exodus/ethereum-lib'
+import { fromHexToString } from '../number-utils'
 
 /**
  * Generic eth server based fee monitor.
@@ -16,24 +18,37 @@ import { getServerByName } from '../exodus-eth-server'
  * }
  */
 
-export const serverBasedFeeMonitorFactoryFactory = ({ assetName, interval }) => {
+export const serverBasedFeeMonitorFactoryFactory = ({
+  assetName,
+  interval = DEFAULT_FEE_MONITOR_INTERVAL,
+  eip1559Enabled,
+}) => {
   assert(assetName, 'assetName is required')
-
   // NOTE: Using getServerByName for simplicity now but
   // remove getServerByName and convert server to a param instead.
   // This is to avoid global references, static creation, remove the chain specific map and allow IOC
   const server = getServerByName(assetName)
-  const getGasPrice = (...args) => server.getGasPrice(...args)
-  const FeeMonitorClass = class ServerBaseEthereumFeeMonitor extends EthereumLikeFeeMonitor {
+
+  const FeeMonitorClass = class ServerBaseEthereumFeeMonitor extends FeeMonitor {
     constructor({ updateFee }) {
       assert(updateFee, 'updateFee is required')
       super({
         updateFee,
         assetName,
-        getGasPrice,
         interval,
       })
     }
+
+    async fetchFee() {
+      const gasPrice = fromHexToString(await server.getGasPrice())
+
+      const baseFeePerGas = eip1559Enabled ? `${await server.getBaseFeePerGas()} wei` : undefined
+
+      return {
+        gasPrice: `${gasPrice} wei`,
+        baseFeePerGas,
+      }
+    }
   }
   return (...args) => new FeeMonitorClass(...args)
 }

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

@@ -32,7 +32,12 @@ const txSendFactory = ({ assetClientInterface }) => {
     const baseAsset = asset.baseAsset
     const feeOpts = { ...feeOpts_ }
     const assets = await assetClientInterface.getAssetsForNetwork({ baseAssetName: baseAsset.name })
-    let eip1559Enabled = baseAsset.name === 'ethereum' // TODO: temp override, clean up use of eip1559Enabled flag and default to always true
+
+    // 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,
@@ -41,6 +46,12 @@ const txSendFactory = ({ assetClientInterface }) => {
 
     let nonceParam = _nonce
 
+    const feeData = await assetClientInterface.getFeeData({
+      assetName: baseAsset.name,
+    })
+
+    let eip1559Enabled = feeData.eip1559Enabled
+
     // `replacedTx` is always an ETH/ETC transaction (not a token)
     let replacedTx, replacedTokenTx
     if (bumpTxId) {
@@ -68,19 +79,17 @@ const txSendFactory = ({ assetClientInterface }) => {
       address = (replacedTokenTx || replacedTx).to
       amount = (replacedTokenTx || replacedTx).coinAmount.negate()
       feeOpts.gasLimit = replacedTx.data.gasLimit
-      const { gasPrice: currentGasPrice, eip1559Enabled: _eip1559Enabled } =
-        await assetClientInterface.getFeeData({
-          assetName,
-        })
+
+      const { gasPrice: currentGasPrice } = feeData
       const { bumpedGasPrice, bumpedTipGasPrice } = calculateBumpedGasPrice({
         baseAsset,
         tx: replacedTx,
         currentGasPrice,
-        eip1559Enabled: _eip1559Enabled,
+        eip1559Enabled,
       })
       feeOpts.gasPrice = bumpedGasPrice
       feeOpts.tipGasPrice = bumpedTipGasPrice
-      eip1559Enabled = _eip1559Enabled && feeOpts.tipGasPrice
+      eip1559Enabled = feeData.eip1559Enabled && feeOpts.tipGasPrice
       nonceParam = replacedTx.data.nonce
       txInput = replacedTokenTx ? null : replacedTx.data.data || '0x'
       feeAmount = feeOpts.gasPrice.mul(feeOpts.gasLimit)