diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-07-05 23:58:06 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-07-05 23:58:06 -0500 |
| commit | 969316685bcd2ed4038b2a964ac4fc1c7874fc5c (patch) | |
| tree | 9c6241db3a95efd057671d4b6653f0d07337c90d /src/simplewallet/simplewallet.cpp | |
| parent | b54d5ae383bf19484580c76ac8ed803676767f49 (diff) | |
| parent | 16f8e042b5af06bc5ef194eaabaf4df0f27fbe1c (diff) | |
| download | monzero-core-969316685bcd2ed4038b2a964ac4fc1c7874fc5c.tar.gz monzero-core-969316685bcd2ed4038b2a964ac4fc1c7874fc5c.tar.xz monzero-core-969316685bcd2ed4038b2a964ac4fc1c7874fc5c.zip | |
Merge pull request #8371
16f8e04 Remove erraneous commas (Luke Parker)
da0715e Improve consistency between on_money_received and on_money_received_unconfirmed (Luke Parker)
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index f6e313089..41a11b53c 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -5673,14 +5673,18 @@ void simple_wallet::on_new_block(uint64_t height, const cryptonote::block& block m_refresh_progress_reporter.update(height, false); } //---------------------------------------------------------------------------------------------------- -void simple_wallet::on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index, bool is_change, uint64_t unlock_time) +void simple_wallet::on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& tx, uint64_t amount, uint64_t burnt, const cryptonote::subaddress_index& subaddr_index, bool is_change, uint64_t unlock_time) { if (m_locked) return; + std::stringstream burn; + if (burnt != 0) { + burn << " (" << print_money(amount) << " yet " << print_money(burnt) << " was burnt)"; + } message_writer(console_color_green, false) << "\r" << tr("Height ") << height << ", " << tr("txid ") << txid << ", " << - print_money(amount) << ", " << + print_money(amount - burnt) << burn.str() << ", " << tr("idx ") << subaddr_index; const uint64_t warn_height = m_wallet->nettype() == TESTNET ? 1000000 : m_wallet->nettype() == STAGENET ? 50000 : 1650000; |