|
|
|
@ -1772,7 +1772,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched)
|
|
|
|
|
refresh(start_height, blocks_fetched, received_money);
|
|
|
|
|
}
|
|
|
|
|
//----------------------------------------------------------------------------------------------------
|
|
|
|
|
void wallet2::pull_and_parse_next_blocks(uint64_t start_height, uint64_t &blocks_start_height, std::list<crypto::hash> &short_chain_history, const std::vector<cryptonote::block_complete_entry> &prev_blocks, std::vector<cryptonote::block_complete_entry> &blocks, std::vector<parsed_block> &parsed_blocks, bool &error)
|
|
|
|
|
void wallet2::pull_and_parse_next_blocks(uint64_t start_height, uint64_t &blocks_start_height, std::list<crypto::hash> &short_chain_history, const std::vector<cryptonote::block_complete_entry> &prev_blocks, const std::vector<parsed_block> &prev_parsed_blocks, std::vector<cryptonote::block_complete_entry> &blocks, std::vector<parsed_block> &parsed_blocks, bool &error)
|
|
|
|
|
{
|
|
|
|
|
error = false;
|
|
|
|
|
|
|
|
|
@ -1781,13 +1781,10 @@ void wallet2::pull_and_parse_next_blocks(uint64_t start_height, uint64_t &blocks
|
|
|
|
|
drop_from_short_history(short_chain_history, 3);
|
|
|
|
|
|
|
|
|
|
// prepend the last 3 blocks, should be enough to guard against a block or two's reorg
|
|
|
|
|
cryptonote::block bl;
|
|
|
|
|
std::vector<cryptonote::block_complete_entry>::const_reverse_iterator i = prev_blocks.rbegin();
|
|
|
|
|
std::vector<parsed_block>::const_reverse_iterator i = prev_parsed_blocks.rbegin();
|
|
|
|
|
for (size_t n = 0; n < std::min((size_t)3, prev_blocks.size()); ++n)
|
|
|
|
|
{
|
|
|
|
|
bool ok = cryptonote::parse_and_validate_block_from_blob(i->block, bl);
|
|
|
|
|
THROW_WALLET_EXCEPTION_IF(!ok, error::block_parse_error, i->block);
|
|
|
|
|
short_chain_history.push_front(cryptonote::get_block_hash(bl));
|
|
|
|
|
short_chain_history.push_front(i->hash);
|
|
|
|
|
++i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -2244,7 +2241,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
|
|
|
|
|
refreshed = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
tpool.submit(&waiter, [&]{pull_and_parse_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, next_blocks, next_parsed_blocks, error);});
|
|
|
|
|
tpool.submit(&waiter, [&]{pull_and_parse_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, parsed_blocks, next_blocks, next_parsed_blocks, error);});
|
|
|
|
|
|
|
|
|
|
if (!first)
|
|
|
|
|
{
|
|
|
|
|