diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-02-24 09:57:55 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-02-24 09:57:55 -0500 |
| commit | 2dc918402cc1a4f6462b606c63307533cd2881a1 (patch) | |
| tree | dc2dbf736dd999e8d490ca70143d62b53f9ebf29 | |
| parent | Merge pull request #9005 (diff) | |
| parent | wallet2: call on_reorg callback in handle_reorg (diff) | |
| download | monero-2dc918402cc1a4f6462b606c63307533cd2881a1.tar.xz | |
Merge pull request #9006
47042ce wallet2: call on_reorg callback in handle_reorg (j-berman)
| -rw-r--r-- | src/wallet/wallet2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f45acb175..e9c48f9a8 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -4252,9 +4252,6 @@ wallet2::detached_blockchain_data wallet2::detach_blockchain(uint64_t height, st ++it; } - if (m_callback) - m_callback->on_reorg(height, blocks_detached, transfers_detached); - LOG_PRINT_L0("Detached blockchain on height " << height << ", transfers detached " << transfers_detached << ", blocks detached " << blocks_detached); return dbd; } @@ -4266,7 +4263,10 @@ void wallet2::handle_reorg(uint64_t height, std::map<std::pair<uint64_t, uint64_ // C THROW_WALLET_EXCEPTION_IF(height < m_blockchain.offset() && m_blockchain.size() > m_blockchain.offset(), error::wallet_internal_error, "Daemon claims reorg below last checkpoint"); - detach_blockchain(height, output_tracker_cache); + detached_blockchain_data dbd = detach_blockchain(height, output_tracker_cache); + + if (m_callback) + m_callback->on_reorg(height, dbd.detached_blockchain.size(), dbd.detached_tx_hashes.size()); } //---------------------------------------------------------------------------------------------------- bool wallet2::deinit() |