@exodus/bitcoin-api 2.6.0 → 2.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -19,10 +19,10 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.7.2",
-    "@exodus/basic-utils": "^2.0.1",
+    "@exodus/basic-utils": "^2.1.0",
     "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
-    "@exodus/models": "^8.10.4",
+    "@exodus/models": "^10.1.0",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
@@ -43,5 +43,5 @@
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "6bfd72d44715d9c44057d5134841a875cbb7e8c4"
+  "gitHead": "a9f5e8c6f0ac0655cdd2721cf20813f86a373678"
 }

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

@@ -61,6 +61,7 @@ export class BitcoinMonitorScanner {
 
     const storedUtxos = getUtxos({ asset, accountState })
     const storedOrdinalUtxos = getOrdinalsUtxos({ asset, accountState })
+    const ordinalAddress = await this.getOrdinalAddress({ walletAccount })
 
     const currentStoredUtxos = storedUtxos.union(storedOrdinalUtxos)
 
@@ -236,6 +237,18 @@ export class BitcoinMonitorScanner {
 
       const addresses = await aggregateAddresses(chainObjects)
 
+      if (fetchCount === 0) {
+        // in compatibility mode, the receive address could be different
+        const receiveAddress = await this.#assetClientInterface.getReceiveAddressObject({
+          assetName,
+          walletAccount,
+        })
+        if (!addresses.includes(receiveAddress.toString())) {
+          addresses.push(receiveAddress.toString())
+          addrMap[receiveAddress.toString()] = receiveAddress
+        }
+      }
+
       const txs = await fetchAllTxs(addresses)
       if (txs.length === 0) break
       allTxs = allTxs.concat(txs)
@@ -253,11 +266,14 @@ export class BitcoinMonitorScanner {
           // this is a used address, we need to update the chain
           const pd = address.meta.path.split('/')
           const metaChainIndex = parseInt(pd[1])
-          const metaAddressIndex = parseInt(pd[2])
+          const metaAddressIndex = pd[2] ? parseInt(pd[2]) : undefined // compatibility, it could shorter eg. m/0, not m/0/0
           const addressString = String(address)
           const purposeToUpdate = purposeMap[addressString]
 
-          if (metaChainIndex === this.#ordinalChainIndex && this.#ordinalChainIndex > 1) {
+          if (
+            metaAddressIndex === undefined ||
+            (metaChainIndex === this.#ordinalChainIndex && this.#ordinalChainIndex > 1)
+          ) {
             return
           }
 
@@ -342,15 +358,19 @@ export class BitcoinMonitorScanner {
         vinTxids[`${vin.txid}-${vin.vout}`] = true
         from.push(vin.addr)
 
-        if (!addrMap[vin.addr]) return
+        const address = addrMap[vin.addr]
+        if (!address) return
         // it came from us...
         txLogItem.coinAmount = txLogItem.coinAmount.sub(currency.defaultUnit(vin.value))
         isSent = true
         txLogItem.data.sent = []
+        if (ordinalAddress && address.toString() === ordinalAddress.toString()) {
+          txLogItem.data.isInscriptionSent = true
+        }
 
         // this is only used to exclude the utxos in the reducer which is why we don't care about the other fields
         utxosToRemove.push({
-          address: addrMap[vin.addr],
+          address: address,
           txId: vin.txid,
           vout: vin.vout,
           value: currency.defaultUnit(vin.value || 0),
@@ -415,6 +435,10 @@ export class BitcoinMonitorScanner {
           txLogItem.data.changeAddress = address
         }
 
+        if (ordinalAddress && address.toString() === ordinalAddress.toString()) {
+          txLogItem.data.isInscriptionReceived = true
+        }
+
         // it was sent to us...
         let val = currency.defaultUnit(vout.value)
         txLogItem.coinAmount = txLogItem.coinAmount.add(val)
@@ -485,7 +509,7 @@ export class BitcoinMonitorScanner {
 
     const utxosToRemoveCol = UtxoCollection.fromArray(utxosToRemove, { currency })
     // if something else can update currentStoredUtxos in the meantime, we probably need to grab it from state again
-    utxoCol = currentStoredUtxos.union(utxoCol.difference(utxosToRemoveCol))
+    utxoCol = currentStoredUtxos.union(utxoCol).difference(utxosToRemoveCol)
 
     for (let tx of Object.values(unconfirmedTxsToCheck)) {
       existingTxs.push({ ...tx, dropped: true }) // TODO: this will decrease the chain index, it shouldn't be an issue considering the gap limit
@@ -522,7 +546,7 @@ export class BitcoinMonitorScanner {
     const utxosData = utxoCol
       ? partitionUtxos({
           allUtxos: utxoCol,
-          ordinalAddress: await this.getOrdinalAddress({ walletAccount }),
+          ordinalAddress,
         })
       : {}