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

Fix merging issue

Browse source
This commit is contained in:
Srdjan Obucina 2020-02-11 15:18:04 +01:00
parent da7b161d3d
commit 0d14b481a4
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -488,11 +488,6 @@ void peerplays_sidechain_plugin_impl::on_objects_new(const vector<object_id_type
continue; continue;
} }
} }
if(proposal->proposed_transaction.operations.size() == 1
&& proposal->proposed_transaction.operations[0].which() == chain::operation::tag<chain::transfer_operation>::value) {
approve_proposal( proposal->id );
}
} }
} }
} }

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

@ -337,11 +337,6 @@ 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 );