Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

#339 - fix database::pay_sons()

Browse source
This commit is contained in:
Vlad Dobromyslov 2022-04-07 14:29:57 +03:00
parent 8f2c1b06b1
commit e58b7d6916
1 changed files with 74 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
libraries/chain/db_maint.cpp
View file

@ -185,99 +185,91 @@ void database::pay_sons()
time_point_sec now = head_block_time(); time_point_sec now = head_block_time();
const dynamic_global_property_object& dpo = get_dynamic_global_properties(); const dynamic_global_property_object& dpo = get_dynamic_global_properties();
// Current requirement is that we have to pay every 24 hours, so the following check // Current requirement is that we have to pay every 24 hours, so the following check
if( dpo.son_budget.value > 0 && ((now - dpo.last_son_payout_time) >= fc::seconds(get_global_properties().parameters.son_pay_time()))) { if( dpo.son_budget.value > 0 && ((now - dpo.last_son_payout_time) >= fc::seconds(get_global_properties().parameters.son_pay_time())))
//! Fixme - sort_votable_objects only for bitcoin {
auto sons = sort_votable_objects<son_index>(sidechain_type::bitcoin, get_global_properties().parameters.maximum_son_count()); for(const auto& active_sidechain_type : active_sidechain_types)
// After SON2 HF
uint64_t total_votes = 0;
for( const son_object& son : sons )
{ {
for(const auto& vote_id : son.sidechain_vote_ids) auto sons = sort_votable_objects<son_index>(active_sidechain_type, get_global_properties().parameters.maximum_son_count());
// After SON2 HF
uint64_t total_votes = 0;
for( const son_object& son : sons )
{ {
total_votes += _vote_tally_buffer[vote_id.second]; total_votes += _vote_tally_buffer[son.sidechain_vote_ids.at(active_sidechain_type)];
} }
} int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0); auto get_weight = [&bits_to_drop]( uint64_t son_votes ) {
auto get_weight = [&bits_to_drop]( uint64_t son_votes ) { uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) );
uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) ); return weight;
return weight; };
}; // Before SON2 HF
// Before SON2 HF auto get_weight_before_son2_hf = []( uint64_t son_votes ) {
auto get_weight_before_son2_hf = []( uint64_t son_votes ) { int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(son_votes)) - 15, 0);
int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(son_votes)) - 15, 0); uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) );
uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) ); return weight;
return weight; };
}; uint64_t weighted_total_txs_signed = 0;
uint64_t weighted_total_txs_signed = 0; share_type son_budget = dpo.son_budget;
share_type son_budget = dpo.son_budget; get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &get_weight, &now, &get_weight_before_son2_hf, &active_sidechain_type](const object& o) {
get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &get_weight, &now, &get_weight_before_son2_hf](const object& o) { const son_statistics_object& s = static_cast<const son_statistics_object&>(o);
const son_statistics_object& s = static_cast<const son_statistics_object&>(o);
const auto& idx = get_index_type<son_index>().indices().get<by_id>();
auto son_obj = idx.find( s.owner );
uint16_t son_weight = 0;
if( now >= HARDFORK_SON2_TIME ) {
for (const auto& vote_id : son_obj->sidechain_vote_ids) {
son_weight += get_weight(_vote_tally_buffer[vote_id.second]);
}
}
else {
for (const auto& vote_id : son_obj->sidechain_vote_ids) {
son_weight += get_weight_before_son2_hf(_vote_tally_buffer[vote_id.second]);
}
}
uint64_t txs_signed = 0;
for (const auto &ts : s.txs_signed) {
txs_signed = txs_signed + ts.second;
}
weighted_total_txs_signed += (txs_signed * son_weight);
});
// Now pay off each SON proportional to the number of transactions signed.
get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &dpo, &son_budget, &get_weight, &get_weight_before_son2_hf, &now](const object& o) {
const son_statistics_object& s = static_cast<const son_statistics_object&>(o);
uint64_t txs_signed = 0;
for (const auto &ts : s.txs_signed) {
txs_signed = txs_signed + ts.second;
}
if(txs_signed > 0){
const auto& idx = get_index_type<son_index>().indices().get<by_id>(); const auto& idx = get_index_type<son_index>().indices().get<by_id>();
auto son_obj = idx.find( s.owner ); auto son_obj = idx.find( s.owner );
uint16_t son_weight = 0; uint16_t son_weight = 0;
if( now >= HARDFORK_SON2_TIME ) { if( now >= HARDFORK_SON2_TIME ) {
for (const auto& vote_id : son_obj->sidechain_vote_ids) { son_weight += get_weight(_vote_tally_buffer[son_obj->sidechain_vote_ids.at(active_sidechain_type)]);
son_weight += get_weight(_vote_tally_buffer[vote_id.second]);
}
} }
else { else {
for (const auto& vote_id : son_obj->sidechain_vote_ids) { son_weight += get_weight_before_son2_hf(_vote_tally_buffer[son_obj->sidechain_vote_ids.at(active_sidechain_type)]);
son_weight += get_weight_before_son2_hf(_vote_tally_buffer[vote_id.second]);
}
} }
share_type pay = (txs_signed * son_weight * son_budget.value)/weighted_total_txs_signed; uint64_t txs_signed = 0;
modify( *son_obj, [&]( son_object& _son_obj) for (const auto &ts : s.txs_signed) {
{ txs_signed = txs_signed + ts.second;
_son_obj.pay_son_fee(pay, *this); }
}); weighted_total_txs_signed += (txs_signed * son_weight);
//Remove the amount paid out to SON from global SON Budget });
modify( dpo, [&]( dynamic_global_property_object& _dpo )
{ // Now pay off each SON proportional to the number of transactions signed.
_dpo.son_budget -= pay; get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &dpo, &son_budget, &get_weight, &get_weight_before_son2_hf, &now, &active_sidechain_type](const object& o) {
} ); const son_statistics_object& s = static_cast<const son_statistics_object&>(o);
//Reset the tx counter in each son statistics object uint64_t txs_signed = 0;
modify( s, [&]( son_statistics_object& _s) for (const auto &ts : s.txs_signed) {
{ txs_signed = txs_signed + ts.second;
for (const auto &ts : s.txs_signed) { }
_s.txs_signed.at(ts.first) = 0;
if(txs_signed > 0){
const auto& idx = get_index_type<son_index>().indices().get<by_id>();
auto son_obj = idx.find( s.owner );
uint16_t son_weight = 0;
if( now >= HARDFORK_SON2_TIME ) {
son_weight += get_weight(_vote_tally_buffer[son_obj->sidechain_vote_ids.at(active_sidechain_type)]);
} }
}); else {
} son_weight += get_weight_before_son2_hf(_vote_tally_buffer[son_obj->sidechain_vote_ids.at(active_sidechain_type)]);
}); }
//Note the last son pay out time share_type pay = (txs_signed * son_weight * son_budget.value)/weighted_total_txs_signed;
modify( dpo, [&]( dynamic_global_property_object& _dpo ) modify( *son_obj, [&]( son_object& _son_obj)
{ {
_dpo.last_son_payout_time = now; _son_obj.pay_son_fee(pay, *this);
}); });
//Remove the amount paid out to SON from global SON Budget
modify( dpo, [&]( dynamic_global_property_object& _dpo )
{
_dpo.son_budget -= pay;
} );
//Reset the tx counter in each son statistics object
modify( s, [&]( son_statistics_object& _s)
{
for (const auto &ts : s.txs_signed) {
_s.txs_signed.at(ts.first) = 0;
}
});
}
});
//Note the last son pay out time
modify( dpo, [&]( dynamic_global_property_object& _dpo )
{
_dpo.last_son_payout_time = now;
});
}
} }
} }