4.0.1.0-leisure

Fixed: - Wrong RA scan range causing reward calculation disagreements and forks #1366, (@tomasbrod, @jamescowens, @denravonska). - Fix crashes when voting in polls #1369 (@denravonska).
gridcoin-community · Nov 30, 2018 · 2dfe715 · 2dfe715
2 parents 6f11fd3 + 30162ec
commit 2dfe715
Show file tree

Hide file tree

Showing 12 changed files with 228 additions and 271 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ 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/).
 
+
+## [4.0.1.0] 2018-11-30, leisure
+### Fixed
+ - Wrong RA scan range causing reward calculation disagreements and forks
+   #1366, (@tomasbrod, @jamescowens, @denravonska).
+ - Fix crashes when voting in polls #1369 (@denravonska).
+
 ## [4.0.0.0] 2018-10-19, mandatory
 ### Added
  - Linux nodes can now stake superblocks using forwarded contracts,

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/src/contract/polls.cpp b/src/contract/polls.cpp
@@ -18,7 +18,6 @@ double DoubleFromAmount(int64_t amount);
 std::string PubKeyToAddress(const CScript& scriptPubKey);
 bool GetEarliestStakeTime(std::string grcaddress, std::string cpid);
 CBlockIndex* GetHistoricalMagnitude(std::string cpid);
-StructCPID GetLifetimeCPID(const std::string& cpid, const std::string& sFrom);
 bool WalletOutOfSync();
 
 std::string GetShareType(double dShareType)
@@ -99,7 +98,7 @@ std::pair<std::string, std::string> CreateVoteContract(std::string sTitle, std::
     }
     std::string sParam = SerializeBoincBlock(GlobalCPUMiningCPID, pindexBest->nVersion);
     std::string GRCAddress = DefaultWalletAddress();
-    StructCPID structMag = GetInitializedStructCPID2(GlobalCPUMiningCPID.cpid, mvMagnitudes);
+    StructCPID& structMag = GetInitializedStructCPID2(GlobalCPUMiningCPID.cpid, mvMagnitudes);
     double dmag = structMag.Magnitude;
     double poll_duration = PollDuration(sTitle) * 86400;
 
@@ -110,7 +109,7 @@ std::pair<std::string, std::string> CreateVoteContract(std::string sTitle, std::
     double cpid_age = GetAdjustedTime() - ReadCache("global", "nCPIDTime").timestamp;
     double stake_age = GetAdjustedTime() - ReadCache("global", "nGRCTime").timestamp;
 
-    StructCPID structGRC = GetInitializedStructCPID2(GRCAddress, mvMagnitudes);
+    StructCPID& structGRC = GetInitializedStructCPID2(GRCAddress, mvMagnitudes);
     LogPrintf("CPIDAge %f, StakeAge %f, Poll Duration %f", cpid_age, stake_age, poll_duration);
     double dShareType= RoundFromString(GetPollXMLElementByPollTitle(sTitle, "<SHARETYPE>", "</SHARETYPE>"), 0);
 
@@ -280,7 +279,7 @@ std::string GetProvableVotingWeightXML()
     //Retrieve the historical magnitude
     if (IsResearcher(msPrimaryCPID))
     {
-        StructCPID st1 = GetLifetimeCPID(msPrimaryCPID,"ProvableMagnitude()");
+        StructCPID& st1 = GetLifetimeCPID(msPrimaryCPID);
         CBlockIndex* pHistorical = GetHistoricalMagnitude(msPrimaryCPID);
         if (pHistorical->nHeight > 1 && pHistorical->nMagnitude > 0)
         {

diff --git a/src/global_objects_noui.hpp b/src/global_objects_noui.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <set>
 
 extern int nBoincUtilization;
 extern std::string sRegVer;
@@ -46,7 +47,7 @@ struct StructCPID
     double totalowed;
     double LastPaymentTime;
     double ResearchSubsidy;
-    double ResearchAverageMagnitude;
+    /* double ResearchAverageMagnitude; TotalMagnitude / (Accuracy+0.01) */
     double EarliestPaymentTime;
     double InterestSubsidy;
     double PaymentTimespan;
@@ -66,6 +67,7 @@ struct StructCPID
     std::string boincruntimepublickey;
     std::string cpidv2;
     std::string BlockHash;
+    std::set<const CBlockIndex*> rewardBlocks;
 };
 
 struct MiningCPID
@@ -111,15 +113,11 @@ struct MiningCPID
 
 //User CPIDs
 extern std::map<std::string, StructCPID> mvCPIDs;
-//Verified CPIDs
-extern std::map<std::string, StructCPID> mvCreditNode;
 //Network Averages
 extern std::map<std::string, StructCPID> mvNetwork;
 extern std::map<std::string, StructCPID> mvNetworkCopy;
 extern std::map<std::string, StructCPID> mvMagnitudes;
 extern std::map<std::string, StructCPID> mvMagnitudesCopy;
-extern std::map<std::string, StructCPID> mvCreditNodeCPIDProject; //Contains verified CPID+Projects;
-extern std::map<std::string, StructCPID> mvCreditNodeCPID;  //Contains verified CPID total Magnitude;
 
 //Global CPU Mining CPID:
 extern MiningCPID GlobalCPUMiningCPID;

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -276,8 +276,8 @@ int64_t GetRSAWeightByCPIDWithRA(std::string cpid)
         return 0;
 
     double dWeight = 0;
-    StructCPID stMagnitude = GetInitializedStructCPID2(cpid,mvMagnitudes);
-    StructCPID stLifetime  = GetInitializedStructCPID2(cpid,mvResearchAge);
+    StructCPID& stMagnitude = GetInitializedStructCPID2(cpid,mvMagnitudes);
+    StructCPID& stLifetime  = GetInitializedStructCPID2(cpid,mvResearchAge);
     if (stMagnitude.Magnitude > 0 && stLifetime.ResearchSubsidy == 0)
     {
         dWeight = 100000;