haraldwolff
/
node-cryptonote-util
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Digitalnote 4.0.0-beta update

xdn-Nan-2.0
clintar 2016-11-21 13:56:56 -07:00
parent 902571957d
commit 54d041c33a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptonote_config.h
View File

@ -6,7 +6,8 @@
#define CURRENT_BLOCK_MINOR_VERSION 0
#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 DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6)

12
src/cryptonote_core/cryptonote_basic.h
View File

@ -470,6 +470,15 @@ 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<crypto::hash> baseTransactionBranch;
transaction baseTransaction;
std::vector<crypto::hash> blockchainBranch;
};
struct block_header
{
@ -478,7 +487,6 @@ namespace cryptonote
uint64_t timestamp;
crypto::hash prev_id;
uint32_t nonce;
BEGIN_SERIALIZE()
VARINT_FIELD(major_version)
VARINT_FIELD(minor_version)
@ -491,7 +499,7 @@ namespace cryptonote
struct block: public block_header
{
bytecoin_block parent_block;
RootBlock rootBlock;
transaction miner_tx;
std::vector<crypto::hash> tx_hashes;