@exodus/bitcoin-api 2.3.6 → 2.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -38,7 +38,8 @@
     "url-join": "4.0.0"
   },
   "devDependencies": {
-    "@exodus/bitcoin-meta": "^1.0.1"
+    "@exodus/bitcoin-meta": "^1.0.1",
+    "jest-when": "^3.5.1"
   },
-  "gitHead": "0ac89c74616ae95eee3c4628ea3babd98dd1495b"
+  "gitHead": "7a83d2ff5d672615938fba868779293df74ff51d"
 }

package/src/tx-log/bitcoin-monitor-scanner.js

@@ -1,7 +1,7 @@
 /* @flow */
 import { orderTxs } from '../insight-api-client/util'
 import { Address, UtxoCollection } from '@exodus/models'
-import { isEqual, compact } from 'lodash'
+import { isEqual, compact, uniq } from 'lodash'
 import ms from 'ms'
 
 import assert from 'minimalistic-assert'
@@ -505,4 +505,56 @@ export class BitcoinMonitorScanner {
       changedUnusedAddressIndexes,
     }
   }
+
+  async rescanOnNewBlock({ walletAccount }) {
+    const aci = this.#assetClientInterface
+    const asset = this.#asset
+    const assetName = this.#asset.name
+
+    const accountState = await aci.getAccountState({ assetName, walletAccount })
+
+    const allStoredUtxos = getUtxos({ accountState, asset })
+
+    const currentTxs = Array.from(await aci.getTxLog({ assetName, walletAccount }))
+
+    const unconfirmedTxIds = uniq([
+      ...allStoredUtxos
+        .toArray()
+        .filter((utxos) => !utxos.confirmations)
+        .map((utxos) => utxos.txId),
+      ...currentTxs.filter((tx) => !tx.dropped && !tx.confirmations).map((tx) => tx.txId),
+    ])
+
+    const confirmationsList = (
+      await Promise.all(
+        unconfirmedTxIds.map(async (txId) => {
+          const txStatus = await this.#insightClient.fetchTx(txId)
+          if (!txStatus?.confirmations) {
+            return undefined
+          }
+          return { txId, confirmations: txStatus.confirmations }
+        })
+      )
+    ).filter(Boolean)
+
+    const updatedPropertiesTxs = currentTxs
+      .map((tx) => {
+        const updatedProperties = {}
+        const confirmations = confirmationsList.find(({ txId }) => tx.txId === txId)?.confirmations
+        if (!tx.dropped && !tx.confirmations && confirmations > 0) {
+          updatedProperties.confirmations = confirmations
+        }
+        return { txId: tx.txId, ...updatedProperties }
+      })
+      .filter((tx) => Object.keys(tx).length > 1)
+
+    const txConfirmedUtxos = confirmationsList.length
+      ? allStoredUtxos.updateConfirmations(confirmationsList)
+      : null
+
+    return {
+      utxos: txConfirmedUtxos,
+      txsToUpdate: updatedPropertiesTxs,
+    }
+  }
 }

package/src/tx-log/bitcoin-monitor.js

@@ -94,7 +94,6 @@ export class Monitor extends BaseMonitor {
   }
 
   #connectWS = async (wsUrl) => {
-    const aci = this.aci
     if (this.#ws) {
       this.#ws.close()
       this.#ws = null
@@ -125,46 +124,7 @@ export class Monitor extends BaseMonitor {
       )
       this.tickWalletAccounts({ walletAccount })
     })
-    this.#ws.on('block', async () => {
-      await this.#yieldToUI(100)
-      const assetName = this.asset.name
-
-      const walletAccounts = await aci.getWalletAccounts({ assetName })
-      for (const walletAccount of walletAccounts) {
-        const currentTxs = Array.from(await aci.getTxLog({ assetName, walletAccount }))
-        const updatedPropertiesTxs = await Promise.all(
-          currentTxs.map(async (tx) => {
-            if (tx.dropped || (tx.confirmations && tx.confirmations > 0)) return null
-            const txStatus = await this.#insightClient.fetchTx(tx.txId)
-            if (!txStatus) return null
-            if (txStatus.confirmations <= 0) return null
-            return { txId: tx.txId, confirmations: txStatus.confirmations }
-          })
-        ).then((res) => res.filter((status) => !!status))
-        if (updatedPropertiesTxs.length) {
-          await this.updateTxLog({ assetName, walletAccount, logItems: updatedPropertiesTxs })
-
-          const accountState = await aci.getAccountState({ assetName, walletAccount })
-
-          const utxos = accountState.utxos.updateConfirmations(updatedPropertiesTxs)
-          await aci.updateAccountState({
-            accountState,
-            assetName,
-            walletAccount,
-            newData: { utxos },
-          })
-
-          if (['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) {
-            updateUnconfirmedAncestorData({
-              asset: this.asset,
-              walletAccount,
-              accountState,
-              insightClient: this.#insightClient,
-            })
-          }
-        }
-      }
-    })
+    this.#ws.on('block', () => this.onNewBlock())
     this.#ws.on('disconnect', () => {
       this.#logWsStatus('disconnect')
       this.timer.setNewInterval(this.interval)
@@ -175,6 +135,42 @@ export class Monitor extends BaseMonitor {
     })
   }
 
+  async onNewBlock() {
+    await this.#yieldToUI(100)
+    const aci = this.aci
+    const asset = this.asset
+    const assetName = asset.name
+    const walletAccounts = await aci.getWalletAccounts({ assetName })
+    for (const walletAccount of walletAccounts) {
+      const { txsToUpdate, utxos } = await this.#scanner.rescanOnNewBlock({
+        walletAccount,
+      })
+
+      if (utxos) {
+        await aci.updateAccountState({
+          assetName,
+          walletAccount,
+          newData: {
+            utxos,
+          },
+        })
+      }
+
+      if (txsToUpdate.length) {
+        const accountState = await aci.getAccountState({ assetName, walletAccount })
+        await this.updateTxLog({ assetName, walletAccount, logItems: txsToUpdate })
+        if (['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)) {
+          updateUnconfirmedAncestorData({
+            asset,
+            walletAccount,
+            accountState,
+            insightClient: this.#insightClient,
+          })
+        }
+      }
+    }
+  }
+
   #subscribeToNewAddresses = async () => {
     const newAddressesByWalletAccount = await this.#getReceiveAddressesByWalletAccount()
     if (!isEqual(newAddressesByWalletAccount, this.#addressesByWalletAccount)) {