@exodus/ethereum-lib 2.0.6 → 2.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -16,6 +16,7 @@
     "base-x": "^3.0.2",
     "ethereumjs-tx": "^1.3.7",
     "ethereumjs-util": "^5.2.0",
+    "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
   "peerDependencies": {
@@ -24,5 +25,5 @@
   "devDependencies": {
     "@exodus/models": "^8.5.1"
   },
-  "gitHead": "38a0f167883abb62d45459bcd747f38a6c5a3b0d"
+  "gitHead": "57d3639cc6539825c14e53ef6c299d79920f54d3"
 }

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
     }
   }
@@ -72,8 +79,10 @@ export default (
       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
+      if (!tx.pending || !tx.sent || tx.exchange || !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)