Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

miner improvements on PoS block validation

Browse source
This commit is contained in:
sowle 2022-10-16 03:13:03 +02:00
parent c5206d0f52
commit 088ea83808
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/currency_core/blockchain_storage.cpp
View file

@ -4552,7 +4552,7 @@ struct outputs_visitor
//check tx unlock time
uint64_t source_out_unlock_time = get_tx_unlock_time(source_tx, out_i);
//let coinbase sources for PoS block to have locked inputs, the outputs supposed to be locked same way, except the reward
if (is_coinbase(validated_tx) && is_pos_block(validated_tx)) // @#@ consider changing to one call to is_pos_coinbase()
if (is_coinbase(validated_tx) && is_pos_miner_tx(validated_tx)) // @#@ consider changing to one call to is_pos_coinbase()
{
CHECK_AND_ASSERT_MES(should_unlock_value_be_treated_as_block_height(source_out_unlock_time), false, "source output #" << out_i << " is locked by time, not by height, which is not allowed for PoS coinbase");
if (source_out_unlock_time > m_source_max_unlock_time_for_pos_coinbase)
@ -5374,7 +5374,7 @@ bool blockchain_storage::validate_pos_block(const block& b,
wide_difficulty_type basic_diff,
uint64_t& amount,
wide_difficulty_type& final_diff,
crypto::hash& proof_hash,
crypto::hash& kernel_hash,
const crypto::hash& id,
bool for_altchain,
const alt_chain_type& alt_chain,
@ -5415,7 +5415,7 @@ bool blockchain_storage::validate_pos_block(const block& b,
CHECK_AND_ASSERT_MES(r, false, "failed to build_stake_modifier");
r = build_kernel(stake_key_image, sk, sm, b.timestamp);
CHECK_AND_ASSERT_MES(r, false, "failed to build kernel_stake");
proof_hash = crypto::cn_fast_hash(&sk, sizeof(sk));
kernel_hash = crypto::cn_fast_hash(&sk, sizeof(sk));
if (is_hardfork_active(ZANO_HARDFORK_04_ZARCANUM))
{
@ -5424,6 +5424,7 @@ bool blockchain_storage::validate_pos_block(const block& b,
else
{
// old PoS non-hidden amount scheme
CHECK_AND_ASSERT_MES(b.miner_tx.version <= TRANSACTION_VERSION_PRE_HF4, false, "PoS miner tx has incorrect version: " << b.miner_tx.version);
CHECK_AND_ASSERT_MES(b.miner_tx.vin[1].type() == typeid(txin_to_key), false, "incorrect input 1 type: " << b.miner_tx.vin[1].type().name() << ", txin_to_key expected");
const txin_to_key& intk = boost::get<txin_to_key>(b.miner_tx.vin[1]);
amount = intk.amount;
@ -5435,16 +5436,16 @@ bool blockchain_storage::validate_pos_block(const block& b,
LOG_PRINT_L2("STAKE KERNEL for bl ID: " << get_block_hash(b) << ENDL
<< print_stake_kernel_info(sk)
<< "amount: " << print_money(amount) << ENDL
<< "kernel_hash: " << proof_hash);
<< "kernel_hash: " << kernel_hash);
final_diff = basic_diff / amount;
if (!check_hash(proof_hash, final_diff))
if (!check_hash(kernel_hash, final_diff))
{
LOG_ERROR("PoS difficulty check failed for block " << get_block_hash(b) << " @ HEIGHT " << get_block_height(b) << ":" << ENDL
<< " basic_diff: " << basic_diff << ENDL
<< " final_diff: " << final_diff << ENDL
<< " amount: " << print_money_brief(amount) << ENDL
<< " kernel_hash: " << proof_hash << ENDL
<< " kernel_hash: " << kernel_hash << ENDL
);
return false;
}

2
src/currency_core/blockchain_storage.h
View file

@ -352,7 +352,7 @@ namespace currency
wide_difficulty_type basic_diff,
uint64_t& amount,
wide_difficulty_type& final_diff,
crypto::hash& proof_hash,
crypto::hash& kernel_hash,
const crypto::hash& id,
bool for_altchain,
const alt_chain_type& alt_chain = alt_chain_type(),

15
src/currency_core/currency_format_utils.cpp
View file

@ -189,7 +189,6 @@ namespace currency
const pos_entry& pe)
{
bool r = false;
CHECK_AND_ASSERT_THROW_MES(!pos || tx_version <= TRANSACTION_VERSION_PRE_HF4, "PoS miner tx is currently unsupported for HF4 -- sowle");
uint64_t block_reward = 0;
if (!get_block_reward(pos, median_size, current_block_size, already_generated_coins, block_reward, height))
@ -271,10 +270,10 @@ namespace currency
if (tx.version > TRANSACTION_VERSION_PRE_HF4 /* && stake is zarcanum */)
{
// TODO: add Zarcanum part
txin_zc_input stake_input;
//txin_zc_input stake_input = AUTO_VAL_INIT(stake_input);
//stake_input.key_offsets.push_back(pe.g_index);
stake_input.k_image = pe.keyimage;
tx.vin.emplace_back(std::move(stake_input));
//stake_input.k_image = pe.keyimage;
tx.vin.emplace_back(std::move(txin_zc_input()));
//reserve place for ring signature
tx.signatures.emplace_back(std::move(zarcanum_sig()));
}
@ -3579,17 +3578,19 @@ namespace currency
{
if (!(b.flags & CURRENCY_BLOCK_FLAG_POS_BLOCK))
return false;
return is_pos_block(b.miner_tx);
return is_pos_miner_tx(b.miner_tx);
}
//---------------------------------------------------------------
bool is_pos_block(const transaction& tx)
bool is_pos_miner_tx(const transaction& tx)
{
if (tx.vin.size() == 2 &&
tx.vin[0].type() == typeid(txin_gen) &&
tx.vin[1].type() == typeid(txin_to_key))
(tx.vin[1].type() == typeid(txin_to_key) ||
tx.vin[1].type() == typeid(txin_zc_input)))
return true;
return false;
}
//---------------------------------------------------------------
size_t get_max_block_size()
{
return CURRENCY_MAX_BLOCK_SIZE;

2
src/currency_core/currency_format_utils.h
View file

@ -385,7 +385,7 @@ namespace currency
//PoS
bool is_pos_block(const block& b);
bool is_pos_block(const transaction& tx);
bool is_pos_miner_tx(const transaction& tx);
wide_difficulty_type correct_difficulty_with_sequence_factor(size_t sequence_factor, wide_difficulty_type diff);
void print_currency_details();
std::string print_reward_change_first_blocks(size_t n_of_first_blocks);