Merge pull request #6629

795e186 blockchain: fix total_height in getblocks.bin response (moneromooo-monero)
This commit is contained in:
luigi1111 2020-07-08 17:23:28 -05:00
commit 18bb011afe
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -2560,6 +2560,7 @@ bool Blockchain::find_blockchain_supplement(const uint64_t req_start_block, cons
} }
db_rtxn_guard rtxn_guard(m_db); db_rtxn_guard rtxn_guard(m_db);
total_height = get_current_blockchain_height();
blocks.reserve(std::min(std::min(max_count, (size_t)10000), (size_t)(total_height - start_height))); blocks.reserve(std::min(std::min(max_count, (size_t)10000), (size_t)(total_height - start_height)));
CHECK_AND_ASSERT_MES(m_db->get_blocks_from(start_height, 3, max_count, FIND_BLOCKCHAIN_SUPPLEMENT_MAX_SIZE, blocks, pruned, true, get_miner_tx_hash), CHECK_AND_ASSERT_MES(m_db->get_blocks_from(start_height, 3, max_count, FIND_BLOCKCHAIN_SUPPLEMENT_MAX_SIZE, blocks, pruned, true, get_miner_tx_hash),
false, "Error getting blocks"); false, "Error getting blocks");