@exodus/ethereum-lib 2.7.2 → 2.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -23,5 +23,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "cd08eeb37f107463a6285a9fb151a97e6e1cd2c7"
+  "gitHead": "14b8266879ea622f272c94f98e71c1a16dd274f1"
 }

package/src/fee-data/bsc.js

@@ -5,9 +5,9 @@ export default new FeeData(
     gasPrice: '20 Gwei',
     max: '200 Gwei',
     min: '1 Gwei',
-    erc20FuelThreshold: '25000000 Gwei',
-    gasPriceEconomicalRate: 1,
-    gasPriceMinimumRate: 1,
+    erc20FuelThreshold: '2500000 Gwei',
+    gasPriceEconomicalRate: 0.8,
+    gasPriceMinimumRate: 0.6,
   },
   'gasPrice',
   'bsc'

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

@@ -79,8 +79,10 @@ const wrapResponseToObject = ({ bumpType = BumpType.NONE, errorMessage = null }
   errorMessage,
 })
 
+const calculateTxGasPrice = (tx) => tx.feeAmount.div(tx.data.gasLimit)
+
 export const calculateBumpedGasPrice = (tx, currentGasPrice) => {
-  const usedGasPrice = tx.feeAmount.div(tx.data.gasLimit)
+  const usedGasPrice = calculateTxGasPrice(tx)
   const bumpedGasPrice = usedGasPrice.mul(12).div(10)
 
   return currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice
@@ -123,7 +125,7 @@ export default (
       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' })
+        return wrapResponseToObject({ errorMessage: 'can not bump a confirmed or received TX' })
       if (!tx.data || !tx.data.gasLimit)
         return wrapResponseToObject({ errorMessage: 'data object is missing or corrupted' })
       const isExchangeTx = getIsExchangeTx(tx.txId)
@@ -134,7 +136,15 @@ export default (
       if (isQueuedPendingTx(tx, baseAssetName, activeWalletAccount, getTxLog))
         return wrapResponseToObject({ errorMessage: 'there is a stuck TX with lower nonce' })
 
-      const { gasPrice: currentGasPrice } = getFeeData(assetName)
+      const { gasPrice: currentGasPrice, gasPriceMinimumRate } = getFeeData(assetName)
+      // converting to the smallest unit to avoid rounding errors
+      if (
+        calculateTxGasPrice(tx)
+          .to('wei')
+          .gte(currentGasPrice.mul(gasPriceMinimumRate).to('wei'))
+      )
+        return wrapResponseToObject({ errorMessage: 'the used gas price is still high enough' })
+
       const gasPriceToUse = calculateBumpedGasPrice(tx, currentGasPrice)
       const replacementFee = gasPriceToUse.mul(tx.data.gasLimit)
       const extraEthNeeded = replacementFee.sub(tx.feeAmount)

package/src/unsigned-tx/create-unsigned-tx.js

@@ -1,5 +1,5 @@
 import ethUtil from 'ethereumjs-util'
-import { isEthereumToken, isQuorumToken, currency2buffer } from '../utils'
+import { isToken, currency2buffer } from '../utils'
 import { CHAIN_IDS } from '../constants'
 
 import type { UnsignedTransaction } from '#/app-models'
@@ -25,9 +25,9 @@ export default function createUnsignedTx({
   const baseAsset = asset.baseAsset
   if (!chainId) chainId = CHAIN_IDS[baseAsset.name] // mainnet
 
-  const isToken = isEthereumToken(asset) || isQuorumToken(asset)
-  const to = isToken ? asset.contract.address : address
-  let value = currency2buffer(isToken ? baseAsset.currency.ZERO : amount)
+  const _isToken = isToken(asset)
+  const to = _isToken ? asset.contract.address : address
+  let value = currency2buffer(_isToken ? baseAsset.currency.ZERO : amount)
 
   // TODO: check: present on desktop missing on mobile. This insures we never have a buffer specifying 0.
   // In ETH, a buffer of zero length and a buffer specifying 0 imply different things

package/src/unsigned-tx/parse-unsigned-tx.js

@@ -1,6 +1,6 @@
 /* @flow */
 import * as ethUtil from 'ethereumjs-util'
-import { isEthereumToken, isQuorumToken, buffer2currency } from '../utils'
+import { isToken, buffer2currency } from '../utils'
 import { CHAIN_IDS } from '../constants'
 
 import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/types'
@@ -10,7 +10,7 @@ export default function parseUnsignedTx(
   unsignedTx: UnsignedTransaction
 ): ParsedTransaction {
   const { txData } = unsignedTx
-  const isToken = isEthereumToken(asset) || isQuorumToken(asset)
+  const _isToken = isToken(asset)
   const baseAsset = asset.baseAsset
   const gasPrice = buffer2currency({ asset: baseAsset, value: txData.gasPrice })
   const gasLimit = ethUtil.bufferToInt(txData.gasLimit)
@@ -18,7 +18,7 @@ export default function parseUnsignedTx(
   let { to, chainId, data } = txData
   let amount
   const fee = gasPrice.mul(gasLimit)
-  if (isToken) {
+  if (_isToken) {
     const { method, values } = asset.contract.decodeInput(data)
     if (method === 'transfer' || method === 'approve') {
       to = values[0]

package/src/utils/index.js

@@ -10,6 +10,8 @@ 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 const isToken = (asset) =>
+  isEthereumToken(asset) || isBscToken(asset) || isQuorumToken(asset)
 
 export function buffer2currency({ asset, value }) {
   return asset.currency.baseUnit(base10.encode(value)).toDefault()