Merge pull request #1708

f2986ccf db_lmdb: fix bad height saved in tx data (moneromooo-monero)

src/blockchain_db/blockchain_db.cpp

@@ -130,12 +130,6 @@ uint64_t BlockchainDB::add_block( const block& blk
 
   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);
-  TIME_MEASURE_FINISH(time1);
-  time_add_block1 += time1;
-
   // call out to add the transactions
 
   time1 = epee::misc_utils::get_tick_count();
@@ -151,6 +145,12 @@ uint64_t BlockchainDB::add_block( const block& blk
   TIME_MEASURE_FINISH(time1);
   time_add_transaction += time1;
 
+  // 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);
+  TIME_MEASURE_FINISH(time1);
+  time_add_block1 += time1;
+
   m_hardfork->add(blk, prev_height);
 
   block_txn_stop();

src/blockchain_db/lmdb/db_lmdb.cpp

@@ -628,6 +628,7 @@ void BlockchainLMDB::add_block(const block& blk, const size_t& block_size, const
   CURSOR(blocks)
   CURSOR(block_info)
 
+  // this call to mdb_cursor_put will change height()
   MDB_val_copy<blobdata> blob(block_to_blob(blk));
   result = mdb_cursor_put(m_cur_blocks, &key, &blob, MDB_APPEND);
   if (result)