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

[wallet] use P2WPKH change output if any destination is P2WPKH or P2WSH

Browse Source 
Only if -changetype is not set and -addresstype is not "legacy".
This commit is contained in:
Sjors Provoost
2018-01-23 17:56:15 +01:00
parent 44080a90a2
commit 596c44633f
6 changed files with 154 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/paymentserver.cpp
View File

@@ -643,8 +643,9 @@ void PaymentServer::fetchPaymentACK(CWallet* wallet, const SendCoinsRecipient& r
// use for change. Despite an actual payment and not change, this is a close match:
// it's the output type we use subject to privacy issues, but not restricted by what
// other software supports.
wallet->LearnRelatedScripts(newKey, g_change_type);
CTxDestination dest = GetDestinationForKey(newKey, g_change_type);
const OutputType change_type = g_change_type != OUTPUT_TYPE_NONE ? g_change_type : g_address_type;
wallet->LearnRelatedScripts(newKey, change_type);
CTxDestination dest = GetDestinationForKey(newKey, change_type);
wallet->SetAddressBook(dest, strAccount, "refund");
CScript s = GetScriptForDestination(dest);