@exodus/ethereum-lib 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.4.0",
-    "@exodus/models": "^8.2.0",
+    "@exodus/models": "^8.4.0",
     "@exodus/solidity-contract": "^0.1.3",
     "base-x": "^3.0.2",
     "ethereumjs-tx": "^1.3.7",
@@ -21,5 +21,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "cc2ade686dff7693c028ca9d6796ada2a0eed6f1"
+  "gitHead": "d87cca0e0050afde0621e4090010d6a185eeab9b"
 }

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

@@ -16,32 +16,42 @@ export const calculateBumpedGasPrice = (tx, currentGasPrice) => {
 export default (
   getFeeDataSelector,
   getFeeSelector,
-  getWalletAccountBalancesSelector,
   activeWalletAccountSelector,
   getPersonalNoteByTxIdSelector,
+  getIsRbfEnabledSelector,
+  getIsEnoughBalanceToAccelerateSelector,
   assets
 ) =>
   createSelector(
     getFeeDataSelector,
     getFeeSelector,
-    getWalletAccountBalancesSelector,
     activeWalletAccountSelector,
     getPersonalNoteByTxIdSelector,
-    (getFeeData, getFee, getWalletAccountBalances, activeWalletAccount, getPersonalNoteByTxId) => (
-      tx
-    ) => {
+    getIsRbfEnabledSelector,
+    getIsEnoughBalanceToAccelerateSelector,
+    (
+      getFeeData,
+      getFee,
+      activeWalletAccount,
+      getPersonalNoteByTxId,
+      getIsRbfEnabled,
+      getIsEnoughBalanceToAccelerate
+    ) => (tx) => {
       const assetName = tx.coinName
       const asset = assets[assetName]
+      if (!getIsRbfEnabled(assetName)) return BumpType.NONE
       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 { gasPrice: currentGasPrice } = getFeeData(assetName)
       const gasPriceToUse = calculateBumpedGasPrice(tx, currentGasPrice)
       const replacementFee = gasPriceToUse.mul(tx.data.gasLimit)
       const extraEthNeeded = replacementFee.sub(tx.feeAmount)
-      if (walletAccountBalances[asset.baseAsset.name].lt(extraEthNeeded)) return BumpType.NONE
+      if (
+        !getIsEnoughBalanceToAccelerate(activeWalletAccount, asset.baseAsset.name, extraEthNeeded)
+      )
+        return BumpType.NONE
 
       return BumpType.RBF
     }

package/src/selectors/get-is-enough-balance-to-accelerate-factory.js

@@ -0,0 +1,20 @@
+import { createSelector } from 'reselect'
+
+export default (getWalletAccountBalancesSelector, getUnconfirmedEthereumBalanceSelector) =>
+  createSelector(
+    getWalletAccountBalancesSelector,
+    getUnconfirmedEthereumBalanceSelector,
+    (getWalletAccountBalances, getUnconfirmedEthereumBalance) => (
+      walletAccount,
+      assetName,
+      extraEthNeeded
+    ) => {
+      const totalBalance = getWalletAccountBalances(walletAccount)[assetName]
+      const unconfirmedBalance = getUnconfirmedEthereumBalance({
+        asset: assetName,
+        walletAccount,
+      })
+
+      return totalBalance.sub(unconfirmedBalance).gte(extraEthNeeded)
+    }
+  )

package/src/selectors/index.js

@@ -2,3 +2,5 @@ export {
   default as getCanAccelerateTxFactory,
   calculateBumpedGasPrice,
 } from './get-can-accelerate-tx-factory'
+
+export { default as getIsEnoughBalanceToAccelerateSelectorFactory } from './get-is-enough-balance-to-accelerate-factory'