Merge pull request #4260 from BitGo/BTC-855-fix-unsafe-nonwitness-psb…

…t-update fix(utxo-lib): correct logic for unsafe segwit unspent update
BitGo · Feb 6, 2024 · 62bd8c8 · 62bd8c8
2 parents a599366 + a4839b9
commit 62bd8c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/utxo-lib/src/bitgo/wallet/Unspent.ts b/modules/utxo-lib/src/bitgo/wallet/Unspent.ts
@@ -255,7 +255,7 @@ export function updateWalletUnspentForPsbt(
   // with the previous transaction. Therefore, we can treat Zcash non-segwit transactions as Bitcoin
   // segwit transactions
   const isZcashOrSegwit = isSegwit(u.chain) || getMainnet(psbt.network) === networks.zcash;
-  if ((isZcashOrSegwit && !input.witnessUtxo) || customParams?.skipNonWitnessUtxo) {
+  if ((isZcashOrSegwit || customParams?.skipNonWitnessUtxo) && !input.witnessUtxo) {
     const { script, value } = toPrevOutput(u, psbt.network);
     psbt.updateInput(inputIndex, { witnessUtxo: { script, value } });
   } else if (!isZcashOrSegwit) {