@exodus/balances 11.0.3 → 11.2.0

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.
 
+## [11.2.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@11.1.0...@exodus/balances@11.2.0) (2023-10-25)
+
+### Features
+
+- add selector to compute unconfirmed balance ([#4552](https://github.com/ExodusMovement/exodus-hydra/issues/4552)) ([a3b5217](https://github.com/ExodusMovement/exodus-hydra/commit/a3b52173c5cf3dd23aa7f1f21aea62f9e09f6b58))
+
+## [11.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@11.0.3...@exodus/balances@11.1.0) (2023-10-20)
+
+### Features
+
+- warn on different number unit ([#4512](https://github.com/ExodusMovement/exodus-hydra/issues/4512)) ([d11cbc7](https://github.com/ExodusMovement/exodus-hydra/commit/d11cbc770535cb5f978526d5634a391b1bd4146f))
+
 ## [11.0.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/balances@11.0.2...@exodus/balances@11.0.3) (2023-10-20)
 
 ### Bug Fixes

package/module/index.js

@@ -21,7 +21,6 @@ export const MODULE_ID = 'balances'
 
 class Balances extends ExodusModule {
   #assetsModule
-  #blockchainMetadata
   #balanceFields
   #walletAccounts = [] // string[]
   #ready = false
@@ -36,7 +35,6 @@ class Balances extends ExodusModule {
 
   constructor({
     assetsModule,
-    blockchainMetadata,
     enabledWalletAccountsAtom,
     config: { balanceFields },
     logger,
@@ -47,7 +45,6 @@ class Balances extends ExodusModule {
     super({ name: MODULE_ID, logger })
 
     this.#assetsModule = assetsModule
-    this.#blockchainMetadata = blockchainMetadata
     this.#balanceFields = balanceFields
     this.#balancesAtom = balancesAtom
     this.#accountStatesAtom = accountStatesAtom
@@ -163,7 +160,27 @@ class Balances extends ExodusModule {
       const asset = this.#getAsset(assetName)
       const txLog = txLogsByAssetName[assetName]
       const balances = asset.api.getBalances({ asset, accountState, txLog })
-      if (!balances || isEmpty(balances)) return null
+      if (!balances || isEmpty(balances) || !balances.balance) return null
+      if (!balances.balance.unitType.equals(asset.currency)) {
+        this.emit('error', {
+          fn: 'getAssetBalances',
+          error: 'asset.api.getBalances returns different currency',
+          args: {
+            balanceUnit: balances.balance.unitType.defaultUnit.unitName,
+            assetUnit: asset.currency.defaultUnit.unitName,
+          },
+        })
+
+        this._logger.warn(
+          'asset.api.getBalances returns different currency, asset currency:',
+          asset.currency.defaultUnit.unitName,
+          'balance currency',
+          balances.balance.unitType.defaultUnit.unitName,
+          'return zero balance for it'
+        )
+
+        return Object.fromEntries(this.#balanceFields.map((field) => [field, asset.currency.ZERO]))
+      }
 
       if (balances.balance && this.#balanceFields.includes('confirmedBalance')) {
         balances.confirmedBalance = getConfirmedBalance({
@@ -257,15 +274,20 @@ class Balances extends ExodusModule {
     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 { value: txLogsByAssetSource } = await this.#txLogsAtom.get()
+    let accountState = providedAccountState
+    if (!accountState) {
+      const asset = this.#getAsset(assetName).baseAsset
+      const assetNameToUse = asset.name
+      const { value } = await this.#accountStatesAtom.get()
+      const cached = value[walletAccount]?.[assetNameToUse]
+      if (cached) {
+        accountState = cached
+      } else {
+        const AccountState = asset.api?.createAccountState?.()
+        accountState = AccountState?.create()
+      }
+    }
 
     const assetNames = this.#getRelatedAssetNames(assetName)
     const txLogsByAssetName = zipObject(
@@ -368,7 +390,6 @@ const balancesDefinition = {
   factory: createBalances,
   dependencies: [
     'assetsModule',
-    'blockchainMetadata',
     'enabledWalletAccountsAtom',
     'config',
     'logger',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/balances",
-  "version": "11.0.3",
+  "version": "11.2.0",
   "description": "Tracks crypto balances across enabled wallet accounts.",
   "author": "Exodus Movement Inc.",
   "license": "UNLICENSED",
@@ -29,7 +29,7 @@
     "url": "https://github.com/ExodusMovement/exodus-hydra/issues?q=is%3Aissue+is%3Aopen+label%3Abalances"
   },
   "dependencies": {
-    "@exodus/atoms": "^5.7.3",
+    "@exodus/atoms": "^6.0.0",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/currency": "^2.1.2",
     "@exodus/module": "^1.1.0",
@@ -45,18 +45,18 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.94",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^3.5.0",
+    "@exodus/assets-feature": "^3.7.0",
     "@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.1.0",
+    "@exodus/wallet-accounts": "^14.2.0",
     "eslint": "^8.44.0",
     "events": "^3.3.0",
     "jest": "^29.1.2",
     "redux": "^4.2.1"
   },
-  "gitHead": "18791c72d9be2a75aea6621a216c1aed819442ca"
+  "gitHead": "8b3bfdde1a35b05e6f42445f5d40a573a68d919b"
 }

package/redux/selectors/create-unconfirmed-balance.js

@@ -0,0 +1,39 @@
+import { memoize } from 'lodash'
+import { createSelector } from 'reselect'
+
+const selectorFactory = (assetsSelector, createAssetSourceSelector) =>
+  memoize(
+    ({ assetName, walletAccount }) =>
+      createSelector(
+        assetsSelector,
+        createAssetSourceSelector({ assetName, walletAccount }),
+        (assets, txs) => {
+          const asset = assets[assetName]
+          let result = asset.currency.ZERO
+
+          for (const tx of txs) {
+            const isUnconfirmed = tx.error || tx.pending || tx.confirmations <= 0
+
+            if (isUnconfirmed) {
+              result = tx.coinAmount.isNegative
+                ? result.sub(tx.coinAmount)
+                : result.add(tx.coinAmount)
+            }
+          }
+
+          return result
+        }
+      ),
+    ({ assetName, walletAccount }) => [assetName, walletAccount].join('-')
+  )
+
+const createUnconfirmedBalanceSelectorDefinition = {
+  id: 'createUnconfirmedBalance',
+  selectorFactory,
+  dependencies: [
+    { module: 'assets', selector: 'all' },
+    { module: 'txLog', selector: 'createAssetSourceSelector' },
+  ],
+}
+
+export default createUnconfirmedBalanceSelectorDefinition

package/redux/selectors/index.js

@@ -1 +1,3 @@
-export default []
+import createUnconfirmedBalanceSelectorDefinition from './create-unconfirmed-balance'
+
+export default [createUnconfirmedBalanceSelectorDefinition]