From 0d14b481a42ede8fcf225727daceebb32c53a018 Mon Sep 17 00:00:00 2001
From: Srdjan Obucina <obucinac@gmail.com>
Date: Tue, 11 Feb 2020 15:18:04 +0100
Subject: [PATCH] Fix merging issue

---
 .../peerplays_sidechain/peerplays_sidechain_plugin.cpp       | 5 -----
 .../peerplays_sidechain/sidechain_net_handler_bitcoin.cpp    | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
index f14e7897..a23e48bc 100644
--- a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
+++ b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
@@ -488,11 +488,6 @@ void peerplays_sidechain_plugin_impl::on_objects_new(const vector<object_id_type
                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 );
-         }
       }
    }
 }
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
index 942b99e7..cdd3611e 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
@@ -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("                             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 );
    if( block != "" ) {
       const auto& vins = extract_info_from_block( block );