diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-09-12 11:14:00 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-09-12 11:15:53 +0100 |
| commit | f85498422d9aec79411c739835ab4a5ed27b1688 (patch) | |
| tree | 72c398cf2bd85b0f0adac83fa0644a588b7c0479 /src/cryptonote_core/cryptonote_basic.h | |
| parent | New hardfork class (diff) | |
| download | monero-f85498422d9aec79411c739835ab4a5ed27b1688.tar.xz | |
blockchain: use the new hardfork class
Diffstat (limited to 'src/cryptonote_core/cryptonote_basic.h')
| -rw-r--r-- | src/cryptonote_core/cryptonote_basic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index 07745bf0d..d3db50068 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -182,7 +182,6 @@ namespace cryptonote FIELD(extra) END_SERIALIZE() - protected: transaction_prefix(){} }; @@ -278,7 +277,7 @@ namespace cryptonote /************************************************************************/ struct block_header { - uint8_t major_version; + uint8_t major_version; // now used as a voting mechanism, rather than how this particular block is built uint8_t minor_version; uint64_t timestamp; crypto::hash prev_id; @@ -286,7 +285,6 @@ namespace cryptonote BEGIN_SERIALIZE() VARINT_FIELD(major_version) - if(major_version > CURRENT_BLOCK_MAJOR_VERSION) return false; VARINT_FIELD(minor_version) VARINT_FIELD(timestamp) FIELD(prev_id) |