Convert non-witness UTXOs to witness if witness sig created

If a witness signature was created when a non-witness UTXO is used,
convert the non-witness UTXO to a witness one.
This commit is contained in:
Andrew Chow 2018-09-11 00:11:00 -04:00
parent fcdea8ad2a
commit fcefc6851a

View file

@ -4525,6 +4525,13 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C
complete &= SignPSBTInput(PublicOnlySigningProvider(pwallet), *psbtx.tx, input, sigdata, i, sighash_type);
}
if (sigdata.witness) {
// Convert the non-witness utxo to witness
if (input.witness_utxo.IsNull() && input.non_witness_utxo) {
input.witness_utxo = input.non_witness_utxo->vout[txin.prevout.n];
}
}
// If both UTXO types are present, drop the unnecessary one.
if (input.non_witness_utxo && !input.witness_utxo.IsNull()) {
if (sigdata.witness) {