rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 16:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1584

Browse source 
990e08f0 Fix PR#1506, off by one in chain height (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-01-16 08:41:15 -05:00
commit deb6728bc3
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/blockchain_db/blockchain_db.cpp
View file

@ -128,6 +128,8 @@ uint64_t BlockchainDB::add_block( const block& blk
TIME_MEASURE_FINISH(time1); TIME_MEASURE_FINISH(time1);
time_blk_hash += time1; time_blk_hash += time1;
uint64_t prev_height = height();
// call out to subclass implementation to add the block & metadata // call out to subclass implementation to add the block & metadata
time1 = epee::misc_utils::get_tick_count(); time1 = epee::misc_utils::get_tick_count();
add_block(blk, block_size, cumulative_difficulty, coins_generated, blk_hash); add_block(blk, block_size, cumulative_difficulty, coins_generated, blk_hash);
@ -149,9 +151,6 @@ uint64_t BlockchainDB::add_block( const block& blk
TIME_MEASURE_FINISH(time1); TIME_MEASURE_FINISH(time1);
time_add_transaction += time1; time_add_transaction += time1;
// DB's new height based on this added block is only incremented after this
// function returns, so height() here returns the new previous height.
uint64_t prev_height = height();
m_hardfork->add(blk, prev_height); m_hardfork->add(blk, prev_height);
block_txn_stop(); block_txn_stop();