diff --git a/Makefile.Debug b/Makefile.Debug index 65e7a9ca3f..38153b64fd 100644 --- 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 Mar 26 17:49:04 2017 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Apr 2 08:08:53 2017 # Project: gridcoinresearch.pro # Template: app ############################################################################# diff --git a/Makefile.Release b/Makefile.Release index 879b7875c4..e644e83269 100644 --- 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 Mar 26 17:49:05 2017 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Apr 2 08:08:54 2017 # Project: gridcoinresearch.pro # Template: app ############################################################################# diff --git a/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj b/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj index 9cb03e23bd..4b90109328 100644 --- a/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj +++ b/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj @@ -232,37 +232,37 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69" + "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098" + "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9" + "OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12" + "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625" + "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65" + "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69" "MsmSig" = "8:_UNDEFINED" } } @@ -1084,19 +1084,19 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Gridcoin Research" - "ProductCode" = "8:{841D7D7B-708C-4FB6-952D-FE393085E82D}" - "PackageCode" = "8:{B62D5B84-E542-4BA2-9024-E4D93CD8DBA7}" + "ProductCode" = "8:{187182ED-AEF9-46D8-91FD-4839828A6C9D}" + "PackageCode" = "8:{417B50AD-DB90-4AFC-BA6A-9022A071FD61}" "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:42.1" + "ProductVersion" = "8:42.2" "Manufacturer" = "8:GridcoinResearch" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:Gridcoin Research 42.1" + "Title" = "8:Gridcoin Research 42.2" "Subject" = "8:" "ARPCONTACT" = "8:The Gridcoin Developers" "Keywords" = "8:Gridcoin Research" diff --git a/src/clientversion.h b/src/clientversion.h index c0aa950632..754498709a 100644 --- 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 8 -#define CLIENT_VERSION_BUILD 7 +#define CLIENT_VERSION_BUILD 8 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/main.cpp b/src/main.cpp index 8b719c4837..acb38a6439 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -461,7 +461,7 @@ extern void FlushGridcoinBlockFile(bool fFinalize); std::string msHDDSerial = ""; //When syncing, we grandfather block rejection rules up to this block, as rules became stricter over time and fields changed - int nGrandfather = 854400; + int nGrandfather = 860000; int nNewIndex = 271625; int nNewIndex2 = 364500; @@ -4370,11 +4370,11 @@ bool CBlock::CheckBlock(std::string sCaller, int height1, int64_t Mint, bool fCh if (fDebug10) printf("BV %f, CV %f ",bv,cvn); // if (bv+10 < cvn) return error("ConnectBlock[]: Old client version after mandatory upgrade - block rejected\r\n"); // Enforce Beacon Age - if (bv < 3587 && height1 > 855000 && !fTestNet) return error("CheckBlock[]: Old client spamming new blocks after mandatory upgrade \r\n"); + if (bv < 3588 && height1 > 860500 && !fTestNet) return error("CheckBlock[]: Old client spamming new blocks after mandatory upgrade \r\n"); if (bv < 3580 && fTestNet) return DoS(25, error("CheckBlock[]: Old testnet client spamming new blocks after mandatory upgrade \r\n")); } - if (bb.cpid != "INVESTOR" && height1 > nGrandfather) + if (bb.cpid != "INVESTOR" && height1 > nGrandfather && BlockNeedsChecked(nTime)) { if (bb.projectname.empty() && !IsResearchAgeEnabled(height1)) return DoS(1,error("CheckBlock::PoR Project Name invalid")); if (!fLoadingIndex && !IsCPIDValidv2(bb,height1)) @@ -7170,7 +7170,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return false; } - if (pfrom->nVersion < 180322 && !fTestNet && pindexBest->nHeight > 855000) + if (pfrom->nVersion < 180323 && !fTestNet && pindexBest->nHeight > 860500) { // disconnect from peers older than this proto version - Enforce Beacon Age - 3-26-2017 if (fDebug10) printf("partner %s using obsolete version %i (before enforcing beacon age); disconnecting\n", pfrom->addr.ToString().c_str(), pfrom->nVersion); diff --git a/src/version.h b/src/version.h index fdb11f186d..4897cabb46 100644 --- a/src/version.h +++ b/src/version.h @@ -25,7 +25,7 @@ extern int MINOR_VERSION; /////////////////////////////////////////////////////////// // network protocol versioning // // // -static const int PROTOCOL_VERSION = 180322; // +static const int PROTOCOL_VERSION = 180323; // // disconnect from peers older than this proto version // static const int MIN_PEER_PROTO_VERSION = 180284; // ///////////////////////////////////////////////////////////