Introduce CEvoDB for all evo related things, e.g. DIP3

codablock · random-zebra · commit d6c56d17de37 · 2021-04-11T10:21:06.000+02:00
&gt;&gt;&gt; backports dash@c9a72e8880fe88f07b64aecfc059f08ec14440fc

Also add transaction handling to ConnectTip and DisconnectTip and a few
other places where blocks are processed.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -385,6 +385,7 @@ set(COMMON_SOURCES
         ./src/coins.cpp
         ./src/key_io.cpp
         ./src/compressor.cpp
+        ./src/evo/evodb.cpp
         ./src/evo/specialtx.cpp
         ./src/consensus/merkle.cpp
         ./src/consensus/zerocoin_verify.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -181,6 +181,7 @@ BITCOIN_CORE_H = \
   cuckoocache.h \
   crypter.h \
   cyclingvector.h \
+  evo/evodb.h \
   evo/specialtx.h \
   pairresult.h \
   addressbook.h \
@@ -322,6 +323,7 @@ libbitcoin_server_a_SOURCES = \
   consensus/params.cpp \
   consensus/tx_verify.cpp \
   consensus/zerocoin_verify.cpp \
+  evo/evodb.cpp \
   evo/specialtx.cpp \
   httprpc.cpp \
   httpserver.cpp \
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
@@ -0,0 +1,14 @@
+// Copyright (c) 2018-2021 The Dash Core developers
+// Copyright (c) 2021 The PIVX Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "evodb.h"
+
+CEvoDB* evoDb;
+
+CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
+        db(GetDataDir() / "evodb", nCacheSize, fMemory, fWipe),
+        dbTransaction(db)
+{
+}
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
@@ -0,0 +1,65 @@
+// Copyright (c) 2018-2021 The Dash Core developers
+// Copyright (c) 2021 The PIVX Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef PIVX_EVODB_H
+#define PIVX_EVODB_H
+
+#include "dbwrapper.h"
+#include "sync.h"
+
+class CEvoDB
+{
+private:
+    RecursiveMutex cs;
+    CDBWrapper db;
+    CDBTransaction dbTransaction;
+
+public:
+    CEvoDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
+
+    std::unique_ptr<CScopedDBTransaction> BeginTransaction()
+    {
+        LOCK(cs);
+        auto t = CScopedDBTransaction::Begin(dbTransaction);
+        return t;
+    }
+
+    template<typename K, typename V>
+    bool Read(const K& key, V& value)
+    {
+        LOCK(cs);
+        return dbTransaction.Read(key, value);
+    }
+
+    template<typename K, typename V>
+    void Write(const K& key, const V& value)
+    {
+        LOCK(cs);
+        dbTransaction.Write(key, value);
+    }
+
+    template <typename K>
+    bool Exists(const K& key)
+    {
+        LOCK(cs);
+        return dbTransaction.Exists(key);
+    }
+
+    template <typename K>
+    void Erase(const K& key)
+    {
+        LOCK(cs);
+        dbTransaction.Erase(key);
+    }
+
+    CDBWrapper& GetRawDB()
+    {
+        return db;
+    }
+};
+
+extern CEvoDB* evoDb;
+
+#endif//PIVX_EVODB_H
diff --git a/src/init.cpp b/src/init.cpp
@@ -44,6 +44,7 @@
 #include "scheduler.h"
 #include "spork.h"
 #include "sporkdb.h"
+#include "evo/evodb.h"
 #include "txdb.h"
 #include "torcontrol.h"
 #include "guiinterface.h"
@@ -297,6 +298,8 @@ void PrepareShutdown()
         zerocoinDB = NULL;
         delete pSporkDB;
         pSporkDB = NULL;
+        delete evoDb;
+        evoDb = nullptr;
     }
 #ifdef ENABLE_WALLET
     if (pwalletMain)
@@ -1547,6 +1550,7 @@ bool AppInitMain()
     int64_t nCoinDBCache = std::min(nTotalCache / 2, (nTotalCache / 4) + (1 << 23)); // use 25%-50% of the remainder for disk cache
     nTotalCache -= nCoinDBCache;
     nCoinCacheUsage = nTotalCache; // the rest goes to in-memory cache
+    int64_t nEvoDbCache = 1024 * 1024 * 16; // TODO
     LogPrintf("Cache configuration:\n");
     LogPrintf("* Using %.1fMiB for block index database\n", nBlockTreeDBCache * (1.0 / 1024 / 1024));
     LogPrintf("* Using %.1fMiB for chain state database\n", nCoinDBCache * (1.0 / 1024 / 1024));
@@ -1571,10 +1575,12 @@ bool AppInitMain()
                 delete pblocktree;
                 delete zerocoinDB;
                 delete pSporkDB;
+                delete evoDb;
 
                 //PIVX specific: zerocoin and spork DB's
                 zerocoinDB = new CZerocoinDB(0, false, fReindex);
                 pSporkDB = new CSporkDB(0, false, false);
+                evoDb = new CEvoDB(nEvoDbCache, false, fReindex);
 
                 pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
 
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -9,6 +9,7 @@
 
 #include "blockassembler.h"
 #include "guiinterface.h"
+#include "evo/evodb.h"
 #include "miner.h"
 #include "net_processing.h"
 #include "random.h"
@@ -75,6 +76,7 @@ TestingSetup::TestingSetup()
         RegisterAllCoreRPCCommands(tableRPC);
         zerocoinDB = new CZerocoinDB(0, true);
         pSporkDB = new CSporkDB(0, true);
+        evoDb = new CEvoDB(1 << 20, true, true);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
@@ -109,6 +111,7 @@ TestingSetup::~TestingSetup()
         delete pblocktree;
         delete zerocoinDB;
         delete pSporkDB;
+        delete evoDb;
         fs::remove_all(pathTemp);
 }
 
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -43,6 +43,7 @@
 #include "script/sigcache.h"
 #include "spork.h"
 #include "sporkdb.h"
+#include "evo/evodb.h"
 #include "txdb.h"
 #include "txmempool.h"
 #include "undo.h"
@@ -1954,11 +1955,16 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     const uint256& saplingAnchorBeforeDisconnect = pcoinsTip->GetBestAnchor();
     int64_t nStart = GetTimeMicros();
     {
+        auto dbTx = evoDb->BeginTransaction();
+
         CCoinsViewCache view(pcoinsTip);
         assert(view.GetBestBlock() == pindexDelete->GetBlockHash());
         if (DisconnectBlock(block, pindexDelete, view) != DISCONNECT_OK)
             return error("DisconnectTip() : DisconnectBlock %s failed", pindexDelete->GetBlockHash().ToString());
-        assert(view.Flush());
+        bool flushed = view.Flush();
+        assert(flushed);
+        bool committed = dbTx->Commit();
+        assert(committed);
     }
     LogPrint(BCLog::BENCH, "- Disconnect block: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
     const uint256& saplingAnchorAfterDisconnect = pcoinsTip->GetBestAnchor();
@@ -2103,6 +2109,8 @@ bool static ConnectTip(CValidationState& state, CBlockIndex* pindexNew, const st
     int64_t nTime3;
     LogPrint(BCLog::BENCH, "  - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001);
     {
+        auto dbTx = evoDb->BeginTransaction();
+
         CCoinsViewCache view(pcoinsTip);
         bool rv = ConnectBlock(blockConnecting, state, pindexNew, view, false);
         GetMainSignals().BlockChecked(blockConnecting, state);
@@ -2114,7 +2122,10 @@ bool static ConnectTip(CValidationState& state, CBlockIndex* pindexNew, const st
         nTime3 = GetTimeMicros();
         nTimeConnectTotal += nTime3 - nTime2;
         LogPrint(BCLog::BENCH, "  - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001);
-        assert(view.Flush());
+        bool flushed = view.Flush();
+        assert(flushed);
+        bool committed = dbTx->Commit();
+        assert(committed);
     }
     int64_t nTime4 = GetTimeMicros();
     nTimeFlush += nTime4 - nTime3;
@@ -3415,6 +3426,9 @@ bool TestBlockValidity(CValidationState& state, const CBlock& block, CBlockIndex
     indexDummy.pprev = pindexPrev;
     indexDummy.nHeight = pindexPrev->nHeight + 1;
 
+    // begin tx and let it rollback
+    auto dbTx = evoDb->BeginTransaction();
+
     // NOTE: CheckBlockHeader is called by CheckBlock
     if (!ContextualCheckBlockHeader(block, state, pindexPrev))
         return error("%s: ContextualCheckBlockHeader failed: %s", __func__, FormatStateMessage(state));
@@ -3654,6 +3668,10 @@ bool CVerifyDB::VerifyDB(CCoinsView* coinsview, int nCheckLevel, int nCheckDepth
         return true;
 
     const int chainHeight = chainActive.Height();
+
+    // begin tx and let it rollback
+    auto dbTx = evoDb->BeginTransaction();
+
     // Verify blocks in the best chain
     if (nCheckDepth <= 0)
         nCheckDepth = 1000000000; // suffices until the year 19000
