diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 3895d32..31cb032 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -6,8 +6,7 @@ #define CURRENT_BLOCK_MINOR_VERSION 0 #define BLOCK_MAJOR_VERSION_1 1 -#define BLOCK_MAJOR_VERSION_2 2 -#define BLOCK_MAJOR_VERSION_3 3 +#define BLOCK_MAJOR_VERSION_2 3 #define COIN ((uint64_t)100000000) // pow(10, 8) #define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6) diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index 814e32e..20d333d 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -470,15 +470,6 @@ namespace cryptonote // Implemented below inline serializable_bytecoin_block make_serializable_bytecoin_block(const block& b, bool hashing_serialization, bool header_only); -struct RootBlock { - uint8_t majorVersion; - uint8_t minorVersion; - crypto::hash previousBlockHash; - uint16_t transactionCount; - std::vector baseTransactionBranch; - transaction baseTransaction; - std::vector blockchainBranch; -}; struct block_header { @@ -487,6 +478,7 @@ struct RootBlock { uint64_t timestamp; crypto::hash prev_id; uint32_t nonce; + BEGIN_SERIALIZE() VARINT_FIELD(major_version) VARINT_FIELD(minor_version) @@ -499,7 +491,7 @@ struct RootBlock { struct block: public block_header { bytecoin_block parent_block; - RootBlock rootBlock; + transaction miner_tx; std::vector tx_hashes;