@exodus/balances 1.1.2 → 1.2.1

package/index.js

@@ -1,4 +1,5 @@
 import { isNumberUnit } from '@exodus/currency'
+import { TxSet } from '@exodus/models'
 import ExodusModule from '@exodus/module'
 import { cloneDeepWith, difference, isEmpty, merge, set, zipObject } from 'lodash'
 import makeConcurrent from 'make-concurrent'
@@ -41,24 +42,24 @@ class Balances extends ExodusModule {
 
     // these share a queue
     this.#updateAssetSource = shareQueue(this.#updateAssetSource)
+    this.#handleTxLogUpdate = shareQueue(this.#handleTxLogUpdate)
     this.#recompute = shareQueue(this.#recompute)
 
     blockchainMetadata.on('loaded', () => {
-      this.#recompute()
+      walletAccountsAtom.observe((payload) =>
+        this.#setWalletAccounts(
+          Object.keys(payload).filter((walletAccount) => payload[walletAccount].enabled)
+        )
+      )
       blockchainMetadata.on('account-state', this.#handleAccountStateUpdate)
       blockchainMetadata.on('tx-log', this.#handleTxLogUpdate)
     })
 
-    walletAccountsAtom.observe((payload) =>
-      this.#setWalletAccounts(
-        Object.keys(payload).filter((walletAccount) => payload[walletAccount].enabled)
-      )
-    )
-
     assetsModule.on('assets-add', this.#onAssetsChanged)
   }
 
   #getAsset = (assetName) => this.#assetsModule.getAsset(assetName)
+  #getAssets = () => this.#assetsModule.getAssets()
 
   #handleAccountStateUpdate = async (opts) => {
     if (!this.#ready) {
@@ -77,7 +78,8 @@ class Balances extends ExodusModule {
       })
       return
     }
-    if (this.#isHistoryBasedBalanceAsset(opts.assetName)) return this.#updateAssetSource(opts)
+
+    return this.#updateAssetSource(opts)
   }
 
   #pushIntoSharedQueue = makeConcurrent((fn) => fn(), { concurrency: 1 })
@@ -90,30 +92,21 @@ class Balances extends ExodusModule {
 
   #getBalancesForAssetSource = async ({ walletAccount, assetName }) => {
     const metadata = await this.#loadBlockchainMetadataForBalance({ walletAccount, assetName })
-    return this.#getBalancesFromBlockchainMetadata({ assetName, ...metadata })
+    return this.#getBalancesFromBlockchainMetadata({
+      assetNames: this.#getRelatedAssetNames(assetName),
+      ...metadata,
+    })
   }
 
-  #getBalancesFromBlockchainMetadata = ({ assetName, accountState, txLog }) => {
+  #getBalancesFromBlockchainMetadata = ({ assetNames, accountState, txLogsByAssetName }) => {
     // in the future accountState may have all the balances and we won't need to rely on txLog
     // for now, accountState-based balance has both the baseAsset and token balances while txLog is per asset/token
     const getAssetBalances = (assetName) => {
       const asset = this.#getAsset(assetName)
+      const txLog = txLogsByAssetName[assetName]
       return asset.api.getBalances({ asset, accountState, txLog })
     }
 
-    if (this.#isHistoryBasedBalanceAsset(assetName)) {
-      const balances = getAssetBalances(assetName)
-      return balances
-        ? {
-            [assetName]: balances,
-          }
-        : {}
-    }
-
-    const assetNames = [assetName, ...this.#assetsModule.getTokenNames(assetName)].filter(
-      this.#isSupportedAsset
-    )
-
     const balances = assetNames.map(getAssetBalances)
     return zipNonNull(assetNames, balances)
   }
@@ -161,23 +154,41 @@ class Balances extends ExodusModule {
   }
 
   #isSupportedAsset = (assetName) => !this.#getAsset(assetName).isCombined
-  #getSupportedAssetNames = () =>
-    Object.keys(this.#assetsModule.getAssets()).filter(this.#isSupportedAsset)
+  #getSupportedAssetNames = () => Object.keys(this.#getAssets()).filter(this.#isSupportedAsset)
 
-  #isHistoryBasedBalanceAsset = (assetName) => {
-    const asset = this.#getAsset(assetName)
-    return asset.api?.hasFeature('historyBasedBalance')
-  }
+  #getRelatedAssetNames = (assetName) =>
+    [assetName, ...this.#assetsModule.getTokenNames(assetName)].filter(this.#isSupportedAsset)
+
+  #loadBlockchainMetadataForBalance = async ({
+    assetName,
+    walletAccount,
+    accountState: providedAccountState = null,
+    txLogsByAssetName: providedTxLogsByAssetName = {},
+  }) => {
+    const [txLogsByAssetSource, accountState] = await Promise.all([
+      this.#blockchainMetadata.getLoadedTxLogs(),
+      providedAccountState
+        ? Promise.resolve(providedAccountState)
+        : this.#blockchainMetadata.getAccountState({
+            assetName: this.#getAsset(assetName).baseAsset.name,
+            walletAccount,
+          }),
+    ])
+
+    const assetNames = this.#getRelatedAssetNames(assetName)
+    const txLogsByAssetName = zipObject(
+      assetNames,
+      assetNames.map(
+        (assetName) =>
+          providedTxLogsByAssetName[assetName] ||
+          txLogsByAssetSource[walletAccount]?.[assetName] ||
+          TxSet.EMPTY
+      )
+    )
 
-  #loadBlockchainMetadataForBalance = async ({ assetName, walletAccount, accountState, txLog }) => {
     return {
-      accountState:
-        accountState ||
-        (await this.#blockchainMetadata.getAccountState({
-          assetName: this.#getAsset(assetName).baseAsset.name,
-          walletAccount,
-        })),
-      txLog: txLog || (await this.#blockchainMetadata.getTxLog({ assetName, walletAccount })),
+      accountState,
+      txLogsByAssetName,
     }
   }
 
@@ -194,15 +205,22 @@ class Balances extends ExodusModule {
       return
     }
 
-    const { accountState, txLog } = await this.#loadBlockchainMetadataForBalance({
+    const { accountState, txLogsByAssetName } = await this.#loadBlockchainMetadataForBalance({
       assetName,
       walletAccount,
       accountState: providedAccountState,
-      txLog: providedTxLog,
+      txLogsByAssetName: {
+        [assetName]: providedTxLog,
+      },
     })
 
     const accountBalances = this.#balances[walletAccount]
-    const newBalances = this.#getBalancesFromBlockchainMetadata({ assetName, accountState, txLog })
+    const newBalances = this.#getBalancesFromBlockchainMetadata({
+      assetNames: this.#getRelatedAssetNames(assetName),
+      accountState,
+      txLogsByAssetName,
+    })
+
     const changes = Object.create(null)
     for (let subAssetName in newBalances) {
       const { currency } = this.#getAsset(subAssetName)
@@ -234,10 +252,12 @@ class Balances extends ExodusModule {
   }
 
   sync = ({ changes } = {}) => {
-    this._logger.log('balances updated')
-
     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.emit('balances', {
       balances,
       oldBalances,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/balances",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "balances",
   "author": "Exodus Movement Inc",
   "license": "UNLICENSED",
@@ -31,5 +31,5 @@
     "@exodus/basic-utils": "^1.0.0",
     "@exodus/models": "^8.9.0"
   },
-  "gitHead": "d23a92b5962eedd5874f0362a6983b7c4b8a3ce4"
+  "gitHead": "03c583ee3f8e75c54871f0da68dd15dd336da09b"
 }