highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-12 21:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert non-witness UTXOs to witness if witness sig created

Browse Source 
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:13:19 -04:00
parent 2796c6e5ec
commit f8c1714634
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/sign.cpp
View File

@ -277,6 +277,11 @@ bool SignPSBTInput(const SigningProvider& provider, const CMutableTransaction& t
if (require_witness_sig && !sigdata.witness) return false;
input.FromSignatureData(sigdata);
if (sigdata.witness) {
assert(!utxo.IsNull());
input.witness_utxo = utxo;
}
// If both UTXO types are present, drop the unnecessary one.
if (input.non_witness_utxo && !input.witness_utxo.IsNull()) {
if (sigdata.witness) {