Noir Core 1.0.1.1

- Temporarily disable Zerocoin

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

src/clientversion.h

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

src/main.cpp

@@ -1231,6 +1231,16 @@ bool AcceptToMemoryPoolWorker(CTxMemPool &pool, CValidationState &state, const C
         return state.Invalid(false, REJECT_ALREADY_KNOWN, "txn-already-in-mempool");
     // Check for conflicts with in-memory transactions
     set <uint256> setConflicts;
+
+    /*
+     *  Temporarily disable Zerocoin
+     */
+    if (tx.IsZerocoinSpend())
+    {
+        LogPrintf("AcceptToMemoryPoolWorker(): Zerocoin temporarily disabled!\n");
+        return false;
+    }
+
     //btzc
     CZerocoinState *zcState = CZerocoinState::GetZerocoinState();
     CBigNum zcSpendSerial;
@@ -2795,8 +2805,18 @@ bool ConnectBlock(const CBlock &block, CValidationState &state, CBlockIndex *pin
                         spentIndex.push_back(make_pair(CSpentIndexKey(input.prevout.hash, input.prevout.n), CSpentIndexValue(txHash, j, pindex->nHeight, prevout.nValue, addressType, hashBytes)));
                     }
                 }
-             }
+            }
+        }
+
+        /*
+         *  Temporarily disable Zerocoin
+         */
+        if (tx.IsZerocoinSpend() && !IsInitialBlockDownload())
+        {
+            LogPrintf("ConnectBlock(): Zerocoin temporarily disabled!\n");
+            return false;
         }
+
          if (fAddressIndex) {
             for (unsigned int k = 0; k < tx.vout.size(); k++) {
                 const CTxOut &out = tx.vout[k];

src/main.h

@@ -165,6 +165,10 @@ static std::map<int, CBlock> mapBlockData;
 
 static const bool DEFAULT_PEERBLOOMFILTERS = true;
 
+/*
+ *  Temporarily disable Zerocoin
+ */
+static const bool disableZerocoin = true;
 
 static const int DevRewardStartBlock = 230250;
 static const int DevRewardStopBlock = 255250;

src/qt/menupage.cpp

@@ -34,6 +34,8 @@ MenuPage::MenuPage(QWidget *parent) :
    ui->setupUi(this);
    ui->Noirnode->setEnabled(true);
 
+   ui->Zerocoin->setEnabled(false);
+
    connect(ui->Overview, SIGNAL(pressed()), this, SLOT(ClickedItem()));
    connect(ui->Send, SIGNAL(pressed()), this, SLOT(ClickedItem()));
    connect(ui->Receive, SIGNAL(pressed()), this, SLOT(ClickedItem()));

src/wallet/rpcwallet.cpp

@@ -2649,6 +2649,9 @@ UniValue mintzerocoin(const UniValue& params, bool fHelp)
     if (fHelp || params.size() > 1)
         throw runtime_error("mintzerocoin <amount>(1,10,25,50,100)\n" + HelpRequiringPassphrase());
 
+    if (disableZerocoin)
+        throw JSONRPCError(RPC_WALLET_ERROR, "Zerocoin temporarily disabled!");
+
     int64_t nAmount = 0;
     libzerocoin::CoinDenomination denomination;
     // Amount
@@ -2738,6 +2741,8 @@ UniValue spendzerocoin(const UniValue& params, bool fHelp) {
         );
      LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    if (disableZerocoin)
+        throw JSONRPCError(RPC_WALLET_ERROR, "Zerocoin temporarily disabled!");
 
     int64_t nAmount = 0;
     libzerocoin::CoinDenomination denomination;