Merge pull request #1559

db56a03f Wallet2 + API: Callbacks for unconfirmed transfers (Jaquee)
This commit is contained in:
Riccardo Spagni
2017-01-13 14:37:12 -05:00
10 changed files with 83 additions and 6 deletions

View File

@@ -1004,8 +1004,11 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, const s
payment.m_block_height = height;
payment.m_unlock_time = tx.unlock_time;
payment.m_timestamp = ts;
if (pool)
if (pool) {
m_unconfirmed_payments.emplace(payment_id, payment);
if (0 != m_callback)
m_callback->on_unconfirmed_money_received(height, tx, payment.m_amount);
}
else
m_payments.emplace(payment_id, payment);
LOG_PRINT_L2("Payment found in " << (pool ? "pool" : "block") << ": " << payment_id << " / " << payment.m_tx_hash << " / " << payment.m_amount);