diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-09-22 14:49:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-09-22 14:49:25 +0200 |
| commit | 0193bfce4bcee87f202ac1154f017d57bb5aa08d (patch) | |
| tree | 8f6b2d879f7e8b5c224a4592373bd37afc2a9957 /src/cryptonote_core/cryptonote_basic.h | |
| parent | cf88e4dd24edab449765e78b34ec530f08373b68 (diff) | |
| parent | 5b11a89a76cf44c0fb98d98b05eb1c9e4ddce0c4 (diff) | |
| download | monzero-core-0193bfce4bcee87f202ac1154f017d57bb5aa08d.tar.gz monzero-core-0193bfce4bcee87f202ac1154f017d57bb5aa08d.tar.xz monzero-core-0193bfce4bcee87f202ac1154f017d57bb5aa08d.zip | |
Merge pull request #405
5b11a89 hardfork: most state now saved to the DB (moneromooo-monero)
0a54c3a hardfork: remove the "parts are copyright cryptonote" notices (moneromooo-monero)
e546f37 Add an RPC call and daemon command to get info on hard fork voting (moneromooo-monero)
d067131 blockchain: force a hardfork recalculation at load time (moneromooo-monero)
a717761 core: add consts where appropriate (moneromooo-monero)
8ffc508 core: moan when we think an update is needed to get latest hard fork info (moneromooo-monero)
f854984 blockchain: use the new hardfork class (moneromooo-monero)
62b1f74 New hardfork class (moneromooo-monero)
bed9a44 blockchain: add a couple missing includes (moneromooo-monero)
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) |