Merge pull request #4490

bccd88dd wallet2: clear found out for every tx key (doy-lee)
This commit is contained in:
Riccardo Spagni 2018-10-02 22:41:24 +02:00
commit 932a17018a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -1344,7 +1344,6 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
// (that is, the prunable stuff may or may not be included) // (that is, the prunable stuff may or may not be included)
if (!miner_tx && !pool) if (!miner_tx && !pool)
process_unconfirmed(txid, tx, height); process_unconfirmed(txid, tx, height);
std::vector<size_t> outs;
std::unordered_map<cryptonote::subaddress_index, uint64_t> tx_money_got_in_outs; // per receiving subaddress index std::unordered_map<cryptonote::subaddress_index, uint64_t> tx_money_got_in_outs; // per receiving subaddress index
crypto::public_key tx_pub_key = null_pkey; crypto::public_key tx_pub_key = null_pkey;
bool notify = false; bool notify = false;
@ -1367,6 +1366,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
uint64_t total_received_1 = 0; uint64_t total_received_1 = 0;
while (!tx.vout.empty()) while (!tx.vout.empty())
{ {
std::vector<size_t> outs;
// if tx.vout is not empty, we loop through all tx pubkeys // if tx.vout is not empty, we loop through all tx pubkeys
tx_extra_pub_key pub_key_field; tx_extra_pub_key pub_key_field;