From 2cc90a87945ae1d689e4c8715d33856ea034f1fb Mon Sep 17 00:00:00 2001
From: Srdjan Obucina <obucinac@gmail.com>
Date: Fri, 7 Feb 2020 18:30:11 +0100
Subject: [PATCH] Add is_active_son guards for sidechain events processing

---
 .../plugins/peerplays_sidechain/sidechain_net_handler.cpp    | 5 +++++
 .../peerplays_sidechain/sidechain_net_handler_bitcoin.cpp    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
index 96d753aa..3a610dca 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
@@ -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_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();
 
    son_wallet_transfer_create_operation op;
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
index bfaa4aab..3d89938f 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
@@ -334,6 +334,11 @@ 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 );