aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/cryptonote_core.cpp
diff options
context:
space:
mode:
authorfluffypony <ric@spagni.net>2014-06-06 00:23:56 +0200
committerfluffypony <ric@spagni.net>2014-06-06 00:23:56 +0200
commit92ac24dc43c2afd2e5996a7c0fa82823e2f6199c (patch)
treeaea570eb3b393cfac94f7145804962f42ce2fc4b /src/cryptonote_core/cryptonote_core.cpp
parente0685d412a931520766ce4e1678760c1fb06a1e2 (diff)
parent3162fcb70fa609eebfcb1cac004041fbca37a7cc (diff)
downloadmonzero-core-92ac24dc43c2afd2e5996a7c0fa82823e2f6199c.tar.gz
monzero-core-92ac24dc43c2afd2e5996a7c0fa82823e2f6199c.tar.xz
monzero-core-92ac24dc43c2afd2e5996a7c0fa82823e2f6199c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.cpp')
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp10
1 files changed, 9 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;
+ }
}