Fixes after merging upstream

Groestlcoin · Oct 31, 2024 · 63136de · 63136de
1 parent c6e139b
commit 63136de
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 5 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -46,7 +46,7 @@ void ReadSigNetArgs(const ArgsManager& args, CChainParams::SigNetOptions& option
 void ReadRegTestArgs(const ArgsManager& args, CChainParams::RegTestOptions& options)
 {
     if (auto value = args.GetBoolArg("-fastprune")) options.fastprune = *value;
-    if (HasTestOption(args, "bip94")) options.enforce_bip94 = true;
+    if (HasTestOption(args, "bip94")) options.enforce_bip94 = false; // GRS
 
     for (const std::string& arg : args.GetArgs("-testactivationheight")) {
         const auto found{arg.find('@')};

diff --git a/src/groestlcoin-wallet-res.rc b/src/groestlcoin-wallet-res.rc
@@ -15,14 +15,14 @@ BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
             VALUE "CompanyName",        "Groestlcoin"
-            VALUE "FileDescription",    "groestlcoin-wallet (CLI tool for " PACKAGE_NAME " wallets)"
-            VALUE "FileVersion",        PACKAGE_VERSION
+            VALUE "FileDescription",    "groestlcoin-wallet (CLI tool for " CLIENT_NAME " wallets)"
+            VALUE "FileVersion",        CLIENT_VERSION_STRING
             VALUE "InternalName",       "groestlcoin-wallet"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "groestlcoin-wallet.exe"
             VALUE "ProductName",        "groestlcoin-wallet"
-            VALUE "ProductVersion",     PACKAGE_VERSION
+            VALUE "ProductVersion",     CLIENT_VERSION_STRING
         END
     END
 

diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -226,7 +226,7 @@ add_executable(groestlcoin-qt
   ../init/groestlcoin-qt.cpp
 )
 
-add_windows_resources(groestlcoin-qt res/bitcoin-qt-res.rc)
+add_windows_resources(groestlcoin-qt res/groestlcoin-qt-res.rc)
 
 target_link_libraries(groestlcoin-qt
   core_interface

diff --git a/src/qt/res/groestlcoin-qt-res.rc b/src/qt/res/groestlcoin-qt-res.rc
@@ -0,0 +1,41 @@
+IDI_ICON1 ICON DISCARDABLE "icons/groestlcoin.ico"
+IDI_ICON2 ICON DISCARDABLE "icons/groestlcoin_testnet.ico"
+IDI_ICON3 ICON DISCARDABLE "icons/groestlcoin_signet.ico"
+IDI_ICON4 ICON DISCARDABLE "icons/groestlcoin_testnet.ico" // testnet4
+
+#include <windows.h>             // needed for VERSIONINFO
+#include "../../clientversion.h" // holds the needed client version information
+#define PACKAGE_NAME "Groestlcoin Core"
+
+#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
+#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
+#define VER_FILEVERSION        VER_PRODUCTVERSION
+#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEOS          VOS_NT_WINDOWS32
+FILETYPE        VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4" // U.S. English - multilingual (hex)
+        BEGIN
+            VALUE "CompanyName",        "Groestlcoin"
+            VALUE "FileDescription",    CLIENT_NAME " (GUI node for Groestlcoin)"
+            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "InternalName",       "groestlcoin-qt"
+            VALUE "LegalCopyright",     COPYRIGHT_STR
+            VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
+            VALUE "OriginalFilename",   "groestlcoin-qt.exe"
+            VALUE "ProductName",        CLIENT_NAME
+            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal)
+    END
+END