Merge pull request #24 from Neozaru/master

'getinfo' daemon HTTP-RPC returns 'target_height' for progress estimation

2 files changed, 14 insertions, 1 deletions

diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index b6bfa09c8..b2389fce2 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -28,7 +28,8 @@ namespace cryptonote
               m_blockchain_storage(m_mempool),
               m_miner(this),
               m_miner_address(boost::value_initialized<account_public_address>()), 
-              m_starter_message_showed(false)
+              m_starter_message_showed(false),
+              m_target_blockchain_height(0)
   {
     set_cryptonote_protocol(pprotocol);
   }
@@ -516,4 +517,11 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------
+  void core::set_target_blockchain_height(uint64_t target_blockchain_height) {
+    m_target_blockchain_height = target_blockchain_height;
+  }
+  //-----------------------------------------------------------------------------------------------
+  uint64_t core::get_target_blockchain_height() const {
+    return m_target_blockchain_height;
+  }
 }
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index cde52d5a2..7ef0f8b1d 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -90,6 +90,9 @@ namespace cryptonote
      void print_blockchain_outs(const std::string& file);
      void on_synchronized();
 
+     void set_target_blockchain_height(uint64_t target_blockchain_height);
+     uint64_t get_target_blockchain_height() const;
+
    private:
      bool add_new_tx(const transaction& tx, const crypto::hash& tx_hash, const crypto::hash& tx_prefix_hash, size_t blob_size, tx_verification_context& tvc, bool keeped_by_block);
      bool add_new_tx(const transaction& tx, tx_verification_context& tvc, bool keeped_by_block);
@@ -124,6 +127,8 @@ namespace cryptonote
      epee::math_helper::once_a_time_seconds<60*60*12, false> m_store_blockchain_interval;
      friend class tx_validate_inputs;
      std::atomic<bool> m_starter_message_showed;
+
+     uint64_t m_target_blockchain_height;
    };
 }