@exodus/ethereum-lib 2.1.1 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -25,5 +25,5 @@
   "devDependencies": {
     "@exodus/models": "^8.5.1"
   },
-  "gitHead": "bd541d6d65566346f20e9217e8a0088d3c61e5c4"
+  "gitHead": "1b43dd94263594666e89c4948e728d28e5ffa798"
 }

package/src/fee-data/ethereum.js

@@ -2,9 +2,12 @@ import { FeeData } from '@exodus/asset-lib'
 
 export default new FeeData(
   {
-    gasPrice: '50 Gwei',
+    gasPrice: '75 Gwei',
     max: '250 Gwei',
     min: '1 Gwei',
+    erc20FuelThreshold: '0.025 ETH',
+    swapFee: '0.05 ETH',
+    gasPriceEconomicalRate: 0.7,
   },
   'gasPrice',
   'ethereum'

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
@@ -41,6 +62,11 @@ export const _refreshCache = () => {
   isQueuedPendingTx.minIndex = null
 }
 
+const wrapResponseToObject = ({ bumpType = BumpType.NONE, errorMessage = null } = {}) => ({
+  bumpType,
+  errorMessage,
+})
+
 export const calculateBumpedGasPrice = (tx, currentGasPrice) => {
   const usedGasPrice = tx.feeAmount.div(tx.data.gasLimit)
   const bumpedGasPrice = usedGasPrice.mul(12).div(10)
@@ -80,14 +106,21 @@ export default (
     ) => (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.data || !tx.data.gasLimit) return BumpType.NONE
+      if (!getIsRbfEnabled(assetName))
+        return wrapResponseToObject({ errorMessage: 'rbf is disabled' })
+      if (!['ETHEREUM_ERC20', 'ETHEREUM_LIKE'].includes(asset.assetType))
+        return wrapResponseToObject({ errorMessage: `not an ETH/ERC20 asset supplied` })
+      if (!tx.pending || !tx.sent)
+        return wrapResponseToObject({ errorMessage: 'can not bump a pending or received TX' })
+      if (!tx.data || !tx.data.gasLimit)
+        return wrapResponseToObject({ errorMessage: 'data object is missing or corrupted' })
       const isExchangeTx = getIsExchangeTx(tx.txId)
-      if (isExchangeTx) return BumpType.NONE
+      if (isExchangeTx) return wrapResponseToObject({ errorMessage: 'can not bump an exchange TX' })
       const personalNote = getPersonalNoteByTxId(tx.txId)
-      if (personalNote && personalNote.dapp) return BumpType.NONE
-      if (isQueuedPendingTx(tx, activeWalletAccount, getTxLog)) return BumpType.NONE
+      if (personalNote && personalNote.dapp)
+        return wrapResponseToObject({ errorMessage: 'can not bump a dapp TX' })
+      if (isQueuedPendingTx(tx, activeWalletAccount, getTxLog))
+        return wrapResponseToObject({ errorMessage: 'there is a stuck TX with lower nonce' })
 
       const { gasPrice: currentGasPrice } = getFeeData(assetName)
       const gasPriceToUse = calculateBumpedGasPrice(tx, currentGasPrice)
@@ -96,8 +129,8 @@ export default (
       if (
         !getIsEnoughBalanceToAccelerate(activeWalletAccount, asset.baseAsset.name, extraEthNeeded)
       )
-        return BumpType.NONE
+        return wrapResponseToObject({ errorMessage: 'insufficient funds' })
 
-      return BumpType.RBF
+      return wrapResponseToObject({ bumpType: BumpType.RBF })
     }
   )

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'