In verify_match_of_blockchain_configuration:

- do not check HIVE_TREASURY_ACCOUNT
- in case of mainet, check if chain_id matches specific id depending of
hardfork number
- in case of mirrornet or testnet, current chain_id should match stored
chain_id

Author: asuch

libraries/chain/util/state_checker_tools.cpp

@@ -43,15 +43,26 @@ void verify_match_of_state_definitions(const chain::util::decoded_types_data_sto
   }
 }
 
-void verify_match_of_blockchain_configuration(fc::mutable_variant_object current_blockchain_config, const fc::variant& full_current_blockchain_config_as_variant, const std::string& full_stored_blockchain_config_json, const uint32_t hardfork)
+void verify_match_of_blockchain_configuration(fc::mutable_variant_object current_blockchain_config, const fc::variant &full_current_blockchain_config_as_variant, const std::string &full_stored_blockchain_config_json, const uint32_t hardfork)
 {
   constexpr char HIVE_TREASURY_ACCOUNT_KEY[] = "HIVE_TREASURY_ACCOUNT";
   constexpr char HIVE_CHAIN_ID_KEY[] = "HIVE_CHAIN_ID";
   constexpr char HIVE_BLOCKCHAIN_VERSION_KEY[] = "HIVE_BLOCKCHAIN_VERSION";
 
   fc::mutable_variant_object stored_blockchain_config = fc::json::from_string(full_stored_blockchain_config_json, fc::json::format_validation_mode::full).get_object();
-  const std::string current_hive_treasury_account = current_blockchain_config[HIVE_TREASURY_ACCOUNT_KEY].as_string();
   const std::string current_hive_chain_id = current_blockchain_config[HIVE_CHAIN_ID_KEY].as_string();
+  const std::string stored_hive_chain_id = stored_blockchain_config[HIVE_CHAIN_ID_KEY].as_string();
+
+#if defined(USE_ALTERNATE_CHAIN_ID) || defined(IS_TEST_NET)
+  // mirrornet & testnet  
+  if (current_hive_chain_id != stored_hive_chain_id)
+    FC_THROW_EXCEPTION(blockchain_config_mismatch_exception, "Chain id stored in database: ${stored_hive_chain_id} mismatch chain-id from configuration: ${current_hive_chain_id}", (stored_hive_chain_id)(current_hive_chain_id));
+#else
+  // mainnet
+  if ((hardfork < HIVE_HARDFORK_1_24 && (current_hive_chain_id != std::string(OLD_CHAIN_ID) || current_hive_chain_id != stored_hive_chain_id)) ||
+      (hardfork >= HIVE_HARDFORK_1_24 && (current_hive_chain_id != std::string(HIVE_CHAIN_ID) || current_hive_chain_id != stored_hive_chain_id)))
+    FC_THROW_EXCEPTION(blockchain_config_mismatch_exception, "chain id mismatch. Current config: ${current_hive_chain_id}, stored in db: ${stored_hive_chain_id}, hf: ${hardfork}", (current_hive_chain_id)(stored_hive_chain_id)(hardfork));
+#endif
 
   stored_blockchain_config.erase(HIVE_TREASURY_ACCOUNT_KEY);
   current_blockchain_config.erase(HIVE_TREASURY_ACCOUNT_KEY);
@@ -60,33 +71,12 @@ void verify_match_of_blockchain_configuration(fc::mutable_variant_object current
   stored_blockchain_config.erase(HIVE_BLOCKCHAIN_VERSION_KEY);
   current_blockchain_config.erase(HIVE_BLOCKCHAIN_VERSION_KEY);
 
-  bool throw_exception = false;
+  fc::variant modified_current_blockchain_config;
+  fc::to_variant(current_blockchain_config, modified_current_blockchain_config);
+  fc::variant modified_stored_blockchain_config;
+  fc::to_variant(stored_blockchain_config, modified_stored_blockchain_config);
 
-  {
-    fc::variant modified_current_blockchain_config;
-    fc::to_variant(current_blockchain_config, modified_current_blockchain_config);
-    fc::variant modified_stored_blockchain_config;
-    fc::to_variant(stored_blockchain_config, modified_stored_blockchain_config);
-
-    if (fc::json::to_string(modified_current_blockchain_config) != fc::json::to_string(modified_stored_blockchain_config))
-      throw_exception = true;
-  }
-
-  if (!throw_exception)
-  {
-    if (hardfork < HIVE_HARDFORK_1_24)
-    {
-      if (current_hive_treasury_account != OBSOLETE_TREASURY_ACCOUNT || current_hive_chain_id != std::string(OLD_CHAIN_ID))
-        throw_exception = true;
-    }
-    else
-    {
-      if (current_hive_treasury_account != NEW_HIVE_TREASURY_ACCOUNT || current_hive_chain_id != std::string(HIVE_CHAIN_ID))
-        throw_exception = true;
-    }
-  }
-
-  if (throw_exception)
+  if (fc::json::to_string(modified_current_blockchain_config) != fc::json::to_string(modified_stored_blockchain_config))
   {
     std::fstream loaded_blockchain_config_file, current_blockchain_config_file;
     constexpr char current_config_filename[] = "current_blockchain_config.log";
@@ -105,10 +95,9 @@ void verify_match_of_blockchain_configuration(fc::mutable_variant_object current
     current_blockchain_config_file.close();
 
     FC_THROW_EXCEPTION(blockchain_config_mismatch_exception,
-                        "Mismatch between blockchain configuration loaded from shared memory file and the current one"
-                        "\nFull data about blockchain configuration are in files: ${current_config_filename}, ${loaded_config_filename}",
-                        (current_config_filename)(loaded_config_filename));
+                       "Mismatch between blockchain configuration loaded from shared memory file and the current one"
+                       "\nFull data about blockchain configuration are in files: ${current_config_filename}, ${loaded_config_filename}",
+                       (current_config_filename)(loaded_config_filename));
   }
 }
-
-} } } // hive::chain::util
+    } } } // hive::chain::util