[WIP] integrated_scraper_2 changes tracking

src/Makefile.am

@@ -74,7 +74,6 @@ GRIDCOIN_CORE_H = \
 	compat/endian.h \
 	contract/polls.h \
 	contract/contract.h \
-   contract/superblock.h \
 	crypter.h \
 	db.h \
 	fwd.h \
@@ -95,6 +94,7 @@ GRIDCOIN_CORE_H = \
    neuralnet/neuralnet_stub.h \
 	neuralnet/project.h \
 	neuralnet/researcher.h \
+	neuralnet/superblock.h \
 	netbase.h \
 	net.h \
 	pbkdf2.h \
@@ -135,7 +135,6 @@ GRIDCOIN_CORE_CPP = addrman.cpp \
 	checkpoints.cpp \
 	contract/polls.cpp \
 	contract/contract.cpp \
-   contract/superblock.cpp \
 	crypter.cpp \
 	db.cpp \
 	gridcoin.cpp \
@@ -151,6 +150,7 @@ GRIDCOIN_CORE_CPP = addrman.cpp \
 	neuralnet/cpid.cpp \
 	neuralnet/project.cpp \
 	neuralnet/researcher.cpp \
+	neuralnet/superblock.cpp \
 	netbase.cpp \
 	net.cpp \
 	noui.cpp \

src/Makefile.test.include

@@ -43,9 +43,11 @@ GRIDCOIN_TESTS =\
   test/neuralnet/cpid_tests.cpp \
   test/neuralnet/project_tests.cpp \
   test/neuralnet/researcher_tests.cpp \
+  test/neuralnet/superblock_tests.cpp \
   test/rpc_tests.cpp \
   test/script_P2SH_tests.cpp \
   test/script_tests.cpp \
+  test/serialize_tests.cpp \
   test/sigopcount_tests.cpp \
   test/test_gridcoin.cpp \
   test/transaction_tests.cpp \

src/main.cpp

@@ -22,11 +22,11 @@
 #include "neuralnet/cpid.h"
 #include "neuralnet/neuralnet.h"
 #include "neuralnet/researcher.h"
+#include "neuralnet/superblock.h"
 #include "backup.h"
 #include "appcache.h"
 #include "tally.h"
 #include "contract/contract.h"
-#include "contract/superblock.h"
 #include "scraper_net.h"
 
 #include <boost/filesystem.hpp>
@@ -1880,7 +1880,8 @@ int64_t GetProofOfStakeReward(uint64_t nCoinAge, int64_t nFees, std::string cpid
             }
 
             int64_t nTotalSubsidy = nSubsidy + nFees;
-            if (nBoinc > 1)
+            // This rule does not apply in v11
+            if (nBoinc > 1 && pindexLast->nVersion <= 10)
             {
                 std::string sTotalSubsidy = RoundToString(CoinToDouble(nTotalSubsidy)+.00000123,8);
                 if (sTotalSubsidy.length() > 7)

src/neuralnet/cpid.cpp

@@ -82,6 +82,22 @@ bool Cpid::operator!=(const Cpid& other) const
     return m_bytes != other.m_bytes;
 }
 
+bool Cpid::operator<(const Cpid& other) const
+{
+    // CONSENSUS: Changing the behavior of this comparison operator will affect
+    // the sort order of protocol-sensitive maps (for example, superblocks).
+    //
+    return m_bytes < other.m_bytes;
+}
+
+bool Cpid::operator>(const Cpid& other) const
+{
+    // CONSENSUS: Changing the behavior of this comparison operator will affect
+    // the sort order of protocol-sensitive maps (for example, superblocks).
+    //
+    return m_bytes > other.m_bytes;
+}
+
 bool Cpid::IsZero() const
 {
     const auto zero = [](const unsigned char& i) { return i == 0; };

src/neuralnet/cpid.h

@@ -76,6 +76,36 @@ class Cpid
     //!
     bool operator!=(const Cpid& other) const;
 
+    //!
+    //! \brief Compare a supplied CPID value for less than other.
+    //!
+    //! The comparison checks from left to right with the most significant byte
+    //! on the left (byte order equivalent to the hex string representation).
+    //!
+    //! CONSENSUS: Changing the behavior of this comparison operator will affect
+    //! the sort order of protocol-sensitive maps (for example, superblocks).
+    //!
+    //! \param other A CPID value to check whether current is less than.
+    //!
+    //! \return \c true if the supplied CPID's bytes represent a greater number.
+    //!
+    bool operator<(const Cpid& other) const;
+
+    //!
+    //! \brief Compare a supplied CPID value for greater than other.
+    //!
+    //! The comparison checks from left to right with the most significant byte
+    //! on the left (byte order equivalent to the hex string representation).
+    //!
+    //! CONSENSUS: Changing the behavior of this comparison operator will affect
+    //! the sort order of protocol-sensitive maps (for example, superblocks).
+    //!
+    //! \param other A CPID value to check whether current is greater than.
+    //!
+    //! \return \c true if the supplied CPID's bytes represent a lesser number.
+    //!
+    bool operator>(const Cpid& other) const;
+
     //!
     //! \brief Determine whether the CPID contains only zeros.
     //!

src/neuralnet/neuralnet.h

@@ -2,6 +2,7 @@
 
 #include "beacon.h"
 #include "project.h"
+#include "superblock.h"
 
 #include <string>
 #include <memory>
@@ -52,6 +53,16 @@ namespace NN
         //!
         virtual std::string GetNeuralHash() = 0;
 
+        //!
+        //! \brief Get current superblock hash from scraper.
+        //!
+        //! \note This is a synchoronous operation.
+        //!
+        //! \return Current superblock hash. This might be empty if it has
+        //! not been calculated yet.
+        //!
+        virtual NN::QuorumHash GetSuperblockHash() = 0;
+
         //!
         //! \brief Get the most recently updated neural network contract.
         //!
@@ -62,6 +73,16 @@ namespace NN
         //!
         virtual std::string GetNeuralContract() = 0;
 
+        //!
+        //! \brief Get the most recently updated superblock contract.
+        //!
+        //! Synchronously queries the scraper for the current
+        //! superblock contract.
+        //!
+        //! \return Most recent superblock contract if available.
+        //!
+        virtual NN::Superblock GetSuperblockContract() = 0;
+
         //!
         //! \brief Synchronize DPOR data.
         //!

src/neuralnet/neuralnet_native.cpp

@@ -12,6 +12,9 @@ extern std::string ExplainMagnitude(std::string sCPID);
 
 using namespace NN;
 
+extern Superblock ScraperGetSuperblockContract(bool bStoreConvergedStats = false, bool bContractDirectFromStatsUpdate = false);
+extern QuorumHash ScraperGetSuperblockHash();
+
 bool NeuralNetNative::IsEnabled()
 {
     return GetArgument("disableneuralnetwork", "false") == "false";
@@ -29,11 +32,21 @@ std::string NeuralNetNative::GetNeuralHash()
     return ScraperGetNeuralHash();
 }
 
+QuorumHash NeuralNetNative::GetSuperblockHash()
+{
+    return ScraperGetSuperblockHash();
+}
+
 std::string NeuralNetNative::GetNeuralContract()
 {
     return ScraperGetNeuralContract(false, false);
 }
 
+Superblock NeuralNetNative::GetSuperblockContract()
+{
+    return ScraperGetSuperblockContract(false, false);
+}
+
 // Note that the data argument is still used here for compatibility, but I don't think it will
 // actually be used in the scraper. We will see.
 bool NeuralNetNative::SynchronizeDPOR(const BeaconConsensus& beacons)
@@ -50,5 +63,6 @@ int64_t NeuralNetNative::IsNeuralNet()
 {
     // This is the NN version number. TODO: Consider different number for new NN?
     int64_t nNeuralNetVersion = 1999;
+
     return nNeuralNetVersion;
 }

src/neuralnet/neuralnet_native.h

@@ -16,7 +16,9 @@ namespace NN
         bool IsEnabled();
         std::string GetNeuralVersion();
         std::string GetNeuralHash();
+        NN::QuorumHash GetSuperblockHash();
         std::string GetNeuralContract();
+        NN::Superblock GetSuperblockContract();
         bool SynchronizeDPOR(const BeaconConsensus& beacons);
         std::string ExplainMagnitude(const std::string& cpid);
         int64_t IsNeuralNet();

src/neuralnet/neuralnet_stub.cpp

@@ -19,11 +19,27 @@ std::string NeuralNetStub::GetNeuralHash()
     return std::string();
 }
 
+NN::QuorumHash NeuralNetStub::GetSuperblockHash()
+{
+    NN::QuorumHash EmptyQuorumHash;
+
+    //Initialize a purposefully empty (invalid) hash.
+    return EmptyQuorumHash;
+}
+
 std::string NeuralNetStub::GetNeuralContract()
 {
     return std::string();
 }
 
+NN::Superblock NeuralNetStub::GetSuperblockContract()
+{
+    NN::Superblock EmptySuperblock;
+
+    return EmptySuperblock;
+}
+
+
 bool NeuralNetStub::SynchronizeDPOR(const BeaconConsensus& beacons)
 {
     return false;

src/neuralnet/neuralnet_stub.h

@@ -16,7 +16,9 @@ namespace NN
         bool IsEnabled();
         std::string GetNeuralVersion();
         std::string GetNeuralHash();
+        NN::QuorumHash GetSuperblockHash();
         std::string GetNeuralContract();
+        NN::Superblock GetSuperblockContract();
         bool SynchronizeDPOR(const BeaconConsensus& beacons);
         std::string ExplainMagnitude(const std::string& data);
         int64_t IsNeuralNet();