diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-04-01 17:19:10 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-04-01 17:19:10 +0200 |
commit | e55b3f9dda39a5fe6a7fff86a50125cec15596a0 (patch) | |
tree | aaf0dcfd82ea9fda8b428a788d6b732c4ee43d90 /src/blockchain_utilities/bootstrap_serialization.h | |
parent | Merge pull request #5359 (diff) | |
parent | Make difficulty 128 bit instead of 64 bit (diff) | |
download | monero-e55b3f9dda39a5fe6a7fff86a50125cec15596a0.tar.xz |
Merge pull request #5239
91f4c7f4 Make difficulty 128 bit instead of 64 bit (moneromooo-monero)
Diffstat (limited to 'src/blockchain_utilities/bootstrap_serialization.h')
-rw-r--r-- | src/blockchain_utilities/bootstrap_serialization.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/blockchain_utilities/bootstrap_serialization.h b/src/blockchain_utilities/bootstrap_serialization.h index 554c6d56e..70b3eea7e 100644 --- a/src/blockchain_utilities/bootstrap_serialization.h +++ b/src/blockchain_utilities/bootstrap_serialization.h @@ -29,7 +29,7 @@ #pragma once #include "cryptonote_basic/cryptonote_boost_serialization.h" -#include "cryptonote_basic/difficulty.h" +#include "serialization/difficulty_type.h" namespace cryptonote @@ -66,6 +66,23 @@ namespace cryptonote END_SERIALIZE() }; + struct block_package_1 + { + cryptonote::block block; + std::vector<transaction> txs; + size_t block_weight; + uint64_t cumulative_difficulty; + uint64_t coins_generated; + + BEGIN_SERIALIZE() + FIELD(block) + FIELD(txs) + VARINT_FIELD(block_weight) + VARINT_FIELD(cumulative_difficulty) + VARINT_FIELD(coins_generated) + END_SERIALIZE() + }; + struct block_package { cryptonote::block block; @@ -78,7 +95,7 @@ namespace cryptonote FIELD(block) FIELD(txs) VARINT_FIELD(block_weight) - VARINT_FIELD(cumulative_difficulty) + FIELD(cumulative_difficulty) VARINT_FIELD(coins_generated) END_SERIALIZE() }; |