diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-09 14:58:11 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-09 14:58:11 +0200 |
| commit | f43d59d8b368f79231f536a26a668a55e1bf7ead (patch) | |
| tree | cd7615acb005a5a299ef2a8d628695f15bdb49ce /src/cryptonote_protocol/cryptonote_protocol_defs.h | |
| parent | Merge pull request #2267 (diff) | |
| parent | protocol: add checks for top block hard fork version (diff) | |
| download | monero-f43d59d8b368f79231f536a26a668a55e1bf7ead.tar.xz | |
Merge pull request #2269
635929ea protocol: add checks for top block hard fork version (moneromooo-monero)
7482253a epee: fixup KV_SERIALIZE_OPT to work in more cases (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_protocol/cryptonote_protocol_defs.h')
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_defs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h index 042ae49f6..37b503436 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_defs.h +++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h @@ -195,10 +195,12 @@ namespace cryptonote { uint64_t current_height; crypto::hash top_id; + uint8_t top_version; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(current_height) KV_SERIALIZE_VAL_POD_AS_BLOB(top_id) + KV_SERIALIZE_OPT(top_version, (uint8_t)0) END_KV_SERIALIZE_MAP() }; |