[PSL-1247] pasteld: port PSL-1223 to the master branch (#264)

akobrin1 · web-flow · commit 9ee4175f4971 · 2024-07-30T18:55:47.000-04:00
* [PSL-1247] pasteld: port PSL-1223 to the master branch

* compilation fixes
diff --git a/build-aux/vs2022/libbitcoin_util/libbitcoin_util.vcxproj b/build-aux/vs2022/libbitcoin_util/libbitcoin_util.vcxproj
@@ -109,6 +109,7 @@
     <ClCompile Include="..\..\..\src\utils\bech32.cpp" />
     <ClCompile Include="..\..\..\src\utils\datacompressor.cpp" />
     <ClCompile Include="..\..\..\src\utils\hash.cpp" />
+    <ClCompile Include="..\..\..\src\utils\logmanager.cpp" />
     <ClCompile Include="..\..\..\src\utils\ping_util.cpp" />
     <ClCompile Include="..\..\..\src\utils\random.cpp" />
     <ClCompile Include="..\..\..\src\utils\scheduler.cpp" />
@@ -146,6 +147,7 @@
     <ClInclude Include="..\..\..\src\utils\enum_util.h" />
     <ClInclude Include="..\..\..\src\utils\fs.h" />
     <ClInclude Include="..\..\..\src\utils\hash.h" />
+    <ClInclude Include="..\..\..\src\utils\logmanager.h" />
     <ClInclude Include="..\..\..\src\utils\map_types.h" />
     <ClInclude Include="..\..\..\src\utils\numeric_range.h" />
     <ClInclude Include="..\..\..\src\utils\ping_util.h" />
diff --git a/build-aux/vs2022/libbitcoin_util/libbitcoin_util.vcxproj.filters b/build-aux/vs2022/libbitcoin_util/libbitcoin_util.vcxproj.filters
@@ -100,6 +100,9 @@
     <ClCompile Include="..\..\..\src\utils\hash.cpp">
       <Filter>Source Files\utils</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\logmanager.cpp">
+      <Filter>Source Files\utils</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\compat\byteswap.h">
@@ -249,5 +252,8 @@
     <ClInclude Include="..\..\..\src\utils\hash.h">
       <Filter>Source Files\utils</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\utils\logmanager.h">
+      <Filter>Source Files\utils</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_REVISION, 7)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_ZC_BUILD_VAL,
     m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD),
         m4_eval(_CLIENT_VERSION_BUILD < 50), 1, 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -252,6 +252,7 @@ UTILS_CPP = \
   utils/bech32.cpp \
   utils/datacompressor.cpp \
   utils/hash.cpp \
+  utils/logmanager.cpp \
   utils/ping_util.cpp \
   utils/random.cpp \
   utils/scheduler.cpp \
@@ -272,6 +273,7 @@ UTILS_H = \
   utils/enum_util.h \
   utils/fs.h \
   utils/hash.h \
+  utils/logmanager.h \
   utils/map_types.h \
   utils/numeric_range.h \
   utils/ping_util.h \
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 2
 #define CLIENT_VERSION_REVISION 7
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true
diff --git a/src/compat.h b/src/compat.h
@@ -12,7 +12,7 @@
 #ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
 #endif
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0601
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
 #endif
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -12,6 +12,8 @@
 #include <thread>
 #include <functional>
 
+#include <compat.h>
+
 #include <event2/buffer.h>
 #include <event2/event.h>
 #include <event2/http.h>
diff --git a/src/init.cpp b/src/init.cpp
@@ -169,8 +169,32 @@ class CCoinsViewErrorCatcher : public CCoinsViewBacked
     // Writes do not need similar protection, as failure to write is handled by the caller.
 };
 
+class CLogRotationManager : public CStoppableServiceThread
+{
+public:
+    CLogRotationManager() :
+        CStoppableServiceThread("logrt")
+    {}
+    static constexpr auto LOG_ROTATION_INTERVAL = chrono::minutes(10);
+
+    void execute() override
+    {
+        // check if debug log needs to be rotated every 10 minutes
+        while (!shouldStop())
+        {
+            unique_lock lock(m_mutex);
+            if (m_condVar.wait_for(lock, LOG_ROTATION_INTERVAL) == cv_status::timeout)
+            {
+                if (gl_LogMgr)
+                    gl_LogMgr->ShrinkDebugLogFile();
+            }
+        }
+    }
+};
+
 static unique_ptr<CCoinsViewDB> gl_pCoinsDbView;
 static unique_ptr<CCoinsViewErrorCatcher> pCoinsCatcher;
+static shared_ptr<CLogRotationManager> gl_LogRotationManager;
 
 void Interrupt(CServiceThreadGroup& threadGroup, CScheduler &scheduler)
 {
@@ -180,6 +204,8 @@ void Interrupt(CServiceThreadGroup& threadGroup, CScheduler &scheduler)
     InterruptREST();
     threadGroup.stop_all();
     scheduler.stop(false);
+    if (gl_LogRotationManager)
+        gl_LogRotationManager->stop();
 }
 
 void Shutdown(CServiceThreadGroup& threadGroup, CScheduler &scheduler)
@@ -197,6 +223,9 @@ void Shutdown(CServiceThreadGroup& threadGroup, CScheduler &scheduler)
     RenameThread("psl-shutoff");
     mempool.AddTransactionsUpdated(1);
 
+    if (gl_LogRotationManager)
+        gl_LogRotationManager->waitForStop();
+
     StopHTTPRPC();
     StopREST();
     StopRPC();
@@ -213,8 +242,12 @@ void Shutdown(CServiceThreadGroup& threadGroup, CScheduler &scheduler)
  #endif
 #endif
     StopNode();
+    LogFnPrintf("Waiting for Pastel threads to exit...");
     threadGroup.join_all();
+    LogFnPrintf("...done");
+    LogFnPrintf("Waiting for scheduler threads to exit...");
     scheduler.join_all();
+    LogFnPrintf("...done");
     UnregisterNodeSignals(GetNodeSignals());
 
     if (fFeeEstimatesInitialized)
@@ -290,7 +323,8 @@ void HandleSIGTERM(int)
 
 void HandleSIGHUP(int)
 {
-    fReopenDebugLog = true;
+    if (gl_LogMgr)
+        gl_LogMgr->ScheduleReopenDebugLog();
 }
 
 bool static InitError(const string &str)
@@ -796,6 +830,9 @@ bool AppInit2(CServiceThreadGroup& threadGroup, CScheduler& scheduler)
 {
     string strError;
 
+    if (!gl_LogMgr)
+        return InitError("Error: Log Manager is not initialized");
+
     // ********************************************************* Step 1: setup
 #ifdef _MSC_VER
     // Turn off Microsoft heap dump noise
@@ -866,7 +903,7 @@ bool AppInit2(CServiceThreadGroup& threadGroup, CScheduler& scheduler)
 
     // Set this early so that parameter interactions go to console
     string error;
-    if (!SetPrintToConsoleMode(error))
+    if (!gl_LogMgr->SetPrintToConsoleMode(error))
         return InitError(error);
     fLogTimestamps = GetBoolArg("-logtimestamps", true);
     fLogIPs = GetBoolArg("-logips", false);
@@ -1194,10 +1231,15 @@ bool AppInit2(CServiceThreadGroup& threadGroup, CScheduler& scheduler)
     CreatePidFile(GetPidFile(), getpid());
 #endif
     if (GetBoolArg("-shrinkdebugfile", !fDebug))
-        ShrinkDebugFile();
+        gl_LogMgr->ShrinkDebugLogFile(true);
 
-    if (fPrintToDebugLog)
-        OpenDebugLog();
+    gl_LogMgr->OpenDebugLogFile();
+    if (!gl_LogRotationManager)
+    {
+		gl_LogRotationManager = make_unique<CLogRotationManager>();
+		if (threadGroup.add_thread(error, gl_LogRotationManager, true) == INVALID_THREAD_OBJECT_ID)
+			return InitError(translate("Failed to create log rotation thread. ") + error);
+    }
 
     LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION_STRING));
 #ifdef ENABLE_WALLET
@@ -1226,7 +1268,7 @@ bool AppInit2(CServiceThreadGroup& threadGroup, CScheduler& scheduler)
 
     if (!chainparams.IsRegTest() &&
             GetBoolArg("-showmetrics", isatty(STDOUT_FILENO)) &&
-            !IsPrintToConsole() && !GetBoolArg("-daemon", false))
+            !gl_LogMgr->IsPrintToConsole() && !GetBoolArg("-daemon", false))
     {
         // Start the persistent metrics interface
         ConnectMetricsScreen();
@@ -1240,6 +1282,7 @@ bool AppInit2(CServiceThreadGroup& threadGroup, CScheduler& scheduler)
     libsnark::inhibit_profiling_counters = true;
 
     // Initialize Zcash circuit parameters
+    uiInterface.InitMessage(translate("Initializing chain parameters..."));
     ZC_LoadParams(chainparams);
 
     /* Start the RPC server already.  It will be started in "warmup" mode
diff --git a/src/net.cpp b/src/net.cpp
@@ -12,15 +12,13 @@
 #include <algorithm>
 #include <functional>
 #include <random>
+
+#include <compat.h>
+
 #ifdef WIN32
 #include <string.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
 #include <iphlpapi.h>
 #include <wininet.h>
-#else
-#include <fcntl.h>
-#include <ifaddrs.h>
 #endif
 
 #include <extlibs/scope_guard.hpp>
diff --git a/src/pasteld.cpp b/src/pasteld.cpp
@@ -58,6 +58,9 @@ void WaitForShutdown(CServiceThreadGroup& threadGroup, CScheduler &scheduler)
 //
 bool AppInit(int argc, char* argv[])
 {
+    if (!gl_LogMgr)
+        gl_LogMgr = make_unique<CLogManager>();
+
     CServiceThreadGroup threadGroup;
     CScheduler scheduler("scheduler");
 
@@ -180,6 +183,12 @@ bool AppInit(int argc, char* argv[])
         WaitForShutdown(threadGroup, scheduler);
     Shutdown(threadGroup, scheduler);
 
+    if (gl_LogMgr)
+    {
+        LogPrintf("Shutdown: log file closed\n");
+		gl_LogMgr->CloseDebugLogFile();
+		gl_LogMgr.reset();
+	}
     return fRet;
 }
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -22,14 +22,14 @@
 #include <rpc/server.h>
 #include <rpc/chain-rpc-utils.h>
 #include <rpc/rpc_consts.h>
+#include <rpc/rpc-utils.h>
 #ifdef ENABLE_WALLET
 #include <wallet/wallet.h>
 #include <wallet/walletdb.h>
 #endif
 #include <netmsg/nodemanager.h>
 
 #include <zcash/Address.hpp>
-#include "rpc-utils.h"
 
 using namespace std;
 
@@ -357,11 +357,11 @@ CScript _createmultisig_redeemScript(const UniValue& params)
             throw runtime_error(" Invalid public key: "+ks);
         }
     }
-    CScript result = GetScriptForMultisig(nRequired, pubkeys);
+    CScript result = GetScriptForMultisig(static_cast<int>(nRequired), pubkeys);
 
     if (result.size() > MAX_SCRIPT_ELEMENT_SIZE)
         throw runtime_error(
-                strprintf("redeemScript exceeds size limit: %d > %d", result.size(), MAX_SCRIPT_ELEMENT_SIZE));
+                strprintf("redeemScript exceeds size limit: %u > %u", result.size(), MAX_SCRIPT_ELEMENT_SIZE));
 
     return result;
 }
@@ -1157,7 +1157,7 @@ OR, if "simple" is true:
     rpcDisabledThrowMsg(fInsightExplorer, RPC_API_GETADDRESSUTXOS);
 
     bool simpleInfo = false;
-    int64_t height = 0;
+    uint32_t height = 0;
     string senderFilter = "";
     if (params[0].isObject())
     {
@@ -1166,7 +1166,11 @@ OR, if "simple" is true:
             simpleInfo = get_bool_value(simple);
         UniValue minHeight = find_value(params[0].get_obj(), "minHeight");
         if (!minHeight.isNull())
-            height = get_long_number(minHeight);
+        {
+            int64_t nParamMinHeight = get_long_number(minHeight);
+            rpc_check_unsigned_param<uint32_t>("minHeight", nParamMinHeight);
+            height = static_cast<uint32_t>(nParamMinHeight);
+        }
         UniValue sender = find_value(params[0].get_obj(), "sender");
         if (!sender.isNull())
             senderFilter = sender.get_str();
@@ -1316,7 +1320,9 @@ Returns the txid and index where an output is spent.
     if (!indexValue.isNum())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid index, must be an integer");
     uint256 txid = ParseHashV(txidValue, "txid");
-    auto outputIndex = get_long_number(indexValue);
+    int64_t nParamOutputIndex = get_long_number(indexValue);
+    rpc_check_unsigned_param<uint32_t>("index", nParamOutputIndex);
+    uint32_t outputIndex = static_cast<uint32_t>(nParamOutputIndex);
 
     CSpentIndexKey key(txid, outputIndex);
     CSpentIndexValue value;
diff --git a/src/utils/logmanager.cpp b/src/utils/logmanager.cpp
diff --git a/src/utils/logmanager.h b/src/utils/logmanager.h
diff --git a/src/utils/sync.cpp b/src/utils/sync.cpp
diff --git a/src/utils/util.cpp b/src/utils/util.cpp
diff --git a/src/utils/util.h b/src/utils/util.h
