- trivial: Add and update copyright headers in Gridcoin files #1897 (@…

…cyrossignol)

 - refactor: port chainparams #1878 (@div72)
 - gui: Update default font to Inter-Regular and console font to Inconsolata (@opsinphark, @jamescowens)
 - gui: Add "review beacon verification" button to wizard summary page #1912 (@cyrossignol)
 - rpc, wallet: Implement liststakes #1909 (@jamescowens)
 - rpc: Add "getlaststake" RPC function #1913 (@cyrossignol)
 - gui: Install bold variant of Inter font #1914 (@cyrossignol)

 - refactor: Consolidate Gridcoin-specific code #1894 (@cyrossignol)
 - script: Setup improvements #1895 (@nathanielcwm)
 - gui: Diagnostics refresh #1899 (@jamescowens)
 - superblock: Optimize superblock size calculation #1906 (@cyrossignol)
 - gui: Adjust stylesheets and scale icons to improve HiDPI side toolbar display #1911 (@jamescowens)
 - doc: Tell user to disable win32 application support in WSL (for building) #1917 (@nathanielcwm)
 - rpc: Revise and expand help for beaconconvergence rpc call #1918 (@jamescowens)
 - scheduler: Increase default update check interval to 5 days #1920 (@cyrossignol)
 - gui: Prevent multiple dialogs from being open at the same time #1922 (@scribblemaniac)

 - refactor: Clean up remaining legacy timer code #1892 (@cyrossignol)

 - build: Add --without-brotli option to curl.mk #1902 (@G_UK)
 - test: Remove fs_tests... file after the fs test #1903 (@div72)
 - util, gui: Fix shutdown segfault and repair broken overview page staking status #1901 (@jamescowens)
 - scraper: Fix order of destruction for global scraper objects #1904 (@cyrossignol)
 - scraper: Fix global object destruction order for MacOS #1905 (@cyrossignol)
 - util: Decouple out-of-sync state from block acceptance #1921 (@cyrossignol)

CHANGELOG.md

@@ -4,6 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.0.2.0] 2020-10-08, leisure
+### Added
+ - trivial: Add and update copyright headers in Gridcoin files #1897 (@cyrossignol)
+ - refactor: port chainparams #1878 (@div72)
+ - gui: Update default font to Inter-Regular and console font to Inconsolata (@opsinphark, @jamescowens)
+ - gui: Add "review beacon verification" button to wizard summary page #1912 (@cyrossignol)
+ - rpc, wallet: Implement liststakes #1909 (@jamescowens)
+ - rpc: Add "getlaststake" RPC function #1913 (@cyrossignol)
+ - gui: Install bold variant of Inter font #1914 (@cyrossignol)
+
+### Changed
+ - refactor: Consolidate Gridcoin-specific code #1894 (@cyrossignol)
+ - script: Setup improvements #1895 (@nathanielcwm)
+ - gui: Diagnostics refresh #1899 (@jamescowens)
+ - superblock: Optimize superblock size calculation #1906 (@cyrossignol)
+ - gui: Adjust stylesheets and scale icons to improve HiDPI side toolbar display #1911 (@jamescowens)
+ - doc: Tell user to disable win32 application support in WSL (for building) #1917 (@nathanielcwm)
+ - rpc: Revise and expand help for beaconconvergence rpc call #1918 (@jamescowens)
+ - scheduler: Increase default update check interval to 5 days #1920 (@cyrossignol)
+ - gui: Prevent multiple dialogs from being open at the same time #1922 (@scribblemaniac)
+
+### Removed
+ - refactor: Clean up remaining legacy timer code #1892 (@cyrossignol)
+
+### Fixed
+ - build: Add --without-brotli option to curl.mk #1902 (@G_UK)
+ - test: Remove fs_tests... file after the fs test #1903 (@div72)
+ - util, gui: Fix shutdown segfault and repair broken overview page staking status #1901 (@jamescowens)
+ - scraper: Fix order of destruction for global scraper objects #1904 (@cyrossignol)
+ - scraper: Fix global object destruction order for MacOS #1905 (@cyrossignol)
+ - util: Decouple out-of-sync state from block acceptance #1921 (@cyrossignol)
+
 ## [5.0.1.0] 2020-09-20, leisure
 ### Added
  - wallet, rpc: Implement backup file management functionality #1735 (@jamescowens)

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)

depends/packages/curl.mk

@@ -9,6 +9,7 @@ $(package)_dependencies=openssl
 define $(package)_set_vars
   $(package)_config_opts=--disable-shared
   $(package)_config_opts+= --enable-static
+  $(package)_config_opts+= --without-brotli
   $(package)_config_opts_release+=--disable-debug-mode
   $(package)_config_opts_linux+=--with-pic
   # Disable OpenSSL for Windows and use native SSL stack (SSPI/Schannel):

doc/build-windows.md

@@ -64,6 +64,9 @@ First, install the general dependencies:
 A host toolchain (`build-essential`) is necessary because some dependency
 packages need to build host utilities that are used in the build process.
 
+If you want to build the windows installer with `make deploy` you need [NSIS](https://nsis.sourceforge.io/Main_Page):
+
+    sudo apt install nsis
 
 Acquire the source in the usual way:
 
@@ -87,15 +90,22 @@ Note that for WSL the Gridcoin source path MUST be somewhere in the default moun
 example /usr/src/Gridcoin-Research, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
 This means you cannot use a directory that is located directly on the host Windows file system to perform the build.
 
+Additional WSL Note: WSL support for [launching Win32 applications](https://docs.microsoft.com/en-us/archive/blogs/wsl/windows-and-ubuntu-interoperability#launching-win32-applications-from-within-wsl)
+results in `Autoconf` configure scripts being able to execute Windows Portable Executable files. This can cause
+unexpected behaviour during the build, such as Win32 error dialogs for missing libraries. The recommended approach
+is to temporarily disable WSL support for Win32 applications.
+
 Build using:
 
     PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var
+    sudo bash -c "echo 0 > /proc/sys/fs/binfmt_misc/status" # Disable WSL support for Win32 applications.
     cd depends
     make HOST=x86_64-w64-mingw32
     cd ..
     ./autogen.sh # not required when building from tarball
     CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/
     make
+    sudo bash -c "echo 1 > /proc/sys/fs/binfmt_misc/status" # Enable WSL support for Win32 applications.
 
 ## Building for 32-bit Windows
 
@@ -117,12 +127,14 @@ For WSL use:
 
 Then build using:
 
+    sudo bash -c "echo 0 > /proc/sys/fs/binfmt_misc/status" # Disable WSL support for Win32 applications.
     cd depends
     make HOST=i686-w64-mingw32
     cd ..
     ./autogen.sh # not required when building from tarball
     CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/
     make
+    sudo bash -c "echo 1 > /proc/sys/fs/binfmt_misc/status" # Enable WSL support for Win32 applications.
 
 ## Depends system
 
@@ -137,3 +149,6 @@ as they appear in the release `.zip` archive. This can be done in the following
 way. This will install to `c:\workspace\Gridcoin-Research`, for example:
 
     make install DESTDIR=/mnt/c/workspace/Gridcoin-Research
+You can also create an installer using:
+
+    make deploy

share/setup.nsi.in

@@ -17,6 +17,7 @@ SetCompressor /SOLID lzma
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
 !define MUI_HEADERIMAGE_BITMAP "${ICONDIR}\nsis-header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${ICONDIR}\nsis-wizard.bmp"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
@@ -161,13 +162,21 @@ Function .onInit
     ${If} ${RunningX64}
       ; disable registry redirection (enable access to 64-bit portion of registry)
       SetRegView 64
+      ReadRegStr $INSTDIR HKCU "${REGKEY}" "Path"
+      StrCmp $INSTDIR "" 0 rununin
+      StrCpy $INSTDIR $PROGRAMFILES64\GridcoinResearch
     ${Else}
       MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
       Abort
     ${EndIf}
+!else
+    ReadRegStr $INSTDIR HKCU "${REGKEY}" "Path"
+    StrCmp $INSTDIR "" 0 rununin
+    StrCpy $INSTDIR $PROGRAMFILES\GridcoinResearch
 !endif
-    Exec $INSTDIR\uninst.exe
-    Delete $INSTDIR\*"
+    rununin:
+      Exec $INSTDIR\uninst.exe
+      Delete $INSTDIR\*"
 FunctionEnd
 
 # Uninstaller functions

src/Makefile.am

@@ -60,47 +60,60 @@ GRIDCOIN_CORE_H = \
     addrdb.h \
     addrman.h \
     alert.h \
-    appcache.h \
     arith_uint256.h \
     attributes.h \
-    backup.h \
     banman.h \
     base58.h \
     bignum.h \
-    block.h \
-    boinc.h \
+    chainparams.h \
+    chainparamsbase.h \
     checkpoints.h \
     compat.h \
     compat/byteswap.h \
     compat/endian.h \
+    consensus/consensus.h \
+    consensus/params.h \
     crypter.h \
-    enumbytes.h \
-    filehash.h \
     fs.h \
     fwd.h \
-    global_objects.hpp \
-    global_objects_noui.hpp \
-    gridcoin.h \
     gridcoin/account.h \
     gridcoin/accrual/computer.h \
     gridcoin/accrual/newbie.h \
     gridcoin/accrual/null.h \
     gridcoin/accrual/research_age.h \
     gridcoin/accrual/snapshot.h \
+    gridcoin/appcache.h \
+    gridcoin/backup.h \
     gridcoin/beacon.h \
+    gridcoin/boinc.h \
     gridcoin/claim.h \
     gridcoin/contract/contract.h \
     gridcoin/contract/handler.h \
     gridcoin/contract/message.h \
     gridcoin/contract/payload.h \
     gridcoin/cpid.h \
+    gridcoin/gridcoin.h \
     gridcoin/magnitude.h \
     gridcoin/project.h \
     gridcoin/quorum.h \
     gridcoin/researcher.h \
+    gridcoin/scraper/fwd.h \
+    gridcoin/scraper/http.h \
+    gridcoin/scraper/scraper.h \
+    gridcoin/scraper/scraper_net.h \
+    gridcoin/staking/difficulty.h \
+    gridcoin/staking/exceptions.h \
+    gridcoin/staking/kernel.h \
+    gridcoin/staking/reward.h \
+    gridcoin/staking/status.h \
     gridcoin/superblock.h \
+    gridcoin/support/block_finder.h \
+    gridcoin/support/enumbytes.h \
+    gridcoin/support/filehash.h \
+    gridcoin/support/xml.h \
     gridcoin/tally.h \
     gridcoin/tx_message.h \
+    gridcoin/upgrade.h \
     gridcoin/voting/builders.h \
     gridcoin/voting/claims.h \
     gridcoin/voting/fwd.h \
@@ -111,7 +124,6 @@ GRIDCOIN_CORE_H = \
     gridcoin/voting/vote.h \
     hash.h \
     init.h \
-    kernel.h \
     key.h \
     keystore.h \
     logging.h \
@@ -128,10 +140,6 @@ GRIDCOIN_CORE_H = \
     rpcprotocol.h \
     rpcserver.h \
     scheduler.h \
-    scraper_net.h \
-    scraper/fwd.h \
-    scraper/http.h \
-    scraper/scraper.h \
     script.h \
     scrypt.h \
     serialize.h \
@@ -148,7 +156,6 @@ GRIDCOIN_CORE_H = \
     txdb-leveldb.h \
     ui_interface.h \
     uint256.h \
-    upgrade.h \
     util/memory.h \
     util/reverse_iterator.h \
     util/strencodings.h \
@@ -165,34 +172,44 @@ GRIDCOIN_CORE_H = \
 GRIDCOIN_CORE_CPP = addrdb.cpp \
     addrman.cpp \
     alert.cpp \
-    appcache.cpp \
     arith_uint256.cpp \
-    backup.cpp \
     banman.cpp \
-    block.cpp \
-    boinc.cpp \
+    chainparams.cpp \
+    chainparamsbase.cpp \
     checkpoints.cpp \
     crypter.cpp \
     fs.cpp \
-    gridcoin.cpp \
+    gridcoin/appcache.cpp \
+    gridcoin/backup.cpp \
     gridcoin/beacon.cpp \
+    gridcoin/boinc.cpp \
     gridcoin/claim.cpp \
     gridcoin/contract/contract.cpp \
     gridcoin/contract/message.cpp \
     gridcoin/cpid.cpp \
+    gridcoin/gridcoin.cpp \
     gridcoin/project.cpp \
     gridcoin/quorum.cpp \
     gridcoin/researcher.cpp \
+    gridcoin/scraper/http.cpp \
+    gridcoin/scraper/scraper.cpp \
+    gridcoin/scraper/scraper_net.cpp \
+    gridcoin/staking/difficulty.cpp \
+    gridcoin/staking/exceptions.cpp \
+    gridcoin/staking/kernel.cpp \
+    gridcoin/staking/reward.cpp \
+    gridcoin/staking/status.cpp \
     gridcoin/superblock.cpp \
+    gridcoin/support/block_finder.cpp \
     gridcoin/tally.cpp \
+    gridcoin/upgrade.cpp \
     gridcoin/voting/builders.cpp \
     gridcoin/voting/claims.cpp \
     gridcoin/voting/poll.cpp \
     gridcoin/voting/registry.cpp \
     gridcoin/voting/result.cpp \
     gridcoin/voting/vote.cpp \
     init.cpp \
-    kernel.cpp \
     key.cpp \
     keystore.cpp \
     logging.cpp \
@@ -213,9 +230,6 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     rpcrawtransaction.cpp \
     rpcserver.cpp \
     rpcvoting.cpp \
-    scraper_net.cpp \
-    scraper/http.cpp \
-    scraper/scraper.cpp \
     script.cpp \
     scrypt.cpp \
     scrypt-x86_64.S \
@@ -226,7 +240,6 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     sync.cpp \
     txdb-leveldb.cpp \
     uint256.cpp \
-    upgrade.cpp \
     util/strencodings.cpp \
     util/threadnames.cpp \
     util/time.cpp \

src/Makefile.qt.include

@@ -379,6 +379,11 @@ RES_IMAGES = \
   qt/res/images/ic_solo_inactive.svg \
   qt/res/images/splash3.png
 
+RES_FONTS = \
+  qt/res/fonts/Inconsolata-Regular.ttf \
+  qt/res/fonts/Inter-Bold.ttf \
+  qt/res/fonts/Inter-Regular.ttf
+
 RES_STYLESHEETS = \
   qt/res/stylesheets/light_stylesheet.qss \
   qt/res/stylesheets/native_stylesheet.qss \
@@ -403,7 +408,7 @@ qt_libgridcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(GRIDCOIN_INCLUDES) $(GRIDCOIN_QT_
 qt_libgridcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
 qt_libgridcoinqt_a_SOURCES = $(GRIDCOINRESEARCH_QT_CPP) $(GRIDCOINRESEARCH_QT_H) $(QT_FORMS_UI) \
-  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(RES_STYLESHEETS)
+  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_FONTS) $(RES_MOVIES) $(RES_STYLESHEETS)
 
 if TARGET_WINDOWS
 qt_libgridcoinqt_a_SOURCES += $(GRIDCOIN_CORE_H) $(GRIDCOIN_CORE_CPP)
@@ -462,7 +467,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
 	@rm $(@D)/temp_$(<F)
 
-$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(RES_STYLESHEETS) $(PROTOBUF_H)
+$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_FONTS) $(RES_MOVIES) $(RES_STYLESHEETS) $(PROTOBUF_H)
 	@test -f $(RCC)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@

src/Makefile.test.include

@@ -23,7 +23,6 @@ OTHER_TEST_FILES = \
 
 # test_n binary #
 GRIDCOIN_TESTS =\
-  test/appcache_tests.cpp \
   test/checkpoints_tests.cpp \
   test/dos_tests.cpp \
   test/accounting_tests.cpp \
@@ -32,15 +31,16 @@ GRIDCOIN_TESTS =\
   test/base58_tests.cpp \
   test/base64_tests.cpp \
   test/bignum_tests.cpp \
-  test/block_tests.cpp \
-  test/enumbytes.cpp \
   test/fs_tests.cpp \
   test/getarg_tests.cpp \
   test/gridcoin_tests.cpp \
+  test/gridcoin/appcache_tests.cpp \
+  test/gridcoin/block_finder_tests.cpp \
   test/gridcoin/beacon_tests.cpp \
   test/gridcoin/claim_tests.cpp \
   test/gridcoin/contract_tests.cpp \
   test/gridcoin/cpid_tests.cpp \
+  test/gridcoin/enumbytes_tests.cpp \
   test/gridcoin/magnitude_tests.cpp \
   test/gridcoin/project_tests.cpp \
   test/gridcoin/researcher_tests.cpp \

src/alert.cpp

@@ -9,6 +9,7 @@
 #include <map>
 
 #include "alert.h"
+#include "chainparams.h"
 #include "key.h"
 #include "net.h"
 #include "streams.h"
@@ -21,15 +22,6 @@ using namespace std;
 map<uint256, CAlert> mapAlerts;
 CCriticalSection cs_mapAlerts;
 
-// same as master project key now
-static const char* pszMainKey = "049ac003b3318d9fe28b2830f6a95a2624ce2a69fb0c0c7ac0b513efcc1e93a6a6e8eba84481155dd82f2f1104e0ff62c69d662b0094639b7106abc5d84f948c0a";
-
-// TestNet alerts pubKey
-static const char* pszTestKey = "0471dc165db490094d35cde15b1f5d755fa6ad6f2b5ed0f340e3f17f57389c3c2af113a8cbcc885bde73305a553b5640c83021128008ddf882e856336269080496";
-
-// TestNet alerts private key
-// "308201130201010420b665cff1884e53da26376fd1b433812c9a5a8a4d5221533b15b9629789bb7e42a081a53081a2020101302c06072a8648ce3d0101022100fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f300604010004010704410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8022100fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141020101a1440342000471dc165db490094d35cde15b1f5d755fa6ad6f2b5ed0f340e3f17f57389c3c2af113a8cbcc885bde73305a553b5640c83021128008ddf882e856336269080496"
-
 void CUnsignedAlert::SetNull()
 {
     nVersion = 1;
@@ -153,7 +145,7 @@ bool CAlert::RelayTo(CNode* pnode) const
 bool CAlert::CheckSignature() const
 {
     CKey key;
-    if (!key.SetPubKey(ParseHex(fTestNet ? pszTestKey : pszMainKey)))
+    if (!key.SetPubKey(Params().AlertKey()))
         return error("CAlert::CheckSignature() : SetPubKey failed");
     if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig))
         return error("CAlert::CheckSignature() : verify signature failed");