Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5902 

b9da023 blockchain: keep block template timestamp not below recent median (moneromooo-monero)
This commit is contained in:
luigi1111 2019-09-30 18:52:11 -05:00
parent d9cb50870d b9da0234e9
commit 17f063a50f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_core/blockchain.cpp
View File

@ -1315,7 +1315,9 @@ bool Blockchain::create_block_template(block& b, const crypto::hash *from_block,
if (!memcmp(&miner_address, &m_btc_address, sizeof(cryptonote::account_public_address)) && m_btc_nonce == ex_nonce if (!memcmp(&miner_address, &m_btc_address, sizeof(cryptonote::account_public_address)) && m_btc_nonce == ex_nonce
&& m_btc_pool_cookie == m_tx_pool.cookie() && m_btc.prev_id == get_tail_id()) { && m_btc_pool_cookie == m_tx_pool.cookie() && m_btc.prev_id == get_tail_id()) {
MDEBUG("Using cached template"); MDEBUG("Using cached template");
m_btc.timestamp = time(NULL); // update timestamp unconditionally const uint64_t now = time(NULL);
if (m_btc.timestamp < now) // ensures it can't get below the median of the last few blocks
m_btc.timestamp = now;
b = m_btc; b = m_btc;
diffic = m_btc_difficulty; diffic = m_btc_difficulty;
height = m_btc_height; height = m_btc_height;