Cypher_Stack/wownero
2
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-12-23 12:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1197

Browse Source 
fd181b0 Clamp refresh from height to blockchain height. (Dion Ahmetaj)
This commit is contained in:
Riccardo Spagni 2016-11-24 12:51:17 +02:00
commit d094c45822
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 70 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -103,4 +103,4 @@ local.properties
.texlipse .texlipse
.idea/ .idea/
/testnet

30
src/wallet/wallet2.cpp
View File

@ -1574,12 +1574,35 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
std::list<cryptonote::block_complete_entry> blocks; std::list<cryptonote::block_complete_entry> blocks;
std::vector<COMMAND_RPC_GET_BLOCKS_FAST::block_output_indices> o_indices; std::vector<COMMAND_RPC_GET_BLOCKS_FAST::block_output_indices> o_indices;
std::string daemon_height_err = "";
uint64_t daemon_bc_height = get_daemon_blockchain_height(daemon_height_err);
if(daemon_height_err.size() > 0) {
throw std::runtime_error(daemon_height_err);
}
// pull the first set of blocks // pull the first set of blocks
get_short_chain_history(short_chain_history); get_short_chain_history(short_chain_history);
m_run.store(true, std::memory_order_relaxed); m_run.store(true, std::memory_order_relaxed);
if (start_height > m_blockchain.size() || m_refresh_from_block_height > m_blockchain.size()) { if (start_height > m_blockchain.size() || m_refresh_from_block_height > m_blockchain.size()) {
if (!start_height)
start_height = m_refresh_from_block_height; // even target_height can be zero if the daemon just started and hasn't gotten some sync
// data back from peers .. hmmm, what to do ... O.o (you can see him thinking)
// i'm going with infiniti loop until i get something bigger than zero or err ... moneromoo don't kill me
std::string daemon_target_err = "";
uint64_t daemon_target_height = 0;
while(daemon_target_height == 0)
{
daemon_target_height = get_daemon_blockchain_target_height(daemon_target_err);
if(daemon_target_err.size() > 0) {
daemon_target_height = get_approximate_blockchain_height(); // - x?
}
}
if (m_refresh_from_block_height > daemon_target_height) m_refresh_from_block_height = daemon_target_height - 1;
if (!start_height) start_height = m_refresh_from_block_height;
if (start_height >= daemon_bc_height) start_height = daemon_bc_height - 1;
// we can shortcut by only pulling hashes up to the start_height // we can shortcut by only pulling hashes up to the start_height
fast_refresh(start_height, blocks_start_height, short_chain_history); fast_refresh(start_height, blocks_start_height, short_chain_history);
// regenerate the history now that we've got a full set of hashes // regenerate the history now that we've got a full set of hashes
@ -1589,6 +1612,8 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
// and then fall through to regular refresh processing // and then fall through to regular refresh processing
} }
if(!(m_refresh_from_block_height >= daemon_bc_height))
{
pull_blocks(start_height, blocks_start_height, short_chain_history, blocks, o_indices); pull_blocks(start_height, blocks_start_height, short_chain_history, blocks, o_indices);
// always reset start_height to 0 to force short_chain_ history to be used on // always reset start_height to 0 to force short_chain_ history to be used on
// subsequent pulls in this refresh. // subsequent pulls in this refresh.
@ -1639,6 +1664,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
} }
} }
} }
}
if(last_tx_hash_id != (m_transfers.size() ? m_transfers.back().m_txid : null_hash)) if(last_tx_hash_id != (m_transfers.size() ? m_transfers.back().m_txid : null_hash))
received_money = true; received_money = true;