|
|
|
@ -215,13 +215,14 @@ bool test_generator::construct_block_manually(block& blk, const block& prev_bloc
|
|
|
|
|
const crypto::hash& prev_id/* = crypto::hash()*/, const difficulty_type& diffic/* = 1*/,
|
|
|
|
|
const transaction& miner_tx/* = transaction()*/,
|
|
|
|
|
const std::vector<crypto::hash>& tx_hashes/* = std::vector<crypto::hash>()*/,
|
|
|
|
|
size_t txs_sizes/* = 0*/)
|
|
|
|
|
size_t txs_sizes/* = 0*/, size_t max_outs/* = 0*/)
|
|
|
|
|
{
|
|
|
|
|
blk.major_version = actual_params & bf_major_ver ? major_ver : CURRENT_BLOCK_MAJOR_VERSION;
|
|
|
|
|
blk.minor_version = actual_params & bf_minor_ver ? minor_ver : CURRENT_BLOCK_MINOR_VERSION;
|
|
|
|
|
blk.timestamp = actual_params & bf_timestamp ? timestamp : prev_block.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN; // Keep difficulty unchanged
|
|
|
|
|
blk.prev_id = actual_params & bf_prev_id ? prev_id : get_block_hash(prev_block);
|
|
|
|
|
blk.tx_hashes = actual_params & bf_tx_hashes ? tx_hashes : std::vector<crypto::hash>();
|
|
|
|
|
max_outs = actual_params & bf_max_outs ? max_outs : 1;
|
|
|
|
|
|
|
|
|
|
size_t height = get_block_height(prev_block) + 1;
|
|
|
|
|
uint64_t already_generated_coins = get_already_generated_coins(prev_block);
|
|
|
|
@ -235,7 +236,7 @@ bool test_generator::construct_block_manually(block& blk, const block& prev_bloc
|
|
|
|
|
{
|
|
|
|
|
size_t current_block_size = txs_sizes + get_object_blobsize(blk.miner_tx);
|
|
|
|
|
// TODO: This will work, until size of constructed block is less then CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE
|
|
|
|
|
if (!construct_miner_tx(height, misc_utils::median(block_sizes), already_generated_coins, current_block_size, 0, miner_acc.get_keys().m_account_address, blk.miner_tx, blobdata(), 1))
|
|
|
|
|
if (!construct_miner_tx(height, misc_utils::median(block_sizes), already_generated_coins, current_block_size, 0, miner_acc.get_keys().m_account_address, blk.miner_tx, blobdata(), max_outs))
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|