@exodus/ethereum-lib 2.0.7 → 2.1.0

package/package.json

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

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

@@ -10,17 +10,24 @@ const BumpType = {
 
 function isQueuedPendingTx(tx, activeWalletAccount, getTxLog) {
   const txLog = getTxLog('ethereum', activeWalletAccount)
-  if (isQueuedPendingTx.minIndex >= 0 && txLog.getAt(isQueuedPendingTx.minIndex)?.pending) {
-    return tx.data?.nonce > txLog.getAt(isQueuedPendingTx.minIndex).data.nonce
+  if (!txLog || txLog.size === 0) return false
+
+  const txAtMinIndex = txLog.getAt(isQueuedPendingTx.minIndex)
+  if (isQueuedPendingTx.minIndex >= 0 && txAtMinIndex && txAtMinIndex.pending) {
+    return tx.data && tx.data.nonce > txAtMinIndex.data.nonce
   }
   let minPendingNonce = Number.MAX_SAFE_INTEGER
   for (let index = 0; index < txLog.size; index++) {
     const _tx = txLog.getAt(index)
     if (!_tx.pending) continue
+
+    const nonce = _tx.data && _tx.data.nonce
+    if (nonce === undefined) continue
+
     // ignore nonce of a TX that just replaced an another tx
-    if (_tx.data?.replacedTxId && Date.now() - _tx.date < MINUTE) continue
-    if (_tx.sent && _tx.data?.nonce < minPendingNonce) {
-      minPendingNonce = _tx.data.nonce
+    if (_tx.data.replacedTxId && Date.now() - _tx.date < MINUTE) continue
+    if (_tx.sent && nonce < minPendingNonce) {
+      minPendingNonce = nonce
       isQueuedPendingTx.minIndex = index
     }
   }
@@ -49,6 +56,7 @@ export default (
   getIsRbfEnabledSelector,
   getIsEnoughBalanceToAccelerateSelector,
   getTxLogSelector,
+  getIsFailedOrderByTxIdSelector,
   assets
 ) =>
   createSelector(
@@ -59,6 +67,7 @@ export default (
     getIsRbfEnabledSelector,
     getIsEnoughBalanceToAccelerateSelector,
     getTxLogSelector,
+    getIsFailedOrderByTxIdSelector,
     (
       getFeeData,
       getFee,
@@ -66,14 +75,24 @@ export default (
       getPersonalNoteByTxId,
       getIsRbfEnabled,
       getIsEnoughBalanceToAccelerate,
-      getTxLog
+      getTxLog,
+      getIsFailedOrderByTxId
     ) => (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 isFailedExchangeOrder = getIsFailedOrderByTxId(tx.txId)
+      if (
+        !tx.pending ||
+        !tx.sent ||
+        (tx.exchange && !isFailedExchangeOrder) ||
+        !tx.data ||
+        !tx.data.gasLimit
+      )
+        return BumpType.NONE
+      const personalNote = getPersonalNoteByTxId(tx.txId)
+      if (personalNote && personalNote.dapp) return BumpType.NONE
       if (isQueuedPendingTx(tx, activeWalletAccount, getTxLog)) return BumpType.NONE
 
       const { gasPrice: currentGasPrice } = getFeeData(assetName)