@exodus/ethereum-lib 2.10.2 → 2.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "a352b5ebc98ee831c4c8c8a5d055d70e15801401"
+  "gitHead": "704f2a8459929ab1c12653de7df84d1406b67e0f"
 }

package/src/constants.js

@@ -9,3 +9,4 @@ export const CONFIRMATIONS_NUMBER = {
 }
 export const ETHEREUM_LIKE_ASSETS = ['bsc', 'ethereum', 'ethereumclassic', 'matic']
 export const ETHEREUM_LIKE_TOKEN_TYPES = ['ETHEREUM_ERC20', 'BSC_BEP20', 'MATIC_ERC20']
+export const BUMP_RATE = 1.2

package/src/fee-data/ethereum.js

@@ -11,10 +11,7 @@ export default new FeeData(
     gasPriceMinimumRate: 0.5,
     enableFeeDelegation: false,
     tipGasPrice: '2 Gwei',
-    minTipGasPrice: '1 Gwei',
-    maxTipGasPrice: '5 Gwei',
-    baseFeeMultiplier: 1.6019, // 1.125^4
-    eip1559Enabled: false,
+    eip1559Enabled: true,
   },
   'gasPrice',
   'ethereum'

package/src/fee-monitor/ethereum-like.js

@@ -7,19 +7,11 @@ export default class EthereumLikeFeeMonitor extends FeeMonitor {
     interval = DEFAULT_FEE_MONITOR_INTERVAL,
     assetName,
     getGasPrice,
-    getBaseFee,
     minGasPrice = 0,
   }) {
     super({ updateFee, interval, assetName })
     this.getGasPrice = getGasPrice
     this.minGasPrice = minGasPrice
-    this.getBaseFee = getBaseFee
-    this.eip1559Enabled = true
-  }
-
-  setEip1559Enabled(bool = true) {
-    // bool set by remote-config
-    this.eip1559Enabled = bool
   }
 
   async fetchFee() {
@@ -33,15 +25,8 @@ export default class EthereumLikeFeeMonitor extends FeeMonitor {
       gasPrice = this.minGasPrice
     }
 
-    if (this.asset.name === 'ethereum' && this.eip1559Enabled) {
-      const baseFee = parseInt(await this.getBaseFee(), 16)
-      return {
-        gasPrice: `${gasPrice} wei`,
-        baseFee: `${baseFee} wei`,
-        eip1559Enabled: this.eip1559Enabled,
-      }
+    return {
+      gasPrice: `${gasPrice} wei`,
     }
-
-    return { gasPrice: `${gasPrice} wei` }
   }
 }

package/src/selectors/get-can-accelerate-tx-factory.js

@@ -1,6 +1,7 @@
 import { createSelector } from 'reselect'
 import ms from 'ms'
 import { isEthereumLike } from '../utils'
+import { BUMP_RATE } from '../constants'
 
 const MINUTE = ms('1m')
 const BumpType = {
@@ -82,24 +83,22 @@ const wrapResponseToObject = ({ bumpType = BumpType.NONE, errorMessage = null }
 
 const calculateTxGasPrice = (tx) => tx.feeAmount.div(tx.data.gasLimit)
 
-export const calculateBumpedGasPrice = ({
-  baseAsset,
-  tx,
-  currentGasPrice,
-  currentBaseFee,
-  baseFeeMultiplier,
-}) => {
-  if (tx.data?.tipGasPrice) {
-    // EIP1559 tx
-    const bumpedTipGasPrice = baseAsset.currency.baseUnit(tx.data.tipGasPrice).mul(2)
-    const bumpedGasPrice = currentBaseFee.mul(baseFeeMultiplier).add(bumpedTipGasPrice) // we are fetching a fresh baseFee, no need to multiply by baseFeeMultiplier
-    return { bumpedGasPrice, bumpedTipGasPrice }
-  }
-
+export const calculateBumpedGasPrice = ({ baseAsset, tx, currentGasPrice, eip1559Enabled }) => {
   const usedGasPrice = calculateTxGasPrice(tx)
-  const bumpedGasPrice = usedGasPrice.mul(12).div(10)
-
-  return { bumpedGasPrice: currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice }
+  let bumpedGasPrice = usedGasPrice.mul(BUMP_RATE)
+  bumpedGasPrice = currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice
+
+  const tipGasPrice = tx.data?.tipGasPrice
+    ? baseAsset.currency.baseUnit(tx.data.tipGasPrice).to('Gwei')
+    : baseAsset.currency.parse('2 Gwei') // we bump a legacy tx by an EIP1559 tx
+  const bumpedTipGasPrice = tipGasPrice.mul(BUMP_RATE)
+
+  return eip1559Enabled
+    ? {
+        bumpedTipGasPrice,
+        bumpedGasPrice,
+      }
+    : { bumpedGasPrice }
 }
 
 export default (
@@ -151,13 +150,9 @@ export default (
       if (isQueuedPendingTx(tx, baseAssetName, activeWalletAccount, getTxLog))
         return wrapResponseToObject({ errorMessage: 'there is a stuck TX with lower nonce' })
 
-      const {
-        gasPrice: currentGasPrice,
-        gasPriceMinimumRate,
-        eip1559Enabled,
-        baseFee: currentBaseFee,
-        baseFeeMultiplier,
-      } = getFeeData(assetName)
+      const { gasPrice: currentGasPrice, gasPriceMinimumRate, eip1559Enabled } = getFeeData(
+        assetName
+      )
       // converting to the smallest unit to avoid rounding errors
       if (
         !eip1559Enabled &&
@@ -171,8 +166,7 @@ export default (
         baseAsset,
         tx,
         currentGasPrice,
-        currentBaseFee,
-        baseFeeMultiplier,
+        eip1559Enabled,
       })
       const replacementFee = gasPriceToUse.mul(tx.data.gasLimit)
       const extraEthNeeded = replacementFee.sub(tx.feeAmount)

package/src/utils/index.js

@@ -63,10 +63,5 @@ export function deserialize(hex) {
   }
 }
 
-export function gasPriceFromFeeData(feeData) {
-  const { baseFeeMultiplier, baseFee, tipGasPrice, gasPrice, eip1559Enabled } = feeData
-
-  return eip1559Enabled
-    ? { gasPrice: baseFee.mul(baseFeeMultiplier).add(tipGasPrice), tipGasPrice }
-    : { gasPrice }
-}
+const getTxType = (serializedTx: string) => serializedTx.slice(2, 4)
+export const isEip1559Tx = (serializedTx: string) => getTxType(serializedTx) === '02'