@exodus/bitcoin-api 2.7.3 → 2.7.5

package/package.json

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

package/src/tx-log/ordinals-indexer-utils.js

@@ -48,6 +48,6 @@ export const indexOrdinalUnconfirmedTx = memoizeLruCache(
     )
     return indexOutputs({ tx: copyTx, currency })
   },
-  ({ tx }) => tx.txid,
+  ({ tx }) => `${tx.txid}_${tx.confirmations}`,
   100
 )

package/src/tx-sign/common.js

@@ -1,16 +1,20 @@
-export function extractTransaction({ psbt, extract }) {
-  if (extract) {
+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 {
     // 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
-    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() } }
+    return { rawTx, txId, tx: serializeTx({ tx }) }
   }
 }
 

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

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

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

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