highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-13 22:24:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Change output type globals to members

Browse Source
This commit is contained in:
MarcoFalke
2018-02-10 21:06:35 -05:00
parent 7be9a9a570
commit fab8a6f609
16 changed files with 84 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/paymentserver.cpp
View File

@@ -643,7 +643,7 @@ 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.
const OutputType change_type = g_change_type != OUTPUT_TYPE_NONE ? g_change_type : g_address_type;
const OutputType change_type = wallet->m_default_change_type != OutputType::NONE ? wallet->m_default_change_type : wallet->m_default_address_type;
wallet->LearnRelatedScripts(newKey, change_type);
CTxDestination dest = GetDestinationForKey(newKey, change_type);
wallet->SetAddressBook(dest, strAccount, "refund");