@exodus/ethereum-api 6.3.29 → 6.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.29",
+  "version": "6.3.31",
   "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": "fdcd4a653b2de7a722c2d4936b196961f20563fd"
 }

package/src/get-balances.js

@@ -1,4 +1,6 @@
-import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
+import { getEthereumBalances, isRpcBalanceAsset } from '@exodus/ethereum-lib'
+
+import { get } from 'lodash'
 
 const fixBalance = ({ txLog, balance }) => {
   for (const tx of txLog) {
@@ -14,25 +16,47 @@ 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)
+
+  if (['ethereum', 'ethereumgoerli'].includes(asset.name)) {
+    const { balance: ethereumBalance } = getEthereumBalances({
+      asset,
+      liquidBalance: balance,
+      accountState,
+    })
+    return ethereumBalance
+  }
+
+  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 }
 }

package/src/staking/ethereum/api.js

@@ -94,6 +94,16 @@ export class EthereumStaking {
     return this.asset.currency.baseUnit(userBalance)
   }
 
+  /** Return user pending deposited balance. Balance which deposited into validator but not active yet. Pending deposited balance can't be unstake till validator activation */
+  async pendingDepositedBalanceOf(address) {
+    const userBalance = await this.callReadFunctionContract(
+      this.contractAccounting,
+      'pendingDepositedBalanceOf',
+      address
+    )
+    return this.asset.currency.baseUnit(userBalance)
+  }
+
   /** Return user active origin deposited balance */
   async depositedBalanceOf(address) {
     const depositedBalance = await this.callReadFunctionContract(

package/src/staking/ethereum/service.js

@@ -236,14 +236,21 @@ export async function getEthereumStakingInfo({ address, asset }) {
   const delegator = address.toLowerCase()
   const staking = new EthereumStaking(asset)
 
-  const [activeStakedBalance, pendingBalance, withdrawRequest, rewardsBalance] = await Promise.all([
+  const [
+    activeStakedBalance,
+    pendingBalance,
+    pendingDepositedBalance,
+    withdrawRequest,
+    rewardsBalance,
+  ] = await Promise.all([
     staking.autocompoundBalanceOf(delegator),
     staking.pendingBalanceOf(delegator),
+    staking.pendingDepositedBalanceOf(delegator),
     staking.withdrawRequest(delegator),
     staking.getLiquidRewards(delegator),
   ])
 
-  const delegatedBalance = activeStakedBalance.add(pendingBalance)
+  const delegatedBalance = activeStakedBalance.add(pendingBalance).add(pendingDepositedBalance)
   const minDelegateAmount = currency.defaultUnit(0.1)
 
   const {
@@ -262,8 +269,10 @@ export async function getEthereumStakingInfo({ address, asset }) {
   return {
     rewardsBalance,
     isDelegating,
+    activeStakedBalance, // balance staked into the validator
     delegatedBalance, // balance staked into the validator + pending
     pendingBalance, // balance waiting to be staked
+    pendingDepositedBalance, // balance deposited into validator but not active yet
     minDelegateAmount,
     unclaimedUndelegatedBalance,
     canClaimUndelegatedBalance,