diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-01-13 14:37:12 -0500 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-01-13 14:37:12 -0500 |
commit | 2a2f02e375d0db176b998af779e447ffe871b774 (patch) | |
tree | 9232a5dc4fed0bcdf31fbde230aab986e3f2eea5 /src/wallet/wallet2.cpp | |
parent | Merge pull request #1558 (diff) | |
parent | Wallet2 + API: Callbacks for unconfirmed transfers (diff) | |
download | monero-2a2f02e375d0db176b998af779e447ffe871b774.tar.xz |
Merge pull request #1559
db56a03f Wallet2 + API: Callbacks for unconfirmed transfers (Jaquee)
Diffstat (limited to '')
-rw-r--r-- | src/wallet/wallet2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index b57ea9273..29cf47ddd 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -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); |