kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass tx and nonce to genesis block constructor

Browse source
This commit is contained in:
Zachary Michaels 2014-09-08 15:09:59 -04:00 • committed by Riccardo Spagni
parent 257077a96b
commit 96eed84aad
5 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/cryptonote_core/cryptonote_format_utils.cpp
View file

@ -660,7 +660,11 @@ namespace cryptonote
return p;
}
//---------------------------------------------------------------
bool generate_genesis_block(block& bl)
bool generate_genesis_block(
block& bl
, std::string const & genesis_tx
, uint32_t nonce
)
{
//genesis block
bl = boost::value_initialized<block>();
@ -681,20 +685,10 @@ namespace cryptonote
bl.major_version = CURRENT_BLOCK_MAJOR_VERSION;
bl.minor_version = CURRENT_BLOCK_MINOR_VERSION;
bl.timestamp = 0;
bl.nonce = config::GENESIS_NONCE;
bl.nonce = nonce;
miner::find_nonce_for_given_block(bl, 1, 0);
return true;
}
bool generate_testnet_genesis_block(cryptonote::block& b) {
if (!generate_genesis_block(b)) {
return false;
}
b.nonce += 1;
return true;
}
//---------------------------------------------------------------
bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height)
{