feat(qt): UI refresh (4/n, introduce distinct widgets for Dash-specific reporting in debug window, governance stats)

src/Makefile.qt.include

@@ -20,62 +20,73 @@ QT_FORMS_UI = \
   qt/forms/askpassphrasedialog.ui \
   qt/forms/coincontroldialog.ui \
   qt/forms/createwalletdialog.ui \
+  qt/forms/debugwindow.ui \
+  qt/forms/descriptiondialog.ui \
   qt/forms/editaddressdialog.ui \
+  qt/forms/informationwidget.ui \
+  qt/forms/governanceinfo.ui \
   qt/forms/governancelist.ui \
-  qt/forms/proposalwizard.ui \
   qt/forms/helpmessagedialog.ui \
   qt/forms/intro.ui \
-  qt/forms/modaloverlay.ui \
   qt/forms/masternodelist.ui \
   qt/forms/mnemonicverificationdialog.ui \
-  qt/forms/qrdialog.ui \
+  qt/forms/modaloverlay.ui \
+  qt/forms/networkwidget.ui \
   qt/forms/openuridialog.ui \
   qt/forms/optionsdialog.ui \
   qt/forms/overviewpage.ui \
+  qt/forms/proposalcreate.ui \
+  qt/forms/proposalresume.ui \
   qt/forms/psbtoperationsdialog.ui \
+  qt/forms/qrdialog.ui \
   qt/forms/receivecoinsdialog.ui \
   qt/forms/receiverequestdialog.ui \
-  qt/forms/debugwindow.ui \
   qt/forms/sendcoinsdialog.ui \
   qt/forms/sendcoinsentry.ui \
-  qt/forms/signverifymessagedialog.ui \
-  qt/forms/transactiondescdialog.ui
+  qt/forms/signverifymessagedialog.ui
 
 QT_MOC_CPP = \
   qt/moc_addressbookpage.cpp \
   qt/moc_addresstablemodel.cpp \
   qt/moc_appearancewidget.cpp \
   qt/moc_askpassphrasedialog.cpp \
-  qt/moc_createwalletdialog.cpp \
   qt/moc_bantablemodel.cpp \
   qt/moc_bitcoin.cpp \
   qt/moc_bitcoinaddressvalidator.cpp \
   qt/moc_bitcoinamountfield.cpp \
   qt/moc_bitcoingui.cpp \
   qt/moc_bitcoinunits.cpp \
+  qt/moc_donutchart.cpp \
   qt/moc_clientmodel.cpp \
   qt/moc_coincontroldialog.cpp \
   qt/moc_coincontroltreewidget.cpp \
+  qt/moc_createwalletdialog.cpp \
   qt/moc_csvmodelwriter.cpp \
+  qt/moc_descriptiondialog.cpp \
   qt/moc_editaddressdialog.cpp \
+  qt/moc_governanceinfo.cpp \
   qt/moc_governancelist.cpp \
-  qt/moc_proposalwizard.cpp \
   qt/moc_guiutil.cpp \
+  qt/moc_informationwidget.cpp \
   qt/moc_initexecutor.cpp \
   qt/moc_intro.cpp \
   qt/moc_macdockiconhandler.cpp \
   qt/moc_macnotificationhandler.cpp \
-  qt/moc_modaloverlay.cpp \
   qt/moc_masternodelist.cpp \
   qt/moc_mnemonicverificationdialog.cpp \
+  qt/moc_modaloverlay.cpp \
+  qt/moc_networkwidget.cpp \
   qt/moc_notificator.cpp \
   qt/moc_openuridialog.cpp \
   qt/moc_optionsdialog.cpp \
   qt/moc_optionsmodel.cpp \
   qt/moc_overviewpage.cpp \
+  qt/moc_paymentserver.cpp \
   qt/moc_peertablemodel.cpp \
   qt/moc_peertablesortproxy.cpp \
-  qt/moc_paymentserver.cpp \
+  qt/moc_proposalmodel.cpp \
+  qt/moc_proposalcreate.cpp \
+  qt/moc_proposalresume.cpp \
   qt/moc_psbtoperationsdialog.cpp \
   qt/moc_qrdialog.cpp \
   qt/moc_qrimagewidget.cpp \
@@ -91,7 +102,6 @@ QT_MOC_CPP = \
   qt/moc_splashscreen.cpp \
   qt/moc_trafficgraphwidget.cpp \
   qt/moc_transactiondesc.cpp \
-  qt/moc_transactiondescdialog.cpp \
   qt/moc_transactionfilterproxy.cpp \
   qt/moc_transactionoverviewwidget.cpp \
   qt/moc_transactiontablemodel.cpp \
@@ -129,26 +139,30 @@ BITCOIN_QT_H = \
   qt/bitcoinamountfield.h \
   qt/bitcoingui.h \
   qt/bitcoinunits.h \
+  qt/donutchart.h \
   qt/clientmodel.h \
   qt/coincontroldialog.h \
   qt/coincontroltreewidget.h \
   qt/createwalletdialog.h \
   qt/csvmodelwriter.h \
+  qt/descriptiondialog.h \
   qt/editaddressdialog.h \
+  qt/governanceinfo.h \
   qt/governancelist.h \
-  qt/proposalwizard.h \
   qt/guiconstants.h \
   qt/guiutil.h \
   qt/guiutil_font.h \
+  qt/informationwidget.h \
   qt/initexecutor.h \
   qt/intro.h \
   qt/macdockiconhandler.h \
   qt/macnotificationhandler.h \
   qt/macos_appnap.h \
-  qt/modaloverlay.h \
   qt/masternodelist.h \
   qt/mnemonicverificationdialog.h \
+  qt/modaloverlay.h \
   qt/networkstyle.h \
+  qt/networkwidget.h \
   qt/notificator.h \
   qt/openuridialog.h \
   qt/optionsdialog.h \
@@ -157,6 +171,9 @@ BITCOIN_QT_H = \
   qt/paymentserver.h \
   qt/peertablemodel.h \
   qt/peertablesortproxy.h \
+  qt/proposalcreate.h \
+  qt/proposalmodel.h \
+  qt/proposalresume.h \
   qt/psbtoperationsdialog.h \
   qt/qrdialog.h \
   qt/qrimagewidget.h \
@@ -174,7 +191,6 @@ BITCOIN_QT_H = \
   qt/trafficgraphdata.h \
   qt/trafficgraphwidget.h \
   qt/transactiondesc.h \
-  qt/transactiondescdialog.h \
   qt/transactionfilterproxy.h \
   qt/transactionoverviewwidget.h \
   qt/transactionrecord.h \
@@ -189,36 +205,36 @@ BITCOIN_QT_H = \
   qt/winshutdownmonitor.h
 
 QT_RES_ICONS = \
-  qt/res/icons/dash.ico \
-  qt/res/icons/dash_testnet.ico \
-  qt/res/icons/dash.png \
-  qt/res/icons/warning.png \
   qt/res/icons/address-book.png \
-  qt/res/icons/transaction0.png \
-  qt/res/icons/transaction1.png \
-  qt/res/icons/transaction2.png \
-  qt/res/icons/transaction3.png \
-  qt/res/icons/transaction4.png \
-  qt/res/icons/transaction5.png \
-  qt/res/icons/transaction_abandoned.png \
-  qt/res/icons/transaction_locked.png \
   qt/res/icons/connect1_16.png \
   qt/res/icons/connect2_16.png \
   qt/res/icons/connect3_16.png \
   qt/res/icons/connect4_16.png \
+  qt/res/icons/dash.ico \
+  qt/res/icons/dash.png \
+  qt/res/icons/dash_testnet.ico \
   qt/res/icons/editcopy.png \
   qt/res/icons/editpaste.png \
   qt/res/icons/eye.png \
   qt/res/icons/eye_minus.png \
   qt/res/icons/eye_plus.png \
+  qt/res/icons/fontbigger.png \
+  qt/res/icons/fontsmaller.png \
   qt/res/icons/hd_enabled.png \
   qt/res/icons/lock_closed.png \
   qt/res/icons/lock_open.png \
   qt/res/icons/proxy.png \
   qt/res/icons/remove.png \
   qt/res/icons/synced.png \
-  qt/res/icons/fontbigger.png \
-  qt/res/icons/fontsmaller.png
+  qt/res/icons/transaction0.png \
+  qt/res/icons/transaction1.png \
+  qt/res/icons/transaction2.png \
+  qt/res/icons/transaction3.png \
+  qt/res/icons/transaction4.png \
+  qt/res/icons/transaction5.png \
+  qt/res/icons/transaction_abandoned.png \
+  qt/res/icons/transaction_locked.png \
+  qt/res/icons/warning.png
 
 BITCOIN_QT_BASE_CPP = \
   qt/appearancewidget.cpp \
@@ -228,14 +244,18 @@ BITCOIN_QT_BASE_CPP = \
   qt/bitcoinamountfield.cpp \
   qt/bitcoingui.cpp \
   qt/bitcoinunits.cpp \
+  qt/donutchart.cpp \
   qt/clientmodel.cpp \
   qt/csvmodelwriter.cpp \
+  qt/governanceinfo.cpp \
   qt/guiutil.cpp \
   qt/guiutil_font.cpp \
+  qt/informationwidget.cpp \
   qt/initexecutor.cpp \
   qt/intro.cpp \
   qt/modaloverlay.cpp \
   qt/networkstyle.cpp \
+  qt/networkwidget.cpp \
   qt/notificator.cpp \
   qt/optionsdialog.cpp \
   qt/optionsmodel.cpp \
@@ -258,14 +278,17 @@ BITCOIN_QT_WALLET_CPP = \
   qt/coincontroldialog.cpp \
   qt/coincontroltreewidget.cpp \
   qt/createwalletdialog.cpp \
+  qt/descriptiondialog.cpp \
   qt/editaddressdialog.cpp \
   qt/governancelist.cpp \
-  qt/proposalwizard.cpp \
   qt/masternodelist.cpp \
   qt/mnemonicverificationdialog.cpp \
   qt/openuridialog.cpp \
   qt/overviewpage.cpp \
   qt/paymentserver.cpp \
+  qt/proposalcreate.cpp \
+  qt/proposalmodel.cpp \
+  qt/proposalresume.cpp \
   qt/psbtoperationsdialog.cpp \
   qt/qrdialog.cpp \
   qt/qrimagewidget.cpp \
@@ -276,7 +299,6 @@ BITCOIN_QT_WALLET_CPP = \
   qt/sendcoinsentry.cpp \
   qt/signverifymessagedialog.cpp \
   qt/transactiondesc.cpp \
-  qt/transactiondescdialog.cpp \
   qt/transactionfilterproxy.cpp \
   qt/transactionoverviewwidget.cpp \
   qt/transactionrecord.cpp \
@@ -301,50 +323,50 @@ QT_RES_IMAGES = \
   qt/res/images/arrow_down_light.png \
   qt/res/images/arrow_left_dark.png \
   qt/res/images/arrow_left_light.png \
-  qt/res/images/arrow_right_dark.png \
-  qt/res/images/arrow_right_light.png \
-  qt/res/images/arrow_up_dark.png \
-  qt/res/images/arrow_up_light.png \
-  qt/res/images/arrow_light_down_normal.png \
   qt/res/images/arrow_light_down_hover.png \
-  qt/res/images/arrow_light_left_normal.png \
+  qt/res/images/arrow_light_down_normal.png \
   qt/res/images/arrow_light_left_hover.png \
-  qt/res/images/arrow_light_right_normal.png \
+  qt/res/images/arrow_light_left_normal.png \
   qt/res/images/arrow_light_right_hover.png \
-  qt/res/images/arrow_light_up_normal.png \
+  qt/res/images/arrow_light_right_normal.png \
   qt/res/images/arrow_light_up_hover.png \
-  qt/res/images/checkbox_normal_dark.png \
-  qt/res/images/checkbox_normal_hover_dark.png \
-  qt/res/images/checkbox_normal_disabled_dark.png \
+  qt/res/images/arrow_light_up_normal.png \
+  qt/res/images/arrow_right_dark.png \
+  qt/res/images/arrow_right_light.png \
+  qt/res/images/arrow_up_dark.png \
+  qt/res/images/arrow_up_light.png \
   qt/res/images/checkbox_checked_dark.png \
-  qt/res/images/checkbox_checked_hover_dark.png \
   qt/res/images/checkbox_checked_disabled_dark.png \
+  qt/res/images/checkbox_checked_disabled_light.png \
+  qt/res/images/checkbox_checked_hover_dark.png \
+  qt/res/images/checkbox_checked_hover_light.png \
+  qt/res/images/checkbox_checked_light.png \
+  qt/res/images/checkbox_normal_dark.png \
+  qt/res/images/checkbox_normal_disabled_dark.png \
+  qt/res/images/checkbox_normal_disabled_light.png \
+  qt/res/images/checkbox_normal_hover_dark.png \
+  qt/res/images/checkbox_normal_hover_light.png \
+  qt/res/images/checkbox_normal_light.png \
   qt/res/images/checkbox_partly_checked_dark.png \
-  qt/res/images/checkbox_partly_checked_hover_dark.png \
   qt/res/images/checkbox_partly_checked_disabled_dark.png \
-  qt/res/images/checkbox_normal_light.png \
-  qt/res/images/checkbox_normal_hover_light.png \
-  qt/res/images/checkbox_normal_disabled_light.png \
-  qt/res/images/checkbox_checked_light.png \
-  qt/res/images/checkbox_checked_hover_light.png \
-  qt/res/images/checkbox_checked_disabled_light.png \
-  qt/res/images/checkbox_partly_checked_light.png \
-  qt/res/images/checkbox_partly_checked_hover_light.png \
   qt/res/images/checkbox_partly_checked_disabled_light.png \
+  qt/res/images/checkbox_partly_checked_hover_dark.png \
+  qt/res/images/checkbox_partly_checked_hover_light.png \
+  qt/res/images/checkbox_partly_checked_light.png \
   qt/res/images/dash_logo_toolbar.png \
   qt/res/images/dash_logo_toolbar_blue.png \
-  qt/res/images/radio_normal_dark.png \
-  qt/res/images/radio_normal_hover_dark.png \
   qt/res/images/radio_checked_dark.png \
-  qt/res/images/radio_checked_hover_dark.png \
-  qt/res/images/radio_normal_disabled_dark.png \
   qt/res/images/radio_checked_disabled_dark.png \
-  qt/res/images/radio_normal_light.png \
-  qt/res/images/radio_normal_hover_light.png \
-  qt/res/images/radio_checked_light.png \
+  qt/res/images/radio_checked_disabled_light.png \
+  qt/res/images/radio_checked_hover_dark.png \
   qt/res/images/radio_checked_hover_light.png \
+  qt/res/images/radio_checked_light.png \
+  qt/res/images/radio_normal_dark.png \
+  qt/res/images/radio_normal_disabled_dark.png \
   qt/res/images/radio_normal_disabled_light.png \
-  qt/res/images/radio_checked_disabled_light.png \
+  qt/res/images/radio_normal_hover_dark.png \
+  qt/res/images/radio_normal_hover_light.png \
+  qt/res/images/radio_normal_light.png \
   qt/res/images/splash.png
 
 QT_RES_CSS = \

src/chainlock/chainlock.cpp

@@ -365,7 +365,7 @@ void CChainLocksHandler::EnforceBestChainLock()
     }
 
     GetMainSignals().NotifyChainLock(currentBestChainLockBlockIndex, clsig, clsig->ToString());
-    uiInterface.NotifyChainLock(clsig->getBlockHash().ToString(), clsig->getHeight());
+    uiInterface.NotifyChainLock(clsig->getBlockHash().ToString(), clsig->getHeight(), currentBestChainLockBlockIndex->GetBlockTime());
     ::g_stats_client->gauge("chainlocks.blockHeight", clsig->getHeight(), 1.0f);
 }
 

src/governance/object.cpp

@@ -590,6 +590,20 @@ int CGovernanceObject::GetAbstainCount(const CDeterministicMNList& tip_mn_list,
     return CountMatchingVotes(tip_mn_list, eVoteSignalIn, VOTE_OUTCOME_ABSTAIN);
 }
 
+std::pair<uint16_t, uint16_t> CGovernanceObject::GetUniqueVoterCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+{
+    LOCK(cs);
+    uint16_t regular{0}, evo{0};
+    for (const auto& [outpoint, rec_vote] : mapCurrentMNVotes) {
+        if (auto it = rec_vote.mapInstances.find(eVoteSignalIn); it != rec_vote.mapInstances.end()) {
+            if (auto dmn = tip_mn_list.GetMNByCollateral(outpoint)) {
+                dmn->nType == MnType::Evo ? evo++ : regular++;
+            }
+        }
+    }
+    return {regular, evo};
+}
+
 bool CGovernanceObject::GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint, vote_rec_t& voteRecord) const
 {
     LOCK(cs);

src/governance/object.h

@@ -226,6 +226,8 @@ class CGovernanceObject
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     int GetAbstainCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::pair<uint16_t, uint16_t> GetUniqueVoterCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     bool GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint, vote_rec_t& voteRecord) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);

src/init.cpp

@@ -2391,9 +2391,9 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     }
     const std::string chainlock_notify = args.GetArg("-chainlocknotify", "");
     if (!chainlock_notify.empty()) {
-        uiInterface.NotifyChainLock_connect([chainlock_notify](const std::string& bestChainLockHash, int bestChainLockHeight) {
+        uiInterface.NotifyChainLock_connect([chainlock_notify](const std::string& best_hash, int /* best_height */, int64_t /* best_block_time */) {
             std::string command = chainlock_notify;
-            ReplaceAll(command, "%s", bestChainLockHash);
+            ReplaceAll(command, "%s", best_hash);
             std::thread t(runCommand, command);
             t.detach(); // thread runs free
         });

src/instantsend/instantsend.cpp

@@ -721,6 +721,24 @@ size_t CInstantSendManager::GetInstantSendLockCount() const
     return db.GetInstantSendLockCount();
 }
 
+size_t CInstantSendManager::GetPendingInstantSendLockCount() const
+{
+    LOCK(cs_pendingLocks);
+    return pendingInstantSendLocks.size();
+}
+
+size_t CInstantSendManager::GetPendingNoTxInstantSendLockCount() const
+{
+    LOCK(cs_pendingLocks);
+    return pendingNoTxInstantSendLocks.size();
+}
+
+size_t CInstantSendManager::GetNonLockedTxCount() const
+{
+    LOCK(cs_nonLocked);
+    return nonLockedTxs.size();
+}
+
 void CInstantSendManager::CacheBlockHeightInternal(const CBlockIndex* const block_index) const
 {
     AssertLockHeld(cs_height_cache);