Refactor softwareexpiry to use global variable

(Necessary to avoid indirect univalue inclusion via common/args, in clientversion)

Author: luke-jr

src/bitcoind.cpp

@@ -129,6 +129,7 @@ static bool ParseArgs(ArgsManager& args, int argc, char* argv[])
         }
     }
 
+    g_software_expiry = args.GetIntArg("-softwareexpiry", DEFAULT_SOFTWARE_EXPIRY);
     if (IsThisSoftwareExpired(GetTime())) {
         tfm::format(std::cerr, "This software is expired, and may be out of consensus. You must choose to upgrade or override this expiration.\n");
         exit(EXIT_FAILURE);

src/clientversion.cpp

@@ -8,9 +8,7 @@
 #include <util/string.h>
 #include <util/translation.h>
 
-#include <common/args.h>
 #include <tinyformat.h>
-#include <util/time.h>
 
 #include <string>
 #include <vector>
@@ -102,11 +100,12 @@ std::string LicenseInfo()
            "\n";
 }
 
+int64_t g_software_expiry{DEFAULT_SOFTWARE_EXPIRY};
+
 bool IsThisSoftwareExpired(int64_t nTime)
 {
-    int64_t nSoftwareExpiry = gArgs.GetIntArg("-softwareexpiry", DEFAULT_SOFTWARE_EXPIRY);
-    if (nSoftwareExpiry <= 0) {
-        nSoftwareExpiry = std::numeric_limits<int64_t>::max();
+    if (g_software_expiry <= 0) {
+        return false;
     }
-    return (nTime > nSoftwareExpiry);
+    return (nTime > g_software_expiry);
 }

src/clientversion.h

@@ -48,6 +48,7 @@ std::string LicenseInfo();
 static const int64_t SECONDS_PER_YEAR = 31558060;
 static const int POSIX_EPOCH_YEAR = 1970;
 static const int64_t DEFAULT_SOFTWARE_EXPIRY = ((COPYRIGHT_YEAR - POSIX_EPOCH_YEAR) * SECONDS_PER_YEAR) + (SECONDS_PER_YEAR * 2);
+extern int64_t g_software_expiry;
 
 bool IsThisSoftwareExpired(int64_t nTime);
 

src/qt/bitcoin.cpp

@@ -645,6 +645,7 @@ int GuiMain(int argc, char* argv[])
     // Re-initialize translations after changing application name (language in network-specific settings can be different)
     initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator);
 
+    g_software_expiry = gArgs.GetIntArg("-softwareexpiry", DEFAULT_SOFTWARE_EXPIRY);
     if (IsThisSoftwareExpired(GetTime())) {
         QMessageBox::critical(nullptr, QObject::tr("Software expired"), QObject::tr("This software is expired, and may be out of consensus. You must choose to upgrade or override this expiration."));
         return EXIT_FAILURE;