@exodus/ethereum-lib 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -21,5 +21,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "2e5d344cb8f52ccd17e37dfa73db49a95a927e96"
+  "gitHead": "0c3b4952a99f9157becc9a3754a34e289a0a1095"
 }

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

@@ -6,12 +6,20 @@ const BumpType = {
   RBF: 2,
 }
 
+export const calculateBumpedGasPrice = (tx, currentGasPrice) => {
+  const usedGasPrice = tx.feeAmount.div(tx.data.gasLimit)
+  const bumpedGasPrice = usedGasPrice.mul(12).div(10)
+
+  return currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice
+}
+
 export default (
   getFeeDataSelector,
   getFeeSelector,
   getWalletAccountBalancesSelector,
   activeWalletAccountSelector,
-  getPersonalNoteByTxIdSelector
+  getPersonalNoteByTxIdSelector,
+  assets
 ) =>
   createSelector(
     getFeeDataSelector,
@@ -22,20 +30,18 @@ export default (
     (getFeeData, getFee, getWalletAccountBalances, activeWalletAccount, getPersonalNoteByTxId) => (
       tx
     ) => {
-      if (!['ethereum', 'ethereumclassic'].includes(tx.coinName)) return BumpType.NONE
-      if (!tx.pending || !tx.sent || tx.exchange) return BumpType.NONE
+      const assetName = tx.coinName
+      const asset = assets[assetName]
+      if (!['ETHEREUM_ERC20', 'ETHEREUM_LIKE'].includes(asset.assetType)) return BumpType.NONE
+      if (!tx.pending || !tx.sent || tx.exchange || !tx.data?.gasLimit) return BumpType.NONE
       if (getPersonalNoteByTxId(tx.txId)?.dapp) return BumpType.NONE
 
       const walletAccountBalances = getWalletAccountBalances(activeWalletAccount)
-      const assetName = tx.coinName
       const { gasPrice: currentGasPrice } = getFeeData(assetName)
-      const usedGasPrice = tx.feeAmount.div(tx.data.gasLimit)
-      // new gas price should be at least 20% higher and not less than the current gas price
-      const bumpedGasPrice = usedGasPrice.mul(12).div(10)
-      const gasPriceToUse = currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice
+      const gasPriceToUse = calculateBumpedGasPrice(tx, currentGasPrice)
       const replacementFee = gasPriceToUse.mul(tx.data.gasLimit)
       const extraEthNeeded = replacementFee.sub(tx.feeAmount)
-      if (walletAccountBalances[assetName].lt(extraEthNeeded)) return BumpType.NONE
+      if (walletAccountBalances[asset.baseAsset.name].lt(extraEthNeeded)) return BumpType.NONE
 
       return BumpType.RBF
     }

package/src/selectors/index.js

@@ -1 +1,4 @@
-export { default as getCanAccelerateTxFactory } from './get-can-accelerate-tx-factory'
+export {
+  default as getCanAccelerateTxFactory,
+  calculateBumpedGasPrice,
+} from './get-can-accelerate-tx-factory'