peerplays_migrated/libraries/plugins/peerplays_sidechain
Vlad Dobromyslov 7c49232f60 Merge branch 'feature/son-for-hive-voting' into feature/339-refactor-sidechain_type
# 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
2022-04-11 11:09:45 +03:00
..
bitcoin SON for Hive 2021-11-18 17:32:30 +00:00
common Merging fix of bug/empty-json-parsing-failure 2021-12-07 17:40:29 +00:00
hive SON for Hive 2021-11-18 17:32:30 +00:00
include/graphene/peerplays_sidechain zmq::recv_multipart 2022-02-16 18:25:25 +00:00
CMakeLists.txt Enable multiple SON support by default 2022-02-09 18:36:03 +01:00
peerplays_sidechain_plugin.cpp Merge branch 'feature/son-for-hive-voting' into feature/339-refactor-sidechain_type 2022-04-11 11:09:45 +03:00
sidechain_net_handler.cpp #308 List of active SONs per sidechain 2022-04-07 19:06:07 +00:00
sidechain_net_handler_bitcoin.cpp #308 List of active SONs per sidechain 2022-04-07 19:06:07 +00:00
sidechain_net_handler_hive.cpp #308 List of active SONs per sidechain 2022-04-07 19:06:07 +00:00
sidechain_net_handler_peerplays.cpp #308 List of active SONs per sidechain 2022-04-07 19:06:07 +00:00
sidechain_net_manager.cpp SON for Hive 2021-11-18 17:32:30 +00:00