reorg + refactoring + conflicts

furszy · Fuzzbawls · commit f3f7a32319a7 · 2019-03-22T16:14:28.000-07:00
diff --git a/src/lightzpivthread.cpp b/src/lightzpivthread.cpp
@@ -54,7 +54,6 @@ void CLightWorker::ThreadLightZPIVSimplified() {
                                 genWit.getFilter(),
                                 accumulator,
                                 witness,
-                                100,
                                 nMintsAdded,
                                 strFailReason,
                                 ret,
diff --git a/src/lightzpivthread.h b/src/lightzpivthread.h
@@ -9,7 +9,7 @@
 
 #include <atomic>
 #include "genwit.h"
-#include "accumulators.h"
+#include "zpiv/accumulators.h"
 #include "concurrentqueue.h"
 #include "chainparams.h"
 #include <boost/function.hpp>
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1299,18 +1299,19 @@ UniValue getaccumulatorwitness(const UniValue& params, bool fHelp)
     string strFailReason = "";
     int nMintsAdded = 0;
     CZerocoinSpendReceipt receipt;
-    if (!GenerateAccumulatorWitness(pubCoin, accumulator, witness, 100, nMintsAdded, strFailReason)) {
-        receipt.SetStatus(_(strFailReason.c_str()), ZPIV_FAILED_ACCUMULATOR_INITIALIZATION);
-        throw JSONRPCError(RPC_DATABASE_ERROR, receipt.GetStatusMessage());
-    }
-
-    UniValue obj(UniValue::VOBJ);
-    obj.push_back(Pair("Accumulator Value", accumulator.getValue().GetHex()));
-    obj.push_back(Pair("Denomination", accumulator.getDenomination()));
-    obj.push_back(Pair("Mints added",nMintsAdded));
-    obj.push_back(Pair("Witness Value", witness.getValue().GetHex()));
-
-    return obj;
+    // TODO: Fix me
+//    if (!GenerateAccumulatorWitness(pubCoin, accumulator, witness, 100, nMintsAdded, strFailReason)) {
+//        receipt.SetStatus(_(strFailReason.c_str()), ZPIV_FAILED_ACCUMULATOR_INITIALIZATION);
+//        throw JSONRPCError(RPC_DATABASE_ERROR, receipt.GetStatusMessage());
+//    }
+//
+//    UniValue obj(UniValue::VOBJ);
+//    obj.push_back(Pair("Accumulator Value", accumulator.getValue().GetHex()));
+//    obj.push_back(Pair("Denomination", accumulator.getDenomination()));
+//    obj.push_back(Pair("Mints added",nMintsAdded));
+//    obj.push_back(Pair("Witness Value", witness.getValue().GetHex()));
+
+    return UniValue(UniValue::VOBJ);
 }
 
 UniValue getmintsinblocks(const UniValue& params, bool fHelp) {
diff --git a/src/wallet.h b/src/wallet.h
@@ -228,6 +228,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool SetMintUnspent(const CBigNum& bnSerial);
     bool UpdateMint(const CBigNum& bnValue, const int& nHeight, const uint256& txid, const libzerocoin::CoinDenomination& denom);
     string GetUniqueWalletBackupName(bool fzpivAuto) const;
+    void InitAutoConvertAddresses();
 
 
     /** Zerocin entry changed.
@@ -385,6 +386,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     const CWalletTx* GetWalletTx(const uint256& hash) const;
 
+    void PrecomputeSpends();
+
     //! check whether we are allowed to upgrade (or already support) to the named feature
     bool CanSupportFeature(enum WalletFeature wf)
     {
diff --git a/src/zpiv/accumulators.cpp b/src/zpiv/accumulators.cpp
@@ -529,7 +529,7 @@ bool GenerateAccumulatorWitness(CoinWitnessData* coinWitness, AccumulatorMap& ma
         }
 
         // Mint added height
-        coinWitness->SetHeightMintAdded(SearchMintHeightOf(*coinWitness->coin->getValue()));
+        coinWitness->SetHeightMintAdded(SearchMintHeightOf(coinWitness->coin->getValue()));
 
         // Set the initial state of the witness accumulator for this coin.
         CBigNum bnAccValue = 0;
diff --git a/src/zpiv/accumulators.h b/src/zpiv/accumulators.h
@@ -8,33 +8,15 @@
 #include "libzerocoin/Accumulator.h"
 #include "libzerocoin/Coin.h"
 #include "libzerocoin/Denominations.h"
-#include "primitives/zerocoin.h"
+#include "zpiv/zerocoin.h"
 #include "accumulatormap.h"
 #include "chain.h"
 #include "uint256.h"
 #include "bloom.h"
+#include "witness.h"
 
 class CBlockIndex;
 
-class CoinWitnessData
-{
-public:
-    std::unique_ptr<libzerocoin::PublicCoin> coin;
-    std::unique_ptr<libzerocoin::Accumulator> pAccumulator;
-    std::unique_ptr<libzerocoin::AccumulatorWitness> pWitness;
-    libzerocoin::CoinDenomination denom;
-    int nHeightCheckpoint;
-    int nHeightMintAdded;
-    int nHeightAccStart;
-    int nMintsAdded;
-    uint256 txid;
-    bool isV1;
-
-    CoinWitnessData();
-    void SetHeightMintAdded(int nHeight);
-    //  CoinWitnessData(CoinWitnessData&);
-};
-
 std::map<libzerocoin::CoinDenomination, int> GetMintMaturityHeight();
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ bool GenerateAccumulatorWitness(CoinWitnessData* coinWitness, AccumulatorMap& ma`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`// Mint added height`
`532`		`- coinWitness->SetHeightMintAdded(SearchMintHeightOf(*coinWitness->coin->getValue()));`
	`532`	`+ coinWitness->SetHeightMintAdded(SearchMintHeightOf(coinWitness->coin->getValue()));`
`533`	`533`
`534`	`534`	`// Set the initial state of the witness accumulator for this coin.`
`535`	`535`	`CBigNum bnAccValue = 0;`