@exodus/balances 1.2.1 → 2.0.1

package/confirmed-balance.js

@@ -0,0 +1,19 @@
+import { TxSet } from '@exodus/models'
+
+const isUnconfirmedTx = (tx) => tx.pending && !tx.error
+
+const getTxSetBalance = (txSet) => txSet.getMutations().slice(-1)[0].balance
+
+const getUnconfirmedTotal = ({ assets, asset, txLog }) => {
+  const unconfirmedTxs = [...txLog].filter(isUnconfirmedTx)
+  return unconfirmedTxs.length === 0
+    ? asset.currency.ZERO
+    : getTxSetBalance(TxSet.fromArray(unconfirmedTxs, { assets }))
+}
+
+const getConfirmedBalance = ({ assets, asset, txLog, balance }) => {
+  const unconfirmedTotal = getUnconfirmedTotal({ assets, asset, txLog })
+  return balance.sub(unconfirmedTotal)
+}
+
+export default getConfirmedBalance

package/index.js

@@ -3,6 +3,7 @@ import { TxSet } from '@exodus/models'
 import ExodusModule from '@exodus/module'
 import { cloneDeepWith, difference, isEmpty, merge, set, zipObject } from 'lodash'
 import makeConcurrent from 'make-concurrent'
+import getConfirmedBalance from './confirmed-balance'
 
 const cloneBalances = (balances) =>
   cloneDeepWith(balances, (val) => {
@@ -45,12 +46,13 @@ class Balances extends ExodusModule {
     this.#handleTxLogUpdate = shareQueue(this.#handleTxLogUpdate)
     this.#recompute = shareQueue(this.#recompute)
 
-    blockchainMetadata.on('loaded', () => {
-      walletAccountsAtom.observe((payload) =>
+    blockchainMetadata.once('load-wallet-accounts', () => {
+      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)
     })
@@ -104,7 +106,33 @@ class Balances extends ExodusModule {
     const getAssetBalances = (assetName) => {
       const asset = this.#getAsset(assetName)
       const txLog = txLogsByAssetName[assetName]
-      return asset.api.getBalances({ asset, accountState, txLog })
+      const balances = asset.api.getBalances({ asset, accountState, txLog })
+      if (!balances || isEmpty(balances)) return null
+
+      if (balances.balance && this.#balanceFields.includes('confirmedBalance')) {
+        balances.confirmedBalance = getConfirmedBalance({
+          assets: this.#getAssets(),
+          asset,
+          txLog,
+          balance: balances.balance,
+        })
+      }
+
+      const negativeBalanceFields = Object.keys(balances).filter(
+        (field) => balances[field]?.isNegative
+      )
+
+      if (negativeBalanceFields.length > 0) {
+        this._logger.warn('unexpected negative balance', {
+          assetName,
+          accountState,
+          txLogsByAssetName,
+          balances,
+          negativeBalanceFields,
+        })
+      }
+
+      return balances
     }
 
     const balances = assetNames.map(getAssetBalances)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/balances",
-  "version": "1.2.1",
+  "version": "2.0.1",
   "description": "balances",
   "author": "Exodus Movement Inc",
   "license": "UNLICENSED",
@@ -10,7 +10,8 @@
     "lint:fix": "yarn lint --fix"
   },
   "files": [
-    "index.js"
+    "index.js",
+    "confirmed-balance.js"
   ],
   "repository": {
     "type": "git",
@@ -26,10 +27,15 @@
     "lodash": "^4.17.21",
     "make-concurrent": "^4.0.0"
   },
+  "peerDependencies": {
+    "@exodus/blockchain-metadata": "^3.0.0"
+  },
   "devDependencies": {
-    "@exodus/atoms": "^1.0.0",
+    "@exodus/atoms": "^2.3.0",
     "@exodus/basic-utils": "^1.0.0",
-    "@exodus/models": "^8.9.0"
+    "@exodus/blockchain-metadata": "*",
+    "@exodus/models": "^8.9.0",
+    "@exodus/storage-memory": "*"
   },
-  "gitHead": "03c583ee3f8e75c54871f0da68dd15dd336da09b"
+  "gitHead": "9ef26663a0f2415380d7bebc4c97acfbe8be35f0"
 }