kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hardfork: fix actual/voting confusion

Browse source
This commit is contained in:
moneromooo-monero 2015-11-23 14:04:33 +00:00
parent 263cc48c48
commit edade8dc81
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cryptonote_core/hardfork.cpp
View file

@ -46,6 +46,11 @@ static uint8_t get_block_vote(const cryptonote::block &b)
return b.minor_version; return b.minor_version;
} }
static uint8_t get_block_version(const cryptonote::block &b)
{
return b.major_version;
}
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, uint8_t default_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, uint8_t default_threshold_percent):
db(db), db(db),
original_version(original_version), original_version(original_version),
@ -105,7 +110,7 @@ bool HardFork::do_check(uint8_t version) const
bool HardFork::check(const cryptonote::block &block) const bool HardFork::check(const cryptonote::block &block) const
{ {
CRITICAL_REGION_LOCAL(lock); CRITICAL_REGION_LOCAL(lock);
return do_check(get_block_vote(block)); return do_check(::get_block_version(block));
} }
bool HardFork::add(uint8_t block_version, uint64_t height) bool HardFork::add(uint8_t block_version, uint64_t height)
@ -143,7 +148,7 @@ bool HardFork::add(uint8_t block_version, uint64_t height)
bool HardFork::add(const cryptonote::block &block, uint64_t height) bool HardFork::add(const cryptonote::block &block, uint64_t height)
{ {
return add(get_block_vote(block), height); return add(::get_block_version(block), height);
} }
void HardFork::init() void HardFork::init()
@ -185,7 +190,7 @@ uint8_t HardFork::get_block_version(uint64_t height) const
return original_version; return original_version;
const cryptonote::block &block = db.get_block_from_height(height); const cryptonote::block &block = db.get_block_from_height(height);
return get_block_vote(block); return ::get_block_version(block);
} }
bool HardFork::reorganize_from_block_height(uint64_t height) bool HardFork::reorganize_from_block_height(uint64_t height)