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

notifications of SONS should get restrict to sons functionality

Browse source
This commit is contained in:
pbattu123 2020-03-16 22:32:35 -03:00
parent 3ffcd4fdd0
commit c0d515b93f
1 changed files with 79 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
libraries/chain/db_maint.cpp
View file

@ -558,93 +558,97 @@ void database::update_active_sons()
} }
} }
if (son_sets_equal) { //restrict below code snippet to sons functionality
ilog( "Active SONs set NOT CHANGED" ); if(cur_active_sons.size() || new_active_sons.size())
} else { {
ilog( "Active SONs set CHANGED" ); if (son_sets_equal) {
ilog( "Active SONs set NOT CHANGED" );
} else {
ilog( "Active SONs set CHANGED" );
bool should_recreate_pw = true; bool should_recreate_pw = true;
// Expire for current son_wallet_object wallet, if exists // Expire for current son_wallet_object wallet, if exists
const auto& idx_swi = get_index_type<son_wallet_index>().indices().get<by_id>(); const auto& idx_swi = get_index_type<son_wallet_index>().indices().get<by_id>();
auto obj = idx_swi.rbegin(); auto obj = idx_swi.rbegin();
if (obj != idx_swi.rend()) { if (obj != idx_swi.rend()) {
// Compare current wallet SONs and to-be lists of active sons // Compare current wallet SONs and to-be lists of active sons
auto cur_wallet_sons = (*obj).sons; auto cur_wallet_sons = (*obj).sons;
bool wallet_son_sets_equal = (cur_wallet_sons.size() == new_active_sons.size()); bool wallet_son_sets_equal = (cur_wallet_sons.size() == new_active_sons.size());
if (wallet_son_sets_equal) { if (wallet_son_sets_equal) {
for( size_t i = 0; i < cur_wallet_sons.size(); i++ ) { for( size_t i = 0; i < cur_wallet_sons.size(); i++ ) {
wallet_son_sets_equal = wallet_son_sets_equal && cur_wallet_sons.at(i) == new_active_sons.at(i); wallet_son_sets_equal = wallet_son_sets_equal && cur_wallet_sons.at(i) == new_active_sons.at(i);
}
}
should_recreate_pw = !wallet_son_sets_equal;
if (should_recreate_pw) {
modify(*obj, [&, obj](son_wallet_object &swo) {
swo.expires = head_block_time();
});
} }
} }
should_recreate_pw = !wallet_son_sets_equal;
if (should_recreate_pw) { if (should_recreate_pw) {
modify(*obj, [&, obj](son_wallet_object &swo) { // Create new son_wallet_object, to initiate wallet recreation
swo.expires = head_block_time(); create<son_wallet_object>( [&]( son_wallet_object& obj ) {
obj.valid_from = head_block_time();
obj.expires = time_point_sec::maximum();
obj.sons.insert(obj.sons.end(), new_active_sons.begin(), new_active_sons.end());
}); });
} }
}
if (should_recreate_pw) { vector<son_info> sons_to_remove;
// Create new son_wallet_object, to initiate wallet recreation // find all cur_active_sons members that is not in new_active_sons
create<son_wallet_object>( [&]( son_wallet_object& obj ) { for_each(cur_active_sons.begin(), cur_active_sons.end(),
obj.valid_from = head_block_time(); [&sons_to_remove, &new_active_sons](const son_info& si)
obj.expires = time_point_sec::maximum();
obj.sons.insert(obj.sons.end(), new_active_sons.begin(), new_active_sons.end());
});
}
vector<son_info> sons_to_remove;
// find all cur_active_sons members that is not in new_active_sons
for_each(cur_active_sons.begin(), cur_active_sons.end(),
[&sons_to_remove, &new_active_sons](const son_info& si)
{
if(std::find(new_active_sons.begin(), new_active_sons.end(), si) ==
new_active_sons.end())
{ {
sons_to_remove.push_back(si); if(std::find(new_active_sons.begin(), new_active_sons.end(), si) ==
new_active_sons.end())
{
sons_to_remove.push_back(si);
}
} }
} );
); const auto& idx = get_index_type<son_index>().indices().get<by_id>();
const auto& idx = get_index_type<son_index>().indices().get<by_id>(); for( const son_info& si : sons_to_remove )
for( const son_info& si : sons_to_remove )
{
auto son = idx.find( si.son_id );
if(son == idx.end()) // SON is deleted already
continue;
// keep maintenance status for nodes becoming inactive
if(son->status == son_status::active)
{ {
modify( *son, [&]( son_object& obj ){ auto son = idx.find( si.son_id );
obj.status = son_status::inactive; if(son == idx.end()) // SON is deleted already
}); continue;
// keep maintenance status for nodes becoming inactive
if(son->status == son_status::active)
{
modify( *son, [&]( son_object& obj ){
obj.status = son_status::inactive;
});
}
} }
} vector<son_info> sons_to_add;
vector<son_info> sons_to_add; // find all new_active_sons members that is not in cur_active_sons
// find all new_active_sons members that is not in cur_active_sons for_each(new_active_sons.begin(), new_active_sons.end(),
for_each(new_active_sons.begin(), new_active_sons.end(), [&sons_to_add, &cur_active_sons](const son_info& si)
[&sons_to_add, &cur_active_sons](const son_info& si)
{
if(std::find(cur_active_sons.begin(), cur_active_sons.end(), si) ==
cur_active_sons.end())
{ {
sons_to_add.push_back(si); if(std::find(cur_active_sons.begin(), cur_active_sons.end(), si) ==
cur_active_sons.end())
{
sons_to_add.push_back(si);
}
} }
} );
); for( const son_info& si : sons_to_add )
for( const son_info& si : sons_to_add )
{
auto son = idx.find( si.son_id );
FC_ASSERT(son != idx.end(), "Invalid SON in active list, id={sonid}.", ("sonid", si.son_id));
// keep maintenance status for new nodes
if(son->status == son_status::inactive)
{ {
modify( *son, [&]( son_object& obj ){ auto son = idx.find( si.son_id );
obj.status = son_status::active; FC_ASSERT(son != idx.end(), "Invalid SON in active list, id={sonid}.", ("sonid", si.son_id));
}); // keep maintenance status for new nodes
if(son->status == son_status::inactive)
{
modify( *son, [&]( son_object& obj ){
obj.status = son_status::active;
});
}
} }
} }
} }