Skip to content

Commit

Permalink
3.6.1.0-Leisure
Browse files Browse the repository at this point in the history 
Gridcoin Research 3.6.1.0/MSI=43.7
Leisure Upgrade
https://github.com/gridcoin/Gridcoin-Research/releases/tag/3.6.1.0

- Fix problems forging superblock due to rounding differences, #608
(@denravonska).
- Fetch data from project servers if missing on scraper #564
(@denravonska).
  • Loading branch information
@gridcoin
gridcoin committed Sep 13, 2017
1 parent 916842e commit 386243d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,37 +232,37 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
"OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
"OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12"
"OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
"OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
"OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
"OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -1084,19 +1084,19 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Gridcoin Research"
"ProductCode" = "8:{C7D29DFD-D31B-4849-AB57-707C0AC1DB82}"
"PackageCode" = "8:{D103E86A-AB58-42C3-825A-97881D9CC228}"
"ProductCode" = "8:{239D585C-E9B0-48EC-9F3A-CFA0F0196316}"
"PackageCode" = "8:{D2F3951C-E71B-47B9-88D9-DC7F63D5ED31}"
"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:43.6"
"ProductVersion" = "8:43.7"
"Manufacturer" = "8:GridcoinResearch"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:Gridcoin Research 43.6"
"Title" = "8:Gridcoin Research 43.7"
"Subject" = "8:"
"ARPCONTACT" = "8:The Gridcoin Developers"
"Keywords" = "8:Gridcoin Research"
Expand Down
2 changes: 1 addition & 1 deletion contrib/Installer/boinc/boinc/Utilization.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Public Class Utilization
Private mlSpeakMagnitude As Double
Public ReadOnly Property Version As Double
Get
Return 423
Return 424
End Get
End Property

Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 6
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 2
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 0

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

3 comments on commit 386243d

@gridcoin
Copy link
Contributor Author

@gridcoin gridcoin commented on 386243d Sep 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBrod asked: Why there are so many freaking version numbers?
• msi has procuct version 8:43.7
• VB has version 424
• core client 3.6.2

@gridcoin
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I accidentally deleted your post and I cant undo it.

In software development its useful to know when a module that contains new code is actually being used by other modules. Since vb.net is a rather large module (containing the neural network code), it has a version of 424.

This is useful when we only change the vb.net dll, and not the core exe.

If a change was made to the neuralnetwork business logic, its useful for the one running the software to see the version of the neural network is 424 and they can do that by viewing the about page.

The MSI is also useful to have a version, because of the uninstaller and reinstaller guids. If we move to nullsofts installer, we can lose the microsoft issues (with MSI version).

@tomasbrod
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, that seems logical.
So the (windows) wallet version is basically 3.6.2.0+424. I agree, it is useful to know the VB module version.
As I get it, the MSI version is largely irrelevant? Where is it even displayed?

Please sign in to comment.