@exodus/ethereum-api 7.5.1 → 7.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "7.5.1",
+  "version": "7.5.3",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -25,7 +25,7 @@
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/crypto": "^1.0.0-rc.0",
     "@exodus/currency": "^2.1.3",
-    "@exodus/ethereum-lib": "^4.8.1",
+    "@exodus/ethereum-lib": "^4.9.0",
     "@exodus/ethereum-meta": "^1.2.0",
     "@exodus/ethereumholesky-meta": "^1.0.1",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.7",
@@ -57,5 +57,5 @@
     "cross-fetch": "^3.1.5",
     "delay": "4.0.1"
   },
-  "gitHead": "220c00b21c6bf4d250aea7a40d37ceebb1716979"
+  "gitHead": "9322a03c6b00b6dc765356309b3e8f1e1f27df41"
 }

package/src/create-asset.js

@@ -38,6 +38,7 @@ import { txSendFactory } from './tx-send'
 import { serverBasedFeeMonitorFactoryFactory } from './fee-monitor'
 import { createGetBalanceForAddress } from './get-balance-for-address'
 import { estimateL1DataFeeFactory, getL1GetFeeFactory } from './optimism-gas'
+import { mapValues } from 'lodash'
 
 export const createAssetFactory = ({
   assetsList,
@@ -55,6 +56,7 @@ export const createAssetFactory = ({
   customCreateGetKeyIdentifier,
   feeMonitorInterval,
   l1GasOracleAddress, // l1 extra fee for base and opto
+  stakingConfiguration = {},
 }) => {
   assert(assetsList, 'assetsList is required')
   assert(feeData, 'feeData is required')
@@ -135,8 +137,20 @@ export const createAssetFactory = ({
 
     const confirmationNumber = CONFIRMATIONS_NUMBER[asset.name] || 1
 
+    const stakingAssetNames = Object.keys(stakingConfiguration)
+
+    const extraData =
+      stakingAssetNames.length > 0
+        ? {
+            staking: mapValues(
+              stakingConfiguration,
+              (assetStakinConfiguration) => assetStakinConfiguration.accountStateExtraData
+            ),
+          }
+        : undefined
+
     const accountStateClass =
-      CustomAccountState || createEthereumLikeAccountState({ asset: base, assets })
+      CustomAccountState || createEthereumLikeAccountState({ asset: base, assets, extraData })
 
     const createHistoryMonitor = (args) => {
       let monitor
@@ -158,8 +172,12 @@ export const createAssetFactory = ({
           throw new Error(`Monitor type ${monitorType} of evm asset ${asset.name} is unknown`)
       }
 
-      if (supportsStaking) {
-        const afterTickHook = createEthereumHooks({ assetClientInterface })['after-tick']
+      if (stakingAssetNames.length > 0) {
+        const afterTickHook = createEthereumHooks({
+          assetClientInterface,
+          assetName: asset.name,
+          stakingAssetNames,
+        })['after-tick']
         monitor.addHook('after-tick', afterTickHook)
       }
 
@@ -196,7 +214,11 @@ export const createAssetFactory = ({
       getDefaultAddressPath: () => defaultAddressPath,
       getFee,
       getFeeData: () => feeData,
-      getKeyIdentifier: createGetKeyIdentifier({ bip44, allowMetaMaskCompat }),
+      getKeyIdentifier: createGetKeyIdentifier({
+        bip44,
+        allowMetaMaskCompat,
+        assetName: asset.name,
+      }),
       getSupportedPurposes: () => [44],
       getTokens,
       hasFeature: (feature) => !!features[feature], // @deprecated use api.features instead

package/src/get-balances.js

@@ -70,15 +70,20 @@ export const getBalances = ({ asset, txLog, accountState }) => {
   const unconfirmedReceived = getUnconfirmedReceivedBalanceFromTxLog({ asset, txLog })
   const unconfirmedSent = getUnconfirmedSentBalanceFromTxLog({ asset, txLog })
 
+  // balance from txLog / rpc is considered to be total
   const balanceWithoutUnconfirmedSent = isRpcBalanceAsset(asset)
     ? getBalanceFromAccountState({ asset, accountState }).sub(unconfirmedSent)
     : getBalanceFromTxLog({ txLog, asset })
 
-  const spendable = balanceWithoutUnconfirmedSent.sub(unconfirmedReceived)
   const staked = getStaked({ asset, accountState })
   const unstaking = getUnstaking({ asset, accountState })
   const unstaked = getUnstaked({ asset, accountState })
-  const total = balanceWithoutUnconfirmedSent.add(staked).add(unstaking).add(unstaked)
+  const total = balanceWithoutUnconfirmedSent
+  const spendable = balanceWithoutUnconfirmedSent
+    .sub(unconfirmedReceived)
+    .sub(staked)
+    .sub(unstaking)
+    .sub(unstaked)
 
   return {
     // new

package/src/hooks/monitor.js

@@ -1,83 +1,50 @@
 import { getEthereumStakingInfo, getPolygonStakingInfo } from '../staking'
-import { isEmpty } from 'lodash'
-
 import processTxLog from '../tx-log-staking-processor'
 
-export const createEthereumHooks = ({ assetClientInterface }) => {
+export const createEthereumHooks = ({ assetClientInterface, assetName, stakingAssetNames }) => {
   const afterTickHook = async ({ walletAccount }) => {
     // args passed from monitor tick method ({ monitor, error })
-    const { ethereum, polygon } = await assetClientInterface.getAssetsForNetwork({
-      baseAssetName: 'ethereum',
+    const assets = await assetClientInterface.getAssetsForNetwork({
+      baseAssetName: assetName,
     })
 
-    const assetName = ethereum.name
-
     const userAddress = await assetClientInterface.getReceiveAddress({
       assetName,
       walletAccount,
       useCache: true,
     })
 
-    const ethereumStakingInfo = await getEthereumStakingInfo({
-      address: userAddress.toString(),
-      asset: ethereum,
-    })
-
-    const polygonStakingInfo = await getPolygonStakingInfo({
-      address: userAddress.toString(),
-      asset: polygon,
-    })
-
     const stakingInfo = {
-      staking: {
-        ethereum: ethereumStakingInfo,
-        polygon: polygonStakingInfo,
-      },
+      staking: Object.create(null),
+    }
+
+    for (const stakingAssetName of stakingAssetNames) {
+      const getStakingInfo =
+        stakingAssetName === 'polygon' ? getPolygonStakingInfo : getEthereumStakingInfo
+      const assetStakingInfo = await getStakingInfo({
+        address: userAddress.toString(),
+        asset: assets[stakingAssetName],
+      })
+      stakingInfo.staking[stakingAssetName] = assetStakingInfo
     }
 
     const batch = assetClientInterface.createOperationsBatch()
     assetClientInterface.updateAccountStateBatch({
-      assetName: ethereum.name,
+      assetName,
       walletAccount,
       newData: stakingInfo,
       batch,
     })
 
-    const processTxLogsPromises = []
-
-    const holeskyAssets = await assetClientInterface.getAssetsForNetwork({
-      baseAssetName: 'ethereumholesky',
-    })
-
-    if (!isEmpty(holeskyAssets)) {
-      const { ethereumholesky } = holeskyAssets
-      // eslint-disable-next-line no-console
-      console.log('ethereum-hooks updating holesky state')
-
-      const ethereumHoleskyInfo = await getEthereumStakingInfo({
-        address: userAddress.toString(),
-        asset: ethereumholesky,
-      })
-
-      assetClientInterface.updateAccountStateBatch({
-        assetName: ethereumholesky.name,
+    const processTxLogsPromises = stakingAssetNames.map((stakingAssetName) => {
+      return processTxLog({
+        asset: assets[stakingAssetName],
+        assetClientInterface,
         walletAccount,
-        newData: {
-          staking: {
-            ethereumholesky: ethereumHoleskyInfo,
-          },
-        },
         batch,
       })
-      processTxLogsPromises.push(
-        processTxLog({ asset: ethereumholesky, assetClientInterface, walletAccount, batch })
-      )
-    }
+    })
 
-    processTxLogsPromises.push(
-      processTxLog({ asset: polygon, assetClientInterface, walletAccount, batch }),
-      processTxLog({ asset: ethereum, assetClientInterface, walletAccount, batch })
-    )
     await Promise.all(processTxLogsPromises)
     await assetClientInterface.executeOperationsBatch(batch)
   }