@exodus/ethereum-api 6.3.29 → 6.3.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.29",
+  "version": "6.3.30",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^3.3.42",
+    "@exodus/ethereum-lib": "^4.0.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.3.0-beta.4",
     "@exodus/simple-retry": "^0.0.6",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/models": "^8.10.4"
   },
-  "gitHead": "01457e8fa6da6b468680885d4e086699842e2ee0"
+  "gitHead": "44bf590d6ecef38d828b466687ad579c7528ea84"
 }

package/src/get-balances.js

@@ -1,4 +1,5 @@
 import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
+import { get } from 'lodash'
 
 const fixBalance = ({ txLog, balance }) => {
   for (const tx of txLog) {
@@ -14,25 +15,38 @@ const fixBalance = ({ txLog, balance }) => {
   return balance
 }
 
+const getBalanceFromAccountState = ({ asset, accountState }) => {
+  const isBase = asset.name === asset.baseAsset.name
+  return get(
+    accountState,
+    isBase ? ['balance'] : ['tokenBalances', asset.name],
+    asset.currency.ZERO
+  )
+}
+
+const getBalanceFromTxLog = ({ txLog, asset }) => {
+  return txLog.size > 0 ? txLog.getMutations().slice(-1)[0].balance : asset.currency.ZERO
+}
+
+const getBalance = ({ asset, accountState, txLog }) => {
+  const balance = isRpcBalanceAsset(asset)
+    ? getBalanceFromAccountState({ asset, accountState })
+    : getBalanceFromTxLog({ txLog, asset })
+
+  const shouldFixBalance = isRpcBalanceAsset(asset)
+
+  return shouldFixBalance ? fixBalance({ txLog, balance }) : balance
+}
+
 /**
  * Api method to return the balance based on either account state balances or tx history.
  *
  * @param asset the asset to get the balances
  * @param txLog the txLog when the balance is transaction based
  * @param accountState the account state when the balance is loaded from RPC
- * @returns {{balance}|null} an object with the balance or null if the balance is unknown/zero
+ * @returns {{balance}|null} an object with the balance or null if the balance is unknown
  */
 export const getBalances = ({ asset, txLog, accountState }) => {
-  if (isRpcBalanceAsset(asset)) {
-    const balance =
-      asset.baseAsset.name === asset.name
-        ? accountState?.balance
-        : accountState?.tokenBalances?.[asset.name]
-    return balance && !balance.isZero ? { balance: fixBalance({ txLog, balance }) } : null
-  }
-  return txLog.size
-    ? {
-        balance: txLog.getMutations().slice(-1)[0].balance,
-      }
-    : null
+  const balance = getBalance({ asset, accountState, txLog })
+  return { balance }
 }