Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-07-31 23:08:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2303

Browse source 
5a283078 cryptonote_protocol: large block sync size before v4 (moneromooo-monero)
7b747607 cryptonote_protocol: kick idle synchronizing peers (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-17 21:39:44 +02:00
commit 4466b6d1b0
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
11 changed files with 61 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cryptonote_core/cryptonote_core.cpp
View file

@ -421,8 +421,6 @@ namespace cryptonote
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize blockchain storage");
block_sync_size = command_line::get_arg(vm, command_line::arg_block_sync_size);
if (block_sync_size == 0)
block_sync_size = BLOCKS_SYNCHRONIZING_DEFAULT_COUNT;
MGINFO("Loading checkpoints");
@ -788,6 +786,16 @@ namespace cryptonote
return true;
}
//-----------------------------------------------------------------------------------------------
size_t core::get_block_sync_size(uint64_t height) const
{
static const uint64_t quick_height = m_testnet ? 801219 : 1220516;
if (block_sync_size > 0)
return block_sync_size;
if (height >= quick_height)
return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT;
return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT_PRE_V4;
}
//-----------------------------------------------------------------------------------------------
std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const size_t count)
{
uint64_t emission_amount = 0;

2
src/cryptonote_core/cryptonote_core.h
View file

@ -698,7 +698,7 @@ namespace cryptonote
*
* @return the number of blocks to sync in one go
*/
size_t get_block_sync_size() const { return block_sync_size; }
size_t get_block_sync_size(uint64_t height) const;
/**
* @brief get the sum of coinbase tx amounts between blocks