v29.4-roots.3 · Commit 2: [PATCH 02/30] runtime: preserve shared operator controls

src/common/config.cpp

Before: src/common/config.cpp · After: src/common/config.cpp

File metadata

index fac4aa314c54ae976a8464d29da1dbdb0c495548..59dec7566bf602bcf756f29936d49c7405725798 100644

Download original patch · Release notes

Diff rows 1–76 of 76. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.

src/common/config.cpp CHANGED Viewed

@@ -4,6 +4,7 @@
 #include <common/args.h>
 #include <common/settings.h>
 #include <logging.h>
 #include <sync.h>
@@ -84,13 +85,13 @@ bool IsConfSupported(KeyInfo& key, std::string& error) {
     if (key.name == "reindex") {
         // reindex can be set in a config file but it is strongly discouraged as this will cause the node to reindex on
         // every restart. Allow the config but throw a warning
-        LogPrintf("Warning: reindex=1 is set in the configuration file, which will significantly slow down startup. Consider removing or commenting out this option for better performance, unless there is currently a condition which makes rebuilding the indexes necessary\n");
         return true;
     }
     return true;
 }
-bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& filepath, std::string& error, bool ignore_invalid_keys)
 {
     LOCK(cs_args);
     std::vector<std::pair<std::string, std::string>> options;
@@ -106,10 +107,13 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
             if (!value) {
                 return false;
             }
             m_settings.ro_config[key.section][key.name].push_back(*value);
         } else {
             if (ignore_invalid_keys) {
-                LogPrintf("Ignoring unknown configuration value %s\n", option.first);
             } else {
                 error = strprintf("Invalid configuration value %s", option.first);
                 return false;
@@ -124,6 +128,8 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
     {
         LOCK(cs_args);
         m_settings.ro_config.clear();
         m_config_sections.clear();
         m_config_path = AbsPathForConfigVal(*this, GetPathArg("-conf", BITCOIN_CONF_FILENAME), /*net_specific=*/false);
     }
@@ -214,12 +220,32 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
         }
     }
     // If datadir is changed in .conf file:
     ClearPathCache();
     if (!CheckDataDirOption(*this)) {
         error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", ""));
         return false;
     }
     return true;
 }

 #include <common/args.h>
+#include <chainparamsbase.h>
 #include <common/settings.h>
 #include <logging.h>
 #include <sync.h>
     if (key.name == "reindex") {
         // reindex can be set in a config file but it is strongly discouraged as this will cause the node to reindex on
         // every restart. Allow the config but throw a warning
+        LogWarning("reindex=1 is set in the configuration file, which will significantly slow down startup. Consider removing or commenting out this option for better performance, unless there is currently a condition which makes rebuilding the indexes necessary");
         return true;
     }
     return true;
 }
+bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& filepath, std::string& error, bool ignore_invalid_keys, std::map<std::string, std::vector<common::SettingsValue>>* settings_target)
 {
     LOCK(cs_args);
     std::vector<std::pair<std::string, std::string>> options;
             if (!value) {
                 return false;
             }
+            if (settings_target) {
+                (*settings_target)[key.name].push_back(*value);
+            } else
             m_settings.ro_config[key.section][key.name].push_back(*value);
         } else {
             if (ignore_invalid_keys) {
+                LogWarning("Ignoring unknown configuration value %s", option.first);
             } else {
                 error = strprintf("Invalid configuration value %s", option.first);
                 return false;
     {
         LOCK(cs_args);
         m_settings.ro_config.clear();
+        m_settings.rw_config.clear();
+        m_rwconf_had_prune_option = false;
         m_config_sections.clear();
         m_config_path = AbsPathForConfigVal(*this, GetPathArg("-conf", BITCOIN_CONF_FILENAME), /*net_specific=*/false);
     }
         }
     }
+    // Check for chain settings (BaseParams() calls are only valid after this clause)
+    try {
+        SelectBaseParams(gArgs.GetChainType());
+    } catch (const std::exception& e) {
+        error = e.what();
+        return false;
+    }
     // If datadir is changed in .conf file:
     ClearPathCache();
     if (!CheckDataDirOption(*this)) {
         error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", ""));
         return false;
     }
+    LOCK(cs_args);
+    m_rwconf_path = AbsPathForConfigVal(*this, GetPathArg("-confrw", BITCOIN_RW_CONF_FILENAME));
+    const auto rwconf_path{GetRWConfigFilePath()};
+    std::ifstream rwconf_stream(rwconf_path);
+    if (rwconf_stream.good()) {
+        if (!ReadConfigStream(rwconf_stream, fs::PathToString(rwconf_path), error, ignore_invalid_keys, &m_settings.rw_config)) {
+            return false;
+        }
+        m_rwconf_had_prune_option = m_settings.rw_config.count("prune");
+    }
     return true;
 }