@exodus/bitcoin-api 2.6.5 → 2.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.6.5",
+  "version": "2.6.7",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -43,5 +43,5 @@
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "c8877a87f29d0c4c27b18937a9ec57c81be223dd"
+  "gitHead": "04954f04a1246db5d0cc3fd848ef23a91df2b623"
 }

package/src/insight-api-client/index.js

@@ -57,12 +57,11 @@ export default class InsightAPIClient {
     return !!peerStatus.connected
   }
 
-  /*
-  async fetchBalance (address) {
-    const addrData = await this.fetchAddress(address)
-    return (addrData.balanceSat + addrData.unconfirmedBalanceSat) | 0
+  async fetchBalance(address) {
+    const encodedAddress = encodeURIComponent(address)
+    const url = urlJoin(this._baseURL, `/balance/${encodedAddress}`)
+    return fetchJson(url)
   }
-  */
 
   async fetchBlockHeight() {
     const url = urlJoin(this._baseURL, '/status')

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

@@ -505,8 +505,8 @@ export class BitcoinMonitorScanner {
     let utxoCol = UtxoCollection.fromArray(utxos, { currency })
 
     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)
+    // Keep new utxos when they intersect with the stored utxos.
+    utxoCol = utxoCol.union(currentStoredUtxos).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

package/src/tx-send/index.js

@@ -293,6 +293,7 @@ export const createAndBroadcastTXFactory = ({
       UtxoCollection.fromJSON(replaceTx.data.inputs, { currency: asset.currency })
     )
   }
+  const addressPathsMap = selectedUtxos.getAddressPathsMap()
 
   // transform UTXO object to raw
   const inputs = shuffle(createInputs(assetName, selectedUtxos.toArray(), rbfEnabled))
@@ -341,6 +342,9 @@ export const createAndBroadcastTXFactory = ({
       ourAddress.address ? ourAddress.address : ourAddress.toString(),
       change
     )
+    // Add the keypath of change address to support Trezor detect the change output.
+    // Output is change and does not need approval from user which shows the strange address that user never seen.
+    addressPathsMap[changeAddress] = ourAddress.meta.path
     outputs.push(changeOutput)
   } else {
     // If we don't have enough for a change output, then all remaining dust is just added to fee
@@ -360,7 +364,7 @@ export const createAndBroadcastTXFactory = ({
     },
     txMeta: {
       useCashAddress, // for trezor to show the receiver cash address
-      addressPathsMap: selectedUtxos.getAddressPathsMap(),
+      addressPathsMap,
       blockHeight,
     },
   }