@exodus/ethereum-lib 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -25,5 +25,5 @@
   "devDependencies": {
     "@exodus/models": "^8.5.1"
   },
-  "gitHead": "3530b1a7710f3aec0aba47dd761e4911629a96ad"
+  "gitHead": "956ac273cee5a8979824a68127a6d400ac711e48"
 }

package/src/fee-data/ethereum.js

@@ -2,7 +2,7 @@ import { FeeData } from '@exodus/asset-lib'
 
 export default new FeeData(
   {
-    gasPrice: '50 Gwei',
+    gasPrice: '75 Gwei',
     max: '250 Gwei',
     min: '1 Gwei',
   },

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

@@ -8,6 +8,27 @@ const BumpType = {
   RBF: 2,
 }
 
+export function getPendingNonExchangeTxs(activeWalletAccount, getTxLog, getIsExchangeTx) {
+  // check if the tx log even has pending transactions
+  const result = isQueuedPendingTx(
+    { data: { nonce: Number.MAX_SAFE_INTEGER } },
+    activeWalletAccount,
+    getTxLog
+  )
+  if (!result) return []
+
+  const txLog = getTxLog('ethereum', activeWalletAccount)
+  const pendingNonExchangeTxs = []
+  for (let index = isQueuedPendingTx.minIndex; index < txLog.size; index++) {
+    const _tx = txLog.getAt(index)
+    if (_tx.pending && _tx.sent && !getIsExchangeTx(_tx.txId)) {
+      pendingNonExchangeTxs.push(_tx)
+    }
+  }
+
+  return pendingNonExchangeTxs
+}
+
 function isQueuedPendingTx(tx, activeWalletAccount, getTxLog) {
   const txLog = getTxLog('ethereum', activeWalletAccount)
   if (!txLog || txLog.size === 0) return false
@@ -56,7 +77,7 @@ export default (
   getIsRbfEnabledSelector,
   getIsEnoughBalanceToAccelerateSelector,
   getTxLogSelector,
-  getIsFailedOrderByTxIdSelector,
+  getIsExchangeTxSelector,
   assets
 ) =>
   createSelector(
@@ -67,7 +88,7 @@ export default (
     getIsRbfEnabledSelector,
     getIsEnoughBalanceToAccelerateSelector,
     getTxLogSelector,
-    getIsFailedOrderByTxIdSelector,
+    getIsExchangeTxSelector,
     (
       getFeeData,
       getFee,
@@ -76,21 +97,15 @@ export default (
       getIsRbfEnabled,
       getIsEnoughBalanceToAccelerate,
       getTxLog,
-      getIsFailedOrderByTxId
+      getIsExchangeTx
     ) => (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
-      const isFailedExchangeOrder = getIsFailedOrderByTxId(tx.txId)
-      if (
-        !tx.pending ||
-        !tx.sent ||
-        (tx.exchange && !isFailedExchangeOrder) ||
-        !tx.data ||
-        !tx.data.gasLimit
-      )
-        return BumpType.NONE
+      if (!tx.pending || !tx.sent || !tx.data || !tx.data.gasLimit) return BumpType.NONE
+      const isExchangeTx = getIsExchangeTx(tx.txId)
+      if (isExchangeTx) return BumpType.NONE
       const personalNote = getPersonalNoteByTxId(tx.txId)
       if (personalNote && personalNote.dapp) return BumpType.NONE
       if (isQueuedPendingTx(tx, activeWalletAccount, getTxLog)) return BumpType.NONE

package/src/selectors/index.js

@@ -1,6 +1,7 @@
 export {
   default as getCanAccelerateTxFactory,
   calculateBumpedGasPrice,
+  getPendingNonExchangeTxs,
 } from './get-can-accelerate-tx-factory'
 
 export { default as getIsEnoughBalanceToAccelerateSelectorFactory } from './get-is-enough-balance-to-accelerate-factory'