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-231' into feature/SON-238

Browse source
This commit is contained in:
Srdjan Obucina 2020-02-07 18:30:52 +01:00
commit 98ebbbd69b
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
View file

@ -54,6 +54,11 @@ void sidechain_net_handler::sidechain_event_data_received(const sidechain_event_
ilog( " peerplays_from: ${peerplays_from}", ( "peerplays_from", sed.peerplays_from ) ); ilog( " peerplays_from: ${peerplays_from}", ( "peerplays_from", sed.peerplays_from ) );
ilog( " peerplays_to: ${peerplays_to}", ( "peerplays_to", sed.peerplays_to ) ); ilog( " peerplays_to: ${peerplays_to}", ( "peerplays_to", sed.peerplays_to ) );
if (!plugin.is_active_son()) {
ilog( " !!! SON is not active and not processing sidechain events...");
return;
}
const chain::global_property_object& gpo = database.get_global_properties(); const chain::global_property_object& gpo = database.get_global_properties();
son_wallet_transfer_create_operation op; son_wallet_transfer_create_operation op;

5
libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
View file

@ -336,6 +336,11 @@ void sidechain_net_handler_bitcoin::handle_event( const std::string& event_data
ilog("peerplays sidechain plugin: sidechain_net_handler_bitcoin::handle_event"); ilog("peerplays sidechain plugin: sidechain_net_handler_bitcoin::handle_event");
ilog(" event_data: ${event_data}", ("event_data", event_data)); ilog(" event_data: ${event_data}", ("event_data", event_data));
if (!plugin.is_active_son()) {
ilog(" !!! SON is not active and not processing sidechain events...");
return;
}
std::string block = bitcoin_client->receive_full_block( event_data ); std::string block = bitcoin_client->receive_full_block( event_data );
if( block != "" ) { if( block != "" ) {
const auto& vins = extract_info_from_block( block ); const auto& vins = extract_info_from_block( block );