@exodus/bitcoin-api 2.3.5 → 2.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -20,12 +20,14 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.2",
     "@exodus/basic-utils": "^2.0.1",
+    "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/bitcoinjs-lib": "6.0.2-beta.5",
     "@exodus/models": "^8.10.4",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
+    "@noble/secp256k1": "~1.5.3",
     "bech32": "^1.1.3",
     "coininfo": "5.1.0",
     "delay": "4.0.1",
@@ -36,11 +38,8 @@
     "url-join": "4.0.0"
   },
   "devDependencies": {
-    "@exodus/asset-lib": "^3.7.1",
-    "@exodus/bcash-meta": "^1.0.0",
-    "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bitcoin-meta": "^1.0.1",
-    "@noble/secp256k1": "~1.5.3"
+    "jest-when": "^3.5.1"
   },
-  "gitHead": "3dd9a1846d6f34252c12e966e1ee1f851cca4173"
+  "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)) {

package/src/tx-send/index.js

@@ -92,21 +92,10 @@ export const getSizeAndChangeScriptFactory = ({ bitcoinJsLib = defaultBitcoinjsL
   assert(rawTx, 'rawTx is required')
   assert(typeof changeUtxoIndex === 'number', 'changeUtxoIndex must be a number')
 
-  const getSize = (tx) => {
-    if (typeof tx.size === 'number') return tx.size
-    if (typeof tx.virtualSize === 'function') {
-      return tx.virtualSize()
-    }
-    if (typeof tx.virtualSize === 'number') {
-      return tx.virtualSize
-    }
-    return undefined
-  }
-
   if (tx) {
     return {
-      script: tx.outs?.[changeUtxoIndex]?.script.toString('hex'),
-      size: getSize(tx),
+      script: tx.outs?.[changeUtxoIndex]?.script,
+      size: tx.virtualSize,
     }
   }
   // Trezor doesn't return tx!! we need to reparse it!
@@ -114,7 +103,7 @@ export const getSizeAndChangeScriptFactory = ({ bitcoinJsLib = defaultBitcoinjsL
   try {
     return {
       script: parsedTx.outs?.[changeUtxoIndex]?.script.toString('hex'),
-      size: getSize(parsedTx),
+      size: tx.virtualSize?.(),
     }
   } catch (e) {
     console.warn(

package/src/tx-sign/default-create-tx.js

@@ -24,6 +24,16 @@ const canParseTx = (rawTxBuffer) => {
   }
 }
 
+export const serializeTx = ({ tx }) => {
+  // for desktop compatibility
+  return {
+    virtualSize: tx.virtualSize?.(),
+    outs: tx.outs?.map((out) => ({
+      script: out.script.toString('hex'),
+    })),
+  }
+}
+
 export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, network, ecc }) => {
   assert(assetName, 'assetName is required')
   assert(resolvePurpose, 'resolvePurpose is required')
@@ -134,6 +144,6 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
     const txId = tx.getId()
 
     // tx needs to be serializable for desktop RPC send => sign communication
-    return { rawTx, txId, tx: { ...tx, virtualSize: tx.virtualSize?.() } }
+    return { rawTx, txId, tx: serializeTx({ tx }) }
   }
 }

package/src/tx-sign/index.js

@@ -1 +1 @@
-export { signTxFactory } from './default-create-tx'
+export { signTxFactory, serializeTx } from './default-create-tx'

package/src/utxos-utils.js

@@ -12,18 +12,12 @@ export function getUtxos({ accountState, asset }) {
   )
 }
 
-export function getConfirmedUtxos({ asset, utxos }) {
-  assert(asset, 'asset is required')
+export function getConfirmedUtxos({ utxos }) {
   assert(utxos, 'utxos is required')
-  const currency = asset.currency
-  return UtxoCollection.fromArray(
-    utxos.toArray().filter(({ confirmations }) => confirmations > 0),
-    { currency }
-  )
+  return utxos.filter(({ confirmations }) => confirmations > 0)
 }
 
-export function getConfirmedOrRfbDisabledUtxos({ asset, utxos, allowUnconfirmedRbfEnabledUtxos }) {
-  assert(asset, 'asset is required')
+export function getConfirmedOrRfbDisabledUtxos({ utxos, allowUnconfirmedRbfEnabledUtxos }) {
   assert(utxos, 'utxos is required')
   assert(
     allowUnconfirmedRbfEnabledUtxos !== undefined,
@@ -32,11 +26,7 @@ export function getConfirmedOrRfbDisabledUtxos({ asset, utxos, allowUnconfirmedR
   if (allowUnconfirmedRbfEnabledUtxos) {
     return utxos
   }
-  const currency = asset.currency
-  return UtxoCollection.fromArray(
-    utxos.toArray().filter((utxo) => utxo.confirmations > 0 || !utxo.rbfEnabled),
-    { currency }
-  )
+  return utxos.filter((utxo) => utxo.confirmations > 0 || !utxo.rbfEnabled)
 }
 
 export function getUsableUtxos({ asset, utxos, feeData, txSet }) {
@@ -58,8 +48,5 @@ export function getUsableUtxos({ asset, utxos, feeData, txSet }) {
   })
   return largeUnconfirmedTxs.size === 0
     ? utxos
-    : UtxoCollection.fromArray(
-        utxos.toArray().filter((utxo) => !largeUnconfirmedTxs.has(utxo.txId)),
-        { currency: asset.currency }
-      )
+    : utxos.filter((utxo) => !largeUnconfirmedTxs.has(utxo.txId))
 }