Remove log spam and ensure proper zpiv version is used.

KolbyML · May 9, 2018 · ccf6c77 · ccf6c77
1 parent 8a6d425
commit ccf6c77
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1068,7 +1068,7 @@ bool TxOutToPublicCoin(const CTxOut txout, PublicCoin& pubCoin, CValidationState
  publicZerocoin.setvch(vchZeroMint);
 
  CoinDenomination denomination = AmountToZerocoinDenomination(txout.nValue);
- LogPrint("zero", "%s ZCPRINT denomination %d pubcoin %s\n", __func__, denomination, publicZerocoin.GetHex());
+ //LogPrint("zero", "%s ZCPRINT denomination %d pubcoin %s\n", __func__, denomination, publicZerocoin.GetHex());
  if (denomination == ZQ_ERROR)
  return state.DoS(100, error("TxOutToPublicCoin : txout.nValue is not correct"));
 

diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -4563,9 +4563,9 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con
 {
  // Default error status if not changed below
  receipt.SetStatus(_("Transaction Mint Started"), ZPIV_TXMINT_GENERAL);
- libzerocoin::ZerocoinParams* paramsAccumulator = Params().Zerocoin_Params(chainActive.Height() < Params().Zerocoin_Block_V2_Start());
+ libzerocoin::ZerocoinParams* paramsAccumulator = Params().Zerocoin_Params(false);
 
- bool isV1Coin = zerocoinSelected.GetVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION;
+ bool isV1Coin = libzerocoin::ExtractVersionFromSerial(zerocoinSelected.GetSerialNumber()) < libzerocoin::PrivateCoin::PUBKEY_VERSION;
  libzerocoin::ZerocoinParams* paramsCoin = Params().Zerocoin_Params(isV1Coin);
  //LogPrintf("%s: *** using v1 coin params=%b, using v1 acc params=%b\n", __func__, isV1Coin, chainActive.Height() < Params().Zerocoin_Block_V2_Start());
 

diff --git a/src/zpivtracker.cpp b/src/zpivtracker.cpp
@@ -149,10 +149,6 @@ CAmount CzPIVTracker::GetBalance(bool fConfirmedOnly, bool fUnconfirmedOnly) con
  myZerocoinSupply.at(meta.denom)++;
  }
  }
- for (auto& denom : libzerocoin::zerocoinDenomList) {
- LogPrint("zero","%s My coins for denomination %d pubcoin %s\n", __func__,denom, myZerocoinSupply.at(denom));
- }
- LogPrint("zero","Total value of coins %d\n",nTotal);
 
  if (nTotal < 0 ) nTotal = 0; // Sanity never hurts