Bump core to 1.7.3, rename misc global wallet constants and variables…

… not to interfere with core (like version, project name etc.) this fixes warnings about makro redefinition, tell Windows where Boost is
seredat · May 1, 2020 · a732ccb · a732ccb
1 parent 3561465
commit a732ccb
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 49 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
           git clone https://github.com/seredat/karbowanec cryptonote
           mkdir "$build_folder"
           cd "$build_folder"
-          Start-Process cmake -ArgumentList "-G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait
+          Start-Process cmake -ArgumentList "-DBOOST_ROOT=""$env:BOOST_ROOT_1_69_0"" -G ""Visual Studio 16 2019"" -A x64",".." -NoNewWindow -Wait
           Start-Process msbuild -ArgumentList "KarbowanecWallet.sln","/p:Configuration=Release" -NoNewWindow -Wait
           $build_path = "./$build_folder"
           echo "::set-output name=build_path::${build_path}"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 
+# Required for finding Threads on ARM
+enable_language(C)
+enable_language(CXX)
+
 include(CryptoNoteWallet.cmake)
 include(external/ext.cmake)
 
@@ -33,7 +37,7 @@ if(ARCH_ID STREQUAL "ppc64le")
   set(PPC64LE 1)
 endif()
 
-project(${CN_PROJECT_NAME})
+project(${WALLET_NAME})
 
 execute_process(COMMAND git log -1 --pretty=format:%h
 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -87,7 +91,7 @@ configure_file(
     @ONLY
 )
 
-add_definitions(-DVERSION=\"${CN_VERSION}\")
+add_definitions(-DVERSION=\"${WALLET_VERSION}\")
 add_definitions(-DGIT_REVISION=\"${GIT_REVISION}\")
 add_definitions(-DUPNP_STATIC -DMINIUPNP_STATICLIB -DUPNPC_BUILD_STATIC)
 
@@ -471,8 +475,8 @@ qt5_use_modules(${PROJECT_NAME} Widgets Gui Network)
 
 # Installation
 
-set(CPACK_PACKAGE_NAME ${CN_PROJECT_NAME})
-set(CPACK_PACKAGE_VERSION ${CN_VERSION})
+set(CPACK_PACKAGE_NAME ${WALLET_NAME})
+set(CPACK_PACKAGE_VERSION ${WALLET_VERSION})
 set(CPACK_PACKAGE_VENDOR "Karbowanec-project")
 set(CPACK_PACKAGE_CONTACT "https://karbo.org")
 set(CPACK_STRIP_FILES ON)
@@ -494,7 +498,7 @@ elseif (UNIX)
     if (RPMBUILD)
         set(CPACK_GENERATOR "RPM;DEB")
         set(CPACK_SYSTEM_NAME x86_64)
-        set(CPACK_RPM_PACKAGE_RELEASE ${CN_VERSION})
+        set(CPACK_RPM_PACKAGE_RELEASE ${WALLET_VERSION})
         set(CPACK_RPM_PACKAGE_LICENSE "MIT")
         set(CPACK_RPM_PACKAGE_GROUP Office)
         set(CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase >= 5.3.2, qt5-qtbase-gui >= 5.3.2")

diff --git a/CryptoNoteWallet.cmake b/CryptoNoteWallet.cmake
@@ -1,5 +1,5 @@
 
-set(CN_PROJECT_NAME "KarbowanecWallet")
+set(WALLET_NAME "KarbowanecWallet")
 set(CN_CURRENCY_DISPLAY_NAME "Karbo")
 set(CN_CURRENCY_TICKER "KRB")
 
@@ -17,30 +17,30 @@ if(GIT_FOUND)
     ERROR_STRIP_TRAILING_WHITESPACE)
   if(NOT WALLET_GIT_RESULT EQUAL 0)
     set(WALLET_GIT_TAG "0.0.0")
-	set(PROJECT_VER_MAJOR 0)
-	set(PROJECT_VER_MINOR 0)
-	set(PROJECT_VER_PATCH 0)
+	set(WALLET_VER_MAJOR 0)
+	set(WALLET_VER_MINOR 0)
+	set(WALLET_VER_PATCH 0)
     message(WARNING "Failed to execute Git: ${WALLET_GIT_ERROR}")
   else()
     string(REPLACE "v." "" WALLET_GIT_TAG ${WALLET_GIT_TAG})
 
     # Parse and split a version number into separate components
 	string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?" "\\1;\\2;\\3;\\4" VERSION_MATCHES ${WALLET_GIT_TAG})
     list(GET VERSION_MATCHES 0 version_major)
-    set(PROJECT_VER_MAJOR ${version_major})
+    set(WALLET_VER_MAJOR ${version_major})
     list(GET VERSION_MATCHES 1 version_minor)
-    set(PROJECT_VER_MINOR ${version_minor})
+    set(WALLET_VER_MINOR ${version_minor})
     list(GET VERSION_MATCHES 2 version_patch)
-    set(PROJECT_VER_PATCH ${version_patch})
+    set(WALLET_VER_PATCH ${version_patch})
 
     message(STATUS "Wallet git tag: ${WALLET_GIT_TAG}")
   endif()
 endif()  
 
-set(PROJECT_VER_BUILD 1) # this one was always 1 anyways
+set(WALLET_VER_BUILD 1) # this one was always 1 anyways
 
-set(PROJECT_VENDOR_NAME "Karbo Developers")
-set(PROJECT_COPYRIGHT "Copyright 2016-2020 ${PROJECT_VENDOR_NAME}")
-set(PROJECT_VENDOR_URL "https://karbo.org")
+set(WALLET_VENDOR_NAME "Karbo Developers")
+set(WALLET_COPYRIGHT "Copyright 2016-2020 ${PROJECT_VENDOR_NAME}")
+set(WALLET_VENDOR_URL "https://karbo.org")
 
-set(CN_VERSION "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
+set(WALLET_VERSION "${WALLET_VER_MAJOR}.${WALLET_VER_MINOR}.${WALLET_VER_PATCH}")
diff --git a/cryptonote b/cryptonote
diff --git a/src/CryptoNoteWalletConfig.h.in b/src/CryptoNoteWalletConfig.h.in
@@ -6,14 +6,14 @@ namespace WalletGui {
 const char WALLET_CURRENCY_DISPLAY_NAME[] = "@CN_CURRENCY_DISPLAY_NAME@";
 const char WALLET_CURRENCY_TICKER[] = "@CN_CURRENCY_TICKER@";
 
-#define PROJECT_NAME "@CN_PROJECT_NAME@"
-#define PROJECT_DESCRIPTION "@CN_CURRENCY_DISPLAY_NAME@ Wallet v. @CN_VERSION@"
-#define PROJECT_SITE "@PROJECT_VENDOR_URL@"
-#define PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@"
-#define PROJECT_VERSION "@CN_VERSION@"
-#define PROJECT_VER_MAJOR @PROJECT_VER_MAJOR@
-#define PROJECT_VER_MINOR @PROJECT_VER_MINOR@
-#define PROJECT_VER_PATCH @PROJECT_VER_PATCH@
-#define PROJECT_VER_BUILD @PROJECT_VER_BUILD@
+#define WALLET_NAME        "@WALLET_NAME@"
+#define WALLET_DESCRIPTION "@CN_CURRENCY_DISPLAY_NAME@ Wallet v. @WALLET_VERSION@"
+#define WALLET_SITE        "@WALLET_VENDOR_URL@"
+#define WALLET_COPYRIGHT   "@WALLET_COPYRIGHT@"
+#define WALLET_VERSION     "@WALLET_VERSION@"
+#define WALLET_VER_MAJOR    @WALLET_VER_MAJOR@
+#define WALLET_VER_MINOR    @WALLET_VER_MINOR@
+#define WALLET_VER_PATCH    @WALLET_VER_PATCH@
+#define WALLET_VER_BUILD    @WALLET_VER_BUILD@
 
 }
diff --git a/src/Info.plist.in b/src/Info.plist.in
@@ -5,27 +5,27 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>@CN_PROJECT_NAME@</string>
+	<string>@WALLET_NAME@</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Karbo Wallet v. @CN_VERSION@</string>
+	<string>Karbo Wallet v. @WALLET_VERSION@</string>
 	<key>CFBundleIconFile</key>
 	<string>karbowanec.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.karbowanec.Karbowanec-Qt</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>@CN_VERSION@</string>
+	<string>@WALLET_VERSION@</string>
 	<key>CFBundleName</key>
 	<string>Karbo Wallet</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@CN_VERSION@</string>
+	<string>@WALLET_VERSION@</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>karbowanec@CN_VERSION@</string>
+	<string>karbowanec@WALLET_VERSION@</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Settings.cpp b/src/Settings.cpp
@@ -15,6 +15,7 @@
 #include <Common/Util.h>
 #include "CommandLineParser.h"
 #include "CurrencyAdapter.h"
+#include "CryptoNoteWalletConfig.h"
 #include "Settings.h"
 
 namespace WalletGui {
@@ -217,7 +218,7 @@ bool Settings::isTrackingMode() const {
 }
 
 QString Settings::getVersion() const {
-  return VERSION;
+  return WALLET_VERSION;
 }
 
 QString Settings::getCurrentTheme() const {

diff --git a/src/WindowsInstall.nsi.in b/src/WindowsInstall.nsi.in
@@ -1,11 +1,11 @@
 Name "Karbo Wallet (64-bit)"
 
 # General Symbol Definitions
-!define PROJECT_NAME "@CN_PROJECT_NAME@"
-!define PROJECT_VERSION "@CN_VERSION@"
+!define PROJECT_NAME "@WALLET_NAME@"
+!define PROJECT_VERSION "@WALLET_VERSION@"
 !define REGKEY "SOFTWARE\$(^Name)"
-!define COMPANY "@PROJECT_VENDOR_NAME@"
-!define URL "@PROJECT_VENDOR_URL@"
+!define COMPANY "@WALLET_VENDOR_NAME@"
+!define URL "@WALLET_VENDOR_URL@"
 
 RequestExecutionLevel highest
 SetCompressor /SOLID lzma
@@ -55,7 +55,7 @@ InstallDir $PROGRAMFILES64\Karbowanec
 CRCCheck on
 BrandingText "@CN_CURRENCY_DISPLAY_NAME@ Wallet"
 ShowInstDetails show
-VIProductVersion @PROJECT_VER_MAJOR@.@PROJECT_VER_MINOR@.@PROJECT_VER_PATCH@.@PROJECT_VER_BUILD@
+VIProductVersion @WALLET_VER_MAJOR@.@WALLET_VER_MINOR@.@WALLET_VER_PATCH@.@WALLET_VER_BUILD@
 VIAddVersionKey ProductName "${PROJECT_NAME}"
 VIAddVersionKey ProductVersion "${PROJECT_VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"

diff --git a/src/cryptonotewallet.rc b/src/cryptonotewallet.rc
@@ -9,19 +9,19 @@ IDI_ICON1               ICON    "images\karbowanez.ico"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-PRODUCTVERSION  PROJECT_VER_MAJOR,PROJECT_VER_MINOR,PROJECT_VER_PATCH,PROJECT_VER_BUILD
+PRODUCTVERSION  WALLET_VER_MAJOR,WALLET_VER_MINOR,WALLET_VER_PATCH,WALLET_VER_BUILD
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904E4"
         BEGIN
-            VALUE "FileDescription",    PROJECT_DESCRIPTION
+            VALUE "FileDescription",    WALLET_DESCRIPTION
             VALUE "FileVersion",        VER_FILEVERSION_STR
-            VALUE "InternalName",       PROJECT_NAME
-            VALUE "LegalCopyright",     PROJECT_COPYRIGHT
+            VALUE "InternalName",       WALLET_NAME
+            VALUE "LegalCopyright",     WALLET_COPYRIGHT
             VALUE "OriginalFilename",   VER_ORIGINALFILENAME_STR
-            VALUE "ProductName",        PROJECT_NAME
-            VALUE "ProductVersion",     PROJECT_VERSION
+            VALUE "ProductName",        WALLET_NAME
+            VALUE "ProductVersion",     WALLET_VERSION
         END
     END
 

diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
@@ -16,8 +16,8 @@ AboutDialog::AboutDialog(QWidget* _parent) : QDialog(_parent), m_ui(new Ui::Abou
   m_ui->setupUi(this);
   setWindowTitle(QString(tr("About %1 Wallet")).arg(CurrencyAdapter::instance().getCurrencyDisplayName()));
   QString aboutText = m_ui->m_aboutLabel->text();
-  m_ui->m_aboutLabel->setText(aboutText.arg(VERSION));
-  m_ui->m_aboutLabel->setText(aboutText.arg(VERSION " (" GIT_REVISION ")").arg(PROJECT_VERSION_LONG));
+  m_ui->m_aboutLabel->setText(aboutText.arg(WALLET_VERSION));
+  m_ui->m_aboutLabel->setText(aboutText.arg(WALLET_VERSION " (" GIT_REVISION ")").arg(PROJECT_VERSION_LONG));
 }
 
 AboutDialog::~AboutDialog() {

diff --git a/src/karbowanecwallet.desktop.in b/src/karbowanecwallet.desktop.in
@@ -23,10 +23,10 @@ Comment[fr]=Portefeuille Karbo
 Comment[jp]=カルボ財布
 Comment[cn]=卡博币钱包
 Comment[kr]=카르보 지갑
-Exec=@CN_PROJECT_NAME@ %U
+Exec=@WALLET_NAME@ %U
 Terminal=false
 Type=Application
 Icon=karbowanec
 MimeType=x-scheme-handler/karbowanec;
 Categories=Office;Finance;
-Version=@CN_VERSION@
+Version=@WALLET_VERSION@
+1 −1		.github/workflows/check.yml
+1 −1		.github/workflows/release.yml
+2 −0		README.md
+4,063 −0		external/parallel_hashmap/btree.h
+36 −0		external/parallel_hashmap/conanfile.py
+195 −0		external/parallel_hashmap/meminfo.h
+4,388 −0		external/parallel_hashmap/phmap.h
+5,167 −0		external/parallel_hashmap/phmap_base.h
+663 −0		external/parallel_hashmap/phmap_bits.h
+756 −0		external/parallel_hashmap/phmap_config.h
+227 −0		external/parallel_hashmap/phmap_dump.h
+154 −0		external/parallel_hashmap/phmap_fwd_decl.h
+370 −0		external/parallel_hashmap/phmap_utils.h
+15 −13		include/BlockchainExplorerData.h
+2 −0		src/BlockchainExplorer/BlockchainExplorerDataBuilder.cpp
+1 −1		src/BlockchainExplorer/BlockchainExplorerDataBuilder.h
+1 −0		src/CMakeLists.txt
+2 −1		src/CheckpointsData.h
+91 −0		src/Common/Math.h
+12 −0		src/Common/StringTools.cpp
+28 −2		src/Common/StringTools.h
+13 −13		src/CryptoNoteConfig.h
+50 −20		src/CryptoNoteCore/Blockchain.cpp
+10 −8		src/CryptoNoteCore/Blockchain.h
+5 −1		src/CryptoNoteCore/BlockchainIndices.h
+1 −1		src/CryptoNoteCore/Checkpoints.h
+48 −39		src/CryptoNoteCore/Core.cpp
+5 −5		src/CryptoNoteCore/Core.h
+58 −50		src/CryptoNoteCore/Currency.cpp
+4 −4		src/CryptoNoteCore/Currency.h
+1 −1		src/CryptoNoteCore/ICore.h
+2 −2		src/CryptoNoteCore/TransactionPool.cpp
+1 −1		src/NodeRpcProxy/NodeRpcProxy.cpp
+11 −16		src/Rpc/CoreRpcServerCommandsDefinitions.h
+9 −10		src/Rpc/HttpServer.cpp
+245 −23		src/Rpc/RpcServer.cpp
+5 −1		src/Rpc/RpcServer.h
+1 −0		src/Serialization/BlockchainExplorerDataSerialization.cpp
+14 −0		src/Serialization/SerializationOverloads.h