@exodus/balances 13.15.2 → 13.15.4

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.15.4](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@13.15.3...@exodus/balances@13.15.4) (2026-04-10)
+
+### Bug Fixes
+
+- fix(balances): use Object.values() to check balancesLoaded state (#15939)
+
+## [13.15.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@13.15.2...@exodus/balances@13.15.3) (2026-03-11)
+
+### Performance
+
+- perf(balances): optimize clone and incremental asset computation (#15480)
+
 ## [13.15.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@13.15.1...@exodus/balances@13.15.2) (2026-03-03)
 
 ### Bug Fixes

package/module/index.js

@@ -1,34 +1,43 @@
 import { safeString } from '@exodus/safe-string'
-import { isNumberUnit } from '@exodus/currency'
 import { TxSet } from '@exodus/models'
-// eslint-disable-next-line no-restricted-imports -- TODO: Fix this the next time the file is edited.
-import lodash from 'lodash'
 import { difference as getChanges } from '@exodus/atoms'
 import { difference, pick, set, mapValues } from '@exodus/basic-utils'
 import makeConcurrent from 'make-concurrent'
 import { processAssetBalances, validateBalances } from './balances-utils.js'
 import defaultConfig from '../default-config.js'
 
-const { isEmpty, merge, zipObject } = lodash
+const zipObject = (keys, values) => {
+  const result = Object.create(null)
+  for (const [i, key] of keys.entries()) {
+    result[key] = values[i]
+  }
+
+  return result
+}
 
 export const cloneBalances = (balances) => {
-  if (isNumberUnit(balances)) {
-    return balances
-  }
+  const result = Object.create(null)
+  for (const walletAccount of Object.keys(balances)) {
+    const accountBalances = balances[walletAccount]
+    const clonedAccount = Object.create(null)
+    for (const assetName of Object.keys(accountBalances)) {
+      clonedAccount[assetName] = { ...accountBalances[assetName] }
+    }
 
-  const cloned = Object.create(Object.getPrototypeOf(balances))
-  for (const key in balances) {
-    cloned[key] = cloneBalances(balances[key])
+    result[walletAccount] = clonedAccount
   }
 
-  return cloned
+  return result
 }
 
-const zipNonNull = (keys, values) =>
-  zipObject(
-    keys.filter((key, i) => values[i] != null),
-    values.filter((value) => value != null)
-  )
+const zipNonNull = (keys, values) => {
+  const result = Object.create(null)
+  for (const [i, key] of keys.entries()) {
+    if (values[i] != null) result[key] = values[i]
+  }
+
+  return result
+}
 
 class Balances {
   #logger
@@ -134,7 +143,8 @@ class Balances {
       getChanges(this.#availableAssetNamesAtom).observe(({ previous = [], current }) => {
         this.#availableAssetNames = current
         const added = difference(current, previous)
-        if (added.length > 0) this.#onAssetsChanged(added)
+        const removed = difference(previous, current)
+        if (added.length > 0 || removed.length > 0) this.#onAssetsChanged({ added, removed })
       })
     )
 
@@ -247,7 +257,7 @@ class Balances {
     )
 
     const balances = results.map(({ value }) => value).filter(Boolean)
-    return merge(Object.create(null), ...balances)
+    return Object.assign(Object.create(null), ...balances)
   }
 
   #load = async ({ walletAccount }) => {
@@ -277,21 +287,48 @@ class Balances {
     }
   }
 
-  #onAssetsChanged = async (added) => {
-    if (
-      added.every((name) =>
-        this.#walletAccounts.every((walletAccount) => !!this.#balances?.[walletAccount]?.[name])
-      )
-    ) {
+  #onAssetsChanged = async ({ added, removed }) => {
+    if (removed.length > 0) {
+      for (const walletAccount of this.#walletAccounts) {
+        for (const assetName of removed) {
+          delete this.#balances[walletAccount]?.[assetName]
+        }
+      }
+    }
+
+    const newSupportedAssets = added.filter(this.#isSupportedAsset)
+    const missingAssets = newSupportedAssets.filter(
+      (name) =>
+        !this.#walletAccounts.every((walletAccount) => !!this.#balances?.[walletAccount]?.[name])
+    )
+
+    if (missingAssets.length === 0) {
+      if (removed.length > 0) this.#flush()
       return
     }
 
-    this.#logger.log('recomputing based on new assets list')
-    this.#recompute()
+    this.#logger.log('computing balances for newly available assets', missingAssets)
+    await Promise.all(
+      this.#walletAccounts.map(async (walletAccount) => {
+        const balances = await Promise.all(
+          missingAssets.map((assetName) =>
+            this.#getBalancesForAssetSource({ assetName, walletAccount })
+          )
+        )
+        if (this.#balances[walletAccount]) {
+          Object.assign(this.#balances[walletAccount], ...balances)
+        }
+      })
+    )
+
+    this.#flush()
   }
 
-  #isSupportedAsset = (assetName) =>
-    this.#availableAssetNames.includes(assetName) && !this.#getAsset(assetName).isCombined
+  #isSupportedAsset = (assetName) => {
+    if (!this.#availableAssetNames.includes(assetName)) return false
+    const asset = this.#getAsset(assetName)
+    return asset && !asset.isCombined
+  }
 
   #getSupportedAssetNames = () => Object.keys(this.#getAssets()).filter(this.#isSupportedAsset)
 
@@ -406,7 +443,7 @@ class Balances {
       }
     }
 
-    if (!isEmpty(changes)) this.#flush({ changes })
+    if (Object.keys(changes).length > 0) this.#flush({ changes })
   }
 
   #recompute = async ({ walletAccounts = this.#walletAccounts } = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/balances",
-  "version": "13.15.2",
+  "version": "13.15.4",
   "description": "Tracks crypto balances across enabled wallet accounts.",
   "author": "Exodus Movement, Inc.",
   "license": "MIT",
@@ -36,9 +36,9 @@
     "@exodus/atoms": "^10.0.0",
     "@exodus/basic-utils": "^3.7.3",
     "@exodus/core-selectors": "^4.0.0",
-    "@exodus/currency": "^5.0.2",
+    "@exodus/currency": "^6.0.0",
     "@exodus/errors": "^3.0.0",
-    "@exodus/models": "^12.0.1",
+    "@exodus/models": "^13.0.0",
     "@exodus/multi-account-redux": "^2.0.1",
     "@exodus/redux-dependency-injection": "^4.0.3",
     "@exodus/safe-string": "^1.1.0",
@@ -60,8 +60,8 @@
     "@exodus/blockchain-metadata": "^17.1.0",
     "@exodus/ethereum-meta": "^2.0.0",
     "@exodus/fee-data-monitors": "^5.0.5",
-    "@exodus/storage-memory": "^2.3.0",
-    "@exodus/wallet-accounts": "^20.2.1",
+    "@exodus/storage-memory": "^2.4.0",
+    "@exodus/wallet-accounts": "^20.4.1",
     "events": "^3.3.0",
     "redux": "^4.2.1"
   },
@@ -69,5 +69,5 @@
     "access": "public",
     "provenance": false
   },
-  "gitHead": "7e7f0fcec611b48c995e5e878f64795d6cf23a0b"
+  "gitHead": "641c600efc2e4216570437ab642710ee9169d713"
 }

package/redux/index.js

@@ -42,7 +42,7 @@ const balancesReduxDefinition = {
   eventReducers: {
     balances: (state, payload) => {
       const { hasBalance, ...walletAccountBalances } = state
-      const balancesLoaded = Object.keys(walletAccountBalances).every((value) => value.loaded)
+      const balancesLoaded = Object.values(walletAccountBalances).every((value) => value.loaded)
 
       if (balancesLoaded && payload.changes && Object.keys(payload.changes).length > 0) {
         return mergeChanges(state, payload.changes)