@exodus/ethereum-lib 2.9.3 → 2.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.9.3",
+  "version": "2.10.1",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.4.0",
-    "@exodus/ethereumjs-common": "^2.4.0-exodus.3",
-    "@exodus/ethereumjs-tx": "^3.3.0-exodus.3",
-    "@exodus/ethereumjs-util": "^7.1.0-exodus.3",
+    "@exodus/ethereumjs-common": "^2.4.0-exodus.6",
+    "@exodus/ethereumjs-tx": "^3.3.0-exodus.6",
+    "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/models": "^8.5.12",
     "@exodus/solidity-contract": "^0.1.3",
     "base-x": "^3.0.2",
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "eae6b9f748f998f441875426e473d37f5a9809dc"
+  "gitHead": "d4013194fcf671424c87a455fb4c95e97b54f9a9"
 }

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

@@ -82,11 +82,24 @@ const wrapResponseToObject = ({ bumpType = BumpType.NONE, errorMessage = null }
 
 const calculateTxGasPrice = (tx) => tx.feeAmount.div(tx.data.gasLimit)
 
-export const calculateBumpedGasPrice = (tx, currentGasPrice) => {
+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 }
+  }
+
   const usedGasPrice = calculateTxGasPrice(tx)
   const bumpedGasPrice = usedGasPrice.mul(12).div(10)
 
-  return currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice
+  return { bumpedGasPrice: currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice }
 }
 
 export default (
@@ -120,14 +133,15 @@ export default (
       getIsExchangeTx
     ) => (tx) => {
       const assetName = tx.coinName
-      const baseAssetName = assets[assetName].baseAsset.name
+      const baseAsset = assets[assetName].baseAsset
+      const baseAssetName = baseAsset.name
       if (!getIsRbfEnabled(assetName))
         return wrapResponseToObject({ errorMessage: 'rbf is disabled' })
       if (!isEthereumLike(assets[assetName]))
         return wrapResponseToObject({ errorMessage: `not an ETH/ERC20/BSC/BEP20 asset supplied` })
       if (!tx.pending || !tx.sent)
         return wrapResponseToObject({ errorMessage: 'can not bump a confirmed or received TX' })
-      if (!tx.data || !tx.data.gasLimit)
+      if (!tx.data || !(tx.data.gasLimit || tx.data.tipGasPrice))
         return wrapResponseToObject({ errorMessage: 'data object is missing or corrupted' })
       const isExchangeTx = getIsExchangeTx(tx.txId)
       if (isExchangeTx) return wrapResponseToObject({ errorMessage: 'can not bump an exchange TX' })
@@ -137,16 +151,29 @@ export default (
       if (isQueuedPendingTx(tx, baseAssetName, activeWalletAccount, getTxLog))
         return wrapResponseToObject({ errorMessage: 'there is a stuck TX with lower nonce' })
 
-      const { gasPrice: currentGasPrice, gasPriceMinimumRate } = getFeeData(assetName)
+      const {
+        gasPrice: currentGasPrice,
+        gasPriceMinimumRate,
+        eip1559Enabled,
+        baseFee: currentBaseFee,
+        baseFeeMultiplier,
+      } = getFeeData(assetName)
       // converting to the smallest unit to avoid rounding errors
       if (
+        !eip1559Enabled &&
         calculateTxGasPrice(tx)
           .to('wei')
           .gte(currentGasPrice.mul(gasPriceMinimumRate).to('wei'))
       )
         return wrapResponseToObject({ errorMessage: 'the used gas price is still high enough' })
 
-      const gasPriceToUse = calculateBumpedGasPrice(tx, currentGasPrice)
+      const { bumpedGasPrice: gasPriceToUse } = calculateBumpedGasPrice({
+        baseAsset,
+        tx,
+        currentGasPrice,
+        currentBaseFee,
+        baseFeeMultiplier,
+      })
       const replacementFee = gasPriceToUse.mul(tx.data.gasLimit)
       const extraEthNeeded = replacementFee.sub(tx.feeAmount)
       if (!getIsEnoughBalanceToAccelerate(activeWalletAccount, baseAssetName, extraEthNeeded))

package/src/unsigned-tx/sign-unsigned-tx.js

@@ -33,7 +33,10 @@ export default function signUnsignedTx(
     )
   } else {
     // Legacy tx
-    tx = Transaction.fromTxData({ gasPrice, ...txData }, { common: new Common({ chain }) })
+    tx = Transaction.fromTxData(
+      { gasPrice, ...txData },
+      { common: Common.custom({ chainId: chain }) }
+    )
   }
 
   const signedTx = tx.sign(privateKey)