@exodus/ethereum-lib 2.2.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -25,5 +25,5 @@
   "devDependencies": {
     "@exodus/models": "^8.5.1"
   },
-  "gitHead": "956ac273cee5a8979824a68127a6d400ac711e48"
+  "gitHead": "92d4717b906fd92d37c90d8ba41f3c314cd65534"
 }

package/src/constants.js

@@ -1,7 +1,8 @@
-export const CHAIN_IDS = { ethereum: 1, ethereumclassic: 61 }
+export const CHAIN_IDS = { ethereum: 1, ethereumclassic: 61, quorum: 10 }
 export const MIN_GASPRICE = 1e9 // 1 gwei
 export const DEFAULT_FEE_MONITOR_INTERVAL = '1m'
 export const CONFIRMATIONS_NUMBER = {
   ethereum: 30,
   ethereumclassic: 5000,
+  quorum: 4,
 }

package/src/fee-data/ethereum.js

@@ -5,6 +5,9 @@ export default new FeeData(
     gasPrice: '75 Gwei',
     max: '250 Gwei',
     min: '1 Gwei',
+    erc20FuelThreshold: '0.025 ETH',
+    swapFee: '0.05 ETH',
+    gasPriceEconomicalRate: 0.7,
   },
   'gasPrice',
   'ethereum'

package/src/fee-data/index.js

@@ -1,2 +1,3 @@
 export { default as ethereum } from './ethereum'
 export { default as ethereumclassic } from './ethereumclassic'
+export { default as quorum } from './quorum'

package/src/fee-data/quorum.js

@@ -0,0 +1,11 @@
+import { FeeData } from '@exodus/asset-lib'
+
+export default new FeeData(
+  {
+    gasPrice: '0 Gwei',
+    max: '0 Gwei',
+    min: '0 Gwei',
+  },
+  'gasPrice',
+  'quorum'
+)

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

@@ -62,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)
@@ -101,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)
@@ -117,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/unsigned-tx/create-unsigned-tx.js

@@ -1,5 +1,5 @@
 import ethUtil from 'ethereumjs-util'
-import { isEthereumToken, currency2buffer, getBaseAsset } from '../utils'
+import { isEthereumToken, isQuorumToken, currency2buffer, getBaseAsset } from '../utils'
 import { CHAIN_IDS } from '../constants'
 
 import type { UnsignedTransaction } from '#/app-models'
@@ -25,7 +25,7 @@ export default function createUnsignedTx({
   const baseAsset = getBaseAsset(asset)
   if (!chainId) chainId = CHAIN_IDS[baseAsset.name] // mainnet
 
-  const isToken = isEthereumToken(asset)
+  const isToken = isEthereumToken(asset) || isQuorumToken(asset)
   const to = isToken ? asset.contract.address : address
   let value = currency2buffer(isToken ? baseAsset.currency.ZERO : amount)
 

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

@@ -1,6 +1,6 @@
 /* @flow */
 import * as ethUtil from 'ethereumjs-util'
-import { isEthereumToken, buffer2currency, getBaseAsset } from '../utils'
+import { isEthereumToken, isQuorumToken, buffer2currency, getBaseAsset } 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)
+  const isToken = isEthereumToken(asset) || isQuorumToken(asset)
   const baseAsset = getBaseAsset(asset)
   const gasPrice = buffer2currency({ asset: baseAsset, value: txData.gasPrice })
   const gasLimit = ethUtil.bufferToInt(txData.gasLimit)

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 isQuorumToken = (asset) => asset.assetType === 'QUORUM_ERC20'
 
 export function buffer2currency({ asset, value }) {
   return asset.currency.baseUnit(base10.encode(value)).toDefault()
@@ -34,5 +35,5 @@ export function normalizeTxId(txId: string): string {
 }
 
 export function getBaseAsset(asset) {
-  return isEthereumToken(asset) ? assets.ethereum : asset
+  return isEthereumToken(asset) ? assets.ethereum : isQuorumToken(asset) ? assets.quorum : asset
 }