Add trusted N for MainNet and TestNet, set denomination value to 50 coins

diff --git a/src/init.cpp b/src/init.cpp
index 0f18b57..a35efaf 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -361,11 +361,6 @@ bool AppInit2()
     nNodeLifespan = GetArg("-addrlifespan", 7);
     fStakeUsePooledKeys = GetBoolArg("-stakepooledkeys", false);
 
-    if (GetBoolArg("-zerotest", false))
-    {
-        Test_RunAllTests();
-    }
-
     CheckpointsMode = Checkpoints::STRICT;
     std::string strCpMode = GetArg("-cppolicy", "strict");
 
@@ -707,6 +702,7 @@ bool AppInit2()
     if (!LoadBlockIndex())
         return InitError(_("Error loading blkindex.dat"));
 
+
     // as LoadBlockIndex can take several minutes, it's possible the user
     // requested to kill bitcoin-qt during the last operation. If so, exit.
     // As the program has not fully started yet, Shutdown() is possibly overkill.
@@ -746,6 +742,16 @@ bool AppInit2()
         return false;
     }
 
+    // ********************************************************* Testing Zerocoin
+
+
+    if (GetBoolArg("-zerotest", false))
+    {
+        printf("\n=== ZeroCoin tests start ===\n");
+        Test_RunAllTests();
+        printf("=== ZeroCoin tests end ===\n\n");
+    }
+
     // ********************************************************* Step 8: load wallet
 
     uiInterface.InitMessage(_("Loading wallet..."));

diff --git a/src/main.cpp b/src/main.cpp
index 85640d7..952fcfb 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,10 +11,12 @@
 #include "init.h"
 #include "ui_interface.h"
 #include "kernel.h"
+#include "zerocoin/Zerocoin.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
+
 using namespace std;
 using namespace boost;
 
@@ -32,6 +34,7 @@ unsigned int nTransactionsUpdated = 0;
 
 map<uint256, CBlockIndex*> mapBlockIndex;
 set<pair<COutPoint, unsigned int> > setStakeSeen;
+libzerocoin::Params* ZCParams;
 
 CBigNum bnProofOfWorkLimit(~uint256(0) >> 20); // "standard" scrypt target limit for proof of work, results with 0,000244140625 proof-of-work difficulty
 CBigNum bnProofOfStakeLegacyLimit(~uint256(0) >> 24); // proof of stake target limit from block #15000 and until 20 June 2013, results with 0,00390625 proof of stake difficulty
@@ -2689,6 +2692,8 @@ FILE* AppendBlockFile(unsigned int& nFileRet)
 
 bool LoadBlockIndex(bool fAllowNew)
 {
+    CBigNum bnTrustedModulus;
+
     if (fTestNet)
     {
         pchMessageStart[0] = 0xcd;
@@ -2696,12 +2701,20 @@ bool LoadBlockIndex(bool fAllowNew)
         pchMessageStart[2] = 0xc0;
         pchMessageStart[3] = 0xef;
 
+        bnTrustedModulus.SetHex("f0d14cf72623dacfe738d0892b599be0f31052239cddd95a3f25101c801dc990453b38c9434efe3f372db39a32c2bb44cbaea72d62c8931fa785b0ec44531308df3e46069be5573e49bb29f4d479bfc3d162f57a5965db03810be7636da265bfced9c01a6b0296c77910ebdc8016f70174f0f18a57b3b971ac43a934c6aedbc5c866764a3622b5b7e3f9832b8b3f133c849dbcc0396588abcd1e41048555746e4823fb8aba5b3d23692c6857fccce733d6bb6ec1d5ea0afafecea14a0f6f798b6b27f77dc989c557795cc39a0940ef6bb29a7fc84135193a55bcfc2f01dd73efad1b69f45a55198bd0e6bef4d338e452f6a420f1ae2b1167b923f76633ab6e55");
         bnProofOfWorkLimit = bnProofOfWorkLimitTestNet; // 16 bits PoW target limit for testnet
         nStakeMinAge = 2 * 60 * 60; // test net min age is 2 hours
         nModifierInterval = 20 * 60; // test modifier interval is 20 minutes
         nCoinbaseMaturity = 10; // test maturity is 10 blocks
         nStakeTargetSpacing = 5 * 60; // test block spacing is 5 minutes
     }
+    else
+    {
+        bnTrustedModulus.SetHex("d01f952e1090a5a72a3eda261083256596ccc192935ae1454c2bafd03b09e6ed11811be9f3a69f5783bbbced8c6a0c56621f42c2d19087416facf2f13cc7ed7159d1c5253119612b8449f0c7f54248e382d30ecab1928dbf075c5425dcaee1a819aa13550e0f3227b8c685b14e0eae094d65d8a610a6f49fff8145259d1187e4c6a472fa5868b2b67f957cb74b787f4311dbc13c97a2ca13acdb876ff506ebecbb904548c267d68868e07a32cd9ed461fbc2f920e9940e7788fed2e4817f274df5839c2196c80abe5c486df39795186d7bc86314ae1e8342f3c884b158b4b05b4302754bf351477d35370bad6639b2195d30006b77bf3dbb28b848fd9ecff5662bf39dde0c974e83af51b0d3d642d43834827b8c3b189065514636b8f2a59c42ba9b4fc4975d4827a5d89617a3873e4b377b4d559ad165748632bd928439cfbc5a8ef49bc2220e0b15fb0aa302367d5e99e379a961c1bc8cf89825da5525e3c8f14d7d8acca2fa9c133a2176ae69874d8b1d38b26b9c694e211018005a97b40848681b9dd38feb2de141626fb82591aad20dc629b2b6421cef1227809551a0e4e943ab99841939877f18f2d9c0addc93cf672e26b02ed94da3e6d329e8ac8f3736eebbf37bb1a21e5aadf04ee8e3b542f876aa88b2adf2608bd86329b7f7a56fd0dc1c40b48188731d11082aea360c62a0840c2db3dad7178fd7e359317ae081");
+    }
+
+    // Set up the Zerocoin Params object
+    ZCParams = new libzerocoin::Params(bnTrustedModulus);
 
     //
     // Load block index

diff --git a/src/main.h b/src/main.h
index 666745d..8b57cd4 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -10,6 +10,7 @@
 #include "net.h"
 #include "script.h"
 #include "scrypt.h"
+#include "zerocoin/Zerocoin.h"
 
 #include <list>
 
@@ -57,12 +58,10 @@ static const int fHaveUPnP = false;
 
 static const uint256 hashGenesisBlock("0x00000a060336cbb72fe969666d337b87198b1add2abaa59cca226820b32933a4");
 static const uint256 hashGenesisBlockTestNet("0x000c763e402f2436da9ed36c7286f62c3f6e5dbafce9ff289bd43d7459327eb");
-
 static const int64 nMaxClockDrift = 2 * 60 * 60;        // two hours
 
+extern libzerocoin::Params* ZCParams;
 extern CScript COINBASE_FLAGS;
-
-
 extern CCriticalSection cs_main;
 extern std::map<uint256, CBlockIndex*> mapBlockIndex;
 extern std::set<std::pair<COutPoint, unsigned int> > setStakeSeen;
@@ -532,7 +531,7 @@ public:
     bool IsCoinStake() const
     {
         // ppcoin: the coin stake transaction is marked with the first output empty
-        return (vin.size() > 0 && (!vin[0].prevout.IsNull()) && vout.size() >= 2 && vout[0].IsEmpty());
+        return (vin.size() > 0 && (!vin[0].prevout.IsNull()) && vout.size() >= 2 && vout[0].IsEmpty() && !vout[1].IsEmpty());
     }
 
     /** Check for standard transaction types

diff --git a/src/zerocoin/Accumulator.h b/src/zerocoin/Accumulator.h
index 17cd58f..deed87b 100644 (file)
--- a/src/zerocoin/Accumulator.h
+++ b/src/zerocoin/Accumulator.h
@@ -43,9 +43,9 @@ public:
         * @param d the denomination of coins we are accumulating
         * @throw     Zerocoin exception in case of invalid parameters
         **/
-       Accumulator(const AccumulatorAndProofParams* p, const CoinDenomination d = ZQ_LOVELACE);
+       Accumulator(const AccumulatorAndProofParams* p, const CoinDenomination d = ZQ_PEDERSEN);
 
-       Accumulator(const Params* p, const CoinDenomination d = ZQ_LOVELACE);
+       Accumulator(const Params* p, const CoinDenomination d = ZQ_PEDERSEN);
 
        /**
         * Accumulate a coin into the accumulator. Validates

diff --git a/src/zerocoin/Coin.cpp b/src/zerocoin/Coin.cpp
index 4841c5e..c9aa9a5 100644 (file)
--- a/src/zerocoin/Coin.cpp
+++ b/src/zerocoin/Coin.cpp
@@ -17,7 +17,7 @@ namespace libzerocoin {
 
 //PublicCoin class
 PublicCoin::PublicCoin(const Params* p):
-       params(p), denomination(ZQ_LOVELACE) {
+       params(p), denomination(ZQ_PEDERSEN) {
        if(this->params->initialized == false) {
                throw std::invalid_argument("Params are not initialized");
        }

diff --git a/src/zerocoin/Coin.h b/src/zerocoin/Coin.h
index e862aad..09e3caa 100644 (file)
--- a/src/zerocoin/Coin.h
+++ b/src/zerocoin/Coin.h
@@ -45,9 +45,9 @@ public:
         *
         * @param p cryptographic paramters
         * @param coin the value of the commitment.
-        * @param denomination The denomination of the coin. Defaults to ZQ_LOVELACE
+        * @param denomination The denomination of the coin. Defaults to ZQ_PEDERSEN
         */
-       PublicCoin( const Params* p, const Bignum& coin, const CoinDenomination d = ZQ_LOVELACE);
+       PublicCoin( const Params* p, const Bignum& coin, const CoinDenomination d = ZQ_PEDERSEN);
        const Bignum& getValue() const;
        const CoinDenomination getDenomination() const;
        bool operator==(const PublicCoin& rhs) const;
@@ -88,7 +88,7 @@ public:
        PrivateCoin(const Params* p, Stream& strm): params(p) {
                strm >> *this;
        }
-       PrivateCoin(const Params* p,const CoinDenomination denomination = ZQ_LOVELACE);
+       PrivateCoin(const Params* p,const CoinDenomination denomination = ZQ_PEDERSEN);
        const PublicCoin& getPublicCoin() const;
        const Bignum& getSerialNumber() const;
        const Bignum& getRandomness() const;

diff --git a/src/zerocoin/CoinSpend.h b/src/zerocoin/CoinSpend.h
index c8d20b9..8bf6925 100644 (file)
--- a/src/zerocoin/CoinSpend.h
+++ b/src/zerocoin/CoinSpend.h
@@ -32,7 +32,7 @@ namespace libzerocoin {
 class CoinSpend {
 public:
        template<typename Stream>
-       CoinSpend(const Params* p,  Stream& strm):denomination(ZQ_LOVELACE),
+       CoinSpend(const Params* p,  Stream& strm):denomination(ZQ_PEDERSEN),
                accumulatorPoK(&p->accumulatorParams),
                serialNumberSoK(p),
                commitmentPoK(&p->serialNumberSoKCommitmentGroup, &p->accumulatorParams.accumulatorPoKCommitmentGroup) {