diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:53:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:53:52 +0200 |
| commit | 33e7d4b35c0e6159934e6cde62bd5c86973791e5 (patch) | |
| tree | 687f1d48cd6e6dcba3b6c3445b5ddabecdf89a6f /src/cryptonote_core/blockchain.cpp | |
| parent | 14dd279fe123d7b48baed82d9109c585839b678f (diff) | |
| parent | 63766275301f1c562205e22d5f14b220f321ad58 (diff) | |
| download | monzero-core-33e7d4b35c0e6159934e6cde62bd5c86973791e5.tar.gz monzero-core-33e7d4b35c0e6159934e6cde62bd5c86973791e5.tar.xz monzero-core-33e7d4b35c0e6159934e6cde62bd5c86973791e5.zip | |
Merge pull request #438
6376627 hardfork: switch voting to block minor version (moneromooo-monero)
55178ae unit_tests: remove leftover debug traces in hardfork test (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index c38b58841..306530f02 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1033,8 +1033,8 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m CRITICAL_REGION_BEGIN(m_blockchain_lock); height = m_db->height(); - b.major_version = m_hardfork->get_ideal_version(); - b.minor_version = 0; + b.major_version = m_hardfork->get_current_version(); + b.minor_version = m_hardfork->get_ideal_version(); b.prev_id = get_tail_id(); b.timestamp = time(NULL); |