Digitalnote 4.0.0-beta update
parent
902571957d
commit
54d041c33a
|
@ -6,7 +6,8 @@
|
||||||
#define CURRENT_BLOCK_MINOR_VERSION 0
|
#define CURRENT_BLOCK_MINOR_VERSION 0
|
||||||
|
|
||||||
#define BLOCK_MAJOR_VERSION_1 1
|
#define BLOCK_MAJOR_VERSION_1 1
|
||||||
#define BLOCK_MAJOR_VERSION_2 3
|
#define BLOCK_MAJOR_VERSION_2 2
|
||||||
|
#define BLOCK_MAJOR_VERSION_3 3
|
||||||
|
|
||||||
#define COIN ((uint64_t)100000000) // pow(10, 8)
|
#define COIN ((uint64_t)100000000) // pow(10, 8)
|
||||||
#define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6)
|
#define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6)
|
||||||
|
|
|
@ -470,6 +470,15 @@ namespace cryptonote
|
||||||
|
|
||||||
// Implemented below
|
// Implemented below
|
||||||
inline serializable_bytecoin_block make_serializable_bytecoin_block(const block& b, bool hashing_serialization, bool header_only);
|
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<crypto::hash> baseTransactionBranch;
|
||||||
|
transaction baseTransaction;
|
||||||
|
std::vector<crypto::hash> blockchainBranch;
|
||||||
|
};
|
||||||
|
|
||||||
struct block_header
|
struct block_header
|
||||||
{
|
{
|
||||||
|
@ -478,7 +487,6 @@ namespace cryptonote
|
||||||
uint64_t timestamp;
|
uint64_t timestamp;
|
||||||
crypto::hash prev_id;
|
crypto::hash prev_id;
|
||||||
uint32_t nonce;
|
uint32_t nonce;
|
||||||
|
|
||||||
BEGIN_SERIALIZE()
|
BEGIN_SERIALIZE()
|
||||||
VARINT_FIELD(major_version)
|
VARINT_FIELD(major_version)
|
||||||
VARINT_FIELD(minor_version)
|
VARINT_FIELD(minor_version)
|
||||||
|
@ -491,7 +499,7 @@ namespace cryptonote
|
||||||
struct block: public block_header
|
struct block: public block_header
|
||||||
{
|
{
|
||||||
bytecoin_block parent_block;
|
bytecoin_block parent_block;
|
||||||
|
RootBlock rootBlock;
|
||||||
transaction miner_tx;
|
transaction miner_tx;
|
||||||
std::vector<crypto::hash> tx_hashes;
|
std::vector<crypto::hash> tx_hashes;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue