Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-12 10:50:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

hardfork: rescan speedup

Browse source 
Add a block height before which version 1 is assumed
Use DB transactions
This commit is contained in:
moneromooo-monero 2015-09-26 16:22:57 +01:00
parent fec98b8952
commit 0a7421b607
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
4 changed files with 49 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/cryptonote_core/hardfork.cpp
View file

@ -35,9 +35,10 @@
using namespace cryptonote;
HardFork::HardFork(cryptonote::BlockchainDB &db, uint8_t original_version, time_t forked_time, time_t update_time, uint64_t window_size, int threshold_percent):
HardFork::HardFork(cryptonote::BlockchainDB &db, uint8_t original_version, uint64_t original_version_till_height, time_t forked_time, time_t update_time, uint64_t window_size, int threshold_percent):
db(db),
original_version(original_version),
original_version_till_height(original_version_till_height),
forked_time(forked_time),
update_time(update_time),
window_size(window_size),
@ -68,9 +69,8 @@ bool HardFork::add(uint8_t version, uint64_t height, time_t time)
return true;
}
uint8_t HardFork::get_effective_version(const cryptonote::block &block) const
uint8_t HardFork::get_effective_version(uint8_t version) const
{
uint8_t version = block.major_version;
if (!heights.empty()) {
uint8_t max_version = heights.back().version;
if (version > max_version)
@ -79,27 +79,27 @@ uint8_t HardFork::get_effective_version(const cryptonote::block &block) const
return version;
}
bool HardFork::do_check(const cryptonote::block &block) const
bool HardFork::do_check(uint8_t version) const
{
return block.major_version >= heights[current_fork_index].version;
return version >= heights[current_fork_index].version;
}
bool HardFork::check(const cryptonote::block &block) const
{
CRITICAL_REGION_LOCAL(lock);
return do_check(block);
return do_check(block.major_version);
}
bool HardFork::add(const cryptonote::block &block, uint64_t height)
bool HardFork::add(uint8_t block_version, uint64_t height)
{
CRITICAL_REGION_LOCAL(lock);
if (!do_check(block))
if (!do_check(block_version))
return false;
db.set_hard_fork_version(height, heights[current_fork_index].version);
const uint8_t version = get_effective_version(block);
const uint8_t version = get_effective_version(block_version);
while (versions.size() >= window_size) {
const uint8_t old_version = versions.front();
@ -123,6 +123,11 @@ bool HardFork::add(const cryptonote::block &block, uint64_t height)
return true;
}
bool HardFork::add(const cryptonote::block &block, uint64_t height)
{
return add(block.major_version, height);
}
void HardFork::init()
{
CRITICAL_REGION_LOCAL(lock);
@ -154,12 +159,24 @@ void HardFork::init()
LOG_PRINT_L1("reorganization done");
}
uint8_t HardFork::get_block_version(uint64_t height) const
{
if (height <= original_version_till_height)
return original_version;
const cryptonote::block &block = db.get_block_from_height(height);
return block.major_version;
}
bool HardFork::reorganize_from_block_height(uint64_t height)
{
CRITICAL_REGION_LOCAL(lock);
if (height >= db.height())
return false;
//db.set_batch_transactions(true);
//db.batch_start();
versions.clear();
for (size_t n = 0; n < 256; ++n)
@ -172,7 +189,7 @@ bool HardFork::reorganize_from_block_height(uint64_t height)
}
for (uint64_t h = rescan_height; h <= height; ++h) {
cryptonote::block b = db.get_block_from_height(h);
const uint8_t v = get_effective_version(b);
const uint8_t v = get_effective_version(b.major_version);
last_versions[v]++;
versions.push_back(v);
}
@ -188,9 +205,11 @@ bool HardFork::reorganize_from_block_height(uint64_t height)
const uint64_t bc_height = db.height();
for (uint64_t h = height + 1; h < bc_height; ++h) {
add(db.get_block_from_height(h), h);
add(get_block_version(h), h);
}
//db.batch_stop();
return true;
}