diff --git a/src/darksend.cpp b/src/darksend.cpp index 7a57a8f22..798357873 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -922,7 +922,6 @@ bool CDarkSendPool::IsCollateralValid(const CTransaction& txCollateral){ int64_t nValueOut = 0; bool missingTx = false; - CTransaction tx; BOOST_FOREACH(const CTxOut o, txCollateral.vout){ nValueOut += o.nValue; @@ -957,9 +956,8 @@ bool CDarkSendPool::IsCollateralValid(const CTransaction& txCollateral){ if(fDebug) LogPrintf("CDarkSendPool::IsCollateralValid %s\n", txCollateral.ToString().c_str()); - CWalletTx wtxCollateral = CWalletTx(pwalletMain, txCollateral); CValidationState state; - if(AcceptableInputs(mempool, state, tx)){ + if(!AcceptableInputs(mempool, state, txCollateral)){ if(fDebug) LogPrintf ("CDarkSendPool::IsCollateralValid - didn't pass IsAcceptable\n"); return false; } @@ -1166,7 +1164,7 @@ bool CDarkSendPool::StatusUpdate(int newState, int newEntriesCount, int newAccep UpdateState(newState); entriesCount = newEntriesCount; - strAutoDenomResult = "Masternode: " + error; + if(error.size() > 0) strAutoDenomResult = "Masternode: " + error; if(newAccepted != -1) { lastEntryAccepted = newAccepted; diff --git a/src/darksend.h b/src/darksend.h index 8a107fad4..92d5dc212 100644 --- a/src/darksend.h +++ b/src/darksend.h @@ -284,7 +284,7 @@ public: if(!(Params().NetworkID() == CChainParams::TESTNET)) { strAddress = "Xq19GqFvajRrEdDHYRKGYjTsQfpV5jyipF"; } else { - strAddress = "mxE2Rp3oYpSEFdsN5TdHWhZvEHm3PJQQVm"; + strAddress = "y1EZuxhhNMAUofTBEeLqGE1bJrpC2TWRNp"; } lastSplitUpBlock = 0; @@ -296,7 +296,6 @@ public: minBlockSpacing = 1; nDsqCount = 0; vecDisabledDenominations.clear(); - strAutoDenomResult = ""; SetCollateralAddress(strAddress); SetNull(); diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 0ec52d792..9a40609d2 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -413,10 +413,14 @@ void OverviewPage::darkSendStatus() ui->darksendStatus->setText(s); - std::string out; - darkSendPool.GetDenominationsToString(darkSendPool.sessionDenom, out); - QString s2(out.c_str()); - ui->label_10->setText(s2); + if(darkSendPool.sessionDenom == 0){ + ui->label_10->setText("n/a"); + } else { + std::string out; + darkSendPool.GetDenominationsToString(darkSendPool.sessionDenom, out); + QString s2(out.c_str()); + ui->label_10->setText(s2); + } showingDarkSendMessage++; darksendActionCheck++;