Merge branch 'staging'

CHANGELOG.md

@@ -4,6 +4,66 @@ 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/).
 
+## [3.7.0.0]
+### Added
+ - Provide Difficulty of best kernel found, #766 (@tomasbrod).
+ - Add Travis support for OSX, 665 (@acey1).
+ - Add better command for sending alerts, #731 (@tomasbrod).
+ - Add RPC for sending raw contracts, #683 (@tomasbrod).
+ - Add portable diagnostic page, #631 (@fooforever).
+
+### Fixed
+ - Fixed minor spelling mistakes, #742 (@denravonska).
+ - Several tally improvements. There should now be less forking and the wallet
+   should use ~50MB less memory, #668, #756 (@denravonska, @tomasbrod)
+ - Data scraper can no longer run concurrently, #742 (@denravonska).
+ - Improve superblock validations, #730 (@tomasbrod).
+ - Fix potential deadlock, #708 (@denravonska).
+ - Prevent duplicate superblocks, #534 (@tomasbrod).
+ - Fix issue with application cache clears, #577 (@tomasbrod).
+ - Fix bug which caused rewards to be lost when staking the newbie block.
+   Missing rewards will be reimbursed, #552 (@Foggyx420).
+ - Fix minor UI typos, #661 (@Erkan-Yilmaz).
+ - Fix stake modifier, #686 (@tomasbrod).
+ - Improve boost-1.66.0 compatibility, #800 (@denravonska).
+ - Fix crash in diagnostics dialog, #794 (@Foggyx420).
+
+### Changed
+ - Changed versioning extraction from git. Test builds can no longer be used to
+   stake in production unless explicitly enabled, #729 (@tomasbrod).
+ - Don't update network quorum while syncing, #728 (@Foggyx420).
+ - Snapshot URL now uses https, #727 (@Foggyx420).
+ - Code cleanup (@Foggyx420, @denravonska).
+ - Use more efficient data structure for blocks, #679 (@denravonska).
+ - Improve transaction description dialog, #676 (@Foggyx420).
+ - Improve beacon handling, #604, #645, #649, #684, #701 (@Foggyx420, @tomasbrod).
+ - Optimize double<->string conversions, #692 (@denravonska).
+ - Optimize application cache access, #506 (@denravonska).
+ - Improve thread handling, #656 (@skcin).
+ - Replace `boost::shared_ptr` with `std::shared_ptr`.
+ - Optimize string split function, #672 (@denravonska).
+ - Improve sync speeds, #650 (@denravonska).
+ - The RPC command `restartclient` is now called `restart`.
+ - Fix voting sorting issues, #610 (@MagixInTheAir).
+ - Improve wallet backup, #610 (@Foggyx420).
+ - Update seed nodes, #783 (@barton2526).
+ - Auto upgrades are now opt-in via the "autoupgrade" flag, #796 (@denravonska).
+ - Clean up seed nodes, #783 (@barton2526).
+
+### Removed
+ - Remove CSV exporter which used unreliable data, #759 (@denravonska).
+ - Remove block download menu options on non-Windows, #727 (@Foggyx420).
+ - Removed RPC commands (@Foggyx420, @denravonska):
+    - debugexplainmagnitude
+    - executecode
+    - getsubsidy
+    - list newbieage
+    - list staking
+    - leder
+    - reboot
+ - Remove checkpoint relaying to improve sync speeds, #678 (@denravonska).
+ - Remove IRC peer discovery.
+
 ## [3.6.3.0] 2017-10-09
 ### Fixed
  - Fix problems sending beacons on Windows, #684 (@tomasbrod).

CompilingGridcoinOnLinux.txt

@@ -169,7 +169,6 @@ email=
 rpcuser=<username>
 rpcpassword=<password>
 addnode=node.gridcoin.us
-addnode=gridcoin.asia
 
 Ctrl-X to exit and save
 

contrib/Installer/boinc/boinc/Utilization.vb

@@ -14,7 +14,7 @@ Public Class Utilization
     Private mlSpeakMagnitude As Double
     Public ReadOnly Property Version As Double
         Get
-            Return 424
+            Return 425
         End Get
     End Property
 
@@ -152,12 +152,6 @@ Public Class Utilization
             Catch ex As Exception
                 Log("New:" + ex.Message)
             End Try
-            Try
-                Dim sContract As String = GetMagnitudeContract()
-                If Len(sContract) = 0 Then bMagsDoneLoading = False
-            Catch ex As Exception
-                Log("contract err " + ex.Message)
-            End Try
         Catch ex As Exception
             Log("While loading clsUtilization : " + ex.Message)
         End Try
@@ -501,8 +495,7 @@ Public Class Utilization
     Public Function SyncCPIDsWithDPORNodes(sData As String) As Double
         'Write the Gridcoin CPIDs to the Persisted Data System
         Try
-            msSyncData = sData
-            Call SyncDPOR2()
+            Call SyncDPOR2(sData)
         Catch ex As Exception
             Log("Exception during SyncDpor2 : " + ex.Message)
             Return -2
@@ -562,4 +555,4 @@ End Class
 Public Interface IGridcoinMining
 
 
-End Interface
+End Interface

contrib/Installer/boinc/boinc/modPersistedDataSystem.vb

@@ -413,8 +413,7 @@ Module modPersistedDataSystem
 
         End Try
     End Function
-    Public Sub SyncDPOR2()
-        If Math.Abs(DateDiff(DateInterval.Second, Now, mdLastSync)) > 60 * 10 Then bMagsDoneLoading = True
+    Public Sub SyncDPOR2(sData As String)
         If bMagsDoneLoading = False Then
             Log("Blocked call.")
             Exit Sub
@@ -423,6 +422,10 @@ Module modPersistedDataSystem
             Log("Neural network is disabled.")
             Exit Sub
         End If
+
+        msSyncData = sData
+        bMagsDoneLoading = False
+
         Dim t As New Threading.Thread(AddressOf CompleteSync)
         t.Priority = Threading.ThreadPriority.BelowNormal
         t.Start()
@@ -489,19 +492,12 @@ Module modPersistedDataSystem
         End Try
     End Function
     Public Sub CompleteSync()
-        If Math.Abs(DateDiff(DateInterval.Second, Now, mdLastSync)) > 60 * 10 Then bMagsDoneLoading = True
-        If bMagsDoneLoading = False Then Exit Sub
-
-
         mbForcefullySyncAllRac = True
         Log("Starting complete Neural Network Sync.")
 
         Try
-
             EnsureNNDirExists()
-
             msCurrentNeuralHash = ""
-            bMagsDoneLoading = False
 
             Try
                 mlPercentComplete = 1
@@ -525,12 +521,12 @@ Module modPersistedDataSystem
             Log("Completesync:" + ex.Message)
         End Try
 
-        bMagsDoneLoading = True
         mdLastSync = Now
         mlPercentComplete = 0
         '7-21-2015: Store historical magnitude so it can be charted
         StoreHistoricalMagnitude()
         bNeedsDgvRefreshed = True
+        bMagsDoneLoading = True
 
     End Sub
     Private Function GetMagByCPID(sCPID As String) As Row
@@ -1068,7 +1064,9 @@ Module modPersistedDataSystem
             Dim fi As FileInfo
             Dim sPrefix = GetEntryPrefix(DataRow)
             For Each fi In fiArr
-                If Left(fi.Name, Len(sPrefix)) = sPrefix Then
+                If Left(fi.Name, Len(sPrefix)) <> sPrefix Then Continue For
+
+                Try
                     Using Stream As New System.IO.FileStream(fi.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)
                         Dim objReader As New System.IO.StreamReader(Stream)
                         While objReader.EndOfStream = False
@@ -1092,7 +1090,10 @@ Module modPersistedDataSystem
                         End While
                         objReader.Close()
                     End Using
-                End If
+                Catch ex As IO.FileNotFoundException
+                    Log("GetList: Error reading " + fi.FullName)
+                End Try
+
             Next fi
         End SyncLock
         Return x

contrib/easywinbuilder/3a_build_boost.bat

@@ -3,20 +3,10 @@
 @cd %ROOTPATH%\%EWBLIBS%\%BOOST%
 
 @echo bootstrap...
-call bootstrap.bat mingw
+call bootstrap.bat gcc
 @echo.
 @echo.
 @echo building...
-b2.exe --build-type=minimal --with-chrono --with-filesystem --with-program_options --with-system --with-thread^
- --layout=versioned -sNO_BZIP2=1 -sNO_ZLIB=1^
- variant=release^
- toolset=gcc^
- link=static^
- threading=multi^
- target-os=windows^
- threadapi=win32^
- cxxflags="%ADDITIONALCCFLAGS%"^
- cflags="%ADDITIONALCCFLAGS%"^
- stage
+b2.exe --build-type=minimal --with-chrono --with-filesystem --with-program_options --with-system --with-thread toolset=gcc variant=release link=static threading=multi runtime-link=static --layout=versioned -sNO_BZIP2=1 -sNO_ZLIB=1 target-os=windows threadapi=win32 cxxflags="%ADDITIONALCCFLAGS%" cflags="%ADDITIONALCCFLAGS%" stage
 @cd ..\..\%EWBPATH%
 @if not "%RUNALL%"=="1" pause

contrib/easywinbuilder/3b_run_build_dep.bat

@@ -1,3 +1,3 @@
 @call set_vars.bat
-@rxvt -e ./build_dep.sh
-@if not "%RUNALL%"=="1" pause
+@bash ./build_dep.sh
+@if not "%RUNALL%"=="1" pause

contrib/easywinbuilder/4b_build_qt.bat

@@ -11,9 +11,6 @@
 @echo building qt - qmake...
 @set COINNAME=Gridcoin
 
-
-echo %EWBLIBS%
-
 @set QMPS=BOOST_INCLUDE_PATH=%EWBLIBS%/%BOOST%^
  BOOST_LIB_PATH=%EWBLIBS%/%BOOST%/stage/lib^
  BOOST_LIB_SUFFIX=%BOOSTSUFFIX%^
@@ -27,10 +24,12 @@ echo %EWBLIBS%
  LIBZIP_LIB_PATH=%EWBLIBS%/libzip/lib^
  MINIUPNPC_INCLUDE_PATH=%EWBLIBS%/%MINIUPNPC%^
  MINIUPNPC_LIB_PATH=%EWBLIBS%/%MINIUPNPC%^
+ QRENCODE_INCLUDE_PATH=%EWBLIBS%/%QRENCODE%^
+ QRENCODE_LIB_PATH=%EWBLIBS%/%QRENCODE%/.libs^
  QMAKE_CXXFLAGS="%ADDITIONALCCFLAGS%"^
  QMAKE_CFLAGS="%ADDITIONALCCFLAGS%"
- 
-@%QTPATH%\qmake.exe %QMPS% USE_QRCODE=0 ZZZ=1
+
+@qmake.exe %QMPS% USE_QRCODE=1 ZZZ=1 
 @echo.
 @echo.
 @echo building qt - make...

contrib/easywinbuilder/6_gather_dlls.bat

@@ -1,11 +1,13 @@
 @call set_vars.bat
-copy %QTPATH%\QtCore4.dll %ROOTPATH%\release\
-copy %QTPATH%\QtGui4.dll %ROOTPATH%\release\
-copy %QTPATH%\QtNetwork4.dll %ROOTPATH%\release\
-copy C:\MinGW\bin\libgcc_s_dw2-1.dll %ROOTPATH%\release\
-copy "C:\MinGW\bin\libstdc++-6.dll" %ROOTPATH%\release\
-copy C:\MinGW\bin\mingwm10.dll %ROOTPATH%\release\
-
-copy C:\MinGW\bin\libgcc_s_dw2-1.dll %ROOTPATH%\src\
-copy "C:\MinGW\bin\libstdc++-6.dll" %ROOTPATH%\src\
-@if not "%RUNALL%"=="1" pause
+copy %QTDIR%\5.8\mingw53_32\Qt5Charts.dll %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\Qt5Core.dll %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\Qt5Gui.dll %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\Qt5Network.dll %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\Qt5Widgets.dll %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\bin\libgcc_s_dw2-1.dll %ROOTPATH%\release\
+copy "%QTDIR%\5.8\mingw53_32\bin\libstdc++-6.dll" %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\bin\libwinpthread-1.dll %ROOTPATH%\release\
+copy %QTDIR%\5.8\mingw53_32\plugins\iconengines\qsvgicon.dll %ROOTPATH%\release\iconengines\qsvgicon.dll
+copy %QTDIR%\5.8\mingw53_32\plugins\imageformats\qsvg.dll %ROOTPATH%\release\imageformats\qsvg.dll
+copy %QTDIR%\5.8\mingw53_32\plugins\platforms\qwindows.dll %ROOTPATH%\release\platforms\qwindows.dll
+@if not "%RUNALL%"=="1" pause

contrib/easywinbuilder/build_dep.sh

@@ -11,24 +11,38 @@ fi
 
 cd $ROOTPATHSH/$EWBLIBS
 
+echo libpng..
+cd ${LIBPNG}
+make -j2 -f scripts/makefile.gcc
+cd ..
+echo
+
+echo qrencode..
+cd ${QRENCODE}
+png_CFLAGS="-I${LIBPNG}" \
+png_LIBS="-L${LIBPNG}/.libs -lpng" \
+./configure --enable-static --disable-shared --without-tools
+make -j2
+cd ..
+echo
+
 echo db...
-cd $BERKELEYDB
-cd build_unix
+cd $BERKELEYDB/build_unix
 ../dist/configure --disable-replication --enable-mingw --enable-cxx \
  CXXFLAGS="${ADDITIONALCCFLAGS}" \
  CFLAGS="${ADDITIONALCCFLAGS}"
 sed -i 's/typedef pthread_t db_threadid_t;/typedef u_int32_t db_threadid_t;/g' db.h  # workaround, see https://bitcointalk.org/index.php?topic=45507.0
-make
-cd ..
-cd ..
+make -j2
+cd ../..
 echo
 
 echo  openssl...
 cd $OPENSSL
 export CC="gcc ${ADDITIONALCCFLAGS}"
-./config
-make
+./Configure mingw
+
+make -j2
 cd ..
 echo
 
-cd ../$EWBPATH
+cd ../$EWBPATH

contrib/easywinbuilder/set_vars.bat

@@ -1,26 +1,24 @@
-@set PATH=a:\mingw\msys\1.0\bin;a:\mingw\bin
-
 @set LANG=en_US.UTF8
 @set LC_ALL=en_US.UTF8
 
 @set MINGWINSTALLER=mingw-get-inst-20120426
 
-@set OPENSSL=openssl-1.0.1e
+@set OPENSSL=openssl-1.0.2l
 @set BERKELEYDB=db-4.8.30.NC
-@set BOOST=boost_1_55_0
-@set BOOSTVERSION=1.55.0
+@set BOOST=boost_1_64_0
+@set BOOSTVERSION=1.64.0
 @set LEVELDB=leveldb
-@rem If you wonder why there is no -s- see: https://github.com/bitcoin/bitcoin/pull/2835#issuecomment-21231694
-@set BOOSTSUFFIX=-mgw46-mt-1_55
+@set BOOSTSUFFIX=-mgw53-mt-s-1_64
 @set MINIUPNPC=miniupnpc-1.9
+@set QRENCODE=qrencode-3.4.4
+@set LIBPNG=lpng1629
+@set ZLIB=zlib
 
 @set EWBLIBS=libs
 
-
-set QTDIR=A:\Qt\4.8.4
-set QMAKESPEC=A:\Qt\4.8.4\mkspecs\win32-g++
-set PATH=%PATH%;a:\qt\4.8.4\qmake\bin
-@set QTPATH=a:\Qt\4.8.4\bin
+@set QTDIR=A:\Qt\Qt5.8.0
+@set PATH=%QTDIR%\Tools\mingw530_32\bin;%QTDIR%\5.8\mingw53_32\bin;%PATH%
+@set QMAKESPEC=%QTDIR%\5.8\mingw53_32\mkspecs\win32-g++
 
 @set EWBPATH=contrib/easywinbuilder
 set ROOTPATH=..\..
@@ -37,10 +35,12 @@ xset ROOTPATH=a:\gridcoin-research
 @set QTDOWNLOADPATH=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-win-opensource-4.8.5-mingw.exe
 @rem Qt5 will need changes in gather_dlls.bat
 
-@set MSYS=a:/MinGW/msys/1.0/bin
-@set PERL=%MSYS%/perl.exe
+rem @set MINGW=%QTMINGW%
+@set MSYS=a:\msys\1.0\bin
+@set PERL=a:/msys/1.0/bin/perl.exe
+set PATH=%MSYS%;%PATH%
 
 @rem the following will be set as additional CXXFLAGS and CFLAGS for everything - no ' or ", space is ok
 @set ADDITIONALCCFLAGS=-fno-guess-branch-probability -frandom-seed=1984 -Wno-unused-variable -Wno-unused-value -Wno-sign-compare -Wno-strict-aliasing
 
-@rem Note: Variables set here can NOT be overwritten in makefiles
+@rem Note: Variables set here can NOT be overwritten in makefiles