@exodus/bitcoin-api 2.7.1 → 2.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "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": "9c993eed3a3bcfc1c49d86377fdc5c7cb731d632"
+  "gitHead": "4a7004951e0b166368bf8366ccdeeac4cbcff0e3"
 }

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

@@ -267,6 +267,7 @@ export class BitcoinMonitorScanner {
         const receiveAddress = await this.#assetClientInterface.getReceiveAddressObject({
           assetName,
           walletAccount,
+          useCache: true,
         })
         if (!addresses.includes(receiveAddress.toString())) {
           addresses.push(receiveAddress.toString())

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

@@ -86,6 +86,7 @@ export class Monitor extends BaseMonitor {
               multiAddressMode: true,
               assetName: this.asset.name,
               walletAccount,
+              useCache: true,
             }),
           ])
         )

package/src/tx-sign/common.js

@@ -1,20 +1,16 @@
-export function extractTransaction({ psbt, skipFinalize }) {
-  // If a dapp authored the TX, it expects a serialized PSBT response.
-  // Note: we wouldn't be able to finalise inputs in some cases that's why we serialize before finalizing inputs.
-
-  if (skipFinalize) {
-    const rawPSBT = psbt.toBuffer()
-
-    return { plainTx: { rawPSBT } }
-  } else {
+export function extractTransaction({ psbt, extract }) {
+  if (extract) {
     // Serialize tx
-    psbt.finalizeAllInputs()
-    const tx = psbt.extractTransaction()
-    const rawTx = tx.toBuffer()
-    const txId = tx.getId()
-
     // tx needs to be serializable for desktop RPC send => sign communication
-    return { rawTx, txId, tx: serializeTx({ tx }) }
+    const extractedTx = psbt.extractTransaction()
+    return {
+      rawTx: extractedTx.toBuffer(),
+      txId: extractedTx.getId(),
+      tx: serializeTx({ tx: extractedTx }),
+    }
+  } else {
+    // Web3 transactions can't be expected to be extractable.
+    return { plainTx: { rawPSBT: psbt.toBuffer() } }
   }
 }
 

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

@@ -47,10 +47,13 @@ export function createSignWithWallet({
         // BIP143: As a default policy, only compressed public keys are accepted in P2WPKH and P2WSH
         const p2wpkh = payments.p2wpkh({ pubkey: publicKey })
         const p2sh = payments.p2sh({ redeem: p2wpkh })
-        if (address === p2sh.address && !Buffer.isBuffer(psbt.data.inputs[index].redeemScript)) {
-          psbt.updateInput(index, {
-            redeemScript: p2sh.redeem.output,
-          })
+        if (address === p2sh.address) {
+          // Set the redeem script in the psbt in case it's missing.
+          if (!Buffer.isBuffer(psbt.data.inputs[index].redeemScript)) {
+            psbt.updateInput(index, {
+              redeemScript: p2sh.redeem.output,
+            })
+          }
         } else {
           throw new Error('Expected P2SH script to be a nested segwit input')
         }
@@ -65,6 +68,7 @@ export function createSignWithWallet({
       // desktop / BE / mobile with bip-schnorr signing
       const signingKey = isTaprootAddress ? tweakSigner({ signer: key, ECPair, network }) : key
       await psbt.signInputAsync(index, toAsyncSigner({ keyPair: signingKey }), sigHashTypes)
+      psbt.finalizeInput(index)
     }
   }
 }

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

@@ -37,7 +37,6 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
 
     await signWithWallet(psbt, inputsToSign)
 
-    const skipFinalize = !!unsignedTx.txData.psbtBuffer
-    return extractTransaction({ psbt, skipFinalize })
+    return extractTransaction({ psbt, extract: !unsignedTx.txData.psbtBuffer })
   }
 }

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

@@ -39,8 +39,7 @@ export const signHardwareFactory = ({ assetName, resolvePurpose, keys, coinInfo
       accountIndex,
     })
 
-    const skipFinalize = !!unsignedTx.txData.psbtBuffer
-    return extractTransaction({ psbt, skipFinalize })
+    return extractTransaction({ psbt, extract: !unsignedTx.txData.psbtBuffer })
   }
 }
 
@@ -88,6 +87,8 @@ export function applySignatures(psbt, signatures, inputsToSign) {
             ],
           })
         }
+
+        psbt.finalizeInput(inputIndex)
       } else {
         throw new Error(
           `expected to sign for inputIndex ${inputIndex} but no signature was produced`