Refactor applicaton for magnitudes with greater precision

Author: cyrossignol

src/beacon.cpp

@@ -78,7 +78,7 @@ int64_t MaxBeaconAge()
 int64_t BeaconAgeAdvertiseThreshold()
 {
     // 5 months in seconds.
-    return 3600 * 24 * 30 * 5;    
+    return 3600 * 24 * 30 * 5;
 }
 
 void GetBeaconElements(const std::string& sBeacon, std::string& out_cpid, std::string& out_address, std::string& out_publickey)
@@ -101,7 +101,7 @@ std::string GetBeaconPublicKey(const std::string& cpid, bool bAdvertisingBeacon)
     std::string sBeacon = RetrieveBeaconValueWithMaxAge(cpid, iMaxSeconds);
     if (sBeacon.empty())
         return "";
-    
+
     // Beacon data structure: CPID,hashRand,Address,beacon public key: base64 encoded
     std::string sContract = DecodeBase64(sBeacon);
     std::vector<std::string> vContract = split(sContract.c_str(),";");
@@ -244,14 +244,14 @@ bool VerifyBeaconContractTx(const CTransaction& tx)
 }
 
 bool ImportBeaconKeysFromConfig(const std::string& cpid, CWallet* wallet)
-{    
+{
     if(cpid.empty())
         return error("Empty CPID");
 
     std::string strSecret = GetArgument("privatekey" + cpid + (fTestNet ? "testnet" : ""), "");
     if(strSecret.empty())
         return false;
-    
+
     auto vecsecret = ParseHex(strSecret);
 
     CKey key;
@@ -335,7 +335,7 @@ BeaconStatus GetBeaconStatus(std::string& sCPID)
     beacon_status.iBeaconTimestamp = BeaconTimeStamp(sCPID);
     beacon_status.timestamp = TimestampToHRDate(beacon_status.iBeaconTimestamp);
     beacon_status.hasBeacon = HasActiveBeacon(sCPID);
-    beacon_status.dPriorSBMagnitude = NN::Tally::GetMagnitude(NN::MiningId::Parse(sCPID));
+    beacon_status.dPriorSBMagnitude = NN::Tally::GetMagnitude(NN::MiningId::Parse(sCPID)).Floating();
     beacon_status.is_mine = (sCPID == NN::GetPrimaryCpid());
 
     return beacon_status;

src/contract/polls.cpp

@@ -99,7 +99,7 @@ std::pair<std::string, std::string> CreateVoteContract(std::string sTitle, std::
     const std::string primary_cpid = NN::GetPrimaryCpid();
 
     std::string GRCAddress = DefaultWalletAddress();
-    double dmag = NN::Tally::MyMagnitude();
+    double dmag = NN::Tally::MyMagnitude().Floating();
     double poll_duration = PollDuration(sTitle) * 86400;
 
     // Prevent Double Voting

src/main.cpp

@@ -569,7 +569,7 @@ void GetGlobalStatus()
 
     try
     {
-        double boincmagnitude = NN::Tally::MyMagnitude();
+        double boincmagnitude = NN::Tally::MyMagnitude().Floating();
         uint64_t nWeight = 0;
         pwalletMain->GetStakeWeight(nWeight);
         nBoincUtilization = boincmagnitude; //Legacy Support for the about screen
@@ -2601,7 +2601,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
             {
                 // 6-4-2017 - Verify researchers stored block magnitude
                 // 2018 02 04 - Moved here for better effect.
-                double dNeuralNetworkMagnitude = NN::Tally::GetMagnitude(claim.m_mining_id);
+                double dNeuralNetworkMagnitude = NN::Tally::GetMagnitude(claim.m_mining_id).Floating();
                 if (claim.m_magnitude > (dNeuralNetworkMagnitude * 1.25)
                     && (fTestNet || (!fTestNet && (pindex->nHeight-1) > 947000)))
                 {

src/miner.cpp

@@ -1031,7 +1031,7 @@ bool CreateGridcoinReward(CBlock &blocknew, CBlockIndex* pindexPrev, int64_t &nR
     }
 
     if (const NN::CpidOption cpid = claim.m_mining_id.TryCpid()) {
-        claim.m_magnitude = NN::Tally::GetMagnitude(*cpid);
+        claim.m_magnitude = NN::Tally::GetMagnitude(*cpid).Floating();
     }
 
     LogPrintf(

src/neuralnet/tally.cpp

@@ -127,7 +127,10 @@ class ResearcherTally
             const Cpid& cpid = account_pair.first;
             ResearchAccount& account = account_pair.second;
 
-            account.m_magnitude = m_current_superblock->m_cpids.MagnitudeOf(cpid);
+            // TODO: this only supports legacy magnitudes, but the upcoming
+            // superblock window accrual changes remove these shenanigans:
+            //
+            account.m_magnitude = m_current_superblock->m_cpids.MagnitudeOf(cpid).Compact();
         }
 
         return ResearchAccountRange(m_researchers);
@@ -143,7 +146,10 @@ class ResearcherTally
     //!
     const ResearchAccount& GetAccount(const Cpid cpid)
     {
-        const uint16_t magnitude = m_current_superblock->m_cpids.MagnitudeOf(cpid);
+        // TODO: this only supports legacy magnitudes, but the upcoming
+        // superblock window accrual changes remove these shenanigans:
+        //
+        const uint16_t magnitude = m_current_superblock->m_cpids.MagnitudeOf(cpid).Compact();
         auto iter = m_researchers.find(cpid);
 
         if (iter == m_researchers.end()) {
@@ -299,13 +305,13 @@ double Tally::GetMagnitudeUnit(const int64_t payment_time)
     return g_network_tally.GetMagnitudeUnit(payment_time);
 }
 
-uint16_t Tally::MyMagnitude()
+Magnitude Tally::MyMagnitude()
 {
     if (const auto cpid_option = NN::Researcher::Get()->Id().TryCpid()) {
         return Quorum::CurrentSuperblock()->m_cpids.MagnitudeOf(*cpid_option);
     }
 
-    return 0;
+    return Magnitude::Zero();
 }
 
 ResearchAccountRange Tally::Accounts()
@@ -341,18 +347,18 @@ AccrualComputer Tally::GetComputer(
         last_block_ptr->nHeight);
 }
 
-uint16_t Tally::GetMagnitude(const Cpid cpid)
+Magnitude Tally::GetMagnitude(const Cpid cpid)
 {
     return Quorum::CurrentSuperblock()->m_cpids.MagnitudeOf(cpid);
 }
 
-uint16_t Tally::GetMagnitude(const MiningId mining_id)
+Magnitude Tally::GetMagnitude(const MiningId mining_id)
 {
     if (const auto cpid_option = mining_id.TryCpid()) {
         return GetMagnitude(*cpid_option);
     }
 
-    return 0;
+    return Magnitude::Zero();
 }
 
 void Tally::RecordRewardBlock(const CBlockIndex* const pindex)

src/neuralnet/tally.h

@@ -66,7 +66,7 @@ class Tally
     //! \return The wallet user's magnitude or zero if the wallet started in
     //! investor mode.
     //!
-    static uint16_t MyMagnitude();
+    static Magnitude MyMagnitude();
 
     //!
     //! \brief Get a traversable object for the research accounts stored in
@@ -107,7 +107,7 @@ class Tally
     //!
     //! \return Magnitude as of the last tallied superblock.
     //!
-    static uint16_t GetMagnitude(const Cpid cpid);
+    static Magnitude GetMagnitude(const Cpid cpid);
 
     //!
     //! \brief Get the current magnitude for the specified mining ID.
@@ -117,7 +117,7 @@ class Tally
     //! \return Magnitude as of the last tallied superblock or zero if the
     //! mining ID represents an investor.
     //!
-    static uint16_t GetMagnitude(const MiningId mining_id);
+    static Magnitude GetMagnitude(const MiningId mining_id);
 
     //!
     //! \brief Record a block's research reward data in the tally.

src/rpcblockchain.cpp

@@ -84,8 +84,8 @@ UniValue SuperblockToJson(const NN::Superblock& superblock)
 {
     UniValue magnitudes(UniValue::VOBJ);
 
-    for (const auto& cpid_pair : superblock.m_cpids) {
-        magnitudes.pushKV(cpid_pair.first.ToString(), cpid_pair.second);
+    for (const auto& cpid_iter : superblock.m_cpids) {
+        magnitudes.pushKV(cpid_iter.Cpid().ToString(), cpid_iter.Magnitude().Floating());
     }
 
     UniValue projects(UniValue::VOBJ);
@@ -1897,7 +1897,7 @@ UniValue SuperblockReport(int lookback, bool displaycontract, std::string cpid)
 
                 if (cpid_parsed)
                 {
-                    c.pushKV("Magnitude", superblock.m_cpids.MagnitudeOf(*cpid_parsed));
+                    c.pushKV("Magnitude", superblock.m_cpids.MagnitudeOf(*cpid_parsed).Floating());
                 }
 
                 if (displaycontract)

src/scraper/scraper.h

@@ -70,7 +70,7 @@ int64_t SCRAPER_CMANIFEST_RETENTION_TIME = 48 * 3600;
 bool SCRAPER_CMANIFEST_INCLUDE_NONCURRENT_PROJ_FILES = false;
 double MAG_ROUND = 0.01;
 double NEURALNETWORKMULTIPLIER = 115000;
-double CPID_MAG_LIMIT = 32767;
+double CPID_MAG_LIMIT = NN::Magnitude::MAX;
 // This settings below are important. This sets the minimum number of scrapers
 // that must be available to form a convergence. Above this minimum, the ratio
 // is followed. For example, if there are 4 scrapers, a ratio of 0.6 would require

src/test/neuralnet/claim_tests.cpp

@@ -61,7 +61,7 @@ NN::Superblock GetTestSuperblock(uint32_t version = NN::Superblock::CURRENT_VERS
     NN::Superblock superblock;
 
     superblock.m_version = version;
-    superblock.m_cpids.Add(NN::Cpid(), 123);
+    superblock.m_cpids.Add(NN::Cpid(), NN::Magnitude::RoundFrom(123));
     superblock.m_projects.Add("project", NN::Superblock::ProjectStats());
 
     return superblock;