highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 15:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop the unnecessary UTXO based on the UTXOs present, not on earlier wallet things

Browse Source 
Instead of dropping the unnecessary UTXO based on whether the wallet did something,
do it based on whether two UTXOs are there.
This commit is contained in:
Andrew Chow
2018-09-11 00:09:57 -04:00
parent 465a583f9d
commit fcdea8ad2a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/rpcwallet.cpp
View File

@@ -4525,8 +4525,8 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C
complete &= SignPSBTInput(PublicOnlySigningProvider(pwallet), *psbtx.tx, input, sigdata, i, sighash_type); complete &= SignPSBTInput(PublicOnlySigningProvider(pwallet), *psbtx.tx, input, sigdata, i, sighash_type);
} }
if (it != pwallet->mapWallet.end()) { // If both UTXO types are present, drop the unnecessary one.
// Drop the unnecessary UTXO if we added both from the wallet. if (input.non_witness_utxo && !input.witness_utxo.IsNull()) {
if (sigdata.witness) { if (sigdata.witness) {
input.non_witness_utxo = nullptr; input.non_witness_utxo = nullptr;
} else { } else {