Merge pull request #1191

9f31e2d wallet: do not announce pool txes as money spent/received (yet) (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-10-09 14:29:16 +02:00
commit 0589209eb4

View file

@ -583,13 +583,16 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, const s
std::string(", expected ") + print_money(td.amount()));
}
amount = td.amount();
LOG_PRINT_L0("Spent money: " << print_money(amount) << ", with tx: " << txid());
tx_money_spent_in_ins += amount;
if (!pool)
{
LOG_PRINT_L0("Spent money: " << print_money(amount) << ", with tx: " << txid());
set_spent(it->second, height);
if (0 != m_callback)
m_callback->on_money_spent(height, tx, amount, tx);
}
}
}
if (tx_money_spent_in_ins > 0)
{