Merge pull request #7211 from BitGo/BTC-000.fix-logic

lcovar · web-flow · commit d2102da80107 · 2025-10-10T13:56:23.000-05:00
fix(utxo-lib): respect skipNonWitnessUtxo flag in PSBT
diff --git a/modules/utxo-lib/src/bitgo/wallet/Unspent.ts b/modules/utxo-lib/src/bitgo/wallet/Unspent.ts
@@ -256,7 +256,7 @@ export function updateWalletUnspentForPsbt(
   if ((isZcashOrSegwit || customParams?.skipNonWitnessUtxo) && !input.witnessUtxo) {
     const { script, value } = toPrevOutput(u, psbt.network);
     psbt.updateInput(inputIndex, { witnessUtxo: { script, value } });
-  } else if (!isZcashOrSegwit) {
+  } else if (!isZcashOrSegwit && !customParams?.skipNonWitnessUtxo) {
     if (!isUnspentWithPrevTx(u)) {
       throw new Error('Error, require previous tx to add to PSBT');
     }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ export function updateWalletUnspentForPsbt(`
`256`	`256`	`if ((isZcashOrSegwit \|\| customParams?.skipNonWitnessUtxo) && !input.witnessUtxo) {`
`257`	`257`	`const { script, value } = toPrevOutput(u, psbt.network);`
`258`	`258`	`psbt.updateInput(inputIndex, { witnessUtxo: { script, value } });`
`259`		`- } else if (!isZcashOrSegwit) {`
	`259`	`+ } else if (!isZcashOrSegwit && !customParams?.skipNonWitnessUtxo) {`
`260`	`260`	`if (!isUnspentWithPrevTx(u)) {`
`261`	`261`	`throw new Error('Error, require previous tx to add to PSBT');`
`262`	`262`	`}`