@exodus/ethereum-lib 2.6.0 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -23,5 +23,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "4453c1bb550cdf09b6851ab7c1c2d092eca8e792"
+  "gitHead": "71d126e789b161f5877db4a651a641061f00c7af"
 }

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

@@ -8,16 +8,28 @@ const BumpType = {
   RBF: 2,
 }
 
+// Legacy compatibility with wallets
 export function getPendingNonExchangeTxs(activeWalletAccount, getTxLog, getIsExchangeTx) {
+  console.log('Using deprecated function getPendingNonExchangeTxs()')
+  return getAssetPendingNonExchangeTxs('ethereum', activeWalletAccount, getTxLog, getIsExchangeTx)
+}
+
+export function getAssetPendingNonExchangeTxs(
+  baseAssetName,
+  activeWalletAccount,
+  getTxLog,
+  getIsExchangeTx
+) {
   // check if the tx log even has pending transactions
   const result = isQueuedPendingTx(
     { data: { nonce: Number.MAX_SAFE_INTEGER } },
+    baseAssetName,
     activeWalletAccount,
     getTxLog
   )
   if (!result) return []
 
-  const txLog = getTxLog('ethereum', activeWalletAccount)
+  const txLog = getTxLog(baseAssetName, activeWalletAccount)
   const pendingNonExchangeTxs = []
   for (let index = isQueuedPendingTx.minIndex; index < txLog.size; index++) {
     const _tx = txLog.getAt(index)
@@ -29,8 +41,8 @@ export function getPendingNonExchangeTxs(activeWalletAccount, getTxLog, getIsExc
   return pendingNonExchangeTxs
 }
 
-function isQueuedPendingTx(tx, activeWalletAccount, getTxLog) {
-  const txLog = getTxLog('ethereum', activeWalletAccount)
+function isQueuedPendingTx(tx, baseAssetName, activeWalletAccount, getTxLog) {
+  const txLog = getTxLog(baseAssetName, activeWalletAccount)
   if (!txLog || txLog.size === 0) return false
 
   const txAtMinIndex = txLog.getAt(isQueuedPendingTx.minIndex)
@@ -105,11 +117,11 @@ export default (
       getIsExchangeTx
     ) => (tx) => {
       const assetName = tx.coinName
-      const asset = assets[assetName]
+      const baseAssetName = assets[assetName].baseAsset.name
       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 (!['ethereum', 'bsc'].includes(baseAssetName))
+        return wrapResponseToObject({ errorMessage: `not an ETH/ERC20/BSC/BEP20 asset supplied` })
       if (!tx.pending || !tx.sent)
         return wrapResponseToObject({ errorMessage: 'can not bump a pending or received TX' })
       if (!tx.data || !tx.data.gasLimit)
@@ -119,16 +131,14 @@ export default (
       const personalNote = getPersonalNoteByTxId(tx.txId)
       if (personalNote && personalNote.dapp)
         return wrapResponseToObject({ errorMessage: 'can not bump a dapp TX' })
-      if (isQueuedPendingTx(tx, activeWalletAccount, getTxLog))
+      if (isQueuedPendingTx(tx, baseAssetName, activeWalletAccount, getTxLog))
         return wrapResponseToObject({ errorMessage: 'there is a stuck TX with lower nonce' })
 
       const { gasPrice: currentGasPrice } = getFeeData(assetName)
       const gasPriceToUse = calculateBumpedGasPrice(tx, currentGasPrice)
       const replacementFee = gasPriceToUse.mul(tx.data.gasLimit)
       const extraEthNeeded = replacementFee.sub(tx.feeAmount)
-      if (
-        !getIsEnoughBalanceToAccelerate(activeWalletAccount, asset.baseAsset.name, extraEthNeeded)
-      )
+      if (!getIsEnoughBalanceToAccelerate(activeWalletAccount, baseAssetName, extraEthNeeded))
         return wrapResponseToObject({ errorMessage: 'insufficient funds' })
 
       return wrapResponseToObject({ bumpType: BumpType.RBF })

package/src/selectors/index.js

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

package/src/utils/calculate-extra-eth.js

@@ -0,0 +1,15 @@
+const defaultMultiplier = 1.1
+
+// if a wallet has 0 ETH the deposit needed should be more than the fee needed by <multiplier>
+// if a wallet has <N> ETH, the deposit needed should be the fee * <multiplier> - <N>
+export default function({ fee, balance, multiplier = defaultMultiplier }) {
+  if (typeof multiplier !== 'number' || multiplier < 1) multiplier = defaultMultiplier
+  if (balance.gt(fee)) return balance.unitType.ZERO
+
+  return fee
+    .mul(multiplier)
+    .toDefault()
+    .sub(balance)
+    .toFixed(4, 'ceil')
+    .toString()
+}

package/src/utils.js

@@ -6,6 +6,7 @@ const base10 = baseX('0123456789')
 const base16 = baseX('0123456789abcdef')
 
 export const isEthereumToken = (asset) => asset.assetType === 'ETHEREUM_ERC20'
+export const isBscToken = (asset) => asset.assetType === 'BSC_BEP20'
 export const isQuorumToken = (asset) => asset.assetType === 'QUORUM_ERC20'
 
 export function buffer2currency({ asset, value }) {