@exodus/ethereum-api 7.5.1 → 7.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "7.5.1",
+  "version": "7.5.2",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -57,5 +57,5 @@
     "cross-fetch": "^3.1.5",
     "delay": "4.0.1"
   },
-  "gitHead": "220c00b21c6bf4d250aea7a40d37ceebb1716979"
+  "gitHead": "8f0211c5cbdc7117872f2f910c9b31d7e4e106f0"
 }

package/src/create-asset.js

@@ -158,10 +158,10 @@ export const createAssetFactory = ({
           throw new Error(`Monitor type ${monitorType} of evm asset ${asset.name} is unknown`)
       }
 
-      if (supportsStaking) {
-        const afterTickHook = createEthereumHooks({ assetClientInterface })['after-tick']
-        monitor.addHook('after-tick', afterTickHook)
-      }
+      // always run hooks that modify staking txs to have consistent balances
+      // revisit later to only run this hook ONLY if supportsStaking = true
+      const afterTickHook = createEthereumHooks({ assetClientInterface })['after-tick']
+      monitor.addHook('after-tick', afterTickHook)
 
       return monitor
     }
@@ -196,7 +196,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

@@ -10,6 +10,10 @@ export const createEthereumHooks = ({ assetClientInterface }) => {
       baseAssetName: 'ethereum',
     })
 
+    // polygon on ETH is not supported in ME
+    // TODO: remove this once this hook only runs for wallets that support staking
+    const isPolygonSupported = !!polygon
+
     const assetName = ethereum.name
 
     const userAddress = await assetClientInterface.getReceiveAddress({
@@ -23,10 +27,12 @@ export const createEthereumHooks = ({ assetClientInterface }) => {
       asset: ethereum,
     })
 
-    const polygonStakingInfo = await getPolygonStakingInfo({
-      address: userAddress.toString(),
-      asset: polygon,
-    })
+    const polygonStakingInfo = isPolygonSupported
+      ? await getPolygonStakingInfo({
+          address: userAddress.toString(),
+          asset: polygon,
+        })
+      : {}
 
     const stakingInfo = {
       staking: {
@@ -75,7 +81,9 @@ export const createEthereumHooks = ({ assetClientInterface }) => {
     }
 
     processTxLogsPromises.push(
-      processTxLog({ asset: polygon, assetClientInterface, walletAccount, batch }),
+      ...(isPolygonSupported
+        ? [processTxLog({ asset: polygon, assetClientInterface, walletAccount, batch })]
+        : []),
       processTxLog({ asset: ethereum, assetClientInterface, walletAccount, batch })
     )
     await Promise.all(processTxLogsPromises)