Merge pull request #12 from ZencashOfficial/sidechains_dev

Release v2.1.0-beta3

Author: cronicc

README.md

@@ -1,4 +1,4 @@
-Zen 2.1.0-beta2
+Zen 2.1.0-beta3
 ==============
 
 What is Horizen?

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)

src/clientversion.h

@@ -35,7 +35,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 1
+#define CLIENT_VERSION_BUILD 2
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/coins.cpp

@@ -1324,6 +1324,11 @@ bool CCoinsViewCache::HandleSidechainEvents(int height, CBlockUndo& blockUndo, s
         LogPrint("sc", "%s():%d - SIDECHAIN-EVENT: lastCertEpoch [%d], lastCertHash [%s]\n",
                 __func__, __LINE__, scInfo.lastEpochReferencedByCertificate, scInfo.lastCertificateHash.ToString());
 
+        blockUndo.vVoidedCertUndo.push_back(CVoidedCertUndo());
+        blockUndo.vVoidedCertUndo.back().voidedCertScId = ceasingScId;
+        LogPrint("sc", "%s():%d - set voidedCertHash[%s], ceasingScId = %s\n",
+            __func__, __LINE__, scInfo.lastCertificateHash.ToString(), ceasingScId.ToString());
+
         if (scInfo.lastEpochReferencedByCertificate == CScCertificate::EPOCH_NULL) {
             assert(scInfo.lastCertificateHash.IsNull());
             continue;
@@ -1336,19 +1341,8 @@ bool CCoinsViewCache::HandleSidechainEvents(int height, CBlockUndo& blockUndo, s
         assert(coins->nBwtMaturityHeight != 0);
 
         //null all bwt outputs and add related txundo in block
-        bool foundFirstBwt = false;
-
         for(int pos = coins->nFirstBwtPos; pos < coins->vout.size(); ++pos)
         {
-            if (!foundFirstBwt)
-            {
-                blockUndo.vVoidedCertUndo.push_back(CVoidedCertUndo());
-                blockUndo.vVoidedCertUndo.back().voidedCertScId = ceasingScId;
-                LogPrint("sc", "%s():%d - set voidedCertHash[%s], firstBwtPos[%d]\n",
-                    __func__, __LINE__, scInfo.lastCertificateHash.ToString(), pos);
-                foundFirstBwt = true;
-            }
-
             blockUndo.vVoidedCertUndo.back().voidedOuts.push_back(CTxInUndo(coins->vout.at(pos)));
             coins->Spend(pos);
             if (coins->vout.size() == 0)
@@ -1427,42 +1421,47 @@ bool CCoinsViewCache::RevertSidechainEvents(const CBlockUndo& blockUndo, int hei
 
         CSidechain scInfo;
         assert(GetSidechain(voidedCertUndo.voidedCertScId, scInfo));
-        const uint256& coinHash = scInfo.lastCertificateHash;
 
-        if(coinHash.IsNull())
-        {
-            fClean = fClean && error("%s: malformed undo data, missing voided certificate hash ", __func__);
-            return fClean;
-        }
-        LogPrint("sc", "%s():%d - reverting voiding of bwt for certificate [%s]\n", __func__, __LINE__, coinHash.ToString());
 
-        CCoinsModifier coins = this->ModifyCoins(coinHash);
-        const std::vector<CTxInUndo>& voidedOuts = voidedCertUndo.voidedOuts;
-        for (size_t idx = voidedOuts.size(); idx-- > 0;)
+        if (scInfo.lastEpochReferencedByCertificate != CScCertificate::EPOCH_NULL)
         {
-            if (voidedOuts.at(idx).nHeight != 0)
+            const uint256& coinHash = scInfo.lastCertificateHash;
+ 
+            if(coinHash.IsNull())
             {
-                coins->fCoinBase          = voidedOuts.at(idx).fCoinBase;
-                coins->nHeight            = voidedOuts.at(idx).nHeight;
-                coins->nVersion           = voidedOuts.at(idx).nVersion;
-                coins->nFirstBwtPos       = voidedOuts.at(idx).nFirstBwtPos;
-                coins->nBwtMaturityHeight = voidedOuts.at(idx).nBwtMaturityHeight;
-            } else
+                fClean = fClean && error("%s: malformed undo data, missing voided certificate hash ", __func__);
+                return fClean;
+            }
+            LogPrint("sc", "%s():%d - reverting voiding of bwt for certificate [%s]\n", __func__, __LINE__, coinHash.ToString());
+ 
+            CCoinsModifier coins = this->ModifyCoins(coinHash);
+            const std::vector<CTxInUndo>& voidedOuts = voidedCertUndo.voidedOuts;
+            for (size_t idx = voidedOuts.size(); idx-- > 0;)
             {
-                if (coins->IsPruned())
-                    fClean = fClean && error("%s: undo data adding output to missing transaction", __func__);
+                if (voidedOuts.at(idx).nHeight != 0)
+                {
+                    coins->fCoinBase          = voidedOuts.at(idx).fCoinBase;
+                    coins->nHeight            = voidedOuts.at(idx).nHeight;
+                    coins->nVersion           = voidedOuts.at(idx).nVersion;
+                    coins->nFirstBwtPos       = voidedOuts.at(idx).nFirstBwtPos;
+                    coins->nBwtMaturityHeight = voidedOuts.at(idx).nBwtMaturityHeight;
+                } else
+                {
+                    if (coins->IsPruned())
+                        fClean = fClean && error("%s: undo data adding output to missing transaction", __func__);
+                }
+ 
+                if(coins->IsAvailable(coins->nFirstBwtPos + idx))
+                    fClean = fClean && error("%s: undo data overwriting existing output", __func__);
+                if (coins->vout.size() < (coins->nFirstBwtPos + idx+1))
+                    coins->vout.resize(coins->nFirstBwtPos + idx+1);
+                coins->vout.at(coins->nFirstBwtPos + idx) = voidedOuts.at(idx).txout;
             }
-
-            if(coins->IsAvailable(coins->nFirstBwtPos + idx))
-                fClean = fClean && error("%s: undo data overwriting existing output", __func__);
-            if (coins->vout.size() < (coins->nFirstBwtPos + idx+1))
-                coins->vout.resize(coins->nFirstBwtPos + idx+1);
-            coins->vout.at(coins->nFirstBwtPos + idx) = voidedOuts.at(idx).txout;
+ 
+            if(pVoidedCertsList != nullptr)
+                pVoidedCertsList->push_back(coinHash);
         }
 
-        if(pVoidedCertsList != nullptr)
-            pVoidedCertsList->push_back(coinHash);
-
         if (!fClean) return false;
 
         recreatedScEvent.ceasingScs.insert(voidedCertUndo.voidedCertScId);

src/gtest/test_sidechain_events.cpp

@@ -744,7 +744,7 @@ TEST_F(SidechainsEventsTestSuite, RestoreNoBwtCeasedCoins) {
     for (unsigned int pos = 0; pos < cert.GetVout().size(); ++pos) {
         EXPECT_TRUE(rebuiltCoin.vout[pos] == originalCoins.vout[pos]);
     }
-    EXPECT_FALSE(view->HaveSidechainEvents(minimalCeaseHeight));
+    EXPECT_TRUE(view->HaveSidechainEvents(minimalCeaseHeight));
 }
 
 TEST_F(SidechainsEventsTestSuite, RestoreEmptyCertCeasedCoins) {
@@ -789,7 +789,7 @@ TEST_F(SidechainsEventsTestSuite, RestoreEmptyCertCeasedCoins) {
     //checks
     EXPECT_FALSE(view->HaveCoins(cert.GetHash()));
 
-    EXPECT_FALSE(view->HaveSidechainEvents(minimalCeaseHeight));
+    EXPECT_TRUE(view->HaveSidechainEvents(minimalCeaseHeight));
 }
 ///////////////////////////////////////////////////////////////////////////////
 //////////////////////////////// UndoCeasingScs ///////////////////////////////