@exodus/ethereum-api 6.3.30 → 6.3.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.30",
+  "version": "6.3.32",
   "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": "^4.0.0",
+    "@exodus/ethereum-lib": "^4.0.1",
     "@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": "44bf590d6ecef38d828b466687ad579c7528ea84"
+  "gitHead": "8eb47087d7253d18f372baad9fbd8b4b42cb2f1a"
 }

package/src/get-balances.js

@@ -1,4 +1,5 @@
-import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
+import { getEthereumBalances, isRpcBalanceAsset } from '@exodus/ethereum-lib'
+
 import { get } from 'lodash'
 
 const fixBalance = ({ txLog, balance }) => {
@@ -35,6 +36,15 @@ const getBalance = ({ asset, accountState, txLog }) => {
 
   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
 }
 

package/src/staking/ethereum/api.js

@@ -21,6 +21,7 @@ export class EthereumStaking {
     DELEGATE: '0x3a29dbae', // stake(uint256 source)
     UNSTAKE: '0x76ec871c', // unstake(uint256 amount)
     UNSTAKE_PENDING: '0xed0723d4', // unstakePending(uint256 amount)
+    CLAIM_UNSTAKE: '0x33986ffa', // claimWithdrawRequest(uint256 amount)
   }
 
   constructor(
@@ -94,6 +95,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

@@ -146,7 +146,9 @@ export function createEthereumStakingService({
     let amount, data, fee
     try {
       ;({ amount, data } = await delegateOperation(args))
-      ;({ fee } = await estimateTxFee(delegatorAddress, staking.poolAddress, amount, data))
+      const address =
+        operation === 'claimUndelegatedBalance' ? staking.accountingAddress : staking.poolAddress
+      ;({ fee } = await estimateTxFee(delegatorAddress, address, amount, data))
     } catch (e) {
       // If the operation is to unstake and failed retry with unstakePending
       if (operation === 'undelegate') {
@@ -236,14 +238,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 +271,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,

package/src/staking/ethereum/staking-utils.js

@@ -1,6 +1,6 @@
 import { EthereumStaking } from './api'
 
-const { DELEGATE, UNSTAKE, UNSTAKE_PENDING } = EthereumStaking.METHODS_IDS
+const { DELEGATE, UNSTAKE, UNSTAKE_PENDING, CLAIM_UNSTAKE } = EthereumStaking.METHODS_IDS
 
 const STAKING_MANAGER_CONTRACTS = [
   EthereumStaking.addresses.ethereum.EVERSTAKE_ADDRESS_CONTRACT_POOL.toLowerCase(),
@@ -13,6 +13,9 @@ export const isEthereumDelegate = (tx) =>
   isEthereumStakingTx(tx) &&
   STAKING_MANAGER_CONTRACTS.includes(tx.to) &&
   tx.data?.methodId === DELEGATE
-export const isEthereumUndelegate = (tx) => isEthereumStakingTx(tx) && tx.data?.methodId === UNSTAKE
-export const isEthereumClaimUndelegate = (tx) =>
+export const isEthereumUndelegatePending = (tx) =>
   isEthereumStakingTx(tx) && tx.data?.methodId === UNSTAKE_PENDING
+export const isEthereumUndelegate = (tx) =>
+  (isEthereumStakingTx(tx) && tx.data?.methodId === UNSTAKE) || isEthereumUndelegatePending(tx)
+export const isEthereumClaimUndelegate = (tx) =>
+  isEthereumStakingTx(tx) && tx.data?.methodId === CLAIM_UNSTAKE