@exodus/bitcoin-api 2.3.8 → 2.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.3.8",
+  "version": "2.3.11",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -41,5 +41,5 @@
     "@exodus/bitcoin-meta": "^1.0.1",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "9e53c6305dd83860b2db0ea8bfc261c043d8509b"
+  "gitHead": "0baba593527c3eb5bd558dd0a9d230e8aed03824"
 }

package/src/fee/fee-utils.js

@@ -5,7 +5,7 @@ import { resolveExtraFeeOfTx } from '../unconfirmed-ancestor-data'
 import { UtxoCollection } from '@exodus/models'
 import assert from 'minimalistic-assert'
 
-export const isHex = (s: string) => /[0-9a-f]*/.test(s.toLowerCase())
+export const isHex = (s: string) => typeof s === 'string' && /[0-9a-f]*/.test(s.toLowerCase())
 
 export function getExtraFee({ asset, inputs, feePerKB }) {
   let extraFee = 0

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

@@ -346,13 +346,15 @@ export class BitcoinMonitorScanner {
         ['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(asset.name)
       ) {
         txLogItem.data.inputs = UtxoCollection.fromArray(
-          txItem.vin.map((vin) => ({
-            address: addrMap[vin.addr],
-            script: asset.address.toScriptPubKey(vin.addr).toString('hex'),
-            txId: vin.txid,
-            vout: vin.vout,
-            value: currency.defaultUnit(vin.value || 0),
-          }))
+          txItem.vin
+            .filter((vin) => addrMap[vin.addr])
+            .map((vin) => ({
+              address: addrMap[vin.addr],
+              script: asset.address.toScriptPubKey(vin.addr).toString('hex'),
+              txId: vin.txid,
+              vout: vin.vout,
+              value: currency.defaultUnit(vin.value || 0),
+            }))
         ).toJSON()
       }
 
@@ -514,12 +516,12 @@ export class BitcoinMonitorScanner {
 
     const accountState = await aci.getAccountState({ assetName, walletAccount })
 
-    const allStoredUtxos = getUtxos({ accountState, asset })
+    const storedUtxos = getUtxos({ accountState, asset })
 
     const currentTxs = Array.from(await aci.getTxLog({ assetName, walletAccount }))
 
     const unconfirmedTxIds = uniq([
-      ...allStoredUtxos
+      ...storedUtxos
         .toArray()
         .filter((utxos) => !utxos.confirmations)
         .map((utxos) => utxos.txId),
@@ -549,12 +551,13 @@ export class BitcoinMonitorScanner {
       })
       .filter((tx) => Object.keys(tx).length > 1)
 
-    const txConfirmedUtxos = confirmationsList.length
-      ? allStoredUtxos.updateConfirmations(confirmationsList)
+    // Note about storedUtxos.clone(): updateConfirmations mutates the ordinal utxos, it's not possible to perform the equals below if not cloned
+    const updatedUtxos = confirmationsList.length
+      ? storedUtxos.clone().updateConfirmations(confirmationsList)
       : null
 
     return {
-      utxos: txConfirmedUtxos,
+      utxos: !updatedUtxos || updatedUtxos.equals(storedUtxos) ? null : updatedUtxos,
       txsToUpdate: updatedPropertiesTxs,
     }
   }

package/src/tx-send/index.js

@@ -81,7 +81,18 @@ export async function getNonWitnessTxs(asset, utxos, insightClient) {
   return rawTxs
 }
 
-export const getSizeAndChangeScriptFactory = ({ bitcoinJsLib = defaultBitcoinjsLib } = {}) => ({
+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
+}
+
+export const getSizeAndChangeScriptFactory = ({ bitcoinjsLib = defaultBitcoinjsLib } = {}) => ({
   assetName,
   tx,
   rawTx,
@@ -94,16 +105,16 @@ export const getSizeAndChangeScriptFactory = ({ bitcoinJsLib = defaultBitcoinjsL
 
   if (tx) {
     return {
-      script: tx.outs?.[changeUtxoIndex]?.script,
-      size: tx.virtualSize,
+      script: tx.outs?.[changeUtxoIndex]?.script.toString('hex'),
+      size: getSize(tx),
     }
   }
   // Trezor doesn't return tx!! we need to reparse it!
-  const parsedTx = bitcoinJsLib.Transaction.fromBuffer(Buffer.from(rawTx, 'hex'))
+  const parsedTx = bitcoinjsLib.Transaction.fromBuffer(Buffer.from(rawTx, 'hex'))
   try {
     return {
       script: parsedTx.outs?.[changeUtxoIndex]?.script.toString('hex'),
-      size: tx.virtualSize?.(),
+      size: getSize(parsedTx),
     }
   } catch (e) {
     console.warn(