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

Merge branch 'feature/son-for-hive-voting' into feature/339-refactor-sidechain_type

Browse source 
# Conflicts are resolved:
libraries/chain/db_maint.cpp
libraries/chain/db_witness_schedule.cpp
libraries/chain/include/graphene/chain/database.hpp
libraries/chain/include/graphene/chain/global_property_object.hpp
libraries/chain/include/graphene/chain/son_object.hpp
libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
libraries/wallet/wallet.cpp
This commit is contained in:
Vlad Dobromyslov 2022-04-11 11:09:45 +03:00
commit 7c49232f60
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
View file

@ -317,6 +317,8 @@ bool peerplays_sidechain_plugin_impl::is_active_son(son_id_type son_id) {
if (son_obj == idx.end())
return false;
//! Fixme - now only bitcoin, fix according to sidechain_type
const chain::global_property_object &gpo = plugin.database().get_global_properties();
set<son_id_type> active_son_ids;
for(const auto& active_sidechain_type : active_sidechain_types) {