Skip to content

Commit 67a6a3e

Browse files
gridcoingridcoin
committed
3.6.0.1-Mandatory
Gridcoin Research 3.6.0.1/MSI=43.5 Mandatory Upgrade https://github.com/gridcoin/Gridcoin-Research/releases/tag/3.6.0.1 ### Added - Added [V8 stake engine](https://github.com/gridcoin/Gridcoin-Research/wiki/Stake-V8) set to start producing V8 blocks at block 1010000. This fixes several security issues, see wiki for details. - Blocks can now carry identification from the "org" argument/configuration option (@tomasbrod). - Add "reorganize" RPC command (@tomasbrod). ### Changed - Berkeley DB V6+ compatibility, #451 (@xPh03n1x). - Improved poll loading speeds, #497 (@denravonska). - Versions now contain the git hash, #500 (@tomasbrod). - Improved security on NeuralNet votes, #496 (@Foggyx420). - Improved RPC help. It now supports "execute help" and "list help", #512 (@Foggyx420). - Voting is now integrated in wallet as a tab and cleaned up, #416 (@skcin, @Joshoeah). - Improve low-peer mining ability on testnet (@tomasbrod). - Improve poll error message when low on funds, #415 (@Erkan-Yilmaz). - Code cleanup (@denravonska, @tomasbrod, @Foggyx420, @skcin). ### Removed - Remove RPC commands: - DAO, #486 (@denravonska). - volatilecode, testnet0917, testboinckey, chainrsa, testcpidv2, testcpid, windows error report disabling, list betatest, fDebug4/fDebug5 flags (@Foggyx420). ### Fixed - Fixed security issue where superblocks could be injected, #526 (@tomasbrod). - Fix poll sorting bug, #512 (@skcin)
1 parent a3b911d commit 67a6a3e

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

‎CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7-
## [Unreleased]
7+
## [3.6.0.1] 08-22-2017
88
### Added
99
- Added [V8 stake engine](https://github.com/gridcoin/Gridcoin-Research/wiki/Stake-V8)
1010
set to start producing V8 blocks at block 1010000. This fixes several security issues,
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2929
- DAO, #486 (@denravonska).
3030
- volatilecode, testnet0917, testboinckey, chainrsa, testcpidv2, testcpid, windows
3131
error report disabling, list betatest, fDebug4/fDebug5 flags (@Foggyx420).
32+
- Set magnitude boost to be removed at 2017-Sep-07 00:00:00 UTC
3233

3334
### Fixed
3435
- Fixed security issue where superblocks could be injected, #526 (@tomasbrod).

‎contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -232,37 +232,37 @@
232232
"Entry"
233233
{
234234
"MsmKey" = "8:_UNDEFINED"
235-
"OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
235+
"OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
236236
"MsmSig" = "8:_UNDEFINED"
237237
}
238238
"Entry"
239239
{
240240
"MsmKey" = "8:_UNDEFINED"
241-
"OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
241+
"OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
242242
"MsmSig" = "8:_UNDEFINED"
243243
}
244244
"Entry"
245245
{
246246
"MsmKey" = "8:_UNDEFINED"
247-
"OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12"
247+
"OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
248248
"MsmSig" = "8:_UNDEFINED"
249249
}
250250
"Entry"
251251
{
252252
"MsmKey" = "8:_UNDEFINED"
253-
"OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
253+
"OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12"
254254
"MsmSig" = "8:_UNDEFINED"
255255
}
256256
"Entry"
257257
{
258258
"MsmKey" = "8:_UNDEFINED"
259-
"OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
259+
"OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
260260
"MsmSig" = "8:_UNDEFINED"
261261
}
262262
"Entry"
263263
{
264264
"MsmKey" = "8:_UNDEFINED"
265-
"OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
265+
"OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
266266
"MsmSig" = "8:_UNDEFINED"
267267
}
268268
}
@@ -1084,19 +1084,19 @@
10841084
{
10851085
"Name" = "8:Microsoft Visual Studio"
10861086
"ProductName" = "8:Gridcoin Research"
1087-
"ProductCode" = "8:{C356D278-0901-4F4F-9D80-32B53D5E48F4}"
1088-
"PackageCode" = "8:{AC4789DE-7FB6-45F9-B8DA-EA13379AB8EC}"
1087+
"ProductCode" = "8:{8A258BEE-279E-4C48-A315-D3B170EF1997}"
1088+
"PackageCode" = "8:{150CDC40-FD69-4B42-86D4-11ADE2838A5A}"
10891089
"UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
10901090
"AspNetVersion" = "8:4.0.30319.0"
10911091
"RestartWWWService" = "11:FALSE"
10921092
"RemovePreviousVersions" = "11:TRUE"
10931093
"DetectNewerInstalledVersion" = "11:FALSE"
10941094
"InstallAllUsers" = "11:TRUE"
1095-
"ProductVersion" = "8:43.4"
1095+
"ProductVersion" = "8:43.5"
10961096
"Manufacturer" = "8:GridcoinResearch"
10971097
"ARPHELPTELEPHONE" = "8:"
10981098
"ARPHELPLINK" = "8:"
1099-
"Title" = "8:Gridcoin Research 43.4"
1099+
"Title" = "8:Gridcoin Research 43.5"
11001100
"Subject" = "8:"
11011101
"ARPCONTACT" = "8:The Gridcoin Developers"
11021102
"Keywords" = "8:Gridcoin Research"

‎contrib/Installer/boinc/boinc/Utilization.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Public Class Utilization
1414
Private mlSpeakMagnitude As Double
1515
Public ReadOnly Property Version As Double
1616
Get
17-
Return 422
17+
Return 423
1818
End Get
1919
End Property
2020

‎contrib/Installer/boinc/boinc/modPersistedDataSystem.vb

+7-3
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,12 @@ Module modPersistedDataSystem
162162
Return total
163163
End Function
164164
Public Function GetMagnitudeContract() As String
165-
Try
166165

166+
Dim dLegacyMagnitudeBoost As Double = 1.35
167+
Dim dtCutoverDate As DateTime = TimeZoneInfo.ConvertTimeToUtc(New DateTime(2017, 9, 7))
168+
If Now > dtCutoverDate Then dLegacyMagnitudeBoost = 1.0
169+
170+
Try
167171
If GetWindowsFileAge(GetGridPath("NeuralNetwork") + "\contract.dat") < 240 Then
168172
Dim sData As String
169173
sData = FileToString(GetGridPath("NeuralNetwork") + "\contract.dat")
@@ -172,7 +176,7 @@ Module modPersistedDataSystem
172176

173177
Dim lAgeOfMaster As Long = GetWindowsFileAge(GetGridPath("NeuralNetwork") + "\db.dat")
174178
If lAgeOfMaster > PROJECT_SYNC_THRESHOLD Then Return ""
175-
179+
176180
Dim surrogateRow As New Row
177181
surrogateRow.Database = "CPID"
178182
surrogateRow.Table = "CPIDS"
@@ -190,7 +194,7 @@ Module modPersistedDataSystem
190194

191195
For Each cpid As Row In lstCPIDs
192196
If cpid.DataColumn5 = "True" Then
193-
Dim dLocalMagnitude As Double = Val("0" + Num(cpid.Magnitude)) * 1.35 'Ensure culture is neutral first - and then that magnitude passes through the bar
197+
Dim dLocalMagnitude As Double = Val("0" + Num(cpid.Magnitude)) * dLegacyMagnitudeBoost
194198
If dLocalMagnitude > 32766 Then dLocalMagnitude = 32766
195199

196200
Dim sRow As String = cpid.PrimaryKey + "," + Num(dLocalMagnitude) + ";"

‎src/clientversion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define CLIENT_VERSION_MAJOR 3
1010
#define CLIENT_VERSION_MINOR 6
1111
#define CLIENT_VERSION_REVISION 0
12-
#define CLIENT_VERSION_BUILD 0
12+
#define CLIENT_VERSION_BUILD 1
1313

1414
// Converts the parameter X to a string after macro replacement on X has been performed.
1515
// Don't merge these into one macro!

0 commit comments

Comments
 (0)