[Main] Refactor Accumulator Code

src/Makefile.am

@@ -77,6 +77,8 @@ endif
 # pivx core #
 BITCOIN_CORE_H = \
   activemasternode.h \
+  accumulators.h \
+  accumulatormap.h \
   addrman.h \
   alert.h \
   allocators.h \
@@ -169,7 +171,6 @@ BITCOIN_CORE_H = \
   zmq/zmqconfig.h \
   zmq/zmqnotificationinterface.h \
   zmq/zmqpublishnotifier.h \
-  accumulators.h \
   compat/sanity.h
 
 JSON_H = \
@@ -334,6 +335,8 @@ libzerocoin_libbitcoin_zerocoin_a_SOURCES = \
 # common: shared between pivxd, and pivx-qt and non-server tools
 libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_common_a_SOURCES = \
+  accumulators.cpp \
+  accumulatormap.cpp \
   allocators.cpp \
   amount.cpp \
   base58.cpp \
@@ -361,7 +364,6 @@ libbitcoin_common_a_SOURCES = \
   script/script_error.cpp \
   spork.cpp \
   sporkdb.cpp \
-  accumulators.cpp \
   $(BITCOIN_CORE_H)
 
 # util: shared between all executables.

src/accumulatormap.cpp

@@ -0,0 +1,88 @@
+// Copyright (c) 2017 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "accumulatormap.h"
+#include "accumulators.h"
+#include "main.h"
+#include "txdb.h"
+#include "libzerocoin/Denominations.h"
+
+using namespace libzerocoin;
+using namespace std;
+
+//Construct accumulators for all denominations
+AccumulatorMap::AccumulatorMap()
+{
+    for (auto& denom : zerocoinDenomList) {
+        unique_ptr<Accumulator> uptr(new Accumulator(Params().Zerocoin_Params(), denom));
+        mapAccumulators.insert(make_pair(denom, std::move(uptr)));
+    }
+}
+
+//Reset each accumulator to its default state
+void AccumulatorMap::Reset()
+{
+    mapAccumulators.clear();
+    for (auto& denom : zerocoinDenomList) {
+        unique_ptr<Accumulator> uptr(new Accumulator(Params().Zerocoin_Params(), denom));
+        mapAccumulators.insert(make_pair(denom, std::move(uptr)));
+    }
+}
+
+//Load a checkpoint containing 8 32bit checksums of accumulator values.
+bool AccumulatorMap::Load(uint256 nCheckpoint)
+{
+    for (auto& denom : zerocoinDenomList) {
+        uint32_t nChecksum = ParseChecksum(nCheckpoint, denom);
+
+        CBigNum bnValue;
+        if (!zerocoinDB->ReadAccumulatorValue(nChecksum, bnValue)) {
+            LogPrintf("%s : cannot find checksum %d", __func__, nChecksum);
+            return false;
+        }
+
+        mapAccumulators.at(denom)->setValue(bnValue);
+    }
+    return true;
+}
+
+//Add a zerocoin to the accumulator of its denomination.
+bool AccumulatorMap::Accumulate(PublicCoin pubCoin, bool fSkipValidation)
+{
+    CoinDenomination denom = pubCoin.getDenomination();
+    if (denom == CoinDenomination::ZQ_ERROR)
+        return false;
+
+    if (fSkipValidation)
+        mapAccumulators.at(denom)->increment(pubCoin.getValue());
+    else
+        mapAccumulators.at(denom)->accumulate(pubCoin);
+    return true;
+}
+
+//Get the value of a specific accumulator
+CBigNum AccumulatorMap::GetValue(CoinDenomination denom)
+{
+    if (denom == CoinDenomination::ZQ_ERROR)
+        return CBigNum(0);
+    return mapAccumulators.at(denom)->getValue();
+}
+
+//Calculate a 32bit checksum of each accumulator value. Concatenate checksums into uint256
+uint256 AccumulatorMap::GetCheckpoint()
+{
+    uint256 nCheckpoint;
+
+    //Prevent possible overflows from future changes to the list and forgetting to update this code
+    assert(zerocoinDenomList.size() == 8);
+    for (auto& denom : zerocoinDenomList) {
+        CBigNum bnValue = mapAccumulators.at(denom)->getValue();
+        uint32_t nCheckSum = GetChecksum(bnValue);
+        nCheckpoint = nCheckpoint << 32 | nCheckSum;
+    }
+
+    return nCheckpoint;
+}
+
+

src/accumulatormap.h

@@ -0,0 +1,23 @@
+// Copyright (c) 2017 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PIVX_ACCUMULATORMAP_H
+#define PIVX_ACCUMULATORMAP_H
+
+#include "libzerocoin/Accumulator.h"
+#include "libzerocoin/Coin.h"
+
+//A map with an accumulator for each denomination
+class AccumulatorMap
+{
+private:
+    std::map<libzerocoin::CoinDenomination, std::unique_ptr<libzerocoin::Accumulator> > mapAccumulators;
+public:
+    AccumulatorMap();
+    bool Load(uint256 nCheckpoint);
+    bool Accumulate(libzerocoin::PublicCoin pubCoin, bool fSkipValidation = false);
+    CBigNum GetValue(libzerocoin::CoinDenomination denom);
+    uint256 GetCheckpoint();
+    void Reset();
+};
+#endif //PIVX_ACCUMULATORMAP_H