@exodus/balances 12.0.0 → 12.1.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@12.0.1...@exodus/balances@12.1.0) (2023-12-14)
+
+### Features
+
+- **balances:** funded wallet accounts atom ([#5074](https://github.com/ExodusMovement/exodus-hydra/issues/5074)) ([dc98436](https://github.com/ExodusMovement/exodus-hydra/commit/dc98436d5f8bbade4ceab85af60455ac3b4efa49))
+- remove storing oldBalances in balances atoms ([#5073](https://github.com/ExodusMovement/exodus-hydra/issues/5073)) ([414db86](https://github.com/ExodusMovement/exodus-hydra/commit/414db866a86aaf3242e68698596af187da6927c3))
+
+## [12.0.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@12.0.0...@exodus/balances@12.0.1) (2023-12-12)
+
+### Bug Fixes
+
+- **balances:** reducer changes computation when balances not loaded ([#5008](https://github.com/ExodusMovement/exodus-hydra/issues/5008))08) ([01e50c9](https://github.com/ExodusMovement/exodus-hydra/commit/01e50c9ef852b542855aad8abf25db3eaeca76a0))
+
 ## [12.0.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@11.2.2...@exodus/balances@12.0.0) (2023-11-23)
 
 ### ⚠ BREAKING CHANGES

package/README.md

@@ -30,8 +30,8 @@ const balances = createBalances({
   logger,
 })
 
-balances.on('balances', ({ balances, oldBalances, changes }) => {
-  // `balances`, `oldBalances`
+balances.on('balances', ({ balances, changes }) => {
+  // `balances`
   // {
   //   [walletAccount]: {
   //     [assetName]: {

package/atoms/balances.js

@@ -1,5 +1,6 @@
 import { createInMemoryAtom } from '@exodus/atoms'
 
+// eslint-disable-next-line @exodus/hydra/in-memory-atom-default-value
 const createBalancesAtom = () => createInMemoryAtom()
 
 export default createBalancesAtom

package/atoms/funded-wallet-accounts.js

@@ -0,0 +1,23 @@
+import { combine, compute } from '@exodus/atoms'
+import { mapValues } from '@exodus/basic-utils'
+
+const computeFundedWalletAccounts = ({ walletAccounts, balances }) => {
+  return mapValues(walletAccounts, (_, key) => {
+    const walletAccountBalaces = balances.balances[key] || {}
+    return Object.values(walletAccountBalaces).some(({ balance }) => !balance.isZero)
+  })
+}
+
+const createFundedWalletAccountsAtom = ({ balancesAtom, enabledWalletAccountsAtom }) => {
+  const walletAccountsBalanceAtom = combine({
+    walletAccounts: enabledWalletAccountsAtom,
+    balances: balancesAtom,
+  })
+
+  return compute({
+    atom: walletAccountsBalanceAtom,
+    selector: computeFundedWalletAccounts,
+  })
+}
+
+export default createFundedWalletAccountsAtom

package/atoms/index.js

@@ -1,4 +1,5 @@
 import createBalancesAtom from './balances'
+import createFundedWalletAccountsAtom from './funded-wallet-accounts'
 import createHasBalanceAtom from './has-balance'
 
 export const balancesAtomDefinition = {
@@ -14,3 +15,10 @@ export const hasBalanceAtomDefinition = {
   factory: createHasBalanceAtom,
   dependencies: ['balancesAtom', 'storage'],
 }
+
+export const fundedWalletAccountsAtomDefinition = {
+  id: 'fundedWalletAccountsAtom',
+  type: 'atom',
+  factory: createFundedWalletAccountsAtom,
+  dependencies: ['balancesAtom', 'enabledWalletAccountsAtom'],
+}

package/index.js

@@ -1,5 +1,9 @@
 import balancesDefinition from './module'
-import { balancesAtomDefinition, hasBalanceAtomDefinition } from './atoms'
+import {
+  balancesAtomDefinition,
+  hasBalanceAtomDefinition,
+  fundedWalletAccountsAtomDefinition,
+} from './atoms'
 import balancesReportDefinition from './report'
 import balancesPluginDefinition from './plugins'
 import typeforce from '@exodus/typeforce'
@@ -18,7 +22,6 @@ const balances = (config) => {
     definitions: [
       {
         definition: balancesDefinition,
-        writesAtoms: ['balancesAtom'],
         config,
       },
       { definition: balancesAtomDefinition },
@@ -27,8 +30,9 @@ const balances = (config) => {
         storage: { namespace: 'balances' },
         aliases: [{ implementationId: 'unsafeStorage', interfaceId: 'storage' }],
       },
+      { definition: fundedWalletAccountsAtomDefinition },
       { definition: balancesReportDefinition },
-      { definition: balancesPluginDefinition, writesAtoms: ['hasBalanceAtom'] },
+      { definition: balancesPluginDefinition },
     ],
   }
 }

package/module/index.js

@@ -26,7 +26,6 @@ class Balances extends ExodusModule {
   #walletAccounts = [] // string[]
   #ready = false
 
-  #oldBalances = Object.create(null)
   #balances = Object.create(null)
   #balancesAtom
   #accountStatesAtom
@@ -375,19 +374,12 @@ class Balances extends ExodusModule {
   }
 
   #flush = ({ changes } = {}) => {
-    const oldBalances = this.#oldBalances
     const balances = cloneBalances(this.#balances)
 
     if (Object.keys(balances).length === 0) return // wait till `load` finished
 
     this._logger.log('balances updated')
-    this.#balancesAtom.set({
-      balances,
-      oldBalances,
-      changes,
-    })
-
-    this.#oldBalances = balances
+    this.#balancesAtom.set({ balances, changes })
   }
 
   stop = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/balances",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "description": "Tracks crypto balances across enabled wallet accounts.",
   "author": "Exodus Movement Inc.",
   "license": "UNLICENSED",
@@ -29,11 +29,11 @@
     "url": "https://github.com/ExodusMovement/exodus-hydra/issues?q=is%3Aissue+is%3Aopen+label%3Abalances"
   },
   "dependencies": {
-    "@exodus/atoms": "^6.0.1",
+    "@exodus/atoms": "^7.0.0",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/currency": "^2.1.2",
     "@exodus/module": "^1.1.0",
-    "@exodus/multi-account-redux": "^2.0.0",
+    "@exodus/multi-account-redux": "^2.0.1",
     "@exodus/typeforce": "^1.18.0",
     "lodash": "^4.17.21",
     "make-concurrent": "^4.0.0",
@@ -45,18 +45,18 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.94",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^4.0.0",
+    "@exodus/assets-feature": "^4.0.1",
     "@exodus/bitcoin-meta": "^1.0.1",
     "@exodus/blockchain-metadata": "^9.0.1",
     "@exodus/ethereum-meta": "^1.0.30",
     "@exodus/models": "^10.1.0",
     "@exodus/redux-dependency-injection": "^3.0.0",
     "@exodus/storage-memory": "*",
-    "@exodus/wallet-accounts": "^14.3.0",
+    "@exodus/wallet-accounts": "^15.0.0",
     "eslint": "^8.44.0",
     "events": "^3.3.0",
     "jest": "^29.1.2",
     "redux": "^4.2.1"
   },
-  "gitHead": "0c943e6a82e29239305544665711c1b1b4a98fce"
+  "gitHead": "b2cc53c628d9cdb2e4a25557f72b88ec05c75e14"
 }

package/redux/index.js

@@ -38,15 +38,14 @@ const balancesReduxDefinition = {
   initialState,
   eventReducers: {
     balances: (state, payload) => {
-      const ignoreChanges = state === initialState
-      if (!ignoreChanges && payload.changes && Object.keys(payload.changes).length > 0) {
+      const { hasBalance, ...walletAccountBalances } = state
+      const balancesLoaded = Object.keys(walletAccountBalances).every((value) => value.loaded)
+
+      if (balancesLoaded && payload.changes && Object.keys(payload.changes).length > 0) {
         return mergeChanges(state, payload.changes)
       }
 
-      return {
-        hasBalance: state.hasBalance,
-        ...setAccounts(state, payload.balances),
-      }
+      return { hasBalance, ...setAccounts(state, payload.balances) }
     },
     hasBalance: (state, payload) => ({
       ...state,