feat(qt): UI refresh (2/n, update "Governance" Tab layout, lifecycle icons, description dialogs, resumable proposal creation)

src/Makefile.qt.include

@@ -20,33 +20,33 @@ 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/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/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 \
@@ -56,26 +56,30 @@ QT_MOC_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_governancelist.cpp \
-  qt/moc_proposalwizard.cpp \
   qt/moc_guiutil.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_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 +95,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 \
@@ -134,9 +137,9 @@ BITCOIN_QT_H = \
   qt/coincontroltreewidget.h \
   qt/createwalletdialog.h \
   qt/csvmodelwriter.h \
+  qt/descriptiondialog.h \
   qt/editaddressdialog.h \
   qt/governancelist.h \
-  qt/proposalwizard.h \
   qt/guiconstants.h \
   qt/guiutil.h \
   qt/guiutil_font.h \
@@ -145,9 +148,9 @@ BITCOIN_QT_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/notificator.h \
   qt/openuridialog.h \
@@ -157,6 +160,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 +180,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 +194,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 \
@@ -258,14 +263,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 +284,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 +308,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/interfaces/node.h

@@ -135,7 +135,11 @@ class GOV
     virtual ~GOV() {}
     virtual void getAllNewerThan(std::vector<CGovernanceObject> &objs, int64_t nMoreThanTime) = 0;
     virtual int32_t getObjAbsYesCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
+    virtual int32_t getObjYesCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
+    virtual int32_t getObjNoCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
+    virtual int32_t getObjAbstainCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
     virtual bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) = 0;
+    virtual bool existsObj(const uint256& hash) = 0;
     virtual bool isEnabled() = 0;
     virtual bool processVoteAndRelay(const CGovernanceVote& vote, std::string& error) = 0;
     struct GovernanceInfo {
@@ -150,6 +154,7 @@ class GOV
         int requiredConfs{6};
     };
     virtual GovernanceInfo getGovernanceInfo() = 0;
+    virtual std::optional<int32_t> getProposalFundedHeight(const uint256& proposal_hash) = 0;
     virtual std::optional<CGovernanceObject> createProposal(int32_t revision, int64_t created_time,
                                 const std::string& data_hex, std::string& error) = 0;
     virtual bool submitProposal(const uint256& parent, int32_t revision, int64_t created_time, const std::string& data_hex,

src/node/interfaces.cpp

@@ -236,6 +236,34 @@ class GOVImpl : public GOV
         }
         return 0;
     }
+    int32_t getObjAbstainCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
+    {
+        if (context().govman != nullptr && context().dmnman != nullptr) {
+            return obj.GetAbstainCount(context().dmnman->GetListAtChainTip(), vote_signal);
+        }
+        return 0;
+    }
+    int32_t getObjYesCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
+    {
+        if (context().govman != nullptr && context().dmnman != nullptr) {
+            return obj.GetYesCount(context().dmnman->GetListAtChainTip(), vote_signal);
+        }
+        return 0;
+    }
+    int32_t getObjNoCount(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
+    {
+        if (context().govman != nullptr && context().dmnman != nullptr) {
+            return obj.GetNoCount(context().dmnman->GetListAtChainTip(), vote_signal);
+        }
+        return 0;
+    }
+    bool existsObj(const uint256& hash) override
+    {
+        if (context().govman != nullptr) {
+            return context().govman->HaveObjectForHash(hash);
+        }
+        return false;
+    }
     bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) override
     {
         if (context().govman != nullptr && context().chainman != nullptr && context().dmnman != nullptr) {
@@ -271,13 +299,7 @@ class GOVImpl : public GOV
         const Consensus::Params& consensusParams = Params().GetConsensus();
 
         if (ctx.chainman) {
-            const CBlockIndex* tip = WITH_LOCK(::cs_main, return ctx.chainman->ActiveChain().Tip());
-            int last = 0;
-            int next = 0;
-            const int height = tip ? tip->nHeight : 0;
-            CSuperblock::GetNearestSuperblocksHeights(height, last, next);
-            info.lastsuperblock = last;
-            info.nextsuperblock = next;
+            CSuperblock::GetNearestSuperblocksHeights(ctx.chainman->ActiveHeight(), info.lastsuperblock, info.nextsuperblock);
         }
         info.proposalfee = GOVERNANCE_PROPOSAL_FEE_TX;
         info.superblockcycle = consensusParams.nSuperblockCycle;
@@ -292,6 +314,21 @@ class GOVImpl : public GOV
         }
         return info;
     }
+    std::optional<int32_t> getProposalFundedHeight(const uint256& proposal_hash) override
+    {
+        if (context().govman != nullptr && context().chainman != nullptr) {
+            const int32_t nTipHeight = context().chainman->ActiveHeight();
+            for (const auto& trigger : context().govman->GetActiveTriggers()) {
+                if (!trigger || trigger->GetBlockHeight() > nTipHeight) continue;
+                for (const auto& hash : trigger->GetProposalHashes()) {
+                    if (hash == proposal_hash) {
+                        return trigger->GetBlockHeight();
+                    }
+                }
+            }
+        }
+        return std::nullopt;
+    }
     std::optional<CGovernanceObject> createProposal(int32_t revision, int64_t created_time,
                         const std::string& data_hex, std::string& error) override
     {