From 990e08f090a3ba33beb9389420e17bf17f322f17 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 16 Jan 2017 10:00:06 +0000 Subject: [PATCH] Fix PR#1506, off by one in chain height --- src/blockchain_db/blockchain_db.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp index a88af2fc..bd1a38ec 100644 --- a/src/blockchain_db/blockchain_db.cpp +++ b/src/blockchain_db/blockchain_db.cpp @@ -128,6 +128,8 @@ uint64_t BlockchainDB::add_block( const block& blk TIME_MEASURE_FINISH(time1); time_blk_hash += time1; + uint64_t prev_height = height(); + // call out to subclass implementation to add the block & metadata time1 = epee::misc_utils::get_tick_count(); 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_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); block_txn_stop();