3.5.6.5-leisure

Gridcoin Research 3.5.6.5/MSI=40.2 Leisure Upgrade - Modify business logic for superblock to allow superblock to be accepted with a lower Project average (since we have a lower average without Bitcoin Utopia)
gridcoin-community · Jun 5, 2016 · 42353be · 42353be
1 parent 27a3ab7
commit 42353be
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/Makefile.Debug b/Makefile.Debug
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun May 15 10:50:44 2016
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jun 5 17:50:12 2016
 # Project:  gridcoinresearch.pro
 # Template: app
 #############################################################################

diff --git a/Makefile.Release b/Makefile.Release
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun May 15 10:50:45 2016
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jun 5 17:50:15 2016
 # Project:  gridcoinresearch.pro
 # Template: app
 #############################################################################

diff --git a/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj b/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj
@@ -1120,19 +1120,19 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Gridcoin Research"
-        "ProductCode" = "8:{35E668C0-64F2-4DA0-B82B-CF835081B360}"
-        "PackageCode" = "8:{DD4F1D71-50AF-4A04-8C67-91E2B9E8E695}"
+        "ProductCode" = "8:{11449F35-92F0-4A25-912E-910A9C8915C8}"
+        "PackageCode" = "8:{BB38A7E0-B695-4C35-BC49-6500233289A6}"
         "UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:40.1"
+        "ProductVersion" = "8:40.2"
         "Manufacturer" = "8:GridcoinResearch"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:Gridcoin Research 40.1"
+        "Title" = "8:Gridcoin Research 40.2"
         "Subject" = "8:"
         "ARPCONTACT" = "8:The Gridcoin Developers"
         "Keywords" = "8:Gridcoin Research"

diff --git a/contrib/Installer/boinc/boinc/Utilization.vb b/contrib/Installer/boinc/boinc/Utilization.vb
@@ -531,6 +531,7 @@ Public Class Utilization
         'Write the Gridcoin CPIDs to the Persisted Data System
         Try
             msSyncData = sData
+
             Call SyncDPOR2()
         Catch ex As Exception
             Log("Exception during SyncDpor2 : " + ex.Message)

diff --git a/contrib/Installer/boinc/boinc/modPersistedDataSystem.vb b/contrib/Installer/boinc/boinc/modPersistedDataSystem.vb
@@ -215,6 +215,7 @@ Module modPersistedDataSystem
                 End If
 
             Next
+            sOut += "NeuralNetwork,2000000,20000000;"
             sOut += "</AVERAGES>"
             Return sOut
 

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       3
 #define CLIENT_VERSION_MINOR       5
 #define CLIENT_VERSION_REVISION    6
-#define CLIENT_VERSION_BUILD       4
+#define CLIENT_VERSION_BUILD       5
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,6 +215,7 @@ Module modPersistedDataSystem @@
                     End If
                 Next
+                sOut += "NeuralNetwork,2000000,20000000;"
                 sOut += "</AVERAGES>"
                 Return sOut
@@ Expand Down @@