|
|
|
@ -1149,7 +1149,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
|
|
|
|
|
uint8_t hf_version = m_hardfork->get_current_version();
|
|
|
|
|
size_t max_outs = hf_version >= 4 ? 1 : 11;
|
|
|
|
|
bool r = construct_miner_tx(height, median_size, already_generated_coins, txs_size, fee, miner_address, b.miner_tx, ex_nonce, max_outs, hf_version);
|
|
|
|
|
CHECK_AND_ASSERT_MES(r, false, "Failed to construc miner tx, first chance");
|
|
|
|
|
CHECK_AND_ASSERT_MES(r, false, "Failed to construct miner tx, first chance");
|
|
|
|
|
size_t cumulative_size = txs_size + get_object_blobsize(b.miner_tx);
|
|
|
|
|
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
|
|
|
|
|
LOG_PRINT_L1("Creating block template: miner tx size " << get_object_blobsize(b.miner_tx) <<
|
|
|
|
@ -1159,7 +1159,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
|
|
|
|
|
{
|
|
|
|
|
r = construct_miner_tx(height, median_size, already_generated_coins, cumulative_size, fee, miner_address, b.miner_tx, ex_nonce, max_outs, hf_version);
|
|
|
|
|
|
|
|
|
|
CHECK_AND_ASSERT_MES(r, false, "Failed to construc miner tx, second chance");
|
|
|
|
|
CHECK_AND_ASSERT_MES(r, false, "Failed to construct miner tx, second chance");
|
|
|
|
|
size_t coinbase_blob_size = get_object_blobsize(b.miner_tx);
|
|
|
|
|
if (coinbase_blob_size > cumulative_size - txs_size)
|
|
|
|
|
{
|
|
|
|
@ -1802,7 +1802,7 @@ bool Blockchain::find_blockchain_supplement(const std::list<crypto::hash>& qbloc
|
|
|
|
|
auto gen_hash = m_db->get_block_hash_from_height(0);
|
|
|
|
|
if(qblock_ids.back() != gen_hash)
|
|
|
|
|
{
|
|
|
|
|
LOG_PRINT_L1("Client sent wrong NOTIFY_REQUEST_CHAIN: genesis block missmatch: " << std::endl << "id: " << qblock_ids.back() << ", " << std::endl << "expected: " << gen_hash << "," << std::endl << " dropping connection");
|
|
|
|
|
LOG_PRINT_L1("Client sent wrong NOTIFY_REQUEST_CHAIN: genesis block mismatch: " << std::endl << "id: " << qblock_ids.back() << ", " << std::endl << "expected: " << gen_hash << "," << std::endl << " dropping connection");
|
|
|
|
|
m_db->block_txn_abort();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|