@exodus/bitcoin-api 2.15.0 → 2.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -58,5 +58,5 @@
     "jest-when": "^3.5.1",
     "safe-buffer": "^5.2.1"
   },
-  "gitHead": "364ffb79577938023d87e78e7d24a8e6413af060"
+  "gitHead": "f6d3343c14d821405ea319c4bb022983a7bd4e4c"
 }

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

@@ -54,6 +54,15 @@ export class BitcoinMonitorScanner {
     this.#refreshGapLimit = refreshGapLimit
   }
 
+  async #getGapLimit({ walletAccount, assetName, refresh }) {
+    const assetConfig = await this.#assetClientInterface.getAssetConfig?.({
+      assetName,
+      walletAccount,
+    })
+    if (typeof assetConfig?.gapLimit === 'number') return assetConfig.gapLimit
+    return refresh ? this.#refreshGapLimit : this.#gapLimit
+  }
+
   async rescanBlockchainInsight({ walletAccount, refresh }) {
     const asset = this.#asset
     const assetClientInterface = this.#assetClientInterface
@@ -100,6 +109,8 @@ export class BitcoinMonitorScanner {
       assetName,
       walletAccount,
     })
+
+    const resolvedGapLimit = await this.#getGapLimit({ walletAccount, assetName, refresh })
     /*
      * The chain fields/variables are number arrays of size 2
      *
@@ -153,13 +164,23 @@ export class BitcoinMonitorScanner {
                 addressIndex,
               })
               .then((address) => {
+                const addressObject = this.#asset.address.toLegacyAddress
+                  ? Address.create(
+                      this.#asset.address.toLegacyAddress(String(address)),
+                      address.meta
+                    )
+                  : address
+
+                const addressString = String(addressObject)
+
+                if (addrMap[addressString]) {
+                  return null
+                }
+
+                addrMap[addressString] = addressObject
+
                 return {
-                  address: this.#asset.address.toLegacyAddress
-                    ? Address.create(
-                        this.#asset.address.toLegacyAddress(String(address)),
-                        address.meta
-                      )
-                    : address,
+                  address: addressObject,
                   purpose,
                 }
               })
@@ -168,9 +189,9 @@ export class BitcoinMonitorScanner {
       }
 
       const addresses = []
-      const result = await Promise.all(promises)
+      const allAddresses = await Promise.all(promises)
+      const result = allAddresses.filter(Boolean)
       result.forEach(({ address, purpose }) => {
-        addrMap[String(address)] = address
         purposeMap[String(address)] = purpose
         addresses.push(String(address))
       })
@@ -185,8 +206,9 @@ export class BitcoinMonitorScanner {
 
       const fetchAddressesSize = 25
       for (let i = 0; i < addresses.length; i += fetchAddressesSize) {
+        const fetchAddresses = addresses.slice(i, i + fetchAddressesSize)
         const promise = insightClient.fetchAllTxData(
-          addresses.slice(i, i + fetchAddressesSize),
+          fetchAddresses,
           txFetchLimit,
           fetchTimeout,
           shouldStop
@@ -224,8 +246,8 @@ export class BitcoinMonitorScanner {
         purpose,
         chain,
         startAddressIndexes: chain.map(() => 0),
-        endAddressIndexes: chain.map(
-          (addressIndex) => (refresh ? this.#refreshGapLimit : addressIndex + this.#gapLimit) // right of the || should never happen
+        endAddressIndexes: chain.map((addressIndex) =>
+          refresh ? resolvedGapLimit : addressIndex + resolvedGapLimit
         ),
       }
     })
@@ -336,7 +358,6 @@ export class BitcoinMonitorScanner {
         indexData.startAddressIndexes = [...indexData.endAddressIndexes]
         // eslint-disable-next-line @exodus/mutable/no-param-reassign-prop-only
         indexData.endAddressIndexes = indexData.chain.map((addressIndex) => {
-          const resolvedGapLimit = refresh ? this.#refreshGapLimit : this.#gapLimit
           return addressIndex + resolvedGapLimit
         })
       })

package/src/tx-sign/create-sign-with-wallet.js

@@ -27,10 +27,14 @@ export function createSignWithWallet({
   return async (psbt, inputsToSign) => {
     // The Taproot SIGHASH flag includes all previous outputs,
     // so signing is only done AFTER all inputs have been updated
+    const signingPromises = []
+
     for (let index = 0; index < psbt.inputCount; index++) {
       const inputInfo = inputsToSign[index]
       // dApps request to sign only specific transaction inputs.
       if (!inputInfo) continue
+
+      const input = psbt.data.inputs[index]
       const { address, sigHash } = inputInfo
       // The sighash value from the PSBT input itself will be used.
       // This list just represents possible sighash values the inputs can have.
@@ -41,8 +45,7 @@ export function createSignWithWallet({
       const { key, purpose, keyId, publicKey } = await getKeyWithMetadata(address)
 
       const isP2SH = purpose === 49
-      const hasTapLeafScript =
-        psbt.data.inputs[index].tapLeafScript && psbt.data.inputs[index].tapLeafScript.length > 0
+      const hasTapLeafScript = input.tapLeafScript && input.tapLeafScript.length > 0
       const isTaprootKeySpend = isTaprootPurpose(purpose) && !hasTapLeafScript
 
       if (isP2SH) {
@@ -54,7 +57,7 @@ export function createSignWithWallet({
         const p2sh = payments.p2sh({ redeem: p2wpkh })
         if (address === p2sh.address) {
           // Set the redeem script in the psbt in case it's missing.
-          if (!Buffer.isBuffer(psbt.data.inputs[index].redeemScript)) {
+          if (!Buffer.isBuffer(input.redeemScript)) {
             psbt.updateInput(index, {
               redeemScript: p2sh.redeem.output,
             })
@@ -62,7 +65,7 @@ export function createSignWithWallet({
         } else {
           throw new Error('Expected P2SH script to be a nested segwit input')
         }
-      } else if (isTaprootKeySpend && !Buffer.isBuffer(psbt.data.inputs[index].tapInternalKey)) {
+      } else if (isTaprootKeySpend && !Buffer.isBuffer(input.tapInternalKey)) {
         // tapInternalKey is metadata for signing and not part of the hash to sign.
         // so modifying it here is fine.
         psbt.updateInput(index, { tapInternalKey: toXOnly(publicKey) })
@@ -73,7 +76,9 @@ export function createSignWithWallet({
         : toAsyncSigner({ keyPair: key, isTaprootKeySpend, network })
 
       // desktop / BE / mobile with bip-schnorr signing
-      await psbt.signInputAsync(index, asyncSigner, allowedSigHashTypes)
+      signingPromises.push(psbt.signInputAsync(index, asyncSigner, allowedSigHashTypes))
     }
+
+    await Promise.all(signingPromises)
   }
 }