|
|
|
@ -4313,9 +4313,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;
|
|
|
|
|
}
|
|
|
|
@ -4327,7 +4324,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()
|
|
|
|
|