A bunch of mostly trivial tweaks/fixes (#2889)

UdjinM6 · web-flow · commit 8ffdcbf99938 · 2019-04-30T15:48:21.000+03:00
* Trivial: vout-&gt;txout

* Re-use SetHexStr in few more places

* Tweak log output

* fix v13 release notes links

* Drop no longer used stuff

* Few more trivial fixes

* Adjust few rpc help strings

* Apply review suggestions
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -120,9 +120,9 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
 
 These release are considered obsolete. Old release notes can be found here:
 
-- [v0.13.2.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.2.0.md) released Mar/15/2019
-- [v0.13.1.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.1.0.md) released Feb/9/2019
-- [v0.13.0.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.0.md) released Jan/14/2019
+- [v0.13.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.2.md) released Mar/15/2019
+- [v0.13.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.1.md) released Feb/9/2019
+- [v0.13.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.md) released Jan/14/2019
 - [v0.12.3.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.4.md) released Dec/14/2018
 - [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
 - [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
diff --git a/doc/release-notes/dash/release-notes-0.13.1.md b/doc/release-notes/dash/release-notes-0.13.1.md
@@ -126,7 +126,7 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
 
 These release are considered obsolete. Old release notes can be found here:
 
-- [v0.13.0.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.0.md) released Jan/14/2019
+- [v0.13.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.md) released Jan/14/2019
 - [v0.12.3.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.4.md) released Dec/14/2018
 - [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
 - [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
diff --git a/doc/release-notes/dash/release-notes-0.13.2.md b/doc/release-notes/dash/release-notes-0.13.2.md
@@ -153,8 +153,8 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
 
 These release are considered obsolete. Old release notes can be found here:
 
-- [v0.13.1.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.1.0.md) released Feb/9/2019
-- [v0.13.0.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.0.md) released Jan/14/2019
+- [v0.13.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.1.md) released Feb/9/2019
+- [v0.13.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.md) released Jan/14/2019
 - [v0.12.3.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.4.md) released Dec/14/2018
 - [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
 - [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
@@ -1245,7 +1245,7 @@ def update_block(block_number, new_transactions):
         yield rejected()
 
 
-        #  Test re-org of a week's worth of blocks (1088 blocks)
+        #  Test re-org of a ~2 days' worth of blocks (1088 blocks)
         #  This test takes a minute or two and can be accomplished in memory
         #
         if self.options.runbarelyexpensive:
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -442,7 +442,7 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nStartTime = 1553126400; // Mar 21st, 2019
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nTimeout = 1584748800; // Mar 21st, 2020
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nWindowSize = 100;
-        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 80% of 100
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 50% of 100
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000003cd72a542"); // 4000
@@ -601,7 +601,7 @@ class CDevNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nStartTime = 1553126400; // Mar 21st, 2019
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nTimeout = 1584748800; // Mar 21st, 2020
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nWindowSize = 100;
-        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 80% of 100
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 50% of 100
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000000000000");
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
@@ -60,16 +60,16 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
         return;
 
     llmq::quorumInstantSendManager->UpdatedBlockTip(pindexNew);
-    llmq::chainLocksHandler->UpdatedBlockTip(pindexNew, pindexFork);
+    llmq::chainLocksHandler->UpdatedBlockTip(pindexNew);
 
     CPrivateSend::UpdatedBlockTip(pindexNew);
 #ifdef ENABLE_WALLET
     privateSendClient.UpdatedBlockTip(pindexNew);
 #endif // ENABLE_WALLET
     instantsend.UpdatedBlockTip(pindexNew);
     governance.UpdatedBlockTip(pindexNew, connman);
-    llmq::quorumManager->UpdatedBlockTip(pindexNew, pindexFork, fInitialDownload);
-    llmq::quorumDKGSessionManager->UpdatedBlockTip(pindexNew, pindexFork, fInitialDownload);
+    llmq::quorumManager->UpdatedBlockTip(pindexNew, fInitialDownload);
+    llmq::quorumDKGSessionManager->UpdatedBlockTip(pindexNew, fInitialDownload);
 }
 
 void CDSNotificationInterface::SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock)
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
@@ -36,7 +36,7 @@ uint256 CSimplifiedMNListEntry::CalcHash() const
 
 std::string CSimplifiedMNListEntry::ToString() const
 {
-    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, confirmedHash=%s, service=%s, pubKeyOperator=%s, votingAddress=%s, isValie=%d)",
+    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, confirmedHash=%s, service=%s, pubKeyOperator=%s, votingAddress=%s, isValid=%d)",
         proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), CBitcoinAddress(keyIDVoting).ToString(), isValid);
 }
 
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
@@ -495,14 +495,14 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
         std::string strOutpoint = masternodeOutpoint.ToStringShort();
         auto dmn = mnList.GetMNByCollateral(masternodeOutpoint);
         if (!dmn) {
-            strError = "Failed to find Masternode by UTXO, missing masternode=" + strOutpoint + "\n";
+            strError = "Failed to find Masternode by UTXO, missing masternode=" + strOutpoint;
             return false;
         }
         if (!mnList.IsMNValid(dmn)) {
             if (mnList.IsMNPoSeBanned(dmn)) {
-                strError = "Masternode is POSE_BANNED, masternode=" + strOutpoint + "\n";
+                strError = "Masternode is POSE_BANNED, masternode=" + strOutpoint;
             } else {
-                strError = "Masternode is invalid for unknown reason, masternode=" + strOutpoint + "\n";
+                strError = "Masternode is invalid for unknown reason, masternode=" + strOutpoint;
             }
             return false;
         }
diff --git a/src/governance.cpp b/src/governance.cpp
@@ -183,7 +183,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         if (fRateCheckBypassed && (fIsValid || fMasternodeMissing)) {
             if (!MasternodeRateCheck(govobj, true)) {
-                LogPrintf("MNGOVERNANCEOBJECT -- masternode rate check failed (after signature verification) - %s - (current block height %d) \n", strHash, nCachedBlockHeight);
+                LogPrintf("MNGOVERNANCEOBJECT -- masternode rate check failed (after signature verification) - %s - (current block height %d)\n", strHash, nCachedBlockHeight);
                 return;
             }
         }
@@ -445,7 +445,7 @@ void CGovernanceManager::UpdateCachesAndClean()
             if (pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
                 CProposalValidator validator(pObj->GetDataAsHexString(), true);
                 if (!validator.Validate()) {
-                    LogPrintf("CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", (*it).first.ToString());
+                    LogPrintf("CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", strHash);
                     pObj->fCachedDelete = true;
                     if (pObj->nDeletionTime == 0) {
                         pObj->nDeletionTime = nNow;
diff --git a/src/init.cpp b/src/init.cpp
@@ -801,7 +801,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
     // scan for better chains in the block chain database, that are not yet connected in the active best chain
     CValidationState state;
     if (!ActivateBestChain(state, chainparams)) {
-        LogPrintf("Failed to connect best block");
+        LogPrintf("Failed to connect best block (%s)\n", FormatStateMessage(state));
         StartShutdown();
     }
 
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -159,7 +159,7 @@ CQuorumManager::CQuorumManager(CEvoDB& _evoDb, CBLSWorker& _blsWorker, CDKGSessi
 {
 }
 
-void CQuorumManager::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+void CQuorumManager::UpdatedBlockTip(const CBlockIndex* pindexNew, bool fInitialDownload)
 {
     if (fInitialDownload) {
         return;
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
@@ -92,7 +92,7 @@ class CQuorumManager
 public:
     CQuorumManager(CEvoDB& _evoDb, CBLSWorker& _blsWorker, CDKGSessionManager& _dkgManager);
 
-    void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
+    void UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitialDownload);
 
     bool HasQuorum(Consensus::LLMQType llmqType, const uint256& quorumHash);
 
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
@@ -434,7 +434,7 @@ std::vector<const CBlockIndex*> CQuorumBlockProcessor::GetMinedCommitmentsUntilB
 
         auto quorumIndex = pindex->GetAncestor(quorumHeight);
         assert(quorumIndex);
-        ret.emplace_back(pindex->GetAncestor(quorumHeight));
+        ret.emplace_back(quorumIndex);
 
         dbIt->Next();
     }
diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
@@ -184,7 +184,7 @@ void CChainLocksHandler::AcceptedBlockHeader(const CBlockIndex* pindexNew)
     }
 }
 
-void CChainLocksHandler::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork)
+void CChainLocksHandler::UpdatedBlockTip(const CBlockIndex* pindexNew)
 {
     // don't call TrySignChainTip directly but instead let the scheduler call it. This way we ensure that cs_main is
     // never locked and TrySignChainTip is not called twice in parallel. Also avoids recursive calls due to
@@ -301,7 +301,7 @@ void CChainLocksHandler::TrySignChainTip()
                 auto it = blockTxs.find(pindexWalk->GetBlockHash());
                 if (it == blockTxs.end()) {
                     // this should actually not happen as NewPoWValidBlock should have been called before
-                    LogPrintf("CChainLocksHandler::%s -- blockTxs for %s not found\n", __func__,
+                    LogPrint("chainlocks", "CChainLocksHandler::%s -- blockTxs for %s not found\n", __func__,
                               pindexWalk->GetBlockHash().ToString());
                     return;
                 }
diff --git a/src/llmq/quorums_chainlocks.h b/src/llmq/quorums_chainlocks.h
@@ -88,7 +88,7 @@ class CChainLocksHandler : public CRecoveredSigsListener
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
     void ProcessNewChainLock(NodeId from, const CChainLockSig& clsig, const uint256& hash);
     void AcceptedBlockHeader(const CBlockIndex* pindexNew);
-    void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork);
+    void UpdatedBlockTip(const CBlockIndex* pindexNew);
     void SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock);
     void CheckActiveState();
     void TrySignChainTip();
diff --git a/src/llmq/quorums_dkgsessionhandler.cpp b/src/llmq/quorums_dkgsessionhandler.cpp
@@ -108,7 +108,7 @@ CDKGSessionHandler::~CDKGSessionHandler()
     }
 }
 
-void CDKGSessionHandler::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+void CDKGSessionHandler::UpdatedBlockTip(const CBlockIndex* pindexNew)
 {
     LOCK(cs);
 
diff --git a/src/llmq/quorums_dkgsessionhandler.h b/src/llmq/quorums_dkgsessionhandler.h
@@ -121,7 +121,7 @@ class CDKGSessionHandler
     CDKGSessionHandler(const Consensus::LLMQParams& _params, ctpl::thread_pool& _messageHandlerPool, CBLSWorker& blsWorker, CDKGSessionManager& _dkgManager);
     ~CDKGSessionHandler();
 
-    void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
+    void UpdatedBlockTip(const CBlockIndex *pindexNew);
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
 private:
diff --git a/src/llmq/quorums_dkgsessionmgr.cpp b/src/llmq/quorums_dkgsessionmgr.cpp
@@ -48,7 +48,7 @@ void CDKGSessionManager::StopMessageHandlerPool()
     messageHandlerPool.stop(true);
 }
 
-void CDKGSessionManager::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+void CDKGSessionManager::UpdatedBlockTip(const CBlockIndex* pindexNew, bool fInitialDownload)
 {
     const auto& consensus = Params().GetConsensus();
 
@@ -62,7 +62,7 @@ void CDKGSessionManager::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBl
         return;
 
     for (auto& qt : dkgSessionHandlers) {
-        qt.second.UpdatedBlockTip(pindexNew, pindexFork, fInitialDownload);
+        qt.second.UpdatedBlockTip(pindexNew);
     }
 }
 
diff --git a/src/llmq/quorums_dkgsessionmgr.h b/src/llmq/quorums_dkgsessionmgr.h
@@ -53,7 +53,7 @@ class CDKGSessionManager
     void StartMessageHandlerPool();
     void StopMessageHandlerPool();
 
-    void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload);
+    void UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitialDownload);
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
     bool AlreadyHave(const CInv& inv) const;
diff --git a/src/llmq/quorums_init.h b/src/llmq/quorums_init.h
@@ -15,8 +15,6 @@ namespace llmq
 // If true, we will connect to all new quorums and watch their communication
 static const bool DEFAULT_WATCH_QUORUMS = false;
 
-extern CDBWrapper* llmqDb;
-
 // Init/destroy LLMQ globals
 void InitLLMQSystem(CEvoDB& evoDb, CScheduler* scheduler, bool unitTests, bool fWipe = false);
 void DestroyLLMQSystem();
diff --git a/src/llmq/quorums_signing_shares.cpp b/src/llmq/quorums_signing_shares.cpp
@@ -1347,7 +1347,7 @@ void CSigSharesManager::WorkThreadMain()
     int64_t lastSendTime = 0;
 
     while (!workInterrupt) {
-        if (!quorumSigningManager || !g_connman || !quorumSigningManager) {
+        if (!quorumSigningManager || !g_connman) {
             if (!workInterrupt.sleep_for(std::chrono::milliseconds(100))) {
                 return;
             }
diff --git a/src/net.cpp b/src/net.cpp
@@ -1156,7 +1156,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
 
     // don't accept incoming connections until fully synced
     if(fMasternodeMode && !masternodeSync.IsSynced()) {
-        LogPrintf("AcceptConnection -- masternode is not synced yet, skipping inbound connection attempt\n");
+        LogPrint("net", "AcceptConnection -- masternode is not synced yet, skipping inbound connection attempt\n");
         CloseSocket(hSocket);
         return;
     }
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
@@ -864,13 +864,20 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool
         CAmount nBalanceDenominatedUnconf = pwalletMain->GetDenominatedBalance(true);
         CAmount nBalanceDenominated = nBalanceDenominatedConf + nBalanceDenominatedUnconf;
 
-        LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- nValueMin: %f, nBalanceNeedsAnonymized: %f, nBalanceAnonimizableNonDenom: %f, nBalanceDenominatedConf: %f, nBalanceDenominatedUnconf: %f, nBalanceDenominated: %f\n",
-            (float)nValueMin / COIN,
-            (float)nBalanceNeedsAnonymized / COIN,
-            (float)nBalanceAnonimizableNonDenom / COIN,
-            (float)nBalanceDenominatedConf / COIN,
-            (float)nBalanceDenominatedUnconf / COIN,
-            (float)nBalanceDenominated / COIN);
+        LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- current stats:\n"
+            "    nValueMin: %s\n"
+            "    nBalanceNeedsAnonymized: %s\n"
+            "    nBalanceAnonimizableNonDenom: %s\n"
+            "    nBalanceDenominatedConf: %s\n"
+            "    nBalanceDenominatedUnconf: %s\n"
+            "    nBalanceDenominated: %s\n",
+            FormatMoney(nValueMin),
+            FormatMoney(nBalanceNeedsAnonymized),
+            FormatMoney(nBalanceAnonimizableNonDenom),
+            FormatMoney(nBalanceDenominatedConf),
+            FormatMoney(nBalanceDenominatedUnconf),
+            FormatMoney(nBalanceDenominated)
+            );
 
         if (fDryRun) return true;
 
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
@@ -571,7 +571,7 @@ void OverviewPage::privateSendStatus()
     QString s = tr("Last PrivateSend message:\n") + strStatus;
 
     if(s != ui->labelPrivateSendLastMessage->text())
-        LogPrintf("OverviewPage::privateSendStatus -- Last PrivateSend message: %s\n", strStatus.toStdString());
+        LogPrint("privatesend", "OverviewPage::privateSendStatus -- Last PrivateSend message: %s\n", strStatus.toStdString());
 
     ui->labelPrivateSendLastMessage->setText(s);
 
diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp
@@ -89,7 +89,7 @@ void TrafficGraphWidget::paintEvent(QPaintEvent *)
     // decide what order of magnitude we are
     int base = floor(log10(fMax));
     float val = pow(10.0f, base);
-    float val2;
+    float val2 = val;
 
     const QString units     = tr("KB/s");
     const float yMarginText = 2.0;
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -332,17 +332,17 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
             {
                 {
                     strHTML += "<li>";
-                    const CTxOut &vout = prev.out;
+                    const CTxOut& txout = prev.out;
                     CTxDestination address;
-                    if (ExtractDestination(vout.scriptPubKey, address))
+                    if (ExtractDestination(txout.scriptPubKey, address))
                     {
                         if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty())
                             strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " ";
                         strHTML += QString::fromStdString(CBitcoinAddress(address).ToString());
                     }
-                    strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatHtmlWithUnit(unit, vout.nValue);
-                    strHTML = strHTML + " IsMine=" + (wallet->IsMine(vout) & ISMINE_SPENDABLE ? tr("true") : tr("false"));
-                    strHTML = strHTML + " IsWatchOnly=" + (wallet->IsMine(vout) & ISMINE_WATCH_ONLY ? tr("true") : tr("false")) + "</li>";
+                    strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatHtmlWithUnit(unit, txout.nValue);
+                    strHTML = strHTML + " IsMine=" + (wallet->IsMine(txout) & ISMINE_SPENDABLE ? tr("true") : tr("false"));
+                    strHTML = strHTML + " IsWatchOnly=" + (wallet->IsMine(txout) & ISMINE_WATCH_ONLY ? tr("true") : tr("false")) + "</li>";
                 }
             }
         }
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -329,7 +329,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx, int numISLocks, int c
             if (wtx.isAbandoned())
                 status.status = TransactionStatus::Abandoned;
         }
-        else if (!wtx.IsChainLocked() && status.depth < RecommendedNumConfirmations)
+        else if (status.depth < RecommendedNumConfirmations && !wtx.IsChainLocked())
         {
             status.status = TransactionStatus::Confirming;
         }
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
@@ -423,6 +423,8 @@ void TransactionView::exportClicked()
 
 void TransactionView::contextualMenu(const QPoint &point)
 {
+    if (!transactionView || !transactionView->selectionModel())
+        return;
     QModelIndex index = transactionView->indexAt(point);
     QModelIndexList selection = transactionView->selectionModel()->selectedRows(0);
     if (selection.empty())
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
diff --git a/src/rpc/rpcquorums.cpp b/src/rpc/rpcquorums.cpp
diff --git a/src/spork.cpp b/src/spork.cpp
diff --git a/src/util.cpp b/src/util.cpp
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
diff --git a/src/utiltime.h b/src/utiltime.h
diff --git a/src/validation.cpp b/src/validation.cpp

Original file line number	Diff line number	Diff line change
`@@ -1245,7 +1245,7 @@ def update_block(block_number, new_transactions):`
`1245`	`1245`	`yield rejected()`
`1246`	`1246`
`1247`	`1247`
`1248`		`- # Test re-org of a week's worth of blocks (1088 blocks)`
	`1248`	`+ # Test re-org of a ~2 days' worth of blocks (1088 blocks)`
`1249`	`1249`	`# This test takes a minute or two and can be accomplished in memory`
`1250`	`1250`	`#`
`1251`	`1251`	`if self.options.runbarelyexpensive:`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ uint256 CSimplifiedMNListEntry::CalcHash() const`
`36`	`36`
`37`	`37`	`std::string CSimplifiedMNListEntry::ToString() const`
`38`	`38`	`{`
`39`		`- return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, confirmedHash=%s, service=%s, pubKeyOperator=%s, votingAddress=%s, isValie=%d)",`
	`39`	`+ return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, confirmedHash=%s, service=%s, pubKeyOperator=%s, votingAddress=%s, isValid=%d)",`
`40`	`40`	`proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), CBitcoinAddress(keyIDVoting).ToString(), isValid);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -495,14 +495,14 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast`
`495`	`495`	`std::string strOutpoint = masternodeOutpoint.ToStringShort();`
`496`	`496`	`auto dmn = mnList.GetMNByCollateral(masternodeOutpoint);`
`497`	`497`	`if (!dmn) {`
`498`		`- strError = "Failed to find Masternode by UTXO, missing masternode=" + strOutpoint + "\n";`
	`498`	`+ strError = "Failed to find Masternode by UTXO, missing masternode=" + strOutpoint;`
`499`	`499`	`return false;`
`500`	`500`	`}`
`501`	`501`	`if (!mnList.IsMNValid(dmn)) {`
`502`	`502`	`if (mnList.IsMNPoSeBanned(dmn)) {`
`503`		`- strError = "Masternode is POSE_BANNED, masternode=" + strOutpoint + "\n";`
	`503`	`+ strError = "Masternode is POSE_BANNED, masternode=" + strOutpoint;`
`504`	`504`	`} else {`
`505`		`- strError = "Masternode is invalid for unknown reason, masternode=" + strOutpoint + "\n";`
	`505`	`+ strError = "Masternode is invalid for unknown reason, masternode=" + strOutpoint;`
`506`	`506`	`}`
`507`	`507`	`return false;`
`508`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)`
`801`	`801`	`// scan for better chains in the block chain database, that are not yet connected in the active best chain`
`802`	`802`	`CValidationState state;`
`803`	`803`	`if (!ActivateBestChain(state, chainparams)) {`
`804`		`- LogPrintf("Failed to connect best block");`
	`804`	`+ LogPrintf("Failed to connect best block (%s)\n", FormatStateMessage(state));`
`805`	`805`	`StartShutdown();`
`806`	`806`	`}`
`807`	`807`